diff --git a/assets.json b/assets.json deleted file mode 100644 index 8cfe7ce9f..000000000 --- a/assets.json +++ /dev/null @@ -1,1068 +0,0 @@ -{ -"@comment": "This file was generated by n64split.", - -"textures/raw/ipl3_font_00.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000B70","0x0"]}}, -"textures/raw/ipl3_font_01.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000B87","0x0"]}}, -"textures/raw/ipl3_font_02.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000B9E","0x0"]}}, -"textures/raw/ipl3_font_03.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000BB5","0x0"]}}, -"textures/raw/ipl3_font_04.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000BCC","0x0"]}}, -"textures/raw/ipl3_font_05.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000BE3","0x0"]}}, -"textures/raw/ipl3_font_06.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000BFA","0x0"]}}, -"textures/raw/ipl3_font_07.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000C11","0x0"]}}, -"textures/raw/ipl3_font_08.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000C28","0x0"]}}, -"textures/raw/ipl3_font_09.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000C3F","0x0"]}}, -"textures/raw/ipl3_font_10.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000C56","0x0"]}}, -"textures/raw/ipl3_font_11.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000C6D","0x0"]}}, -"textures/raw/ipl3_font_12.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000C84","0x0"]}}, -"textures/raw/ipl3_font_13.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000C9B","0x0"]}}, -"textures/raw/ipl3_font_14.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000CB2","0x0"]}}, -"textures/raw/ipl3_font_15.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000CC9","0x0"]}}, -"textures/raw/ipl3_font_16.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000CE0","0x0"]}}, -"textures/raw/ipl3_font_17.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000CF7","0x0"]}}, -"textures/raw/ipl3_font_18.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000D0E","0x0"]}}, -"textures/raw/ipl3_font_19.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000D25","0x0"]}}, -"textures/raw/ipl3_font_20.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000D3C","0x0"]}}, -"textures/raw/ipl3_font_21.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000D53","0x0"]}}, -"textures/raw/ipl3_font_22.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000D6A","0x0"]}}, -"textures/raw/ipl3_font_23.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000D81","0x0"]}}, -"textures/raw/ipl3_font_24.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000D98","0x0"]}}, -"textures/raw/ipl3_font_25.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000DAF","0x0"]}}, -"textures/raw/ipl3_font_26.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000DC6","0x0"]}}, -"textures/raw/ipl3_font_27.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000DDD","0x0"]}}, -"textures/raw/ipl3_font_28.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000DF4","0x0"]}}, -"textures/raw/ipl3_font_29.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000E0B","0x0"]}}, -"textures/raw/ipl3_font_30.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000E22","0x0"]}}, -"textures/raw/ipl3_font_31.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000E39","0x0"]}}, -"textures/raw/ipl3_font_32.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000E50","0x0"]}}, -"textures/raw/ipl3_font_33.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000E67","0x0"]}}, -"textures/raw/ipl3_font_34.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000E7E","0x0"]}}, -"textures/raw/ipl3_font_35.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000E95","0x0"]}}, -"textures/raw/ipl3_font_36.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000EAC","0x0"]}}, -"textures/raw/ipl3_font_37.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000EC3","0x0"]}}, -"textures/raw/ipl3_font_38.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000EDA","0x0"]}}, -"textures/raw/ipl3_font_39.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000EF1","0x0"]}}, -"textures/raw/ipl3_font_40.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000F08","0x0"]}}, -"textures/raw/ipl3_font_41.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000F1F","0x0"]}}, -"textures/raw/ipl3_font_42.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000F36","0x0"]}}, -"textures/raw/ipl3_font_43.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000F4D","0x0"]}}, -"textures/raw/ipl3_font_44.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000F64","0x0"]}}, -"textures/raw/ipl3_font_45.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000F7B","0x0"]}}, -"textures/raw/ipl3_font_46.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000F92","0x0"]}}, -"textures/raw/ipl3_font_47.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000FA9","0x0"]}}, -"textures/raw/ipl3_font_48.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000FC0","0x0"]}}, -"textures/raw/ipl3_font_49.ia1.png": {"meta":{"dims":[13,14]}, "offsets":{"us":["0x000FD7","0x0"]}}, -"textures/crash_screen/crash_screen_font.ia1.png": {"meta":{"dims":[8,136]}, "offsets":{"us":["0x0DD274","0x0"]}}, -"bin/lib/PR/boot/F3D_boot.bin": {"meta":{"size": "0xD0"}, "offsets": {"us":["0x0D9B70", "0x0"]}}, -"bin/lib/PR/f3d/F3DEX.bin": {"meta":{"size": "0x13E0"}, "offsets": {"us":["0x0D9C40", "0x0"]}}, -"bin/lib/PR/f3d/F3DLX.bin": {"meta":{"size": "0x1410"}, "offsets": {"us":["0x0DB020", "0x0"]}}, -"bin/lib/PR/audio/aspMain.bin": {"meta":{"size": "0xC70"}, "offsets": {"us":["0x0DC430", "0x0"]}}, -"bin/lib/PR/f3d/F3DEX_data.bin": {"meta":{"size": "0x800"}, "offsets": {"us":["0x0F4900", "0x0"]}}, -"bin/lib/PR/f3d/F3DLX_data.bin": {"meta":{"size": "0x800"}, "offsets": {"us":["0x0F5100", "0x0"]}}, -"bin/lib/PR/audio/aspMain_data.bin": {"meta":{"size": "0x300"}, "offsets": {"us":["0x0F5900", "0x0"]}}, -"bin/audiobanks.us.bin": {"meta":{"size": "0x13840"}, "offsets":{"us":["0x966260","0x0"],"eu-final":["0x966380","0x0"]}}, -"bin/audiobanks.eu.bin": {"meta":{"size": "0x13840"}, "offsets":{"eu-1.0":["0x966460","0x0"]}}, -"bin/audiotables.bin": {"meta":{"size": "0x24C4C0"}, "offsets":{"us":["0x979AA0","0x0"]}}, - -"music/00_seq_00.m64": {"meta":{"size":"0x2830"}, "offsets": {"us":["0xBC6060", "0x0"]}}, -"music/01_title_screen.m64": {"meta":{"size":"0x1B30"}, "offsets": {"us":["0xBC8890", "0x0"]}}, -"music/02_main_menu.m64": {"meta":{"size":"0x0D60"}, "offsets": {"us":["0xBCA3C0", "0x0"]}}, -"music/03_racways_wario_stadium.m64": {"meta":{"size":"0x1A10"}, "offsets": {"us":["0xBCB120", "0x0"]}}, -"music/04_moo_moo_fame_yoshi_valley.m64": {"meta":{"size":"0x1CA0"}, "offsets": {"us":["0xBCCB30", "0x0"]}}, -"music/05_choco_mountain.m64": {"meta":{"size":"0x1F70"}, "offsets": {"us":["0xBCE7D0", "0x0"]}}, -"music/06_koopa_troopa_beach.m64": {"meta":{"size":"0x1EE0"}, "offsets": {"us":["0xBD0740", "0x0"]}}, -"music/07_banshee_boardwalk.m64": {"meta":{"size":"0x16D0"}, "offsets": {"us":["0xBD2620", "0x0"]}}, -"music/08_seq_08.m64": {"meta":{"size":"0x23D0"}, "offsets": {"us":["0xBD3CF0", "0x0"]}}, -"music/09_seq_09.m64": {"meta":{"size":"0x1800"}, "offsets": {"us":["0xBD60C0", "0x0"]}}, -"music/10_kalimari_desert.m64": {"meta":{"size":"0x1AE0"}, "offsets": {"us":["0xBD78C0", "0x0"]}}, -"music/11_start_grid_gp_vs.m64": {"meta":{"size":"0x05F0"}, "offsets": {"us":["0xBD93A0", "0x0"]}}, -"music/12_final_lap_fanfare.m64": {"meta":{"size":"0x03D0"}, "offsets": {"us":["0xBD9990", "0x0"]}}, -"music/13_finish_1st_place.m64": {"meta":{"size":"0x0360"}, "offsets": {"us":["0xBD9D60", "0x0"]}}, -"music/14_finish_2nd_4th_place.m64": {"meta":{"size":"0x02E0"}, "offsets": {"us":["0xBDA0C0", "0x0"]}}, -"music/15_finish_5th_8th_place.m64": {"meta":{"size":"0x04C0"}, "offsets": {"us":["0xBDA3A0", "0x0"]}}, -"music/16_seq_10.m64": {"meta":{"size":"0x1410"}, "offsets": {"us":["0xBDA860", "0x0"]}}, -"music/17_star_jingle.m64": {"meta":{"size":"0x06E0"}, "offsets": {"us":["0xBDBC70", "0x0"]}}, -"music/18_rainbow_road.m64": {"meta":{"size":"0x32F0"}, "offsets": {"us":["0xBDC350", "0x0"]}}, -"music/19_maybe_boo_item.m64": {"meta":{"size":"0x06C0"}, "offsets": {"us":["0xBDF640", "0x0"]}}, -"music/20_game_over.m64": {"meta":{"size":"0x04B0"}, "offsets": {"us":["0xBDFD00", "0x0"]}}, -"music/21_toads_turnpike.m64": {"meta":{"size":"0x1160"}, "offsets": {"us":["0xBE01B0", "0x0"]}}, -"music/22_start_gird_time_attack.m64": {"meta":{"size":"0x0310"}, "offsets": {"us":["0xBE1310", "0x0"]}}, -"music/23_vs_battle_results.m64": {"meta":{"size":"0x12B0"}, "offsets": {"us":["0xBE1620", "0x0"]}}, -"music/24_losing_results.m64": {"meta":{"size":"0x0600"}, "offsets": {"us":["0xBE28D0", "0x0"]}}, -"music/25_battle_arenas.m64": {"meta":{"size":"0x16E0"}, "offsets": {"us":["0xBE2ED0", "0x0"]}}, -"music/26_award_ceremony_buildup.m64": {"meta":{"size":"0x0AD0"}, "offsets": {"us":["0xBE45B0", "0x0"]}}, -"music/27_award_ceremony_1st_3rd.m64": {"meta":{"size":"0x0C80"}, "offsets": {"us":["0xBE5080", "0x0"]}}, -"music/28_staff_roll.m64": {"meta":{"size":"0x2750"}, "offsets": {"us":["0xBE5D00", "0x0"]}}, -"music/29_award_ceremony_4th_8th.m64": {"meta":{"size":"0x0C80"}, "offsets": {"us":["0xBE8450", "0x0"]}}, - -"music/eu/00_seq_00.m64": {"meta":{"size":"0x2910"}, "offsets": {"eu-1.0":["0xBC6260", "0x0"],"eu-final":["0xBC6180", "0x0"]}}, -"music/eu/01_title_screen.m64": {"meta":{"size":"0x1B30"}, "offsets": {"eu-1.0":["0xBC8B70", "0x0"],"eu-final":["0xBC8A90", "0x0"]}}, -"music/eu/02_main_menu.m64": {"meta":{"size":"0x0D60"}, "offsets": {"eu-1.0":["0xBCA6A0", "0x0"],"eu-final":["0xBCA5C0", "0x0"]}}, -"music/eu/03_racways_wario_stadium.m64": {"meta":{"size":"0x1A10"}, "offsets": {"eu-1.0":["0xBCB400", "0x0"],"eu-final":["0xBCB320", "0x0"]}}, -"music/eu/04_moo_moo_fame_yoshi_valley.m64": {"meta":{"size":"0x1CA0"}, "offsets": {"eu-1.0":["0xBCCE10", "0x0"],"eu-final":["0xBCCC30", "0x0"]}}, -"music/eu/05_choco_mountain.m64": {"meta":{"size":"0x1F70"}, "offsets": {"eu-1.0":["0xBCEAB0", "0x0"],"eu-final":["0xBCE9D0", "0x0"]}}, -"music/eu/06_koopa_troopa_beach.m64": {"meta":{"size":"0x1EE0"}, "offsets": {"eu-1.0":["0xBD0A20", "0x0"],"eu-final":["0xBD0920", "0x0"]}}, -"music/eu/07_banshee_boardwalk.m64": {"meta":{"size":"0x16D0"}, "offsets": {"eu-1.0":["0xBD2900", "0x0"],"eu-final":["0xBD2800", "0x0"]}}, -"music/eu/08_seq_08.m64": {"meta":{"size":"0x23D0"}, "offsets": {"eu-1.0":["0xBD3FD0", "0x0"],"eu-final":["0xBD3E50", "0x0"]}}, -"music/eu/09_seq_09.m64": {"meta":{"size":"0x1800"}, "offsets": {"eu-1.0":["0xBD63A0", "0x0"],"eu-final":["0xBD6230", "0x0"]}}, -"music/eu/10_kalimari_desert.m64": {"meta":{"size":"0x1AE0"}, "offsets": {"eu-1.0":["0xBD7BA0", "0x0"],"eu-final":["0xBD7A20", "0x0"]}}, -"music/eu/11_start_grid_gp_vs.m64": {"meta":{"size":"0x05F0"}, "offsets": {"eu-1.0":["0xBD9680", "0x0"],"eu-final":["0xBD9500", "0x0"]}}, -"music/eu/12_final_lap_fanfare.m64": {"meta":{"size":"0x03D0"}, "offsets": {"eu-1.0":["0xBD9C70", "0x0"],"eu-final":["0xBD9AF0", "0x0"]}}, -"music/eu/13_finish_1st_place.m64": {"meta":{"size":"0x0360"}, "offsets": {"eu-1.0":["0xBDA040", "0x0"],"eu-final":["0xBD9DC0", "0x0"]}}, -"music/eu/14_finish_2nd_4th_place.m64": {"meta":{"size":"0x02E0"}, "offsets": {"eu-1.0":["0xBDA3A0", "0x0"],"eu-final":["0xBDA140", "0x0"]}}, -"music/eu/15_finish_5th_8th_place.m64": {"meta":{"size":"0x04C0"}, "offsets": {"eu-1.0":["0xBDA680", "0x0"],"eu-final":["0xBDA400", "0x0"]}}, -"music/eu/16_seq_10.m64": {"meta":{"size":"0x1410"}, "offsets": {"eu-1.0":["0xBDAB40", "0x0"],"eu-final":["0xBDAA60", "0x0"]}}, -"music/eu/17_star_jingle.m64": {"meta":{"size":"0x06E0"}, "offsets": {"eu-1.0":["0xBDBF50", "0x0"],"eu-final":["0xBDBE70", "0x0"]}}, -"music/eu/18_rainbow_road.m64": {"meta":{"size":"0x32F0"}, "offsets": {"eu-1.0":["0xBDC630", "0x0"],"eu-final":["0xBDC4D0", "0x0"]}}, -"music/eu/19_maybe_boo_item.m64": {"meta":{"size":"0x06C0"}, "offsets": {"eu-1.0":["0xBDF920", "0x0"],"eu-final":["0xBDF840", "0x0"]}}, -"music/eu/20_game_over.m64": {"meta":{"size":"0x04B0"}, "offsets": {"eu-1.0":["0xBDFFE0", "0x0"],"eu-final":["0xBDFF00", "0x0"]}}, -"music/eu/21_toads_turnpike.m64": {"meta":{"size":"0x1160"}, "offsets": {"eu-1.0":["0xBE0490", "0x0"],"eu-final":["0xBE0380", "0x0"]}}, -"music/eu/22_start_gird_time_attack.m64": {"meta":{"size":"0x0310"}, "offsets": {"eu-1.0":["0xBE15F0", "0x0"],"eu-final":["0xBE1500", "0x0"]}}, -"music/eu/23_vs_battle_results.m64": {"meta":{"size":"0x12B0"}, "offsets": {"eu-1.0":["0xBE1900", "0x0"],"eu-final":["0xBE17D0", "0x0"]}}, -"music/eu/24_losing_results.m64": {"meta":{"size":"0x0600"}, "offsets": {"eu-1.0":["0xBE2BB0", "0x0"],"eu-final":["0xBE2A90", "0x0"]}}, -"music/eu/25_battle_arenas.m64": {"meta":{"size":"0x16E0"}, "offsets": {"eu-1.0":["0xBE31B0", "0x0"],"eu-final":["0xBE30B0", "0x0"]}}, -"music/eu/26_award_ceremony_buildup.m64": {"meta":{"size":"0x0AD0"}, "offsets": {"eu-1.0":["0xBE4890", "0x0"],"eu-final":["0xBE4780", "0x0"]}}, -"music/eu/27_award_ceremony_1st_3rd.m64": {"meta":{"size":"0x0C80"}, "offsets": {"eu-1.0":["0xBE5360", "0x0"],"eu-final":["0xBE5260", "0x0"]}}, -"music/eu/28_staff_roll.m64": {"meta":{"size":"0x2750"}, "offsets": {"eu-1.0":["0xBE5FE0", "0x0"],"eu-final":["0xBE5EA0", "0x0"]}}, -"music/eu/29_award_ceremony_4th_8th.m64": {"meta":{"size":"0x0C80"}, "offsets": {"eu-1.0":["0xBE8730", "0x0"],"eu-final":["0xBE8680", "0x0"]}}, - -"bin/gTexturePlayerSelect.rgba16.tkmk00": {"meta":{"size":"0xC00"}, "offsets": {"us":["0x7FA3C0", "0x0"]}}, -"bin/gTextureOption.rgba16.tkmk00": {"meta":{"size":"0x900"}, "offsets": {"us":["0x7FAFC0", "0x0"]}}, - -"bin/gTextureNameDK.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x7FB8C0", "0x0"]}}, -"bin/gTextureNameToad.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x7FBAC0", "0x0"]}}, -"bin/gTextureNameBowser.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x7FBCC0", "0x0"]}}, -"bin/gTextureNameLuigi.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x7FBEC0", "0x0"]}}, -"bin/gTextureNameMario.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x7FC0C0", "0x0"]}}, -"bin/gTextureNamePeach.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x7FC2C0", "0x0"]}}, -"bin/gTextureNameWario.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x7FC4C0", "0x0"]}}, -"bin/gTextureNameYoshi.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x7FC6C0", "0x0"]}}, - -"bin/gTextureTitleMarioRaceway.rgba16.tkmk00": {"meta":{"size":"0x500"}, "offsets": {"us":["0x7FC8C0", "0x0"]}}, -"bin/gTextureTitleChocoMountain.rgba16.tkmk00": {"meta":{"size":"0x500"}, "offsets": {"us":["0x7FCDC0", "0x0"]}}, -"bin/gTextureTitleBowsersCastle.rgba16.tkmk00": {"meta":{"size":"0x500"}, "offsets": {"us":["0x7FD2C0", "0x0"]}}, -"bin/gTextureTitleBansheeBoardwalk.rgba16.tkmk00": {"meta":{"size":"0x600"}, "offsets": {"us":["0x7FD7C0", "0x0"]}}, -"bin/gTextureTitleYoshiValley.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x7FDDC0", "0x0"]}}, -"bin/gTextureTitleFrappeSnowland.rgba16.tkmk00": {"meta":{"size":"0x500"}, "offsets": {"us":["0x7FE1C0", "0x0"]}}, -"bin/gTextureTitleKoopaTroopaBeach.rgba16.tkmk00": {"meta":{"size":"0x500"}, "offsets": {"us":["0x7FE6C0", "0x0"]}}, -"bin/gTextureTitleRoyalRaceway.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x7FEBC0", "0x0"]}}, -"bin/gTextureTitleLuigiRaceway.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x7FEFC0", "0x0"]}}, -"bin/gTextureTitleMooMooFarm.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x7FF3C0", "0x0"]}}, -"bin/gTextureTitleToadsTurnpike.rgba16.tkmk00": {"meta":{"size":"0x500"}, "offsets": {"us":["0x7FF7C0", "0x0"]}}, -"bin/gTextureTitleKalimariDesert.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x7FFCC0", "0x0"]}}, -"bin/gTextureTitleSherbetLand.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x8000C0", "0x0"]}}, -"bin/gTextureTitleRainbowRoad.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x8004C0", "0x0"]}}, -"bin/gTextureTitleWarioStadium.rgba16.tkmk00": {"meta":{"size":"0x500"}, "offsets": {"us":["0x8008C0", "0x0"]}}, -"bin/gTextureTitleBlockFort.rgba16.tkmk00": {"meta":{"size":"0x300"}, "offsets": {"us":["0x800DC0", "0x0"]}}, -"bin/gTextureTitleSkyscraper.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x8010C0", "0x0"]}}, -"bin/gTextureTitleDoubleDeck.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x8014C0", "0x0"]}}, -"bin/gTextureTitleDKsJungleParkway.rgba16.tkmk00": {"meta":{"size":"0x600"}, "offsets": {"us":["0x8018C0", "0x0"]}}, -"bin/gTextureTitleBigDonut.rgba16.tkmk00": {"meta":{"size":"0x300"}, "offsets": {"us":["0x801EC0", "0x0"]}}, - -"bin/gTextureMapSelect.rgba16.tkmk00": {"meta":{"size":"0xC00"}, "offsets": {"us":["0x8021C0", "0x0"]}}, - -"bin/gTextureMenuFlowerCup.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x802DC0", "0x0"]}}, -"bin/gTextureMenuMushroomCup.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x8031C0", "0x0"]}}, -"bin/gTextureMenuStarCup.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x8035C0", "0x0"]}}, -"bin/gTextureMenuSpecialCup.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x8039C0", "0x0"]}}, - -"bin/gTextureGameSelect.rgba16.tkmk00": {"meta":{"size":"0xC00"}, "offsets": {"us":["0x803DC0", "0x0"]}}, - -"bin/gTextureMenu1PGame.rgba16.tkmk00": {"meta":{"size":"0x500"}, "offsets": {"us":["0x8049C0", "0x0"]}}, -"bin/gTextureMenu2PGame.rgba16.tkmk00": {"meta":{"size":"0x700"}, "offsets": {"us":["0x804EC0", "0x0"]}}, -"bin/gTextureMenu3PGame.rgba16.tkmk00": {"meta":{"size":"0xA00"}, "offsets": {"us":["0x8055C0", "0x0"]}}, -"bin/gTextureMenu4PGame.rgba16.tkmk00": {"meta":{"size":"0xB00"}, "offsets": {"us":["0x805FC0", "0x0"]}}, - -"bin/gTextureMenuModeBattle.rgba16.tkmk00": {"meta":{"size":"0x300"}, "offsets": {"us":["0x806AC0", "0x0"]}}, -"bin/gTextureMenuModeTimeTrials.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x806DC0", "0x0"]}}, -"bin/gTextureMenuModeMarioGP.rgba16.tkmk00": {"meta":{"size":"0x400"}, "offsets": {"us":["0x8071C0", "0x0"]}}, -"bin/gTextureMenuModeVS.rgba16.tkmk00": {"meta":{"size":"0x300"}, "offsets": {"us":["0x8075C0", "0x0"]}}, - -"bin/gTextureMenuLOption.rgba16.tkmk00": {"meta":{"size":"0x300"}, "offsets": {"us":["0x8078C0", "0x0"]}}, -"bin/gTextureMenuRData.rgba16.tkmk00": {"meta":{"size":"0x300"}, "offsets": {"us":["0x807BC0", "0x0"]}}, - -"bin/gTextureMenu50cc.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x807EC0", "0x0"]}}, -"bin/gTextureMenu100cc.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x8080C0", "0x0"]}}, -"bin/gTextureMenu150cc.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x8082C0", "0x0"]}}, -"bin/gTextureMenuExtra.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x8084C0", "0x0"]}}, -"bin/gTextureMenuWithoutItem.rgba16.tkmk00": {"meta":{"size":"0x300"}, "offsets": {"us":["0x8086C0", "0x0"]}}, -"bin/gTextureMenuWithItem.rgba16.tkmk00": {"meta":{"size":"0x300"}, "offsets": {"us":["0x8089C0", "0x0"]}}, -"bin/gTextureMenuBegin.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x808CC0", "0x0"]}}, -"bin/gTextureMenuGhost.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x808EC0", "0x0"]}}, -"bin/gTextureMenuData.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x8090C0", "0x0"]}}, -"bin/gTextureMenuOK.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x8092C0", "0x0"]}}, - -"bin/gTextureBackgroundBlueSky.rgba16.tkmk00": {"meta":{"size":"0xCE00"}, "offsets": {"us":["0x8094C0", "0x0"]}}, -"bin/gTextureBackgroundSunset.rgba16.tkmk00": {"meta":{"size":"0x9400"}, "offsets": {"us":["0x8162C0", "0x0"]}}, - -"bin/gTextureGreenGoldStripe.rgba16.tkmk00": {"meta":{"size":"0xC00"}, "offsets": {"us":["0x81F6C0", "0x0"]}}, -"bin/gTextureGoldStripe.rgba16.tkmk00": {"meta":{"size":"0x700"}, "offsets": {"us":["0x8202C0", "0x0"]}}, -"bin/gTextureWhiteStripe.rgba16.tkmk00": {"meta":{"size":"0x100"}, "offsets": {"us":["0x8209C0", "0x0"]}}, -"bin/gTexturePinkBar.rgba16.tkmk00": {"meta":{"size":"0x500"}, "offsets": {"us":["0x820AC0", "0x0"]}}, -"bin/gTextureGoldBar.rgba16.tkmk00": {"meta":{"size":"0xD50"}, "offsets": {"us":["0x820FC0", "0x0"]}}, - -"textures/common/common_texture_particle_fire.rgba16.png": {"meta":{"dims":[32,64]}, "offsets":{"us":["0x132B50","0x200"]}}, -"textures/common/common_texture_item_box_question_mark.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x132B50", "0x01EE8"]}}, -"textures/common/common_texture_banana.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x03348"]}}, -"textures/common/common_texture_flat_banana.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x132B50", "0x03B48"]}}, -"textures/common/132B50_06A58.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x06A58"]}}, -"textures/common/132B50_06AD8.ia8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x06AD8"]}}, -"textures/common/common_texture_speedometer.i4.png": {"meta":{"dims":[64,96]}, "offsets": {"us":["0x132B50", "0x09958"]}}, -"textures/common/common_texture_speedometer_needle.i4.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x132B50", "0x0A558"]}}, -"textures/common/common_texture_hud_lap.rgba16.png": {"meta":{"dims":[32,8]}, "offsets": {"us":["0x132B50", "0x0A958"]}}, -"textures/common/common_texture_hud_123.rgba16.png": {"meta":{"dims":[32,8]}, "offsets": {"us":["0x132B50", "0x0AB58"]}}, -"textures/common/common_texture_hud_lap_time.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0AD58"]}}, -"textures/common/common_texture_hud_lap_1_on_3.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0B158"]}}, -"textures/common/common_texture_hud_lap_2_on_3.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0B558"]}}, -"textures/common/common_texture_hud_lap_3_on_3.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0B958"]}}, -"textures/common/common_texture_hud_total_time.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0BD58"]}}, -"textures/common/common_texture_hud_time.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0C158"]}}, -"textures/common/common_texture_hud_normal_digit.rgba16.png": {"meta":{"dims":[104,16]}, "offsets": {"us":["0x132B50", "0x0C558"]}}, -"textures/common/common_texture_hud_1st.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x0D258"]}}, -"textures/common/common_texture_hud_2nd.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x0E258"]}}, -"textures/common/common_texture_hud_3rd.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x0F258"]}}, -"textures/common/common_texture_hud_4th.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x10258"]}}, -"textures/common/common_texture_hud_5th.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x11258"]}}, -"textures/common/common_texture_hud_6th.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x12258"]}}, -"textures/common/common_texture_hud_7th.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x13258"]}}, -"textures/common/common_texture_hud_8th.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x14258"]}}, -"textures/common/132B50_15258.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x132B50", "0x15258"]}}, -"textures/common/132B50_15A58.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x132B50", "0x15A58"]}}, -"textures/common/132B50_16258.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x132B50", "0x16258"]}}, -"textures/common/132B50_16A58.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x132B50", "0x16A58"]}}, - -"textures/common/common_texture_particle_leaf.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x28DD8"]}}, -"textures/common/common_texture_unused_particle_leaf.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x291D8"]}}, - -"textures/common/132B50_293D8.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x293D8"]}}, -"textures/common/132B50_29458.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x29458"]}}, - -"textures/common/132B50_2AA58.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x2AA58"]}}, -"textures/common/common_texture_particle_spark_1.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2AC58"]}}, -"textures/common/common_texture_particle_spark_2.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2B058"]}}, -"textures/common/common_texture_particle_spark_3.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2B458"]}}, -"textures/common/common_texture_particle_spark_4.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2B858"]}}, -"textures/common/common_texture_particle_smoke_1.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2BC58"]}}, -"textures/common/common_texture_particle_smoke_2.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2C058"]}}, -"textures/common/common_texture_particle_smoke_3.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2C458"]}}, -"textures/common/common_texture_particle_smoke_4.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2C858"]}}, - -"textures/standalone/sign_shell_shot_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x641F70", "0x00000"]}}, -"textures/standalone/sign_shell_shot_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x6422FC", "0x00000"]}}, -"textures/standalone/gray_checkerboard.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x642544", "0x00000"]}}, -"textures/standalone/gray_cobblestone.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x642650", "0x00000"]}}, -"textures/standalone/texture_64275C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64275C", "0x00000"]}}, -"textures/standalone/texture_64286C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64286C", "0x00000"]}}, -"textures/standalone/texture_642978.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x642978", "0x00000"]}}, -"textures/standalone/sign_blue_64.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x642A88", "0x00000"]}}, -"textures/standalone/checkerboard_yellow_pink.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x642FF0", "0x00000"]}}, -"textures/standalone/texture_64313C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64313C", "0x00000"]}}, -"textures/standalone/checkerbord_yellow_blue.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6432F4", "0x00000"]}}, -"textures/standalone/texture_643430.ia16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x643430", "0x00000"]}}, -"textures/standalone/texture_643A34.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x643A34", "0x00000"]}}, -"textures/standalone/texture_643B3C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x643B3C", "0x00000"]}}, -"textures/standalone/texture_6442D4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6442D4", "0x00000"]}}, -"textures/standalone/texture_64440C.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x64440C", "0x00000"]}}, -"textures/standalone/texture_6446AC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6446AC", "0x00000"]}}, -"textures/standalone/texture_6447C4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6447C4", "0x00000"]}}, -"textures/standalone/checkerboard_black_white.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6448CC", "0x00000"]}}, -"textures/standalone/texture_6449D4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6449D4", "0x00000"]}}, -"textures/standalone/texture_645134.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x645134", "0x00000"]}}, -"textures/standalone/texture_645660.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x645660", "0x00000"]}}, -"textures/standalone/texture_6457D8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6457D8", "0x00000"]}}, -"textures/standalone/checkerboard_blue_green.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x645938", "0x00000"]}}, -"textures/standalone/number_yellow_blue_1.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x645A74", "0x00000"]}}, -"textures/standalone/number_yellow_blue_2.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x645C24", "0x00000"]}}, -"textures/standalone/number_yellow_blue_3.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x645DEC", "0x00000"]}}, -"textures/standalone/number_yellow_blue_4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x645FB8", "0x00000"]}}, -"textures/standalone/texture_64619C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64619C", "0x00000"]}}, -"textures/standalone/texture_6462C0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6462C0", "0x00000"]}}, -"textures/standalone/texture_64647C.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x64647C", "0x00000"]}}, -"textures/standalone/texture_646CA8.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x646CA8", "0x00000"]}}, -"textures/standalone/texture_6473E4.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x6473E4", "0x00000"]}}, -"textures/standalone/texture_647994.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x647994", "0x00000"]}}, -"textures/standalone/texture_647F4C.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x647F4C", "0x00000"]}}, -"textures/standalone/texture_648508.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x648508", "0x00000"]}}, -"textures/standalone/grass_1.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x648708", "0x00000"]}}, -"textures/standalone/wood_door_0.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x648830", "0x00000"]}}, -"textures/standalone/wood_door_1.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x648AC4", "0x00000"]}}, -"textures/standalone/grass_2.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6493C8", "0x00000"]}}, -"textures/standalone/texture_64ACAC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64ACAC", "0x00000"]}}, -"textures/standalone/texture_64AF50.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64AF50", "0x00000"]}}, -"textures/standalone/texture_64B090.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64B090", "0x00000"]}}, -"textures/standalone/texture_64B3F8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64B3F8", "0x00000"]}}, -"textures/standalone/texture_64B54C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64B54C", "0x00000"]}}, -"textures/standalone/texture_64B8D8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64B8D8", "0x00000"]}}, -"textures/standalone/texture_64BA50.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64BA50", "0x00000"]}}, -"textures/standalone/texture_64BB60.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64BB60", "0x00000"]}}, -"textures/standalone/texture_64BCCC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64BCCC", "0x00000"]}}, -"textures/standalone/texture_64C11C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64C11C", "0x00000"]}}, -"textures/standalone/texture_64C7B4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64C7B4", "0x00000"]}}, -"textures/standalone/texture_64CC20.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x64CC20", "0x00000"]}}, -"textures/standalone/sign_merging_lanes.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64DAE4", "0x00000"]}}, -"textures/standalone/grass_3.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64DBFC", "0x00000"]}}, -"textures/standalone/grass_4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64DF70", "0x00000"]}}, -"textures/standalone/grass_5.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64E534", "0x00000"]}}, -"textures/standalone/grass_6.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64E774", "0x00000"]}}, -"textures/standalone/sign_nintendo_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x64E9B0", "0x00000"]}}, -"textures/standalone/sign_nintendo_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x64EEF4", "0x00000"]}}, -"textures/standalone/grass_7.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64F408", "0x00000"]}}, -"textures/standalone/texture_64F9E8.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x64F9E8", "0x00000"]}}, -"textures/standalone/texture_64FBF4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x64FBF4", "0x00000"]}}, -"textures/standalone/texture_64FE68.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x64FE68", "0x00000"]}}, -"textures/standalone/wood_bridge_slats.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x6500C0", "0x00000"]}}, -"textures/standalone/flag_red.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x650E6C", "0x00000"]}}, -"textures/standalone/texture_65100C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x65100C", "0x00000"]}}, -"textures/standalone/texture_65112C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x65112C", "0x00000"]}}, -"textures/standalone/texture_65127C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x65127C", "0x00000"]}}, -"textures/standalone/texture_651428.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x651428", "0x00000"]}}, -"textures/standalone/texture_651984.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x651984", "0x00000"]}}, -"textures/standalone/texture_651B20.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x651B20", "0x00000"]}}, -"textures/standalone/texture_651F40.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x651F40", "0x00000"]}}, -"textures/standalone/texture_6522E0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6522E0", "0x00000"]}}, -"textures/standalone/texture_6528DC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6528DC", "0x00000"]}}, -"textures/standalone/texture_652B54.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x652B54", "0x00000"]}}, -"textures/standalone/texture_65315C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x65315C", "0x00000"]}}, -"textures/standalone/texture_653608.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x653608", "0x00000"]}}, -"textures/standalone/texture_653DB0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x653DB0", "0x00000"]}}, -"textures/standalone/texture_654460.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x654460", "0x00000"]}}, -"textures/standalone/texture_654F74.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x654F74", "0x00000"]}}, -"textures/standalone/texture_655998.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x655998", "0x00000"]}}, -"textures/standalone/texture_655F38.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x655F38", "0x00000"]}}, -"textures/standalone/texture_656AF4.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x656AF4", "0x00000"]}}, -"textures/standalone/texture_6575C8.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x6575C8", "0x00000"]}}, -"textures/standalone/texture_658370.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x658370", "0x00000"]}}, -"textures/standalone/texture_65912C.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x65912C", "0x00000"]}}, -"textures/standalone/texture_659EE8.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x659EE8", "0x00000"]}}, -"textures/standalone/texture_65ADE0.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x65ADE0", "0x00000"]}}, -"textures/standalone/texture_65BB3C.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x65BB3C", "0x00000"]}}, -"textures/standalone/texture_65C8DC.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x65C8DC", "0x00000"]}}, -"textures/standalone/texture_65D5D4.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x65D5D4", "0x00000"]}}, -"textures/standalone/texture_65E2EC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x65E2EC", "0x00000"]}}, -"textures/standalone/texture_65E59C.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x65E59C", "0x00000"]}}, -"textures/standalone/texture_65EAEC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x65EAEC", "0x00000"]}}, -"textures/standalone/texture_65EE38.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x65EE38", "0x00000"]}}, -"textures/standalone/texture_65FB18.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x65FB18", "0x00000"]}}, -"textures/standalone/sign_pink_arrow.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x65FF08", "0x00000"]}}, -"textures/standalone/crown_jewel_blue.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6600A0", "0x00000"]}}, -"textures/standalone/crown.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6603A4", "0x00000"]}}, -"textures/standalone/crown_jewel_pink.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6604AC", "0x00000"]}}, -"textures/standalone/texture_6607C0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6607C0", "0x00000"]}}, -"textures/standalone/texture_6608C8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6608C8", "0x00000"]}}, -"textures/standalone/texture_6609D0.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x6609D0", "0x00000"]}}, -"textures/standalone/texture_660D8C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x660D8C", "0x00000"]}}, -"textures/standalone/roof_tile.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x660EB4", "0x00000"]}}, -"textures/standalone/castle_bricks.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x660FE0", "0x00000"]}}, -"textures/standalone/castle_bridge.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x661B14", "0x00000"]}}, -"textures/standalone/grass_8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x661F3C", "0x00000"]}}, -"textures/standalone/grass_9.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x662208", "0x00000"]}}, -"textures/standalone/texture_66262C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66262C", "0x00000"]}}, -"textures/standalone/texture_662924.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x662924", "0x00000"]}}, -"textures/standalone/texture_662A34.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x662A34", "0x00000"]}}, -"textures/standalone/sign_toad_yellow.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x662B3C", "0x00000"]}}, -"textures/standalone/sign_toad_green.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x663260", "0x00000"]}}, -"textures/standalone/sign_toad_red.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x663980", "0x00000"]}}, -"textures/standalone/texture_663F90.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x663F90", "0x00000"]}}, -"textures/standalone/texture_6640B4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6640B4", "0x00000"]}}, -"textures/standalone/texture_6642A4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6642A4", "0x00000"]}}, -"textures/standalone/texture_664408.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x664408", "0x00000"]}}, -"textures/standalone/texture_6646B8.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x6646B8", "0x00000"]}}, -"textures/standalone/sign_koopa_air_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x664950", "0x00000"]}}, -"textures/standalone/sign_koopa_air_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x664CB0", "0x00000"]}}, -"textures/standalone/bricks_red.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x664FB4", "0x00000"]}}, -"textures/standalone/texture_665C0C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x665C0C", "0x00000"]}}, -"textures/standalone/texture_6661AC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6661AC", "0x00000"]}}, -"textures/standalone/texture_6663A4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6663A4", "0x00000"]}}, -"textures/standalone/sign_bowser_0.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x66699C", "0x00000"]}}, -"textures/standalone/sign_bowser_1.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x66716C", "0x00000"]}}, -"textures/standalone/grass_10.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6677BC", "0x00000"]}}, -"textures/standalone/grass_11.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6679B4", "0x00000"]}}, -"textures/standalone/texture_667BAC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x667BAC", "0x00000"]}}, -"textures/standalone/texture_668228.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x668228", "0x00000"]}}, -"textures/standalone/texture_668358.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x668358", "0x00000"]}}, -"textures/standalone/texture_6684F8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6684F8", "0x00000"]}}, -"textures/standalone/texture_668608.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x668608", "0x00000"]}}, -"textures/standalone/texture_668728.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x668728", "0x00000"]}}, -"textures/standalone/texture_668920.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x668920", "0x00000"]}}, -"textures/standalone/grass_12.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x668CFC", "0x00000"]}}, -"textures/standalone/texture_669570.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x669570", "0x00000"]}}, -"textures/standalone/texture_66A3DC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66A3DC", "0x00000"]}}, -"textures/standalone/texture_66ABA4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66ABA4", "0x00000"]}}, -"textures/standalone/texture_66AEB8.ia16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66AEB8", "0x00000"]}}, -"textures/standalone/sign_luigi_face_0.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x66B0BC", "0x00000"]}}, -"textures/standalone/sign_luigi_face_1.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x66B688", "0x00000"]}}, -"textures/standalone/sign_luigis_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x66BCE8", "0x00000"]}}, -"textures/standalone/sign_luigis_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x66BF70", "0x00000"]}}, -"textures/standalone/sign_mario_star_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x66C220", "0x00000"]}}, -"textures/standalone/sign_mario_star_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x66C4F4", "0x00000"]}}, -"textures/standalone/texture_66C7A8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66C7A8", "0x00000"]}}, -"textures/standalone/texture_66C8F4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66C8F4", "0x00000"]}}, -"textures/standalone/texture_66CA98.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66CA98", "0x00000"]}}, -"textures/standalone/texture_66CD64.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66CD64", "0x00000"]}}, -"textures/standalone/texture_66D024.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66D024", "0x00000"]}}, -"textures/standalone/flag_red_2.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66D510", "0x00000"]}}, -"textures/standalone/texture_66D698.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66D698", "0x00000"]}}, -"textures/standalone/checkerboard_pink.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66DA08", "0x00000"]}}, -"textures/standalone/texture_66DB60.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66DB60", "0x00000"]}}, -"textures/standalone/texture_66DD38.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x66DD38", "0x00000"]}}, -"textures/standalone/sign_nintendo_red_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x66E068", "0x00000"]}}, -"textures/standalone/sign_nintendo_red_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x66E310", "0x00000"]}}, -"textures/standalone/texture_66E608.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66E608", "0x00000"]}}, -"textures/standalone/texture_66EBF0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66EBF0", "0x00000"]}}, -"textures/standalone/texture_66ED38.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x66ED38", "0x00000"]}}, -"textures/standalone/stainglass_peach_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x66EE48", "0x00000"]}}, -"textures/standalone/stainglass_peach_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x66FD1C", "0x00000"]}}, -"textures/standalone/texture_670AC8.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x670AC8", "0x00000"]}}, -"textures/standalone/texture_671A88.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x671A88", "0x00000"]}}, -"textures/standalone/railroad_track.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x671BB8", "0x00000"]}}, -"textures/standalone/railroad_crossing_track.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x672714", "0x00000"]}}, -"textures/standalone/texture_67291C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67291C", "0x00000"]}}, -"textures/standalone/rainbow.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x672EB8", "0x00000"]}}, -"textures/standalone/texture_673118.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x673118", "0x00000"]}}, -"textures/standalone/texture_6733CC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6733CC", "0x00000"]}}, -"textures/standalone/texture_6735DC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6735DC", "0x00000"]}}, -"textures/standalone/texture_673990.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x673990", "0x00000"]}}, -"textures/standalone/texture_673C68.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x673C68", "0x00000"]}}, -"textures/standalone/texture_673FF8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x673FF8", "0x00000"]}}, -"textures/standalone/texture_674354.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x674354", "0x00000"]}}, -"textures/standalone/texture_6747C4.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6747C4", "0x00000"]}}, -"textures/standalone/texture_67490C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67490C", "0x00000"]}}, -"textures/standalone/texture_674B28.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x674B28", "0x00000"]}}, -"textures/standalone/texture_674D58.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x674D58", "0x00000"]}}, -"textures/standalone/texture_675064.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x675064", "0x00000"]}}, -"textures/standalone/texture_675220.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x675220", "0x00000"]}}, -"textures/standalone/texture_675434.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x675434", "0x00000"]}}, -"textures/standalone/road_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x67567C", "0x00000"]}}, -"textures/standalone/road_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x67597C", "0x00000"]}}, -"textures/standalone/road_2.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x675C50", "0x00000"]}}, -"textures/standalone/road_3.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x675F00", "0x00000"]}}, -"textures/standalone/road_4.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x676188", "0x00000"]}}, -"textures/standalone/road_5.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x67640C", "0x00000"]}}, -"textures/standalone/road_finish_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x6766C8", "0x00000"]}}, -"textures/standalone/road_finish_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x676A00", "0x00000"]}}, -"textures/standalone/texture_676C6C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x676C6C", "0x00000"]}}, -"textures/standalone/texture_676D7C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x676D7C", "0x00000"]}}, -"textures/standalone/texture_676EA8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x676EA8", "0x00000"]}}, -"textures/standalone/texture_676FB0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x676FB0", "0x00000"]}}, -"textures/standalone/texture_6774D8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6774D8", "0x00000"]}}, -"textures/standalone/texture_6775EC.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x6775EC", "0x00000"]}}, -"textures/standalone/fence_barbed_wire.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x677820", "0x00000"]}}, -"textures/standalone/texture_677A40.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x677A40", "0x00000"]}}, -"textures/standalone/sign_falling_rocks.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x677CB8", "0x00000"]}}, -"textures/standalone/sign_backside.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x677DE4", "0x00000"]}}, -"textures/standalone/texture_677F04.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x677F04", "0x00000"]}}, -"textures/standalone/texture_678118.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x678118", "0x00000"]}}, -"textures/standalone/texture_67842C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67842C", "0x00000"]}}, -"textures/standalone/texture_67893C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67893C", "0x00000"]}}, -"textures/standalone/texture_678CC8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x678CC8", "0x00000"]}}, -"textures/standalone/texture_679258.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x679258", "0x00000"]}}, -"textures/standalone/texture_67973C.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x67973C", "0x00000"]}}, -"textures/standalone/texture_679C04.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x679C04", "0x00000"]}}, -"textures/standalone/texture_679D34.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x679D34", "0x00000"]}}, -"textures/standalone/star_outline.ia16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x679E3C", "0x00000"]}}, -"textures/standalone/texture_67A1B8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67A1B8", "0x00000"]}}, -"textures/standalone/texture_67A370.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67A370", "0x00000"]}}, -"textures/standalone/texture_67A91C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67A91C", "0x00000"]}}, -"textures/standalone/texture_67ADF0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67ADF0", "0x00000"]}}, -"textures/standalone/texture_67B388.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67B388", "0x00000"]}}, -"textures/standalone/texture_67B75C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67B75C", "0x00000"]}}, -"textures/standalone/texture_67B864.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67B864", "0x00000"]}}, -"textures/standalone/texture_67B9B0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67B9B0", "0x00000"]}}, -"textures/standalone/texture_67BBD8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67BBD8", "0x00000"]}}, -"textures/standalone/texture_67BEE8.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67BEE8", "0x00000"]}}, -"textures/standalone/sand_finish.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67C1B8", "0x00000"]}}, -"textures/standalone/waves_0.ia16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67C3E8", "0x00000"]}}, -"textures/standalone/waves_1.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67C8B8", "0x00000"]}}, -"textures/standalone/waves_2.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67CE7C", "0x00000"]}}, -"textures/standalone/texture_67D304.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x67D304", "0x00000"]}}, -"textures/standalone/texture_67DC20.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67DC20", "0x00000"]}}, -"textures/standalone/texture_67E010.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67E010", "0x00000"]}}, -"textures/standalone/texture_67E428.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x67E428", "0x00000"]}}, -"textures/standalone/texture_67EEAC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67EEAC", "0x00000"]}}, -"textures/standalone/texture_67EFEC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67EFEC", "0x00000"]}}, -"textures/standalone/texture_67F15C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67F15C", "0x00000"]}}, -"textures/standalone/texture_67F450.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67F450", "0x00000"]}}, -"textures/standalone/sign_wario_face.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x67F5E4", "0x00000"]}}, -"textures/standalone/texture_67FE0C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x67FE0C", "0x00000"]}}, -"textures/standalone/sign_welcome_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x6800EC", "0x00000"]}}, -"textures/standalone/sign_welcome_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x680B1C", "0x00000"]}}, -"textures/standalone/sign_wooden_back_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x681528", "0x00000"]}}, -"textures/standalone/sign_wooden_back_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x681C18", "0x00000"]}}, -"textures/standalone/wheel_steam_engine.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6822EC", "0x00000"]}}, -"textures/standalone/wheel_steam_engine_real.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x6824FC", "0x00000"]}}, -"textures/standalone/texture_68272C.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x68272C", "0x00000"]}}, -"textures/standalone/texture_682928.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x682928", "0x00000"]}}, -"textures/standalone/texture_682B24.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x682B24", "0x00000"]}}, -"textures/standalone/texture_682D20.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x682D20", "0x00000"]}}, -"textures/standalone/texture_682F1C.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x682F1C", "0x00000"]}}, -"textures/standalone/texture_683118.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x683118", "0x00000"]}}, -"textures/standalone/texture_683314.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x683314", "0x00000"]}}, -"textures/standalone/texture_6835F0.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x6835F0", "0x00000"]}}, -"textures/standalone/texture_683844.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x683844", "0x00000"]}}, -"textures/standalone/fence_post_wooden.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x683E9C", "0x00000"]}}, -"textures/standalone/texture_6846DC.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6846DC", "0x00000"]}}, -"textures/standalone/fence_rope.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x684BC8", "0x00000"]}}, -"textures/standalone/texture_685108.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x685108", "0x00000"]}}, -"textures/standalone/sign_wood_red_arrow.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x6855DC", "0x00000"]}}, -"textures/standalone/texture_685AC0.ia16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x685AC0", "0x00000"]}}, -"textures/standalone/sign_green_arrow.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x68628C", "0x00000"]}}, -"textures/standalone/texture_6864E8.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x6864E8", "0x00000"]}}, -"textures/standalone/texture_686CF0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x686CF0", "0x00000"]}}, -"textures/standalone/texture_6875A8.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x6875A8", "0x00000"]}}, -"textures/standalone/texture_687EE8.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x687EE8", "0x00000"]}}, -"textures/standalone/texture_68876C.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x68876C", "0x00000"]}}, -"textures/standalone/texture_689230.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x689230", "0x00000"]}}, -"textures/standalone/texture_689C00.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x689C00", "0x00000"]}}, -"textures/standalone/texture_68A484.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x68A484", "0x00000"]}}, -"textures/standalone/texture_68AC5C.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x68AC5C", "0x00000"]}}, -"textures/standalone/texture_68B6A4.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x68B6A4", "0x00000"]}}, -"textures/standalone/texture_68BE6C.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x68BE6C", "0x00000"]}}, -"textures/standalone/texture_68C310.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x68C310", "0x00000"]}}, -"textures/standalone/texture_68C620.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x68C620", "0x00000"]}}, -"textures/standalone/texture_68C79C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x68C79C", "0x00000"]}}, -"textures/standalone/texture_68C944.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x68C944", "0x00000"]}}, -"textures/standalone/texture_68CA94.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x68CA94", "0x00000"]}}, -"textures/standalone/texture_68CC0C.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x68CC0C", "0x00000"]}}, -"textures/standalone/texture_68CDA0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x68CDA0", "0x00000"]}}, -"textures/standalone/sign_yoshi.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x68CEB0", "0x00000"]}}, -"textures/standalone/checkerboard_blue_gray.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x68D390", "0x00000"]}}, -"textures/standalone/texture_68D834.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x68D834", "0x00000"]}}, -"textures/standalone/texture_68D940.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x68D940", "0x00000"]}}, -"textures/standalone/texture_68DEC0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x68DEC0", "0x00000"]}}, -"textures/standalone/texture_68E2D0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x68E2D0", "0x00000"]}}, - -"textures/standalone/question_mark_yellow.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x691030", "0x00000"]}}, - -"textures/standalone/shrub.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x692F3C", "0x00000"]}}, - -"textures/standalone/texture_6997E0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6997E0", "0x00000"]}}, - -"textures/standalone/kart_shadow.i8.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69A830", "0x00000"]}}, -"textures/standalone/texture_69B03C.i8.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x69B03C", "0x00000"]}}, -"textures/standalone/texture_69B140.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x69B140", "0x00000"]}}, -"textures/standalone/texture_69B378.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x69B378", "0x00000"]}}, -"textures/standalone/texture_69B960.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x69B960", "0x00000"]}}, -"textures/standalone/texture_69BA28.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x69BA28", "0x00000"]}}, -"textures/standalone/boing_exclamation.ia8.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x69BB18", "0x00000"]}}, -"textures/standalone/texture_69BE6C.ia16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x69BE6C", "0x00000"]}}, -"textures/standalone/texture_69BF54.ia16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x69BF54", "0x00000"]}}, -"textures/standalone/texture_69C090.ia16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x69C090", "0x00000"]}}, -"textures/standalone/texture_69C1E8.ia16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x69C1E8", "0x00000"]}}, -"textures/standalone/texture_69C354.ia8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x69C354", "0x00000"]}}, -"textures/standalone/texture_69C4E4.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x69C4E4", "0x00000"]}}, -"textures/standalone/texture_69C80C.ia8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x69C80C", "0x00000"]}}, -"textures/standalone/texture_69C9C4.ia16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x69C9C4", "0x00000"]}}, -"textures/standalone/texture_69CB84.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69CB84", "0x00000"]}}, -"textures/standalone/texture_69CCEC.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69CCEC", "0x00000"]}}, -"textures/standalone/texture_69CEB8.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69CEB8", "0x00000"]}}, -"textures/standalone/texture_69D148.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69D148", "0x00000"]}}, -"textures/standalone/texture_69D4E0.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69D4E0", "0x00000"]}}, -"textures/standalone/texture_69D8FC.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69D8FC", "0x00000"]}}, -"textures/standalone/texture_69DCB4.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69DCB4", "0x00000"]}}, -"textures/standalone/texture_69DFA0.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69DFA0", "0x00000"]}}, -"textures/standalone/texture_69E25C.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69E25C", "0x00000"]}}, -"textures/standalone/texture_69E518.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69E518", "0x00000"]}}, -"textures/standalone/texture_69E7A8.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69E7A8", "0x00000"]}}, -"textures/standalone/texture_69EA18.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69EA18", "0x00000"]}}, -"textures/standalone/texture_69EC54.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69EC54", "0x00000"]}}, -"textures/standalone/texture_69EE38.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69EE38", "0x00000"]}}, -"textures/standalone/texture_69EFE0.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x69EFE0", "0x00000"]}}, - -"textures/standalone/lightning_zap_0.ia8.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x6A04E4", "0x00000"]}}, -"textures/standalone/lightning_zap_1.ia8.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x6A0798", "0x00000"]}}, - -"textures/standalone/exhaust_0.ia8.png": {"meta":{"dims":[32,96]}, "offsets": {"us":["0x717A84", "0x00000"]}}, -"textures/standalone/exhaust_1.ia8.png": {"meta":{"dims":[32,96]}, "offsets": {"us":["0x717F00", "0x00000"]}}, -"textures/standalone/exhaust_2.ia8.png": {"meta":{"dims":[32,96]}, "offsets": {"us":["0x718388", "0x00000"]}}, -"textures/standalone/exhaust_3.ia8.png": {"meta":{"dims":[32,128]}, "offsets": {"us":["0x71887C", "0x00000"]}}, -"textures/standalone/exhaust_4.ia8.png": {"meta":{"dims":[32,128]}, "offsets": {"us":["0x718C44", "0x00000"]}}, -"textures/standalone/exhaust_5.ia8.png": {"meta":{"dims":[32,128]}, "offsets": {"us":["0x71903C", "0x00000"]}}, -"textures/standalone/logo_mario_kart_64.rgba32.png": {"meta":{"dims":[256,128]}, "offsets": {"us":["0x719480", "0x00000"]}}, - -"textures/standalone/trophy_gold.rgba16.png": {"meta":{"dims":[45,45]}, "offsets": {"us":["0x7D83E8", "0x00000"]}}, -"textures/standalone/trophy_silver.rgba16.png": {"meta":{"dims":[45,45]}, "offsets": {"us":["0x7D8A1C", "0x00000"]}}, -"textures/standalone/trophy_bronze.rgba16.png": {"meta":{"dims":[45,45]}, "offsets": {"us":["0x7D9044", "0x00000"]}}, -"textures/standalone/cup_gold.rgba16.png": {"meta":{"dims":[45,45]}, "offsets": {"us":["0x7D9630", "0x00000"]}}, -"textures/standalone/cup_silver.rgba16.png": {"meta":{"dims":[45,45]}, "offsets": {"us":["0x7D9FBC", "0x00000"]}}, -"textures/standalone/cup_bronze.rgba16.png": {"meta":{"dims":[45,45]}, "offsets": {"us":["0x7DA940", "0x00000"]}}, -"textures/raw/push_start_button.rgba16.png": {"meta":{"dims":[159,16]}, "offsets": {"us":["0x7DB1E4", "0x0"]}}, -"textures/raw/copyright_1996.rgba16.png": {"meta":{"dims":[124,17]}, "offsets": {"us":["0x7DC5C4", "0x0"]}}, -"textures/raw/p1_border_blue.rgba16.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x7DD63C", "0x0"]}}, -"textures/raw/p2_border_red.rgba16.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x7DF63C", "0x0"]}}, -"textures/raw/p3_border_orange.rgba16.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x7E163C", "0x0"]}}, -"textures/raw/p4_border_green.rgba16.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x7E363C", "0x0"]}}, -"textures/raw/small_green_triangle.rgba16.png": {"meta":{"dims":[12,7]}, "offsets": {"us":["0x7E563C", "0x0"]}}, -"textures/standalone/texture_7E56E4.ia16.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x7E56E4", "0x00000"]}}, -"textures/standalone/small_letter_0.ia16.png": {"meta":{"dims":[8,9]}, "offsets": {"us":["0x7E6850", "0x00000"]}}, -"textures/standalone/small_letter_1.ia16.png": {"meta":{"dims":[8,9]}, "offsets": {"us":["0x7E68E0", "0x00000"]}}, -"textures/standalone/small_letter_2.ia16.png": {"meta":{"dims":[8,9]}, "offsets": {"us":["0x7E6938", "0x00000"]}}, -"textures/standalone/small_letter_3.ia16.png": {"meta":{"dims":[8,9]}, "offsets": {"us":["0x7E69D0", "0x00000"]}}, -"textures/standalone/small_letter_4.ia16.png": {"meta":{"dims":[8,9]}, "offsets": {"us":["0x7E6A64", "0x00000"]}}, -"textures/standalone/small_letter_5.ia16.png": {"meta":{"dims":[8,9]}, "offsets": {"us":["0x7E6AEC", "0x00000"]}}, -"textures/standalone/small_letter_6.ia16.png": {"meta":{"dims":[8,9]}, "offsets": {"us":["0x7E6B84", "0x00000"]}}, -"textures/standalone/small_letter_7.ia16.png": {"meta":{"dims":[8,9]}, "offsets": {"us":["0x7E6C20", "0x00000"]}}, -"textures/standalone/small_letter_8.ia16.png": {"meta":{"dims":[8,9]}, "offsets": {"us":["0x7E6C90", "0x00000"]}}, -"textures/standalone/small_letter_9.ia16.png": {"meta":{"dims":[8,9]}, "offsets": {"us":["0x7E6D20", "0x00000"]}}, -"textures/standalone/n64_controller_pak_data_select.ia16.png": {"meta":{"dims":[180,32]}, "offsets": {"us":["0x7E6DC0", "0x00000"]}}, -"textures/standalone/erase_data_record_confirmation.ia16.png": {"meta":{"dims":[180,32]}, "offsets": {"us":["0x7E7EE8", "0x00000"]}}, -"textures/standalone/record_not_erased.ia16.png": {"meta":{"dims":[180,32]}, "offsets": {"us":["0x7E8EDC", "0x00000"]}}, -"textures/standalone/place_n64_controller_pak_into_controller_1.ia16.png": {"meta":{"dims":[180,32]}, "offsets": {"us":["0x7E97AC", "0x00000"]}}, -"textures/standalone/please_reinsert_original_n64_controller_pak.ia16.png": {"meta":{"dims":[180,32]}, "offsets": {"us":["0x7EA3F8", "0x00000"]}}, -"textures/standalone/erasing_selected_record.ia16.png": {"meta":{"dims":[180,32]}, "offsets": {"us":["0x7EB0D0", "0x00000"]}}, -"textures/standalone/select_record.ia16.png": {"meta":{"dims":[68,10]}, "offsets": {"us":["0x7EBCD4", "0x00000"]}}, -"textures/standalone/text_end.ia16.png": {"meta":{"dims":[20,10]}, "offsets": {"us":["0x7EC04C", "0x00000"]}}, -"textures/standalone/table_of_contents.ia16.png": {"meta":{"dims":[88,10]}, "offsets": {"us":["0x7EC17C", "0x00000"]}}, -"textures/standalone/text_hash.ia16.png": {"meta":{"dims":[8,10]}, "offsets": {"us":["0x7EC5A8", "0x00000"]}}, -"textures/standalone/text_game_data.ia16.png": {"meta":{"dims":[56,10]}, "offsets": {"us":["0x7EC628", "0x00000"]}}, -"textures/standalone/text_pages.ia16.png": {"meta":{"dims":[32,10]}, "offsets": {"us":["0x7EC8EC", "0x00000"]}}, -"textures/standalone/text_pages_free.ia16.png": {"meta":{"dims":[56,10]}, "offsets": {"us":["0x7ECAAC", "0x00000"]}}, -"textures/standalone/text_erase.ia16.png": {"meta":{"dims":[28,10]}, "offsets": {"us":["0x7ECD70", "0x00000"]}}, -"textures/standalone/text_quit.ia16.png": {"meta":{"dims":[24,10]}, "offsets": {"us":["0x7ECF10", "0x00000"]}}, -"textures/standalone/texture_7ED058.ia16.png": {"meta":{"dims":[32,66]}, "offsets": {"us":["0x7ED058", "0x00000"]}}, -"textures/standalone/texture_7ED290.ia16.png": {"meta":{"dims":[248,10]}, "offsets": {"us":["0x7ED290", "0x00000"]}}, -"textures/standalone/texture_7ED50C.ia16.png": {"meta":{"dims":[128,10]}, "offsets": {"us":["0x7ED50C", "0x00000"]}}, -"textures/standalone/texture_7ED6A4.ia16.png": {"meta":{"dims":[68,51]}, "offsets": {"us":["0x7ED6A4", "0x00000"]}}, -"textures/standalone/tiny_font_0.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDA34", "0x00000"]}}, -"textures/standalone/tiny_font_1.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDAA8", "0x00000"]}}, -"textures/standalone/tiny_font_2.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDAF0", "0x00000"]}}, -"textures/standalone/tiny_font_3.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDB64", "0x00000"]}}, -"textures/standalone/tiny_font_4.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDBD4", "0x00000"]}}, -"textures/standalone/tiny_font_5.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDC30", "0x00000"]}}, -"textures/standalone/tiny_font_6.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDCA4", "0x00000"]}}, -"textures/standalone/tiny_font_7.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDD18", "0x00000"]}}, -"textures/standalone/tiny_font_8.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDD78", "0x00000"]}}, -"textures/standalone/tiny_font_9.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDDF0", "0x00000"]}}, -"textures/standalone/tiny_font_A.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDE64", "0x00000"]}}, -"textures/standalone/tiny_font_B.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDED0", "0x00000"]}}, -"textures/standalone/tiny_font_C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDF4C", "0x00000"]}}, -"textures/standalone/tiny_font_D.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EDFC0", "0x00000"]}}, -"textures/standalone/tiny_font_E.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE030", "0x00000"]}}, -"textures/standalone/tiny_font_F.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE0A4", "0x00000"]}}, -"textures/standalone/tiny_font_G.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE108", "0x00000"]}}, -"textures/standalone/tiny_font_H.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE17C", "0x00000"]}}, -"textures/standalone/tiny_font_I.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE1F4", "0x00000"]}}, -"textures/standalone/tiny_font_J.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE23C", "0x00000"]}}, -"textures/standalone/tiny_font_K.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE290", "0x00000"]}}, -"textures/standalone/tiny_font_L.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE300", "0x00000"]}}, -"textures/standalone/tiny_font_M.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE34C", "0x00000"]}}, -"textures/standalone/tiny_font_N.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE3C8", "0x00000"]}}, -"textures/standalone/tiny_font_O.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE444", "0x00000"]}}, -"textures/standalone/tiny_font_P.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE4BC", "0x00000"]}}, -"textures/standalone/tiny_font_Q.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE528", "0x00000"]}}, -"textures/standalone/tiny_font_R.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE5A0", "0x00000"]}}, -"textures/standalone/tiny_font_S.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE614", "0x00000"]}}, -"textures/standalone/tiny_font_T.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE684", "0x00000"]}}, -"textures/standalone/tiny_font_U.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE6D8", "0x00000"]}}, -"textures/standalone/tiny_font_V.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE73C", "0x00000"]}}, -"textures/standalone/tiny_font_W.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE79C", "0x00000"]}}, -"textures/standalone/tiny_font_X.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE818", "0x00000"]}}, -"textures/standalone/tiny_font_Y.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE884", "0x00000"]}}, -"textures/standalone/tiny_font_Z.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE8D4", "0x00000"]}}, -"textures/standalone/tiny_font_exclamation_mark.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE93C", "0x00000"]}}, -"textures/standalone/tiny_font_double_quote.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE984", "0x00000"]}}, -"textures/standalone/tiny_font_hash.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EE9BC", "0x00000"]}}, -"textures/standalone/tiny_font_single_quote.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEA2C", "0x00000"]}}, -"textures/standalone/tiny_font_asterisk.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEA5C", "0x00000"]}}, -"textures/standalone/tiny_font_plus.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEAC8", "0x00000"]}}, -"textures/standalone/texture_7EEB18.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEB18", "0x00000"]}}, -"textures/standalone/tiny_font_minus.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEB48", "0x00000"]}}, -"textures/standalone/tiny_font_comma.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEB7C", "0x00000"]}}, -"textures/standalone/tiny_font_forward_slash.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEBAC", "0x00000"]}}, -"textures/standalone/tiny_font_colon.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEBFC", "0x00000"]}}, -"textures/standalone/texture_7EEC34.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEC34", "0x00000"]}}, -"textures/standalone/tiny_font_question.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEC84", "0x00000"]}}, -"textures/standalone/texture_7EECE4.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EECE4", "0x00000"]}}, -"textures/standalone/texture_7EED74.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EED74", "0x00000"]}}, -"textures/standalone/texture_7EEDB0.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEDB0", "0x00000"]}}, -"textures/standalone/texture_7EEDE8.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEDE8", "0x00000"]}}, -"textures/standalone/texture_7EEE20.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEE20", "0x00000"]}}, -"textures/standalone/texture_7EEE7C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEE7C", "0x00000"]}}, -"textures/standalone/texture_7EEED0.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEED0", "0x00000"]}}, -"textures/standalone/texture_7EEF3C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEF3C", "0x00000"]}}, -"textures/standalone/texture_7EEF90.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEF90", "0x00000"]}}, -"textures/standalone/texture_7EEFF4.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EEFF4", "0x00000"]}}, -"textures/standalone/texture_7EF058.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF058", "0x00000"]}}, -"textures/standalone/texture_7EF0B4.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF0B4", "0x00000"]}}, -"textures/standalone/texture_7EF110.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF110", "0x00000"]}}, -"textures/standalone/texture_7EF17C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF17C", "0x00000"]}}, -"textures/standalone/texture_7EF1F0.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF1F0", "0x00000"]}}, -"textures/standalone/texture_7EF250.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF250", "0x00000"]}}, -"textures/standalone/texture_7EF2B8.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF2B8", "0x00000"]}}, -"textures/standalone/texture_7EF314.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF314", "0x00000"]}}, -"textures/standalone/texture_7EF388.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF388", "0x00000"]}}, -"textures/standalone/texture_7EF3F8.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF3F8", "0x00000"]}}, -"textures/standalone/texture_7EF470.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF470", "0x00000"]}}, -"textures/standalone/texture_7EF4E4.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF4E4", "0x00000"]}}, -"textures/standalone/texture_7EF554.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF554", "0x00000"]}}, -"textures/standalone/texture_7EF5C0.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF5C0", "0x00000"]}}, -"textures/standalone/texture_7EF620.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF620", "0x00000"]}}, -"textures/standalone/texture_7EF694.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF694", "0x00000"]}}, -"textures/standalone/texture_7EF708.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF708", "0x00000"]}}, -"textures/standalone/texture_7EF77C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF77C", "0x00000"]}}, -"textures/standalone/texture_7EF7E8.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF7E8", "0x00000"]}}, -"textures/standalone/texture_7EF85C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF85C", "0x00000"]}}, -"textures/standalone/texture_7EF8C8.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF8C8", "0x00000"]}}, -"textures/standalone/texture_7EF93C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF93C", "0x00000"]}}, -"textures/standalone/texture_7EF9B4.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EF9B4", "0x00000"]}}, -"textures/standalone/texture_7EFA2C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFA2C", "0x00000"]}}, -"textures/standalone/texture_7EFAA8.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFAA8", "0x00000"]}}, -"textures/standalone/texture_7EFB00.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFB00", "0x00000"]}}, -"textures/standalone/texture_7EFB64.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFB64", "0x00000"]}}, -"textures/standalone/texture_7EFBBC.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFBBC", "0x00000"]}}, -"textures/standalone/texture_7EFC30.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFC30", "0x00000"]}}, -"textures/standalone/texture_7EFCAC.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFCAC", "0x00000"]}}, -"textures/standalone/texture_7EFD00.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFD00", "0x00000"]}}, -"textures/standalone/texture_7EFD60.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFD60", "0x00000"]}}, -"textures/standalone/texture_7EFDD4.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFDD4", "0x00000"]}}, -"textures/standalone/texture_7EFE48.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFE48", "0x00000"]}}, -"textures/standalone/texture_7EFEA0.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFEA0", "0x00000"]}}, -"textures/standalone/texture_7EFF2C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFF2C", "0x00000"]}}, -"textures/standalone/texture_7EFF90.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7EFF90", "0x00000"]}}, -"textures/standalone/texture_7F0000.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0000", "0x00000"]}}, -"textures/standalone/texture_7F006C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F006C", "0x00000"]}}, -"textures/standalone/texture_7F00D8.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F00D8", "0x00000"]}}, -"textures/standalone/texture_7F0158.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0158", "0x00000"]}}, -"textures/standalone/texture_7F01D0.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F01D0", "0x00000"]}}, -"textures/standalone/texture_7F023C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F023C", "0x00000"]}}, -"textures/standalone/texture_7F02B4.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F02B4", "0x00000"]}}, -"textures/standalone/texture_7F032C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F032C", "0x00000"]}}, -"textures/standalone/texture_7F0390.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0390", "0x00000"]}}, -"textures/standalone/texture_7F0404.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0404", "0x00000"]}}, -"textures/standalone/texture_7F0470.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0470", "0x00000"]}}, -"textures/standalone/texture_7F04EC.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F04EC", "0x00000"]}}, -"textures/standalone/texture_7F055C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F055C", "0x00000"]}}, -"textures/standalone/texture_7F05F0.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F05F0", "0x00000"]}}, -"textures/standalone/texture_7F0670.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0670", "0x00000"]}}, -"textures/standalone/texture_7F06EC.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F06EC", "0x00000"]}}, -"textures/standalone/texture_7F0768.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0768", "0x00000"]}}, -"textures/standalone/texture_7F07E0.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F07E0", "0x00000"]}}, -"textures/standalone/texture_7F0858.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0858", "0x00000"]}}, -"textures/standalone/texture_7F08D8.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F08D8", "0x00000"]}}, -"textures/standalone/texture_7F0948.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0948", "0x00000"]}}, -"textures/standalone/texture_7F09D0.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F09D0", "0x00000"]}}, -"textures/standalone/texture_7F0A3C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0A3C", "0x00000"]}}, -"textures/standalone/texture_7F0ABC.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0ABC", "0x00000"]}}, -"textures/standalone/texture_7F0B34.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0B34", "0x00000"]}}, -"textures/standalone/texture_7F0BB0.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0BB0", "0x00000"]}}, -"textures/standalone/texture_7F0C24.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0C24", "0x00000"]}}, -"textures/standalone/texture_7F0C94.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0C94", "0x00000"]}}, -"textures/standalone/texture_7F0D0C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0D0C", "0x00000"]}}, -"textures/standalone/texture_7F0D8C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0D8C", "0x00000"]}}, -"textures/standalone/texture_7F0DEC.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0DEC", "0x00000"]}}, -"textures/standalone/texture_7F0E5C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0E5C", "0x00000"]}}, -"textures/standalone/texture_7F0EE4.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0EE4", "0x00000"]}}, -"textures/standalone/texture_7F0F5C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0F5C", "0x00000"]}}, -"textures/standalone/texture_7F0FD8.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F0FD8", "0x00000"]}}, -"textures/standalone/texture_7F1038.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F1038", "0x00000"]}}, -"textures/standalone/texture_7F109C.ia16.png": {"meta":{"dims":[8,8]}, "offsets": {"us":["0x7F109C", "0x00000"]}}, -"textures/raw/7F1124.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1124", "0x0"]}}, -"textures/raw/7F11F4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F11F4", "0x0"]}}, -"textures/raw/7F12C4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F12C4", "0x0"]}}, -"textures/raw/7F1394.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1394", "0x0"]}}, -"textures/raw/7F1464.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1464", "0x0"]}}, -"textures/raw/7F1534.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1534", "0x0"]}}, -"textures/raw/7F1604.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1604", "0x0"]}}, -"textures/raw/7F16D4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F16D4", "0x0"]}}, -"textures/raw/7F17A4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F17A4", "0x0"]}}, -"textures/raw/7F1874.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1874", "0x0"]}}, -"textures/raw/7F1944.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1944", "0x0"]}}, -"textures/raw/7F1A14.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1A14", "0x0"]}}, -"textures/raw/7F1AE4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1AE4", "0x0"]}}, -"textures/raw/7F1BB4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1BB4", "0x0"]}}, -"textures/raw/7F1C84.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1C84", "0x0"]}}, -"textures/raw/7F1D54.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1D54", "0x0"]}}, -"textures/raw/7F1E24.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1E24", "0x0"]}}, -"textures/raw/7F1EF4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1EF4", "0x0"]}}, -"textures/raw/7F1FC4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F1FC4", "0x0"]}}, -"textures/raw/7F2094.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2094", "0x0"]}}, -"textures/raw/7F2164.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2164", "0x0"]}}, -"textures/raw/7F2234.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2234", "0x0"]}}, -"textures/raw/7F2304.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2304", "0x0"]}}, -"textures/raw/7F23D4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F23D4", "0x0"]}}, -"textures/raw/7F24A4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F24A4", "0x0"]}}, -"textures/raw/7F2574.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2574", "0x0"]}}, -"textures/raw/7F2644.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2644", "0x0"]}}, -"textures/raw/7F2714.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2714", "0x0"]}}, -"textures/raw/7F27E4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F27E4", "0x0"]}}, -"textures/raw/7F28B4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F28B4", "0x0"]}}, -"textures/raw/7F2984.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2984", "0x0"]}}, -"textures/raw/7F2A54.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2A54", "0x0"]}}, -"textures/raw/7F2B24.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2B24", "0x0"]}}, -"textures/raw/7F2BF4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2BF4", "0x0"]}}, -"textures/raw/7F2CC4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2CC4", "0x0"]}}, -"textures/raw/7F2D94.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2D94", "0x0"]}}, -"textures/raw/7F2E64.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2E64", "0x0"]}}, -"textures/raw/7F2F34.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F2F34", "0x0"]}}, -"textures/raw/7F3004.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F3004", "0x0"]}}, -"textures/raw/7F30D4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F30D4", "0x0"]}}, -"textures/raw/7F31A4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F31A4", "0x0"]}}, -"textures/raw/7F3274.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F3274", "0x0"]}}, -"textures/raw/7F3344.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F3344", "0x0"]}}, -"textures/raw/7F3414.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F3414", "0x0"]}}, -"textures/raw/7F34E4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F34E4", "0x0"]}}, -"textures/raw/7F35B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F35B4", "0x0"]}}, -"textures/raw/7F3634.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3634", "0x0"]}}, -"textures/raw/7F36B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F36B4", "0x0"]}}, -"textures/raw/7F3734.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3734", "0x0"]}}, -"textures/raw/7F37B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F37B4", "0x0"]}}, -"textures/raw/7F3834.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3834", "0x0"]}}, -"textures/raw/7F38B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F38B4", "0x0"]}}, -"textures/raw/7F3934.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3934", "0x0"]}}, -"textures/raw/7F39B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F39B4", "0x0"]}}, -"textures/raw/7F3A34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3A34", "0x0"]}}, -"textures/raw/7F3AB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3AB4", "0x0"]}}, -"textures/raw/7F3B34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3B34", "0x0"]}}, -"textures/raw/7F3BB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3BB4", "0x0"]}}, -"textures/raw/7F3C34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3C34", "0x0"]}}, -"textures/raw/7F3CB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3CB4", "0x0"]}}, -"textures/raw/7F3D34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3D34", "0x0"]}}, -"textures/raw/7F3DB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3DB4", "0x0"]}}, -"textures/raw/7F3E34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3E34", "0x0"]}}, -"textures/raw/7F3EB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3EB4", "0x0"]}}, -"textures/raw/7F3F34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3F34", "0x0"]}}, -"textures/raw/7F3FB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F3FB4", "0x0"]}}, -"textures/raw/7F4034.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4034", "0x0"]}}, -"textures/raw/7F40B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F40B4", "0x0"]}}, -"textures/raw/7F4134.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4134", "0x0"]}}, -"textures/raw/7F41B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F41B4", "0x0"]}}, -"textures/raw/7F4234.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4234", "0x0"]}}, -"textures/raw/7F42B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F42B4", "0x0"]}}, -"textures/raw/7F4334.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4334", "0x0"]}}, -"textures/raw/7F43B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F43B4", "0x0"]}}, -"textures/raw/7F4434.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4434", "0x0"]}}, -"textures/raw/7F44B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F44B4", "0x0"]}}, -"textures/raw/7F4534.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4534", "0x0"]}}, -"textures/raw/7F45B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F45B4", "0x0"]}}, -"textures/raw/7F4634.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4634", "0x0"]}}, -"textures/raw/7F46B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F46B4", "0x0"]}}, -"textures/raw/7F4734.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4734", "0x0"]}}, -"textures/raw/7F47B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F47B4", "0x0"]}}, -"textures/raw/7F4834.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4834", "0x0"]}}, -"textures/raw/7F48B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F48B4", "0x0"]}}, -"textures/raw/7F4934.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4934", "0x0"]}}, -"textures/raw/7F49B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F49B4", "0x0"]}}, -"textures/raw/7F4A34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4A34", "0x0"]}}, -"textures/raw/7F4AB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4AB4", "0x0"]}}, -"textures/raw/7F4B34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4B34", "0x0"]}}, -"textures/raw/7F4BB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4BB4", "0x0"]}}, -"textures/raw/7F4C34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4C34", "0x0"]}}, -"textures/raw/7F4CB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4CB4", "0x0"]}}, -"textures/raw/7F4D34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4D34", "0x0"]}}, -"textures/raw/7F4DB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4DB4", "0x0"]}}, -"textures/raw/7F4E34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4E34", "0x0"]}}, -"textures/raw/7F4EB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4EB4", "0x0"]}}, -"textures/raw/7F4F34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4F34", "0x0"]}}, -"textures/raw/7F4FB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F4FB4", "0x0"]}}, -"textures/raw/7F5034.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5034", "0x0"]}}, -"textures/raw/7F50B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F50B4", "0x0"]}}, -"textures/raw/7F5134.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5134", "0x0"]}}, -"textures/raw/7F51B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F51B4", "0x0"]}}, -"textures/raw/7F5234.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5234", "0x0"]}}, -"textures/raw/7F52B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F52B4", "0x0"]}}, -"textures/raw/7F5334.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5334", "0x0"]}}, -"textures/raw/7F53B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F53B4", "0x0"]}}, -"textures/raw/7F5434.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5434", "0x0"]}}, -"textures/raw/7F54B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F54B4", "0x0"]}}, -"textures/raw/7F5534.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5534", "0x0"]}}, -"textures/raw/7F55B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F55B4", "0x0"]}}, -"textures/raw/7F5634.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5634", "0x0"]}}, -"textures/raw/7F56B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F56B4", "0x0"]}}, -"textures/raw/7F5734.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5734", "0x0"]}}, -"textures/raw/7F57B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F57B4", "0x0"]}}, -"textures/raw/7F5834.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5834", "0x0"]}}, -"textures/raw/7F58B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F58B4", "0x0"]}}, -"textures/raw/7F5934.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5934", "0x0"]}}, -"textures/raw/7F59B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F59B4", "0x0"]}}, -"textures/raw/7F5A34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5A34", "0x0"]}}, -"textures/raw/7F5AB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5AB4", "0x0"]}}, -"textures/raw/7F5B34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5B34", "0x0"]}}, -"textures/raw/7F5BB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5BB4", "0x0"]}}, -"textures/raw/7F5C34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5C34", "0x0"]}}, -"textures/raw/7F5CB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5CB4", "0x0"]}}, -"textures/raw/7F5D34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5D34", "0x0"]}}, -"textures/raw/7F5DB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5DB4", "0x0"]}}, -"textures/raw/7F5E34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5E34", "0x0"]}}, -"textures/raw/7F5EB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5EB4", "0x0"]}}, -"textures/raw/7F5F34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5F34", "0x0"]}}, -"textures/raw/7F5FB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F5FB4", "0x0"]}}, -"textures/raw/7F6034.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6034", "0x0"]}}, -"textures/raw/7F60B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F60B4", "0x0"]}}, -"textures/raw/7F6134.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6134", "0x0"]}}, -"textures/raw/7F61B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F61B4", "0x0"]}}, -"textures/raw/7F6234.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6234", "0x0"]}}, -"textures/raw/7F62B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F62B4", "0x0"]}}, -"textures/raw/7F6334.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6334", "0x0"]}}, -"textures/raw/7F63B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F63B4", "0x0"]}}, -"textures/raw/7F6434.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6434", "0x0"]}}, -"textures/raw/7F64B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F64B4", "0x0"]}}, -"textures/raw/7F6534.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6534", "0x0"]}}, -"textures/raw/7F65B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F65B4", "0x0"]}}, -"textures/raw/7F6634.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6634", "0x0"]}}, -"textures/raw/7F66B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F66B4", "0x0"]}}, -"textures/raw/7F6734.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6734", "0x0"]}}, -"textures/raw/7F67B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F67B4", "0x0"]}}, -"textures/raw/7F6834.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6834", "0x0"]}}, -"textures/raw/7F68B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F68B4", "0x0"]}}, -"textures/raw/7F6934.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6934", "0x0"]}}, -"textures/raw/7F69B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F69B4", "0x0"]}}, -"textures/raw/7F6A34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6A34", "0x0"]}}, -"textures/raw/7F6AB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6AB4", "0x0"]}}, -"textures/raw/7F6B34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6B34", "0x0"]}}, -"textures/raw/7F6BB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6BB4", "0x0"]}}, -"textures/raw/7F6C34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6C34", "0x0"]}}, -"textures/raw/7F6CB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6CB4", "0x0"]}}, -"textures/raw/7F6D34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6D34", "0x0"]}}, -"textures/raw/7F6DB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6DB4", "0x0"]}}, -"textures/raw/7F6E34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6E34", "0x0"]}}, -"textures/raw/7F6EB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6EB4", "0x0"]}}, -"textures/raw/7F6F34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6F34", "0x0"]}}, -"textures/raw/7F6FB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F6FB4", "0x0"]}}, -"textures/raw/7F7034.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7034", "0x0"]}}, -"textures/raw/7F70B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F70B4", "0x0"]}}, -"textures/raw/7F7134.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7134", "0x0"]}}, -"textures/raw/7F71B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F71B4", "0x0"]}}, -"textures/raw/7F7234.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7234", "0x0"]}}, -"textures/raw/7F72B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F72B4", "0x0"]}}, -"textures/raw/7F7334.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7334", "0x0"]}}, -"textures/raw/7F73B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F73B4", "0x0"]}}, -"textures/raw/7F7434.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7434", "0x0"]}}, -"textures/raw/7F74B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F74B4", "0x0"]}}, -"textures/raw/7F7534.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7534", "0x0"]}}, -"textures/raw/7F75B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F75B4", "0x0"]}}, -"textures/raw/7F7634.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7634", "0x0"]}}, -"textures/raw/7F76B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F76B4", "0x0"]}}, -"textures/raw/7F7734.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7734", "0x0"]}}, -"textures/raw/7F77B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F77B4", "0x0"]}}, -"textures/raw/7F7834.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7834", "0x0"]}}, -"textures/raw/7F78B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F78B4", "0x0"]}}, -"textures/raw/7F7934.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7934", "0x0"]}}, -"textures/raw/7F79B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F79B4", "0x0"]}}, -"textures/raw/7F7A34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7A34", "0x0"]}}, -"textures/raw/7F7AB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7AB4", "0x0"]}}, -"textures/raw/7F7B34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7B34", "0x0"]}}, -"textures/raw/7F7BB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7BB4", "0x0"]}}, -"textures/raw/7F7C34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7C34", "0x0"]}}, -"textures/raw/7F7CB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7CB4", "0x0"]}}, -"textures/raw/7F7D34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7D34", "0x0"]}}, -"textures/raw/7F7DB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7DB4", "0x0"]}}, -"textures/raw/7F7E34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7E34", "0x0"]}}, -"textures/raw/7F7EB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7EB4", "0x0"]}}, -"textures/raw/7F7F34.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7F34", "0x0"]}}, -"textures/raw/7F7FB4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F7FB4", "0x0"]}}, -"textures/raw/7F8034.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F8034", "0x0"]}}, -"textures/raw/7F80B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F80B4", "0x0"]}}, -"textures/raw/7F8134.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F8134", "0x0"]}}, -"textures/raw/7F81B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F81B4", "0x0"]}}, -"textures/raw/7F8234.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F8234", "0x0"]}}, -"textures/raw/7F82B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F82B4", "0x0"]}}, -"textures/raw/7F8334.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F8334", "0x0"]}}, -"textures/raw/7F83B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F83B4", "0x0"]}}, -"textures/raw/7F8434.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F8434", "0x0"]}}, -"textures/raw/7F84B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F84B4", "0x0"]}}, -"textures/raw/7F8534.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F8534", "0x0"]}}, -"textures/raw/7F85B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F85B4", "0x0"]}}, -"textures/raw/7F8634.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F8634", "0x0"]}}, -"textures/raw/7F86B4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F86B4", "0x0"]}}, -"textures/raw/7F8734.i4.png": {"meta":{"dims":[30,32]}, "offsets": {"us":["0x7F8734", "0x0"]}}, -"textures/raw/7F8914.i4.png": {"meta":{"dims":[30,32]}, "offsets": {"us":["0x7F8914", "0x0"]}}, -"textures/raw/7F8AF4.i4.png": {"meta":{"dims":[30,32]}, "offsets": {"us":["0x7F8AF4", "0x0"]}}, -"textures/raw/7F8CD4.i4.png": {"meta":{"dims":[30,32]}, "offsets": {"us":["0x7F8CD4", "0x0"]}}, -"textures/raw/7F8EB4.i4.png": {"meta":{"dims":[30,32]}, "offsets": {"us":["0x7F8EB4", "0x0"]}}, -"textures/raw/7F9094.i4.png": {"meta":{"dims":[30,32]}, "offsets": {"us":["0x7F9094", "0x0"]}}, -"textures/raw/7F9274.i4.png": {"meta":{"dims":[30,32]}, "offsets": {"us":["0x7F9274", "0x0"]}}, -"textures/raw/7F9454.i4.png": {"meta":{"dims":[30,32]}, "offsets": {"us":["0x7F9454", "0x0"]}}, -"textures/raw/7F9634.i4.png": {"meta":{"dims":[30,32]}, "offsets": {"us":["0x7F9634", "0x0"]}}, -"textures/raw/7F9814.i4.png": {"meta":{"dims":[30,32]}, "offsets": {"us":["0x7F9814", "0x0"]}}, -"textures/raw/7F99F4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F99F4", "0x0"]}}, -"textures/raw/7F9A74.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F9A74", "0x0"]}}, -"textures/raw/7F9AF4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F9AF4", "0x0"]}}, -"textures/raw/7F9B74.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F9B74", "0x0"]}}, -"textures/raw/7F9BF4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F9BF4", "0x0"]}}, -"textures/raw/7F9C74.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F9C74", "0x0"]}}, -"textures/raw/7F9CF4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7F9CF4", "0x0"]}}, -"textures/raw/7F9DC4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F9DC4", "0x0"]}}, -"textures/raw/7F9E44.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F9E44", "0x0"]}}, -"textures/raw/7F9EC4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F9EC4", "0x0"]}}, -"textures/raw/7F9F44.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F9F44", "0x0"]}}, -"textures/raw/7F9FC4.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7F9FC4", "0x0"]}}, -"textures/raw/7FA044.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7FA044", "0x0"]}}, -"textures/raw/7FA0C4.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7FA0C4", "0x0"]}}, -"textures/raw/7FA194.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7FA194", "0x0"]}}, -"textures/raw/7FA264.i4.png": {"meta":{"dims":[26,16]}, "offsets": {"us":["0x7FA264", "0x0"]}}, -"textures/raw/7FA334.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x7FA334", "0x0"]}}, - -"textures/gTexturePlayerSelect.rgba16.png": {"meta":{"dims":[220,32], "alpha":"0x01"}, "offsets": {"us":["0x7FA3C0", "0x0"]}}, -"textures/gTextureOption.rgba16.png": {"meta":{"dims":[130,32], "alpha":"0x01"}, "offsets": {"us":["0x7FAFC0", "0x0"]}}, - -"textures/gTextureNameDK.rgba16.png": {"meta":{"dims":[64,12], "alpha":"0x01"}, "offsets": {"us":["0x7FB8C0", "0x0"]}}, -"textures/gTextureNameToad.rgba16.png": {"meta":{"dims":[64,12], "alpha":"0x01"}, "offsets": {"us":["0x7FBAC0", "0x0"]}}, -"textures/gTextureNameBowser.rgba16.png": {"meta":{"dims":[64,12], "alpha":"0x01"}, "offsets": {"us":["0x7FBCC0", "0x0"]}}, -"textures/gTextureNameLuigi.rgba16.png": {"meta":{"dims":[64,12], "alpha":"0x01"}, "offsets": {"us":["0x7FBEC0", "0x0"]}}, -"textures/gTextureNameMario.rgba16.png": {"meta":{"dims":[64,12], "alpha":"0x01"}, "offsets": {"us":["0x7FC0C0", "0x0"]}}, -"textures/gTextureNamePeach.rgba16.png": {"meta":{"dims":[64,12], "alpha":"0x01"}, "offsets": {"us":["0x7FC2C0", "0x0"]}}, -"textures/gTextureNameWario.rgba16.png": {"meta":{"dims":[64,12], "alpha":"0x01"}, "offsets": {"us":["0x7FC4C0", "0x0"]}}, -"textures/gTextureNameYoshi.rgba16.png": {"meta":{"dims":[64,12], "alpha":"0x01"}, "offsets": {"us":["0x7FC6C0", "0x0"]}}, - -"textures/gTextureTitleMarioRaceway.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FC8C0", "0x0"]}}, -"textures/gTextureTitleChocoMountain.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FCDC0", "0x0"]}}, -"textures/gTextureTitleBowsersCastle.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FD2C0", "0x0"]}}, -"textures/gTextureTitleBansheeBoardwalk.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FD7C0", "0x0"]}}, -"textures/gTextureTitleYoshiValley.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FDDC0", "0x0"]}}, -"textures/gTextureTitleFrappeSnowland.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FE1C0", "0x0"]}}, -"textures/gTextureTitleKoopaTroopaBeach.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FE6C0", "0x0"]}}, -"textures/gTextureTitleRoyalRaceway.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FEBC0", "0x0"]}}, -"textures/gTextureTitleLuigiRaceway.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FEFC0", "0x0"]}}, -"textures/gTextureTitleMooMooFarm.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FF3C0", "0x0"]}}, -"textures/gTextureTitleToadsTurnpike.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FF7C0", "0x0"]}}, -"textures/gTextureTitleKalimariDesert.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x7FFCC0", "0x0"]}}, -"textures/gTextureTitleSherbetLand.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x8000C0", "0x0"]}}, -"textures/gTextureTitleRainbowRoad.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x8004C0", "0x0"]}}, -"textures/gTextureTitleWarioStadium.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x8008C0", "0x0"]}}, -"textures/gTextureTitleBlockFort.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x800DC0", "0x0"]}}, -"textures/gTextureTitleSkyscraper.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x8010C0", "0x0"]}}, -"textures/gTextureTitleDoubleDeck.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x8014C0", "0x0"]}}, -"textures/gTextureTitleDKsJungleParkway.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x8018C0", "0x0"]}}, -"textures/gTextureTitleBigDonut.rgba16.png": {"meta":{"dims":[140,18], "alpha":"0xBE"}, "offsets": {"us":["0x801EC0", "0x0"]}}, - -"textures/gTextureMapSelect.rgba16.png": {"meta":{"dims":[190,32], "alpha":"0x01"}, "offsets": {"us":["0x8021C0", "0x0"]}}, - -"textures/gTextureMenuFlowerCup.rgba16.png": {"meta":{"dims":[65,40], "alpha":"0xBE"}, "offsets": {"us":["0x802DC0", "0x0"]}}, -"textures/gTextureMenuMushroomCup.rgba16.png": {"meta":{"dims":[65,40], "alpha":"0xBE"}, "offsets": {"us":["0x8031C0", "0x0"]}}, -"textures/gTextureMenuStarCup.rgba16.png": {"meta":{"dims":[65,40], "alpha":"0xBE"}, "offsets": {"us":["0x8035C0", "0x0"]}}, -"textures/gTextureMenuSpecialCup.rgba16.png": {"meta":{"dims":[65,40], "alpha":"0xBE"}, "offsets": {"us":["0x8039C0", "0x0"]}}, - -"textures/gTextureGameSelect.rgba16.png": {"meta":{"dims":[200,32], "alpha":"0x01"}, "offsets": {"us":["0x803DC0", "0x0"]}}, - -"textures/gTextureMenu1PGame.rgba16.png": {"meta":{"dims":[64,54], "alpha":"0xBE"}, "offsets": {"us":["0x8049C0", "0x0"]}}, -"textures/gTextureMenu2PGame.rgba16.png": {"meta":{"dims":[64,54], "alpha":"0xBE"}, "offsets": {"us":["0x804EC0", "0x0"]}}, -"textures/gTextureMenu3PGame.rgba16.png": {"meta":{"dims":[64,54], "alpha":"0xBE"}, "offsets": {"us":["0x8055C0", "0x0"]}}, -"textures/gTextureMenu4PGame.rgba16.png": {"meta":{"dims":[64,54], "alpha":"0xBE"}, "offsets": {"us":["0x805FC0", "0x0"]}}, - -"textures/gTextureMenuModeBattle.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x806AC0", "0x0"]}}, -"textures/gTextureMenuModeTimeTrials.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x806DC0", "0x0"]}}, -"textures/gTextureMenuModeMarioGP.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x8071C0", "0x0"]}}, -"textures/gTextureMenuModeVS.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x8075C0", "0x0"]}}, - -"textures/gTextureMenuLOption.rgba16.png": {"meta":{"dims":[58,19], "alpha":"0xBE"}, "offsets": {"us":["0x8078C0", "0x0"]}}, -"textures/gTextureMenuRData.rgba16.png": {"meta":{"dims":[58,19], "alpha":"0xBE"}, "offsets": {"us":["0x807BC0", "0x0"]}}, - -"textures/gTextureMenu50cc.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x807EC0", "0x0"]}}, -"textures/gTextureMenu100cc.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x8080C0", "0x0"]}}, -"textures/gTextureMenu150cc.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x8082C0", "0x0"]}}, -"textures/gTextureMenuExtra.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x8084C0", "0x0"]}}, - -"textures/gTextureMenuWithoutItem.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x8086C0", "0x0"]}}, -"textures/gTextureMenuWithItem.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x8089C0", "0x0"]}}, -"textures/gTextureMenuBegin.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x808CC0", "0x0"]}}, -"textures/gTextureMenuGhost.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x808EC0", "0x0"]}}, -"textures/gTextureMenuData.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x8090C0", "0x0"]}}, -"textures/gTextureMenuOK.rgba16.png": {"meta":{"dims":[31,19], "alpha":"0xBE"}, "offsets": {"us":["0x8092C0", "0x0"]}}, - -"textures/gTextureBackgroundBlueSky.rgba16.png": {"meta":{"dims":[320,240], "alpha":"0x01"}, "offsets": {"us":["0x8094C0", "0x0"]}}, -"textures/gTextureBackgroundSunset.rgba16.png": {"meta":{"dims":[320,240], "alpha":"0x01"}, "offsets": {"us":["0x8162C0", "0x0"]}}, - -"textures/gTextureGreenGoldStripe.rgba16.png": {"meta":{"dims":[256,29], "alpha":"0x01"}, "offsets": {"us":["0x81F6C0", "0x0"]}}, -"textures/gTextureGoldStripe.rgba16.png": {"meta":{"dims":[256,15], "alpha":"0x01"}, "offsets": {"us":["0x8202C0", "0x0"]}}, -"textures/gTextureWhiteStripe.rgba16.png": {"meta":{"dims":[256,10], "alpha":"0x01"}, "offsets": {"us":["0x8209C0", "0x0"]}}, -"textures/gTexturePinkBar.rgba16.png": {"meta":{"dims":[90,16], "alpha":"0x01"}, "offsets": {"us":["0x820AC0", "0x0"]}}, -"textures/gTextureGoldBar.rgba16.png": {"meta":{"dims":[256,40], "alpha":"0x01"}, "offsets": {"us":["0x820FC0", "0x0"]}} -} diff --git a/include/assets/banshee_boardwalk_data.h b/include/assets/banshee_boardwalk_data.h index 4938c28c9..55716f809 100644 --- a/include/assets/banshee_boardwalk_data.h +++ b/include/assets/banshee_boardwalk_data.h @@ -6,14 +6,20 @@ static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_0[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_0"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_0[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_8[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_8"; static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_38[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_38"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_38[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_38"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_40[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_40"; static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_68[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_68"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_68[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_68"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_A0[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_A0"; static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_160[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_160"; @@ -242,14 +248,24 @@ static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_cheep_cheep10[] = "_ static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_fish_eyes[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_fish_eyes"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_7650[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_7650"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_7650[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_7650"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_78C0[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_78C0"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_78C0[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_78C0"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_7978[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_7978"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_7978[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_7978"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_7B38[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_7B38"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_7B38[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_7B38"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_7B78[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_7B78"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_7B78[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_7B78"; static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_cheep_cheep[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_cheep_cheep"; @@ -281,10 +297,18 @@ static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_texture[] = "__OTR__ static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_A850[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_A850"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_A850[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_A850"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_A900[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_A900"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_A900[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_A900"; + +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_A9B0[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_A9B0"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_A9B0[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_A9B0"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_A9C8[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_A9C8"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_A9C8[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_A9C8"; static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_trash_bin[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_trash_bin"; diff --git a/include/assets/bowsers_castle_data.h b/include/assets/bowsers_castle_data.h index 9c237d629..9768f72e0 100644 --- a/include/assets/bowsers_castle_data.h +++ b/include/assets/bowsers_castle_data.h @@ -257,10 +257,14 @@ static const ALIGN_ASSET(2) char d_course_bowsers_castle_thwomp_model3[] = "__OT static const ALIGN_ASSET(2) char d_course_bowsers_castle_thwomp_model4[] = "__OTR__bowsers_castle_data/d_course_bowsers_castle_thwomp_model4"; +static const ALIGN_ASSET(2) char bowsers_castle_data_seg6_gfx_8F38[] = "__OTR__bowsers_castle_data/bowsers_castle_data_seg6_gfx_8F38"; + static const ALIGN_ASSET(2) char d_course_bowsers_castle_dl_8F38[] = "__OTR__bowsers_castle_data/d_course_bowsers_castle_dl_8F38"; static const ALIGN_ASSET(2) char d_course_bowsers_castle_dl_9078[] = "__OTR__bowsers_castle_data/d_course_bowsers_castle_dl_9078"; +static const ALIGN_ASSET(2) char bowsers_castle_data_seg6_gfx_9078[] = "__OTR__bowsers_castle_data/bowsers_castle_data_seg6_gfx_9078"; + static const ALIGN_ASSET(2) char d_course_bowsers_castle_dl_thwomp[] = "__OTR__bowsers_castle_data/d_course_bowsers_castle_dl_thwomp"; static const ALIGN_ASSET(2) char d_course_bowsers_castle_unknown_model[] = "__OTR__bowsers_castle_data/d_course_bowsers_castle_unknown_model"; diff --git a/include/assets/ceremony_data.h b/include/assets/ceremony_data.h index 8af6d7cec..928f3f423 100644 --- a/include/assets/ceremony_data.h +++ b/include/assets/ceremony_data.h @@ -25,16 +25,28 @@ static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_E50[] = "__OTR__ceremon static const ALIGN_ASSET(2) char silver_trophy_dl[] = "__OTR__ceremony_data/silver_trophy_dl"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_FE0[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_FE0"; + static const ALIGN_ASSET(2) char silver_trophy_dl2[] = "__OTR__ceremony_data/silver_trophy_dl2"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_10B8[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_10B8"; + static const ALIGN_ASSET(2) char silver_trophy_dl3[] = "__OTR__ceremony_data/silver_trophy_dl3"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_1188[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_1188"; + static const ALIGN_ASSET(2) char silver_trophy_dl4[] = "__OTR__ceremony_data/silver_trophy_dl4"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_1260[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_1260"; + +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_1418[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_1418"; + static const ALIGN_ASSET(2) char silver_trophy_dl5[] = "__OTR__ceremony_data/silver_trophy_dl5"; static const ALIGN_ASSET(2) char silver_trophy_dl6[] = "__OTR__ceremony_data/silver_trophy_dl6"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_14D0[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_14D0"; + static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_1580[] = "__OTR__ceremony_data/ceremony_data_seg11_vtx_1580"; static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_16E0[] = "__OTR__ceremony_data/ceremony_data_seg11_vtx_16E0"; @@ -81,22 +93,40 @@ static const ALIGN_ASSET(2) char reflection_map_silver[] = "__OTR__ceremony_data static const ALIGN_ASSET(2) char ceremony_reflection_map_gold[] = "__OTR__ceremony_data/reflection_map_gold"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_5E70[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_5E70"; + static const ALIGN_ASSET(2) char gold_trophy_dl[] = "__OTR__ceremony_data/gold_trophy_dl"; static const ALIGN_ASSET(2) char gold_trophy_dl2[] = "__OTR__ceremony_data/gold_trophy_dl2"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_5F20[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_5F20"; + static const ALIGN_ASSET(2) char gold_trophy_dl3[] = "__OTR__ceremony_data/gold_trophy_dl3"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_5FD0[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_5FD0"; + static const ALIGN_ASSET(2) char gold_trophy_dl4[] = "__OTR__ceremony_data/gold_trophy_dl4"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_6218[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_6218"; + static const ALIGN_ASSET(2) char gold_trophy_dl5[] = "__OTR__ceremony_data/gold_trophy_dl5"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_62C8[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_62C8"; + +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_6518[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_6518"; + static const ALIGN_ASSET(2) char gold_trophy_dl6[] = "__OTR__ceremony_data/gold_trophy_dl6"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_6720[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_6720"; + static const ALIGN_ASSET(2) char gold_trophy_dl7[] = "__OTR__ceremony_data/gold_trophy_dl7"; static const ALIGN_ASSET(2) char gold_trophy_dl8[] = "__OTR__ceremony_data/gold_trophy_dl8"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_6880[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_6880"; + +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_6948[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_6948"; + static const ALIGN_ASSET(2) char gold_trophy_dl9[] = "__OTR__ceremony_data/gold_trophy_dl9"; static const ALIGN_ASSET(2) char gold_trophy_dl10[] = "__OTR__ceremony_data/gold_trophy_dl10"; @@ -111,6 +141,8 @@ static const ALIGN_ASSET(2) char gold_trophy_dl14[] = "__OTR__ceremony_data/gold static const ALIGN_ASSET(2) char gold_trophy_dl15[] = "__OTR__ceremony_data/gold_trophy_dl15"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_lights_6BB8[] = "__OTR__ceremony_data/ceremony_data_seg11_lights_6BB8"; + static const ALIGN_ASSET(2) char light1[] = "__OTR__ceremony_data/light1"; static const ALIGN_ASSET(2) char gTexturePodium1[] = "__OTR__ceremony_data/texture_podium1"; @@ -121,8 +153,12 @@ static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_74D0[] = "__OTR__ceremo static const ALIGN_ASSET(2) char podium_dl[] = "__OTR__ceremony_data/podium_dl"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_7510[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_7510"; + static const ALIGN_ASSET(2) char podium_dl2[] = "__OTR__ceremony_data/podium_dl2"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_75E0[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_75E0"; + static const ALIGN_ASSET(2) char podium_dl3[] = "__OTR__ceremony_data/podium_dl3"; static const ALIGN_ASSET(2) char podium_dl4[] = "__OTR__ceremony_data/podium_dl4"; @@ -131,12 +167,18 @@ static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_7608[] = "__OTR__ceremo static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_7708[] = "__OTR__ceremony_data/ceremony_data_seg11_vtx_7708"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_lights_7748[] = "__OTR__ceremony_data/ceremony_data_seg11_lights_7748"; + static const ALIGN_ASSET(2) char light2[] = "__OTR__ceremony_data/light2"; static const ALIGN_ASSET(2) char gTexturePodium2[] = "__OTR__ceremony_data/texture_podium2"; static const ALIGN_ASSET(2) char podium2_dl[] = "__OTR__ceremony_data/podium2_dl"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_7F60[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_7F60"; + +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_8030[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_8030"; + static const ALIGN_ASSET(2) char podium2_dl2[] = "__OTR__ceremony_data/podium2_dl2"; static const ALIGN_ASSET(2) char podium2_dl3[] = "__OTR__ceremony_data/podium2_dl3"; @@ -145,14 +187,20 @@ static const ALIGN_ASSET(2) char podium2_dl4[] = "__OTR__ceremony_data/podium2_d static const ALIGN_ASSET(2) char light3[] = "__OTR__ceremony_data/light3"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_lights_8058[] = "__OTR__ceremony_data/ceremony_data_seg11_lights_8058"; + static const ALIGN_ASSET(2) char gTexturePodium3[] = "__OTR__ceremony_data/texture_podium3"; static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_8870[] = "__OTR__ceremony_data/ceremony_data_seg11_vtx_8870"; static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_8970[] = "__OTR__ceremony_data/ceremony_data_seg11_vtx_8970"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_89B0[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_89B0"; + static const ALIGN_ASSET(2) char podium3_dl[] = "__OTR__ceremony_data/podium3_dl"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_8A80[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_8A80"; + static const ALIGN_ASSET(2) char podium3_dl2[] = "__OTR__ceremony_data/podium3_dl2"; static const ALIGN_ASSET(2) char podium3_dl3[] = "__OTR__ceremony_data/podium3_dl3"; diff --git a/include/assets/choco_mountain_data.h b/include/assets/choco_mountain_data.h index d78b83689..86be88fdd 100644 --- a/include/assets/choco_mountain_data.h +++ b/include/assets/choco_mountain_data.h @@ -200,6 +200,8 @@ static const ALIGN_ASSET(2) char d_course_choco_mountain_unknown_waypoints[] = " static const ALIGN_ASSET(2) char d_course_choco_mountain_track_waypoints[] = "__OTR__choco_mountain_data/d_course_choco_mountain_track_waypoints"; +static const ALIGN_ASSET(2) char choco_mountain_data_seg6_lights_5AE0[] = "__OTR__choco_mountain_data/choco_mountain_data_seg6_lights_5AE0"; + static const ALIGN_ASSET(2) char d_course_choco_mountain_light[] = "__OTR__choco_mountain_data/d_course_choco_mountain_light"; static const ALIGN_ASSET(2) char d_course_choco_mountain_6005AF8[] = "__OTR__choco_mountain_data/d_course_choco_mountain_6005AF8"; diff --git a/include/assets/common_data.h b/include/assets/common_data.h index 32cab69bc..5dc159476 100644 --- a/include/assets/common_data.h +++ b/include/assets/common_data.h @@ -53,10 +53,16 @@ static const ALIGN_ASSET(2) char D_0D001828[] = "__OTR__common_data/D_0D001828"; static const ALIGN_ASSET(2) char D_0D001840[] = "__OTR__common_data/D_0D001840"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_1840[] = "__OTR__common_data/common_data_seg13_gfx_1840"; + static const ALIGN_ASSET(2) char common_model_finish_post[] = "__OTR__common_data/common_model_finish_post"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_1AB8[] = "__OTR__common_data/common_data_seg13_gfx_1AB8"; + static const ALIGN_ASSET(2) char D_0D001B68[] = "__OTR__common_data/D_0D001B68"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_1B68[] = "__OTR__common_data/common_data_seg13_gfx_1B68"; + static const ALIGN_ASSET(2) char D_0D001B90[] = "__OTR__common_data/D_0D001B90"; static const ALIGN_ASSET(2) char D_0D001BD8[] = "__OTR__common_data/D_0D001BD8"; @@ -79,6 +85,8 @@ static const ALIGN_ASSET(2) char itemBoxQuestionMarkModel[] = "__OTR__common_dat static const ALIGN_ASSET(2) char D_0D003090[] = "__OTR__common_data/D_0D003090"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_3090[] = "__OTR__common_data/common_data_seg13_gfx_3090"; + static const ALIGN_ASSET(2) char D_0D0030F8[] = "__OTR__common_data/D_0D0030F8"; static const ALIGN_ASSET(2) char D_0D003128[] = "__OTR__common_data/D_0D003128"; @@ -95,6 +103,8 @@ static const ALIGN_ASSET(2) char D_0D003218[] = "__OTR__common_data/D_0D003218"; static const ALIGN_ASSET(2) char D_0D003248[] = "__OTR__common_data/D_0D003248"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_3278[] = "__OTR__common_data/common_data_seg13_gfx_3278"; + static const ALIGN_ASSET(2) char D_0D003278[] = "__OTR__common_data/D_0D003278"; static const ALIGN_ASSET(2) char D_0D003288[] = "__OTR__common_data/D_0D003288"; @@ -125,6 +135,8 @@ static const ALIGN_ASSET(2) char D_0D0052B8[] = "__OTR__common_data/D_0D0052B8"; static const ALIGN_ASSET(2) char D_0D005308[] = "__OTR__common_data/D_0D005308"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_5308[] = "__OTR__common_data/common_data_seg13_gfx_5308"; + static const ALIGN_ASSET(2) char D_0D005338[] = "__OTR__common_data/D_0D005338"; static const ALIGN_ASSET(2) char D_0D005368[] = "__OTR__common_data/D_0D005368"; @@ -201,14 +213,20 @@ static const ALIGN_ASSET(2) char D_0D006930[] = "__OTR__common_data/D_0D006930"; static const ALIGN_ASSET(2) char common_rectangle_display[] = "__OTR__common_data/common_rectangle_display"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_6940[] = "__OTR__common_data/common_data_seg13_gfx_6940"; + static const ALIGN_ASSET(2) char D_0D006950[] = "__OTR__common_data/D_0D006950"; static const ALIGN_ASSET(2) char D_0D006968[] = "__OTR__common_data/D_0D006968"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_6980[] = "__OTR__common_data/common_data_seg13_gfx_6980"; + static const ALIGN_ASSET(2) char D_0D006980[] = "__OTR__common_data/D_0D006980"; static const ALIGN_ASSET(2) char D_0D006998[] = "__OTR__common_data/D_0D006998"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_69B0[] = "__OTR__common_data/common_data_seg13_gfx_69B0"; + static const ALIGN_ASSET(2) char D_0D0069B0[] = "__OTR__common_data/D_0D0069B0"; static const ALIGN_ASSET(2) char D_0D0069C8[] = "__OTR__common_data/D_0D0069C8"; @@ -219,6 +237,8 @@ static const ALIGN_ASSET(2) char D_0D0069F8[] = "__OTR__common_data/D_0D0069F8"; static const ALIGN_ASSET(2) char D_0D006A10[] = "__OTR__common_data/D_0D006A10"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_6A10[] = "__OTR__common_data/common_data_seg13_gfx_6A10"; + static const ALIGN_ASSET(2) char D_0D006A28[] = "__OTR__common_data/D_0D006A28"; static const ALIGN_ASSET(2) char D_0D006A40[] = "__OTR__common_data/D_0D006A40"; @@ -233,6 +253,8 @@ static const ALIGN_ASSET(2) char common_texture_debug_font[] = "__OTR__common_da static const ALIGN_ASSET(2) char D_0D0076F8[] = "__OTR__common_data/D_0D0076F8"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7780[] = "__OTR__common_data/common_data_seg13_gfx_7780"; + static const ALIGN_ASSET(2) char D_0D007780[] = "__OTR__common_data/D_0D007780"; static const ALIGN_ASSET(2) char D_0D0077A0[] = "__OTR__common_data/D_0D0077A0"; @@ -253,6 +275,8 @@ static const ALIGN_ASSET(2) char D_0D0078D0[] = "__OTR__common_data/D_0D0078D0"; static const ALIGN_ASSET(2) char D_0D0078F8[] = "__OTR__common_data/D_0D0078F8"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_78F8[] = "__OTR__common_data/common_data_seg13_gfx_78F8"; + static const ALIGN_ASSET(2) char D_0D007928[] = "__OTR__common_data/D_0D007928"; static const ALIGN_ASSET(2) char D_0D007948[] = "__OTR__common_data/D_0D007948"; @@ -269,6 +293,8 @@ static const ALIGN_ASSET(2) char D_0D0079E8[] = "__OTR__common_data/D_0D0079E8"; static const ALIGN_ASSET(2) char D_0D007A08[] = "__OTR__common_data/D_0D007A08"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7A08[] = "__OTR__common_data/common_data_seg13_gfx_7A08"; + static const ALIGN_ASSET(2) char D_0D007A40[] = "__OTR__common_data/D_0D007A40"; static const ALIGN_ASSET(2) char D_0D007A60[] = "__OTR__common_data/D_0D007A60"; @@ -289,6 +315,8 @@ static const ALIGN_ASSET(2) char D_0D007B98[] = "__OTR__common_data/D_0D007B98"; static const ALIGN_ASSET(2) char D_0D007C10[] = "__OTR__common_data/D_0D007C10"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7C88[] = "__OTR__common_data/common_data_seg13_gfx_7C88"; + static const ALIGN_ASSET(2) char D_0D007C88[] = "__OTR__common_data/D_0D007C88"; static const ALIGN_ASSET(2) char D_0D007CB8[] = "__OTR__common_data/D_0D007CB8"; @@ -327,6 +355,10 @@ static const ALIGN_ASSET(2) char D_0D007EB8[] = "__OTR__common_data/D_0D007EB8"; static const ALIGN_ASSET(2) char D_0D007ED8[] = "__OTR__common_data/D_0D007ED8"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7ED8[] = "__OTR__common_data/common_data_seg13_gfx_7ED8"; + +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7EF8[] = "__OTR__common_data/common_data_seg13_gfx_7EF8"; + static const ALIGN_ASSET(2) char D_0D007EF8[] = "__OTR__common_data/D_0D007EF8"; static const ALIGN_ASSET(2) char D_0D007F18[] = "__OTR__common_data/D_0D007F18"; @@ -341,12 +373,16 @@ static const ALIGN_ASSET(2) char D_0D007F98[] = "__OTR__common_data/D_0D007F98"; static const ALIGN_ASSET(2) char D_0D007FB8[] = "__OTR__common_data/D_0D007FB8"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7FB8[] = "__OTR__common_data/common_data_seg13_gfx_7FB8"; + static const ALIGN_ASSET(2) char D_0D007FE0[] = "__OTR__common_data/D_0D007FE0"; static const ALIGN_ASSET(2) char D_0D008000[] = "__OTR__common_data/D_0D008000"; static const ALIGN_ASSET(2) char D_0D008020[] = "__OTR__common_data/D_0D008020"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_8020[] = "__OTR__common_data/common_data_seg13_gfx_8020"; + static const ALIGN_ASSET(2) char D_0D008040[] = "__OTR__common_data/D_0D008040"; static const ALIGN_ASSET(2) char D_0D008060[] = "__OTR__common_data/D_0D008060"; @@ -369,6 +405,8 @@ static const ALIGN_ASSET(2) char D_0D008C38[] = "__OTR__common_data/D_0D008C38"; static const ALIGN_ASSET(2) char common_square_plain_render[] = "__OTR__common_data/common_square_plain_render"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_8C78[] = "__OTR__common_data/common_data_seg13_gfx_8C78"; + static const ALIGN_ASSET(2) char D_0D008C90[] = "__OTR__common_data/D_0D008C90"; static const ALIGN_ASSET(2) char common_setting_render_character[] = "__OTR__common_data/common_setting_render_character"; @@ -379,6 +417,8 @@ static const ALIGN_ASSET(2) char D_0D008D58[] = "__OTR__common_data/D_0D008D58"; static const ALIGN_ASSET(2) char D_0D008DA0[] = "__OTR__common_data/D_0D008DA0"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_8DA0[] = "__OTR__common_data/common_data_seg13_gfx_8DA0"; + static const ALIGN_ASSET(2) char D_0D008DB8[] = "__OTR__common_data/D_0D008DB8"; static const ALIGN_ASSET(2) char D_0D008DF8[] = "__OTR__common_data/D_0D008DF8"; @@ -806,5 +846,21 @@ static const char* common_texture_minimap_kart_character[] = { common_texture_minimap_kart_bowser, }; +static const ALIGN_ASSET(2) char common_texture_minimap_bowser[] = "__OTR__common_data/common_texture_minimap_bowser"; + static const ALIGN_ASSET(2) char common_texture_minimap_progress_dot[] = "__OTR__common_data/common_texture_minimap_progress_dot"; +static const ALIGN_ASSET(2) char common_texture_minimap_mario[] = "__OTR__common_data/common_texture_minimap_mario"; + +static const ALIGN_ASSET(2) char common_texture_minimap_luigi[] = "__OTR__common_data/common_texture_minimap_luigi"; + +static const ALIGN_ASSET(2) char common_texture_minimap_yoshi[] = "__OTR__common_data/common_texture_minimap_yoshi"; + +static const ALIGN_ASSET(2) char common_texture_minimap_toad[] = "__OTR__common_data/common_texture_minimap_toad"; + +static const ALIGN_ASSET(2) char common_texture_minimap_dk[] = "__OTR__common_data/common_texture_minimap_dk"; + +static const ALIGN_ASSET(2) char common_texture_minimap_wario[] = "__OTR__common_data/common_texture_minimap_wario"; + +static const ALIGN_ASSET(2) char common_texture_minimap_peach[] = "__OTR__common_data/common_texture_minimap_peach"; + diff --git a/include/assets/data_800E8700.h b/include/assets/data_800E8700.h index 3a7b1a1ec..a8c93fba1 100644 --- a/include/assets/data_800E8700.h +++ b/include/assets/data_800E8700.h @@ -47,10 +47,6 @@ static const ALIGN_ASSET(2) char D_800E8C00[] = "__OTR__data_800E8700/D_800E8C00 static const ALIGN_ASSET(2) char D_800E8C40[] = "__OTR__data_800E8700/D_800E8C40"; -static const ALIGN_ASSET(2) char data_800E8700_vtx_800E8C40[] = "__OTR__data_800E8700/data_800E8700_vtx_800E8C40"; - -static const ALIGN_ASSET(2) char data_800E8700_vtx_800E8CC0[] = "__OTR__data_800E8700/data_800E8700_vtx_800E8CC0"; - static const ALIGN_ASSET(2) char D_800E8CC0[] = "__OTR__data_800E8700/D_800E8CC0"; static const ALIGN_ASSET(2) char D_800E8D40[] = "__OTR__data_800E8700/D_800E8D40"; diff --git a/include/assets/dks_jungle_parkway_data.h b/include/assets/dks_jungle_parkway_data.h index 8ad06c510..b2de0ca16 100644 --- a/include/assets/dks_jungle_parkway_data.h +++ b/include/assets/dks_jungle_parkway_data.h @@ -4,6 +4,8 @@ #include #include +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_0[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_0[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_0"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_20[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_20"; @@ -252,10 +254,18 @@ static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_paddle_boat_model15 static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_unknown_light1[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_unknown_light1"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_lights_9DE8[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_lights_9DE8"; + +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_lights_9E00[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_lights_9E00"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_unknown_light2[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_unknown_light2"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_lights_9E18[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_lights_9E18"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_unknown_light3[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_unknown_light3"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_lights_9E30[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_lights_9E30"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_unknown_light4[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_unknown_light4"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_mario_sign[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_mario_sign"; @@ -270,40 +280,74 @@ static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_boat_railing[] = "_ static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_DE48[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_DE48"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_DE48[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_DE48"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_DF30[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_DF30"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_DF30[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_DF30"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E030[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E030"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E030[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E030"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E048[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E048"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E048[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E048"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_railings_dl[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_railings_dl"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E068[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E068"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E068[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E068"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E150[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E150"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E150[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E150"; + +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E238[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E238"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E238[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E238"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E250[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E250"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E250[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E250"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E310[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E310"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E310[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E310"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E320[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E320"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E320[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E320"; + +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E578[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E578"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E578[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E578"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E588[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E588"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E588[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E588"; + +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E618[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E618"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E618[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E618"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E628[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E628"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E628[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E628"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E688[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E688"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E688[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E688"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E6E8[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E6E8"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E6E8[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E6E8"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E700[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E700"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E700[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E700"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_boat_dl[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_boat_dl"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_paddle_boat_paddle_model1[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_paddle_boat_paddle_model1"; @@ -318,10 +362,16 @@ static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_boat_paddle2[] = "_ static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_FAE0[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_FAE0"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_FAE0[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_FAE0"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_FC08[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_FC08"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_FC08[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_FC08"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_FC18[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_FC18"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_FC18[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_FC18"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_paddle_wheel_dl[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_paddle_wheel_dl"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_FC38[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_FC38"; diff --git a/include/assets/kalimari_desert_data.h b/include/assets/kalimari_desert_data.h index afd550927..2e6eb5951 100644 --- a/include/assets/kalimari_desert_data.h +++ b/include/assets/kalimari_desert_data.h @@ -298,28 +298,50 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod2_locomotiv static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B7C0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B7C0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1B7C0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1B7C0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B850[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B850"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1B850[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1B850"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B950[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B950"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1B950[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1B950"; + +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1B968[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1B968"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B968[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B968"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B978[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B978"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1B990[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1B990"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B990[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B990"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1BD18[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1BD18"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1BD18[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1BD18"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1BD58[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1BD58"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1BD58[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1BD58"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1BEF8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1BEF8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1BEF8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1BEF8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1BF90[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1BF90"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1BF90[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1BF90"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1C0B0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1C0B0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1C0B0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1C0B0"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1C0E0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1C0E0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1C0E0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1C0E0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1C0F0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1C0F0"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_locomotive_model_lod1[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_locomotive_model_lod1"; @@ -352,30 +374,52 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod1_locomotiv static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod1_locomotive_model14[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod1_locomotive_model14"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1CFA8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1CFA8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1CFA8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1CFA8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D038[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D038"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D038[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D038"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D138[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D138"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D138[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D138"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D150[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D150"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D150[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D150"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D160[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D160"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D178[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D178"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D178[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D178"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D418[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D418"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D418[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D418"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D450[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D450"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D450[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D450"; + +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D540[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D540"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D540[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D540"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D598[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D598"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D598[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D598"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D630[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D630"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D630[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D630"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D660[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D660"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D660[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D660"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D670[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D670"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_locomotive_model_lod0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_locomotive_model_lod0"; @@ -406,30 +450,52 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_locomotiv static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_locomotive_model13[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod0_locomotive_model13"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E2C8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E2C8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E2C8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E2C8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E358[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E358"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E358[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E358"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E458[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E458"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E458[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E458"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E470[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E470"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E470[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E470"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E480[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E480"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E498[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E498"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E498[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E498"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E6D8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E6D8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E6D8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E6D8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E710[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E710"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E710[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E710"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E800[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E800"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E800[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E800"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E858[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E858"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E858[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E858"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E8D0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E8D0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E8D0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E8D0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E900[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E900"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E900[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E900"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E910[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E910"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_tender_model_lod2[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_tender_model_lod2"; @@ -442,16 +508,26 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod2_tender_mo static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod2_tender_model4[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod2_tender_model4"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1EFD8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1EFD8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1EFD8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1EFD8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F050[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F050"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F050[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F050"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F0D8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F0D8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F0D8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F0D8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F1F8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F1F8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F1F8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F1F8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F218[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F218"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F218[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F218"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F228[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F228"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_tender_model_lod1[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_tender_model_lod1"; @@ -460,14 +536,22 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod1_tender_mo static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod1_tender_model2[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod1_tender_model2"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F570[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F570"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F570[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F570"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F5E0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F5E0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F5E0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F5E0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F6E0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F6E0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F6E0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F6E0"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F6F8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F6F8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F6F8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F6F8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F708[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F708"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F720[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F720"; @@ -478,14 +562,22 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_tender_mo static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_tender_model2[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod0_tender_model2"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F988[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F988"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F988[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F988"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F9D8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F9D8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F9D8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F9D8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1FAD0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1FAD0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1FAD0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1FAD0"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1FAE8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1FAE8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1FAE8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1FAE8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1FAF8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1FAF8"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1FB10[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1FB10"; @@ -512,24 +604,44 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod2_carriage_ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod2_carriage_chassis_model10[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod2_carriage_chassis_model10"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20578[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20578"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20578[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20578"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20610[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20610"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20610[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20610"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20620[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20620"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20620[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20620"; + +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20630[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20630"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20630[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20630"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20688[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20688"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20688[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20688"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_208A0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_208A0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_208A0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_208A0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20928[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20928"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20928[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20928"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20980[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20980"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20980[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20980"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_209C8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_209C8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_209C8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_209C8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_209F8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_209F8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_209F8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_209F8"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20A08[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20A08"; @@ -556,24 +668,42 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod1_carriage_ static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21178[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21178"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21178[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21178"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21200[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21200"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21200[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21200"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21210[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21210"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21210[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21210"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21220[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21220"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21238[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21238"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21238[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21238"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21288[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21288"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21288[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21288"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21480[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21480"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21480[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21480"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_214D0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_214D0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_214D0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_214D0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21518[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21518"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21518[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21518"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21540[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21540"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21540[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21540"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21550[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21550"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_carriage_model_lod0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_carriage_model_lod0"; @@ -588,24 +718,42 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_carriage_ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_carriage_model5[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod0_carriage_model5"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_219D8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_219D8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_219D8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_219D8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21A60[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21A60"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21A60[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21A60"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21A70[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21A70"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21A70[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21A70"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21A80[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21A80"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21A98[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21A98"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21A98[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21A98"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21AE8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21AE8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21AE8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21AE8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21BC0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21BC0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21BC0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21BC0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21C10[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21C10"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21C10[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21C10"; + +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21C58[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21C58"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21C58[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21C58"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21C80[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21C80"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21C80[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21C80"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21C90[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21C90"; diff --git a/include/assets/koopa_troopa_beach_data.h b/include/assets/koopa_troopa_beach_data.h index 5a2d791d3..871da13f6 100644 --- a/include/assets/koopa_troopa_beach_data.h +++ b/include/assets/koopa_troopa_beach_data.h @@ -6,8 +6,12 @@ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_0[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_0"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_0[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_48[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_48"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_48[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_48"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_90[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_90"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_118[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_118"; @@ -634,6 +638,8 @@ static const char* d_course_koopa_troopa_beach_crab_frames[] = { gTextureCrab7, }; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_lights_14BE8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_lights_14BE8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_light1[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_light1"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_bird_wing[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_bird_wing"; @@ -664,6 +670,8 @@ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_bird_wing_3_model[] static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_16990[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_16990"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_lights_16B78[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_lights_16B78"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_light2[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_light2"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_tree_model[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_tree_model"; @@ -676,12 +684,20 @@ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_palm_trunk[] = "__O static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18520[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18520"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18520[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18520"; + +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_185E8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_185E8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_185E8[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_185E8"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_top1[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_top1"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18608[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18608"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18608[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18608"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_186A8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_186A8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_186A8[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_186A8"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_trunk1[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_trunk1"; @@ -692,14 +708,24 @@ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_unknown_model5[] = static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_light3[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_light3"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_lights_18858[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_lights_18858"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18870[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18870"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18870[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18870"; + +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18938[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18938"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18938[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18938"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_top2[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_top2"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18958[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18958"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18958[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18958"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_189F8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_189F8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_189F8[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_189F8"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_trunk2[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_trunk2"; @@ -708,16 +734,26 @@ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_tree_3_model[] = "_ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_unknown_model6[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_unknown_model6"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_lights_18BA8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_lights_18BA8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_light4[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_light4"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18BC0[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18BC0"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18BC0[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18BC0"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18C88[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18C88"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18C88[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18C88"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_top3[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_top3"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18CA8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18CA8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18CA8[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18CA8"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18D48[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18D48"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18D48[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18D48"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_trunk3[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_trunk3"; diff --git a/include/assets/luigi_raceway_data.h b/include/assets/luigi_raceway_data.h index b836e01ad..dfab48ddf 100644 --- a/include/assets/luigi_raceway_data.h +++ b/include/assets/luigi_raceway_data.h @@ -260,6 +260,8 @@ static const ALIGN_ASSET(2) char d_course_luigi_raceway_unknown_model4[] = "__OT static const ALIGN_ASSET(2) char d_course_luigi_raceway_unknown_model5[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_unknown_model5"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_lights_C3A0[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_lights_C3A0"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_light1[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_light1"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_basket_model_lod1[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_basket_model_lod1"; @@ -278,44 +280,76 @@ static const ALIGN_ASSET(2) char d_course_luigi_raceway_balloon_basket[] = "__OT static const ALIGN_ASSET(2) char d_course_luigi_raceway_balloon_rope[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_balloon_rope"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F588[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F588"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F588[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F588"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F630[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F630"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F630[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F630"; + +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F640[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F640"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F640[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F640"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F650[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F650"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F660[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F660"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F660[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F660"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F718[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F718"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F718[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F718"; + +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F728[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F728"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F728[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F728"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F938[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F938"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F938[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F938"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F948[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F948"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F948[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F948"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F960[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F960"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F970[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F970"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F970[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F970"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FA00[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FA00"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FA00[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FA00"; + +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FA10[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FA10"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FA10[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FA10"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FA20[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FA20"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FA30[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FA30"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FA30[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FA30"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FB10[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FB10"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FB10[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FB10"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FB20[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FB20"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FB20[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FB20"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FBB8[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FBB8"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FBB8[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FBB8"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FBC8[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FBC8"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FBC8[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FBC8"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FBE0[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FBE0"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_tree_model[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_tree_model"; diff --git a/include/assets/mario_raceway_data.h b/include/assets/mario_raceway_data.h index b8e8cf921..e21a221d2 100644 --- a/include/assets/mario_raceway_data.h +++ b/include/assets/mario_raceway_data.h @@ -176,14 +176,26 @@ static const ALIGN_ASSET(2) char d_course_mario_sign_right[] = "__OTR__mario_rac static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_9068[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_9068"; +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_9068[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_9068"; + +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_90B0[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_90B0"; + static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_90B0[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_90B0"; +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_90C0[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_90C0"; + static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_90C0[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_90C0"; +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_9190[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_9190"; + static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_9190[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_9190"; +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_9250[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_9250"; + static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_9250[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_9250"; +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_9310[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_9310"; + static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_9310[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_9310"; static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_sign[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_sign"; diff --git a/include/assets/moo_moo_farm_data.h b/include/assets/moo_moo_farm_data.h index bc6b9f9fb..cf98fff63 100644 --- a/include/assets/moo_moo_farm_data.h +++ b/include/assets/moo_moo_farm_data.h @@ -6,12 +6,20 @@ static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_0[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_0"; +static const ALIGN_ASSET(2) char moo_moo_farm_data_seg6_gfx_0[] = "__OTR__moo_moo_farm_data/moo_moo_farm_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_30[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_30"; +static const ALIGN_ASSET(2) char moo_moo_farm_data_seg6_gfx_30[] = "__OTR__moo_moo_farm_data/moo_moo_farm_data_seg6_gfx_30"; + +static const ALIGN_ASSET(2) char moo_moo_farm_data_seg6_gfx_48[] = "__OTR__moo_moo_farm_data/moo_moo_farm_data_seg6_gfx_48"; + static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_48[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_48"; static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_60[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_60"; +static const ALIGN_ASSET(2) char moo_moo_farm_data_seg6_gfx_60[] = "__OTR__moo_moo_farm_data/moo_moo_farm_data_seg6_gfx_60"; + static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_78[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_78"; static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_88[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_88"; @@ -241,6 +249,8 @@ static const ALIGN_ASSET(2) char d_course_moo_moo_farm_unknown_model2[] = "__OTR static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_13B88[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_13B88"; +static const ALIGN_ASSET(2) char moo_moo_farm_data_seg6_gfx_13B88[] = "__OTR__moo_moo_farm_data/moo_moo_farm_data_seg6_gfx_13B88"; + static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_cow1[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_cow1"; static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_cow2[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_cow2"; diff --git a/include/assets/other_textures.h b/include/assets/other_textures.h index 563f0445c..43467811b 100644 --- a/include/assets/other_textures.h +++ b/include/assets/other_textures.h @@ -573,37 +573,53 @@ static const ALIGN_ASSET(2) char gTexture68DEC0[] = "__OTR__other_textures/textu static const ALIGN_ASSET(2) char gTexture68E2D0[] = "__OTR__other_textures/texture_68E2D0"; -static const ALIGN_ASSET(2) char gTextureGreenShell0[] = "__OTR__other_textures/gTextureGreenShell0"; +static const ALIGN_ASSET(2) char texture_red_shell_0[] = "__OTR__other_textures/texture_red_shell_0"; -static const ALIGN_ASSET(2) char gTextureGreenShell1[] = "__OTR__other_textures/gTextureGreenShell1"; +static const ALIGN_ASSET(2) char texture_green_shell_0[] = "__OTR__other_textures/texture_green_shell_0"; -static const ALIGN_ASSET(2) char gTextureGreenShell2[] = "__OTR__other_textures/gTextureGreenShell2"; +static const ALIGN_ASSET(2) char texture_green_shell_1[] = "__OTR__other_textures/texture_green_shell_1"; -static const ALIGN_ASSET(2) char gTextureGreenShell3[] = "__OTR__other_textures/gTextureGreenShell3"; +static const ALIGN_ASSET(2) char texture_red_shell_1[] = "__OTR__other_textures/texture_red_shell_1"; -static const ALIGN_ASSET(2) char gTextureGreenShell4[] = "__OTR__other_textures/gTextureGreenShell4"; +static const ALIGN_ASSET(2) char texture_green_shell_2[] = "__OTR__other_textures/texture_green_shell_2"; -static const ALIGN_ASSET(2) char gTextureGreenShell5[] = "__OTR__other_textures/gTextureGreenShell5"; +static const ALIGN_ASSET(2) char texture_red_shell_2[] = "__OTR__other_textures/texture_red_shell_2"; -static const ALIGN_ASSET(2) char gTextureGreenShell6[] = "__OTR__other_textures/gTextureGreenShell6"; +static const ALIGN_ASSET(2) char texture_green_shell_3[] = "__OTR__other_textures/texture_green_shell_3"; -static const ALIGN_ASSET(2) char gTextureGreenShell7[] = "__OTR__other_textures/gTextureGreenShell7"; +static const ALIGN_ASSET(2) char texture_red_shell_3[] = "__OTR__other_textures/texture_red_shell_3"; -static const ALIGN_ASSET(2) char gTextureBlueShell0[] = "__OTR__other_textures/gTextureBlueShell0"; +static const ALIGN_ASSET(2) char texture_red_shell_4[] = "__OTR__other_textures/texture_red_shell_4"; -static const ALIGN_ASSET(2) char gTextureBlueShell1[] = "__OTR__other_textures/gTextureBlueShell1"; +static const ALIGN_ASSET(2) char texture_green_shell_4[] = "__OTR__other_textures/texture_green_shell_4"; -static const ALIGN_ASSET(2) char gTextureBlueShell2[] = "__OTR__other_textures/gTextureBlueShell2"; +static const ALIGN_ASSET(2) char texture_green_shell_5[] = "__OTR__other_textures/texture_green_shell_5"; -static const ALIGN_ASSET(2) char gTextureBlueShell3[] = "__OTR__other_textures/gTextureBlueShell3"; +static const ALIGN_ASSET(2) char texture_red_shell_5[] = "__OTR__other_textures/texture_red_shell_5"; -static const ALIGN_ASSET(2) char gTextureBlueShell4[] = "__OTR__other_textures/gTextureBlueShell4"; +static const ALIGN_ASSET(2) char texture_green_shell_6[] = "__OTR__other_textures/texture_green_shell_6"; -static const ALIGN_ASSET(2) char gTextureBlueShell5[] = "__OTR__other_textures/gTextureBlueShell5"; +static const ALIGN_ASSET(2) char texture_red_shell_6[] = "__OTR__other_textures/texture_red_shell_6"; -static const ALIGN_ASSET(2) char gTextureBlueShell6[] = "__OTR__other_textures/gTextureBlueShell6"; +static const ALIGN_ASSET(2) char texture_green_shell_7[] = "__OTR__other_textures/texture_green_shell_7"; -static const ALIGN_ASSET(2) char gTextureBlueShell7[] = "__OTR__other_textures/gTextureBlueShell7"; +static const ALIGN_ASSET(2) char texture_red_shell_7[] = "__OTR__other_textures/texture_red_shell_7"; + +static const ALIGN_ASSET(2) char texture_blue_shell_0[] = "__OTR__other_textures/texture_blue_shell_0"; + +static const ALIGN_ASSET(2) char texture_blue_shell_1[] = "__OTR__other_textures/texture_blue_shell_1"; + +static const ALIGN_ASSET(2) char texture_blue_shell_2[] = "__OTR__other_textures/texture_blue_shell_2"; + +static const ALIGN_ASSET(2) char texture_blue_shell_3[] = "__OTR__other_textures/texture_blue_shell_3"; + +static const ALIGN_ASSET(2) char texture_blue_shell_4[] = "__OTR__other_textures/texture_blue_shell_4"; + +static const ALIGN_ASSET(2) char texture_blue_shell_5[] = "__OTR__other_textures/texture_blue_shell_5"; + +static const ALIGN_ASSET(2) char texture_blue_shell_6[] = "__OTR__other_textures/texture_blue_shell_6"; + +static const ALIGN_ASSET(2) char texture_blue_shell_7[] = "__OTR__other_textures/texture_blue_shell_7"; static const ALIGN_ASSET(2) char gTextureQuestionMarkYellow[] = "__OTR__other_textures/question_mark_yellow"; @@ -709,11 +725,11 @@ static const ALIGN_ASSET(2) char gTexture69B03C[] = "__OTR__other_textures/textu static const ALIGN_ASSET(2) char gTexture69B140[] = "__OTR__other_textures/texture_69B140"; -static const ALIGN_ASSET(2) char gTexture69B378[] = "__OTR__other_textures/texture_69B378"; +static const ALIGN_ASSET(2) char gGrassParticle[] = "__OTR__other_textures/gGrassParticle"; -static const ALIGN_ASSET(2) char gTexture69B960[] = "__OTR__other_textures/texture_69B960"; +static const ALIGN_ASSET(2) char gTextureMusicNote[] = "__OTR__other_textures/texture_69B960"; -static const ALIGN_ASSET(2) char gTexture69BA28[] = "__OTR__other_textures/texture_69BA28"; +static const ALIGN_ASSET(2) char gTextureSpeechBubble[] = "__OTR__other_textures/texture_69BA28"; static const ALIGN_ASSET(2) char gTextureBoingExclamation[] = "__OTR__other_textures/boing_exclamation"; @@ -725,9 +741,9 @@ static const ALIGN_ASSET(2) char gTexture69C090[] = "__OTR__other_textures/textu static const ALIGN_ASSET(2) char gTexture69C1E8[] = "__OTR__other_textures/texture_69C1E8"; -static const ALIGN_ASSET(2) char gTexture69C354[] = "__OTR__other_textures/texture_69C354"; +static const ALIGN_ASSET(2) char gTextureSmokePuff[] = "__OTR__other_textures/texture_69C354"; -static const ALIGN_ASSET(2) char gTexture69C4E4[] = "__OTR__other_textures/texture_69C4E4"; +static const ALIGN_ASSET(2) char gGroundDust[] = "__OTR__other_textures/gGroundDust"; static const ALIGN_ASSET(2) char gTexture69C80C[] = "__OTR__other_textures/texture_69C80C"; @@ -1027,45 +1043,45 @@ static const ALIGN_ASSET(2) char gTextureExhaust4[] = "__OTR__other_textures/exh static const ALIGN_ASSET(2) char gTextureExhaust5[] = "__OTR__other_textures/exhaust_5"; -static const ALIGN_ASSET(2) char gTextureLogoMarioKart64[] = "__OTR__other_textures/logo_mario_kart_64"; +static const ALIGN_ASSET(2) char logo_mario_kart_64[] = "__OTR__other_textures/logo_mario_kart_64"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineMarioRaceway[] = "__OTR__other_textures/gTextureCourseOutlineMarioRaceway"; +static const ALIGN_ASSET(2) char minimap_mario_raceway[] = "__OTR__other_textures/minimap_mario_raceway"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineChocoMountain[] = "__OTR__other_textures/gTextureCourseOutlineChocoMountain"; +static const ALIGN_ASSET(2) char minimap_choco_mountain[] = "__OTR__other_textures/minimap_choco_mountain"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineBowsersCastle[] = "__OTR__other_textures/gTextureCourseOutlineBowsersCastle"; +static const ALIGN_ASSET(2) char minimap_bowsers_castle[] = "__OTR__other_textures/minimap_bowsers_castle"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineBansheeBoardwalk[] = "__OTR__other_textures/gTextureCourseOutlineBansheeBoardwalk"; +static const ALIGN_ASSET(2) char minimap_banshee_boardwalk[] = "__OTR__other_textures/minimap_banshee_boardwalk"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineYoshiValley[] = "__OTR__other_textures/gTextureCourseOutlineYoshiValley"; +static const ALIGN_ASSET(2) char minimap_yoshi_valley[] = "__OTR__other_textures/minimap_yoshi_valley"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineFrappeSnowland[] = "__OTR__other_textures/gTextureCourseOutlineFrappeSnowland"; +static const ALIGN_ASSET(2) char minimap_frappe_snowland[] = "__OTR__other_textures/minimap_frappe_snowland"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineKoopaTroopaBeach[] = "__OTR__other_textures/gTextureCourseOutlineKoopaTroopaBeach"; +static const ALIGN_ASSET(2) char minimap_koopa_troopa_beach[] = "__OTR__other_textures/minimap_koopa_troopa_beach"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineRoyalRaceway[] = "__OTR__other_textures/gTextureCourseOutlineRoyalRaceway"; +static const ALIGN_ASSET(2) char minimap_royal_raceway[] = "__OTR__other_textures/minimap_royal_raceway"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineLuigiRaceway[] = "__OTR__other_textures/gTextureCourseOutlineLuigiRaceway"; +static const ALIGN_ASSET(2) char minimap_luigi_raceway[] = "__OTR__other_textures/minimap_luigi_raceway"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineMooMooFarm[] = "__OTR__other_textures/gTextureCourseOutlineMooMooFarm"; +static const ALIGN_ASSET(2) char minimap_moo_moo_farm[] = "__OTR__other_textures/minimap_moo_moo_farm"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineToadsTurnpike[] = "__OTR__other_textures/gTextureCourseOutlineToadsTurnpike"; +static const ALIGN_ASSET(2) char minimap_toads_turnpike[] = "__OTR__other_textures/minimap_toads_turnpike"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineKalimariDesert[] = "__OTR__other_textures/gTextureCourseOutlineKalimariDesert"; +static const ALIGN_ASSET(2) char minimap_kalimari_desert[] = "__OTR__other_textures/minimap_kalimari_desert"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineSherbetLand[] = "__OTR__other_textures/gTextureCourseOutlineSherbetLand"; +static const ALIGN_ASSET(2) char minimap_sherbet_land[] = "__OTR__other_textures/minimap_sherbet_land"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineRainbowRoad[] = "__OTR__other_textures/gTextureCourseOutlineRainbowRoad"; +static const ALIGN_ASSET(2) char minimap_rainbow_road[] = "__OTR__other_textures/minimap_rainbow_road"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineWarioStadium[] = "__OTR__other_textures/gTextureCourseOutlineWarioStadium"; +static const ALIGN_ASSET(2) char minimap_wario_stadium[] = "__OTR__other_textures/minimap_wario_stadium"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineBlockFort[] = "__OTR__other_textures/gTextureCourseOutlineBlockFort"; +static const ALIGN_ASSET(2) char minimap_block_fort[] = "__OTR__other_textures/minimap_block_fort"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineSkyscraper[] = "__OTR__other_textures/gTextureCourseOutlineSkyscraper"; +static const ALIGN_ASSET(2) char minimap_skyscraper[] = "__OTR__other_textures/minimap_skyscraper"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineDoubleDeck[] = "__OTR__other_textures/gTextureCourseOutlineDoubleDeck"; +static const ALIGN_ASSET(2) char minimap_double_deck[] = "__OTR__other_textures/minimap_double_deck"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineDksJungleParkway[] = "__OTR__other_textures/gTextureCourseOutlineDksJungleParkway"; +static const ALIGN_ASSET(2) char minimap_dks_jungle_parkway[] = "__OTR__other_textures/minimap_dks_jungle_parkway"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineBigDonut[] = "__OTR__other_textures/gTextureCourseOutlineBigDonut"; +static const ALIGN_ASSET(2) char minimap_big_donut[] = "__OTR__other_textures/minimap_big_donut"; diff --git a/include/assets/player_selection.h b/include/assets/player_selection.h index 483b341ff..940c55c1a 100644 --- a/include/assets/player_selection.h +++ b/include/assets/player_selection.h @@ -328,9 +328,9 @@ static const ALIGN_ASSET(2) char gTextureCupSilver[] = "__OTR__player_selection/ static const ALIGN_ASSET(2) char gTextureCupBronze[] = "__OTR__player_selection/cup_bronze"; -static const ALIGN_ASSET(2) char gTexturePushStartButton[] = "__OTR__player_selection/push_start_button"; +static const ALIGN_ASSET(2) char push_start_button[] = "__OTR__player_selection/push_start_button"; -static const ALIGN_ASSET(2) char gTextureCopyright1996[] = "__OTR__player_selection/copyright_1996"; +static const ALIGN_ASSET(2) char copyright_1996[] = "__OTR__player_selection/copyright_1996"; static const ALIGN_ASSET(2) char gTextureP1BorderBlue[] = "__OTR__player_selection/p1_border_blue"; @@ -340,7 +340,7 @@ static const ALIGN_ASSET(2) char gTextureP3BorderOrange[] = "__OTR__player_selec static const ALIGN_ASSET(2) char gTextureP4BorderGreen[] = "__OTR__player_selection/p4_border_green"; -static const ALIGN_ASSET(2) char gTextureSmallGreenTriangle[] = "__OTR__player_selection/small_green_triangle"; +static const ALIGN_ASSET(2) char texture_small_green_triangle[] = "__OTR__player_selection/texture_small_green_triangle"; static const ALIGN_ASSET(2) char gTexture7E56E4[] = "__OTR__player_selection/texture_7E56E4"; diff --git a/include/assets/rainbow_road_data.h b/include/assets/rainbow_road_data.h index 001d0774c..830110eb3 100644 --- a/include/assets/rainbow_road_data.h +++ b/include/assets/rainbow_road_data.h @@ -6,8 +6,12 @@ static const ALIGN_ASSET(2) char d_course_rainbow_road_dl_0[] = "__OTR__rainbow_road_data/d_course_rainbow_road_dl_0"; +static const ALIGN_ASSET(2) char rainbow_road_data_seg6_gfx_0[] = "__OTR__rainbow_road_data/rainbow_road_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_rainbow_road_dl_80[] = "__OTR__rainbow_road_data/d_course_rainbow_road_dl_80"; +static const ALIGN_ASSET(2) char rainbow_road_data_seg6_gfx_80[] = "__OTR__rainbow_road_data/rainbow_road_data_seg6_gfx_80"; + static const ALIGN_ASSET(2) char d_course_rainbow_road_dl_D8[] = "__OTR__rainbow_road_data/d_course_rainbow_road_dl_D8"; static const ALIGN_ASSET(2) char d_course_rainbow_road_dl_178[] = "__OTR__rainbow_road_data/d_course_rainbow_road_dl_178"; @@ -218,6 +222,8 @@ static const char* d_course_rainbow_road_static_textures[] = { static const ALIGN_ASSET(2) char d_course_rainbow_road_light1[] = "__OTR__rainbow_road_data/d_course_rainbow_road_light1"; +static const ALIGN_ASSET(2) char rainbow_road_data_seg6_lights_12010[] = "__OTR__rainbow_road_data/rainbow_road_data_seg6_lights_12010"; + static const ALIGN_ASSET(2) char d_course_rainbow_road_sphere[] = "__OTR__rainbow_road_data/d_course_rainbow_road_sphere"; static const ALIGN_ASSET(2) char d_course_rainbow_road_reflection_map_metal[] = "__OTR__rainbow_road_data/d_course_rainbow_road_reflection_map_metal"; diff --git a/include/assets/sherbet_land_data.h b/include/assets/sherbet_land_data.h index 1d93b5a3d..a9329036a 100644 --- a/include/assets/sherbet_land_data.h +++ b/include/assets/sherbet_land_data.h @@ -308,24 +308,40 @@ static const ALIGN_ASSET(2) char d_course_sherbet_land_ice[] = "__OTR__sherbet_l static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_70E8[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_70E8"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_gfx_70E8[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_gfx_70E8"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_7208[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_7208"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_gfx_7208[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_gfx_7208"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_ice_block[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_ice_block"; static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_7228[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_7228"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_7240[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_7240"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light1[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light1"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_7258[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_7258"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light2[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light2"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_7270[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_7270"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light3[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light3"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_7288[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_7288"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light4[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light4"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_72A0[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_72A0"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light5[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light5"; static const ALIGN_ASSET(2) char d_course_sherbet_land_light6[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light6"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_72D0[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_72D0"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light7[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light7"; static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_beak[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_beak"; @@ -334,16 +350,22 @@ static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_eye[] = "__OTR__s static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_eyes_model[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_eyes_model"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_gfx_8368[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_gfx_8368"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_8368[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_8368"; static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_nose_model[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_nose_model"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_gfx_83D8[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_gfx_83D8"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_83D8[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_83D8"; static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_head_model1[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_head_model1"; static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_head_model2[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_head_model2"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_gfx_85B0[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_gfx_85B0"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_85B0[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_85B0"; static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_arms_model[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_arms_model"; diff --git a/include/assets/startup_logo.h b/include/assets/startup_logo.h index 9c13fb61b..bebe0478f 100644 --- a/include/assets/startup_logo.h +++ b/include/assets/startup_logo.h @@ -54,22 +54,38 @@ static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_2740[] = "__OTR__startup_ static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_2940[] = "__OTR__startup_logo/startup_logo_seg6_vtx_2940"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_2B00[] = "__OTR__startup_logo/startup_logo_seg6_gfx_2B00"; + static const ALIGN_ASSET(2) char startup_logo_dl[] = "__OTR__startup_logo/dl1"; static const ALIGN_ASSET(2) char startup_logo_dl2[] = "__OTR__startup_logo/dl2"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_2C88[] = "__OTR__startup_logo/startup_logo_seg6_gfx_2C88"; + +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_2D58[] = "__OTR__startup_logo/startup_logo_seg6_gfx_2D58"; + static const ALIGN_ASSET(2) char startup_logo_dl3[] = "__OTR__startup_logo/dl3"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_2F20[] = "__OTR__startup_logo/startup_logo_seg6_gfx_2F20"; + static const ALIGN_ASSET(2) char startup_logo_dl4[] = "__OTR__startup_logo/dl4"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_2FF0[] = "__OTR__startup_logo/startup_logo_seg6_gfx_2FF0"; + static const ALIGN_ASSET(2) char startup_logo_dl5[] = "__OTR__startup_logo/dl5"; static const ALIGN_ASSET(2) char startup_logo_dl6[] = "__OTR__startup_logo/dl6"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_3180[] = "__OTR__startup_logo/startup_logo_seg6_gfx_3180"; + static const ALIGN_ASSET(2) char startup_logo_dl7[] = "__OTR__startup_logo/dl7"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_3308[] = "__OTR__startup_logo/startup_logo_seg6_gfx_3308"; + static const ALIGN_ASSET(2) char startup_logo_dl8[] = "__OTR__startup_logo/dl8"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_33D8[] = "__OTR__startup_logo/startup_logo_seg6_gfx_33D8"; + static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_3538[] = "__OTR__startup_logo/startup_logo_seg6_vtx_3538"; static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_3738[] = "__OTR__startup_logo/startup_logo_seg6_vtx_3738"; @@ -148,38 +164,66 @@ static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_75A8[] = "__OTR__startup_ static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_77A8[] = "__OTR__startup_logo/startup_logo_seg6_vtx_77A8"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7988[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7988"; + static const ALIGN_ASSET(2) char startup_logo_dl9[] = "__OTR__startup_logo/dl9"; static const ALIGN_ASSET(2) char startup_logo_dl10[] = "__OTR__startup_logo/dl10"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7C18[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7C18"; + +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7CE8[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7CE8"; + static const ALIGN_ASSET(2) char startup_logo_dl11[] = "__OTR__startup_logo/dl11"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7E50[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7E50"; + static const ALIGN_ASSET(2) char startup_logo_dl12[] = "__OTR__startup_logo/dl12"; static const ALIGN_ASSET(2) char startup_logo_dl13[] = "__OTR__startup_logo/dl13"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7E90[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7E90"; + static const ALIGN_ASSET(2) char startup_logo_dl14[] = "__OTR__startup_logo/dl14"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7ED0[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7ED0"; + +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7F88[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7F88"; + static const ALIGN_ASSET(2) char startup_logo_dl15[] = "__OTR__startup_logo/dl15"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_80F0[] = "__OTR__startup_logo/startup_logo_seg6_gfx_80F0"; + static const ALIGN_ASSET(2) char startup_logo_dl16[] = "__OTR__startup_logo/dl16"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_8250[] = "__OTR__startup_logo/startup_logo_seg6_gfx_8250"; + static const ALIGN_ASSET(2) char startup_logo_dl17[] = "__OTR__startup_logo/dl17"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_83C8[] = "__OTR__startup_logo/startup_logo_seg6_gfx_83C8"; + static const ALIGN_ASSET(2) char startup_logo_dl18[] = "__OTR__startup_logo/dl18"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_8548[] = "__OTR__startup_logo/startup_logo_seg6_gfx_8548"; + static const ALIGN_ASSET(2) char startup_logo_dl19[] = "__OTR__startup_logo/dl19"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_87A0[] = "__OTR__startup_logo/startup_logo_seg6_gfx_87A0"; + static const ALIGN_ASSET(2) char startup_logo_dl20[] = "__OTR__startup_logo/dl20"; static const ALIGN_ASSET(2) char startup_reflection_map_gold[] = "__OTR__startup_logo/reflection_map_gold"; static const ALIGN_ASSET(2) char startup_texture_dl1[] = "__OTR__startup_logo/startup_texture_dl1"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_9248[] = "__OTR__startup_logo/startup_logo_seg6_gfx_9248"; + static const ALIGN_ASSET(2) char lights[] = "__OTR__startup_logo/lights"; static const ALIGN_ASSET(2) char startup_texture_dl2[] = "__OTR__startup_logo/startup_texture_dl2"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_9320[] = "__OTR__startup_logo/startup_logo_seg6_gfx_9320"; + static const ALIGN_ASSET(2) char startup_texture_dl3[] = "__OTR__startup_logo/startup_texture_dl3"; static const ALIGN_ASSET(2) char startup_texture_dl4[] = "__OTR__startup_logo/startup_texture_dl4"; diff --git a/include/assets/texture_data_2.h b/include/assets/texture_data_2.h index 1b61df8bc..17acda24f 100644 --- a/include/assets/texture_data_2.h +++ b/include/assets/texture_data_2.h @@ -149,7 +149,7 @@ static const ALIGN_ASSET(2) char gTexture7EEB18[] = "__OTR__texture_data_2/textu static const ALIGN_ASSET(2) char gTextureTinyFontMinus[] = "__OTR__texture_data_2/tiny_font_minus"; -static const ALIGN_ASSET(2) char gTextureTinyFontComma[] = "__OTR__texture_data_2/tiny_font_comma"; +static const ALIGN_ASSET(2) char gTextureTinyFontComma[] = "__OTR__texture_data_2/tiny_font_dot"; static const ALIGN_ASSET(2) char gTextureTinyFontForwardSlash[] = "__OTR__texture_data_2/tiny_font_forward_slash"; @@ -327,95 +327,95 @@ static const ALIGN_ASSET(2) char gTexture7F1038[] = "__OTR__texture_data_2/textu static const ALIGN_ASSET(2) char gTexture7F109C[] = "__OTR__texture_data_2/texture_7F109C"; -static const ALIGN_ASSET(2) char gTexture7F1124[] = "__OTR__texture_data_2/7F1124"; +static const ALIGN_ASSET(2) char font_four_dote[] = "__OTR__texture_data_2/font_four_dote"; -static const ALIGN_ASSET(2) char gTexture7F11F4[] = "__OTR__texture_data_2/7F11F4"; +static const ALIGN_ASSET(2) char font_cc[] = "__OTR__texture_data_2/font_cc"; -static const ALIGN_ASSET(2) char gTexture7F12C4[] = "__OTR__texture_data_2/7F12C4"; +static const ALIGN_ASSET(2) char font_double_quote[] = "__OTR__texture_data_2/font_double_quote"; -static const ALIGN_ASSET(2) char gTexture7F1394[] = "__OTR__texture_data_2/7F1394"; +static const ALIGN_ASSET(2) char font_exclamation_mark[] = "__OTR__texture_data_2/font_exclamation_mark"; -static const ALIGN_ASSET(2) char gTexture7F1464[] = "__OTR__texture_data_2/7F1464"; +static const ALIGN_ASSET(2) char font_minus[] = "__OTR__texture_data_2/font_minus"; -static const ALIGN_ASSET(2) char gTexture7F1534[] = "__OTR__texture_data_2/7F1534"; +static const ALIGN_ASSET(2) char font_dot[] = "__OTR__texture_data_2/7F1534"; -static const ALIGN_ASSET(2) char gTexture7F1604[] = "__OTR__texture_data_2/7F1604"; +static const ALIGN_ASSET(2) char font_plus[] = "__OTR__texture_data_2/font_plus"; -static const ALIGN_ASSET(2) char gTexture7F16D4[] = "__OTR__texture_data_2/7F16D4"; +static const ALIGN_ASSET(2) char font_interogation_mark[] = "__OTR__texture_data_2/7F16D4"; -static const ALIGN_ASSET(2) char gTexture7F17A4[] = "__OTR__texture_data_2/7F17A4"; +static const ALIGN_ASSET(2) char font_simple_quote[] = "__OTR__texture_data_2/7F17A4"; -static const ALIGN_ASSET(2) char gTexture7F1874[] = "__OTR__texture_data_2/7F1874"; +static const ALIGN_ASSET(2) char font_number_zero[] = "__OTR__texture_data_2/font_number_zero"; -static const ALIGN_ASSET(2) char gTexture7F1944[] = "__OTR__texture_data_2/7F1944"; +static const ALIGN_ASSET(2) char font_number_one[] = "__OTR__texture_data_2/font_number_one"; -static const ALIGN_ASSET(2) char gTexture7F1A14[] = "__OTR__texture_data_2/7F1A14"; +static const ALIGN_ASSET(2) char font_number_two[] = "__OTR__texture_data_2/font_number_two"; -static const ALIGN_ASSET(2) char gTexture7F1AE4[] = "__OTR__texture_data_2/7F1AE4"; +static const ALIGN_ASSET(2) char font_number_three[] = "__OTR__texture_data_2/font_number_three"; -static const ALIGN_ASSET(2) char gTexture7F1BB4[] = "__OTR__texture_data_2/7F1BB4"; +static const ALIGN_ASSET(2) char font_number_four[] = "__OTR__texture_data_2/font_number_four"; -static const ALIGN_ASSET(2) char gTexture7F1C84[] = "__OTR__texture_data_2/7F1C84"; +static const ALIGN_ASSET(2) char font_number_five[] = "__OTR__texture_data_2/font_number_five"; -static const ALIGN_ASSET(2) char gTexture7F1D54[] = "__OTR__texture_data_2/7F1D54"; +static const ALIGN_ASSET(2) char font_number_six[] = "__OTR__texture_data_2/font_number_six"; -static const ALIGN_ASSET(2) char gTexture7F1E24[] = "__OTR__texture_data_2/7F1E24"; +static const ALIGN_ASSET(2) char font_number_seven[] = "__OTR__texture_data_2/font_number_seven"; -static const ALIGN_ASSET(2) char gTexture7F1EF4[] = "__OTR__texture_data_2/7F1EF4"; +static const ALIGN_ASSET(2) char font_number_eight[] = "__OTR__texture_data_2/font_number_eight"; -static const ALIGN_ASSET(2) char gTexture7F1FC4[] = "__OTR__texture_data_2/7F1FC4"; +static const ALIGN_ASSET(2) char font_number_nine[] = "__OTR__texture_data_2/font_number_nine"; -static const ALIGN_ASSET(2) char gTexture7F2094[] = "__OTR__texture_data_2/7F2094"; +static const ALIGN_ASSET(2) char font_letter_A[] = "__OTR__texture_data_2/font_letter_A"; -static const ALIGN_ASSET(2) char gTexture7F2164[] = "__OTR__texture_data_2/7F2164"; +static const ALIGN_ASSET(2) char font_letter_B[] = "__OTR__texture_data_2/font_letter_B"; -static const ALIGN_ASSET(2) char gTexture7F2234[] = "__OTR__texture_data_2/7F2234"; +static const ALIGN_ASSET(2) char font_letter_C[] = "__OTR__texture_data_2/font_letter_C"; -static const ALIGN_ASSET(2) char gTexture7F2304[] = "__OTR__texture_data_2/7F2304"; +static const ALIGN_ASSET(2) char font_letter_D[] = "__OTR__texture_data_2/font_letter_D"; -static const ALIGN_ASSET(2) char gTexture7F23D4[] = "__OTR__texture_data_2/7F23D4"; +static const ALIGN_ASSET(2) char font_letter_E[] = "__OTR__texture_data_2/font_letter_E"; -static const ALIGN_ASSET(2) char gTexture7F24A4[] = "__OTR__texture_data_2/7F24A4"; +static const ALIGN_ASSET(2) char font_letter_F[] = "__OTR__texture_data_2/font_letter_F"; -static const ALIGN_ASSET(2) char gTexture7F2574[] = "__OTR__texture_data_2/7F2574"; +static const ALIGN_ASSET(2) char font_letter_G[] = "__OTR__texture_data_2/font_letter_G"; -static const ALIGN_ASSET(2) char gTexture7F2644[] = "__OTR__texture_data_2/7F2644"; +static const ALIGN_ASSET(2) char font_letter_H[] = "__OTR__texture_data_2/font_letter_H"; -static const ALIGN_ASSET(2) char gTexture7F2714[] = "__OTR__texture_data_2/7F2714"; +static const ALIGN_ASSET(2) char font_letter_I[] = "__OTR__texture_data_2/font_letter_I"; -static const ALIGN_ASSET(2) char gTexture7F27E4[] = "__OTR__texture_data_2/7F27E4"; +static const ALIGN_ASSET(2) char font_letter_J[] = "__OTR__texture_data_2/font_letter_J"; -static const ALIGN_ASSET(2) char gTexture7F28B4[] = "__OTR__texture_data_2/7F28B4"; +static const ALIGN_ASSET(2) char font_letter_K[] = "__OTR__texture_data_2/font_letter_K"; -static const ALIGN_ASSET(2) char gTexture7F2984[] = "__OTR__texture_data_2/7F2984"; +static const ALIGN_ASSET(2) char font_letter_L[] = "__OTR__texture_data_2/font_letter_L"; -static const ALIGN_ASSET(2) char gTexture7F2A54[] = "__OTR__texture_data_2/7F2A54"; +static const ALIGN_ASSET(2) char font_letter_M[] = "__OTR__texture_data_2/font_letter_M"; -static const ALIGN_ASSET(2) char gTexture7F2B24[] = "__OTR__texture_data_2/7F2B24"; +static const ALIGN_ASSET(2) char font_letter_N[] = "__OTR__texture_data_2/font_letter_N"; -static const ALIGN_ASSET(2) char gTexture7F2BF4[] = "__OTR__texture_data_2/7F2BF4"; +static const ALIGN_ASSET(2) char font_letter_O[] = "__OTR__texture_data_2/font_letter_O"; -static const ALIGN_ASSET(2) char gTexture7F2CC4[] = "__OTR__texture_data_2/7F2CC4"; +static const ALIGN_ASSET(2) char font_letter_P[] = "__OTR__texture_data_2/font_letter_P"; -static const ALIGN_ASSET(2) char gTexture7F2D94[] = "__OTR__texture_data_2/7F2D94"; +static const ALIGN_ASSET(2) char font_letter_Q[] = "__OTR__texture_data_2/font_letter_Q"; -static const ALIGN_ASSET(2) char gTexture7F2E64[] = "__OTR__texture_data_2/7F2E64"; +static const ALIGN_ASSET(2) char font_letter_R[] = "__OTR__texture_data_2/font_letter_R"; -static const ALIGN_ASSET(2) char gTexture7F2F34[] = "__OTR__texture_data_2/7F2F34"; +static const ALIGN_ASSET(2) char font_letter_S[] = "__OTR__texture_data_2/font_letter_S"; -static const ALIGN_ASSET(2) char gTexture7F3004[] = "__OTR__texture_data_2/7F3004"; +static const ALIGN_ASSET(2) char font_letter_T[] = "__OTR__texture_data_2/font_letter_T"; -static const ALIGN_ASSET(2) char gTexture7F30D4[] = "__OTR__texture_data_2/7F30D4"; +static const ALIGN_ASSET(2) char font_letter_U[] = "__OTR__texture_data_2/font_letter_U"; -static const ALIGN_ASSET(2) char gTexture7F31A4[] = "__OTR__texture_data_2/7F31A4"; +static const ALIGN_ASSET(2) char font_letter_V[] = "__OTR__texture_data_2/font_letter_V"; -static const ALIGN_ASSET(2) char gTexture7F3274[] = "__OTR__texture_data_2/7F3274"; +static const ALIGN_ASSET(2) char font_letter_W[] = "__OTR__texture_data_2/font_letter_W"; -static const ALIGN_ASSET(2) char gTexture7F3344[] = "__OTR__texture_data_2/7F3344"; +static const ALIGN_ASSET(2) char font_letter_X[] = "__OTR__texture_data_2/font_letter_X"; -static const ALIGN_ASSET(2) char gTexture7F3414[] = "__OTR__texture_data_2/7F3414"; +static const ALIGN_ASSET(2) char font_letter_Y[] = "__OTR__texture_data_2/font_letter_Y"; -static const ALIGN_ASSET(2) char gTexture7F34E4[] = "__OTR__texture_data_2/7F34E4"; +static const ALIGN_ASSET(2) char font_letter_Z[] = "__OTR__texture_data_2/font_letter_Z"; static const ALIGN_ASSET(2) char gTexture7F35B4[] = "__OTR__texture_data_2/7F35B4"; @@ -787,7 +787,7 @@ static const ALIGN_ASSET(2) char gTexture7F9F44[] = "__OTR__texture_data_2/7F9F4 static const ALIGN_ASSET(2) char gTexture7F9FC4[] = "__OTR__texture_data_2/7F9FC4"; -static const ALIGN_ASSET(2) char gTexture7FA044[] = "__OTR__texture_data_2/7FA044"; +static const ALIGN_ASSET(2) char font_apostrophe[] = "__OTR__texture_data_2/font_apostrophe"; static const ALIGN_ASSET(2) char gTexture7FA0C4[] = "__OTR__texture_data_2/7FA0C4"; @@ -795,5 +795,5 @@ static const ALIGN_ASSET(2) char gTexture7FA194[] = "__OTR__texture_data_2/7FA19 static const ALIGN_ASSET(2) char gTexture7FA264[] = "__OTR__texture_data_2/7FA264"; -static const ALIGN_ASSET(2) char gTexture7FA334[] = "__OTR__texture_data_2/7FA334"; +static const ALIGN_ASSET(2) char font_comma[] = "__OTR__texture_data_2/7FA334"; diff --git a/include/assets/texture_tkmk00.h b/include/assets/texture_tkmk00.h index 05a10d772..b18a748f5 100644 --- a/include/assets/texture_tkmk00.h +++ b/include/assets/texture_tkmk00.h @@ -3,25 +3,25 @@ #include #include -static const ALIGN_ASSET(2) char gTexturePlayerSelect[] = "__OTR__texture_tkmk00/gTexturePlayerSelect"; +static const ALIGN_ASSET(2) char texture_player_select[] = "__OTR__texture_tkmk00/texture_player_select"; -static const ALIGN_ASSET(2) char gTextureOption[] = "__OTR__texture_tkmk00/gTextureOption"; +static const ALIGN_ASSET(2) char texture_option[] = "__OTR__texture_tkmk00/texture_option"; -static const ALIGN_ASSET(2) char gTextureNameDK[] = "__OTR__texture_tkmk00/gTextureNameDK"; +static const ALIGN_ASSET(2) char texture_name_dk[] = "__OTR__texture_tkmk00/texture_name_dk"; -static const ALIGN_ASSET(2) char gTextureNameToad[] = "__OTR__texture_tkmk00/gTextureNameToad"; +static const ALIGN_ASSET(2) char texture_name_toad[] = "__OTR__texture_tkmk00/texture_name_toad"; -static const ALIGN_ASSET(2) char gTextureNameBowser[] = "__OTR__texture_tkmk00/gTextureNameBowser"; +static const ALIGN_ASSET(2) char texture_name_bowser[] = "__OTR__texture_tkmk00/texture_name_bowser"; -static const ALIGN_ASSET(2) char gTextureNameLuigi[] = "__OTR__texture_tkmk00/gTextureNameLuigi"; +static const ALIGN_ASSET(2) char texture_name_luigi[] = "__OTR__texture_tkmk00/texture_name_luigi"; -static const ALIGN_ASSET(2) char gTextureNameMario[] = "__OTR__texture_tkmk00/gTextureNameMario"; +static const ALIGN_ASSET(2) char texture_name_mario[] = "__OTR__texture_tkmk00/texture_name_mario"; -static const ALIGN_ASSET(2) char gTextureNamePeach[] = "__OTR__texture_tkmk00/gTextureNamePeach"; +static const ALIGN_ASSET(2) char texture_name_peach[] = "__OTR__texture_tkmk00/texture_name_peach"; -static const ALIGN_ASSET(2) char gTextureNameWario[] = "__OTR__texture_tkmk00/gTextureNameWario"; +static const ALIGN_ASSET(2) char texture_name_wario[] = "__OTR__texture_tkmk00/texture_name_wario"; -static const ALIGN_ASSET(2) char gTextureNameYoshi[] = "__OTR__texture_tkmk00/gTextureNameYoshi"; +static const ALIGN_ASSET(2) char texture_name_yoshi[] = "__OTR__texture_tkmk00/texture_name_yoshi"; static const ALIGN_ASSET(2) char gTextureTitleMarioRaceway[] = "__OTR__texture_tkmk00/gTextureTitleMarioRaceway"; @@ -73,51 +73,51 @@ static const ALIGN_ASSET(2) char gTextureMenuStarCup[] = "__OTR__texture_tkmk00/ static const ALIGN_ASSET(2) char gTextureMenuSpecialCup[] = "__OTR__texture_tkmk00/gTextureMenuSpecialCup"; -static const ALIGN_ASSET(2) char gTextureGameSelect[] = "__OTR__texture_tkmk00/gTextureGameSelect"; +static const ALIGN_ASSET(2) char texture_game_select[] = "__OTR__texture_tkmk00/texture_game_select"; -static const ALIGN_ASSET(2) char gTextureMenu1PGame[] = "__OTR__texture_tkmk00/gTextureMenu1PGame"; +static const ALIGN_ASSET(2) char texture_menu_1p_game[] = "__OTR__texture_tkmk00/texture_menu_1p_game"; -static const ALIGN_ASSET(2) char gTextureMenu2PGame[] = "__OTR__texture_tkmk00/gTextureMenu2PGame"; +static const ALIGN_ASSET(2) char texture_menu_2p_game[] = "__OTR__texture_tkmk00/texture_menu_2p_game"; -static const ALIGN_ASSET(2) char gTextureMenu3PGame[] = "__OTR__texture_tkmk00/gTextureMenu3PGame"; +static const ALIGN_ASSET(2) char texture_menu_3p_game[] = "__OTR__texture_tkmk00/texture_menu_3p_game"; -static const ALIGN_ASSET(2) char gTextureMenu4PGame[] = "__OTR__texture_tkmk00/gTextureMenu4PGame"; +static const ALIGN_ASSET(2) char texture_menu_4p_game[] = "__OTR__texture_tkmk00/texture_menu_4p_game"; -static const ALIGN_ASSET(2) char gTextureMenuModeBattle[] = "__OTR__texture_tkmk00/gTextureMenuModeBattle"; +static const ALIGN_ASSET(2) char texture_mode_battle[] = "__OTR__texture_tkmk00/texture_mode_battle"; -static const ALIGN_ASSET(2) char gTextureMenuModeTimeTrials[] = "__OTR__texture_tkmk00/gTextureMenuModeTimeTrials"; +static const ALIGN_ASSET(2) char texture_mode_time_trials[] = "__OTR__texture_tkmk00/texture_mode_time_trials"; -static const ALIGN_ASSET(2) char gTextureMenuModeMarioGP[] = "__OTR__texture_tkmk00/gTextureMenuModeMarioGP"; +static const ALIGN_ASSET(2) char texture_mode_mario_gp[] = "__OTR__texture_tkmk00/texture_mode_mario_gp"; -static const ALIGN_ASSET(2) char gTextureMenuModeVS[] = "__OTR__texture_tkmk00/gTextureMenuModeVS"; +static const ALIGN_ASSET(2) char texture_mode_vs[] = "__OTR__texture_tkmk00/texture_mode_vs"; -static const ALIGN_ASSET(2) char gTextureMenuLOption[] = "__OTR__texture_tkmk00/gTextureMenuLOption"; +static const ALIGN_ASSET(2) char texture_l_option[] = "__OTR__texture_tkmk00/texture_l_option"; -static const ALIGN_ASSET(2) char gTextureMenuRData[] = "__OTR__texture_tkmk00/gTextureMenuRData"; +static const ALIGN_ASSET(2) char texture_r_data[] = "__OTR__texture_tkmk00/texture_r_data"; -static const ALIGN_ASSET(2) char gTextureMenu50cc[] = "__OTR__texture_tkmk00/gTextureMenu50cc"; +static const ALIGN_ASSET(2) char texture_50cc[] = "__OTR__texture_tkmk00/texture_50cc"; -static const ALIGN_ASSET(2) char gTextureMenu100cc[] = "__OTR__texture_tkmk00/gTextureMenu100cc"; +static const ALIGN_ASSET(2) char texture_100cc[] = "__OTR__texture_tkmk00/texture_100cc"; -static const ALIGN_ASSET(2) char gTextureMenu150cc[] = "__OTR__texture_tkmk00/gTextureMenu150cc"; +static const ALIGN_ASSET(2) char texture_150cc[] = "__OTR__texture_tkmk00/texture_150cc"; -static const ALIGN_ASSET(2) char gTextureMenuExtra[] = "__OTR__texture_tkmk00/gTextureMenuExtra"; +static const ALIGN_ASSET(2) char texture_extra[] = "__OTR__texture_tkmk00/texture_extra"; static const ALIGN_ASSET(2) char gTextureMenuWithoutItem[] = "__OTR__texture_tkmk00/gTextureMenuWithoutItem"; static const ALIGN_ASSET(2) char gTextureMenuWithItem[] = "__OTR__texture_tkmk00/gTextureMenuWithItem"; -static const ALIGN_ASSET(2) char gTextureMenuBegin[] = "__OTR__texture_tkmk00/gTextureMenuBegin"; +static const ALIGN_ASSET(2) char texture_begin[] = "__OTR__texture_tkmk00/texture_begin"; -static const ALIGN_ASSET(2) char gTextureMenuGhost[] = "__OTR__texture_tkmk00/gTextureMenuGhost"; +static const ALIGN_ASSET(2) char texture_menu_ghost[] = "__OTR__texture_tkmk00/texture_menu_ghost"; -static const ALIGN_ASSET(2) char gTextureMenuData[] = "__OTR__texture_tkmk00/gTextureMenuData"; +static const ALIGN_ASSET(2) char texture_data[] = "__OTR__texture_tkmk00/texture_data"; -static const ALIGN_ASSET(2) char gTextureMenuOK[] = "__OTR__texture_tkmk00/gTextureMenuOK"; +static const ALIGN_ASSET(2) char texture_ok[] = "__OTR__texture_tkmk00/texture_ok"; -static const ALIGN_ASSET(2) char gTextureBackgroundBlueSky[] = "__OTR__texture_tkmk00/gTextureBackgroundBlueSky"; +static const ALIGN_ASSET(2) char background_blue_sky[] = "__OTR__texture_tkmk00/background_blue_sky"; -static const ALIGN_ASSET(2) char gTextureBackgroundSunset[] = "__OTR__texture_tkmk00/gTextureBackgroundSunset"; +static const ALIGN_ASSET(2) char background_sunset[] = "__OTR__texture_tkmk00/background_sunset"; static const ALIGN_ASSET(2) char gTextureGreenGoldStripe[] = "__OTR__texture_tkmk00/gTextureGreenGoldStripe"; diff --git a/include/assets/toads_turnpike_data.h b/include/assets/toads_turnpike_data.h index 27bd6b989..6557ebdd3 100644 --- a/include/assets/toads_turnpike_data.h +++ b/include/assets/toads_turnpike_data.h @@ -6,8 +6,12 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_60[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_60"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_60[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_60"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_80[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_80"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_158[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_158"; @@ -270,30 +274,54 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_unknown_model13[] static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_18DB8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_18DB8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_18DB8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_18DB8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_18E38[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_18E38"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_18E38[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_18E38"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_18EB8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_18EB8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_18EB8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_18EB8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_18F58[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_18F58"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_18F58[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_18F58"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_18FF8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_18FF8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_18FF8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_18FF8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19020[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19020"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19030[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19030"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19030[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19030"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_190E8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_190E8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_190E8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_190E8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19168[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19168"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19168[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19168"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_192B0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_192B0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_192B0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_192B0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19390[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19390"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19390[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19390"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19450[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19450"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19450[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19450"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_194E0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_194E0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_194E0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_194E0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19518[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19518"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_model_lod1[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_truck_model_lod1"; @@ -312,24 +340,40 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_unknown_model19[] static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_unknown_model20[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_truck_unknown_model20"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19CF8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19CF8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19CF8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19CF8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19D68[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19D68"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19D68[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19D68"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19DD8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19DD8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19DD8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19DD8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19DF0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19DF0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19E00[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19E00"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19E00[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19E00"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19E38[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19E38"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19E38[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19E38"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19EA0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19EA0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19EA0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19EA0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19F08[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19F08"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19F08[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19F08"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A040[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A040"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A040[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A040"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A068[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A068"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_model_lod2[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_truck_model_lod2"; @@ -344,18 +388,30 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_unknown_model24[] static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A4B8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A4B8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A4B8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A4B8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A528[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A528"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A528[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A528"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A5E0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A5E0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A5E0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A5E0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A5F8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A5F8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A608[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A608"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A608[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A608"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A640[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A640"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A640[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A640"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A6B0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A6B0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A6B0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A6B0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A6C8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A6C8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_model_lod0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_bus_model_lod0"; @@ -390,28 +446,48 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_unknown_model14[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_unknown_model15[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_bus_unknown_model15"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B5C8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B5C8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B5C8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B5C8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B658[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B658"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B658[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B658"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B6D8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B6D8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B6D8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B6D8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B758[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B758"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B758[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B758"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B778[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B778"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B788[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B788"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B788[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B788"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B810[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B810"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B810[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B810"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B8A0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B8A0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B8A0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B8A0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1BC78[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1BC78"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1BC78[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1BC78"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1BD48[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1BD48"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1BD48[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1BD48"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1BE18[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1BE18"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1BE18[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1BE18"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1BE48[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1BE48"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_model_lod1[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_bus_model_lod1"; @@ -438,20 +514,34 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_unknown_model25[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C628[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C628"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C628[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C628"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C688[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C688"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C688[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C688"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C6E8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C6E8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C6E8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C6E8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C700[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C700"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C710[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C710"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C710[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C710"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C770[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C770"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C770[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C770"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C7D0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C7D0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C7D0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C7D0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CA88[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CA88"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1CA88[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1CA88"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CAA8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CAA8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_model_lod2[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_bus_model_lod2"; @@ -468,18 +558,28 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_unknown_model30[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_unknown_model31[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_bus_unknown_model31"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1CD98[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1CD98"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CD98[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CD98"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1CDF8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1CDF8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CDF8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CDF8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1CE58[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1CE58"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CE58[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CE58"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CE70[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CE70"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1CE80[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1CE80"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CE80[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CE80"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1D008[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1D008"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1D008[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1D008"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1D018[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1D018"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_model_lod0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_model_lod0"; @@ -512,30 +612,52 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_mo static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_model14[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_unknown_model14"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E288[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E288"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E288[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E288"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E318[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E318"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E318[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E318"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E3A8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E3A8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E3A8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E3A8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E438[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E438"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E438[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E438"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E458[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E458"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E468[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E468"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E468[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E468"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E508[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E508"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E508[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E508"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E810[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E810"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E810[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E810"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E8A0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E8A0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E8A0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E8A0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E970[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E970"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E970[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E970"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1EA40[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1EA40"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1EA40[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1EA40"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1EB10[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1EB10"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1EB10[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1EB10"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1EB48[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1EB48"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_model_lod1[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_model_lod1"; @@ -572,34 +694,60 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_mo static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_model30[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_unknown_model30"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F7D8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F7D8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F7D8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F7D8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F850[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F850"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F850[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F850"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F8C0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F8C0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F8C0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F8C0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F938[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F938"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F938[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F938"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F9A8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F9A8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F9A8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F9A8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F9D0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F9D0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F9E0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F9E0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F9E0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F9E0"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FCD8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FCD8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FCD8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FCD8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FD58[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FD58"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FD58[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FD58"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FDD0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FDD0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FDD0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FDD0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FE50[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FE50"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FE50[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FE50"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FEC8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FEC8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FEC8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FEC8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FF50[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FF50"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FF50[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FF50"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FFC8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FFC8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FFC8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FFC8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20008[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20008"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_model_lod2[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_model_lod2"; @@ -610,18 +758,28 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_mo static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_model33[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_unknown_model33"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_20348[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_20348"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20348[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20348"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_20450[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_20450"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20450[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20450"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_204F8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_204F8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_204F8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_204F8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20510[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20510"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_20520[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_20520"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20520[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20520"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20598[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20598"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_20598[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_20598"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_205A8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_205A8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_car_model_lod0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_car_model_lod0"; @@ -658,30 +816,56 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_car_unknown_model15[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21648[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21648"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21648[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21648"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_216D8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_216D8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_216D8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_216D8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21768[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21768"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21768[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21768"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21780[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21780"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21790[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21790"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21790[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21790"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21820[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21820"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21820[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21820"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_218B0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_218B0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_218B0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_218B0"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21950[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21950"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21950[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21950"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21A28[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21A28"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21A28[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21A28"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21C78[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21C78"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21C78[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21C78"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21CD0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21CD0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21CD0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21CD0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21D28[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21D28"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21D28[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21D28"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21D80[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21D80"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21D80[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21D80"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21DD8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21DD8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21DD8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21DD8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21E28[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21E28"; @@ -712,24 +896,44 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_car_unknown_model26[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22A68[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22A68"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22A68[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22A68"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22AF8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22AF8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22AF8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22AF8"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22B88[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22B88"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22B88[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22B88"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22BA0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22BA0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22BB0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22BB0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22BB0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22BB0"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22C50[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22C50"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22C50[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22C50"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22C88[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22C88"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22C88[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22C88"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22CC0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22CC0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22CC0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22CC0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22D60[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22D60"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22D60[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22D60"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22E38[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22E38"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22E38[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22E38"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23040[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23040"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23040[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23040"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23078[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23078"; @@ -748,20 +952,32 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_car_unknown_model31[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_car_unknown_model32[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_car_unknown_model32"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23538[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23538"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23538[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23538"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23600[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23600"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23600[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23600"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23678[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23678"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23678[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23678"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_237D8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_237D8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_237D8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_237D8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_237F8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_237F8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23808[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23808"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23808[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23808"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23838[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23838"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23838[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23838"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23848[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23848"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23858[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23858"; diff --git a/include/assets/wario_stadium_data.h b/include/assets/wario_stadium_data.h index 88a2b1d7a..ac8cc029c 100644 --- a/include/assets/wario_stadium_data.h +++ b/include/assets/wario_stadium_data.h @@ -240,8 +240,12 @@ static const ALIGN_ASSET(2) char d_course_wario_stadium_sign_top_right[] = "__OT static const ALIGN_ASSET(2) char d_course_wario_stadium_sign_bottom_right[] = "__OTR__wario_stadium_data/d_course_wario_stadium_sign_bottom_right"; +static const ALIGN_ASSET(2) char wario_stadium_data_seg6_gfx_C890[] = "__OTR__wario_stadium_data/wario_stadium_data_seg6_gfx_C890"; + static const ALIGN_ASSET(2) char d_course_wario_stadium_dl_C890[] = "__OTR__wario_stadium_data/d_course_wario_stadium_dl_C890"; +static const ALIGN_ASSET(2) char wario_stadium_data_seg6_gfx_CA50[] = "__OTR__wario_stadium_data/wario_stadium_data_seg6_gfx_CA50"; + static const ALIGN_ASSET(2) char d_course_wario_stadium_dl_CA50[] = "__OTR__wario_stadium_data/d_course_wario_stadium_dl_CA50"; static const ALIGN_ASSET(2) char d_course_wario_stadium_dl_sign[] = "__OTR__wario_stadium_data/d_course_wario_stadium_dl_sign"; diff --git a/include/assets/yoshi_valley_data.h b/include/assets/yoshi_valley_data.h index 9dfa8b745..b93a478a4 100644 --- a/include/assets/yoshi_valley_data.h +++ b/include/assets/yoshi_valley_data.h @@ -6,8 +6,12 @@ static const ALIGN_ASSET(2) char d_course_yoshi_valley_dl_0[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_dl_0"; +static const ALIGN_ASSET(2) char yoshi_valley_data_seg6_gfx_0[] = "__OTR__yoshi_valley_data/yoshi_valley_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_yoshi_valley_dl_20[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_dl_20"; +static const ALIGN_ASSET(2) char yoshi_valley_data_seg6_gfx_20[] = "__OTR__yoshi_valley_data/yoshi_valley_data_seg6_gfx_20"; + static const ALIGN_ASSET(2) char d_course_yoshi_valley_dl_40[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_dl_40"; static const ALIGN_ASSET(2) char d_course_yoshi_valley_dl_290[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_dl_290"; @@ -282,8 +286,12 @@ static const ALIGN_ASSET(2) char d_course_yoshi_valley_yoshi_flag[] = "__OTR__yo static const ALIGN_ASSET(2) char d_course_yoshi_valley_unknown_light4[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_unknown_light4"; +static const ALIGN_ASSET(2) char yoshi_valley_data_seg6_lights_141A0[] = "__OTR__yoshi_valley_data/yoshi_valley_data_seg6_lights_141A0"; + static const ALIGN_ASSET(2) char d_course_yoshi_valley_unknown_light5[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_unknown_light5"; +static const ALIGN_ASSET(2) char yoshi_valley_data_seg6_lights_141B8[] = "__OTR__yoshi_valley_data/yoshi_valley_data_seg6_lights_141B8"; + static const ALIGN_ASSET(2) char d_course_yoshi_valley_flag_pole_model1[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_flag_pole_model1"; static const ALIGN_ASSET(2) char d_course_yoshi_valley_flag_pole_model2[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_flag_pole_model2"; @@ -330,6 +338,8 @@ static const ALIGN_ASSET(2) char d_course_yoshi_valley_egg_model4[] = "__OTR__yo static const ALIGN_ASSET(2) char d_course_yoshi_valley_egg_model5[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_egg_model5"; +static const ALIGN_ASSET(2) char yoshi_valley_data_seg6_lights_16558[] = "__OTR__yoshi_valley_data/yoshi_valley_data_seg6_lights_16558"; + static const ALIGN_ASSET(2) char d_course_yoshi_valley_lights4[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_lights4"; static const ALIGN_ASSET(2) char d_course_yoshi_valley_egg_spot[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_egg_spot"; diff --git a/include/common_structs.h b/include/common_structs.h index 11bc9d23c..4450d0e6c 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -160,13 +160,13 @@ typedef struct { } Collision; typedef struct { - /* 0x00 */ Vec3f unk_000; - /* 0x0C */ f32 unk_00C; + /* 0x00 */ Vec3f pos; + /* 0x0C */ f32 scale; /* 0x10 */ u16 unk_010; - /* 0x12 */ u16 unk_012; - /* 0x14 */ f32 unk_014; + /* 0x12 */ u16 type; + /* 0x14 */ f32 surfaceType; /* 0x18 */ f32 unk_018; - /* 0x1C */ s16 unk_01C; + /* 0x1C */ s16 isAlive; /* 0x1E */ s16 unk_01E; /* 0x20 */ s16 unk_020; /* 0x22 */ s16 unk_022; @@ -178,10 +178,10 @@ typedef struct { /* 0x32 */ s16 unk_032; /* 0x34 */ s16 unk_034; /* 0x36 */ s16 unk_036; - /* 0x38 */ s16 unk_038; - /* 0x3A */ s16 unk_03A; - /* 0x3C */ s16 unk_03C; - /* 0x3E */ s16 unk_03E; + /* 0x38 */ s16 red; + /* 0x3A */ s16 green; + /* 0x3C */ s16 blue; + /* 0x3E */ s16 alpha; /* 0x40 */ s16 unk_040; /* 0x42 */ s16 unk_042; /* 0x44 */ s16 unk_044; @@ -343,7 +343,7 @@ typedef struct { /* 0x01F8 */ f32 unk_1F8; /* 0x01FC */ f32 unk_1FC; /* 0x0200 */ u32 unk_200; // May be s32. but less casting required if u32 - /* 0x0204 */ s16 unk_204; + /* 0x0204 */ s16 driftDuration; /* 0x0206 */ s16 unk_206; /* 0x0208 */ f32 unk_208; /* 0x020C */ f32 unk_20C; @@ -355,7 +355,7 @@ typedef struct { /* 0x0222 */ s16 unk_222; /* 0x0224 */ f32 size; /* 0x0228 */ s16 unk_228; - /* 0x022A */ s16 unk_22A; + /* 0x022A */ s16 driftState; /* 0x022C */ f32 previousSpeed; /* 0x0230 */ f32 unk_230; /* 0x0234 */ s16 unk_234; @@ -368,7 +368,10 @@ typedef struct { /* 0x024C */ u16 animGroupSelector[4]; // Based on screen /* 0x0254 */ u16 characterId; /* 0x0256 */ u16 unk_256; - /* 0x0258 */ UnkPlayerStruct258 unk_258[40]; + /* 0x0258 */ UnkPlayerStruct258 particlePool0[10]; + /* 0x06D8 */ UnkPlayerStruct258 particlePool1[10]; + /* 0x0C98 */ UnkPlayerStruct258 particlePool2[10]; + /* 0x1278 */ UnkPlayerStruct258 particlePool3[10]; /* 0x0D98 */ s16 unk_D98; /* 0x0D9A */ s16 unk_D9A; /* 0x0D9C */ f32 unk_D9C; @@ -397,6 +400,19 @@ typedef struct { u32 nHasAuthority; } Player; // size = 0xDD8 +enum POOL_1_PARTICLE_TYPES { + NO_PARTICLE, + DRIFT_PARTICLE, + GROUND_PARTICLE, + GRASS_PARTICLE, + POOL_1_PARTICLE_TYPE_4, + POOL_1_PARTICLE_TYPE_5, + POOL_1_PARTICLE_TYPE_6, + POOL_1_PARTICLE_TYPE_7, + POOL_1_PARTICLE_TYPE_8, + POOL_1_PARTICLE_TYPE_9 +}; + typedef struct { // Something related to time trial ghost data? /* 0x00 */ s32 unk_00; diff --git a/include/defines.h b/include/defines.h index 4b292776f..1c176c9bf 100644 --- a/include/defines.h +++ b/include/defines.h @@ -344,15 +344,40 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE }; * @brief effect of player's * for effects */ -#define BOOST_RAMP_WOOD_EFFECT 0x4 // being boosted by a ramp -#define STAR_EFFECT 0x200 // being a star -#define BOOST_EFFECT 0x2000 // being boosted by trigger a mushroom -#define BOOST_RAMP_ASPHALT_EFFECT 0x100000 // being boosted by a boost pad -#define REVERSE_EFFECT 0x400000 // being in reverse of the course -#define HIT_BY_ITEM_EFFECT 0x2000000 // being hit by an item -#define HIT_EFFECT 0x4000000 // hitting an object -#define LIGHTNING_EFFECT 0x40000000 // being hit by lightning -#define BOO_EFFECT 0x80000000 // being a boo +#define UNKNOWN_EFFECT_0x1 0x1 // +#define BOOST_RAMP_WOOD_EFFECT 0x4 // being boosted by a ramp +#define DRIFTING_EFFECT 0x10 // drifting +#define UNKNOWN_EFFECT_0x40 0x40 // +#define UNKNOWN_EFFECT_0x80 0x80 // +#define UNKNOWN_EFFECT_0xC 0xC // +#define UNKNOWN_EFFECT_0x10 0x10 // +#define UNKNOWN_EFFECT_0x100 0x100 // +#define UNKNOWN_EFFECT_0x1000 0x1000 // +#define STAR_EFFECT 0x200 // being a star +#define BOOST_EFFECT 0x2000 // being boosted by trigger a mushroom +#define UNKNOWN_EFFECT_0x10000 0x10000 // +#define BOOST_RAMP_ASPHALT_EFFECT 0x100000 // being boosted by a boost pad +#define UNKNOWN_EFFECT_0x200000 0x200000 // +#define REVERSE_EFFECT 0x400000 // being in reverse of the course +#define UNKNOWN_EFFECT_0x1000000 0x1000000 // +#define HIT_BY_ITEM_EFFECT 0x2000000 // being hit by an item +#define HIT_EFFECT 0x4000000 // hitting an object +#define UNKNOWN_EFFECT_0x10000000 0x10000000 // +#define LIGHTNING_EFFECT 0x40000000 // being hit by lightning +#define BOO_EFFECT 0x80000000 // being a boo + +/** + * @brief durations of effects + */ +#define STAR_EFFECT_DURATION 0xA +#define BOO_EFFECT_DURATION 0x7 + +/** + * @brief alpha relates values + */ +#define ALPHA_MAX 0xFF +#define ALPHA_MIN 0x0 +#define ALPHA_BOO_EFFECT 0x60 /** * @brief shell state diff --git a/src/actors/blue_and_red_shells/render.inc.c b/src/actors/blue_and_red_shells/render.inc.c index 4e60c9f31..1274d8af8 100644 --- a/src/actors/blue_and_red_shells/render.inc.c +++ b/src/actors/blue_and_red_shells/render.inc.c @@ -10,6 +10,7 @@ */ void render_actor_red_shell(Camera* camera, Mat4 matrix, struct ShellActor* shell) { gDPLoadTLUT_pal256(gDisplayListHead++, &gTLUTRedShell); // set texture + // Set up color combiner for channel swapping render_actor_shell(camera, matrix, shell); } diff --git a/src/actors/falling_rock/update.inc.c b/src/actors/falling_rock/update.inc.c index b700a4226..c4b996531 100644 --- a/src/actors/falling_rock/update.inc.c +++ b/src/actors/falling_rock/update.inc.c @@ -12,13 +12,11 @@ void func_8029CF0C(struct ActorSpawnData* spawnData, struct FallingRock* rock) { struct ActorSpawnData* temp_v0 = (struct ActorSpawnData*) VIRTUAL_TO_PHYSICAL2(gSegmentTable[segment] + offset); #endif Vec3s sp24 = { 60, 120, 180 }; -#ifndef TARGET_N64 temp_v0 += rock->unk_06; -#endif rock->respawnTimer = sp24[rock->unk_06]; // * 2 - rock->pos[0] = (f32) temp_v0[rock->unk_06].pos[0] * gCourseDirection; - rock->pos[1] = (f32) temp_v0[rock->unk_06].pos[1] + 10.0f; - rock->pos[2] = (f32) temp_v0[rock->unk_06].pos[2]; + rock->pos[0] = (f32) temp_v0->pos[0] * gCourseDirection; + rock->pos[1] = (f32) temp_v0->pos[1] + 10.0f; + rock->pos[2] = (f32) temp_v0->pos[2]; vec3f_set(rock->velocity, 0, 0, 0); vec3s_set(rock->rot, 0, 0, 0); } diff --git a/src/audio/external.c b/src/audio/external.c index 44923ab90..0dae888a4 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -1935,7 +1935,7 @@ void func_800C6108(u8 playerId) { } else { D_800E9E54[playerId] = (f32) -player->unk_0C0; } - if ((player->effects & 0x10) == 0x10) { + if ((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) { D_800E9EB4[playerId] = D_800E9E64[playerId] + D_800E9DE4[playerId]; } else { D_800E9EB4[playerId] = D_800E9E64[playerId] + D_800E9DE4[playerId] - (D_800E9E54[playerId] / 12000.0f); @@ -2205,7 +2205,7 @@ void func_800C683C(u8 cameraId) { void func_800C70A8(u8 playerId) { if (D_800EA0EC[playerId] == 0) { D_800E9E74[playerId] = 0; - if ((D_800E9E54[playerId] > 3500.0f) || ((gPlayers[playerId].effects & 0x10) == 0x10)) { + if ((D_800E9E54[playerId] > 3500.0f) || ((gPlayers[playerId].effects & DRIFTING_EFFECT) == DRIFTING_EFFECT)) { D_800E9E74[playerId] = 1; switch (gPlayers[playerId].tyres[AUDIO_LEFT_TYRE].surfaceType) { case DIRT: /* switch 1 */ @@ -2237,7 +2237,7 @@ void func_800C70A8(u8 playerId) { break; } } - if ((gPlayers[playerId].effects & 0x10) == 0x10) { + if ((gPlayers[playerId].effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) { D_800E9E74[playerId] = 2; switch (gPlayers[playerId].tyres[AUDIO_LEFT_TYRE].surfaceType) { /* switch 2 */ case DIRT: /* switch 2 */ diff --git a/src/audio/load.c b/src/audio/load.c index 4a56b86d7..2efa086af 100644 --- a/src/audio/load.c +++ b/src/audio/load.c @@ -240,8 +240,9 @@ void* dma_sample_data(uintptr_t devAddr, u32 size, s32 arg2, u8* dmaIndexRef) { dma->ttl = 2; dma->source = dmaDevAddr; dma->sizeUnused = transfer; - osPiStartDma(&gCurrAudioFrameDmaIoMesgBufs[gCurrAudioFrameDmaCount++], OS_MESG_PRI_NORMAL, OS_READ, dmaDevAddr, - dma->buffer, transfer, &gCurrAudioFrameDmaQueue); + dma->buffer = dmaDevAddr; + // osPiStartDma(&gCurrAudioFrameDmaIoMesgBufs[gCurrAudioFrameDmaCount++], OS_MESG_PRI_NORMAL, OS_READ, dmaDevAddr, + // dma->buffer, transfer, &gCurrAudioFrameDmaQueue); *dmaIndexRef = dmaIndex; return (devAddr - dmaDevAddr) + dma->buffer; } @@ -329,6 +330,7 @@ s32 func_800BB304(struct AudioBankSample* sample) { sample->loaded = 0x81; sample->sampleAddr = mem; // sound->unk4 } + return 0; } s32 func_800BB388(s32 bankId, s32 instId, s32 arg2) { @@ -414,7 +416,7 @@ void func_800BB584(s32 bankId) { u8* var_a1; if (gAlTbl->seqArray[bankId].len == 0) { - var_a1 = gAlTbl->seqArray[(s32) gAlTbl->seqArray[bankId].offset].offset; + var_a1 = gAlTbl->seqArray[(uintptr_t) gAlTbl->seqArray[bankId].offset].offset; } else { var_a1 = gAlTbl->seqArray[bankId].offset; } diff --git a/src/audio/seqplayer.c b/src/audio/seqplayer.c index c25eb8196..7b66d1058 100644 --- a/src/audio/seqplayer.c +++ b/src/audio/seqplayer.c @@ -11,6 +11,8 @@ #include "audio/external.h" #include "port/Engine.h" +#include + /** * Given that (almost) all of these are format strings, it is highly likely * that they are meant to be used in some sort of printf variant. But I don't @@ -733,14 +735,15 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer* layer) { if (seqChannel) {} } -u8 get_instrument(struct SequenceChannel *seqChannel, u8 instId, struct Instrument **instOut, struct AdsrSettings *adsr) { - struct CtlEntry *bank = GameEngine_LoadBank(seqChannel->bankId); - if(instId >= bank->numInstruments) { +u8 get_instrument(struct SequenceChannel* seqChannel, u8 instId, struct Instrument** instOut, + struct AdsrSettings* adsr) { + struct CtlEntry* bank = GameEngine_LoadBank(seqChannel->bankId); + if (instId >= bank->numInstruments) { *instOut = NULL; return 0; } struct Instrument* inst = bank->instruments[instId]; - if(inst == NULL) { + if (inst == NULL) { *instOut = NULL; return 0; } @@ -911,9 +914,9 @@ void sequence_channel_process_script(struct SequenceChannel* seqChannel) { case 0xEB: { cmd = m64_read_u8(state); - struct AudioSequenceData *sequence = GameEngine_LoadSequence(seqPlayer->seqId); + struct AudioSequenceData* sequence = GameEngine_LoadSequence(seqPlayer->seqId); cmd = sequence->banks[cmd]; - if(IS_BANK_LOAD_COMPLETE(cmd)) { + if (IS_BANK_LOAD_COMPLETE(cmd)) { seqChannel->bankId = cmd; } } @@ -1009,9 +1012,9 @@ void sequence_channel_process_script(struct SequenceChannel* seqChannel) { case 0xC6: { cmd = m64_read_u8(state); - struct AudioSequenceData *sequence = GameEngine_LoadSequence(seqPlayer->seqId); + struct AudioSequenceData* sequence = GameEngine_LoadSequence(seqPlayer->seqId); cmd = sequence->banks[cmd]; - if(IS_BANK_LOAD_COMPLETE(cmd)) { + if (IS_BANK_LOAD_COMPLETE(cmd)) { seqChannel->bankId = cmd; } break; @@ -1214,7 +1217,7 @@ void sequence_player_process_sequence(struct SequencePlayer* seqPlayer) { if (seqPlayer->enabled == false) { return; } - + GameEngine_LoadSequence(seqPlayer->seqId); GameEngine_LoadBank(seqPlayer->defaultBank[0]); diff --git a/src/audio/synthesis.c b/src/audio/synthesis.c index aecf4e732..69cee4ef6 100644 --- a/src/audio/synthesis.c +++ b/src/audio/synthesis.c @@ -470,11 +470,12 @@ Acmd* synthesis_process_note(s32 noteIndex, struct NoteSubEu* noteSubEu, struct if (loopInfo_2 != 0) { temp_t6 = ((synthesisState->samplePosInt - s3) + 16) / 16; // diff from sm64 sh if (audioBookSample->loaded == 0x81) { // sm64 has audioBookSample->medium - var_a0_2 = (temp_t6 * 9) + sampleAddr; + var_a0_2 = &sampleAddr[temp_t6 * 9]; } else { var_a0_2 = (temp_t6 * 9) + sampleAddr; // var_a0_2 = - // dma_sample_data((uintptr_t) (temp_t6 * 9) + sampleAddr, ALIGN(((loopInfo_2 * 9) + 16), 4), + // dma_sample_data((uintptr_t) (temp_t6 * 9) + sampleAddr, ALIGN(((loopInfo_2 * 9) + 16), + // 4), // flags, &synthesisState->sampleDmaIndex); // unsure flags? } @@ -576,7 +577,7 @@ Acmd* synthesis_process_note(s32 noteIndex, struct NoteSubEu* noteSubEu, struct resampledTempLen + DMEM_ADDR_RESAMPLED); break; } - //break; + // break; } if (noteSubEu->finished != false) { break; diff --git a/src/camera.c b/src/camera.c index a798d61d2..11c846ab5 100644 --- a/src/camera.c +++ b/src/camera.c @@ -25,7 +25,7 @@ f32 D_800DDB30[] = { 0.4f, 0.6f, 0.275f, 0.3f }; -Camera cameras[5]; +Camera cameras[8]; // This size should be 5 but there is an overflow somewhere in Bowser's Castle, so we allocate 8 cameras to avoid it. Camera* camera1 = &cameras[0]; Camera* camera2 = &cameras[1]; Camera* camera3 = &cameras[2]; @@ -852,7 +852,7 @@ void func_8001E45C(Camera* camera, Player* player, s8 arg2) { UNUSED s16 pad6; s16 temp; - if ((player->effects & 0x10) == 0x10) { + if ((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) { var_a3 = 100; if (player->unk_078 == 0) { camera->unk_B0 = 0; @@ -974,7 +974,7 @@ void func_8001EA0C(Camera* camera, Player* player, s8 arg2) { UNUSED s16 pad6; s16 temp; - if ((player->effects & 0x10) == 0x10) { + if ((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) { var_a3 = 100; if (player->unk_078 == 0) { camera->unk_B0 = 0; diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index e0a62a252..14098e7bf 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -1687,7 +1687,7 @@ void update_player(s32 playerId) { if (!(player->unk_0CA & 2) && !(player->unk_0CA & 8)) { gPlayerPathIndex = gPathIndexByPlayerId[playerId]; set_current_path(gPlayerPathIndex); - // if (GetCourse() == GetKalimariDesert()) { + // if (IsKalimariDesert()) { CM_VehicleCollision(playerId, player); // handle_trains_interactions(playerId, player); if (playerId == 0) { @@ -1811,7 +1811,7 @@ void update_player(s32 playerId) { return; } if ((D_801630E8[playerId] == 1) || (D_801630E8[playerId] == -1)) { - player->effects |= 0x10; + player->effects |= DRIFTING_EFFECT; } if (D_801630E8[playerId] != 0) { sPlayerAngle[playerId] = -get_angle_between_two_vectors(&player->oldPos[0], player->pos); @@ -2079,7 +2079,7 @@ void func_8000B140(s32 playerId) { Player* player; player = &gPlayers[playerId]; - if (!(player->effects & 0x10) && (D_801630E8[playerId] != 1) && (D_801630E8[playerId] != -1) && + if (!(player->effects & DRIFTING_EFFECT) && (D_801630E8[playerId] != 1) && (D_801630E8[playerId] != -1) && !(gTrackPositionFactor[playerId] < -1.0f) && !(gTrackPositionFactor[playerId] > 1.0f) && (player->characterId != 5) && (player->characterId != 7) && (player->characterId != 4) && !(player->effects & STAR_EFFECT)) { @@ -4339,7 +4339,7 @@ void func_80011EC0(s32 arg0, Player* player, s32 arg2, UNUSED u16 arg3) { if ((arg2 >= -9) && (D_80162FF8[arg0] == 0)) { if ((gTrackPositionFactor[arg0] > -0.8) && (gTrackPositionFactor[arg0] < 0.5)) { kart_hop(player); - player->effects |= 0x10; + player->effects |= DRIFTING_EFFECT; D_801630E8[arg0] = 1; break; } @@ -4351,7 +4351,7 @@ void func_80011EC0(s32 arg0, Player* player, s32 arg2, UNUSED u16 arg3) { if ((arg2 < 0xA) && (D_80162FF8[arg0] == 0)) { if ((gTrackPositionFactor[arg0] > -0.5) && (gTrackPositionFactor[arg0] < 0.8)) { kart_hop(player); - player->effects |= 0x10; + player->effects |= DRIFTING_EFFECT; D_801630E8[arg0] = -1; break; } diff --git a/src/code_80057C60.c b/src/code_80057C60.c index d1d9c2d51..25a775c86 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -2745,150 +2745,141 @@ void func_8005D1F4(s32 cameraId) { // Appears to load GP Mode race staging balloons and kart shadows. void func_8005D290(void) { - D_8018D488 = dma_textures(gTexture69C80C, 0x400, 0x400); - D_8018D474 = dma_textures(gTextureKartShadow, 0x1000, 0x1000); - D_8018D420 = dma_textures(gTexture69B03C, 0x100, 0x100); - D_8018D424 = dma_textures(gTexture69B140, 0x400, 0x400); - D_8018D478 = dma_textures(gTexture69C1E8, 0x200, 0x200); - D_8018D480 = dma_textures(gTexture69BA28, 0x400, 0x400); - D_8018D484 = dma_textures(gTexture69B960, 0x400, 0x400); - D_8018D48C = dma_textures(gTexture69C354, 0x400, 0x400); - D_8018D494 = dma_textures(gTexture69C4E4, 0x400, 0x400); + D_8018D420 = gTexture69B03C; + D_8018D424 = gTexture69B140; + D_8018D478 = gTexture69C1E8; + D_8018D480 = gTextureSpeechBubble; + D_8018D484 = gTextureMusicNote; + D_8018D48C = gTextureSmokePuff; D_8018D490 = D_8018D48C; - D_8018D498 = dma_textures(gTexture69B378, 0x1000, 0x1000); - D_8018D4BC = dma_textures(gTextureBalloon1, 0x800, 0x800); - D_8018D4C0 = dma_textures(gTextureBalloon2, 0x800, 0x800); - D_8018D49C = dma_textures(gTexture69C9C4, 0x200, 0x200); - D_8018D4A0 = dma_textures(gTextureBoingExclamation, 0x800, 0x800); - D_8018D4A4 = dma_textures(gTextureOnomatopoeiaPoomp1, 0x800, 0x800); - D_8018D4A8 = dma_textures(gTextureOnomatopoeiaPoomp2, 0x800, 0x800); - D_8018D4AC = dma_textures(gTextureOnomatopoeiaWhrrrr1, 0x800, 0x800); - D_8018D4B0 = dma_textures(gTextureOnomatopoeiaWhrrrr2, 0x800, 0x800); - D_8018D4B4 = dma_textures(gTextureOnomatopoeiaCrash1, 0x800, 0x800); - D_8018D4B8 = dma_textures(gTextureOnomatopoeiaCrash2, 0x800, 0x800); - D_8018D438 = dma_textures(gTexture69CB84, 0x800, 0x800); - D_8018D43C = dma_textures(gTexture69CCEC, 0x800, 0x800); - D_8018D440 = dma_textures(gTexture69CEB8, 0x800, 0x800); - D_8018D444 = dma_textures(gTexture69D148, 0x800, 0x800); - D_8018D448 = dma_textures(gTexture69D4E0, 0x800, 0x800); - D_8018D44C = dma_textures(gTexture69D8FC, 0x800, 0x800); - D_8018D450 = dma_textures(gTexture69DCB4, 0x800, 0x800); - D_8018D454 = dma_textures(gTexture69DFA0, 0x800, 0x800); - D_8018D458 = dma_textures(gTexture69E25C, 0x800, 0x800); - D_8018D45C = dma_textures(gTexture69E518, 0x800, 0x800); - D_8018D460 = dma_textures(gTexture69E7A8, 0x800, 0x800); - D_8018D464 = dma_textures(gTexture69EA18, 0x800, 0x800); - D_8018D468 = dma_textures(gTexture69EC54, 0x800, 0x800); - D_8018D46C = dma_textures(gTexture69EE38, 0x800, 0x800); - D_8018D470 = dma_textures(gTexture69EFE0, 0x800, 0x800); - D_8018D4C4 = dma_textures(gTextureLightningBolt0, 0x800, 0x800); - D_8018D4C8 = dma_textures(gTextureLightningBolt1, 0x800, 0x800); + D_8018D4BC = gTextureBalloon1; + D_8018D4C0 = gTextureBalloon2; + D_8018D49C = gTexture69C9C4; + D_8018D4A0 = gTextureBoingExclamation; + D_8018D438 = gTexture69CB84; + D_8018D43C = gTexture69CCEC; + D_8018D440 = gTexture69CEB8; + D_8018D444 = gTexture69D148; + D_8018D448 = gTexture69D4E0; + D_8018D44C = gTexture69D8FC; + D_8018D450 = gTexture69DCB4; + D_8018D454 = gTexture69DFA0; + D_8018D458 = gTexture69E25C; + D_8018D45C = gTexture69E518; + D_8018D460 = gTexture69E7A8; + D_8018D464 = gTexture69EA18; + D_8018D468 = gTexture69EC54; + D_8018D46C = gTexture69EE38; + D_8018D470 = gTexture69EFE0; + gTextureLoadedLightningBolt0 = gTextureLightningBolt0; + gTextureLoadedLightningBolt1 = gTextureLightningBolt1; } -void func_8005D6C0(Player* player) { - s32 temp_v0; +void reset_player_particle_pool(Player* player) { + s32 i; - for (temp_v0 = 0; temp_v0 < 10; ++temp_v0) { - player->unk_258[temp_v0].unk_01C = 0; - player->unk_258[temp_v0].unk_01E = 0; - player->unk_258[temp_v0].unk_012 = 0; + for (i = 0; i < 10; ++i) { + player->particlePool0[i].isAlive = 0; + player->particlePool0[i].unk_01E = 0; + player->particlePool0[i].type = 0; } - for (temp_v0 = 0; temp_v0 < 10; ++temp_v0) { - player->unk_258[30 + temp_v0].unk_01C = 0; - player->unk_258[30 + temp_v0].unk_01E = 0; - player->unk_258[30 + temp_v0].unk_012 = 0; + for (i = 0; i < 10; ++i) { + player->particlePool3[i].isAlive = 0; + player->particlePool3[i].unk_01E = 0; + player->particlePool3[i].type = 0; } - for (temp_v0 = 0; temp_v0 < 10; ++temp_v0) { - player->unk_258[10 + temp_v0].unk_01C = 0; - player->unk_258[10 + temp_v0].unk_01E = 0; - player->unk_258[10 + temp_v0].unk_012 = 0; + for (i = 0; i < 10; ++i) { + player->particlePool1[i].isAlive = 0; + player->particlePool1[i].unk_01E = 0; + player->particlePool1[i].type = 0; } - for (temp_v0 = 0; temp_v0 < 10; ++temp_v0) { - player->unk_258[20 + temp_v0].unk_01C = 0; - player->unk_258[20 + temp_v0].unk_01E = 0; - player->unk_258[20 + temp_v0].unk_012 = 0; + for (i = 0; i < 10; ++i) { + player->particlePool2[i].isAlive = 0; + player->particlePool2[i].unk_01E = 0; + player->particlePool2[i].type = 0; } } -void func_8005D794(Player* player, UnkPlayerStruct258* arg1, f32 arg2, f32 arg3, f32 arg4, s8 surfaceType, s8 arg6) { - arg1->unk_000[2] = arg4; - arg1->unk_000[0] = arg2; - arg1->unk_000[1] = arg3; +void set_particle_position_and_rotation(Player* player, UnkPlayerStruct258* arg1, f32 x, f32 y, f32 z, s8 surfaceType, s8 arg6) { + arg1->pos[2] = z; + arg1->pos[0] = x; + arg1->pos[1] = y; arg1->unk_020 = -player->rotation[1]; - arg1->unk_014 = surfaceType; + arg1->surfaceType = surfaceType; arg1->unk_010 = arg6; } -s32 func_8005D7D8(UnkPlayerStruct258* arg0, s8 arg1, f32 arg2) { - arg0->unk_01C = 1; - arg0->unk_012 = arg1; +s32 init_particle_player(UnkPlayerStruct258* arg0, s8 type, f32 arg2) { + arg0->isAlive = true; + arg0->type = type; arg0->unk_01E = 0; - arg0->unk_00C = arg2; + arg0->scale = arg2; } -s32 func_8005D800(UnkPlayerStruct258* arg0, s32 arg1, s16 arg2) { - arg0->unk_038 = (u8) (arg1 >> 16); - arg0->unk_03A = (u8) (arg1 >> 8); - arg0->unk_03C = (u8) arg1; - arg0->unk_03E = arg2; +s32 set_particle_colour(UnkPlayerStruct258* arg0, s32 arg1, s16 arg2) { + arg0->red = (u8) (arg1 >> 16); + arg0->green = (u8) (arg1 >> 8); + arg0->blue = (u8) arg1; + arg0->alpha = arg2; } -s32 func_8005D82C(UnkPlayerStruct258* arg0, s32 arg1, s16 arg2) { +s32 set_particle_colour_randomly_varried(UnkPlayerStruct258* arg0, s32 arg1, s16 arg2) { s32 temp_v0; temp_v0 = random_int(0x30); - arg0->unk_038 = (u8) ((u8) (arg1 >> 0x10) - temp_v0); - arg0->unk_03A = (u8) ((u8) (arg1 >> 8) - temp_v0); - arg0->unk_03C = (u8) ((u8) arg1 - temp_v0); - arg0->unk_03E = arg2; + arg0->red = (u8) ((u8) (arg1 >> 0x10) - temp_v0); + arg0->green = (u8) ((u8) (arg1 >> 8) - temp_v0); + arg0->blue = (u8) ((u8) arg1 - temp_v0); + arg0->alpha = arg2; } -void func_8005D898(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4) { +void set_drift_particles(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4) { s32 temp_lo; if (player->unk_0C0 >= 0) { - func_8005D794(player, &player->unk_258[10 + arg1], player->tyres[BACK_LEFT].pos[0], + set_particle_position_and_rotation(player, &player->particlePool1[arg1], player->tyres[BACK_LEFT].pos[0], player->tyres[BACK_LEFT].baseHeight + 2.0f, player->tyres[BACK_LEFT].pos[2], player->tyres[BACK_LEFT].surfaceType, 1); } else { - func_8005D794(player, &player->unk_258[10 + arg1], player->tyres[BACK_RIGHT].pos[0], + set_particle_position_and_rotation(player, &player->particlePool1[arg1], player->tyres[BACK_RIGHT].pos[0], player->tyres[BACK_RIGHT].baseHeight + 2.0f, player->tyres[BACK_RIGHT].pos[2], player->tyres[BACK_RIGHT].surfaceType, 0); } temp_lo = player->unk_0C0 / 182; if ((temp_lo >= 7) || (temp_lo < -6)) { - func_8005D7D8(&player->unk_258[10 + arg1], 1, 0.35f); - if (player->unk_22A == 0) { - func_8005D800(&player->unk_258[10 + arg1], 0xFFFFFF, 0x70); + init_particle_player(&player->particlePool1[arg1], DRIFT_PARTICLE, 0.35f); + if (player->driftState == 0) { + set_particle_colour(&player->particlePool1[arg1], 0xFFFFFF, 0x70); } - if (player->unk_22A == 1) { - func_8005D800(&player->unk_258[10 + arg1], 0xFFFF00, 0x70); + if (player->driftState == 1) { + set_particle_colour(&player->particlePool1[arg1], 0xFFFF00, 0x70); } - if (player->unk_22A >= 2) { - func_8005D800(&player->unk_258[10 + arg1], 0xFF9600, 0x70); + if (player->driftState >= 2) { + set_particle_colour(&player->particlePool1[arg1], 0xFF9600, 0x70); } - if (player->unk_22A >= 2) { + if (player->driftState >= 2) { // Why not put this in previous if statement? - player->unk_258[10 + arg1].unk_040 = 2; + player->particlePool1[arg1].unk_040 = 2; return; } - player->unk_258[10 + arg1].unk_040 = player->unk_22A; + player->particlePool1[arg1].unk_040 = player->driftState; } } -void func_8005DA30(Player* player, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { - if ((arg1 == 0) && ((player->unk_258[10 + arg2].unk_01E >= 3) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D898(player, arg1, arg2, arg3, arg4); - } else if (player->unk_258[10 + arg2].unk_01E >= 3) { - func_8005D898(player, arg1, arg2, arg3, arg4); +void check_drift_particles_setup_valid(Player* player, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { + if ((arg1 == 0) && + ((player->particlePool1[arg2].unk_01E >= 3) || (player->particlePool1[arg2].isAlive == 0))) { + set_drift_particles(player, arg1, arg2, arg3, arg4); + } else if (player->particlePool1[arg2].unk_01E >= 3) { + set_drift_particles(player, arg1, arg2, arg3, arg4); } } @@ -2896,228 +2887,219 @@ UNUSED void func_8005DAD0(void) { } void func_8005DAD8(UnkPlayerStruct258* arg0, s16 arg1, s16 arg2, s16 arg3) { - arg0->unk_038 = arg1; - arg0->unk_03E = arg3; + arg0->red = arg1; + arg0->alpha = arg3; arg0->unk_040 = arg2; } -void func_8005DAF4(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4) { +void setup_tyre_particles(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4) { UNUSED s32 stackPadding; s32 surfaceType; s32 var_t3; - f32 var_f2; - f32 var_f12; - f32 var_f14; - s32 temp_v0; + f32 x; + f32 z; + f32 y; + s32 randval; static s32 test = 8; surfaceType = 0x000000FF; - temp_v0 = random_int(test); - if ((temp_v0 == 0) || (temp_v0 == 4)) { - var_f2 = player->tyres[BACK_LEFT].pos[0]; - var_f12 = player->tyres[BACK_LEFT].baseHeight + 2.0f; - var_f14 = player->tyres[BACK_LEFT].pos[2]; + randval = random_int(test); + if ((randval == 0) || (randval == 4)) { + x = player->tyres[BACK_LEFT].pos[0]; + z = player->tyres[BACK_LEFT].baseHeight + 2.0f; + y = player->tyres[BACK_LEFT].pos[2]; var_t3 = 1; surfaceType = player->tyres[BACK_LEFT].surfaceType; } - if ((temp_v0 == 2) || (temp_v0 == 6)) { - var_f2 = player->tyres[BACK_RIGHT].pos[0]; - var_f12 = player->tyres[BACK_RIGHT].baseHeight + 2.0f; - var_f14 = player->tyres[BACK_RIGHT].pos[2]; + if ((randval == 2) || (randval == 6)) { + x = player->tyres[BACK_RIGHT].pos[0]; + z = player->tyres[BACK_RIGHT].baseHeight + 2.0f; + y = player->tyres[BACK_RIGHT].pos[2]; var_t3 = 0; surfaceType = player->tyres[BACK_RIGHT].surfaceType; } switch (surfaceType) { case DIRT: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { if (((player->speed / 18.0f) * 216.0f) >= 10.0f) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); if ((IsChocoMountain()) || (IsRoyalRaceway())) { - func_8005DAD8(&player->unk_258[10 + arg1], 1, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 1, 0, 0x0080); } if (IsKalimariDesert()) { - func_8005DAD8(&player->unk_258[10 + arg1], 7, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 7, 0, 0x0080); } if (IsMooMooFarm()) { - func_8005DAD8(&player->unk_258[10 + arg1], 8, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 8, 0, 0x0080); } if (IsWarioStadium()) { - func_8005DAD8(&player->unk_258[10 + arg1], 9, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 9, 0, 0x0080); } if (IsYoshiValley()) { - func_8005DAD8(&player->unk_258[10 + arg1], 10, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 10, 0, 0x0080); } if (IsDkJungle()) { - func_8005DAD8(&player->unk_258[10 + arg1], 11, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 11, 0, 0x0080); } - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + player->particlePool1[arg1].green = random_int(0x0010U); } - } else if ((player->unk_258[10 + arg2].unk_01E > 0) && (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); + } else if ((player->particlePool1[arg2].unk_01E > 0) && + (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); if ((IsChocoMountain()) || (IsRoyalRaceway())) { - func_8005DAD8(&player->unk_258[10 + arg1], 1, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 1, 0, 0x0080); } if (IsKalimariDesert()) { - func_8005DAD8(&player->unk_258[10 + arg1], 7, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 7, 0, 0x0080); } if (IsMooMooFarm()) { - func_8005DAD8(&player->unk_258[10 + arg1], 8, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 8, 0, 0x0080); } if (IsWarioStadium()) { - func_8005DAD8(&player->unk_258[10 + arg1], 9, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 9, 0, 0x0080); } if (IsYoshiValley()) { - func_8005DAD8(&player->unk_258[10 + arg1], 10, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 10, 0, 0x0080); } if (IsDkJungle()) { - func_8005DAD8(&player->unk_258[10 + arg1], 11, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 11, 0, 0x0080); } - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case GRASS: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { if (((player->speed / 18.0f) * 216.0f) >= 10.0f) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 3, 1.0f); - func_8005D800(&player->unk_258[10 + arg1], 0x00FFFFFF, 0x00FF); - player->unk_258[10 + arg1].unk_038 -= arg1 * 8; - player->unk_258[10 + arg1].unk_03A -= arg1 * 8; - player->unk_258[10 + arg1].unk_03C -= arg1 * 8; + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GRASS_PARTICLE, 1.0f); + set_particle_colour(&player->particlePool1[arg1], 0x00FFFFFF, 0x00FF); + player->particlePool1[arg1].red -= arg1 * 8; + player->particlePool1[arg1].green -= arg1 * 8; + player->particlePool1[arg1].blue -= arg1 * 8; } - } else if ((player->unk_258[10 + arg2].unk_01E > 0) && (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 3, 1.0f); - func_8005D800(&player->unk_258[10 + arg1], 0x00FFFFFF, 0x00FF); - player->unk_258[10 + arg1].unk_038 -= arg1 * 8; - player->unk_258[10 + arg1].unk_03A -= arg1 * 8; - player->unk_258[10 + arg1].unk_03C -= arg1 * 8; + } else if ((player->particlePool1[arg2].unk_01E > 0) && + (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GRASS_PARTICLE, 1.0f); + set_particle_colour(&player->particlePool1[arg1], 0x00FFFFFF, 0x00FF); + player->particlePool1[arg1].red -= arg1 * 8; + player->particlePool1[arg1].green -= arg1 * 8; + player->particlePool1[arg1].blue -= arg1 * 8; } - player->unk_258[10 + arg1].unk_000[1] -= 1.5; + player->particlePool1[arg1].pos[1] -= 1.5; break; case SAND_OFFROAD: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { if (((player->speed / 18.0f) * 216.0f) >= 10.0f) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 2, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 2, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } - } else if ((player->unk_258[10 + arg2].unk_01E > 0) && (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 2, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + } else if ((player->particlePool1[arg2].unk_01E > 0) && + (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 2, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case SAND: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { if (((player->speed / 18.0f) * 216.0f) >= 10.0f) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 3, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 3, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } - } else if ((player->unk_258[10 + arg2].unk_01E > 0) && (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 3, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + } else if ((player->particlePool1[arg2].unk_01E > 0) && + (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 3, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case WET_SAND: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { if (((player->speed / 18.0f) * 216.0f) >= 10.0f) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 4, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 4, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } - } else if ((player->unk_258[10 + arg2].unk_01E > 0) && (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 4, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + } else if ((player->particlePool1[arg2].unk_01E > 0) && + (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 4, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case DIRT_OFFROAD: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { if (((player->speed / 18.0f) * 216.0f) >= 10.0f) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 5, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 5, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } - } else if ((player->unk_258[10 + arg2].unk_01E > 0) && (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005D82C(&player->unk_258[10 + arg1], 0x00FFA54F, 0x00AF); - func_8005DAD8(&player->unk_258[10 + arg1], 5, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + } else if ((player->particlePool1[arg2].unk_01E > 0) && + (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + set_particle_colour_randomly_varried(&player->particlePool1[arg1], 0x00FFA54F, 0x00AF); + func_8005DAD8(&player->particlePool1[arg1], 5, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case SNOW: case SNOW_OFFROAD: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { if (((player->speed / 18.0f) * 216.0f) >= 10.0f) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 6, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 6, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } - } else if ((player->unk_258[10 + arg2].unk_01E > 0) && (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 6, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + } else if ((player->particlePool1[arg2].unk_01E > 0) && + (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 6, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case ASPHALT: case STONE: case BRIDGE: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { if (((((player->speed / 18.0f) * 216.0f) >= 30.0f) && ((((player->unk_0C0 / 182) > 0x14) || ((player->unk_0C0 / 182) < (-0x14))))) || ((player->previousSpeed - player->speed) >= 0.04)) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 0, 0, 0x0080); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 0, 0, 0x0080); + player->particlePool1[arg1].green = random_int(0x0010U); } - } else if ((player->unk_258[10 + arg2].unk_01E > 0) && + } else if ((player->particlePool1[arg2].unk_01E > 0) && (((((player->speed / 18.0f) * 216.0f) >= 30.0f) && (((player->unk_0C0 / 182) >= 0x15) || ((player->unk_0C0 / 182) < -0x14))) || ((player->previousSpeed - player->speed) >= 0.04))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 2, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 0, 0, 0x0080); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, z, y, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], GROUND_PARTICLE, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 0, 0, 0x0080); + player->particlePool1[arg1].green = random_int(0x0010U); } break; default: @@ -3127,45 +3109,46 @@ void func_8005DAF4(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 void func_8005EA94(Player* player, s16 arg1, s32 arg2, s8 arg3, UNUSED s8 arg4) { s32 temp_v0; - s32 var_t0; + s32 surfaceType; s32 var_t1; - f32 var_f2; - f32 var_f12; - f32 var_f14; + f32 x; + f32 y; + f32 z; static s32 test = 10; - var_t0 = 0x000000FF; + surfaceType = 0x000000FF; temp_v0 = random_int(test); if ((temp_v0 == 0) || (temp_v0 == 8)) { if ((D_801652A0[arg3] - player->tyres[BACK_LEFT].baseHeight) >= 3.5) { - var_f2 = player->tyres[BACK_LEFT].pos[0]; - var_f12 = player->tyres[BACK_LEFT].baseHeight + 2.0f; - var_f14 = player->tyres[BACK_LEFT].pos[2]; + x = player->tyres[BACK_LEFT].pos[0]; + y = player->tyres[BACK_LEFT].baseHeight + 2.0f; + z = player->tyres[BACK_LEFT].pos[2]; var_t1 = 1; - var_t0 = 0; + surfaceType = 0; } } if ((temp_v0 == 2) || (temp_v0 == 6)) { if ((D_801652A0[arg3] - player->tyres[BACK_RIGHT].baseHeight) >= 3.5) { - var_f2 = player->tyres[BACK_RIGHT].pos[0]; - var_f12 = player->tyres[BACK_RIGHT].baseHeight + 2.0f; - var_f14 = player->tyres[BACK_RIGHT].pos[2]; + x = player->tyres[BACK_RIGHT].pos[0]; + y = player->tyres[BACK_RIGHT].baseHeight + 2.0f; + z = player->tyres[BACK_RIGHT].pos[2]; var_t1 = 0; - var_t0 = 0; + surfaceType = 0; } } if (1) {} - if (var_t0 == 0) { - if ((arg1 == 0) && ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { + if (surfaceType == 0) { + if ((arg1 == 0) && + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { if (((player->speed / 18.0f) * 216.0f) >= 10.0f) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, var_t0, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 9, 0.8f); - func_8005D800(&player->unk_258[10 + arg1], 0x00FFFFFF, 0x00AF); + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 9, 0.8f); + set_particle_colour(&player->particlePool1[arg1], 0x00FFFFFF, 0x00AF); } - } else if ((player->unk_258[10 + arg2].unk_01E > 0) && (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f2, var_f12, var_f14, var_t0, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 9, 0.8f); - func_8005D800(&player->unk_258[10 + arg1], 0x00FFFFFF, 0x00AF); + } else if ((player->particlePool1[arg2].unk_01E > 0) && (((player->speed / 18.0f) * 216.0f) >= 10.0f)) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 9, 0.8f); + set_particle_colour(&player->particlePool1[arg1], 0x00FFFFFF, 0x00AF); } } } @@ -3174,194 +3157,180 @@ void func_8005ED48(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 s32 temp_v0; s32 surfaceType; s32 var_t3; - f32 var_f0; - f32 var_f2; - f32 var_f12; + f32 x; + f32 y; + f32 z; static s32 test = 8; surfaceType = 0x000000FF; temp_v0 = random_int(test); if ((temp_v0 == 2) || (temp_v0 == 4)) { - var_f0 = player->tyres[BACK_LEFT].pos[0]; - var_f2 = player->tyres[BACK_LEFT].baseHeight + 2.0f; - var_f12 = player->tyres[BACK_LEFT].pos[2]; + x = player->tyres[BACK_LEFT].pos[0]; + y = player->tyres[BACK_LEFT].baseHeight + 2.0f; + z = player->tyres[BACK_LEFT].pos[2]; var_t3 = 1; surfaceType = player->tyres[BACK_LEFT].surfaceType; } if ((temp_v0 == 0) || (temp_v0 == 6)) { - var_f0 = player->tyres[BACK_RIGHT].pos[0]; - var_f2 = player->tyres[BACK_RIGHT].baseHeight + 2.0f; - var_f12 = player->tyres[BACK_RIGHT].pos[2]; + x = player->tyres[BACK_RIGHT].pos[0]; + y = player->tyres[BACK_RIGHT].baseHeight + 2.0f; + z = player->tyres[BACK_RIGHT].pos[2]; var_t3 = 0; surfaceType = player->tyres[BACK_RIGHT].surfaceType; } switch (surfaceType) { case DIRT: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); if ((IsChocoMountain()) || (IsRoyalRaceway())) { - func_8005DAD8(&player->unk_258[10 + arg1], 1, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 1, 0, 0x0080); } if (IsKalimariDesert()) { - func_8005DAD8(&player->unk_258[10 + arg1], 7, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 7, 0, 0x0080); } if (IsMooMooFarm()) { - func_8005DAD8(&player->unk_258[10 + arg1], 8, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 8, 0, 0x0080); } if (IsWarioStadium()) { - func_8005DAD8(&player->unk_258[10 + arg1], 9, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 9, 0, 0x0080); } if (IsYoshiValley()) { - func_8005DAD8(&player->unk_258[10 + arg1], 10, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 10, 0, 0x0080); } if (IsDkJungle()) { - func_8005DAD8(&player->unk_258[10 + arg1], 11, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 11, 0, 0x0080); } - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); if ((IsChocoMountain()) || (IsRoyalRaceway())) { - func_8005DAD8(&player->unk_258[10 + arg1], 1, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 1, 0, 0x0080); } if (IsKalimariDesert()) { - func_8005DAD8(&player->unk_258[10 + arg1], 7, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 7, 0, 0x0080); } if (IsMooMooFarm()) { - func_8005DAD8(&player->unk_258[10 + arg1], 8, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 8, 0, 0x0080); } if (IsWarioStadium()) { - func_8005DAD8(&player->unk_258[10 + arg1], 9, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 9, 0, 0x0080); } if (IsYoshiValley()) { - func_8005DAD8(&player->unk_258[10 + arg1], 0x000A, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 0x000A, 0, 0x0080); } if (IsDkJungle()) { - func_8005DAD8(&player->unk_258[10 + arg1], 0x000B, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 0x000B, 0, 0x0080); } - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case GRASS: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.1f); - func_8005D800(&player->unk_258[10 + arg1], 0x00FFFFFF, 0x00FF); - player->unk_258[10 + arg1].unk_038 -= arg1 * 8; - player->unk_258[10 + arg1].unk_03A -= arg1 * 8; - player->unk_258[10 + arg1].unk_03C -= arg1 * 8; - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.1f); - func_8005D800(&player->unk_258[10 + arg1], 0x00FFFFFF, 0x00FF); - player->unk_258[10 + arg1].unk_038 -= arg1 * 8; - player->unk_258[10 + arg1].unk_03A -= arg1 * 8; - player->unk_258[10 + arg1].unk_03C -= arg1 * 8; + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.1f); + set_particle_colour(&player->particlePool1[arg1], 0x00FFFFFF, 0x00FF); + player->particlePool1[arg1].red -= arg1 * 8; + player->particlePool1[arg1].green -= arg1 * 8; + player->particlePool1[arg1].blue -= arg1 * 8; + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.1f); + set_particle_colour(&player->particlePool1[arg1], 0x00FFFFFF, 0x00FF); + player->particlePool1[arg1].red -= arg1 * 8; + player->particlePool1[arg1].green -= arg1 * 8; + player->particlePool1[arg1].blue -= arg1 * 8; } - player->unk_258[10 + arg1].unk_000[1] -= 1.5; + player->particlePool1[arg1].pos[1] -= 1.5; break; case SAND_OFFROAD: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 2, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 2, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 2, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 2, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case SAND: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 3, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 3, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 3, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 3, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case WET_SAND: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 4, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 4, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 4, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 4, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case DIRT_OFFROAD: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 5, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 5, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 5, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 5, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case SNOW: case SNOW_OFFROAD: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 6, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 6, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 6, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 6, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case ASPHALT: case STONE: case BRIDGE: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 0, 0, 0x0080); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, (s8) surfaceType, - (s8) var_t3); - func_8005D7D8(&player->unk_258[10 + arg1], 5, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 0, 0, 0x0080); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 0, 0, 0x0080); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, (s8) surfaceType, (s8) var_t3); + init_particle_player(&player->particlePool1[arg1], 5, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 0, 0, 0x0080); + player->particlePool1[arg1].green = random_int(0x0010U); } break; default: @@ -3377,21 +3346,21 @@ void func_8005ED48(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 void func_8005F90C(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4) { s32 var_t1; u8 surfaceType; - f32 var_f0; - f32 var_f2; - f32 var_f12; + f32 x; + f32 y; + f32 z; var_t1 = 0; if ((player->effects & 0x80) == 0x80) { - var_f0 = player->pos[0]; - var_f2 = player->pos[1] - player->boundingBoxSize; - var_f12 = player->pos[2]; + x = player->pos[0]; + y = player->pos[1] - player->boundingBoxSize; + z = player->pos[2]; var_t1 = 1; surfaceType = player->tyres[BACK_LEFT].surfaceType; } else { - var_f0 = player->pos[0]; - var_f2 = player->pos[1] - player->boundingBoxSize; - var_f12 = player->pos[2]; + x = player->pos[0]; + y = player->pos[1] - player->boundingBoxSize; + z = player->pos[2]; surfaceType = player->tyres[BACK_RIGHT].surfaceType; } @@ -3399,156 +3368,156 @@ void func_8005F90C(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 switch (surfaceType) { case DIRT: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); if ((IsChocoMountain()) || (IsRoyalRaceway())) { - func_8005DAD8(&player->unk_258[10 + arg1], 1, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 1, 0, 0x0080); } if (IsKalimariDesert()) { - func_8005DAD8(&player->unk_258[10 + arg1], 7, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 7, 0, 0x0080); } if (IsMooMooFarm()) { - func_8005DAD8(&player->unk_258[10 + arg1], 8, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 8, 0, 0x0080); } if (IsWarioStadium()) { - func_8005DAD8(&player->unk_258[10 + arg1], 9, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 9, 0, 0x0080); } if (IsYoshiValley()) { - func_8005DAD8(&player->unk_258[10 + arg1], 0x000A, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 0x000A, 0, 0x0080); } if (IsDkJungle()) { - func_8005DAD8(&player->unk_258[10 + arg1], 0x000B, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 0x000B, 0, 0x0080); } - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); if ((IsChocoMountain()) || (IsRoyalRaceway())) { - func_8005DAD8(&player->unk_258[10 + arg1], 1, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 1, 0, 0x0080); } if (IsKalimariDesert()) { - func_8005DAD8(&player->unk_258[10 + arg1], 7, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 7, 0, 0x0080); } if (IsMooMooFarm()) { - func_8005DAD8(&player->unk_258[10 + arg1], 8, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 8, 0, 0x0080); } if (IsWarioStadium()) { - func_8005DAD8(&player->unk_258[10 + arg1], 9, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 9, 0, 0x0080); } if (IsYoshiValley()) { - func_8005DAD8(&player->unk_258[10 + arg1], 0x000A, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 0x000A, 0, 0x0080); } if (IsDkJungle()) { - func_8005DAD8(&player->unk_258[10 + arg1], 0x000B, 0, 0x0080); + func_8005DAD8(&player->particlePool1[arg1], 0x000B, 0, 0x0080); } - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case GRASS: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.1f); - func_8005D800(&player->unk_258[10 + arg1], 0x00FFFFFF, 0x00FF); - player->unk_258[10 + arg1].unk_038 -= arg1 * 8; - player->unk_258[10 + arg1].unk_03A -= arg1 * 8; - player->unk_258[10 + arg1].unk_03C -= arg1 * 8; - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.1f); - func_8005D800(&player->unk_258[10 + arg1], 0x00FFFFFF, 0x00FF); - player->unk_258[10 + arg1].unk_038 -= arg1 * 8; - player->unk_258[10 + arg1].unk_03A -= arg1 * 8; - player->unk_258[10 + arg1].unk_03C -= arg1 * 8; + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.1f); + set_particle_colour(&player->particlePool1[arg1], 0x00FFFFFF, 0x00FF); + player->particlePool1[arg1].red -= arg1 * 8; + player->particlePool1[arg1].green -= arg1 * 8; + player->particlePool1[arg1].blue -= arg1 * 8; + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.1f); + set_particle_colour(&player->particlePool1[arg1], 0x00FFFFFF, 0x00FF); + player->particlePool1[arg1].red -= arg1 * 8; + player->particlePool1[arg1].green -= arg1 * 8; + player->particlePool1[arg1].blue -= arg1 * 8; } - player->unk_258[10 + arg1].unk_000[1] -= 1.5; + player->particlePool1[arg1].pos[1] -= 1.5; break; case SAND_OFFROAD: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 2, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 2, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 2, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 2, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case SAND: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 3, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 3, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 3, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 3, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case WET_SAND: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 4, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 4, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 4, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 4, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case DIRT_OFFROAD: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 5, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 5, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 5, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 5, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case SNOW: case SNOW_OFFROAD: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 6, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 6, 1, 0x00A8); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 6, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 6, 1, 0x00A8); + player->particlePool1[arg1].green = random_int(0x0010U); } break; case ASPHALT: case STONE: case BRIDGE: if ((arg1 == 0) && - ((player->unk_258[10 + arg2].unk_01E > 0) || (player->unk_258[10 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 0, 0, 0x0080); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); - } else if (player->unk_258[10 + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[10 + arg1], var_f0, var_f2, var_f12, surfaceType, var_t1); - func_8005D7D8(&player->unk_258[10 + arg1], 4, 0.46f); - func_8005DAD8(&player->unk_258[10 + arg1], 0, 0, 0x0080); - player->unk_258[10 + arg1].unk_03A = random_int(0x0010U); + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 0, 0, 0x0080); + player->particlePool1[arg1].green = random_int(0x0010U); + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], x, y, z, surfaceType, var_t1); + init_particle_player(&player->particlePool1[arg1], 4, 0.46f); + func_8005DAD8(&player->particlePool1[arg1], 0, 0, 0x0080); + player->particlePool1[arg1].green = random_int(0x0010U); } break; default: @@ -3578,53 +3547,54 @@ void func_80060504(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 } temp_v0 = random_int(var_v0); if ((temp_v0 == 1) || (temp_v0 == 2) || (temp_v0 == 3)) { - if ((arg1 == 0) && ((player->unk_258[arg2].unk_01E > 0) || (player->unk_258[arg2].unk_01C == 0))) { + if ((arg1 == 0) && + ((player->particlePool0[arg2].unk_01E > 0) || (player->particlePool0[arg2].isAlive == 0))) { sp4C = player->pos[1] - 2.5; sp48 = player->pos[2]; sp50 = player->pos[0]; - func_8005D794(player, &player->unk_258[arg1], sp50, sp4C, sp48, 0, 0); - func_8005D7D8(&player->unk_258[arg1], 1, 0.5f); - } else if (player->unk_258[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool0[arg1], sp50, sp4C, sp48, 0, 0); + init_particle_player(&player->particlePool0[arg1], 1, 0.5f); + } else if (player->particlePool0[arg2].unk_01E > 0) { sp4C = player->pos[1] - 2.5; sp48 = player->pos[2]; sp50 = player->pos[0]; - func_8005D794(player, &player->unk_258[arg1], sp50, sp4C, sp48, 0, 0); - func_8005D7D8(&player->unk_258[arg1], 1, 0.5f); + set_particle_position_and_rotation(player, &player->particlePool0[arg1], sp50, sp4C, sp48, 0, 0); + init_particle_player(&player->particlePool0[arg1], 1, 0.5f); } } - player->unk_258[arg1].unk_024 = 0.0f; + player->particlePool0[arg1].unk_024 = 0.0f; if ((player->unk_044 & 0x20) == 0x20) { - player->unk_258[arg1].unk_040 = 0; + player->particlePool0[arg1].unk_040 = 0; if ((player->effects & BOOST_EFFECT) == BOOST_EFFECT) { - func_8005D800(&player->unk_258[arg1], 0x00FFFF00, 0x0080); - player->unk_258[arg1].unk_038 = 1; + set_particle_colour(&player->particlePool0[arg1], 0x00FFFF00, 0x0080); + player->particlePool0[arg1].red = 1; } else { - func_8005D800(&player->unk_258[arg1], 0x00FFFFFF, 0x0070); - player->unk_258[arg1].unk_038 = 0; + set_particle_colour(&player->particlePool0[arg1], 0x00FFFFFF, 0x0070); + player->particlePool0[arg1].red = 0; } } else { - player->unk_258[arg1].unk_040 = 1; + player->particlePool0[arg1].unk_040 = 1; if ((player->effects & BOOST_EFFECT) == BOOST_EFFECT) { - func_8005D800(&player->unk_258[arg1], 0x00FFFF00, 0x0080); - player->unk_258[arg1].unk_038 = 1; + set_particle_colour(&player->particlePool0[arg1], 0x00FFFF00, 0x0080); + player->particlePool0[arg1].red = 1; } else { - func_8005D800(&player->unk_258[arg1], 0x00FFFFFF, 0x0070); - player->unk_258[arg1].unk_038 = 0; + set_particle_colour(&player->particlePool0[arg1], 0x00FFFFFF, 0x0070); + player->particlePool0[arg1].red = 0; } } - thing2 = (player->unk_258[arg1].unk_020 - (player->unk_0C0 / 2)); - if (player->unk_258[arg1].unk_040 == 0) { + thing2 = (player->particlePool0[arg1].unk_020 - (player->unk_0C0 / 2)); + if (player->particlePool0[arg1].unk_040 == 0) { var_f0 = -((player->unk_098 / 3000.0f) + 0.1); } else { var_f0 = -((player->unk_098 / 5000.0f) + 0.1); } - func_80062B18(&sp50, &sp4C, &sp48, 0.0f, 4.5f, (player->unk_258[arg1].unk_01E * var_f0) + -5.5, -thing2, + func_80062B18(&sp50, &sp4C, &sp48, 0.0f, 4.5f, (player->particlePool0[arg1].unk_01E * var_f0) + -5.5, -thing2, -player->unk_206 * 2); - player->unk_258[arg1].unk_000[0] = player->pos[0] + sp50; + player->particlePool0[arg1].pos[0] = player->pos[0] + sp50; sp4C = sp4C + (player->pos[1] - player->boundingBoxSize); - player->unk_258[arg1].unk_000[2] = player->pos[2] + sp48; - player->unk_258[arg1].unk_000[1] = player->unk_258[arg1].unk_024 + sp4C; - player->unk_258[arg1].unk_010 = 0; + player->particlePool0[arg1].pos[2] = player->pos[2] + sp48; + player->particlePool0[arg1].pos[1] = player->particlePool0[arg1].unk_024 + sp4C; + player->particlePool0[arg1].unk_010 = 0; } void func_800608E0(Player* player, s16 arg1, UNUSED s32 arg2, s8 arg3, UNUSED s8 arg4) { @@ -3642,26 +3612,27 @@ void func_800608E0(Player* player, s16 arg1, UNUSED s32 arg2, s8 arg3, UNUSED s8 var_f0 = 2.5f; sp4C = (f32) ((f64) (D_801652A0[arg3] - player->pos[1]) + 0.1); } - func_8005D794(player, &player->unk_258[arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); - func_8005D7D8(&player->unk_258[arg1], 3, var_f0); + set_particle_position_and_rotation(player, &player->particlePool0[arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); + init_particle_player(&player->particlePool0[arg1], 3, var_f0); if ((IsBowsersCastle()) || (IsBigDonut())) { - func_8005D800(&player->unk_258[arg1], 0, 0x00AF); + set_particle_colour(&player->particlePool0[arg1], 0, 0x00AF); } else { - func_8005D800(&player->unk_258[arg1], 0x00FFFFFF, 0x00CF); + set_particle_colour(&player->particlePool0[arg1], 0x00FFFFFF, 0x00CF); } func_80062B18(&sp50, &sp4C, &sp48, 0.0f, sp4C, - ((-player->unk_258[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 10.0f) + -4.0f, - -player->unk_258[arg1].unk_020, -player->unk_206 * 2); - player->unk_258[arg1].unk_000[0] = player->pos[0] + sp50; - player->unk_258[arg1].unk_000[2] = player->pos[2] + sp48; - player->unk_258[arg1].unk_000[1] = player->pos[1] + sp4C; + ((-player->particlePool0[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 10.0f) + -4.0f, + -player->particlePool0[arg1].unk_020, -player->unk_206 * 2); + player->particlePool0[arg1].pos[0] = player->pos[0] + sp50; + player->particlePool0[arg1].pos[2] = player->pos[2] + sp48; + player->particlePool0[arg1].pos[1] = player->pos[1] + sp4C; } void func_80060B14(Player* player, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { if ((!IsSkyscraper()) && (!IsRainbowRoad())) { - if ((arg1 == 0) && ((player->unk_258[arg2].unk_01E > 0) || (player->unk_258[arg2].unk_01C == 0))) { + if ((arg1 == 0) && + ((player->particlePool0[arg2].unk_01E > 0) || (player->particlePool0[arg2].isAlive == 0))) { func_800608E0(player, arg1, arg2, arg3, arg4); - } else if (player->unk_258[arg2].unk_01E > 0) { + } else if (player->particlePool0[arg2].unk_01E > 0) { func_800608E0(player, arg1, arg2, arg3, arg4); } } @@ -3687,70 +3658,76 @@ void func_80060BCC(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 if (player != gPlayerOne) { return; } - if ((arg1 == 0) && ((player->unk_258[arg2 + 10].unk_01E > 0) || (player->unk_258[arg2 + 10].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[arg1 + 10], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); - func_8005D7D8(&player->unk_258[arg1 + 10], 0x0B, 0.4f); - func_8005D800(&player->unk_258[arg1 + 10], 0x00FFFFFF, 0x00FF); - player->unk_258[arg1 + 10].unk_000[2] = player->pos[2] + (coss(sp54 * 0xB6) * -1.8); - player->unk_258[arg1 + 10].unk_000[0] = player->pos[0] + (sins(sp54 * 0xB6) * -1.8); - player->unk_258[arg1 + 10].unk_000[1] = (player->pos[1] - player->boundingBoxSize) + sp4C + 2.0f; - player->unk_258[arg1 + 10].unk_018 = sp44 + 1.0f; - player->unk_258[arg1 + 10].unk_00C = (sp48 + 2.0f) / 10.0f; - } else if (player->unk_258[arg2 + 10].unk_01E > 0) { - func_8005D794(player, &player->unk_258[arg1 + 10], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); - func_8005D7D8(&player->unk_258[arg1 + 10], 0x0B, 0.4f); - func_8005D800(&player->unk_258[arg1 + 10], 0x00FFFFFF, 0x00FF); - player->unk_258[arg1 + 10].unk_000[2] = player->pos[2] + (coss(sp54 * 0xB6) * -1.8); - player->unk_258[arg1 + 10].unk_000[0] = player->pos[0] + (sins(sp54 * 0xB6) * -1.8); - player->unk_258[arg1 + 10].unk_000[1] = (player->pos[1] - player->boundingBoxSize) + sp4C + 2.0f; - player->unk_258[arg1 + 10].unk_018 = sp44 + 1.0f; - player->unk_258[arg1 + 10].unk_00C = (sp48 + 2.0f) / 10.0f; + if ((arg1 == 0) && + ((player->particlePool1[arg2].unk_01E > 0) || (player->particlePool1[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); + init_particle_player(&player->particlePool1[arg1], 0x0B, 0.4f); + set_particle_colour(&player->particlePool1[arg1], 0x00FFFFFF, 0x00FF); + player->particlePool1[arg1].pos[2] = player->pos[2] + (coss(sp54 * 0xB6) * -1.8); + player->particlePool1[arg1].pos[0] = player->pos[0] + (sins(sp54 * 0xB6) * -1.8); + player->particlePool1[arg1].pos[1] = (player->pos[1] - player->boundingBoxSize) + sp4C + 2.0f; + player->particlePool1[arg1].unk_018 = sp44 + 1.0f; + player->particlePool1[arg1].scale = (sp48 + 2.0f) / 10.0f; + } else if (player->particlePool1[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool1[arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); + init_particle_player(&player->particlePool1[arg1], 0x0B, 0.4f); + set_particle_colour(&player->particlePool1[arg1], 0x00FFFFFF, 0x00FF); + player->particlePool1[arg1].pos[2] = player->pos[2] + (coss(sp54 * 0xB6) * -1.8); + player->particlePool1[arg1].pos[0] = player->pos[0] + (sins(sp54 * 0xB6) * -1.8); + player->particlePool1[arg1].pos[1] = (player->pos[1] - player->boundingBoxSize) + sp4C + 2.0f; + player->particlePool1[arg1].unk_018 = sp44 + 1.0f; + player->particlePool1[arg1].scale = (sp48 + 2.0f) / 10.0f; } } void func_80060F50(Player* player, s16 arg1, UNUSED s32 arg2, s8 arg3, UNUSED s8 arg4) { - func_8005D794(player, &player->unk_258[arg1], 0.0f, 0.0f, 0.0f, 0, 0); - func_8005D7D8(&player->unk_258[arg1], 5, 4.0f); + set_particle_position_and_rotation(player, &player->particlePool0[arg1], 0.0f, 0.0f, 0.0f, 0, 0); + init_particle_player(&player->particlePool0[arg1], 5, 4.0f); if ((IsBowsersCastle()) || (IsBigDonut())) { - func_8005D800(&player->unk_258[arg1], 0xFF0000, 0xFF); + set_particle_colour(&player->particlePool0[arg1], 0xFF0000, 0xFF); } else { - func_8005D800(&player->unk_258[arg1], 0xFFFFFF, 0xFF); + set_particle_colour(&player->particlePool0[arg1], 0xFFFFFF, 0xFF); } - player->unk_258[arg1].unk_000[2] = player->pos[2] + (coss(player->unk_258[arg1].unk_020) * -5.8); - player->unk_258[arg1].unk_000[0] = player->pos[0] + (sins(player->unk_258[arg1].unk_020) * -5.8); - player->unk_258[arg1].unk_000[1] = D_801652A0[arg3]; + player->particlePool0[arg1].pos[2] = + player->pos[2] + (coss(player->particlePool0[arg1].unk_020) * -5.8); + player->particlePool0[arg1].pos[0] = + player->pos[0] + (sins(player->particlePool0[arg1].unk_020) * -5.8); + player->particlePool0[arg1].pos[1] = D_801652A0[arg3]; player->unk_0DE &= ~0x0008; } void func_80061094(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4) { if (arg1 == 0) { - func_8005D794(player, &player->unk_258[arg1], 0.0f, 0.0f, 0.0f, 0, 0); - func_8005D7D8(&player->unk_258[arg1], 6, 3.8f); - func_8005D800(&player->unk_258[arg1], 0xFFFFFF, 0xFF); - player->unk_258[arg1].unk_038 = 0; - player->unk_258[arg1].unk_03A = 0; - player->unk_258[arg1].unk_03C = 0; + set_particle_position_and_rotation(player, &player->particlePool0[arg1], 0.0f, 0.0f, 0.0f, 0, 0); + init_particle_player(&player->particlePool0[arg1], 6, 3.8f); + set_particle_colour(&player->particlePool0[arg1], 0xFFFFFF, 0xFF); + player->particlePool0[arg1].red = 0; + player->particlePool0[arg1].green = 0; + player->particlePool0[arg1].blue = 0; } } void func_80061130(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4) { - func_8005D794(player, &player->unk_258[arg1], 0.0f, 0.0f, 0.0f, 0, 0); - func_8005D7D8(&player->unk_258[arg1], 7, 0.6f); - func_8005D800(&player->unk_258[arg1], 0xFFFFFF, 0xD0); + set_particle_position_and_rotation(player, &player->particlePool0[arg1], 0.0f, 0.0f, 0.0f, 0, 0); + init_particle_player(&player->particlePool0[arg1], 7, 0.6f); + set_particle_colour(&player->particlePool0[arg1], 0xFFFFFF, 0xD0); - player->unk_258[arg1].unk_000[2] = player->pos[2] + (coss(player->unk_258[arg1].unk_020) * 6.0f); - player->unk_258[arg1].unk_000[0] = player->pos[0] + (sins(player->unk_258[arg1].unk_020) * 6.0f); - player->unk_258[arg1].unk_000[1] = player->pos[1] - 5.0f; - player->unk_258[arg1].unk_040 = 0; - player->unk_258[arg1].unk_024 = 0.0f; + player->particlePool0[arg1].pos[2] = + player->pos[2] + (coss(player->particlePool0[arg1].unk_020) * 6.0f); + player->particlePool0[arg1].pos[0] = + player->pos[0] + (sins(player->particlePool0[arg1].unk_020) * 6.0f); + player->particlePool0[arg1].pos[1] = player->pos[1] - 5.0f; + player->particlePool0[arg1].unk_040 = 0; + player->particlePool0[arg1].unk_024 = 0.0f; } void func_80061224(Player* player, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { - if ((arg1 == 0) && ((player->unk_258[arg2].unk_01E > 0) || (player->unk_258[arg1].unk_01C == 0))) { + if ((arg1 == 0) && + ((player->particlePool0[arg2].unk_01E > 0) || (player->particlePool0[arg1].isAlive == 0))) { func_80061130(player, arg1, arg2, arg3, arg4); - } else if (player->unk_258[arg2].unk_01E >= 2) { + } else if (player->particlePool0[arg2].unk_01E >= 2) { func_80061130(player, arg1, arg2, arg3, arg4); if (arg1 == 9) { player->unk_044 &= ~0x0200; @@ -3762,16 +3739,16 @@ void func_800612F8(Player* player, UNUSED s32 arg1, UNUSED s32 arg2, UNUSED s8 a s32 var_s2; for (var_s2 = 0; var_s2 < 10; var_s2++) { - player->unk_258[0x1E + var_s2].unk_01C = 1; - player->unk_258[0x1E + var_s2].unk_028 = player->pos[1] + 5.0f; - player->unk_258[0x1E + var_s2].unk_020 = (0x1C70 * var_s2) - player->rotation[1]; - player->unk_258[0x1E + var_s2].unk_024 = (random_int(0x0064U) / 100.0f) + 1.5; - player->unk_258[0x1E + var_s2].unk_03A = 0; - player->unk_258[0x1E + var_s2].unk_012 = 1; - player->unk_258[0x1E + var_s2].unk_01E = 0; - player->unk_258[0x1E + var_s2].unk_03E = 0x00FF; - player->unk_258[0x1E + var_s2].unk_000[2] = player->pos[2]; - player->unk_258[0x1E + var_s2].unk_000[0] = player->pos[0]; + player->particlePool3[var_s2].isAlive = 1; + player->particlePool3[var_s2].unk_028 = player->pos[1] + 5.0f; + player->particlePool3[var_s2].unk_020 = (0x1C70 * var_s2) - player->rotation[1]; + player->particlePool3[var_s2].unk_024 = (random_int(0x0064U) / 100.0f) + 1.5; + player->particlePool3[var_s2].green = 0; + player->particlePool3[var_s2].type = 1; + player->particlePool3[var_s2].unk_01E = 0; + player->particlePool3[var_s2].alpha = 0x00FF; + player->particlePool3[var_s2].pos[2] = player->pos[2]; + player->particlePool3[var_s2].pos[0] = player->pos[0]; } player->unk_046 &= ~0x0008; } @@ -3780,18 +3757,18 @@ void func_80061430(Player* player, UNUSED s32 arg1, UNUSED s32 arg2, UNUSED s8 a s32 var_s2; for (var_s2 = 0; var_s2 < 7; var_s2++) { - player->unk_258[0x1E + var_s2].unk_01C = 1; - player->unk_258[0x1E + var_s2].unk_028 = player->pos[1] - 4.0f; - player->unk_258[0x1E + var_s2].unk_020 = (0x1C70 * var_s2) - player->rotation[1]; + player->particlePool3[var_s2].isAlive = 1; + player->particlePool3[var_s2].unk_028 = player->pos[1] - 4.0f; + player->particlePool3[var_s2].unk_020 = (0x1C70 * var_s2) - player->rotation[1]; // ??? - player->unk_258[0x1E + var_s2].unk_024 = (random_int(0x0064U) / 100.0f) + 1.9; - player->unk_258[0x1E + var_s2].unk_024 = (random_int(0x0064U) / 100.0f) + 1.5; - player->unk_258[0x1E + var_s2].unk_03A = 0; - player->unk_258[0x1E + var_s2].unk_012 = 9; - player->unk_258[0x1E + var_s2].unk_01E = 0; - player->unk_258[0x1E + var_s2].unk_03E = 0x00FF; - player->unk_258[0x1E + var_s2].unk_000[2] = player->pos[2]; - player->unk_258[0x1E + var_s2].unk_000[0] = player->pos[0]; + player->particlePool3[var_s2].unk_024 = (random_int(0x0064U) / 100.0f) + 1.9; + player->particlePool3[var_s2].unk_024 = (random_int(0x0064U) / 100.0f) + 1.5; + player->particlePool3[var_s2].green = 0; + player->particlePool3[var_s2].type = 9; + player->particlePool3[var_s2].unk_01E = 0; + player->particlePool3[var_s2].alpha = 0x00FF; + player->particlePool3[var_s2].pos[2] = player->pos[2]; + player->particlePool3[var_s2].pos[0] = player->pos[0]; } player->unk_044 &= ~0x1000; } @@ -3804,20 +3781,20 @@ void func_800615AC(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UN f32 sp28[10] = { -182.0f, 182.0f, 364.0f, -364.0f, 546.0f, -546.0f, 728.0f, -728.0f, 910.0f, -910.0f }; if (random_int(3U) == 2.0f) { - player->unk_258[0x1E + arg1].unk_01C = 1; - player->unk_258[0x1E + arg1].unk_000[0] = player->pos[0]; - player->unk_258[0x1E + arg1].unk_000[2] = player->pos[2]; - player->unk_258[0x1E + arg1].unk_020 = -player->rotation[1] + sp28[arg1]; - player->unk_258[0x1E + arg1].unk_018 = random_int(1U) + 2.0f; + player->particlePool3[arg1].isAlive = 1; + player->particlePool3[arg1].pos[0] = player->pos[0]; + player->particlePool3[arg1].pos[2] = player->pos[2]; + player->particlePool3[arg1].unk_020 = -player->rotation[1] + sp28[arg1]; + player->particlePool3[arg1].unk_018 = random_int(1U) + 2.0f; temp_f0 = random_int(4U); temp_f0 -= test; - player->unk_258[0x1E + arg1].unk_014 = temp_f0; - player->unk_258[0x1E + arg1].unk_000[1] = player->pos[1] + temp_f0; - player->unk_258[0x1E + arg1].unk_00C = 0.15f; - player->unk_258[0x1E + arg1].unk_012 = 5; - player->unk_258[0x1E + arg1].unk_01E = 0; - player->unk_258[0x1E + arg1].unk_03E = 0x00FF; - player->unk_258[0x1E + arg1].unk_038 = 0; + player->particlePool3[arg1].surfaceType = temp_f0; + player->particlePool3[arg1].pos[1] = player->pos[1] + temp_f0; + player->particlePool3[arg1].scale = 0.15f; + player->particlePool3[arg1].type = 5; + player->particlePool3[arg1].unk_01E = 0; + player->particlePool3[arg1].alpha = 0x00FF; + player->particlePool3[arg1].red = 0; } } @@ -3833,31 +3810,32 @@ void func_80061754(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s32 arg3, U temp_s1 = random_int(0x0060U); sp44 = random_int(6U); sp48 = random_int(2U); - func_8005D794(player, &player->unk_258[0x1E + arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); - func_8005D7D8(&player->unk_258[0x1E + arg1], 6, 1.0f); + set_particle_position_and_rotation(player, &player->particlePool3[arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); + init_particle_player(&player->particlePool3[arg1], 6, 1.0f); if ((player->effects & HIT_BY_ITEM_EFFECT) || ((player->effects) & 0x01000000) || ((player->effects) & 0x400) || ((player->effects) & BOO_EFFECT)) { - func_8005D800(&player->unk_258[0x1E + arg1], 0x00FFFFFF, 0x00A0); - player->unk_258[0x1E + arg1].unk_038 -= temp_s1; - player->unk_258[0x1E + arg1].unk_03A -= temp_s1; - player->unk_258[0x1E + arg1].unk_03C -= temp_s1; + set_particle_colour(&player->particlePool3[arg1], 0x00FFFFFF, 0x00A0); + player->particlePool3[arg1].red -= temp_s1; + player->particlePool3[arg1].green -= temp_s1; + player->particlePool3[arg1].blue -= temp_s1; } else { - func_8005D800(&player->unk_258[0x1E + arg1], 0, 0x00A0); - player->unk_258[0x1E + arg1].unk_038 += temp_s1; - player->unk_258[0x1E + arg1].unk_03A += temp_s1; - player->unk_258[0x1E + arg1].unk_03C += temp_s1; + set_particle_colour(&player->particlePool3[arg1], 0, 0x00A0); + player->particlePool3[arg1].red += temp_s1; + player->particlePool3[arg1].green += temp_s1; + player->particlePool3[arg1].blue += temp_s1; } - player->unk_258[0x1E + arg1].unk_000[2] = player->pos[2] + (coss(sp54 * 0xB6) * -5.0f); - player->unk_258[0x1E + arg1].unk_000[0] = player->pos[0] + (sins(sp54 * 0xB6) * -5.0f); - player->unk_258[0x1E + arg1].unk_000[1] = (player->pos[1] - player->boundingBoxSize) + sp4C + 2.0f; - player->unk_258[0x1E + arg1].unk_018 = sp44 + 1.0f; - player->unk_258[0x1E + arg1].unk_00C = sp48 + 1.0f; + player->particlePool3[arg1].pos[2] = player->pos[2] + (coss(sp54 * 0xB6) * -5.0f); + player->particlePool3[arg1].pos[0] = player->pos[0] + (sins(sp54 * 0xB6) * -5.0f); + player->particlePool3[arg1].pos[1] = (player->pos[1] - player->boundingBoxSize) + sp4C + 2.0f; + player->particlePool3[arg1].unk_018 = sp44 + 1.0f; + player->particlePool3[arg1].scale = sp48 + 1.0f; } void func_8006199C(Player* player, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { - if ((arg1 == 0) && ((player->unk_258[0x1E + arg2].unk_01E > 0) || (player->unk_258[0x1E + arg2].unk_01C == 0))) { + if ((arg1 == 0) && + ((player->particlePool3[arg2].unk_01E > 0) || (player->particlePool3[arg2].isAlive == 0))) { func_80061754(player, arg1, arg2, (s32) arg3, arg4); - } else if (player->unk_258[0x1E + arg2].unk_01E > 0) { + } else if (player->particlePool3[arg2].unk_01E > 0) { func_80061754(player, arg1, arg2, (s32) arg3, arg4); } } @@ -3873,22 +3851,23 @@ void func_80061A34(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 sp4C = random_int(6U); random_int(6U); sp48 = (f32) random_int(3U); - if ((arg1 == 0) && ((player->unk_258[0x1E + arg2].unk_01E > 0) || (player->unk_258[0x1E + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[0x1E + arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); - func_8005D7D8(&player->unk_258[0x1E + arg1], 7, 1.0f); - func_8005D800(&player->unk_258[0x1E + arg1], 0x00FFFFFF, 0x00FF); - player->unk_258[0x1E + arg1].unk_000[2] = player->pos[2] + (coss(sp54 * 0xB6) * -2.0); - player->unk_258[0x1E + arg1].unk_000[0] = player->pos[0] + (sins(sp54 * 0xB6) * -2.0); - player->unk_258[0x1E + arg1].unk_000[1] = (player->pos[1] - player->boundingBoxSize) + sp4C + 2.0f; - player->unk_258[0x1E + arg1].unk_00C = (sp48 + 2.0f) / 10.0f; - } else if (player->unk_258[0x1E + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[0x1E + arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); - func_8005D7D8(&player->unk_258[0x1E + arg1], 7, 1.0f); - func_8005D800(&player->unk_258[0x1E + arg1], 0x00FFFFFF, 0x00FF); - player->unk_258[0x1E + arg1].unk_000[2] = player->pos[2] + (coss(sp54 * 0xB6) * -2.0); - player->unk_258[0x1E + arg1].unk_000[0] = player->pos[0] + (sins(sp54 * 0xB6) * -2.0); - player->unk_258[0x1E + arg1].unk_000[1] = (player->pos[1] - player->boundingBoxSize) + (f32) sp4C + 2.0f; - player->unk_258[0x1E + arg1].unk_00C = (sp48 + 2.0f) / 10.0f; + if ((arg1 == 0) && + ((player->particlePool3[arg2].unk_01E > 0) || (player->particlePool3[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool3[arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); + init_particle_player(&player->particlePool3[arg1], 7, 1.0f); + set_particle_colour(&player->particlePool3[arg1], 0x00FFFFFF, 0x00FF); + player->particlePool3[arg1].pos[2] = player->pos[2] + (coss(sp54 * 0xB6) * -2.0); + player->particlePool3[arg1].pos[0] = player->pos[0] + (sins(sp54 * 0xB6) * -2.0); + player->particlePool3[arg1].pos[1] = (player->pos[1] - player->boundingBoxSize) + sp4C + 2.0f; + player->particlePool3[arg1].scale = (sp48 + 2.0f) / 10.0f; + } else if (player->particlePool3[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool3[arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0); + init_particle_player(&player->particlePool3[arg1], 7, 1.0f); + set_particle_colour(&player->particlePool3[arg1], 0x00FFFFFF, 0x00FF); + player->particlePool3[arg1].pos[2] = player->pos[2] + (coss(sp54 * 0xB6) * -2.0); + player->particlePool3[arg1].pos[0] = player->pos[0] + (sins(sp54 * 0xB6) * -2.0); + player->particlePool3[arg1].pos[1] = (player->pos[1] - player->boundingBoxSize) + (f32) sp4C + 2.0f; + player->particlePool3[arg1].scale = (sp48 + 2.0f) / 10.0f; } } @@ -3900,18 +3879,18 @@ void func_80061D4C(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UN f32 sp20[10] = { -182.0f, 182.0f, 364.0f, -364.0f, 546.0f, -546.0f, 728.0f, -728.0f, 910.0f, -910.0f }; if (random_int(3U) == 2.0f) { - player->unk_258[0x1E + arg1].unk_01C = 1; - player->unk_258[0x1E + arg1].unk_000[0] = player->pos[0]; - player->unk_258[0x1E + arg1].unk_000[1] = player->pos[1] + 2.0f; - player->unk_258[0x1E + arg1].unk_000[2] = player->pos[2]; - player->unk_258[0x1E + arg1].unk_020 = -player->rotation[1] + sp20[arg1]; - player->unk_258[0x1E + arg1].unk_018 = random_int(3U) + 2.0f; - player->unk_258[0x1E + arg1].unk_014 = random_int(4U); - player->unk_258[0x1E + arg1].unk_014 -= test; - player->unk_258[0x1E + arg1].unk_00C = 0.4f; - player->unk_258[0x1E + arg1].unk_012 = 2; - player->unk_258[0x1E + arg1].unk_01E = 0; - player->unk_258[0x1E + arg1].unk_03E = 0x00FF; + player->particlePool3[arg1].isAlive = 1; + player->particlePool3[arg1].pos[0] = player->pos[0]; + player->particlePool3[arg1].pos[1] = player->pos[1] + 2.0f; + player->particlePool3[arg1].pos[2] = player->pos[2]; + player->particlePool3[arg1].unk_020 = -player->rotation[1] + sp20[arg1]; + player->particlePool3[arg1].unk_018 = random_int(3U) + 2.0f; + player->particlePool3[arg1].surfaceType = random_int(4U); + player->particlePool3[arg1].surfaceType -= test; + player->particlePool3[arg1].scale = 0.4f; + player->particlePool3[arg1].type = 2; + player->particlePool3[arg1].unk_01E = 0; + player->particlePool3[arg1].alpha = 0x00FF; } } @@ -3937,38 +3916,38 @@ void func_80061EF4(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 } if (var_t0 == 0) { if ((arg1 == 0) && - ((player->unk_258[0x1E + arg2].unk_01E > 0) || (player->unk_258[0x1E + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[0x1E + arg1], 0.0f, var_f2, 0.0f, (s8) var_t0, (s8) var_t1); - func_8005D7D8(&player->unk_258[0x1E + arg1], 3, 0.5f); - func_8005D800(&player->unk_258[0x1E + arg1], 0x00FFFFFF, 0x0060); - player->unk_258[0x1E + arg1].unk_020 = 0; - if (player->unk_258[0x1E + arg1].unk_010 == 1) { - player->unk_258[0x1E + arg1].unk_020 += 0x888; + ((player->particlePool3[arg2].unk_01E > 0) || (player->particlePool3[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool3[arg1], 0.0f, var_f2, 0.0f, (s8) var_t0, (s8) var_t1); + init_particle_player(&player->particlePool3[arg1], 3, 0.5f); + set_particle_colour(&player->particlePool3[arg1], 0x00FFFFFF, 0x0060); + player->particlePool3[arg1].unk_020 = 0; + if (player->particlePool3[arg1].unk_010 == 1) { + player->particlePool3[arg1].unk_020 += 0x888; } else { - player->unk_258[0x1E + arg1].unk_020 -= 0x888; + player->particlePool3[arg1].unk_020 -= 0x888; } - player->unk_258[0x1E + arg1].unk_000[2] = + player->particlePool3[arg1].pos[2] = player->pos[2] + - (coss(player->unk_258[0x1E + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); - player->unk_258[0x1E + arg1].unk_000[0] = + (coss(player->particlePool3[arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); + player->particlePool3[arg1].pos[0] = player->pos[0] + - (sins(player->unk_258[0x1E + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); - } else if (player->unk_258[0x1E + arg2].unk_01E > 0) { - func_8005D794(player, &player->unk_258[0x1E + arg1], 0.0f, var_f2, 0.0f, (s8) var_t0, (s8) var_t1); - func_8005D7D8(&player->unk_258[0x1E + arg1], 3, 0.5f); - func_8005D800(&player->unk_258[0x1E + arg1], 0x00FFFFFF, 0x0060); - player->unk_258[0x1E + arg1].unk_020 = 0; - if (player->unk_258[0x1E + arg1].unk_010 == 1) { - player->unk_258[0x1E + arg1].unk_020 += 0x888; + (sins(player->particlePool3[arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); + } else if (player->particlePool3[arg2].unk_01E > 0) { + set_particle_position_and_rotation(player, &player->particlePool3[arg1], 0.0f, var_f2, 0.0f, (s8) var_t0, (s8) var_t1); + init_particle_player(&player->particlePool3[arg1], 3, 0.5f); + set_particle_colour(&player->particlePool3[arg1], 0x00FFFFFF, 0x0060); + player->particlePool3[arg1].unk_020 = 0; + if (player->particlePool3[arg1].unk_010 == 1) { + player->particlePool3[arg1].unk_020 += 0x888; } else { - player->unk_258[0x1E + arg1].unk_020 -= 0x888; + player->particlePool3[arg1].unk_020 -= 0x888; } - player->unk_258[0x1E + arg1].unk_000[2] = + player->particlePool3[arg1].pos[2] = player->pos[2] + - (coss(player->unk_258[0x1E + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); - player->unk_258[0x1E + arg1].unk_000[0] = + (coss(player->particlePool3[arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); + player->particlePool3[arg1].pos[0] = player->pos[0] + - (sins(player->unk_258[0x1E + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); + (sins(player->particlePool3[arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); } } } @@ -3998,57 +3977,58 @@ void func_800621BC(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 } if (phi_t0 == 0) { - if ((arg1 == 0) && ((player->unk_258[30 + arg2].unk_01E > 0) || (player->unk_258[30 + arg2].unk_01C == 0))) { - func_8005D794(player, &player->unk_258[30 + arg1], 0.0f, phi_f2, 0.0f, phi_t0, phi_t1); - func_8005D7D8(&player->unk_258[30 + arg1], 8, 1.0f); - func_8005D800(&player->unk_258[30 + arg1], 0xFFFF20, 0xFF); + if ((arg1 == 0) && + ((player->particlePool3[arg2].unk_01E > 0) || (player->particlePool3[arg2].isAlive == 0))) { + set_particle_position_and_rotation(player, &player->particlePool3[arg1], 0.0f, phi_f2, 0.0f, phi_t0, phi_t1); + init_particle_player(&player->particlePool3[arg1], 8, 1.0f); + set_particle_colour(&player->particlePool3[arg1], 0xFFFF20, 0xFF); - player->unk_258[30 + arg1].unk_020 = 0; - if (player->unk_258[30 + arg1].unk_010 == 1) { - player->unk_258[30 + arg1].unk_020 += 2184; + player->particlePool3[arg1].unk_020 = 0; + if (player->particlePool3[arg1].unk_010 == 1) { + player->particlePool3[arg1].unk_020 += 2184; } else { - player->unk_258[30 + arg1].unk_020 -= 2184; + player->particlePool3[arg1].unk_020 -= 2184; } - player->unk_258[30 + arg1].unk_000[2] = + player->particlePool3[arg1].pos[2] = player->pos[2] + - (coss((player->unk_258[30 + arg1].unk_020 - player->rotation[1]) - player->unk_0C0) * 5.0f); - player->unk_258[30 + arg1].unk_000[0] = + (coss((player->particlePool3[arg1].unk_020 - player->rotation[1]) - player->unk_0C0) * 5.0f); + player->particlePool3[arg1].pos[0] = player->pos[0] + - (sins((player->unk_258[30 + arg1].unk_020 - player->rotation[1]) - player->unk_0C0) * 5.0f); + (sins((player->particlePool3[arg1].unk_020 - player->rotation[1]) - player->unk_0C0) * 5.0f); return; } new_var2 = player; - if (new_var2->unk_258[30 + arg2].unk_01E > 0) { - func_8005D794(new_var2, &new_var2->unk_258[30 + arg1], 0.0f, phi_f2, 0.0f, phi_t0, phi_t1); - func_8005D7D8(&new_var2->unk_258[30 + arg1], 8, 1.0f); - func_8005D800(&new_var2->unk_258[30 + arg1], 0xFFFF20, 0xFF); - new_var2->unk_258[30 + arg1].unk_020 = 0; - if (new_var2->unk_258[30 + arg1].unk_010 == 1) { - new_var2->unk_258[30 + arg1].unk_020 += 2184; + if (new_var2->particlePool3[arg2].unk_01E > 0) { + set_particle_position_and_rotation(new_var2, &new_var2->particlePool3[arg1], 0.0f, phi_f2, 0.0f, phi_t0, phi_t1); + init_particle_player(&new_var2->particlePool3[arg1], 8, 1.0f); + set_particle_colour(&new_var2->particlePool3[arg1], 0xFFFF20, 0xFF); + new_var2->particlePool3[arg1].unk_020 = 0; + if (new_var2->particlePool3[arg1].unk_010 == 1) { + new_var2->particlePool3[arg1].unk_020 += 2184; } else { - new_var2->unk_258[30 + arg1].unk_020 -= 2184; + new_var2->particlePool3[arg1].unk_020 -= 2184; } new_var = new_var2; - new_var->unk_258[30 + arg1].unk_000[2] = + new_var->particlePool3[arg1].pos[2] = new_var->pos[2] + - (coss((new_var->unk_258[30 + arg1].unk_020 - new_var->rotation[1]) - new_var->unk_0C0) * 5.0f); - new_var->unk_258[30 + arg1].unk_000[0] = + (coss((new_var->particlePool3[arg1].unk_020 - new_var->rotation[1]) - new_var->unk_0C0) * 5.0f); + new_var->particlePool3[arg1].pos[0] = new_var->pos[0] + - (sins((new_var->unk_258[30 + arg1].unk_020 - new_var->rotation[1]) - new_var->unk_0C0) * 5.0f); + (sins((new_var->particlePool3[arg1].unk_020 - new_var->rotation[1]) - new_var->unk_0C0) * 5.0f); } } } void func_80062484(Player* player, UnkPlayerStruct258* arg1, s32 arg2) { - arg1->unk_01C = 1; - arg1->unk_000[1] = player->unk_074 + 1.0f; - arg1->unk_000[2] = player->pos[2]; - arg1->unk_000[0] = player->pos[0]; + arg1->isAlive = 1; + arg1->pos[1] = player->unk_074 + 1.0f; + arg1->pos[2] = player->pos[2]; + arg1->pos[0] = player->pos[0]; arg1->unk_020 = (arg2 * 0x1998) - player->rotation[1]; - arg1->unk_012 = 4; + arg1->type = 4; arg1->unk_01E = 0; } @@ -4059,67 +4039,67 @@ void func_800624D8(Player* player, UNUSED s32 arg1, UNUSED s32 arg2, UNUSED s8 a case DIRT: for (var_s1 = 0; var_s1 < 10; var_s1++) { if ((IsChocoMountain()) || (IsRoyalRaceway())) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 1, 0, 0x00A8); + func_8005DAD8(&player->particlePool3[var_s1], 1, 0, 0x00A8); } if (IsKalimariDesert()) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 7, 0, 0x00A8); + func_8005DAD8(&player->particlePool3[var_s1], 7, 0, 0x00A8); } if (IsMooMooFarm()) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 8, 0, 0x00A8); + func_8005DAD8(&player->particlePool3[var_s1], 8, 0, 0x00A8); } if (IsWarioStadium()) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 9, 0, 0x00A8); + func_8005DAD8(&player->particlePool3[var_s1], 9, 0, 0x00A8); } if (IsYoshiValley()) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 0x000A, 0, 0x00A8); + func_8005DAD8(&player->particlePool3[var_s1], 0x000A, 0, 0x00A8); } if (IsDkJungle()) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 0x000B, 0, 0x00A8); + func_8005DAD8(&player->particlePool3[var_s1], 0x000B, 0, 0x00A8); } - func_80062484(player, &player->unk_258[0x1E + var_s1], var_s1); + func_80062484(player, &player->particlePool3[var_s1], var_s1); } player->unk_044 &= ~0x0100; break; case GRASS: for (var_s1 = 0; var_s1 < 10; var_s1++) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 2, 1, 0x00A8); - func_80062484(player, &player->unk_258[0x1E + var_s1], var_s1); + func_8005DAD8(&player->particlePool3[var_s1], 2, 1, 0x00A8); + func_80062484(player, &player->particlePool3[var_s1], var_s1); } player->unk_044 &= ~0x0100; break; case SAND_OFFROAD: for (var_s1 = 0; var_s1 < 10; var_s1++) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 2, 1, 0x00A8); - func_80062484(player, &player->unk_258[0x1E + var_s1], var_s1); + func_8005DAD8(&player->particlePool3[var_s1], 2, 1, 0x00A8); + func_80062484(player, &player->particlePool3[var_s1], var_s1); } player->unk_044 &= ~0x0100; break; case SAND: for (var_s1 = 0; var_s1 < 10; var_s1++) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 3, 1, 0x00A8); - func_80062484(player, &player->unk_258[0x1E + var_s1], var_s1); + func_8005DAD8(&player->particlePool3[var_s1], 3, 1, 0x00A8); + func_80062484(player, &player->particlePool3[var_s1], var_s1); } player->unk_044 &= ~0x0100; break; case WET_SAND: for (var_s1 = 0; var_s1 < 10; var_s1++) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 4, 1, 0x00A8); - func_80062484(player, &player->unk_258[0x1E + var_s1], var_s1); + func_8005DAD8(&player->particlePool3[var_s1], 4, 1, 0x00A8); + func_80062484(player, &player->particlePool3[var_s1], var_s1); } player->unk_044 &= ~0x0100; break; case DIRT_OFFROAD: for (var_s1 = 0; var_s1 < 10; var_s1++) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 5, 1, 0x00A8); - func_80062484(player, &player->unk_258[0x1E + var_s1], var_s1); + func_8005DAD8(&player->particlePool3[var_s1], 5, 1, 0x00A8); + func_80062484(player, &player->particlePool3[var_s1], var_s1); } player->unk_044 &= ~0x0100; break; case SNOW: case SNOW_OFFROAD: for (var_s1 = 0; var_s1 < 10; var_s1++) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 6, 1, 0x00A8); - func_80062484(player, &player->unk_258[0x1E + var_s1], var_s1); + func_8005DAD8(&player->particlePool3[var_s1], 6, 1, 0x00A8); + func_80062484(player, &player->particlePool3[var_s1], var_s1); } player->unk_044 &= ~0x0100; break; @@ -4127,72 +4107,72 @@ void func_800624D8(Player* player, UNUSED s32 arg1, UNUSED s32 arg2, UNUSED s8 a case STONE: case BRIDGE: for (var_s1 = 0; var_s1 < 10; var_s1++) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 0, 0, 0x00A8); - func_80062484(player, &player->unk_258[0x1E + var_s1], var_s1); + func_8005DAD8(&player->particlePool3[var_s1], 0, 0, 0x00A8); + func_80062484(player, &player->particlePool3[var_s1], var_s1); } player->unk_044 &= ~0x0100; break; default: for (var_s1 = 0; var_s1 < 10; var_s1++) { - func_8005DAD8(&player->unk_258[0x1E + var_s1], 0, 0, 0x00A8); - func_80062484(player, &player->unk_258[0x1E + var_s1], var_s1); + func_8005DAD8(&player->particlePool3[var_s1], 0, 0, 0x00A8); + func_80062484(player, &player->particlePool3[var_s1], var_s1); } player->unk_044 &= ~0x0100; break; } } -void func_800628C0(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { - player->unk_258[20 + arg3].unk_01C = 1; - player->unk_258[20 + arg3].unk_020 = -player->rotation[1]; - player->unk_258[20 + arg3].unk_012 = 2; - player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_00C = 0.2f; +void func_800628C0(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 index) { + player->particlePool2[index].isAlive = 1; + player->particlePool2[index].unk_020 = -player->rotation[1]; + player->particlePool2[index].type = 2; + player->particlePool2[index].unk_01E = 0; + player->particlePool2[index].scale = 0.2f; } -void func_80062914(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { - player->unk_258[20 + arg3].unk_01C = 1; - player->unk_258[20 + arg3].unk_020 = -player->rotation[1]; - player->unk_258[20 + arg3].unk_012 = 4; - player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_00C = 1.0f; +void func_80062914(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 index) { + player->particlePool2[index].isAlive = 1; + player->particlePool2[index].unk_020 = -player->rotation[1]; + player->particlePool2[index].type = 4; + player->particlePool2[index].unk_01E = 0; + player->particlePool2[index].scale = 1.0f; } -void func_80062968(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { - player->unk_258[20 + arg3].unk_01C = 1; - player->unk_258[20 + arg3].unk_020 = -player->rotation[1]; - player->unk_258[20 + arg3].unk_012 = 5; - player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_00C = 0.2f; +void func_80062968(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 index) { + player->particlePool2[index].isAlive = 1; + player->particlePool2[index].unk_020 = -player->rotation[1]; + player->particlePool2[index].type = 5; + player->particlePool2[index].unk_01E = 0; + player->particlePool2[index].scale = 0.2f; } -void func_800629BC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { - player->unk_258[20 + arg3].unk_01C = 1; - player->unk_258[20 + arg3].unk_020 = -player->rotation[1]; - player->unk_258[20 + arg3].unk_012 = 6; - player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_00C = 0.2f; - player->unk_258[20 + arg3].unk_000[1] = 0.0f; +void func_800629BC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 index) { + player->particlePool2[index].isAlive = 1; + player->particlePool2[index].unk_020 = -player->rotation[1]; + player->particlePool2[index].type = 6; + player->particlePool2[index].unk_01E = 0; + player->particlePool2[index].scale = 0.2f; + player->particlePool2[index].pos[1] = 0.0f; } -void func_80062A18(Player* player, s8 arg1, UNUSED s8 arg2, s8 arg3) { - player->unk_258[20 + arg3].unk_01C = 1; - player->unk_258[20 + arg3].unk_012 = 3; - player->unk_258[20 + arg1 /* arg1 instead of arg3 */].unk_00C = 0.2f; - player->unk_258[20 + arg3].unk_01E = 1; - player->unk_258[20 + arg3].unk_020 = 0; +void func_80062A18(Player* player, s8 arg1, UNUSED s8 arg2, s8 index) { + player->particlePool2[index].isAlive = 1; + player->particlePool2[index].type = 3; + player->particlePool2[arg1 /* arg1 instead of arg3 */].scale = 0.2f; + player->particlePool2[index].unk_01E = 1; + player->particlePool2[index].unk_020 = 0; player->unk_0B6 &= ~0x0080; - player->unk_258[20 + arg3].unk_000[2] = player->pos[2]; - player->unk_258[20 + arg3].unk_000[0] = player->pos[0]; - player->unk_258[20 + arg3].unk_000[1] = (player->pos[1] + 4.0f); + player->particlePool2[index].pos[2] = player->pos[2]; + player->particlePool2[index].pos[0] = player->pos[0]; + player->particlePool2[index].pos[1] = (player->pos[1] + 4.0f); } -void func_80062AA8(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { - player->unk_258[20 + arg3].unk_01C = 1; - player->unk_258[20 + arg3].unk_012 = 5; - player->unk_258[20 + arg3].unk_00C = 0.1f; - player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_000[1] = (player->pos[1] + player->boundingBoxSize) - 2.5; +void func_80062AA8(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 index) { + player->particlePool2[index].isAlive = 1; + player->particlePool2[index].type = 5; + player->particlePool2[index].scale = 0.1f; + player->particlePool2[index].unk_01E = 0; + player->particlePool2[index].pos[1] = (player->pos[1] + player->boundingBoxSize) - 2.5; } void func_80062B18(f32* arg0, f32* arg1, f32* arg2, f32 arg3, f32 arg4, f32 arg5, u16 arg6, u16 arg7) { @@ -4239,178 +4219,180 @@ void func_80062C74(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s32 arg3) { f32 sp38; s16 thing; - player->unk_258[arg1].unk_01E += 1; - if (player->unk_258[arg1].unk_01E == 0x000C) { - player->unk_258[arg1].unk_01C = 0; - player->unk_258[arg1].unk_01E = 0; - player->unk_258[arg1].unk_012 = 0; + player->particlePool0[arg1].unk_01E += 1; + if (player->particlePool0[arg1].unk_01E == 0x000C) { + player->particlePool0[arg1].isAlive = 0; + player->particlePool0[arg1].unk_01E = 0; + player->particlePool0[arg1].type = 0; } - player->unk_258[arg1].unk_018 = 2.0f; - if (player->unk_258[arg1].unk_040 == 0) { - player->unk_258[arg1].unk_00C = player->unk_258[arg1].unk_00C + 0.07; - player->unk_258[arg1].unk_024 = player->unk_258[arg1].unk_024 + 0.3; - if (player->unk_258[arg1].unk_01E >= 3) { - player->unk_258[arg1].unk_03E -= 3; + player->particlePool0[arg1].unk_018 = 2.0f; + if (player->particlePool0[arg1].unk_040 == 0) { + player->particlePool0[arg1].scale = player->particlePool0[arg1].scale + 0.07; + player->particlePool0[arg1].unk_024 = player->particlePool0[arg1].unk_024 + 0.3; + if (player->particlePool0[arg1].unk_01E >= 3) { + player->particlePool0[arg1].alpha -= 3; } - if (player->unk_258[arg1].unk_03E <= 0) { - player->unk_258[arg1].unk_03E = 0; + if (player->particlePool0[arg1].alpha <= 0) { + player->particlePool0[arg1].alpha = 0; } } else { - player->unk_258[arg1].unk_00C = player->unk_258[arg1].unk_00C + 0.1; - player->unk_258[arg1].unk_024 = player->unk_258[arg1].unk_024 + 0.3; - if (player->unk_258[arg1].unk_01E >= 3) { - player->unk_258[arg1].unk_03E -= 2; + player->particlePool0[arg1].scale = player->particlePool0[arg1].scale + 0.1; + player->particlePool0[arg1].unk_024 = player->particlePool0[arg1].unk_024 + 0.3; + if (player->particlePool0[arg1].unk_01E >= 3) { + player->particlePool0[arg1].alpha -= 2; } - if (player->unk_258[arg1].unk_03E <= 0) { - player->unk_258[arg1].unk_03E = 0; + if (player->particlePool0[arg1].alpha <= 0) { + player->particlePool0[arg1].alpha = 0; } } - thing = player->unk_258[arg1].unk_020 - (player->unk_0C0 / 2); - if (player->unk_258[arg1].unk_040 == 0) { + thing = player->particlePool0[arg1].unk_020 - (player->unk_0C0 / 2); + if (player->particlePool0[arg1].unk_040 == 0) { var_f6 = -((player->unk_098 / 5000.0f) + 0.1); } else { var_f6 = -((player->unk_098 / 6000.0f) + 0.1); } - if (((player->effects & BOOST_EFFECT) == BOOST_EFFECT) && (player->unk_258[arg1].unk_01E >= 6)) { - player->unk_258[arg1].unk_00C = player->unk_258[arg1].unk_00C + 0.06; + if (((player->effects & BOOST_EFFECT) == BOOST_EFFECT) && (player->particlePool0[arg1].unk_01E >= 6)) { + player->particlePool0[arg1].scale = player->particlePool0[arg1].scale + 0.06; } - player->unk_258[arg1].unk_010++; - if (player->unk_258[arg1].unk_010 >= 3) { - player->unk_258[arg1].unk_010 = 0; + player->particlePool0[arg1].unk_010++; + if (player->particlePool0[arg1].unk_010 >= 3) { + player->particlePool0[arg1].unk_010 = 0; } - func_80062B18(&sp40, &sp38, &sp3C, 0.0f, sp48[player->characterId], (player->unk_258[arg1].unk_01E * var_f6) + -5.5, - -thing, -player->unk_206 * 2); - player->unk_258[arg1].unk_000[0] = player->pos[0] + sp40; + func_80062B18(&sp40, &sp38, &sp3C, 0.0f, sp48[player->characterId], + (player->particlePool0[arg1].unk_01E * var_f6) + -5.5, -thing, -player->unk_206 * 2); + player->particlePool0[arg1].pos[0] = player->pos[0] + sp40; sp38 = (player->pos[1] - player->boundingBoxSize) + sp38; - player->unk_258[arg1].unk_000[2] = player->pos[2] + sp3C; - player->unk_258[arg1].unk_000[1] = player->unk_258[arg1].unk_024 + sp38; + player->particlePool0[arg1].pos[2] = player->pos[2] + sp3C; + player->particlePool0[arg1].pos[1] = player->particlePool0[arg1].unk_024 + sp38; } void func_80062F98(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) { f32 temp_f0; - temp_f0 = player->unk_258[10 + arg1].unk_018 / 10.0f; - ++player->unk_258[10 + arg1].unk_01E; - player->unk_258[10 + arg1].unk_000[1] += temp_f0; + temp_f0 = player->particlePool1[arg1].unk_018 / 10.0f; + ++player->particlePool1[arg1].unk_01E; + player->particlePool1[arg1].pos[1] += temp_f0; if ((player->unk_0CA & 1) == 1) { - player->unk_258[10 + arg1].unk_000[1] += (temp_f0 + 0.3); - if ((player->unk_258[10 + arg1].unk_01E == 0x10) || - ((D_801652A0[arg2] - player->unk_258[10 + arg1].unk_000[1]) < 3.0f)) { - player->unk_258[10 + arg1].unk_01C = 0; - player->unk_258[10 + arg1].unk_01E = 0; - player->unk_258[10 + arg1].unk_012 = 0; + player->particlePool1[arg1].pos[1] += (temp_f0 + 0.3); + if ((player->particlePool1[arg1].unk_01E == 0x10) || + ((D_801652A0[arg2] - player->particlePool1[arg1].pos[1]) < 3.0f)) { + player->particlePool1[arg1].isAlive = 0; + player->particlePool1[arg1].unk_01E = 0; + player->particlePool1[arg1].type = 0; } - } else if ((player->unk_258[10 + arg1].unk_01E == 0xA) || - ((D_801652A0[arg2] - player->unk_258[10 + arg1].unk_000[1]) < 3.0f)) { - player->unk_258[10 + arg1].unk_01C = 0; - player->unk_258[10 + arg1].unk_01E = 0; - player->unk_258[10 + arg1].unk_012 = 0; + } else if ((player->particlePool1[arg1].unk_01E == 0xA) || + ((D_801652A0[arg2] - player->particlePool1[arg1].pos[1]) < 3.0f)) { + player->particlePool1[arg1].isAlive = 0; + player->particlePool1[arg1].unk_01E = 0; + player->particlePool1[arg1].type = 0; } } -void func_800630C0(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) { - ++player->unk_258[arg1].unk_01E; - player->unk_258[arg1].unk_000[2] = player->pos[2] + coss(player->unk_258[arg1].unk_020) * -5.8; - player->unk_258[arg1].unk_000[0] = player->pos[0] + sins(player->unk_258[arg1].unk_020) * -5.8; - player->unk_258[arg1].unk_000[1] = D_801652A0[arg2]; - if (player->unk_258[arg1].unk_01E == 15) { - player->unk_258[arg1].unk_01C = 0; - player->unk_258[arg1].unk_01E = 0; - player->unk_258[arg1].unk_012 = 0; +void set_oob_splash_particle_position(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) { + ++player->particlePool0[arg1].unk_01E; + player->particlePool0[arg1].pos[2] = player->pos[2] + coss(player->particlePool0[arg1].unk_020) * -5.8; + player->particlePool0[arg1].pos[0] = player->pos[0] + sins(player->particlePool0[arg1].unk_020) * -5.8; + player->particlePool0[arg1].pos[1] = D_801652A0[arg2]; + if (player->particlePool0[arg1].unk_01E == 15) { + player->particlePool0[arg1].isAlive = 0; + player->particlePool0[arg1].unk_01E = 0; + player->particlePool0[arg1].type = 0; } } void func_800631A8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - ++player->unk_258[arg1].unk_01E; - if ((s32) player->unk_258[arg1].unk_01E < 9) { - if ((player->unk_258[arg1].unk_01E & 1) != 0) { - player->unk_258[arg1].unk_038 = 8; + ++player->particlePool0[arg1].unk_01E; + if ((s32) player->particlePool0[arg1].unk_01E < 9) { + if ((player->particlePool0[arg1].unk_01E & 1) != 0) { + player->particlePool0[arg1].red = 8; } else { - player->unk_258[arg1].unk_038 = 0; + player->particlePool0[arg1].red = 0; } - } else if (((player->unk_258[arg1].unk_01E & 1) != 0) || - ((player->unk_258[arg1].unk_01E >= 9) && (player->unk_258[arg1].unk_01E < 12))) { - player->unk_258[arg1].unk_038 = 0xFF; - } else if ((player->unk_258[arg1].unk_01E & 2) != 0) { - player->unk_258[arg1].unk_038 = 8; + } else if (((player->particlePool0[arg1].unk_01E & 1) != 0) || + ((player->particlePool0[arg1].unk_01E >= 9) && (player->particlePool0[arg1].unk_01E < 12))) { + player->particlePool0[arg1].red = 0xFF; + } else if ((player->particlePool0[arg1].unk_01E & 2) != 0) { + player->particlePool0[arg1].red = 8; } else { - player->unk_258[arg1].unk_038 = 0; + player->particlePool0[arg1].red = 0; } - player->unk_258[arg1].unk_03A = 0; - player->unk_258[arg1].unk_03C = 0; - if ((s32) player->unk_258[arg1].unk_01E >= 0x19) { - player->unk_258[arg1].unk_01C = 0; - player->unk_258[arg1].unk_01E = 0; - player->unk_258[arg1].unk_012 = 0; + player->particlePool0[arg1].green = 0; + player->particlePool0[arg1].blue = 0; + if ((s32) player->particlePool0[arg1].unk_01E >= 0x19) { + player->particlePool0[arg1].isAlive = 0; + player->particlePool0[arg1].unk_01E = 0; + player->particlePool0[arg1].type = 0; } } void func_80063268(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - if (player->unk_258[arg1].unk_01E >= 0x1E) { - player->unk_258[arg1].unk_040 += 0x1FFE; + if (player->particlePool0[arg1].unk_01E >= 0x1E) { + player->particlePool0[arg1].unk_040 += 0x1FFE; } else { - player->unk_258[arg1].unk_040 += 0x1554; + player->particlePool0[arg1].unk_040 += 0x1554; } - player->unk_258[arg1].unk_024 += 0.25; - player->unk_258[arg1].unk_000[2] = - player->pos[2] + (coss((player->unk_258[arg1].unk_020 + player->unk_258[arg1].unk_040)) * 5.5); - player->unk_258[arg1].unk_000[0] = - player->pos[0] + (sins((player->unk_258[arg1].unk_020 + player->unk_258[arg1].unk_040)) * 5.5); - player->unk_258[arg1].unk_000[1] = ((player->pos[1] - 5.0f) + player->unk_258[arg1].unk_024); - ++player->unk_258[arg1].unk_01E; - player->unk_258[arg1].unk_00C += 0.05; - player->unk_258[arg1].unk_03E -= 5; + player->particlePool0[arg1].unk_024 += 0.25; + player->particlePool0[arg1].pos[2] = + player->pos[2] + + (coss((player->particlePool0[arg1].unk_020 + player->particlePool0[arg1].unk_040)) * 5.5); + player->particlePool0[arg1].pos[0] = + player->pos[0] + + (sins((player->particlePool0[arg1].unk_020 + player->particlePool0[arg1].unk_040)) * 5.5); + player->particlePool0[arg1].pos[1] = ((player->pos[1] - 5.0f) + player->particlePool0[arg1].unk_024); + ++player->particlePool0[arg1].unk_01E; + player->particlePool0[arg1].scale += 0.05; + player->particlePool0[arg1].alpha -= 5; - if ((s32) player->unk_258[arg1].unk_03E <= 0) { - player->unk_258[arg1].unk_03E = 0; + if ((s32) player->particlePool0[arg1].alpha <= 0) { + player->particlePool0[arg1].alpha = 0; } - if ((s32) player->unk_258[arg1].unk_01E >= 0x28) { - player->unk_258[arg1].unk_01C = 0; - player->unk_258[arg1].unk_01E = 0; - player->unk_258[arg1].unk_012 = 0; + if ((s32) player->particlePool0[arg1].unk_01E >= 0x28) { + player->particlePool0[arg1].isAlive = 0; + player->particlePool0[arg1].unk_01E = 0; + player->particlePool0[arg1].type = 0; } } void func_80063408(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - if (player->unk_258[10 + arg1].unk_010 == 1) { - player->unk_258[10 + arg1].unk_000[2] = + if (player->particlePool1[arg1].unk_010 == 1) { + player->particlePool1[arg1].pos[2] = player->tyres[BACK_LEFT].pos[2] + - (player->unk_258[10 + arg1].unk_01E * -7) * coss(player->unk_258[10 + arg1].unk_020); - player->unk_258[10 + arg1].unk_000[0] = + (player->particlePool1[arg1].unk_01E * -7) * coss(player->particlePool1[arg1].unk_020); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_LEFT].pos[0] + - (player->unk_258[10 + arg1].unk_01E * -7) * sins(player->unk_258[10 + arg1].unk_020); + (player->particlePool1[arg1].unk_01E * -7) * sins(player->particlePool1[arg1].unk_020); } else { - player->unk_258[10 + arg1].unk_000[2] = + player->particlePool1[arg1].pos[2] = player->tyres[BACK_RIGHT].pos[2] + - (player->unk_258[10 + arg1].unk_01E * -7) * coss(player->unk_258[10 + arg1].unk_020); - player->unk_258[10 + arg1].unk_000[0] = + (player->particlePool1[arg1].unk_01E * -7) * coss(player->particlePool1[arg1].unk_020); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_RIGHT].pos[0] + - (player->unk_258[10 + arg1].unk_01E * -7) * sins(player->unk_258[10 + arg1].unk_020); + (player->particlePool1[arg1].unk_01E * -7) * sins(player->particlePool1[arg1].unk_020); } - ++player->unk_258[10 + arg1].unk_01E; - player->unk_258[10 + arg1].unk_000[1] += 1.0f; + ++player->particlePool1[arg1].unk_01E; + player->particlePool1[arg1].pos[1] += 1.0f; if (((player->effects & 0x80) != 0) || ((player->effects & 0x40) != 0)) { - player->unk_258[10 + arg1].unk_01C = 0; - player->unk_258[10 + arg1].unk_01E = 0; + player->particlePool1[arg1].isAlive = 0; + player->particlePool1[arg1].unk_01E = 0; } - if (player->unk_258[10 + arg1].unk_01E == 8) { - player->unk_258[10 + arg1].unk_01E = 0; - player->unk_258[10 + arg1].unk_01C = 0; - player->unk_258[10 + arg1].unk_012 = 0; + if (player->particlePool1[arg1].unk_01E == 8) { + player->particlePool1[arg1].unk_01E = 0; + player->particlePool1[arg1].isAlive = 0; + player->particlePool1[arg1].type = 0; } - player->unk_258[10 + arg1].unk_00C += 0.08; - if (player->unk_258[10 + arg1].unk_01E >= 4) { - player->unk_258[10 + arg1].unk_03E -= 16; + player->particlePool1[arg1].scale += 0.08; + if (player->particlePool1[arg1].unk_01E >= 4) { + player->particlePool1[arg1].alpha -= 16; } - if (player->unk_258[10 + arg1].unk_03E <= 0) { - player->unk_258[10 + arg1].unk_03E = 0; + if (player->particlePool1[arg1].alpha <= 0) { + player->particlePool1[arg1].alpha = 0; } } @@ -4419,181 +4401,181 @@ void func_800635D4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { f32 sp40; f32 sp3C; - if (player->unk_258[10 + arg1].unk_010 == 1) { + if (player->particlePool1[arg1].unk_010 == 1) { if ((player->effects & LIGHTNING_EFFECT)) { func_80062B18(&sp44, &sp40, &sp3C, -2.0f, 0.0f, - (-player->unk_258[10 + arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16, - -player->unk_258[10 + arg1].unk_020, 2 * -player->unk_206); - player->unk_258[10 + arg1].unk_000[0] = player->tyres[BACK_LEFT].pos[0] + sp44; - player->unk_258[10 + arg1].unk_000[2] = player->tyres[BACK_LEFT].pos[2] + sp3C; + (-player->particlePool1[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16, + -player->particlePool1[arg1].unk_020, 2 * -player->unk_206); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_LEFT].pos[0] + sp44; + player->particlePool1[arg1].pos[2] = player->tyres[BACK_LEFT].pos[2] + sp3C; } else { - player->unk_258[10 + arg1].unk_000[2] = + player->particlePool1[arg1].pos[2] = player->tyres[BACK_LEFT].pos[2] + - ((-player->unk_258[10 + arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16) * - coss(player->unk_258[10 + arg1].unk_020); - player->unk_258[10 + arg1].unk_000[0] = + ((-player->particlePool1[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16) * + coss(player->particlePool1[arg1].unk_020); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_LEFT].pos[0] + - ((-player->unk_258[10 + arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16) * - sins(player->unk_258[10 + arg1].unk_020); + ((-player->particlePool1[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16) * + sins(player->particlePool1[arg1].unk_020); } } else if ((player->effects & LIGHTNING_EFFECT)) { func_80062B18(&sp44, &sp40, &sp3C, 2.0f, 0.0f, - (-player->unk_258[10 + arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16, - -player->unk_258[10 + arg1].unk_020, 2 * -player->unk_206); - player->unk_258[10 + arg1].unk_000[0] = player->tyres[BACK_RIGHT].pos[0] + sp44; - player->unk_258[10 + arg1].unk_000[2] = player->tyres[BACK_RIGHT].pos[2] + sp3C; + (-player->particlePool1[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16, + -player->particlePool1[arg1].unk_020, 2 * -player->unk_206); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_RIGHT].pos[0] + sp44; + player->particlePool1[arg1].pos[2] = player->tyres[BACK_RIGHT].pos[2] + sp3C; } else { - player->unk_258[10 + arg1].unk_000[2] = + player->particlePool1[arg1].pos[2] = player->tyres[BACK_RIGHT].pos[2] + - ((-player->unk_258[10 + arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16) * - coss(player->unk_258[10 + arg1].unk_020); - player->unk_258[10 + arg1].unk_000[0] = + ((-player->particlePool1[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16) * + coss(player->particlePool1[arg1].unk_020); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_RIGHT].pos[0] + - ((-player->unk_258[10 + arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16) * - sins(player->unk_258[10 + arg1].unk_020); + ((-player->particlePool1[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 16) * + sins(player->particlePool1[arg1].unk_020); } - ++player->unk_258[10 + arg1].unk_01E; - player->unk_258[10 + arg1].unk_000[1] += 0.2; + ++player->particlePool1[arg1].unk_01E; + player->particlePool1[arg1].pos[1] += 0.2; if (((player->effects & 0x80) != 0) || ((player->effects & 0x40) != 0)) { - player->unk_258[10 + arg1].unk_01C = 0; - player->unk_258[10 + arg1].unk_01E = 0; + player->particlePool1[arg1].isAlive = 0; + player->particlePool1[arg1].unk_01E = 0; } - if (player->unk_258[10 + arg1].unk_01E == 8) { - player->unk_258[10 + arg1].unk_01C = 0; - player->unk_258[10 + arg1].unk_01E = 0; - player->unk_258[10 + arg1].unk_012 = 0; + if (player->particlePool1[arg1].unk_01E == 8) { + player->particlePool1[arg1].isAlive = 0; + player->particlePool1[arg1].unk_01E = 0; + player->particlePool1[arg1].type = 0; } - player->unk_258[10 + arg1].unk_00C += 0.1; - if (player->unk_258[10 + arg1].unk_040 == 0) { - if (player->unk_258[10 + arg1].unk_01E >= 4) { - player->unk_258[10 + arg1].unk_03E -= 12; + player->particlePool1[arg1].scale += 0.1; + if (player->particlePool1[arg1].unk_040 == 0) { + if (player->particlePool1[arg1].unk_01E >= 4) { + player->particlePool1[arg1].alpha -= 12; } - if (player->unk_258[10 + arg1].unk_03E <= 0) { - player->unk_258[10 + arg1].unk_03E = 0; + if (player->particlePool1[arg1].alpha <= 0) { + player->particlePool1[arg1].alpha = 0; } } else { - if (player->unk_258[10 + arg1].unk_01E >= 4) { - player->unk_258[10 + arg1].unk_03E -= 16; + if (player->particlePool1[arg1].unk_01E >= 4) { + player->particlePool1[arg1].alpha -= 16; } - if (player->unk_258[10 + arg1].unk_03E <= 0) { - player->unk_258[10 + arg1].unk_03E = 0; + if (player->particlePool1[arg1].alpha <= 0) { + player->particlePool1[arg1].alpha = 0; } } } void func_800639DC(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - if (player->unk_258[10 + arg1].unk_010 == 1) { - player->unk_258[10 + arg1].unk_000[2] = + if (player->particlePool1[arg1].unk_010 == 1) { + player->particlePool1[arg1].pos[2] = player->tyres[BACK_LEFT].pos[2] + - (-1.8f * player->unk_258[10 + arg1].unk_01E) * coss(player->unk_258[10 + arg1].unk_020); - player->unk_258[10 + arg1].unk_000[0] = + (-1.8f * player->particlePool1[arg1].unk_01E) * coss(player->particlePool1[arg1].unk_020); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_LEFT].pos[0] + - (-1.8f * player->unk_258[10 + arg1].unk_01E) * sins(player->unk_258[10 + arg1].unk_020); + (-1.8f * player->particlePool1[arg1].unk_01E) * sins(player->particlePool1[arg1].unk_020); } else { - player->unk_258[10 + arg1].unk_000[2] = + player->particlePool1[arg1].pos[2] = player->tyres[BACK_RIGHT].pos[2] + - (-1.8f * player->unk_258[10 + arg1].unk_01E) * coss(player->unk_258[10 + arg1].unk_020); - player->unk_258[10 + arg1].unk_000[0] = + (-1.8f * player->particlePool1[arg1].unk_01E) * coss(player->particlePool1[arg1].unk_020); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_RIGHT].pos[0] + - (-1.8f * player->unk_258[10 + arg1].unk_01E) * sins(player->unk_258[10 + arg1].unk_020); + (-1.8f * player->particlePool1[arg1].unk_01E) * sins(player->particlePool1[arg1].unk_020); } - ++player->unk_258[10 + arg1].unk_01E; - player->unk_258[10 + arg1].unk_000[1] += 0.3; - if (player->unk_258[10 + arg1].unk_01E == 8) { - player->unk_258[10 + arg1].unk_01C = 0; - player->unk_258[10 + arg1].unk_01E = 0; - player->unk_258[10 + arg1].unk_012 = 0; + ++player->particlePool1[arg1].unk_01E; + player->particlePool1[arg1].pos[1] += 0.3; + if (player->particlePool1[arg1].unk_01E == 8) { + player->particlePool1[arg1].isAlive = 0; + player->particlePool1[arg1].unk_01E = 0; + player->particlePool1[arg1].type = 0; } - player->unk_258[10 + arg1].unk_00C += 0.15; - if (player->unk_258[10 + arg1].unk_040 == 0) { - if ((s32) player->unk_258[10 + arg1].unk_01E >= 4) { - --player->unk_258[10 + arg1].unk_03E; + player->particlePool1[arg1].scale += 0.15; + if (player->particlePool1[arg1].unk_040 == 0) { + if ((s32) player->particlePool1[arg1].unk_01E >= 4) { + --player->particlePool1[arg1].alpha; } - if ((s32) player->unk_258[10 + arg1].unk_03E <= 0) { - player->unk_258[10 + arg1].unk_03E = 0; + if ((s32) player->particlePool1[arg1].alpha <= 0) { + player->particlePool1[arg1].alpha = 0; } } else { - if ((s32) player->unk_258[10 + arg1].unk_01E >= 4) { - player->unk_258[10 + arg1].unk_03E -= 16; + if ((s32) player->particlePool1[arg1].unk_01E >= 4) { + player->particlePool1[arg1].alpha -= 16; } - if ((s32) player->unk_258[10 + arg1].unk_03E <= 0) { + if ((s32) player->particlePool1[arg1].alpha <= 0) { - player->unk_258[10 + arg1].unk_03E = 0; + player->particlePool1[arg1].alpha = 0; } } } void func_80063BD4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - if (player->unk_258[10 + arg1].unk_010 == 1) { - player->unk_258[10 + arg1].unk_000[2] = + if (player->particlePool1[arg1].unk_010 == 1) { + player->particlePool1[arg1].pos[2] = player->tyres[BACK_LEFT].pos[2] + - (-2 * player->unk_258[10 + arg1].unk_01E * coss(player->unk_258[10 + arg1].unk_020)); - player->unk_258[10 + arg1].unk_000[0] = + (-2 * player->particlePool1[arg1].unk_01E * coss(player->particlePool1[arg1].unk_020)); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_LEFT].pos[0] + - (-2 * player->unk_258[10 + arg1].unk_01E * sins(player->unk_258[10 + arg1].unk_020)); + (-2 * player->particlePool1[arg1].unk_01E * sins(player->particlePool1[arg1].unk_020)); } else { - player->unk_258[10 + arg1].unk_000[2] = + player->particlePool1[arg1].pos[2] = player->tyres[BACK_RIGHT].pos[2] + - (-2 * player->unk_258[10 + arg1].unk_01E * coss(player->unk_258[10 + arg1].unk_020)); - player->unk_258[10 + arg1].unk_000[0] = + (-2 * player->particlePool1[arg1].unk_01E * coss(player->particlePool1[arg1].unk_020)); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_RIGHT].pos[0] + - (-2 * player->unk_258[10 + arg1].unk_01E * sins(player->unk_258[10 + arg1].unk_020)); + (-2 * player->particlePool1[arg1].unk_01E * sins(player->particlePool1[arg1].unk_020)); } - ++player->unk_258[10 + arg1].unk_01E; - player->unk_258[10 + arg1].unk_000[1] += 0.2; - if (player->unk_258[10 + arg1].unk_01E == 8) { - player->unk_258[10 + arg1].unk_01C = 0; - player->unk_258[10 + arg1].unk_01E = 0; - player->unk_258[10 + arg1].unk_012 = 0; + ++player->particlePool1[arg1].unk_01E; + player->particlePool1[arg1].pos[1] += 0.2; + if (player->particlePool1[arg1].unk_01E == 8) { + player->particlePool1[arg1].isAlive = 0; + player->particlePool1[arg1].unk_01E = 0; + player->particlePool1[arg1].type = 0; } - player->unk_258[10 + arg1].unk_018 = 2.0f; - player->unk_258[10 + arg1].unk_00C -= 0.06; + player->particlePool1[arg1].unk_018 = 2.0f; + player->particlePool1[arg1].scale -= 0.06; } void func_80063D58(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - if (player->unk_258[10 + arg1].unk_010 == 1) { - player->unk_258[10 + arg1].unk_000[2] = + if (player->particlePool1[arg1].unk_010 == 1) { + player->particlePool1[arg1].pos[2] = player->tyres[BACK_LEFT].pos[2] + - ((-player->unk_258[10 + arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 20.0f) * - coss(player->unk_258[10 + arg1].unk_020); - player->unk_258[10 + arg1].unk_000[0] = + ((-player->particlePool1[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 20.0f) * + coss(player->particlePool1[arg1].unk_020); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_LEFT].pos[0] + - ((-player->unk_258[10 + arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 20.0f) * - sins(player->unk_258[10 + arg1].unk_020); + ((-player->particlePool1[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 20.0f) * + sins(player->particlePool1[arg1].unk_020); } else { - player->unk_258[10 + arg1].unk_000[2] = + player->particlePool1[arg1].pos[2] = player->tyres[BACK_RIGHT].pos[2] + - ((-player->unk_258[10 + arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 20.0f) * - coss(player->unk_258[10 + arg1].unk_020); - player->unk_258[10 + arg1].unk_000[0] = + ((-player->particlePool1[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 20.0f) * + coss(player->particlePool1[arg1].unk_020); + player->particlePool1[arg1].pos[0] = player->tyres[BACK_RIGHT].pos[0] + - ((-player->unk_258[10 + arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 20.0f) * - sins(player->unk_258[10 + arg1].unk_020); + ((-player->particlePool1[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 20.0f) * + sins(player->particlePool1[arg1].unk_020); } - ++player->unk_258[10 + arg1].unk_01E; - if (player->unk_258[10 + arg1].unk_01E == 8) { - player->unk_258[10 + arg1].unk_01E = 0; - player->unk_258[10 + arg1].unk_01C = 0; - player->unk_258[10 + arg1].unk_012 = 0; + ++player->particlePool1[arg1].unk_01E; + if (player->particlePool1[arg1].unk_01E == 8) { + player->particlePool1[arg1].unk_01E = 0; + player->particlePool1[arg1].isAlive = 0; + player->particlePool1[arg1].type = 0; } - player->unk_258[10 + arg1].unk_00C += 0.2; - if (player->unk_258[10 + arg1].unk_01E >= 4) { - player->unk_258[10 + arg1].unk_03E -= 18; - player->unk_258[10 + arg1].unk_000[1] -= 0.1; + player->particlePool1[arg1].scale += 0.2; + if (player->particlePool1[arg1].unk_01E >= 4) { + player->particlePool1[arg1].alpha -= 18; + player->particlePool1[arg1].pos[1] -= 0.1; } else { - player->unk_258[10 + arg1].unk_000[1] += 0.4; + player->particlePool1[arg1].pos[1] += 0.4; } - if (player->unk_258[10 + arg1].unk_03E <= 0) { - player->unk_258[10 + arg1].unk_03E = 0; + if (player->particlePool1[arg1].alpha <= 0) { + player->particlePool1[arg1].alpha = 0; } } @@ -4602,23 +4584,25 @@ void func_80063FBC(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s32 arg3) { f32 sp38; f32 sp34; - if (player->unk_258[10 + arg1].unk_010 == 1) { + if (player->particlePool1[arg1].unk_010 == 1) { func_80062B18(&sp3C, &sp34, &sp38, 3.0f, 0.0f, - -5.5 - (player->unk_258[10 + arg1].unk_01E * (((player->speed / 18.0f) * 216.0f) / 15.0f)), - -player->unk_258[10 + arg1].unk_020, 0); + -5.5 - + (player->particlePool1[arg1].unk_01E * (((player->speed / 18.0f) * 216.0f) / 15.0f)), + -player->particlePool1[arg1].unk_020, 0); } else { func_80062B18(&sp3C, &sp34, &sp38, -3.0f, 0.0f, - -5.5 - (player->unk_258[10 + arg1].unk_01E * (((player->speed / 18.0f) * 216.0f) / 15.0f)), - -player->unk_258[10 + arg1].unk_020, 0); + -5.5 - + (player->particlePool1[arg1].unk_01E * (((player->speed / 18.0f) * 216.0f) / 15.0f)), + -player->particlePool1[arg1].unk_020, 0); } - player->unk_258[10 + arg1].unk_000[0] = player->pos[0] + sp3C; - player->unk_258[10 + arg1].unk_000[2] = player->pos[2] + sp38; - player->unk_258[10 + arg1].unk_000[1] = (player->pos[1] - player->boundingBoxSize) + sp34; - player->unk_258[10 + arg1].unk_01E++; - if (player->unk_258[10 + arg1].unk_01E == 6) { - player->unk_258[10 + arg1].unk_01C = 0; - player->unk_258[10 + arg1].unk_01E = 0; - player->unk_258[10 + arg1].unk_012 = 0; + player->particlePool1[arg1].pos[0] = player->pos[0] + sp3C; + player->particlePool1[arg1].pos[2] = player->pos[2] + sp38; + player->particlePool1[arg1].pos[1] = (player->pos[1] - player->boundingBoxSize) + sp34; + player->particlePool1[arg1].unk_01E++; + if (player->particlePool1[arg1].unk_01E == 6) { + player->particlePool1[arg1].isAlive = 0; + player->particlePool1[arg1].unk_01E = 0; + player->particlePool1[arg1].type = 0; } } @@ -4633,47 +4617,48 @@ void func_80064184(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) { } func_80062B18(&sp44, &sp40, &sp3C, 0.0f, sp40, - -4.0f + ((-player->unk_258[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 10.0f), - -player->unk_258[arg1].unk_020, 2 * -player->unk_206); - player->unk_258[arg1].unk_000[0] = player->pos[0] + sp44; - player->unk_258[arg1].unk_000[2] = player->pos[2] + sp3C; - player->unk_258[arg1].unk_000[1] = player->pos[1] + sp40; - ++player->unk_258[arg1].unk_01E; - if ((player->unk_258[arg1].unk_01E == 12) || (D_801652A0[arg2] <= (player->pos[1] - player->boundingBoxSize))) { - player->unk_258[arg1].unk_01C = 0; - player->unk_258[arg1].unk_01E = 0; - player->unk_258[arg1].unk_012 = 0; + -4.0f + ((-player->particlePool0[arg1].unk_01E * (player->speed / 18.0f) * 216.0f) / 10.0f), + -player->particlePool0[arg1].unk_020, 2 * -player->unk_206); + player->particlePool0[arg1].pos[0] = player->pos[0] + sp44; + player->particlePool0[arg1].pos[2] = player->pos[2] + sp3C; + player->particlePool0[arg1].pos[1] = player->pos[1] + sp40; + ++player->particlePool0[arg1].unk_01E; + if ((player->particlePool0[arg1].unk_01E == 12) || + (D_801652A0[arg2] <= (player->pos[1] - player->boundingBoxSize))) { + player->particlePool0[arg1].isAlive = 0; + player->particlePool0[arg1].unk_01E = 0; + player->particlePool0[arg1].type = 0; } - player->unk_258[arg1].unk_018 = 2.0f; - player->unk_258[arg1].unk_00C -= 0.35; - if (player->unk_258[arg1].unk_00C < 0.0f) { - player->unk_258[arg1].unk_00C = 0.0f; + player->particlePool0[arg1].unk_018 = 2.0f; + player->particlePool0[arg1].scale -= 0.35; + if (player->particlePool0[arg1].scale < 0.0f) { + player->particlePool0[arg1].scale = 0.0f; } - player->unk_258[arg1].unk_03E -= 22; - if (player->unk_258[arg1].unk_03E <= 0) { - player->unk_258[arg1].unk_03E = 0; + player->particlePool0[arg1].alpha -= 22; + if (player->particlePool0[arg1].alpha <= 0) { + player->particlePool0[arg1].alpha = 0; } } void func_800643A8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - player->unk_258[10 + arg1].unk_000[2] = - player->pos[2] + (-1.2 * player->unk_258[10 + arg1].unk_01E * coss(player->unk_258[10 + arg1].unk_020)); - player->unk_258[10 + arg1].unk_000[0] = - player->pos[0] + (-1.2 * player->unk_258[10 + arg1].unk_01E * sins(player->unk_258[10 + arg1].unk_020)); - player->unk_258[10 + arg1].unk_000[1] = player->unk_258[10 + arg1].unk_000[1] + 0.5; + player->particlePool1[arg1].pos[2] = player->pos[2] + (-1.2 * player->particlePool1[arg1].unk_01E * + coss(player->particlePool1[arg1].unk_020)); + player->particlePool1[arg1].pos[0] = player->pos[0] + (-1.2 * player->particlePool1[arg1].unk_01E * + sins(player->particlePool1[arg1].unk_020)); + player->particlePool1[arg1].pos[1] = player->particlePool1[arg1].pos[1] + 0.5; - ++player->unk_258[10 + arg1].unk_01E; - if (player->unk_258[10 + arg1].unk_01E == 10) { - player->unk_258[10 + arg1].unk_01C = 0; - player->unk_258[10 + arg1].unk_01E = 0; - player->unk_258[10 + arg1].unk_012 = 0; + ++player->particlePool1[arg1].unk_01E; + if (player->particlePool1[arg1].unk_01E == 10) { + player->particlePool1[arg1].isAlive = 0; + player->particlePool1[arg1].unk_01E = 0; + player->particlePool1[arg1].type = 0; } - player->unk_258[10 + arg1].unk_00C += 0.2; - player->unk_258[10 + arg1].unk_03E -= 8; - if (player->unk_258[10 + arg1].unk_03E <= 0) { - player->unk_258[10 + arg1].unk_03E = 0; + player->particlePool1[arg1].scale += 0.2; + player->particlePool1[arg1].alpha -= 8; + if (player->particlePool1[arg1].alpha <= 0) { + player->particlePool1[arg1].alpha = 0; } } @@ -4683,27 +4668,27 @@ void func_800644E8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { s32 thing; UNUSED s32 stackPadding1; - if (player->unk_258[30 + arg1].unk_01E >= 9) { - player->unk_258[30 + arg1].unk_01E = 9; + if (player->particlePool3[arg1].unk_01E >= 9) { + player->particlePool3[arg1].unk_01E = 9; } - thing2 = player->unk_258[30 + arg1].unk_024; - thing = player->unk_258[30 + arg1].unk_01E; - player->unk_258[30 + arg1].unk_000[2] = - player->pos[2] + (coss(player->unk_258[30 + arg1].unk_020) * (-0.7 * thing)); - player->unk_258[30 + arg1].unk_000[0] = - player->pos[0] + (sins(player->unk_258[30 + arg1].unk_020) * (-0.7 * thing)); - player->unk_258[30 + arg1].unk_01E++; - player->unk_258[30 + arg1].unk_000[1] = - player->unk_258[30 + arg1].unk_028 + (f32) ((thing * thing2) - (0.2 * (thing * thing))); - if (player->unk_258[30 + arg1].unk_01E == 0x000A) { - player->unk_258[30 + arg1].unk_01E = 0; - player->unk_258[30 + arg1].unk_01C = 0; - player->unk_258[30 + arg1].unk_012 = 0; + thing2 = player->particlePool3[arg1].unk_024; + thing = player->particlePool3[arg1].unk_01E; + player->particlePool3[arg1].pos[2] = + player->pos[2] + (coss(player->particlePool3[arg1].unk_020) * (-0.7 * thing)); + player->particlePool3[arg1].pos[0] = + player->pos[0] + (sins(player->particlePool3[arg1].unk_020) * (-0.7 * thing)); + player->particlePool3[arg1].unk_01E++; + player->particlePool3[arg1].pos[1] = + player->particlePool3[arg1].unk_028 + (f32) ((thing * thing2) - (0.2 * (thing * thing))); + if (player->particlePool3[arg1].unk_01E == 0x000A) { + player->particlePool3[arg1].unk_01E = 0; + player->particlePool3[arg1].isAlive = 0; + player->particlePool3[arg1].type = 0; } - if (player->unk_258[30 + arg1].unk_01E >= 7) { - player->unk_258[30 + arg1].unk_03E -= 0x60; - if (player->unk_258[30 + arg1].unk_03E <= 0) { - player->unk_258[30 + arg1].unk_03E = 0; + if (player->particlePool3[arg1].unk_01E >= 7) { + player->particlePool3[arg1].alpha -= 0x60; + if (player->particlePool3[arg1].alpha <= 0) { + player->particlePool3[arg1].alpha = 0; } } } @@ -4714,262 +4699,266 @@ void func_80064664(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { s32 temp_v1; UNUSED s32 stackPadding1; - temp_v1 = player->unk_258[30 + arg1].unk_01E; - temp_f4 = player->unk_258[30 + arg1].unk_024; - player->unk_258[30 + arg1].unk_000[2] = - player->pos[2] + (coss(player->unk_258[30 + arg1].unk_020) * (-0.6 * temp_v1)); - player->unk_258[30 + arg1].unk_000[0] = - player->pos[0] + (sins(player->unk_258[30 + arg1].unk_020) * (-0.6 * temp_v1)); - player->unk_258[30 + arg1].unk_01E++; - player->unk_258[30 + arg1].unk_000[1] = - player->unk_258[30 + arg1].unk_028 + (f32) ((temp_v1 * temp_f4) - (0.1 * (temp_v1 * temp_v1))); - if (player->unk_258[30 + arg1].unk_01E == 0x0019) { - player->unk_258[30 + arg1].unk_01E = 0; - player->unk_258[30 + arg1].unk_01C = 0; - player->unk_258[30 + arg1].unk_012 = 0; + temp_v1 = player->particlePool3[arg1].unk_01E; + temp_f4 = player->particlePool3[arg1].unk_024; + player->particlePool3[arg1].pos[2] = + player->pos[2] + (coss(player->particlePool3[arg1].unk_020) * (-0.6 * temp_v1)); + player->particlePool3[arg1].pos[0] = + player->pos[0] + (sins(player->particlePool3[arg1].unk_020) * (-0.6 * temp_v1)); + player->particlePool3[arg1].unk_01E++; + player->particlePool3[arg1].pos[1] = + player->particlePool3[arg1].unk_028 + (f32) ((temp_v1 * temp_f4) - (0.1 * (temp_v1 * temp_v1))); + if (player->particlePool3[arg1].unk_01E == 0x0019) { + player->particlePool3[arg1].unk_01E = 0; + player->particlePool3[arg1].isAlive = 0; + player->particlePool3[arg1].type = 0; } - if (player->unk_258[30 + arg1].unk_01E >= 7) { - player->unk_258[30 + arg1].unk_03E -= 0x6; - if (player->unk_258[30 + arg1].unk_03E <= 0) { - player->unk_258[30 + arg1].unk_03E = 0; + if (player->particlePool3[arg1].unk_01E >= 7) { + player->particlePool3[arg1].alpha -= 0x6; + if (player->particlePool3[arg1].alpha <= 0) { + player->particlePool3[arg1].alpha = 0; } } } void func_800647C8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - ++player->unk_258[30 + arg1].unk_01E; - player->unk_258[30 + arg1].unk_000[2] = - player->pos[2] + ((-0.8 * (player->unk_258[30 + arg1].unk_01E)) * coss(player->unk_258[30 + arg1].unk_020)); - player->unk_258[30 + arg1].unk_000[0] = - player->pos[0] + ((-0.8 * (player->unk_258[30 + arg1].unk_01E)) * sins(player->unk_258[30 + arg1].unk_020)); - player->unk_258[30 + arg1].unk_000[1] = (player->unk_074 + 2.0f); + ++player->particlePool3[arg1].unk_01E; + player->particlePool3[arg1].pos[2] = player->pos[2] + ((-0.8 * (player->particlePool3[arg1].unk_01E)) * + coss(player->particlePool3[arg1].unk_020)); + player->particlePool3[arg1].pos[0] = player->pos[0] + ((-0.8 * (player->particlePool3[arg1].unk_01E)) * + sins(player->particlePool3[arg1].unk_020)); + player->particlePool3[arg1].pos[1] = (player->unk_074 + 2.0f); - if (player->unk_258[30 + arg1].unk_01E == 14) { - player->unk_258[30 + arg1].unk_01C = 0; - player->unk_258[30 + arg1].unk_01E = 0; - player->unk_258[30 + arg1].unk_012 = 0; + if (player->particlePool3[arg1].unk_01E == 14) { + player->particlePool3[arg1].isAlive = 0; + player->particlePool3[arg1].unk_01E = 0; + player->particlePool3[arg1].type = 0; } - player->unk_258[30 + arg1].unk_03E -= 12; - if (player->unk_258[30 + arg1].unk_03E <= 0) { - player->unk_258[30 + arg1].unk_03E = 0; + player->particlePool3[arg1].alpha -= 12; + if (player->particlePool3[arg1].alpha <= 0) { + player->particlePool3[arg1].alpha = 0; } } void func_800648E4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - ++player->unk_258[30 + arg1].unk_01E; - player->unk_258[30 + arg1].unk_00C -= 0.06; - player->unk_258[30 + arg1].unk_000[1] += 0.1; - player->unk_258[30 + arg1].unk_03E -= 12; + ++player->particlePool3[arg1].unk_01E; + player->particlePool3[arg1].scale -= 0.06; + player->particlePool3[arg1].pos[1] += 0.1; + player->particlePool3[arg1].alpha -= 12; - if (player->unk_258[30 + arg1].unk_03E <= 0) { - player->unk_258[30 + arg1].unk_03E = 0; + if (player->particlePool3[arg1].alpha <= 0) { + player->particlePool3[arg1].alpha = 0; } - if (player->unk_258[30 + arg1].unk_01E == 10) { - player->unk_258[30 + arg1].unk_01C = 0; - player->unk_258[30 + arg1].unk_01E = 0; - player->unk_258[30 + arg1].unk_012 = 0; + if (player->particlePool3[arg1].unk_01E == 10) { + player->particlePool3[arg1].isAlive = 0; + player->particlePool3[arg1].unk_01E = 0; + player->particlePool3[arg1].type = 0; } } void func_80064988(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - ++player->unk_258[30 + arg1].unk_01E; - player->unk_258[30 + arg1].unk_000[1] -= 0.3; + ++player->particlePool3[arg1].unk_01E; + player->particlePool3[arg1].pos[1] -= 0.3; - if (player->unk_258[30 + arg1].unk_01E == 10) { - player->unk_258[30 + arg1].unk_01C = 0; - player->unk_258[30 + arg1].unk_01E = 0; - player->unk_258[30 + arg1].unk_012 = 0; + if (player->particlePool3[arg1].unk_01E == 10) { + player->particlePool3[arg1].isAlive = 0; + player->particlePool3[arg1].unk_01E = 0; + player->particlePool3[arg1].type = 0; } } void func_800649F4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { f32 temp; - temp = player->unk_258[30 + arg1].unk_018; + temp = player->particlePool3[arg1].unk_018; - player->unk_258[30 + arg1].unk_000[2] = - player->unk_21C + (((-temp) * player->unk_258[30 + arg1].unk_01E) * coss(player->unk_258[30 + arg1].unk_020)); - player->unk_258[30 + arg1].unk_000[0] = - player->unk_218 + (((-temp) * player->unk_258[30 + arg1].unk_01E) * sins(player->unk_258[30 + arg1].unk_020)); - player->unk_258[30 + arg1].unk_000[1] = player->pos[1] + player->unk_258[30 + arg1].unk_014; - player->unk_258[30 + arg1].unk_00C += 0.04; + player->particlePool3[arg1].pos[2] = + player->unk_21C + + (((-temp) * player->particlePool3[arg1].unk_01E) * coss(player->particlePool3[arg1].unk_020)); + player->particlePool3[arg1].pos[0] = + player->unk_218 + + (((-temp) * player->particlePool3[arg1].unk_01E) * sins(player->particlePool3[arg1].unk_020)); + player->particlePool3[arg1].pos[1] = player->pos[1] + player->particlePool3[arg1].surfaceType; + player->particlePool3[arg1].scale += 0.04; - ++player->unk_258[30 + arg1].unk_01E; - if (player->unk_258[30 + arg1].unk_01E == 12) { - player->unk_258[30 + arg1].unk_01E = 0; - player->unk_258[30 + arg1].unk_01C = 0; - player->unk_258[30 + arg1].unk_012 = 0; + ++player->particlePool3[arg1].unk_01E; + if (player->particlePool3[arg1].unk_01E == 12) { + player->particlePool3[arg1].unk_01E = 0; + player->particlePool3[arg1].isAlive = 0; + player->particlePool3[arg1].type = 0; } - if (player->unk_258[30 + arg1].unk_01E >= 9) { - player->unk_258[30 + arg1].unk_03E -= 0x10; - if (player->unk_258[30 + arg1].unk_03E <= 0) { - player->unk_258[30 + arg1].unk_03E = 0; + if (player->particlePool3[arg1].unk_01E >= 9) { + player->particlePool3[arg1].alpha -= 0x10; + if (player->particlePool3[arg1].alpha <= 0) { + player->particlePool3[arg1].alpha = 0; } } } void func_80064B30(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { f32 temp; - temp = player->unk_258[30 + arg1].unk_018 * 1.2; + temp = player->particlePool3[arg1].unk_018 * 1.2; - player->unk_258[30 + arg1].unk_000[2] = - (player->pos[2] + (-temp * player->unk_258[30 + arg1].unk_01E) * (coss(player->unk_258[30 + arg1].unk_020))); - player->unk_258[30 + arg1].unk_000[0] = - (player->pos[0] + (-temp * player->unk_258[30 + arg1].unk_01E) * (sins(player->unk_258[30 + arg1].unk_020))); - player->unk_258[30 + arg1].unk_000[1] += 0.1; + player->particlePool3[arg1].pos[2] = (player->pos[2] + (-temp * player->particlePool3[arg1].unk_01E) * + (coss(player->particlePool3[arg1].unk_020))); + player->particlePool3[arg1].pos[0] = (player->pos[0] + (-temp * player->particlePool3[arg1].unk_01E) * + (sins(player->particlePool3[arg1].unk_020))); + player->particlePool3[arg1].pos[1] += 0.1; - ++player->unk_258[30 + arg1].unk_01E; - if (player->unk_258[30 + arg1].unk_01E == 10) { - player->unk_258[30 + arg1].unk_01E = 0; - player->unk_258[30 + arg1].unk_01C = 0; - player->unk_258[30 + arg1].unk_012 = 0; + ++player->particlePool3[arg1].unk_01E; + if (player->particlePool3[arg1].unk_01E == 10) { + player->particlePool3[arg1].unk_01E = 0; + player->particlePool3[arg1].isAlive = 0; + player->particlePool3[arg1].type = 0; } - player->unk_258[30 + arg1].unk_038 += 1820; - if (player->unk_258[30 + arg1].unk_01E >= 6) { - player->unk_258[30 + arg1].unk_03E -= 16; - if (player->unk_258[30 + arg1].unk_03E <= 0) { - player->unk_258[30 + arg1].unk_03E = 0; + player->particlePool3[arg1].red += 1820; + if (player->particlePool3[arg1].unk_01E >= 6) { + player->particlePool3[arg1].alpha -= 16; + if (player->particlePool3[arg1].alpha <= 0) { + player->particlePool3[arg1].alpha = 0; } } } void func_80064C74(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - if (player->unk_258[30 + arg1].unk_010 == 1) { - player->unk_258[30 + arg1].unk_020 += 2184; + if (player->particlePool3[arg1].unk_010 == 1) { + player->particlePool3[arg1].unk_020 += 2184; } else { - player->unk_258[30 + arg1].unk_020 -= 2184; + player->particlePool3[arg1].unk_020 -= 2184; } - player->unk_258[30 + arg1].unk_000[2] = - player->pos[2] + (coss(player->unk_258[30 + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); - player->unk_258[30 + arg1].unk_000[0] = - player->pos[0] + (sins(player->unk_258[30 + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); - player->unk_258[30 + arg1].unk_000[1] = player->pos[1] - 1.0f; - player->unk_258[30 + arg1].unk_00C += 0.4; - ++player->unk_258[30 + arg1].unk_01E; + player->particlePool3[arg1].pos[2] = + player->pos[2] + + (coss(player->particlePool3[arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); + player->particlePool3[arg1].pos[0] = + player->pos[0] + + (sins(player->particlePool3[arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f); + player->particlePool3[arg1].pos[1] = player->pos[1] - 1.0f; + player->particlePool3[arg1].scale += 0.4; + ++player->particlePool3[arg1].unk_01E; - if (player->unk_258[30 + arg1].unk_01E == 10) { - player->unk_258[30 + arg1].unk_01E = 0; - player->unk_258[30 + arg1].unk_01C = 0; - player->unk_258[30 + arg1].unk_012 = 0; + if (player->particlePool3[arg1].unk_01E == 10) { + player->particlePool3[arg1].unk_01E = 0; + player->particlePool3[arg1].isAlive = 0; + player->particlePool3[arg1].type = 0; } - if (player->unk_258[30 + arg1].unk_01E >= 5) { - player->unk_258[30 + arg1].unk_03E -= 20; - if (player->unk_258[30 + arg1].unk_03E <= 0) { - player->unk_258[30 + arg1].unk_03E = 0; + if (player->particlePool3[arg1].unk_01E >= 5) { + player->particlePool3[arg1].alpha -= 20; + if (player->particlePool3[arg1].alpha <= 0) { + player->particlePool3[arg1].alpha = 0; } } } -void func_80064DEC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { +void func_80064DEC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 index) { - player->unk_258[20 + arg3].unk_000[1] = player->pos[1]; - ++player->unk_258[20 + arg3].unk_01E; + player->particlePool2[index].pos[1] = player->pos[1]; + ++player->particlePool2[index].unk_01E; - if (player->unk_258[20 + arg3].unk_01E == 9) { + if (player->particlePool2[index].unk_01E == 9) { player->unk_0B6 &= ~0x0040; - player->unk_258[20 + arg3].unk_01C = 0; - player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_012 = 0; + player->particlePool2[index].isAlive = 0; + player->particlePool2[index].unk_01E = 0; + player->particlePool2[index].type = 0; } - player->unk_258[20 + arg3].unk_00C += 0.8; - if (player->unk_258[20 + arg3].unk_00C >= (f64) 2.5) { - player->unk_258[20 + arg3].unk_00C = 2.5f; + player->particlePool2[index].scale += 0.8; + if (player->particlePool2[index].scale >= (f64) 2.5) { + player->particlePool2[index].scale = 2.5f; } } -void func_80064EA4(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { - ++player->unk_258[20 + arg3].unk_01E; - if (player->unk_258[20 + arg3].unk_01E < 4) { - player->unk_258[20 + arg3].unk_00C += 1.2; - if (player->unk_258[20 + arg3].unk_00C >= 3.5) { - player->unk_258[20 + arg3].unk_00C = 3.5f; +void func_80064EA4(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 index) { + ++player->particlePool2[index].unk_01E; + if (player->particlePool2[index].unk_01E < 4) { + player->particlePool2[index].scale += 1.2; + if (player->particlePool2[index].scale >= 3.5) { + player->particlePool2[index].scale = 3.5f; } } else { - player->unk_258[20 + arg3].unk_00C -= 1.8; - if (player->unk_258[20 + arg3].unk_00C <= 0.0f) { + player->particlePool2[index].scale -= 1.8; + if (player->particlePool2[index].scale <= 0.0f) { player->unk_0B6 &= ~0x1000; - player->unk_258[20 + arg3].unk_01C = 0; - player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_012 = 0; + player->particlePool2[index].isAlive = 0; + player->particlePool2[index].unk_01E = 0; + player->particlePool2[index].type = 0; } } } -void func_80064F88(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { - ++player->unk_258[20 + arg3].unk_01E; - player->unk_258[20 + arg3].unk_00C += 0.15; +void func_80064F88(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 index) { + ++player->particlePool2[index].unk_01E; + player->particlePool2[index].scale += 0.15; - if (1.2 <= player->unk_258[20 + arg3].unk_00C) { - player->unk_258[20 + arg3].unk_00C = 1.2f; + if (1.2 <= player->particlePool2[index].scale) { + player->particlePool2[index].scale = 1.2f; } - if (player->unk_258[20 + arg3].unk_01E >= 12) { + if (player->particlePool2[index].unk_01E >= 12) { player->unk_0B6 &= ~0x0800; - player->unk_258[20 + arg3].unk_01C = 0; - player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_012 = 0; + player->particlePool2[index].isAlive = 0; + player->particlePool2[index].unk_01E = 0; + player->particlePool2[index].type = 0; } } -void func_80065030(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { - ++player->unk_258[20 + arg3].unk_01E; +void func_80065030(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 index) { + ++player->particlePool2[index].unk_01E; - player->unk_258[20 + arg3].unk_000[1] += 0.8; - player->unk_258[20 + arg3].unk_00C += 0.4; - if (player->unk_258[20 + arg3].unk_00C >= (f64) 1.5) { - player->unk_258[20 + arg3].unk_00C = 1.5f; + player->particlePool2[index].pos[1] += 0.8; + player->particlePool2[index].scale += 0.4; + if (player->particlePool2[index].scale >= (f64) 1.5) { + player->particlePool2[index].scale = 1.5f; } - if (player->unk_258[20 + arg3].unk_01E >= 12) { + if (player->particlePool2[index].unk_01E >= 12) { player->unk_0B6 &= ~0x0100; - player->unk_258[20 + arg3].unk_01C = 0; - player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_012 = 0; + player->particlePool2[index].isAlive = 0; + player->particlePool2[index].unk_01E = 0; + player->particlePool2[index].type = 0; } } -void func_800650FC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { - player->unk_258[20 + arg3].unk_000[2] = (f32) player->pos[2]; - player->unk_258[20 + arg3].unk_000[0] = (f32) player->pos[0]; - player->unk_258[20 + arg3].unk_000[1] = (f32) (player->pos[1] + 4.0f); +void func_800650FC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 index) { + player->particlePool2[index].pos[2] = (f32) player->pos[2]; + player->particlePool2[index].pos[0] = (f32) player->pos[0]; + player->particlePool2[index].pos[1] = (f32) (player->pos[1] + 4.0f); if ((player->effects & 0x80) == 0x80) { - player->unk_258[20 + arg3].unk_020 += 4732; + player->particlePool2[index].unk_020 += 4732; } else { - player->unk_258[20 + arg3].unk_020 -= 4732; + player->particlePool2[index].unk_020 -= 4732; } if (((player->effects & 0x80) != 0x80) && ((player->effects & 0x40) != 0x40)) { - player->unk_258[20 + arg3].unk_01C = 0; - player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_012 = 0; + player->particlePool2[index].isAlive = 0; + player->particlePool2[index].unk_01E = 0; + player->particlePool2[index].type = 0; } - player->unk_258[20 + arg3].unk_00C += 0.08; - if (player->unk_258[20 + arg3].unk_00C >= 1.5) { - player->unk_258[20 + arg3].unk_00C = 1.5f; + player->particlePool2[index].scale += 0.08; + if (player->particlePool2[index].scale >= 1.5) { + player->particlePool2[index].scale = 1.5f; } } -void func_800651F4(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { - ++player->unk_258[20 + arg3].unk_01E; - if (player->unk_258[20 + arg3].unk_01E < 8) { - player->unk_258[20 + arg3].unk_00C += 0.2; - if (1.2 <= player->unk_258[20 + arg3].unk_00C) { - player->unk_258[20 + arg3].unk_00C = 1.2f; +void func_800651F4(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 index) { + ++player->particlePool2[index].unk_01E; + if (player->particlePool2[index].unk_01E < 8) { + player->particlePool2[index].scale += 0.2; + if (1.2 <= player->particlePool2[index].scale) { + player->particlePool2[index].scale = 1.2f; } } else { - player->unk_258[20 + arg3].unk_00C -= 0.4; - if (player->unk_258[20 + arg3].unk_00C <= 0.0f) { + player->particlePool2[index].scale -= 0.4; + if (player->particlePool2[index].scale <= 0.0f) { player->unk_0B6 &= ~0x0020; - player->unk_258[20 + arg3].unk_01C = 0; - player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_012 = 0; + player->particlePool2[index].isAlive = 0; + player->particlePool2[index].unk_01E = 0; + player->particlePool2[index].type = 0; } } } @@ -4998,42 +4987,44 @@ void func_8006538C(Player* player, s8 arg1, s16 arg2, s8 arg3) { s16 envGreen; s16 envBlue; - if (player->unk_258[arg2].unk_01C == 1) { - spB4[0] = player->unk_258[arg2].unk_000[0]; - spB4[1] = player->unk_258[arg2].unk_000[1]; - spB4[2] = player->unk_258[arg2].unk_000[2]; + if (player->particlePool0[arg2].isAlive == 1) { + spB4[0] = player->particlePool0[arg2].pos[0]; + spB4[1] = player->particlePool0[arg2].pos[1]; + spB4[2] = player->particlePool0[arg2].pos[2]; spAC[0] = 0; spAC[1] = player->unk_048[arg3]; spAC[2] = 0; - if ((player->effects & STAR_EFFECT) && (((s32) gCourseTimer - D_8018D930[arg1]) < 9)) { + if ((player->effects & STAR_EFFECT) && (((s32) gCourseTimer - gPlayerStarEffectStartTime[arg1]) < 9)) { primRed = (primColors[1] >> 0x10) & 0xFF; primGreen = (primColors[1] >> 0x08) & 0xFF; primBlue = (primColors[1] >> 0x00) & 0xFF; envRed = (envColors[1] >> 0x10) & 0xFF; envGreen = (envColors[1] >> 0x08) & 0xFF; envBlue = (envColors[1] >> 0x00) & 0xFF; - primAlpha = player->unk_258[arg2].unk_03E; - func_800652D4(spB4, spAC, ((player->unk_258[arg2].unk_00C * player->size) * 1.4)); + primAlpha = player->particlePool0[arg2].alpha; + func_800652D4(spB4, spAC, ((player->particlePool0[arg2].scale * player->size) * 1.4)); gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_smoke[player->unk_258[arg2].unk_010], - G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gDisplayListHead++, + common_texture_particle_smoke[player->particlePool0[arg2].unk_010], G_IM_FMT_I, + G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha); gDPSetAlphaCompare(gDisplayListHead++, G_AC_DITHER); gSPDisplayList(gDisplayListHead++, D_0D008E48); } else { - primRed = (primColors[player->unk_258[arg2].unk_038] >> 0x10) & 0xFF; - primGreen = (primColors[player->unk_258[arg2].unk_038] >> 0x08) & 0xFF; - primBlue = (primColors[player->unk_258[arg2].unk_038] >> 0x00) & 0xFF; - envRed = (envColors[player->unk_258[arg2].unk_038] >> 0x10) & 0xFF; - envGreen = (envColors[player->unk_258[arg2].unk_038] >> 0x08) & 0xFF; - envBlue = (envColors[player->unk_258[arg2].unk_038] >> 0x00) & 0xFF; - primAlpha = player->unk_258[arg2].unk_03E; - func_800652D4(spB4, spAC, player->unk_258[arg2].unk_00C * player->size); + primRed = (primColors[player->particlePool0[arg2].red] >> 0x10) & 0xFF; + primGreen = (primColors[player->particlePool0[arg2].red] >> 0x08) & 0xFF; + primBlue = (primColors[player->particlePool0[arg2].red] >> 0x00) & 0xFF; + envRed = (envColors[player->particlePool0[arg2].red] >> 0x10) & 0xFF; + envGreen = (envColors[player->particlePool0[arg2].red] >> 0x08) & 0xFF; + envBlue = (envColors[player->particlePool0[arg2].red] >> 0x00) & 0xFF; + primAlpha = player->particlePool0[arg2].alpha; + func_800652D4(spB4, spAC, player->particlePool0[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_smoke[player->unk_258[arg2].unk_010], - G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gDisplayListHead++, + common_texture_particle_smoke[player->particlePool0[arg2].unk_010], G_IM_FMT_I, + G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha); gSPDisplayList(gDisplayListHead++, D_0D008E48); } @@ -5049,18 +5040,18 @@ void func_800658A0(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { s16 blue; s16 alpha; - if (player->unk_258[arg2].unk_01C == 1) { - red = player->unk_258[arg2].unk_038; - green = player->unk_258[arg2].unk_03A; - blue = player->unk_258[arg2].unk_03C; - alpha = player->unk_258[arg2].unk_03E; - sp54[0] = player->unk_258[arg2].unk_000[0]; - sp54[1] = player->unk_258[arg2].unk_000[1]; - sp54[2] = player->unk_258[arg2].unk_000[2]; + if (player->particlePool0[arg2].isAlive == 1) { + red = player->particlePool0[arg2].red; + green = player->particlePool0[arg2].green; + blue = player->particlePool0[arg2].blue; + alpha = player->particlePool0[arg2].alpha; + sp54[0] = player->particlePool0[arg2].pos[0]; + sp54[1] = player->particlePool0[arg2].pos[1]; + sp54[2] = player->particlePool0[arg2].pos[2]; sp4C[0] = 0; sp4C[1] = player->unk_048[arg3]; sp4C[2] = 0; - func_800652D4(sp54, sp4C, player->unk_258[arg2].unk_00C * player->size); + func_800652D4(sp54, sp4C, player->particlePool0[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, @@ -5074,7 +5065,7 @@ void func_800658A0(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { #ifdef NON_MATCHING // Something about the handling of the prim/env colors is off, // its causing a huge diff. Can't figure out what's up. -void func_80065AB0(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { +void render_player_drift_particles(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { Vec3f spB4; Vec3s spAC; s32 var_s0; @@ -5086,30 +5077,29 @@ void func_80065AB0(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { s16 envGreen; s16 envBlue; s32 sp8C[] = { 0x00ffffff, 0x00ffff00, 0x00ff9600 }; - if (player->unk_258[10 + arg2].unk_01C == 1) { - if (player->unk_204 >= 0x32) { + if (player->particlePool1[arg2].isAlive == 1) { + if (player->driftDuration >= 0x32) { var_s0 = 1; } else { var_s0 = 0; } - primRed = player->unk_258[10 + arg2].unk_038; - primGreen = player->unk_258[10 + arg2].unk_03A; - primBlue = player->unk_258[10 + arg2].unk_03C; - primAlpha = player->unk_258[10 + arg2].unk_03E; - envRed = (sp8C[player->unk_258[10 + arg2].unk_040] >> 0x10) & 0xFF; - envGreen = (sp8C[player->unk_258[10 + arg2].unk_040] >> 0x08) & 0xFF; - envBlue = (sp8C[player->unk_258[10 + arg2].unk_040] >> 0x00) & 0xFF; - spB4[0] = player->unk_258[10 + arg2].unk_000[0]; - spB4[1] = player->unk_258[10 + arg2].unk_000[1]; - spB4[2] = player->unk_258[10 + arg2].unk_000[2]; + primRed = player->particlePool1[arg2].red; + primGreen = player->particlePool1[arg2].green; + primBlue = player->particlePool1[arg2].blue; + primAlpha = player->particlePool1[arg2].alpha; + envRed = (sp8C[player->particlePool1[arg2].unk_040] >> 0x10) & 0xFF; + envGreen = (sp8C[player->particlePool1[arg2].unk_040] >> 0x08) & 0xFF; + envBlue = (sp8C[player->particlePool1[arg2].unk_040] >> 0x00) & 0xFF; + spB4[0] = player->particlePool1[arg2].pos[0]; + spB4[1] = player->particlePool1[arg2].pos[1]; + spB4[2] = player->particlePool1[arg2].pos[2]; spAC[0] = 0; spAC[1] = player->unk_048[arg3]; spAC[2] = 0; - - func_800652D4(spB4, spAC, player->unk_258[10 + arg2].unk_00C * player->size); + func_800652D4(spB4, spAC, player->particlePool1[arg2].scale * player->size); if (var_s0 == 0) { gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, D_800E4770[var_s0][0], G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, + gDPLoadTextureBlock(gDisplayListHead++, *D_800E4770[var_s0], G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha); @@ -5117,7 +5107,7 @@ void func_80065AB0(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { gSPDisplayList(gDisplayListHead++, D_0D008DF8); } else { gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, D_800E4770[var_s0][0], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, *D_800E4770[var_s0], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha); @@ -5128,13 +5118,13 @@ void func_80065AB0(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { } } #else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80065AB0.s") +GLOBAL_ASM("asm/non_matchings/code_80057C60/render_player_drift_particles.s") #endif #ifdef NON_MATCHING // https://decomp.me/scratch/KEz08 // Something is very wrong with the handling of prim/evn colors, but I can't figuer out what. -void func_80065F0C(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { +void render_player_ground_particles(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { Vec3f spDC; Vec3s spD4; s16 primRed; @@ -5145,38 +5135,38 @@ void func_80065F0C(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { s16 envGreen; s16 envBlue; - if ((player->unk_258[10 + arg2].unk_01C == 1) && (player->unk_258[10 + arg2].unk_01E != 0)) { - spDC[0] = player->unk_258[10 + arg2].unk_000[0]; - spDC[1] = player->unk_258[10 + arg2].unk_000[1]; - spDC[2] = player->unk_258[10 + arg2].unk_000[2]; + if ((player->particlePool1[arg2].isAlive == 1) && (player->particlePool1[arg2].unk_01E != 0)) { + spDC[0] = player->particlePool1[arg2].pos[0]; + spDC[1] = player->particlePool1[arg2].pos[1]; + spDC[2] = player->particlePool1[arg2].pos[2]; spD4[0] = 0; spD4[1] = player->unk_048[arg3]; spD4[2] = 0; - func_800652D4(spDC, spD4, player->unk_258[10 + arg2].unk_00C * player->size); - if ((s32) player->unk_258[10 + arg2].unk_014 != 8) { - primRed = - ((D_800E47DC[player->unk_258[10 + arg2].unk_038] >> 0x10) & 0xFF) - player->unk_258[10 + arg2].unk_03A; - primGreen = - ((D_800E47DC[player->unk_258[10 + arg2].unk_038] >> 0x08) & 0xFF) - player->unk_258[10 + arg2].unk_03A; - primBlue = - ((D_800E47DC[player->unk_258[10 + arg2].unk_038] >> 0x00) & 0xFF) - player->unk_258[10 + arg2].unk_03A; - envRed = - ((D_800E480C[player->unk_258[10 + arg2].unk_038] >> 0x10) & 0xFF) - player->unk_258[10 + arg2].unk_03A; - envGreen = - ((D_800E480C[player->unk_258[10 + arg2].unk_038] >> 0x08) & 0xFF) - player->unk_258[10 + arg2].unk_03A; - envBlue = - ((D_800E480C[player->unk_258[10 + arg2].unk_038] >> 0x00) & 0xFF) - player->unk_258[10 + arg2].unk_03A; - primAlpha = player->unk_258[10 + arg2].unk_03E; - if (player->unk_258[10 + arg2].unk_040 == 0) { + func_800652D4(spDC, spD4, player->particlePool1[arg2].scale * player->size); + if ((s32) player->particlePool1[arg2].surfaceType != GRASS) { + primRed = ((D_800E47DC[player->particlePool1[arg2].red] >> 0x10) & 0xFF) - + player->particlePool1[arg2].green; + primGreen = ((D_800E47DC[player->particlePool1[arg2].red] >> 0x08) & 0xFF) - + player->particlePool1[arg2].green; + primBlue = ((D_800E47DC[player->particlePool1[arg2].red] >> 0x00) & 0xFF) - + player->particlePool1[arg2].green; + envRed = ((D_800E480C[player->particlePool1[arg2].red] >> 0x10) & 0xFF) - + player->particlePool1[arg2].green; + envGreen = ((D_800E480C[player->particlePool1[arg2].red] >> 0x08) & 0xFF) - + player->particlePool1[arg2].green; + envBlue = ((D_800E480C[player->particlePool1[arg2].red] >> 0x00) & 0xFF) - + player->particlePool1[arg2].green; + primAlpha = player->particlePool1[arg2].alpha; + if (player->particlePool1[arg2].unk_040 == 0) { gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D494, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gGroundDust, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha); gSPDisplayList(gDisplayListHead++, D_0D008E48); } else { gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D494, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gGroundDust, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha); @@ -5184,12 +5174,12 @@ void func_80065F0C(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { gSPDisplayList(gDisplayListHead++, D_0D008E48); } } else { - primRed = player->unk_258[10 + arg2].unk_038; - primGreen = player->unk_258[10 + arg2].unk_03A; - primBlue = player->unk_258[10 + arg2].unk_03C; + primRed = player->particlePool1[arg2].red; + primGreen = player->particlePool1[arg2].green; + primBlue = player->particlePool1[arg2].blue; gSPDisplayList(gDisplayListHead++, D_0D008C90); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D498, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 64, 0, + gDPLoadTextureBlock(gDisplayListHead++, gGrassParticle, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B35C(primRed, primGreen, primBlue, 0x000000FF); @@ -5201,7 +5191,7 @@ void func_80065F0C(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { } } #else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80065F0C.s") +GLOBAL_ASM("asm/non_matchings/code_80057C60/render_player_ground_particles.s") #endif void func_800664E0(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { @@ -5212,18 +5202,18 @@ void func_800664E0(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { s16 blue; s16 alpha; - if (player->unk_258[10 + arg2].unk_01C == 1) { - red = player->unk_258[10 + arg2].unk_038; - green = player->unk_258[10 + arg2].unk_03A; - blue = player->unk_258[10 + arg2].unk_03C; - alpha = player->unk_258[10 + arg2].unk_03E; - sp54[0] = player->unk_258[10 + arg2].unk_000[0]; - sp54[1] = player->unk_258[10 + arg2].unk_000[1]; - sp54[2] = player->unk_258[10 + arg2].unk_000[2]; + if (player->particlePool1[arg2].isAlive == 1) { + red = player->particlePool1[arg2].red; + green = player->particlePool1[arg2].green; + blue = player->particlePool1[arg2].blue; + alpha = player->particlePool1[arg2].alpha; + sp54[0] = player->particlePool1[arg2].pos[0]; + sp54[1] = player->particlePool1[arg2].pos[1]; + sp54[2] = player->particlePool1[arg2].pos[2]; sp4C[0] = 0; sp4C[1] = player->unk_048[arg3]; sp4C[2] = 0; - func_800652D4(sp54, sp4C, player->unk_258[10 + arg2].unk_00C * player->size); + func_800652D4(sp54, sp4C, player->particlePool1[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPSetAlphaCompare(gDisplayListHead++, G_AC_DITHER); gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, @@ -5243,18 +5233,18 @@ void func_80066714(Player* player, UNUSED s32 arg1, s16 arg2, s8 arg3) { s16 blue; s16 alpha; - if (player->unk_258[10 + arg2].unk_01C == 1) { - red = player->unk_258[10 + arg2].unk_038; - green = player->unk_258[10 + arg2].unk_03A; - blue = player->unk_258[10 + arg2].unk_03C; - alpha = player->unk_258[10 + arg2].unk_03E; - sp5C[0] = player->unk_258[10 + arg2].unk_000[0]; - sp5C[1] = player->unk_258[10 + arg2].unk_000[1]; - sp5C[2] = player->unk_258[10 + arg2].unk_000[2]; + if (player->particlePool1[arg2].isAlive == 1) { + red = player->particlePool1[arg2].red; + green = player->particlePool1[arg2].green; + blue = player->particlePool1[arg2].blue; + alpha = player->particlePool1[arg2].alpha; + sp5C[0] = player->particlePool1[arg2].pos[0]; + sp5C[1] = player->particlePool1[arg2].pos[1]; + sp5C[2] = player->particlePool1[arg2].pos[2]; sp54[0] = 0; sp54[1] = player->unk_048[arg3]; sp54[2] = 0; - func_800652D4(sp5C, sp54, player->unk_258[10 + arg2].unk_00C * player->size); + func_800652D4(sp5C, sp54, player->particlePool1[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008C90); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_fire, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 64, 0, @@ -5276,18 +5266,18 @@ void func_80066998(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { s16 blue; s16 alpha; - if (player->unk_258[arg2].unk_01C == 1) { - red = player->unk_258[arg2].unk_038; - green = player->unk_258[arg2].unk_03A; - blue = player->unk_258[arg2].unk_03C; - alpha = player->unk_258[arg2].unk_03E; - sp54[0] = player->unk_258[arg2].unk_000[0]; - sp54[1] = player->unk_258[arg2].unk_000[1]; - sp54[2] = player->unk_258[arg2].unk_000[2]; + if (player->particlePool0[arg2].isAlive == 1) { + red = player->particlePool0[arg2].red; + green = player->particlePool0[arg2].green; + blue = player->particlePool0[arg2].blue; + alpha = player->particlePool0[arg2].alpha; + sp54[0] = player->particlePool0[arg2].pos[0]; + sp54[1] = player->particlePool0[arg2].pos[1]; + sp54[2] = player->particlePool0[arg2].pos[2]; sp4C[0] = 0x4000; sp4C[1] = player->unk_048[arg3]; sp4C[2] = 0; - func_800652D4(sp54, sp4C, player->unk_258[arg2].unk_00C * player->size); + func_800652D4(sp54, sp4C, player->particlePool0[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, @@ -5331,7 +5321,7 @@ void func_80066BAC(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { UNUSED s32 stackPadding; // Vtx **A_800E8900 = (Vtx **) LOAD_ASSET(D_800E8900); - if ((player->unk_258[arg2].unk_01C == 1) && (player->unk_258[arg2].unk_038 != 0x00FF)) { + if ((player->particlePool0[arg2].isAlive == 1) && (player->particlePool0[arg2].red != 0x00FF)) { if (player->collision.surfaceDistance[2] >= 300.0f) { spDC[1] = player->pos[1] + 5.0f; @@ -5347,34 +5337,34 @@ void func_80066BAC(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { } spD4[1] = player->unk_048[arg3]; spD4[2] = 0; - func_800652D4(spDC, spD4, player->unk_258[arg2].unk_00C * player->size); - if (player->unk_258[arg2].unk_038 == 0) { + func_800652D4(spDC, spD4, player->particlePool0[arg2].scale * player->size); + if (player->particlePool0[arg2].red == 0) { gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4C4, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt0, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPVertex(gDisplayListHead++, &D_800E8900a[0][player->unk_258[arg2].unk_038], 4, 0); + gSPVertex(gDisplayListHead++, &D_800E8900a[0][player->particlePool0[arg2].red], 4, 0); gSPDisplayList(gDisplayListHead++, common_square_plain_render); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4C8, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt1, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPVertex(gDisplayListHead++, &D_800E8900a[1][player->unk_258[arg2].unk_038], 4, 0); + gSPVertex(gDisplayListHead++, &D_800E8900a[1][player->particlePool0[arg2].red], 4, 0); gSPDisplayList(gDisplayListHead++, D_0D008DA0); } else { gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4C8, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt1, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPVertex(gDisplayListHead++, &D_800E8900a[0][player->unk_258[arg2].unk_038], 4, 0); + gSPVertex(gDisplayListHead++, &D_800E8900a[0][player->particlePool0[arg2].red], 4, 0); gSPDisplayList(gDisplayListHead++, common_square_plain_render); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4C4, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt0, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPVertex(gDisplayListHead++, &D_800E8900a[1][player->unk_258[arg2].unk_038], 4, 0); + gSPVertex(gDisplayListHead++, &D_800E8900a[1][player->particlePool0[arg2].red], 4, 0); gSPDisplayList(gDisplayListHead++, D_0D008DA0); } gMatrixEffectCount += 1; @@ -5389,19 +5379,19 @@ void func_80067280(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { s16 blue; s16 alpha; - if (player->unk_258[30 + arg2].unk_01C == 1) { - red = player->unk_258[30 + arg2].unk_038; - green = player->unk_258[30 + arg2].unk_03A; - blue = player->unk_258[30 + arg2].unk_03C; - alpha = player->unk_258[30 + arg2].unk_03E; - sp7C[0] = player->unk_258[30 + arg2].unk_000[0]; - sp7C[1] = player->unk_258[30 + arg2].unk_000[1]; - sp7C[2] = player->unk_258[30 + arg2].unk_000[2]; + if (player->particlePool3[arg2].isAlive == 1) { + red = player->particlePool3[arg2].red; + green = player->particlePool3[arg2].green; + blue = player->particlePool3[arg2].blue; + alpha = player->particlePool3[arg2].alpha; + sp7C[0] = player->particlePool3[arg2].pos[0]; + sp7C[1] = player->particlePool3[arg2].pos[1]; + sp7C[2] = player->particlePool3[arg2].pos[2]; sp74[0] = -0x071C; sp74[2] = 0; - if (player->unk_258[30 + arg2].unk_010 == 1) { + if (player->particlePool3[arg2].unk_010 == 1) { sp74[1] = player->unk_048[arg3] - 0x2000; - func_800652D4(sp7C, sp74, player->unk_258[30 + arg2].unk_00C * player->size); + func_800652D4(sp7C, sp74, player->particlePool3[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, @@ -5410,7 +5400,7 @@ void func_80067280(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { gSPDisplayList(gDisplayListHead++, D_0D008E70); } else { sp74[1] = player->unk_048[arg3] + 0x2000; - func_800652D4(sp7C, sp74, player->unk_258[30 + arg2].unk_00C * player->size); + func_800652D4(sp7C, sp74, player->particlePool3[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, @@ -5422,20 +5412,20 @@ void func_80067280(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { } } -void func_80067604(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { +void render_player_boost_spark_particles(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { Vec3f sp8C; Vec3s sp84; UNUSED s32 stackPadding[4]; - if (player->unk_258[30 + arg2].unk_01C == 1) { - sp8C[0] = player->unk_258[30 + arg2].unk_000[0]; - sp8C[1] = player->unk_258[30 + arg2].unk_000[1]; - sp8C[2] = player->unk_258[30 + arg2].unk_000[2]; + if (player->particlePool3[arg2].isAlive == 1) { + sp8C[0] = player->particlePool3[arg2].pos[0]; + sp8C[1] = player->particlePool3[arg2].pos[1]; + sp8C[2] = player->particlePool3[arg2].pos[2]; sp84[0] = 0; sp84[1] = player->unk_048[arg3]; sp84[2] = 0; - func_800652D4(sp8C, sp84, player->unk_258[30 + arg2].unk_00C * player->size); - if (player->unk_258[30 + arg2].unk_010 == 1) { + func_800652D4(sp8C, sp84, player->particlePool3[arg2].scale * player->size); + if (player->particlePool3[arg2].unk_010 == 1) { gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_spark[0], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, @@ -5454,29 +5444,29 @@ void func_80067604(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { } } -void func_80067964(Player* player, UNUSED s8 arg1, f32 arg2, UNUSED s8 arg3, s8 arg4) { +void render_player_onomatopoeia_whrrrr(Player* player, UNUSED s8 arg1, f32 arg2, UNUSED s8 arg3, s8 arg4) { Vec3f sp9C; Vec3s sp94; UNUSED s32 stackPadding[2]; - if (player->unk_258[20 + arg4].unk_01C == 1) { - sp9C[0] = player->unk_258[20 + arg4].unk_000[0]; - sp9C[1] = player->unk_258[20 + arg4].unk_000[1]; - sp9C[2] = player->unk_258[20 + arg4].unk_000[2]; + if (player->particlePool2[arg4].isAlive == 1) { + sp9C[0] = player->particlePool2[arg4].pos[0]; + sp9C[1] = player->particlePool2[arg4].pos[1]; + sp9C[2] = player->particlePool2[arg4].pos[2]; sp94[0] = 0; - sp94[1] = player->unk_258[20 + arg4].unk_020; + sp94[1] = player->particlePool2[arg4].unk_020; sp94[2] = 0; func_800652D4(sp9C, sp94, player->size * arg2); gSPDisplayList(gDisplayListHead++, D_0D008C90); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTOnomatopoeia); gDPSetTextureLUT(gDisplayListHead++, G_TT_RGBA16); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4AC, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaWhrrrr1, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(gDisplayListHead++, D_800E8840, 4, 0); gSPDisplayList(gDisplayListHead++, common_square_plain_render); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4B0, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaWhrrrr2, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(gDisplayListHead++, D_800E8800, 4, 0); @@ -5485,7 +5475,7 @@ void func_80067964(Player* player, UNUSED s8 arg1, f32 arg2, UNUSED s8 arg3, s8 } } -void func_80067D3C(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32 arg5) { +void render_player_speech_bubble(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32 arg5) { Vec3f sp7C; Vec3s sp74; f32 sp54[8] = { 0.0f, -1.2f, 0.1f, 1.2f, -1.7f, -0.8f, -0.2f, -1.9f }; @@ -5495,14 +5485,14 @@ void func_80067D3C(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32 s16 blue = ((arg5 >> 0x00) & 0xFF) & 0xFF; // ???????????????????????????????????????? - if (player->unk_258[20 + arg3].unk_01C == 1) { + if (player->particlePool2[arg3].isAlive == 1) { sp74[0] = 0; sp74[1] = player->unk_048[arg1]; sp74[2] = 0; sp7C[0] = player->pos[0] + (sins((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4); sp7C[1] = player->pos[1] + player->boundingBoxSize - sp54[player->characterId] - 2.0f; sp7C[2] = player->pos[2] + (coss((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4); - func_800652D4(sp7C, sp74, player->unk_258[20 + arg3].unk_00C * player->size); + func_800652D4(sp7C, sp74, player->particlePool2[arg3].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPLoadTextureBlock(gDisplayListHead++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -5513,7 +5503,7 @@ void func_80067D3C(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32 } } -void func_8006801C(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32 arg5) { +void render_music_note(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32 arg5) { Vec3f sp7C; Vec3s sp74; f32 sp54[8] = { -0.7f, -1.9f, -0.6f, 0.4f, -2.5f, -1.6f, -0.95f, -2.7f }; @@ -5523,14 +5513,14 @@ void func_8006801C(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32 s16 blue = ((arg5 >> 0x00) & 0xFF) & 0xFF; // ???????????????????????????????????????? - if (player->unk_258[20 + arg3].unk_01C == 1) { + if (player->particlePool2[arg3].isAlive == 1) { sp74[0] = 0; sp74[1] = player->unk_048[arg1]; sp74[2] = 0; sp7C[0] = player->pos[0] + (sins((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4); sp7C[1] = player->pos[1] + player->boundingBoxSize - sp54[player->characterId] - 2.0f; sp7C[2] = player->pos[2] + (coss((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4); - func_800652D4(sp7C, sp74, player->unk_258[20 + arg3].unk_00C * player->size * 0.8); + func_800652D4(sp7C, sp74, player->particlePool2[arg3].scale * player->size * 0.8); gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPLoadTextureBlock(gDisplayListHead++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -5541,28 +5531,28 @@ void func_8006801C(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32 } } -void func_80068310(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4) { +void render_player_onomatopoeia_crash(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4) { UNUSED s32 stackPadding[16]; // huh? Vec3f sp9C; Vec3s sp94; - if (player->unk_258[20 + arg4].unk_01C == 1) { - sp9C[1] = player->unk_258[20 + arg4].unk_000[1]; + if (player->particlePool2[arg4].isAlive == 1) { + sp9C[1] = player->particlePool2[arg4].pos[1]; sp9C[2] = player->pos[2] + (coss(player->unk_048[arg3]) * -10.0f); sp9C[0] = player->pos[0] + (sins(player->unk_048[arg3]) * -10.0f); sp94[0] = 0; sp94[1] = player->unk_048[arg3]; sp94[2] = 0; - func_800652D4(sp9C, sp94, player->unk_258[20 + arg4].unk_00C * player->size); + func_800652D4(sp9C, sp94, player->particlePool2[arg4].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008C90); gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTOnomatopoeia); gDPSetTextureLUT(gDisplayListHead++, G_TT_RGBA16); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4B4, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaCrash1, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(gDisplayListHead++, D_800E8880, 4, 0); gSPDisplayList(gDisplayListHead++, common_square_plain_render); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4B8, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaCrash2, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(gDisplayListHead++, D_800E88C0, 4, 0); @@ -5576,23 +5566,23 @@ void func_80068724(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 Vec3f sp84; Vec3s sp7C; - if (player->unk_258[20 + arg4].unk_01C == 1) { + if (player->particlePool2[arg4].isAlive == 1) { sp84[1] = player->pos[1] - 3.0f; sp84[2] = player->pos[2] + (coss(player->unk_048[arg3]) * -10.0f); sp84[0] = player->pos[0] + (sins(player->unk_048[arg3]) * -10.0f); sp7C[0] = 0; sp7C[1] = player->unk_048[arg3]; sp7C[2] = 0; - func_800652D4(sp84, sp7C, player->unk_258[20 + arg4].unk_00C * player->size); + func_800652D4(sp84, sp7C, player->particlePool2[arg4].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4C4, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt0, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(gDisplayListHead++, D_800E8A00, 4, 0); gSPDisplayList(gDisplayListHead++, common_square_plain_render); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4C8, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt1, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(gDisplayListHead++, D_800E8A40, 4, 0); @@ -5601,7 +5591,7 @@ void func_80068724(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 } } -void func_80068AA4(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4) { +void render_player_onomatopoeia_boing(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4) { Vec3f sp64; Vec3s sp5C; @@ -5609,16 +5599,18 @@ void func_80068AA4(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 sp64[2] = player->pos[2]; sp64[0] = player->pos[0]; - if ((player->unk_258[20 + arg4].unk_01C == 1) && (player->animFrameSelector[arg3] < 0xD)) { + if ((player->particlePool2[arg4].isAlive == 1) && (player->animFrameSelector[arg3] < 0xD)) { if (gTickVisuals) { sp64[1] = player->pos[1] - 3.0f; - sp64[2] = player->pos[2] + ((-2.5 * player->unk_258[20 + arg4].unk_01E) * coss(player->unk_048[arg3])); - sp64[0] = player->pos[0] + ((-2.5 * player->unk_258[20 + arg4].unk_01E) * sins(player->unk_048[arg3])); + sp64[2] = + player->pos[2] + ((-2.5 * player->particlePool2[arg4].unk_01E) * coss(player->unk_048[arg3])); + sp64[0] = + player->pos[0] + ((-2.5 * player->particlePool2[arg4].unk_01E) * sins(player->unk_048[arg3])); } sp5C[0] = 0; sp5C[1] = player->unk_048[arg3]; sp5C[2] = 0; - func_800652D4(sp64, sp5C, player->unk_258[20 + arg4].unk_00C * player->size); + func_800652D4(sp64, sp5C, player->particlePool2[arg4].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008D58); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); gDPLoadTextureBlock(gDisplayListHead++, D_8018D4A0, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 32, 0, @@ -5632,27 +5624,27 @@ void func_80068AA4(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 } } -void func_80068DA0(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4) { +void render_player_onomatopoeia_pomp(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4) { Vec3f sp9C; Vec3s sp94; - if ((player->unk_258[20 + arg4].unk_01C == 1) && ((s32) player->animFrameSelector[arg3] < 0xD)) { - sp9C[1] = (player->pos[1] - 3.0f) + player->unk_258[20 + arg4].unk_000[1]; + if ((player->particlePool2[arg4].isAlive == 1) && ((s32) player->animFrameSelector[arg3] < 0xD)) { + sp9C[1] = (player->pos[1] - 3.0f) + player->particlePool2[arg4].pos[1]; sp9C[2] = player->pos[2] + (coss(player->unk_048[arg3]) * -10.0f); sp9C[0] = player->pos[0] + (sins(player->unk_048[arg3]) * -10.0f); sp94[0] = 0; sp94[1] = player->unk_048[arg3]; sp94[2] = 0; - func_800652D4(sp9C, sp94, player->unk_258[20 + arg4].unk_00C * player->size); + func_800652D4(sp9C, sp94, player->particlePool2[arg4].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008C90); gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTOnomatopoeia); gDPSetTextureLUT(gDisplayListHead++, G_TT_RGBA16); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4A4, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaPoomp1, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(gDisplayListHead++, D_800E8B80, 4, 0); gSPDisplayList(gDisplayListHead++, common_square_plain_render); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D4A8, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaPoomp2, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(gDisplayListHead++, D_800E8BC0, 4, 0); @@ -5666,20 +5658,19 @@ void func_800691B8(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { Vec3s sp54; s16 alpha; - if (player->unk_258[30 + arg2].unk_01C == 1) { - alpha = player->unk_258[30 + arg2].unk_03E; - sp5C[0] = player->unk_258[30 + arg2].unk_000[0]; - sp5C[1] = player->unk_258[30 + arg2].unk_000[1]; - sp5C[2] = player->unk_258[30 + arg2].unk_000[2]; + if (player->particlePool3[arg2].isAlive == 1) { + alpha = player->particlePool3[arg2].alpha; + sp5C[0] = player->particlePool3[arg2].pos[0]; + sp5C[1] = player->particlePool3[arg2].pos[1]; + sp5C[2] = player->particlePool3[arg2].pos[2]; sp54[0] = 0; sp54[1] = player->unk_048[arg3]; - player->unk_258[30 + arg2].unk_03A += 0x1C71; - sp54[2] = player->unk_258[30 + arg2].unk_03A; - + player->particlePool3[arg2].green += 0x1C71; + sp54[2] = player->particlePool3[arg2].green; func_800652D4(sp5C, sp54, player->size * 0.5); gSPDisplayList(gDisplayListHead++, D_0D008D58); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D488, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTexture69C80C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B35C(0xFF, 0xFF, 0, alpha); @@ -5701,25 +5692,25 @@ void func_80069444(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { s16 envGreen; s16 envBlue; u16 test; - if (player->unk_258[30 + arg2].unk_01C == 1) { - primRed = (D_800E47DC[player->unk_258[30 + arg2].unk_038] >> 0x10) & 0xFF; - primGreen = (D_800E47DC[player->unk_258[30 + arg2].unk_038] >> 8) & 0xFF; - primBlue = D_800E47DC[player->unk_258[30 + arg2].unk_038] & 0xFF; + if (player->particlePool3[arg2].isAlive == 1) { + primRed = (D_800E47DC[player->particlePool3[arg2].red] >> 0x10) & 0xFF; + primGreen = (D_800E47DC[player->particlePool3[arg2].red] >> 8) & 0xFF; + primBlue = D_800E47DC[player->particlePool3[arg2].red] & 0xFF; - envRed = (D_800E480C[player->unk_258[30 + arg2].unk_038] >> 0x10) & 0xFF; - envGreen = (D_800E480C[player->unk_258[30 + arg2].unk_038] >> 8) & 0xFF; - envBlue = D_800E480C[player->unk_258[30 + arg2].unk_038] & 0xFF; - primAlpha = player->unk_258[30 + arg2].unk_03E; + envRed = (D_800E480C[player->particlePool3[arg2].red] >> 0x10) & 0xFF; + envGreen = (D_800E480C[player->particlePool3[arg2].red] >> 8) & 0xFF; + envBlue = D_800E480C[player->particlePool3[arg2].red] & 0xFF; + primAlpha = player->particlePool3[arg2].alpha; - sp74[0] = player->unk_258[30 + arg2].unk_000[0]; - sp74[1] = player->unk_258[30 + arg2].unk_000[1]; - sp74[2] = player->unk_258[30 + arg2].unk_000[2]; + sp74[0] = player->particlePool3[arg2].pos[0]; + sp74[1] = player->particlePool3[arg2].pos[1]; + sp74[2] = player->particlePool3[arg2].pos[2]; sp6C[0] = 0; sp6C[1] = player->unk_048[arg3]; sp6C[2] = 0; func_800652D4(sp74, sp6C, player->size * 1.5); gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D494, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gGroundDust, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); // `test` MUST be a u16 @@ -5733,16 +5724,16 @@ void func_80069444(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { } } -void func_800696CC(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3, f32 arg4) { +void render_wall_bonk_star_particles(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3, f32 arg4) { Vec3f sp5C; Vec3s sp54; s16 alpha; - if (player->unk_258[30 + arg2].unk_01C == 1) { - alpha = player->unk_258[30 + arg2].unk_03E; - sp5C[0] = player->unk_258[30 + arg2].unk_000[0]; - sp5C[1] = player->unk_258[30 + arg2].unk_000[1]; - sp5C[2] = player->unk_258[30 + arg2].unk_000[2]; + if (player->particlePool3[arg2].isAlive == 1) { + alpha = player->particlePool3[arg2].alpha; + sp5C[0] = player->particlePool3[arg2].pos[0]; + sp5C[1] = player->particlePool3[arg2].pos[1]; + sp5C[2] = player->particlePool3[arg2].pos[2]; sp54[0] = 0; sp54[1] = player->unk_048[arg3]; sp54[2] = 0; @@ -5750,7 +5741,7 @@ void func_800696CC(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3, f32 arg4) func_800652D4(sp5C, sp54, player->size * arg4); gSPDisplayList(gDisplayListHead++, D_0D008D58); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D488, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTexture69C80C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B35C(0x000000FF, 0x000000FF, 0, alpha); @@ -5766,19 +5757,18 @@ void func_80069938(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { Vec3s sp54; s16 alpha; - if (player->unk_258[30 + arg2].unk_01C == 1) { - alpha = player->unk_258[30 + arg2].unk_03E; - sp5C[0] = player->unk_258[30 + arg2].unk_000[0]; - sp5C[1] = player->unk_258[30 + arg2].unk_000[1]; - sp5C[2] = player->unk_258[30 + arg2].unk_000[2]; + if (player->particlePool3[arg2].isAlive == 1) { + alpha = player->particlePool3[arg2].alpha; + sp5C[0] = player->particlePool3[arg2].pos[0]; + sp5C[1] = player->particlePool3[arg2].pos[1]; + sp5C[2] = player->particlePool3[arg2].pos[2]; sp54[0] = 0; sp54[1] = player->unk_048[arg3]; - sp54[2] = player->unk_258[30 + arg2].unk_038; - - func_800652D4(sp5C, sp54, player->unk_258[30 + arg2].unk_00C * player->size); + sp54[2] = player->particlePool3[arg2].red; + func_800652D4(sp5C, sp54, player->particlePool3[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008D58); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D488, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, gTexture69C80C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B35C(0x000000FF, 0x000000FF, 0, alpha); @@ -5797,18 +5787,18 @@ void func_80069BA8(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { s16 blue; s16 alpha; - if (player->unk_258[30 + arg2].unk_01C == 1) { - red = player->unk_258[30 + arg2].unk_038; - green = player->unk_258[30 + arg2].unk_03A; - blue = player->unk_258[30 + arg2].unk_03C; - alpha = player->unk_258[30 + arg2].unk_03E; - sp54[0] = player->unk_258[30 + arg2].unk_000[0]; - sp54[1] = player->unk_258[30 + arg2].unk_000[1]; - sp54[2] = player->unk_258[30 + arg2].unk_000[2]; + if (player->particlePool3[arg2].isAlive == 1) { + red = player->particlePool3[arg2].red; + green = player->particlePool3[arg2].green; + blue = player->particlePool3[arg2].blue; + alpha = player->particlePool3[arg2].alpha; + sp54[0] = player->particlePool3[arg2].pos[0]; + sp54[1] = player->particlePool3[arg2].pos[1]; + sp54[2] = player->particlePool3[arg2].pos[2]; sp4C[0] = 0; sp4C[1] = player->unk_048[arg3]; sp4C[2] = 0; - func_800652D4(sp54, sp4C, player->unk_258[30 + arg2].unk_00C * player->size); + func_800652D4(sp54, sp4C, player->particlePool3[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008DB8); gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, @@ -5824,14 +5814,14 @@ void func_80069DB8(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { Vec3s sp54; UNUSED s32 stackPadding[2]; - if (player->unk_258[30 + arg2].unk_01C == 1) { - sp5C[0] = player->unk_258[30 + arg2].unk_000[0]; - sp5C[1] = player->unk_258[30 + arg2].unk_000[1]; - sp5C[2] = player->unk_258[30 + arg2].unk_000[2]; + if (player->particlePool3[arg2].isAlive == 1) { + sp5C[0] = player->particlePool3[arg2].pos[0]; + sp5C[1] = player->particlePool3[arg2].pos[1]; + sp5C[2] = player->particlePool3[arg2].pos[2]; sp54[0] = 0; sp54[1] = player->unk_048[arg3]; sp54[2] = 0; - func_800652D4(sp5C, sp54, player->unk_258[30 + arg2].unk_00C * player->size); + func_800652D4(sp5C, sp54, player->particlePool3[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008D58); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); gDPLoadTextureBlock(gDisplayListHead++, D_8018D49C, G_IM_FMT_IA, G_IM_SIZ_16b, 16, 16, 0, @@ -5849,14 +5839,14 @@ void func_8006A01C(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { Vec3f sp54; Vec3s sp4C; - if (player->unk_258[arg2].unk_01C == 1) { - sp54[0] = player->unk_258[10 + arg2].unk_000[0]; - sp54[1] = player->unk_258[10 + arg2].unk_000[1]; - sp54[2] = player->unk_258[10 + arg2].unk_000[2]; + if (player->particlePool0[arg2].isAlive == 1) { + sp54[0] = player->particlePool1[arg2].pos[0]; + sp54[1] = player->particlePool1[arg2].pos[1]; + sp54[2] = player->particlePool1[arg2].pos[2]; sp4C[0] = 0; sp4C[1] = player->unk_048[arg3]; sp4C[2] = 0; - func_800652D4(sp54, sp4C, player->unk_258[10 + arg2].unk_00C * player->size); + func_800652D4(sp54, sp4C, player->particlePool1[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008D58); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); @@ -5878,22 +5868,22 @@ void func_8006A280(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { s16 green; s16 blue; - if (player->unk_258[arg2].unk_01C == 1) { - red = player->unk_258[arg2].unk_038; - green = player->unk_258[arg2].unk_03A; - blue = player->unk_258[arg2].unk_03C; - sp5C[0] = player->unk_258[arg2].unk_000[0]; - sp5C[1] = player->unk_258[arg2].unk_000[1]; - sp5C[2] = player->unk_258[arg2].unk_000[2]; + if (player->particlePool0[arg2].isAlive == 1) { + red = player->particlePool0[arg2].red; + green = player->particlePool0[arg2].green; + blue = player->particlePool0[arg2].blue; + sp5C[0] = player->particlePool0[arg2].pos[0]; + sp5C[1] = player->particlePool0[arg2].pos[1]; + sp5C[2] = player->particlePool0[arg2].pos[2]; sp54[0] = 0; sp54[1] = player->unk_048[arg3]; sp54[2] = 0; - func_800652D4(sp5C, sp54, player->unk_258[arg2].unk_00C * player->size); + func_800652D4(sp5C, sp54, player->particlePool0[arg2].scale * player->size); gSPDisplayList(gDisplayListHead++, D_0D008D58); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); - gDPLoadTextureBlock_4b(gDisplayListHead++, *D_800E47A0[player->unk_258[arg2].unk_01E], G_IM_FMT_I, 64, 64, 0, - G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, - G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock_4b(gDisplayListHead++, *D_800E47A0[player->particlePool0[arg2].unk_01E], G_IM_FMT_I, + 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, + G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B414(red, green, blue, 0x000000FF); gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); gSPVertex(gDisplayListHead++, D_800E8780, 4, 0); @@ -5902,7 +5892,7 @@ void func_8006A280(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) { } } -void func_8006A50C(Player* player, f32 arg1, f32 arg2, s8 arg3, s8 arg4, s16 arg5) { +void init_balloon(Player* player, f32 arg1, f32 arg2, s8 arg3, s8 arg4, s16 arg5) { f32 someX; f32 someY; f32 someZ; @@ -5918,9 +5908,9 @@ void func_8006A50C(Player* player, f32 arg1, f32 arg2, s8 arg3, s8 arg4, s16 arg D_8018D830[arg3][arg4] = 1; D_8018D620[arg3][arg4] = -player->rotation[1] - player->unk_0C0; func_80062B18(&someX, &someY, &someZ, arg1, 4.0f, arg2 + -3.8, -player->rotation[1], 0); - D_8018D4D0[arg3][arg4] = player->pos[0] + someX; - D_8018D590[arg3][arg4] = player->pos[2] + someZ; - D_8018D530[arg3][arg4] = (player->pos[1] - player->boundingBoxSize) + someY; + gPlayerBalloonPosX[arg3][arg4] = player->pos[0] + someX; + gPlayerBalloonPosZ[arg3][arg4] = player->pos[2] + someZ; + gPlayerBalloonPosY[arg3][arg4] = (player->pos[1] - player->boundingBoxSize) + someY; gPlayerBalloonStatus[arg3][arg4] |= 1; D_8018D860[arg3][arg4] = arg5; D_8018D890[arg3][arg4] = 0; @@ -5997,17 +5987,17 @@ void func_8006A7C0(Player* player, f32 arg1, f32 arg2, s8 arg3, s8 arg4) { func_80062B18(&someX, &someY, &someZ, arg1, sp80[player->characterId] - D_8018D710[arg3][arg4], arg2 + -3.2 + (sp6C * 1), -D_8018D620[arg3][arg4], -player->unk_206 * 2); if ((gPlayerBalloonStatus[arg3][arg4] & 2) != 2) { - D_8018D530[arg3][arg4] = (player->pos[1] - player->boundingBoxSize) + someY; - D_8018D4D0[arg3][arg4] = player->pos[0] + someX; - D_8018D590[arg3][arg4] = player->pos[2] + someZ; - D_8018D8D0[arg3][arg4] = 0; + gPlayerBalloonPosY[arg3][arg4] = (player->pos[1] - player->boundingBoxSize) + someY; + gPlayerBalloonPosX[arg3][arg4] = player->pos[0] + someX; + gPlayerBalloonPosZ[arg3][arg4] = player->pos[2] + someZ; + gPlayerBalloonDepartingTimer[arg3][arg4] = 0; } else { - D_8018D530[arg3][arg4] += 0.2; - D_8018D8D0[arg3][arg4] += 1; + gPlayerBalloonPosY[arg3][arg4] += 0.2; + gPlayerBalloonDepartingTimer[arg3][arg4] += 1; move_s16_towards(&D_8018D890[arg3][arg4], 0, 0.1f); move_s16_towards(&D_8018D860[arg3][arg4], 0, 0.1f); - if (D_8018D8D0[arg3][arg4] >= 0x78) { - func_8006B974((s32) player, arg3, arg4); + if (gPlayerBalloonDepartingTimer[arg3][arg4] >= 0x78) { + set_player_balloon_to_gone((s32) player, arg3, arg4); } } } @@ -6062,9 +6052,9 @@ void render_battle_balloon(Player* player, s8 arg1, s16 arg2, s8 arg3) { var_f20 = 0.3f; } } - sp134[0] = D_8018D4D0[arg1][arg2]; - sp134[1] = D_8018D530[arg1][arg2]; - sp134[2] = D_8018D590[arg1][arg2]; + sp134[0] = gPlayerBalloonPosX[arg1][arg2]; + sp134[1] = gPlayerBalloonPosY[arg1][arg2]; + sp134[2] = gPlayerBalloonPosZ[arg1][arg2]; sp12C[0] = -((D_8018D890[arg1][arg2] * 4) * coss(temp_t1)); sp12C[1] = player->unk_048[arg3]; sp12C[2] = D_8018D7D0[arg1][arg2] - (D_8018D860[arg1][arg2] * coss(temp_t1)) - @@ -6109,20 +6099,20 @@ void render_battle_balloon(Player* player, s8 arg1, s16 arg2, s8 arg3) { gMatrixEffectCount++; } -void func_8006B7E4(Player* player, s8 arg1) { - func_8006A50C(player, 0.0f, 0.0f, arg1, (s8) 0, (s16) 0); - func_8006A50C(player, 1.5f, 2.0f, arg1, (s8) 1, (s16) 0x1C70); - func_8006A50C(player, -1.5f, 2.0f, arg1, (s8) 2, (s16) -0x1C70); +void init_all_player_balloons(Player* player, s8 arg1) { + init_balloon(player, 0.0f, 0.0f, arg1, (s8) 0, (s16) 0); + init_balloon(player, 1.5f, 2.0f, arg1, (s8) 1, (s16) 0x1C70); + init_balloon(player, -1.5f, 2.0f, arg1, (s8) 2, (s16) -0x1C70); gPlayerBalloonCount[arg1] = 2; } -void func_8006B87C(UNUSED Player* player, s8 playerIndex) { +void clear_all_player_balloons(UNUSED Player* player, s8 playerIndex) { gPlayerBalloonStatus[playerIndex][0] = BALLOON_STATUS_GONE; gPlayerBalloonStatus[playerIndex][1] = BALLOON_STATUS_GONE; gPlayerBalloonStatus[playerIndex][2] = BALLOON_STATUS_GONE; } -void func_8006B8B4(Player* player, s8 playerIndex) { +void pop_player_balloon(Player* player, s8 playerIndex) { if (gPlayerBalloonCount[playerIndex] >= 0) { gPlayerBalloonStatus[playerIndex][gPlayerBalloonCount[playerIndex]] &= ~1; gPlayerBalloonStatus[playerIndex][gPlayerBalloonCount[playerIndex]] |= 2; @@ -6134,7 +6124,7 @@ void func_8006B8B4(Player* player, s8 playerIndex) { } } -void func_8006B974(UNUSED s32 arg0, s8 playerIndex, s8 balloonIndex) { +void set_player_balloon_to_gone(UNUSED s32 arg0, s8 playerIndex, s8 balloonIndex) { if (gPlayerBalloonCount[playerIndex] >= 0) { gPlayerBalloonStatus[playerIndex][balloonIndex] = BALLOON_STATUS_GONE; } @@ -6279,8 +6269,9 @@ void func_8006C294(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha) { func_800652D4(sp5C, sp54, arg1); gSPDisplayList(gDisplayListHead++, D_0D008D58); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D488, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, - G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gDisplayListHead++, gTexture69C80C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, + G_TX_NOLOD); func_8004B35C(red, green, blue, alpha); gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); gSPVertex(gDisplayListHead++, D_800E87C0, 4, 0); @@ -6313,56 +6304,57 @@ void func_8006C4D4(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha, s16 arg4) { gMatrixEffectCount += 1; } -void func_8006C6AC(Player* player, s16 arg1, s8 arg2, s8 arg3) { +void func_8006C6AC(Player* player, s16 particleIndex, s8 arg2, s8 arg3) { s8 arg2_copy = arg2; s32 sp28; - sp28 = arg1 - 1; + sp28 = particleIndex - 1; if (sp28 < 0) { sp28 = 9; } - if (player->unk_258[10 + arg1].unk_01C == 1) { - switch (player->unk_258[10 + arg1].unk_012) { + if (player->particlePool1[particleIndex].isAlive == 1) { + switch (player->particlePool1[particleIndex].type) { case 1: - func_80063408(player, arg1, arg2_copy, arg3); + func_80063408(player, particleIndex, arg2_copy, arg3); break; case 2: - func_800635D4(player, arg1, arg2_copy, arg3); + func_800635D4(player, particleIndex, arg2_copy, arg3); break; case 3: - func_80063BD4(player, arg1, arg2_copy, arg3); + func_80063BD4(player, particleIndex, arg2_copy, arg3); break; case 4: - func_800643A8(player, arg1, arg2_copy, arg3); + func_800643A8(player, particleIndex, arg2_copy, arg3); break; case 5: - func_800639DC(player, arg1, arg2_copy, arg3); + func_800639DC(player, particleIndex, arg2_copy, arg3); break; case 9: - func_80063D58(player, arg1, arg2_copy, arg3); + func_80063D58(player, particleIndex, arg2_copy, arg3); break; case 11: - func_80062F98(player, arg1, arg2_copy, arg3); + func_80062F98(player, particleIndex, arg2_copy, arg3); break; default: break; } } else { if (player->unk_0DE & 1) { - func_80060BCC(player, arg1, sp28, arg2_copy, arg3); + func_80060BCC(player, particleIndex, sp28, arg2_copy, arg3); } else if (!(player->effects & 8) && !(player->effects & 2)) { - if (((player->effects & 0x10) == 0x10) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { - func_8005DA30(player, arg1, sp28, arg2_copy, arg3); + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && + ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { + check_drift_particles_setup_valid(player, particleIndex, sp28, arg2_copy, arg3); } else if (((f64) (D_801652A0[arg2_copy] - player->tyres[BACK_RIGHT].baseHeight) >= 3.5) || ((f64) (D_801652A0[arg2_copy] - player->tyres[BACK_LEFT].baseHeight) >= 3.5)) { - func_8005EA94(player, arg1, sp28, arg2_copy, arg3); + func_8005EA94(player, particleIndex, sp28, arg2_copy, arg3); } else if (((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40)) { - func_8005F90C(player, arg1, sp28, arg2_copy, arg3); + func_8005F90C(player, particleIndex, sp28, arg2_copy, arg3); } else if (((player->effects & 0x4000) && !(player->type & PLAYER_START_SEQUENCE)) || (player->effects & 0x800) || (player->effects & 0x20) || (player->unk_044 & 0x4000)) { - func_8005ED48(player, arg1, sp28, arg2_copy, arg3); + func_8005ED48(player, particleIndex, sp28, arg2_copy, arg3); } else { - func_8005DAF4(player, arg1, sp28, arg2_copy, arg3); + setup_tyre_particles(player, particleIndex, sp28, arg2_copy, arg3); } } } @@ -6375,8 +6367,8 @@ void func_8006C9B8(Player* player, s16 arg1, s8 arg2, s8 arg3) { if (sp28 < 0) { sp28 = 9; } - if (player->unk_258[30 + arg1].unk_01C == 1) { - switch (player->unk_258[30 + arg1].unk_012) { + if (player->particlePool3[arg1].isAlive == 1) { + switch (player->particlePool3[arg1].type) { case 1: func_800644E8(player, arg1, arg2, arg3); break; @@ -6436,7 +6428,7 @@ void func_8006C9B8(Player* player, s16 arg1, s8 arg2, s8 arg3) { player->unk_044 &= ~0x0100; return; } - if ((player->effects & STAR_EFFECT) && ((((s32) gCourseTimer) - D_8018D930[arg2]) < 9)) { + if ((player->effects & STAR_EFFECT) && ((((s32) gCourseTimer) - gPlayerStarEffectStartTime[arg2]) < 9)) { func_800615AC(player, arg1, sp28, arg2, arg3); player->unk_046 &= ~0x0008; player->unk_044 &= ~0x0100; @@ -6477,8 +6469,8 @@ void func_8006CEC0(Player* arg0, s16 arg1, s8 arg2, s8 arg3) { if (--sp20 < 0) { sp20 = 9; } - if (arg0->unk_258[arg1].unk_01C == 1) { - switch (arg0->unk_258[arg1].unk_012) { + if (arg0->particlePool0[arg1].isAlive == 1) { + switch (arg0->particlePool0[arg1].type) { case 1: func_80062C74(arg0, arg1, arg2, arg3); break; @@ -6486,7 +6478,7 @@ void func_8006CEC0(Player* arg0, s16 arg1, s8 arg2, s8 arg3) { func_80064184(arg0, arg1, arg2, arg3); break; case 5: - func_800630C0(arg0, arg1, arg2, arg3); + set_oob_splash_particle_position(arg0, arg1, arg2, arg3); break; case 6: func_800631A8(arg0, arg1, arg2, arg3); @@ -6537,8 +6529,8 @@ void func_8006CEC0(Player* arg0, s16 arg1, s8 arg2, s8 arg3) { } void func_8006D194(Player* player, s8 arg1, s8 arg2) { - if (player->unk_258[0x14].unk_01C == 1) { - switch (player->unk_258[0x14].unk_012) { + if (player->particlePool0[0x14].isAlive == 1) { + switch (player->particlePool0[0x14].type) { case 2: func_80064DEC(player, arg1, arg2, 0); break; @@ -6572,8 +6564,8 @@ void func_8006D194(Player* player, s8 arg1, s8 arg2) { func_800629BC(player, arg1, arg2, 0); } } - if (player->unk_258[0x15].unk_01C == 1) { - if (player->unk_258[0x15].unk_012 == 5) { + if (player->particlePool0[0x15].isAlive == 1) { + if (player->particlePool0[0x15].type == 5) { func_800651F4(player, arg1, arg2, 1); } } else if ((player->unk_0B6 & 0x20) == 0x20) { @@ -6587,8 +6579,7 @@ void func_8006D474(Player* player, s8 playerId, s8 screenId) { for (var_s2 = 0; var_s2 < 10; var_s2++) { // @port: Tag the transform. FrameInterpolation_RecordOpenChild("SmokeDust", TAG_SMOKE_DUST((playerId << 8) + var_s2)); - - switch (player->unk_258[var_s2].unk_012) { + switch (player->particlePool0[var_s2].type) { case 1: if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { if (screenId == playerId) { @@ -6610,7 +6601,7 @@ void func_8006D474(Player* player, s8 playerId, s8 screenId) { } FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordOpenChild("SmokeDust", TAG_SMOKE_DUST((playerId << 8) + var_s2 + 30)); - switch (player->unk_258[var_s2 + 30].unk_012) { + switch (player->particlePool3[var_s2].type) { case 1: case 9: if (gActiveScreenMode == SCREEN_MODE_1P) { @@ -6621,9 +6612,11 @@ void func_8006D474(Player* player, s8 playerId, s8 screenId) { break; case 2: if (gActiveScreenMode == SCREEN_MODE_1P) { - func_800696CC(player, playerId, var_s2, screenId, player->unk_258[var_s2 + 30].unk_00C); + render_wall_bonk_star_particles(player, playerId, var_s2, screenId, + player->particlePool3[var_s2].scale); } else if (screenId == playerId) { - func_800696CC(player, playerId, var_s2, screenId, player->unk_258[var_s2 + 30].unk_00C); + render_wall_bonk_star_particles(player, playerId, var_s2, screenId, + player->particlePool3[var_s2].scale); } break; case 3: @@ -6663,34 +6656,34 @@ void func_8006D474(Player* player, s8 playerId, s8 screenId) { break; case 8: if (gActiveScreenMode == SCREEN_MODE_1P) { - func_80067604(player, playerId, var_s2, screenId); + render_player_boost_spark_particles(player, playerId, var_s2, screenId); } else if (screenId == playerId) { - func_80067604(player, playerId, var_s2, screenId); + render_player_boost_spark_particles(player, playerId, var_s2, screenId); } break; } FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordOpenChild("SmokeDust", TAG_SMOKE_DUST((playerId << 8) + var_s2 + 10)); - switch (player->unk_258[var_s2 + 10].unk_012) { - case 1: + switch (player->particlePool1[var_s2].type) { + case DRIFT_PARTICLE: if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { if (screenId == playerId) { - func_80065AB0(player, playerId, var_s2, screenId); + render_player_drift_particles(player, playerId, var_s2, screenId); } } else { - func_80065AB0(player, playerId, var_s2, screenId); + render_player_drift_particles(player, playerId, var_s2, screenId); } break; - case 2: - case 3: + case GROUND_PARTICLE: + case GRASS_PARTICLE: case 4: case 5: if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { if (screenId == playerId) { - func_80065F0C(player, playerId, var_s2, screenId); + render_player_ground_particles(player, playerId, var_s2, screenId); } } else { - func_80065F0C(player, playerId, var_s2, screenId); + render_player_ground_particles(player, playerId, var_s2, screenId); } break; case 9: @@ -6728,7 +6721,7 @@ void func_8006DC54(Player* player, s8 arg1, s8 arg2) { bitwiseMask = 8 << (arg2 * 4); if (bitwiseMask == (player->unk_002 & bitwiseMask)) { for (i = 0; i < 10; i++) { - if (player->unk_258[i].unk_012 == 7) { + if (player->particlePool0[i].type == 7) { func_800658A0(player, arg1, i, arg2); } } @@ -6742,7 +6735,7 @@ void func_8006DD3C(Player* player, s8 playerId, s8 arg2) { temp_v0 = 8 << (arg2 * 4); if (temp_v0 == (player->unk_002 & temp_v0)) { for (temp_s0 = 0; temp_s0 < 10; ++temp_s0) { - temp_v0 = player->unk_258[temp_s0].unk_012; + temp_v0 = player->particlePool0[temp_s0].type; if (temp_v0 != 3) { if (temp_v0 == 5) { func_8006A280(player, playerId, temp_s0, arg2); @@ -6758,27 +6751,27 @@ void func_8006DD3C(Player* player, s8 playerId, s8 arg2) { if (((player->type & 0x4000) == 0x4000) && (arg2 == playerId)) { FrameInterpolation_RecordOpenChild("onomatopoeia", TAG_SMOKE_DUST((playerId << 8) + 20)); - switch (player->unk_258[20].unk_012) { + switch (player->particlePool2[0].type) { case 2: - func_80068310(player, playerId, player->unk_258[20].unk_00C, arg2, 0); + render_player_onomatopoeia_crash(player, playerId, player->particlePool2[0].scale, arg2, 0); break; case 3: - func_80067964(player, playerId, player->unk_258[20].unk_00C, arg2, 0); + render_player_onomatopoeia_whrrrr(player, playerId, player->particlePool2[0].scale, arg2, 0); break; case 4: - func_80068724(player, playerId, player->unk_258[20].unk_00C, arg2, 0); + func_80068724(player, playerId, player->particlePool2[0].scale, arg2, 0); break; case 5: - func_80068AA4(player, playerId, player->unk_258[20].unk_00C, arg2, 0); + render_player_onomatopoeia_boing(player, playerId, player->particlePool2[0].scale, arg2, 0); break; case 6: - func_80068DA0(player, playerId, player->unk_258[20].unk_00C, arg2, 0); + render_player_onomatopoeia_pomp(player, playerId, player->particlePool2[0].scale, arg2, 0); break; } FrameInterpolation_RecordCloseChild(); - if (player->unk_258[21].unk_012 == 5) { - func_80067D3C(player, arg2, D_8018D480, 1, 1.6f, 0xFFFFFF); - func_8006801C(player, arg2, D_8018D484, 1, 1.6f, 0xFF); + if (player->particlePool2[1].type == 5) { + render_player_speech_bubble(player, arg2, D_8018D480, 1, 1.6f, 0xFFFFFF); + render_music_note(player, arg2, D_8018D484, 1, 1.6f, 0xFF); } } } diff --git a/src/code_80057C60.h b/src/code_80057C60.h index 515378aa1..8a91bd889 100644 --- a/src/code_80057C60.h +++ b/src/code_80057C60.h @@ -1,6 +1,10 @@ #ifndef CODE_80057C60_H #define CODE_80057C60_H +#ifdef __cplusplus +extern "C" { +#endif + #include #include "objects.h" #include "camera.h" @@ -116,16 +120,16 @@ void func_8005D18C(void); void func_8005D1F4(s32); void func_8005D290(void); -void func_8005D6C0(Player*); -void func_8005D794(Player*, UnkPlayerStruct258*, f32, f32, f32, s8, s8); -s32 func_8005D7D8(UnkPlayerStruct258*, s8, f32); -s32 func_8005D800(UnkPlayerStruct258*, s32, s16); -s32 func_8005D82C(UnkPlayerStruct258*, s32, s16); -void func_8005D898(Player*, s16, s32, s8, s8); -void func_8005DA30(Player*, s16, s32, s8, s8); +void reset_player_particle_pool(Player*); +void set_particle_position_and_rotation(Player*, UnkPlayerStruct258*, f32, f32, f32, s8, s8); +s32 init_particle_player(UnkPlayerStruct258*, s8, f32); +s32 set_particle_colour(UnkPlayerStruct258*, s32, s16); +s32 set_particle_colour_randomly_varried(UnkPlayerStruct258*, s32, s16); +void set_drift_particles(Player*, s16, s32, s8, s8); +void check_drift_particles_setup_valid(Player*, s16, s32, s8, s8); void func_8005DAD0(void); void func_8005DAD8(UnkPlayerStruct258*, s16, s16, s16); -void func_8005DAF4(Player*, s16, s32, s8, s8); +void setup_tyre_particles(Player*, s16, s32, s8, s8); void func_8005EA94(Player*, s16, s32, s8, s8); void func_8005ED48(Player*, s16, s32, s8, s8); @@ -162,7 +166,7 @@ void func_80062B18(f32*, f32*, f32*, f32, f32, f32, u16, u16); void func_80062C74(Player*, s16, s32, s32); void func_80062F98(Player*, s16, s8, s8); -void func_800630C0(Player*, s16, s8, s8); +void set_oob_splash_particle_position(Player*, s16, s8, s8); void func_800631A8(Player*, s16, s8, s8); void func_80063268(Player*, s16, s8, s8); void func_80063408(Player*, s16, s8, s8); @@ -192,41 +196,41 @@ void func_800651F4(Player*, s8, s8, s8); void func_800652D4(Vec3f, Vec3s, f32); void func_8006538C(Player*, s8, s16, s8); void func_800658A0(Player*, s8, s16, s8); -void func_80065AB0(Player*, s8, s16, s8); -void func_80065F0C(Player*, s8, s16, s8); +void render_player_drift_particles(Player*, s8, s16, s8); +void render_player_ground_particles(Player*, s8, s16, s8); void func_800664E0(Player*, s8, s16, s8); void func_80066998(Player*, s8, s16, s8); void func_80066BAC(Player*, s8, s16, s8); void func_80067280(Player*, s8, s16, s8); -void func_80067604(Player*, s8, s16, s8); -void func_80067964(Player*, s8, f32, s8, s8); -void func_80067D3C(Player*, s8, u8*, s8, f32, s32); +void render_player_boost_spark_particles(Player*, s8, s16, s8); +void render_player_onomatopoeia_whrrrr(Player*, s8, f32, s8, s8); +void render_player_speech_bubble(Player*, s8, u8*, s8, f32, s32); -void func_8006801C(Player*, s8, u8*, s8, f32, s32); -void func_80068310(Player*, s8, f32, s8, s8); +void render_music_note(Player*, s8, u8*, s8, f32, s32); +void render_player_onomatopoeia_crash(Player*, s8, f32, s8, s8); void func_80068724(Player*, s8, f32, s8, s8); -void func_80068AA4(Player*, s8, f32, s8, s8); -void func_80068DA0(Player*, s8, f32, s8, s8); +void render_player_onomatopoeia_boing(Player*, s8, f32, s8, s8); +void render_player_onomatopoeia_pomp(Player*, s8, f32, s8, s8); void func_800691B8(Player*, s8, s16, s8); void func_80069444(Player*, s8, s16, s8); -void func_800696CC(Player*, s8, s16, s8, f32); +void render_wall_bonk_star_particles(Player*, s8, s16, s8, f32); void func_80069938(Player*, s8, s16, s8); void func_80069BA8(Player*, s8, s16, s8); void func_80069DB8(Player*, s8, s16, s8); void func_8006A01C(Player*, s8, s16, s8); void func_8006A280(Player*, s8, s16, s8); -void func_8006A50C(Player*, f32, f32, s8, s8, s16); +void init_balloon(Player*, f32, f32, s8, s8, s16); void func_8006A7C0(Player*, f32, f32, s8, s8); void render_battle_balloon(Player*, s8, s16, s8); -void func_8006B7E4(Player*, s8); -void func_8006B87C(Player*, s8); -void func_8006B8B4(Player*, s8); -void func_8006B974(s32, s8, s8); +void init_all_player_balloons(Player*, s8); +void clear_all_player_balloons(Player*, s8); +void pop_player_balloon(Player*, s8); +void set_player_balloon_to_gone(s32, s8, s8); void func_8006B9CC(Player*, s8); void func_8006BA94(Player*, s8, s8); void render_balloon(Vec3f, f32, s16, s16); @@ -594,30 +598,20 @@ extern u8* D_8018D464; extern u8* D_8018D468; extern u8* D_8018D46C; extern u8* D_8018D470; -extern u8* D_8018D474; extern u8* D_8018D478; extern u8* D_8018D480; extern u8* D_8018D484; -extern u8* D_8018D488; extern u8* D_8018D48C; extern u8* D_8018D490; -extern u8* D_8018D494; -extern u8* D_8018D498; extern u8* D_8018D49C; extern u8* D_8018D4A0; -extern u8* D_8018D4A4; -extern u8* D_8018D4A8; -extern u8* D_8018D4AC; -extern u8* D_8018D4B0; -extern u8* D_8018D4B4; -extern u8* D_8018D4B8; extern u8* D_8018D4BC; extern u8* D_8018D4C0; -extern u8* D_8018D4C4; -extern u8* D_8018D4C8; -extern Vec3f D_8018D4D0[]; -extern Vec3f D_8018D530[]; -extern Vec3f D_8018D590[]; +extern u8* gTextureLoadedLightningBolt0; +extern u8* gTextureLoadedLightningBolt1; +extern Vec3f gPlayerBalloonPosX[]; +extern Vec3f gPlayerBalloonPosY[]; +extern Vec3f gPlayerBalloonPosZ[]; extern u16 gPlayerBalloonStatus[8][3]; extern Vec3s D_8018D620[]; extern Vec3f D_8018D650[]; @@ -633,8 +627,12 @@ extern Vec3s D_8018D830[]; extern Vec3s D_8018D860[]; extern Vec3s D_8018D890[]; extern s16 gPlayerBalloonCount[]; // D_8018D8C0 -extern Vec3s D_8018D8D0[]; +extern Vec3s gPlayerBalloonDepartingTimer[]; /** @endcond */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/code_80057C60_var.c b/src/code_80057C60_var.c index 5007e9f48..769fa0ebf 100644 --- a/src/code_80057C60_var.c +++ b/src/code_80057C60_var.c @@ -182,31 +182,21 @@ u8* D_8018D464; u8* D_8018D468; u8* D_8018D46C; u8* D_8018D470; -u8* D_8018D474; u8* D_8018D478; UNUSED u8* D_8018D47C; u8* D_8018D480; u8* D_8018D484; -u8* D_8018D488; u8* D_8018D48C; u8* D_8018D490; -u8* D_8018D494; -u8* D_8018D498; u8* D_8018D49C; u8* D_8018D4A0; -u8* D_8018D4A4; -u8* D_8018D4A8; -u8* D_8018D4AC; -u8* D_8018D4B0; -u8* D_8018D4B4; -u8* D_8018D4B8; u8* D_8018D4BC; u8* D_8018D4C0; -u8* D_8018D4C4; -u8* D_8018D4C8; -Vec3f D_8018D4D0[8]; -Vec3f D_8018D530[8]; -Vec3f D_8018D590[8]; +u8* gTextureLoadedLightningBolt0; +u8* gTextureLoadedLightningBolt1; +Vec3f gPlayerBalloonPosX[8]; +Vec3f gPlayerBalloonPosY[8]; +Vec3f gPlayerBalloonPosZ[8]; u16 gPlayerBalloonStatus[8][3]; Vec3s D_8018D620[8]; Vec3f D_8018D650[8]; @@ -221,4 +211,4 @@ Vec3s D_8018D830[8]; Vec3s D_8018D860[8]; Vec3s D_8018D890[8]; s16 gPlayerBalloonCount[8]; -Vec3s D_8018D8D0[8]; +Vec3s gPlayerBalloonDepartingTimer[8]; diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c index 55d08c423..95c4e8da0 100644 --- a/src/code_8006E9C0.c +++ b/src/code_8006E9C0.c @@ -166,7 +166,8 @@ void get_minimap_properties() { D_8018D240 = (uintptr_t) CM_GetProps()->Minimap.Texture; // This is incredibly dumb. MinimapDimensions ought to be something more like // `u16 MinimapDimensions[][2]` but that doesn't match for some insane reason - gMinimapWidth = CM_GetProps()->Minimap.Width; // MinimapDimensions[courseId * 2]; + + gMinimapWidth = CM_GetProps()->Minimap.Width; // MinimapDimensions[courseId * 2]; gMinimapHeight = CM_GetProps()->Minimap.Height; // MinimapDimensions[courseId * 2 + 1]; } diff --git a/src/data/some_data.c b/src/data/some_data.c index 6e7e4a100..f619ab4a4 100644 --- a/src/data/some_data.c +++ b/src/data/some_data.c @@ -3,157 +3,159 @@ #include #include "some_data.h" -Vtx D_800E49C0[] = { +// Values below are altered so that the whole kart texture may be rendered as one texture instead of two half. + +Vtx gPlayerOneVtx[] = { { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; -Vtx D_800E4AC0[] = { +Vtx gPlayerTwoVtx[] = { { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; -Vtx D_800E4BC0[] = { +Vtx gPlayerThreeVtx[] = { { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; -Vtx D_800E4CC0[] = { +Vtx gPlayerFourVtx[] = { { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; -Vtx D_800E4DC0[] = { +Vtx gPlayerFiveVtx[] = { { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; -Vtx D_800E4EC0[] = { +Vtx gPlayerSixVtx[] = { { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0x60 } } }, }; -Vtx D_800E4FD0[] = { +Vtx gPlayerSevenVtx[] = { { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; -Vtx D_800E50D0[] = { +Vtx gPlayerEightVtx[] = { { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 3776 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; Vtx D_800E51D0[] = { @@ -192,13 +194,11 @@ Vtx gBalloonVertexPlane2[] = { // }; u8* gCourseOutlineTextures[] = { - gTextureCourseOutlineMarioRaceway, gTextureCourseOutlineChocoMountain, gTextureCourseOutlineBowsersCastle, - gTextureCourseOutlineBansheeBoardwalk, gTextureCourseOutlineYoshiValley, gTextureCourseOutlineFrappeSnowland, - gTextureCourseOutlineKoopaTroopaBeach, gTextureCourseOutlineRoyalRaceway, gTextureCourseOutlineLuigiRaceway, - gTextureCourseOutlineMooMooFarm, gTextureCourseOutlineToadsTurnpike, gTextureCourseOutlineKalimariDesert, - gTextureCourseOutlineSherbetLand, gTextureCourseOutlineRainbowRoad, gTextureCourseOutlineWarioStadium, - gTextureCourseOutlineBlockFort, gTextureCourseOutlineSkyscraper, gTextureCourseOutlineDoubleDeck, - gTextureCourseOutlineDksJungleParkway, gTextureCourseOutlineBigDonut, + minimap_mario_raceway, minimap_choco_mountain, minimap_bowsers_castle, minimap_banshee_boardwalk, + minimap_yoshi_valley, minimap_frappe_snowland, minimap_koopa_troopa_beach, minimap_royal_raceway, + minimap_luigi_raceway, minimap_moo_moo_farm, minimap_toads_turnpike, minimap_kalimari_desert, + minimap_sherbet_land, minimap_rainbow_road, minimap_wario_stadium, minimap_block_fort, + minimap_skyscraper, minimap_double_deck, minimap_dks_jungle_parkway, minimap_big_donut, }; s16 D_800E5520[] = { @@ -522,7 +522,8 @@ SplineData D_800E5D78 = { // Note the use of the plain SplineData type here. Since these are pointers, we don't care // about their internal array size -SplineData* D_800E5D9C[] = { &D_800E5988, &D_800E5A44, &D_800E5B08, &D_800E5BD4, &D_800E5C90, &boo6, &boo7, &boo8, &boo9, &boo10 }; +SplineData* D_800E5D9C[] = { &D_800E5988, &D_800E5A44, &D_800E5B08, &D_800E5BD4, &D_800E5C90, + &boo6, &boo7, &boo8, &boo9, &boo10 }; // Unused SplineData* D_800E5DB0 = &D_800E5988; diff --git a/src/data/some_data.h b/src/data/some_data.h index c0651aa2b..b9c672c76 100644 --- a/src/data/some_data.h +++ b/src/data/some_data.h @@ -11,14 +11,14 @@ extern "C" { #endif -extern Vtx D_800E49C0[]; -extern Vtx D_800E4AC0[]; -extern Vtx D_800E4BC0[]; -extern Vtx D_800E4CC0[]; -extern Vtx D_800E4DC0[]; -extern Vtx D_800E4EC0[]; -extern Vtx D_800E4FD0[]; -extern Vtx D_800E50D0[]; +extern Vtx gPlayerOneVtx[]; +extern Vtx gPlayerTwoVtx[]; +extern Vtx gPlayerThreeVtx[]; +extern Vtx gPlayerFourVtx[]; +extern Vtx gPlayerFiveVtx[]; +extern Vtx gPlayerSixVtx[]; +extern Vtx gPlayerSevenVtx[]; +extern Vtx gPlayerEightVtx[]; extern Vtx D_800E51D0[]; extern Vtx D_800E5210[]; extern Vtx gBalloonVertexPlane1[]; diff --git a/src/data/textures.c b/src/data/textures.c index ba62a4ed4..d61123215 100644 --- a/src/data/textures.c +++ b/src/data/textures.c @@ -12,10 +12,10 @@ /** * @brief MenuTexture of a tiny font texture of number 0 * - */ + */ MenuTexture D_02000000[2] = { - { 3, gTextureTinyFont0, 8, 8, 0, 0, 0x75}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFont0, 8, 8, 0, 0, 0x75 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -23,8 +23,8 @@ MenuTexture D_02000000[2] = { * */ MenuTexture D_02000028[2] = { - { 3, gTextureTinyFont1, 8, 8, 0, 0, 0x49}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFont1, 8, 8, 0, 0, 0x49 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -32,8 +32,8 @@ MenuTexture D_02000028[2] = { * */ MenuTexture D_02000050[2] = { - { 3, gTextureTinyFont2, 8, 8, 0, 0, 0x73}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFont2, 8, 8, 0, 0, 0x73 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -41,8 +41,8 @@ MenuTexture D_02000050[2] = { * */ MenuTexture D_02000078[2] = { - { 3, gTextureTinyFont3, 8, 8, 0, 0, 0x70}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFont3, 8, 8, 0, 0, 0x70 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -50,8 +50,8 @@ MenuTexture D_02000078[2] = { * */ MenuTexture D_020000A0[2] = { - { 3, gTextureTinyFont4, 8, 8, 0, 0, 0x5a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFont4, 8, 8, 0, 0, 0x5a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -59,8 +59,8 @@ MenuTexture D_020000A0[2] = { * */ MenuTexture D_020000C8[2] = { - { 3, gTextureTinyFont5, 8, 8, 0, 0, 0x72}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFont5, 8, 8, 0, 0, 0x72 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -68,8 +68,8 @@ MenuTexture D_020000C8[2] = { * */ MenuTexture D_020000F0[2] = { - { 3, gTextureTinyFont6, 8, 8, 0, 0, 0x74}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFont6, 8, 8, 0, 0, 0x74 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -77,8 +77,8 @@ MenuTexture D_020000F0[2] = { * */ MenuTexture D_02000118[2] = { - { 3, gTextureTinyFont7, 8, 8, 0, 0, 0x5e}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFont7, 8, 8, 0, 0, 0x5e }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -86,8 +86,8 @@ MenuTexture D_02000118[2] = { * */ MenuTexture D_02000140[2] = { - { 3, gTextureTinyFont8, 8, 8, 0, 0, 0x77}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFont8, 8, 8, 0, 0, 0x77 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -95,8 +95,8 @@ MenuTexture D_02000140[2] = { * */ MenuTexture D_02000168[2] = { - { 3, gTextureTinyFont9, 8, 8, 0, 0, 0x74}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFont9, 8, 8, 0, 0, 0x74 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -104,8 +104,8 @@ MenuTexture D_02000168[2] = { * */ MenuTexture D_02000190[2] = { - { 3, gTextureTinyFontA, 8, 8, 0, 0, 0x6b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontA, 8, 8, 0, 0, 0x6b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -113,8 +113,8 @@ MenuTexture D_02000190[2] = { * */ MenuTexture D_020001B8[2] = { - { 3, gTextureTinyFontB, 8, 8, 0, 0, 0x7d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontB, 8, 8, 0, 0, 0x7d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -122,8 +122,8 @@ MenuTexture D_020001B8[2] = { * */ MenuTexture D_020001E0[2] = { - { 3, gTextureTinyFontC, 8, 8, 0, 0, 0x75}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontC, 8, 8, 0, 0, 0x75 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -131,8 +131,8 @@ MenuTexture D_020001E0[2] = { * */ MenuTexture D_02000208[2] = { - { 3, gTextureTinyFontD, 8, 8, 0, 0, 0x71}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontD, 8, 8, 0, 0, 0x71 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -140,8 +140,8 @@ MenuTexture D_02000208[2] = { * */ MenuTexture D_02000230[2] = { - { 3, gTextureTinyFontE, 8, 8, 0, 0, 0x72}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontE, 8, 8, 0, 0, 0x72 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -149,8 +149,8 @@ MenuTexture D_02000230[2] = { * */ MenuTexture D_02000258[2] = { - { 3, gTextureTinyFontF, 8, 8, 0, 0, 0x63}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontF, 8, 8, 0, 0, 0x63 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -158,8 +158,8 @@ MenuTexture D_02000258[2] = { * */ MenuTexture D_02000280[2] = { - { 3, gTextureTinyFontG, 8, 8, 0, 0, 0x73}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontG, 8, 8, 0, 0, 0x73 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -167,8 +167,8 @@ MenuTexture D_02000280[2] = { * */ MenuTexture D_020002A8[2] = { - { 3, gTextureTinyFontH, 8, 8, 0, 0, 0x78}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontH, 8, 8, 0, 0, 0x78 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -176,8 +176,8 @@ MenuTexture D_020002A8[2] = { * */ MenuTexture D_020002D0[2] = { - { 3, gTextureTinyFontI, 8, 8, 0, 0, 0x48}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontI, 8, 8, 0, 0, 0x48 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -185,8 +185,8 @@ MenuTexture D_020002D0[2] = { * */ MenuTexture D_020002F8[2] = { - { 3, gTextureTinyFontJ, 8, 8, 0, 0, 0x52}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontJ, 8, 8, 0, 0, 0x52 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -194,8 +194,8 @@ MenuTexture D_020002F8[2] = { * */ MenuTexture D_02000320[2] = { - { 3, gTextureTinyFontK, 8, 8, 0, 0, 0x6f}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontK, 8, 8, 0, 0, 0x6f }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -203,8 +203,8 @@ MenuTexture D_02000320[2] = { * */ MenuTexture D_02000348[2] = { - { 3, gTextureTinyFontL, 8, 8, 0, 0, 0x4b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontL, 8, 8, 0, 0, 0x4b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -212,8 +212,8 @@ MenuTexture D_02000348[2] = { * */ MenuTexture D_02000370[2] = { - { 3, gTextureTinyFontM, 8, 8, 0, 0, 0x7c}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontM, 8, 8, 0, 0, 0x7c }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -221,8 +221,8 @@ MenuTexture D_02000370[2] = { * */ MenuTexture D_02000398[2] = { - { 3, gTextureTinyFontN, 8, 8, 0, 0, 0x7b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontN, 8, 8, 0, 0, 0x7b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -230,8 +230,8 @@ MenuTexture D_02000398[2] = { * */ MenuTexture D_020003C0[2] = { - { 3, gTextureTinyFontO, 8, 8, 0, 0, 0x76}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontO, 8, 8, 0, 0, 0x76 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -239,8 +239,8 @@ MenuTexture D_020003C0[2] = { * */ MenuTexture D_020003E8[2] = { - { 3, gTextureTinyFontP, 8, 8, 0, 0, 0x6a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontP, 8, 8, 0, 0, 0x6a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -248,8 +248,8 @@ MenuTexture D_020003E8[2] = { * */ MenuTexture D_02000410[2] = { - { 3, gTextureTinyFontQ, 8, 8, 0, 0, 0x77}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontQ, 8, 8, 0, 0, 0x77 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -257,8 +257,8 @@ MenuTexture D_02000410[2] = { * */ MenuTexture D_02000438[2] = { - { 3, gTextureTinyFontR, 8, 8, 0, 0, 0x72}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontR, 8, 8, 0, 0, 0x72 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -266,8 +266,8 @@ MenuTexture D_02000438[2] = { * */ MenuTexture D_02000460[2] = { - { 3, gTextureTinyFontS, 8, 8, 0, 0, 0x70}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontS, 8, 8, 0, 0, 0x70 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -275,8 +275,8 @@ MenuTexture D_02000460[2] = { * */ MenuTexture D_02000488[2] = { - { 3, gTextureTinyFontT, 8, 8, 0, 0, 0x54}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontT, 8, 8, 0, 0, 0x54 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -284,8 +284,8 @@ MenuTexture D_02000488[2] = { * */ MenuTexture D_020004B0[2] = { - { 3, gTextureTinyFontU, 8, 8, 0, 0, 0x62}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontU, 8, 8, 0, 0, 0x62 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -293,8 +293,8 @@ MenuTexture D_020004B0[2] = { * */ MenuTexture D_020004D8[2] = { - { 3, gTextureTinyFontV, 8, 8, 0, 0, 0x5e}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontV, 8, 8, 0, 0, 0x5e }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -302,8 +302,8 @@ MenuTexture D_020004D8[2] = { * */ MenuTexture D_02000500[2] = { - { 3, gTextureTinyFontW, 8, 8, 0, 0, 0x7c}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontW, 8, 8, 0, 0, 0x7c }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -311,8 +311,8 @@ MenuTexture D_02000500[2] = { * */ MenuTexture D_02000528[2] = { - { 3, gTextureTinyFontX, 8, 8, 0, 0, 0x6b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontX, 8, 8, 0, 0, 0x6b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -320,8 +320,8 @@ MenuTexture D_02000528[2] = { * */ MenuTexture D_02000550[2] = { - { 3, gTextureTinyFontY, 8, 8, 0, 0, 0x51}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontY, 8, 8, 0, 0, 0x51 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -329,8 +329,8 @@ MenuTexture D_02000550[2] = { * */ MenuTexture D_02000578[2] = { - { 3, gTextureTinyFontZ, 8, 8, 0, 0, 0x68}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontZ, 8, 8, 0, 0, 0x68 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -338,8 +338,8 @@ MenuTexture D_02000578[2] = { * */ MenuTexture D_020005A0[2] = { - { 3, gTextureTinyFontExclamationMark, 8, 8, 0, 0, 0x46}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontExclamationMark, 8, 8, 0, 0, 0x46 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -347,8 +347,8 @@ MenuTexture D_020005A0[2] = { * */ MenuTexture D_020005C8[2] = { - { 3, gTextureTinyFontDoubleQuote, 8, 8, 0, 0, 0x37}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontDoubleQuote, 8, 8, 0, 0, 0x37 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -356,8 +356,8 @@ MenuTexture D_020005C8[2] = { * */ MenuTexture D_020005F0[2] = { - { 3, gTextureTinyFontHash, 8, 8, 0, 0, 0x70}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontHash, 8, 8, 0, 0, 0x70 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -365,8 +365,8 @@ MenuTexture D_020005F0[2] = { * */ MenuTexture D_02000618[2] = { - { 3, gTextureTinyFontSingleQuote, 8, 8, 0, 0, 0x2f}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontSingleQuote, 8, 8, 0, 0, 0x2f }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -374,8 +374,8 @@ MenuTexture D_02000618[2] = { * */ MenuTexture D_02000640[2] = { - { 3, gTextureTinyFontAsterisk, 8, 8, 0, 0, 0x6a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontAsterisk, 8, 8, 0, 0, 0x6a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -383,8 +383,8 @@ MenuTexture D_02000640[2] = { * */ MenuTexture D_02000668[2] = { - { 3, gTextureTinyFontPlus, 8, 8, 0, 0, 0x51}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontPlus, 8, 8, 0, 0, 0x51 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -392,8 +392,8 @@ MenuTexture D_02000668[2] = { * */ MenuTexture D_02000690[2] = { - { 3, gTexture7EEB18, 8, 8, 0, 0, 0x30}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EEB18, 8, 8, 0, 0, 0x30 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -401,8 +401,8 @@ MenuTexture D_02000690[2] = { * */ MenuTexture D_020006B8[2] = { - { 3, gTextureTinyFontMinus, 8, 8, 0, 0, 0x35}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontMinus, 8, 8, 0, 0, 0x35 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -410,8 +410,8 @@ MenuTexture D_020006B8[2] = { * */ MenuTexture D_020006E0[2] = { - { 3, gTextureTinyFontComma, 8, 8, 0, 0, 0x31}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontComma, 8, 8, 0, 0, 0x31 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -419,8 +419,8 @@ MenuTexture D_020006E0[2] = { * */ MenuTexture D_02000708[2] = { - { 3, gTextureTinyFontForwardSlash, 8, 8, 0, 0, 0x4f}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontForwardSlash, 8, 8, 0, 0, 0x4f }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -428,8 +428,8 @@ MenuTexture D_02000708[2] = { * */ MenuTexture D_02000730[2] = { - { 3, gTextureTinyFontColon, 8, 8, 0, 0, 0x38}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontColon, 8, 8, 0, 0, 0x38 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -437,8 +437,8 @@ MenuTexture D_02000730[2] = { * */ MenuTexture D_02000758[2] = { - { 3, gTexture7EEC34, 8, 8, 0, 0, 0x51}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EEC34, 8, 8, 0, 0, 0x51 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -446,8 +446,8 @@ MenuTexture D_02000758[2] = { * */ MenuTexture D_02000780[2] = { - { 3, gTextureTinyFontQuestion, 8, 8, 0, 0, 0x60}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTinyFontQuestion, 8, 8, 0, 0, 0x60 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -455,8 +455,8 @@ MenuTexture D_02000780[2] = { * */ MenuTexture D_020007A8[2] = { - { 3, gTexture7EECE4, 8, 8, 0, 0, 0x8f}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EECE4, 8, 8, 0, 0, 0x8f }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -464,8 +464,8 @@ MenuTexture D_020007A8[2] = { * */ MenuTexture D_020007D0[2] = { - { 3, gTexture7EED74, 8, 8, 0, 0, 0x3d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EED74, 8, 8, 0, 0, 0x3d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -473,8 +473,8 @@ MenuTexture D_020007D0[2] = { * */ MenuTexture D_020007F8[2] = { - { 3, gTexture7EEDB0, 8, 8, 0, 0, 0x37}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EEDB0, 8, 8, 0, 0, 0x37 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -482,8 +482,8 @@ MenuTexture D_020007F8[2] = { * */ MenuTexture D_02000820[2] = { - { 3, gTexture7EEDE8, 8, 8, 0, 0, 0x39}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EEDE8, 8, 8, 0, 0, 0x39 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -491,8 +491,8 @@ MenuTexture D_02000820[2] = { * */ MenuTexture D_02000848[2] = { - { 3, gTexture7EEE20, 8, 8, 0, 0, 0x5b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EEE20, 8, 8, 0, 0, 0x5b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -500,8 +500,8 @@ MenuTexture D_02000848[2] = { * */ MenuTexture D_02000870[2] = { - { 3, gTexture7EEE7C, 8, 8, 0, 0, 0x55}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EEE7C, 8, 8, 0, 0, 0x55 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -509,8 +509,8 @@ MenuTexture D_02000870[2] = { * */ MenuTexture D_02000898[2] = { - { 3, gTexture7EEED0, 8, 8, 0, 0, 0x6a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EEED0, 8, 8, 0, 0, 0x6a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -518,8 +518,8 @@ MenuTexture D_02000898[2] = { * */ MenuTexture D_020008C0[2] = { - { 3, gTexture7EEF3C, 8, 8, 0, 0, 0x55}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EEF3C, 8, 8, 0, 0, 0x55 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -527,8 +527,8 @@ MenuTexture D_020008C0[2] = { * */ MenuTexture D_020008E8[2] = { - { 3, gTexture7EEF90, 8, 8, 0, 0, 0x62}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EEF90, 8, 8, 0, 0, 0x62 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -536,8 +536,8 @@ MenuTexture D_020008E8[2] = { * */ MenuTexture D_02000910[2] = { - { 3, gTexture7EEFF4, 8, 8, 0, 0, 0x64}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EEFF4, 8, 8, 0, 0, 0x64 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -545,8 +545,8 @@ MenuTexture D_02000910[2] = { * */ MenuTexture D_02000938[2] = { - { 3, gTexture7EF058, 8, 8, 0, 0, 0x5b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF058, 8, 8, 0, 0, 0x5b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -554,8 +554,8 @@ MenuTexture D_02000938[2] = { * */ MenuTexture D_02000960[2] = { - { 3, gTexture7EF0B4, 8, 8, 0, 0, 0x5d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF0B4, 8, 8, 0, 0, 0x5d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -563,8 +563,8 @@ MenuTexture D_02000960[2] = { * */ MenuTexture D_02000988[2] = { - { 3, gTexture7EF110, 8, 8, 0, 0, 0x6d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF110, 8, 8, 0, 0, 0x6d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -572,8 +572,8 @@ MenuTexture D_02000988[2] = { * */ MenuTexture D_020009B0[2] = { - { 3, gTexture7EF17C, 8, 8, 0, 0, 0x73}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF17C, 8, 8, 0, 0, 0x73 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -581,8 +581,8 @@ MenuTexture D_020009B0[2] = { * */ MenuTexture D_020009D8[2] = { - { 3, gTexture7EF1F0, 8, 8, 0, 0, 0x5e}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF1F0, 8, 8, 0, 0, 0x5e }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -590,8 +590,8 @@ MenuTexture D_020009D8[2] = { * */ MenuTexture D_02000A00[2] = { - { 3, gTexture7EF250, 8, 8, 0, 0, 0x69}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF250, 8, 8, 0, 0, 0x69 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -599,8 +599,8 @@ MenuTexture D_02000A00[2] = { * */ MenuTexture D_02000A28[2] = { - { 3, gTexture7EF2B8, 8, 8, 0, 0, 0x5b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF2B8, 8, 8, 0, 0, 0x5b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -608,8 +608,8 @@ MenuTexture D_02000A28[2] = { * */ MenuTexture D_02000A50[2] = { - { 3, gTexture7EF314, 8, 8, 0, 0, 0x73}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF314, 8, 8, 0, 0, 0x73 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -617,8 +617,8 @@ MenuTexture D_02000A50[2] = { * */ MenuTexture D_02000A78[2] = { - { 3, gTexture7EF388, 8, 8, 0, 0, 0x6f}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF388, 8, 8, 0, 0, 0x6f }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -626,8 +626,8 @@ MenuTexture D_02000A78[2] = { * */ MenuTexture D_02000AA0[2] = { - { 3, gTexture7EF3F8, 8, 8, 0, 0, 0x79}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF3F8, 8, 8, 0, 0, 0x79 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -635,8 +635,8 @@ MenuTexture D_02000AA0[2] = { * */ MenuTexture D_02000AC8[2] = { - { 3, gTexture7EF470, 8, 8, 0, 0, 0x74}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF470, 8, 8, 0, 0, 0x74 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -644,8 +644,8 @@ MenuTexture D_02000AC8[2] = { * */ MenuTexture D_02000AF0[2] = { - { 3, gTexture7EF4E4, 8, 8, 0, 0, 0x70}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF4E4, 8, 8, 0, 0, 0x70 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -653,8 +653,8 @@ MenuTexture D_02000AF0[2] = { * */ MenuTexture D_02000B18[2] = { - { 3, gTexture7EF554, 8, 8, 0, 0, 0x6c}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF554, 8, 8, 0, 0, 0x6c }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -662,8 +662,8 @@ MenuTexture D_02000B18[2] = { * */ MenuTexture D_02000B40[2] = { - { 3, gTexture7EF5C0, 8, 8, 0, 0, 0x61}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF5C0, 8, 8, 0, 0, 0x61 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -671,8 +671,8 @@ MenuTexture D_02000B40[2] = { * */ MenuTexture D_02000B68[2] = { - { 3, gTexture7EF620, 8, 8, 0, 0, 0x72}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF620, 8, 8, 0, 0, 0x72 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -680,8 +680,8 @@ MenuTexture D_02000B68[2] = { * */ MenuTexture D_02000B90[2] = { - { 3, gTexture7EF694, 8, 8, 0, 0, 0x74}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF694, 8, 8, 0, 0, 0x74 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -689,8 +689,8 @@ MenuTexture D_02000B90[2] = { * */ MenuTexture D_02000BB8[2] = { - { 3, gTexture7EF708, 8, 8, 0, 0, 0x72}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF708, 8, 8, 0, 0, 0x72 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -698,8 +698,8 @@ MenuTexture D_02000BB8[2] = { * */ MenuTexture D_02000BE0[2] = { - { 3, gTexture7EF77C, 8, 8, 0, 0, 0x6b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF77C, 8, 8, 0, 0, 0x6b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -707,8 +707,8 @@ MenuTexture D_02000BE0[2] = { * */ MenuTexture D_02000C08[2] = { - { 3, gTexture7EF7E8, 8, 8, 0, 0, 0x75}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF7E8, 8, 8, 0, 0, 0x75 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -716,8 +716,8 @@ MenuTexture D_02000C08[2] = { * */ MenuTexture D_02000C30[2] = { - { 3, gTexture7EF85C, 8, 8, 0, 0, 0x6b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF85C, 8, 8, 0, 0, 0x6b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -725,8 +725,8 @@ MenuTexture D_02000C30[2] = { * */ MenuTexture D_02000C58[2] = { - { 3, gTexture7EF8C8, 8, 8, 0, 0, 0x72}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF8C8, 8, 8, 0, 0, 0x72 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -734,8 +734,8 @@ MenuTexture D_02000C58[2] = { * */ MenuTexture D_02000C80[2] = { - { 3, gTexture7EF93C, 8, 8, 0, 0, 0x76}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF93C, 8, 8, 0, 0, 0x76 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -743,8 +743,8 @@ MenuTexture D_02000C80[2] = { * */ MenuTexture D_02000CA8[2] = { - { 3, gTexture7EF9B4, 8, 8, 0, 0, 0x78}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EF9B4, 8, 8, 0, 0, 0x78 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -752,8 +752,8 @@ MenuTexture D_02000CA8[2] = { * */ MenuTexture D_02000CD0[2] = { - { 3, gTexture7EFA2C, 8, 8, 0, 0, 0x7b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFA2C, 8, 8, 0, 0, 0x7b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -761,8 +761,8 @@ MenuTexture D_02000CD0[2] = { * */ MenuTexture D_02000CF8[2] = { - { 3, gTexture7EFAA8, 8, 8, 0, 0, 0x57}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFAA8, 8, 8, 0, 0, 0x57 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -770,8 +770,8 @@ MenuTexture D_02000CF8[2] = { * */ MenuTexture D_02000D20[2] = { - { 3, gTexture7EFB00, 8, 8, 0, 0, 0x63}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFB00, 8, 8, 0, 0, 0x63 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -779,8 +779,8 @@ MenuTexture D_02000D20[2] = { * */ MenuTexture D_02000D48[2] = { - { 3, gTexture7EFB64, 8, 8, 0, 0, 0x57}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFB64, 8, 8, 0, 0, 0x57 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -788,8 +788,8 @@ MenuTexture D_02000D48[2] = { * */ MenuTexture D_02000D70[2] = { - { 3, gTexture7EFBBC, 8, 8, 0, 0, 0x75}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFBBC, 8, 8, 0, 0, 0x75 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -797,8 +797,8 @@ MenuTexture D_02000D70[2] = { * */ MenuTexture D_02000D98[2] = { - { 3, gTexture7EFC30, 8, 8, 0, 0, 0x7b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFC30, 8, 8, 0, 0, 0x7b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -806,8 +806,8 @@ MenuTexture D_02000D98[2] = { * */ MenuTexture D_02000DC0[2] = { - { 3, gTexture7EFCAC, 8, 8, 0, 0, 0x53}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFCAC, 8, 8, 0, 0, 0x53 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -815,8 +815,8 @@ MenuTexture D_02000DC0[2] = { * */ MenuTexture D_02000DE8[2] = { - { 3, gTexture7EFD00, 8, 8, 0, 0, 0x60}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFD00, 8, 8, 0, 0, 0x60 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -824,8 +824,8 @@ MenuTexture D_02000DE8[2] = { * */ MenuTexture D_02000E10[2] = { - { 3, gTexture7EFD60, 8, 8, 0, 0, 0x75}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFD60, 8, 8, 0, 0, 0x75 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -833,8 +833,8 @@ MenuTexture D_02000E10[2] = { * */ MenuTexture D_02000E38[2] = { - { 3, gTexture7EFDD4, 8, 8, 0, 0, 0x72}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFDD4, 8, 8, 0, 0, 0x72 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -842,8 +842,8 @@ MenuTexture D_02000E38[2] = { * */ MenuTexture D_02000E60[2] = { - { 3, gTexture7EFE48, 8, 8, 0, 0, 0x57}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFE48, 8, 8, 0, 0, 0x57 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -851,8 +851,8 @@ MenuTexture D_02000E60[2] = { * */ MenuTexture D_02000E88[2] = { - { 3, gTexture7EFEA0, 8, 8, 0, 0, 0x8d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFEA0, 8, 8, 0, 0, 0x8d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -860,8 +860,8 @@ MenuTexture D_02000E88[2] = { * */ MenuTexture D_02000EB0[2] = { - { 3, gTexture7EFF2C, 8, 8, 0, 0, 0x63}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFF2C, 8, 8, 0, 0, 0x63 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -869,8 +869,8 @@ MenuTexture D_02000EB0[2] = { * */ MenuTexture D_02000ED8[2] = { - { 3, gTexture7EFF90, 8, 8, 0, 0, 0x70}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7EFF90, 8, 8, 0, 0, 0x70 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -878,8 +878,8 @@ MenuTexture D_02000ED8[2] = { * */ MenuTexture D_02000F00[2] = { - { 3, gTexture7F0000, 8, 8, 0, 0, 0x6d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0000, 8, 8, 0, 0, 0x6d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -887,8 +887,8 @@ MenuTexture D_02000F00[2] = { * */ MenuTexture D_02000F28[2] = { - { 3, gTexture7F006C, 8, 8, 0, 0, 0x6a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F006C, 8, 8, 0, 0, 0x6a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -896,8 +896,8 @@ MenuTexture D_02000F28[2] = { * */ MenuTexture D_02000F50[2] = { - { 3, gTexture7F00D8, 8, 8, 0, 0, 0x80}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F00D8, 8, 8, 0, 0, 0x80 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -905,8 +905,8 @@ MenuTexture D_02000F50[2] = { * */ MenuTexture D_02000F78[2] = { - { 3, gTexture7F0158, 8, 8, 0, 0, 0x78}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0158, 8, 8, 0, 0, 0x78 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -914,8 +914,8 @@ MenuTexture D_02000F78[2] = { * */ MenuTexture D_02000FA0[2] = { - { 3, gTexture7F01D0, 8, 8, 0, 0, 0x6a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F01D0, 8, 8, 0, 0, 0x6a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -923,8 +923,8 @@ MenuTexture D_02000FA0[2] = { * */ MenuTexture D_02000FC8[2] = { - { 3, gTexture7F023C, 8, 8, 0, 0, 0x78}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F023C, 8, 8, 0, 0, 0x78 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -932,8 +932,8 @@ MenuTexture D_02000FC8[2] = { * */ MenuTexture D_02000FF0[2] = { - { 3, gTexture7F02B4, 8, 8, 0, 0, 0x79}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F02B4, 8, 8, 0, 0, 0x79 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -941,8 +941,8 @@ MenuTexture D_02000FF0[2] = { * */ MenuTexture D_02001018[2] = { - { 3, gTexture7F032C, 8, 8, 0, 0, 0x63}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F032C, 8, 8, 0, 0, 0x63 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -950,8 +950,8 @@ MenuTexture D_02001018[2] = { * */ MenuTexture D_02001040[2] = { - { 3, gTexture7F0390, 8, 8, 0, 0, 0x72}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0390, 8, 8, 0, 0, 0x72 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -959,8 +959,8 @@ MenuTexture D_02001040[2] = { * */ MenuTexture D_02001068[2] = { - { 3, gTexture7F0404, 8, 8, 0, 0, 0x6d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0404, 8, 8, 0, 0, 0x6d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -968,8 +968,8 @@ MenuTexture D_02001068[2] = { * */ MenuTexture D_02001090[2] = { - { 3, gTexture7F0470, 8, 8, 0, 0, 0x7d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0470, 8, 8, 0, 0, 0x7d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -977,8 +977,8 @@ MenuTexture D_02001090[2] = { * */ MenuTexture D_020010B8[2] = { - { 3, gTexture7F04EC, 8, 8, 0, 0, 0x6e}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F04EC, 8, 8, 0, 0, 0x6e }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -986,8 +986,8 @@ MenuTexture D_020010B8[2] = { * */ MenuTexture D_020010E0[2] = { - { 3, gTexture7F055C, 8, 8, 0, 0, 0x93}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F055C, 8, 8, 0, 0, 0x93 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -995,8 +995,8 @@ MenuTexture D_020010E0[2] = { * */ MenuTexture D_02001108[2] = { - { 3, gTexture7F05F0, 8, 8, 0, 0, 0x7f}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F05F0, 8, 8, 0, 0, 0x7f }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1004,8 +1004,8 @@ MenuTexture D_02001108[2] = { * */ MenuTexture D_02001130[2] = { - { 3, gTexture7F0670, 8, 8, 0, 0, 0x7b}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0670, 8, 8, 0, 0, 0x7b }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1013,8 +1013,8 @@ MenuTexture D_02001130[2] = { * */ MenuTexture D_02001158[2] = { - { 3, gTexture7F06EC, 8, 8, 0, 0, 0x7a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F06EC, 8, 8, 0, 0, 0x7a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1022,8 +1022,8 @@ MenuTexture D_02001158[2] = { * */ MenuTexture D_02001180[2] = { - { 3, gTexture7F0768, 8, 8, 0, 0, 0x78}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0768, 8, 8, 0, 0, 0x78 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1031,8 +1031,8 @@ MenuTexture D_02001180[2] = { * */ MenuTexture D_020011A8[2] = { - { 3, gTexture7F07E0, 8, 8, 0, 0, 0x77}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F07E0, 8, 8, 0, 0, 0x77 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1040,8 +1040,8 @@ MenuTexture D_020011A8[2] = { * */ MenuTexture D_020011D0[2] = { - { 3, gTexture7F0858, 8, 8, 0, 0, 0x7f}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0858, 8, 8, 0, 0, 0x7f }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1049,8 +1049,8 @@ MenuTexture D_020011D0[2] = { * */ MenuTexture D_020011F8[2] = { - { 3, gTexture7F08D8, 8, 8, 0, 0, 0x71}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F08D8, 8, 8, 0, 0, 0x71 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1058,8 +1058,8 @@ MenuTexture D_020011F8[2] = { * */ MenuTexture D_02001220[2] = { - { 3, gTexture7F0948, 8, 8, 0, 0, 0x87}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0948, 8, 8, 0, 0, 0x87 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1067,8 +1067,8 @@ MenuTexture D_02001220[2] = { * */ MenuTexture D_02001248[2] = { - { 3, gTexture7F09D0, 8, 8, 0, 0, 0x6d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F09D0, 8, 8, 0, 0, 0x6d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1076,8 +1076,8 @@ MenuTexture D_02001248[2] = { * */ MenuTexture D_02001270[2] = { - { 3, gTexture7F0A3C, 8, 8, 0, 0, 0x7e}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0A3C, 8, 8, 0, 0, 0x7e }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1085,8 +1085,8 @@ MenuTexture D_02001270[2] = { * */ MenuTexture D_02001298[2] = { - { 3, gTexture7F0ABC, 8, 8, 0, 0, 0x77}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0ABC, 8, 8, 0, 0, 0x77 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1094,8 +1094,8 @@ MenuTexture D_02001298[2] = { * */ MenuTexture D_020012C0[2] = { - { 3, gTexture7F0B34, 8, 8, 0, 0, 0x7d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0B34, 8, 8, 0, 0, 0x7d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1103,8 +1103,8 @@ MenuTexture D_020012C0[2] = { * */ MenuTexture D_020012E8[2] = { - { 3, gTexture7F0BB0, 8, 8, 0, 0, 0x75}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0BB0, 8, 8, 0, 0, 0x75 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1112,8 +1112,8 @@ MenuTexture D_020012E8[2] = { * */ MenuTexture D_02001310[2] = { - { 3, gTexture7F0C24, 8, 8, 0, 0, 0x71}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0C24, 8, 8, 0, 0, 0x71 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1121,8 +1121,8 @@ MenuTexture D_02001310[2] = { * */ MenuTexture D_02001338[2] = { - { 3, gTexture7F0C94, 8, 8, 0, 0, 0x77}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0C94, 8, 8, 0, 0, 0x77 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1130,8 +1130,8 @@ MenuTexture D_02001338[2] = { * */ MenuTexture D_02001360[2] = { - { 3, gTexture7F0D0C, 8, 8, 0, 0, 0x7f}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0D0C, 8, 8, 0, 0, 0x7f }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1139,8 +1139,8 @@ MenuTexture D_02001360[2] = { * */ MenuTexture D_02001388[2] = { - { 3, gTexture7F0D8C, 8, 8, 0, 0, 0x61}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0D8C, 8, 8, 0, 0, 0x61 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1148,8 +1148,8 @@ MenuTexture D_02001388[2] = { * */ MenuTexture D_020013B0[2] = { - { 3, gTexture7F0DEC, 8, 8, 0, 0, 0x6e}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0DEC, 8, 8, 0, 0, 0x6e }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1157,8 +1157,8 @@ MenuTexture D_020013B0[2] = { * */ MenuTexture D_020013D8[2] = { - { 3, gTexture7F0E5C, 8, 8, 0, 0, 0x87}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0E5C, 8, 8, 0, 0, 0x87 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1166,8 +1166,8 @@ MenuTexture D_020013D8[2] = { * */ MenuTexture D_02001400[2] = { - { 3, gTexture7F0EE4, 8, 8, 0, 0, 0x78}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0EE4, 8, 8, 0, 0, 0x78 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1175,8 +1175,8 @@ MenuTexture D_02001400[2] = { * */ MenuTexture D_02001428[2] = { - { 3, gTexture7F0F5C, 8, 8, 0, 0, 0x7d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0F5C, 8, 8, 0, 0, 0x7d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1184,8 +1184,8 @@ MenuTexture D_02001428[2] = { * */ MenuTexture D_02001450[2] = { - { 3, gTexture7F0FD8, 8, 8, 0, 0, 0x60}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F0FD8, 8, 8, 0, 0, 0x60 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1193,8 +1193,8 @@ MenuTexture D_02001450[2] = { * */ MenuTexture D_02001478[2] = { - { 3, gTexture7F1038, 8, 8, 0, 0, 0x65}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F1038, 8, 8, 0, 0, 0x65 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1202,8 +1202,8 @@ MenuTexture D_02001478[2] = { * */ MenuTexture D_020014A0[2] = { - { 3, gTexture7F109C, 8, 8, 0, 0, 0x87}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7F109C, 8, 8, 0, 0, 0x87 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1211,9 +1211,9 @@ MenuTexture D_020014A0[2] = { * */ MenuTexture D_020014C8[6] = { - { 0, gTextureGoldBar, 256, 40, 32, 25, 0xd4c}, { 0, gTexturePinkBar, 90, 16, 65, 70, 0x468}, - { 0, gTexturePinkBar, 90, 16, 164, 70, 0x468}, { 0, gTexturePinkBar, 90, 16, 65, 200, 0x468}, - { 0, gTexturePinkBar, 90, 16, 164, 200, 0x468}, { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureGoldBar, 256, 40, 32, 25, 0xd4c }, { 0, gTexturePinkBar, 90, 16, 65, 70, 0x468 }, + { 0, gTexturePinkBar, 90, 16, 164, 70, 0x468 }, { 0, gTexturePinkBar, 90, 16, 65, 200, 0x468 }, + { 0, gTexturePinkBar, 90, 16, 164, 200, 0x468 }, { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1221,14 +1221,14 @@ MenuTexture D_020014C8[6] = { * */ MenuTexture D_02001540[3] = { - { 0, gTextureGreenGoldStripe, 256, 29, 32, 91, 0xbec}, - { 0, gTextureGoldStripe, 256, 15, 32, 180, 0x6f8}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureGreenGoldStripe, 256, 29, 32, 91, 0xbec }, + { 0, gTextureGoldStripe, 256, 15, 32, 180, 0x6f8 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; MenuTexture D_0200157C[2] = { - { 0, gTextureWhiteStripe, 256, 10, 0, 0, 0xe4}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWhiteStripe, 256, 10, 0, 0, 0xe4 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1236,8 +1236,8 @@ MenuTexture D_0200157C[2] = { * */ MenuTexture D_020015A4[2] = { - { 3, gTexture7ED50C, 256, 5, 32, 120, 0x196}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7ED50C, 256, 5, 32, 120, 0x196 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1245,11 +1245,11 @@ MenuTexture D_020015A4[2] = { * */ MenuTexture D_020015CC[5] = { - { 3, gTextureSelectRecord, 68, 10, 75, 74, 0x378}, - { 3, gTextureTextEnd, 20, 10, 200, 74, 0x12f}, - { 3, gTextureTextErase, 28, 10, 96, 204, 0x19e}, - { 3, gTextureTextQuit, 24, 10, 198, 204, 0x149}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureSelectRecord, 68, 10, 75, 74, 0x378 }, + { 3, gTextureTextEnd, 20, 10, 200, 74, 0x12f }, + { 3, gTextureTextErase, 28, 10, 96, 204, 0x19e }, + { 3, gTextureTextQuit, 24, 10, 198, 204, 0x149 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1257,8 +1257,8 @@ MenuTexture D_020015CC[5] = { * */ MenuTexture D_02001630[2] = { - { 3, gTextureTableOfContents, 88, 10, 116, 94, 0x42d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTableOfContents, 88, 10, 116, 94, 0x42d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1266,11 +1266,11 @@ MenuTexture D_02001630[2] = { * */ MenuTexture D_02001658[5] = { - { 3, gTextureTextHash, 8, 10, 48, 108, 0x07e}, - { 3, gTextureTextGameData, 56, 10, 132, 108, 0x2c4}, - { 3, gTextureTextPages, 32, 10, 252, 108, 0x1c1}, - { 3, gTextureTextPagesFree, 56, 10, 132, 184, 0x2c2}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureTextHash, 8, 10, 48, 108, 0x07e }, + { 3, gTextureTextGameData, 56, 10, 132, 108, 0x2c4 }, + { 3, gTextureTextPages, 32, 10, 252, 108, 0x1c1 }, + { 3, gTextureTextPagesFree, 56, 10, 132, 184, 0x2c2 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1278,8 +1278,8 @@ MenuTexture D_02001658[5] = { * */ MenuTexture D_020016BC[2] = { - { 3, gTextureSmallFont0, 8, 9, 0, 0, 0x8e}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureSmallFont0, 8, 9, 0, 0, 0x8e }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1287,8 +1287,8 @@ MenuTexture D_020016BC[2] = { * */ MenuTexture D_020016E4[2] = { - { 3, gTextureSmallFont1, 8, 9, 0, 0, 0x59}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureSmallFont1, 8, 9, 0, 0, 0x59 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1296,8 +1296,8 @@ MenuTexture D_020016E4[2] = { * */ MenuTexture D_0200170C[2] = { - { 3, gTextureSmallFont2, 8, 9, 0, 0, 0x97}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureSmallFont2, 8, 9, 0, 0, 0x97 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1305,8 +1305,8 @@ MenuTexture D_0200170C[2] = { * */ MenuTexture D_02001734[2] = { - { 3, gTextureSmallFont3, 8, 9, 0, 0, 0x95}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureSmallFont3, 8, 9, 0, 0, 0x95 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1314,8 +1314,8 @@ MenuTexture D_02001734[2] = { * */ MenuTexture D_0200175C[2] = { - { 3, gTextureSmallFont4, 8, 9, 0, 0, 0x87}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureSmallFont4, 8, 9, 0, 0, 0x87 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1323,8 +1323,8 @@ MenuTexture D_0200175C[2] = { * */ MenuTexture D_02001784[2] = { - { 3, gTextureSmallFont5, 8, 9, 0, 0, 0x99}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureSmallFont5, 8, 9, 0, 0, 0x99 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1332,8 +1332,8 @@ MenuTexture D_02001784[2] = { * */ MenuTexture D_020017AC[2] = { - { 3, gTextureSmallFont6, 8, 9, 0, 0, 0x9a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureSmallFont6, 8, 9, 0, 0, 0x9a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1341,8 +1341,8 @@ MenuTexture D_020017AC[2] = { * */ MenuTexture D_020017D4[2] = { - { 3, gTextureSmallFont7, 8, 9, 0, 0, 0x70}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureSmallFont7, 8, 9, 0, 0, 0x70 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1350,8 +1350,8 @@ MenuTexture D_020017D4[2] = { * */ MenuTexture D_020017FC[2] = { - { 3, gTextureSmallFont8, 8, 9, 0, 0, 0x90}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureSmallFont8, 8, 9, 0, 0, 0x90 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1359,8 +1359,8 @@ MenuTexture D_020017FC[2] = { * */ MenuTexture D_02001824[2] = { - { 3, gTextureSmallFont9, 8, 9, 0, 0, 0x9f}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureSmallFont9, 8, 9, 0, 0, 0x9f }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1368,8 +1368,8 @@ MenuTexture D_02001824[2] = { * */ MenuTexture D_0200184C[2] = { - { 3, gTexture7ED058, 96, 22, 0, 0, 0x238}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7ED058, 96, 22, 0, 0, 0x238 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1377,8 +1377,8 @@ MenuTexture D_0200184C[2] = { * */ MenuTexture D_02001874[2] = { - { 3, gTexture7ED290, 248, 10, 0, 0, 0x27d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7ED290, 248, 10, 0, 0, 0x27d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1386,8 +1386,8 @@ MenuTexture D_02001874[2] = { * */ MenuTexture D_0200189C[2] = { - { 3, gTextureN64ControllerPakDataSelect, 180, 32, 70, 29, 0x1128}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureN64ControllerPakDataSelect, 180, 32, 70, 29, 0x1128 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1395,8 +1395,8 @@ MenuTexture D_0200189C[2] = { * */ MenuTexture D_020018C4[2] = { - { 3, gTextureEraseDataRecordConfirmation, 180, 32, 70, 29, 0xff4}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureEraseDataRecordConfirmation, 180, 32, 70, 29, 0xff4 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1404,8 +1404,8 @@ MenuTexture D_020018C4[2] = { * */ MenuTexture D_020018EC[2] = { - { 3, gTextureRecordNotErased, 180, 32, 70, 29, 0x8d1}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureRecordNotErased, 180, 32, 70, 29, 0x8d1 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1413,8 +1413,8 @@ MenuTexture D_020018EC[2] = { * */ MenuTexture D_02001914[2] = { - { 3, gTexturePlaceN64ControllerPakIntoController1, 180, 32, 70, 29, 0xc4a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexturePlaceN64ControllerPakIntoController1, 180, 32, 70, 29, 0xc4a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1422,8 +1422,8 @@ MenuTexture D_02001914[2] = { * */ MenuTexture D_0200193C[2] = { - { 3, gTexturePleaseReinsertOriginalN64ControllerPak, 180, 32, 70, 29, 0xcd6}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexturePleaseReinsertOriginalN64ControllerPak, 180, 32, 70, 29, 0xcd6 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1431,8 +1431,8 @@ MenuTexture D_0200193C[2] = { * */ MenuTexture D_02001964[2] = { - { 3, gTextureErasingSelectedRecord, 180, 32, 70, 29, 0xc02}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTextureErasingSelectedRecord, 180, 32, 70, 29, 0xc02 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1494,8 +1494,8 @@ MkAnimation D_020019DC[2] = { * */ MenuTexture D_020019EC[2] = { - { 0, gTextureNameDK, 64, 12, 0, 64, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, texture_name_dk, 64, 12, 0, 64, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1503,8 +1503,8 @@ MenuTexture D_020019EC[2] = { * */ MenuTexture D_02001A14[2] = { - { 0, gTextureNameToad, 64, 12, 0, 64, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, texture_name_toad, 64, 12, 0, 64, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1512,8 +1512,8 @@ MenuTexture D_02001A14[2] = { * */ MenuTexture D_02001A3C[2] = { - { 0, gTextureNameBowser, 64, 12, 0, 64, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, texture_name_bowser, 64, 12, 0, 64, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1521,8 +1521,8 @@ MenuTexture D_02001A3C[2] = { * */ MenuTexture D_02001A64[2] = { - { 0, gTextureNameLuigi, 64, 12, 0, 64, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, texture_name_luigi, 64, 12, 0, 64, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1530,8 +1530,8 @@ MenuTexture D_02001A64[2] = { * */ MenuTexture D_02001A8C[2] = { - { 0, gTextureNameMario, 64, 12, 0, 64, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, texture_name_mario, 64, 12, 0, 64, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1539,8 +1539,8 @@ MenuTexture D_02001A8C[2] = { * */ MenuTexture D_02001AB4[2] = { - { 0, gTextureNamePeach, 64, 12, 0, 64, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, texture_name_peach, 64, 12, 0, 64, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1548,8 +1548,8 @@ MenuTexture D_02001AB4[2] = { * */ MenuTexture D_02001ADC[2] = { - { 0, gTextureNameWario, 64, 12, 0, 64, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, texture_name_wario, 64, 12, 0, 64, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1557,8 +1557,8 @@ MenuTexture D_02001ADC[2] = { * */ MenuTexture D_02001B04[2] = { - { 0, gTextureNameYoshi, 64, 12, 0, 64, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, texture_name_yoshi, 64, 12, 0, 64, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1566,8 +1566,8 @@ MenuTexture D_02001B04[2] = { * */ MenuTexture seg2_mario_raceway_preview_texture[2] = { - { 0, gTextureCoursePreviewMarioRaceway, 128, 78, 0, 0, 0x3157}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewMarioRaceway, 128, 78, 0, 0, 0x3157 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1575,8 +1575,8 @@ MenuTexture seg2_mario_raceway_preview_texture[2] = { * */ MenuTexture D_02001B54[2] = { - { 0, gTextureCoursePreviewChocoMountain, 128, 78, 0, 0, 0x2a24}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewChocoMountain, 128, 78, 0, 0, 0x2a24 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1584,8 +1584,8 @@ MenuTexture D_02001B54[2] = { * */ MenuTexture D_02001B7C[2] = { - { 0, gTextureCoursePreviewBowsersCastle, 128, 78, 0, 0, 0x30de}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewBowsersCastle, 128, 78, 0, 0, 0x30de }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1593,8 +1593,8 @@ MenuTexture D_02001B7C[2] = { * */ MenuTexture D_02001BA4[2] = { - { 0, gTextureCoursePreviewBansheeBoardwalk, 128, 78, 0, 0, 0x26ad}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewBansheeBoardwalk, 128, 78, 0, 0, 0x26ad }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1602,8 +1602,8 @@ MenuTexture D_02001BA4[2] = { * */ MenuTexture D_02001BCC[2] = { - { 0, gTextureCoursePreviewYoshiValley, 128, 78, 0, 0, 0x3a41}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewYoshiValley, 128, 78, 0, 0, 0x3a41 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1611,8 +1611,8 @@ MenuTexture D_02001BCC[2] = { * */ MenuTexture D_02001BF4[2] = { - { 0, gTextureCoursePreviewFrappeSnowland, 128, 78, 0, 0, 0x2409}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewFrappeSnowland, 128, 78, 0, 0, 0x2409 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1620,8 +1620,8 @@ MenuTexture D_02001BF4[2] = { * */ MenuTexture D_02001C1C[2] = { - { 0, gTextureCoursePreviewKoopaTroopaBeach, 128, 78, 0, 0, 0x2323}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewKoopaTroopaBeach, 128, 78, 0, 0, 0x2323 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1629,8 +1629,8 @@ MenuTexture D_02001C1C[2] = { * */ MenuTexture D_02001C44[2] = { - { 0, gTextureCoursePreviewRoyalRaceway, 128, 78, 0, 0, 0x2821}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewRoyalRaceway, 128, 78, 0, 0, 0x2821 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1638,8 +1638,8 @@ MenuTexture D_02001C44[2] = { * */ MenuTexture D_02001C6C[2] = { - { 0, gTextureCoursePreviewLuigiRaceway, 128, 78, 0, 0, 0x2d74}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewLuigiRaceway, 128, 78, 0, 0, 0x2d74 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1647,8 +1647,8 @@ MenuTexture D_02001C6C[2] = { * */ MenuTexture D_02001C94[2] = { - { 0, gTextureCoursePreviewMooMooFarm, 128, 78, 0, 0, 0x25c7}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewMooMooFarm, 128, 78, 0, 0, 0x25c7 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1656,8 +1656,8 @@ MenuTexture D_02001C94[2] = { * */ MenuTexture D_02001CBC[2] = { - { 0, gTextureCoursePreviewToadsTurnpike, 128, 78, 0, 0, 0x299a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewToadsTurnpike, 128, 78, 0, 0, 0x299a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1665,8 +1665,8 @@ MenuTexture D_02001CBC[2] = { * */ MenuTexture D_02001CE4[2] = { - { 0, gTextureCoursePreviewKalimariDesert, 128, 78, 0, 0, 0x280a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewKalimariDesert, 128, 78, 0, 0, 0x280a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1674,8 +1674,8 @@ MenuTexture D_02001CE4[2] = { * */ MenuTexture D_02001D0C[2] = { - { 0, gTextureCoursePreviewSherbetLand, 128, 78, 0, 0, 0x300e}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewSherbetLand, 128, 78, 0, 0, 0x300e }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1683,8 +1683,8 @@ MenuTexture D_02001D0C[2] = { * */ MenuTexture D_02001D34[2] = { - { 0, gTextureCoursePreviewRainbowRoad, 128, 78, 0, 0, 0x2824}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewRainbowRoad, 128, 78, 0, 0, 0x2824 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1692,8 +1692,8 @@ MenuTexture D_02001D34[2] = { * */ MenuTexture D_02001D5C[2] = { - { 0, gTextureCoursePreviewWarioStadium, 128, 78, 0, 0, 0x32d3}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewWarioStadium, 128, 78, 0, 0, 0x32d3 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1701,8 +1701,8 @@ MenuTexture D_02001D5C[2] = { * */ MenuTexture D_02001D84[2] = { - { 0, gTextureCoursePreviewBlockFort, 128, 78, 0, 0, 0x2528}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewBlockFort, 128, 78, 0, 0, 0x2528 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1710,8 +1710,8 @@ MenuTexture D_02001D84[2] = { * */ MenuTexture D_02001DAC[2] = { - { 0, gTextureCoursePreviewSkyscraper, 128, 78, 0, 0, 0x26f0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewSkyscraper, 128, 78, 0, 0, 0x26f0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1719,8 +1719,8 @@ MenuTexture D_02001DAC[2] = { * */ MenuTexture D_02001DD4[2] = { - { 0, gTextureCoursePreviewDoubleDeck, 128, 78, 0, 0, 0x28f7}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewDoubleDeck, 128, 78, 0, 0, 0x28f7 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1728,8 +1728,8 @@ MenuTexture D_02001DD4[2] = { * */ MenuTexture D_02001DFC[2] = { - { 0, gTextureCoursePreviewDksJungleParkway, 128, 78, 0, 0, 0x3ee4}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewDksJungleParkway, 128, 78, 0, 0, 0x3ee4 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1737,8 +1737,8 @@ MenuTexture D_02001DFC[2] = { * */ MenuTexture D_02001E24[2] = { - { 0, gTextureCoursePreviewBigDonut, 128, 78, 0, 0, 0x2f5c}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewBigDonut, 128, 78, 0, 0, 0x2f5c }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1932,8 +1932,8 @@ MkAnimation D_02001F94[2] = { * */ MenuTexture D_02001FA4[2] = { - { 3, gTexture7ED6A4, 68, 51, 0, 0, 0x38e}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7ED6A4, 68, 51, 0, 0, 0x38e }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1941,8 +1941,8 @@ MenuTexture D_02001FA4[2] = { * */ MenuTexture D_02001FCC[2] = { - { 1, gTextureTrophyGold, 45, 45, 0, 0, 0x633}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTrophyGold, 45, 45, 0, 0, 0x633 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1950,8 +1950,8 @@ MenuTexture D_02001FCC[2] = { * */ MenuTexture D_02001FF4[2] = { - { 1, gTextureTrophySilver, 45, 45, 0, 0, 0x629}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTrophySilver, 45, 45, 0, 0, 0x629 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1959,8 +1959,8 @@ MenuTexture D_02001FF4[2] = { * */ MenuTexture D_0200201C[2] = { - { 1, gTextureTrophyBronze, 45, 45, 0, 0, 0x5ec}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTrophyBronze, 45, 45, 0, 0, 0x5ec }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1968,8 +1968,8 @@ MenuTexture D_0200201C[2] = { * */ MenuTexture D_02002044[2] = { - { 1, gTextureCupGold, 45, 45, 0, 0, 0x98a}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureCupGold, 45, 45, 0, 0, 0x98a }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1977,8 +1977,8 @@ MenuTexture D_02002044[2] = { * */ MenuTexture D_0200206C[2] = { - { 1, gTextureCupSilver, 45, 45, 0, 0, 0x985}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureCupSilver, 45, 45, 0, 0, 0x985 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -1986,8 +1986,8 @@ MenuTexture D_0200206C[2] = { * */ MenuTexture D_02002094[2] = { - { 1, gTextureCupBronze, 45, 45, 0, 0, 0x8a2}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureCupBronze, 45, 45, 0, 0, 0x8a2 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2048,405 +2048,405 @@ MkAnimation D_0200210C[2] = { * @brief unknown MenuTexture * */ -MenuTexture D_0200211C[2] = { - { 5, gTexture7F2094, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterA[2] = { + { 5, font_letter_A, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002144[2] = { - { 5, gTexture7F2164, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterB[2] = { + { 5, font_letter_B, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200216C[2] = { - { 5, gTexture7F2234, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterC[2] = { + { 5, font_letter_C, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002194[2] = { - { 5, gTexture7F2304, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterD[2] = { + { 5, font_letter_D, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020021BC[2] = { - { 5, gTexture7F23D4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterE[2] = { + { 5, font_letter_E, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020021E4[2] = { - { 5, gTexture7F24A4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterF[2] = { + { 5, font_letter_F, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200220C[2] = { - { 5, gTexture7F2574, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterG[2] = { + { 5, font_letter_G, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002234[2] = { - { 5, gTexture7F2644, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterH[2] = { + { 5, font_letter_H, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200225C[2] = { - { 5, gTexture7F2714, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterI[2] = { + { 5, font_letter_I, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002284[2] = { - { 5, gTexture7F27E4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterJ[2] = { + { 5, font_letter_J, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020022AC[2] = { - { 5, gTexture7F28B4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterK[2] = { + { 5, font_letter_K, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020022D4[2] = { - { 5, gTexture7F2984, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterL[2] = { + { 5, font_letter_L, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020022FC[2] = { - { 5, gTexture7F2A54, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterM[2] = { + { 5, font_letter_M, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002324[2] = { - { 5, gTexture7F2B24, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterN[2] = { + { 5, font_letter_N, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200234C[2] = { - { 5, gTexture7F2BF4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterO[2] = { + { 5, font_letter_O, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002374[2] = { - { 5, gTexture7F2CC4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterP[2] = { + { 5, font_letter_P, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200239C[2] = { - { 5, gTexture7F2D94, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterQ[2] = { + { 5, font_letter_Q, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020023C4[2] = { - { 5, gTexture7F2E64, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterR[2] = { + { 5, font_letter_R, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020023EC[2] = { - { 5, gTexture7F2F34, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterS[2] = { + { 5, font_letter_S, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002414[2] = { - { 5, gTexture7F3004, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterT[2] = { + { 5, font_letter_T, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200243C[2] = { - { 5, gTexture7F30D4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterU[2] = { + { 5, font_letter_U, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002464[2] = { - { 5, gTexture7F31A4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterV[2] = { + { 5, font_letter_V, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200248C[2] = { - { 5, gTexture7F3274, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterW[2] = { + { 5, font_letter_W, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020024B4[2] = { - { 5, gTexture7F3344, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterX[2] = { + { 5, font_letter_X, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020024DC[2] = { - { 5, gTexture7F3414, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterY[2] = { + { 5, font_letter_Y, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002504[2] = { - { 5, gTexture7F34E4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureFontLetterZ[2] = { + { 5, font_letter_Z, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200252C[2] = { - { 5, gTexture7F1394, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontExclamationMark[2] = { + { 5, font_exclamation_mark, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002554[2] = { - { 5, gTexture7F1464, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontMinus[2] = { + { 5, font_minus, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200257C[2] = { - { 5, gTexture7F16D4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontInterogationMark[2] = { + { 5, font_interogation_mark, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020025A4[2] = { - { 5, gTexture7F17A4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontSimpleQuote[2] = { + { 5, font_simple_quote, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020025CC[2] = { - { 5, gTexture7F12C4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontDoubleQuote[2] = { + { 5, font_double_quote, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020025F4[2] = { - { 5, gTexture7F1604, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontPlus[2] = { + { 5, font_plus, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200261C[2] = { - { 5, gTexture7F1534, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontDot[2] = { + { 5, font_dot, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002644[2] = { - { 5, gTexture7F1124, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontFourDote[2] = { + { 5, font_four_dote, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200266C[2] = { - { 5, gTexture7F11F4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontCC[2] = { + { 5, font_cc, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002694[2] = { - { 5, gTexture7F1874, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontNumberZero[2] = { + { 5, font_number_zero, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020026BC[2] = { - { 5, gTexture7F1944, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontNumberOne[2] = { + { 5, font_number_one, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020026E4[2] = { - { 5, gTexture7F1A14, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontNumberTwo[2] = { + { 5, font_number_two, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200270C[2] = { - { 5, gTexture7F1AE4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontNumberThree[2] = { + { 5, font_number_three, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002734[2] = { - { 5, gTexture7F1BB4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontNumberFour[2] = { + { 5, font_number_four, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_0200275C[2] = { - { 5, gTexture7F1C84, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontNumberFive[2] = { + { 5, font_number_five, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02002784[2] = { - { 5, gTexture7F1D54, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontNumberSix[2] = { + { 5, font_number_six, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020027AC[2] = { - { 5, gTexture7F1E24, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontNumberSeven[2] = { + { 5, font_number_seven, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020027D4[2] = { - { 5, gTexture7F1EF4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontNumberEight[2] = { + { 5, font_number_eight, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_020027FC[2] = { - { 5, gTexture7F1FC4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontNumberNine[2] = { + { 5, font_number_nine, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2454,8 +2454,8 @@ MenuTexture D_020027FC[2] = { * */ MenuTexture D_02002824[2] = { - { 5, gTexture7F35B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F35B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2463,8 +2463,8 @@ MenuTexture D_02002824[2] = { * */ MenuTexture D_0200284C[2] = { - { 5, gTexture7F3634, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3634, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2472,8 +2472,8 @@ MenuTexture D_0200284C[2] = { * */ MenuTexture D_02002874[2] = { - { 5, gTexture7F36B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F36B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2481,8 +2481,8 @@ MenuTexture D_02002874[2] = { * */ MenuTexture D_0200289C[2] = { - { 5, gTexture7F3734, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3734, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2490,8 +2490,8 @@ MenuTexture D_0200289C[2] = { * */ MenuTexture D_020028C4[2] = { - { 5, gTexture7F37B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F37B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2499,8 +2499,8 @@ MenuTexture D_020028C4[2] = { * */ MenuTexture D_020028EC[2] = { - { 5, gTexture7F3AB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3AB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2508,8 +2508,8 @@ MenuTexture D_020028EC[2] = { * */ MenuTexture D_02002914[2] = { - { 5, gTexture7F3B34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3B34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2517,8 +2517,8 @@ MenuTexture D_02002914[2] = { * */ MenuTexture D_0200293C[2] = { - { 5, gTexture7F3BB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3BB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2526,8 +2526,8 @@ MenuTexture D_0200293C[2] = { * */ MenuTexture D_02002964[2] = { - { 5, gTexture7F3C34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3C34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2535,8 +2535,8 @@ MenuTexture D_02002964[2] = { * */ MenuTexture D_0200298C[2] = { - { 5, gTexture7F3CB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3CB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2544,8 +2544,8 @@ MenuTexture D_0200298C[2] = { * */ MenuTexture D_020029B4[2] = { - { 5, gTexture7F3D34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3D34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2553,8 +2553,8 @@ MenuTexture D_020029B4[2] = { * */ MenuTexture D_020029DC[2] = { - { 5, gTexture7F3DB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3DB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2562,8 +2562,8 @@ MenuTexture D_020029DC[2] = { * */ MenuTexture D_02002A04[2] = { - { 5, gTexture7F3E34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3E34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2571,8 +2571,8 @@ MenuTexture D_02002A04[2] = { * */ MenuTexture D_02002A2C[2] = { - { 5, gTexture7F3EB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3EB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2580,8 +2580,8 @@ MenuTexture D_02002A2C[2] = { * */ MenuTexture D_02002A54[2] = { - { 5, gTexture7F3F34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3F34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2589,8 +2589,8 @@ MenuTexture D_02002A54[2] = { * */ MenuTexture D_02002A7C[2] = { - { 5, gTexture7F3FB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3FB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2598,8 +2598,8 @@ MenuTexture D_02002A7C[2] = { * */ MenuTexture D_02002AA4[2] = { - { 5, gTexture7F4034, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4034, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2607,8 +2607,8 @@ MenuTexture D_02002AA4[2] = { * */ MenuTexture D_02002ACC[2] = { - { 5, gTexture7F40B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F40B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2616,8 +2616,8 @@ MenuTexture D_02002ACC[2] = { * */ MenuTexture D_02002AF4[2] = { - { 5, gTexture7F41B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F41B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2625,8 +2625,8 @@ MenuTexture D_02002AF4[2] = { * */ MenuTexture D_02002B1C[2] = { - { 5, gTexture7F4234, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4234, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2634,8 +2634,8 @@ MenuTexture D_02002B1C[2] = { * */ MenuTexture D_02002B44[2] = { - { 5, gTexture7F42B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F42B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2643,8 +2643,8 @@ MenuTexture D_02002B44[2] = { * */ MenuTexture D_02002B6C[2] = { - { 5, gTexture7F4334, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4334, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2652,8 +2652,8 @@ MenuTexture D_02002B6C[2] = { * */ MenuTexture D_02002B94[2] = { - { 5, gTexture7F43B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F43B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2661,8 +2661,8 @@ MenuTexture D_02002B94[2] = { * */ MenuTexture D_02002BBC[2] = { - { 5, gTexture7F4434, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4434, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2670,8 +2670,8 @@ MenuTexture D_02002BBC[2] = { * */ MenuTexture D_02002BE4[2] = { - { 5, gTexture7F44B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F44B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2679,8 +2679,8 @@ MenuTexture D_02002BE4[2] = { * */ MenuTexture D_02002C0C[2] = { - { 5, gTexture7F4534, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4534, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2688,8 +2688,8 @@ MenuTexture D_02002C0C[2] = { * */ MenuTexture D_02002C34[2] = { - { 5, gTexture7F45B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F45B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2697,8 +2697,8 @@ MenuTexture D_02002C34[2] = { * */ MenuTexture D_02002C5C[2] = { - { 5, gTexture7F4634, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4634, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2706,8 +2706,8 @@ MenuTexture D_02002C5C[2] = { * */ MenuTexture D_02002C84[2] = { - { 5, gTexture7F46B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F46B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2715,8 +2715,8 @@ MenuTexture D_02002C84[2] = { * */ MenuTexture D_02002CAC[2] = { - { 5, gTexture7F4734, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4734, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2724,8 +2724,8 @@ MenuTexture D_02002CAC[2] = { * */ MenuTexture D_02002CD4[2] = { - { 5, gTexture7F47B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F47B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2733,8 +2733,8 @@ MenuTexture D_02002CD4[2] = { * */ MenuTexture D_02002CFC[2] = { - { 5, gTexture7F4834, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4834, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2742,8 +2742,8 @@ MenuTexture D_02002CFC[2] = { * */ MenuTexture D_02002D24[2] = { - { 5, gTexture7F48B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F48B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2751,8 +2751,8 @@ MenuTexture D_02002D24[2] = { * */ MenuTexture D_02002D4C[2] = { - { 5, gTexture7F4934, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4934, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2760,8 +2760,8 @@ MenuTexture D_02002D4C[2] = { * */ MenuTexture D_02002D74[2] = { - { 5, gTexture7F49B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F49B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2769,8 +2769,8 @@ MenuTexture D_02002D74[2] = { * */ MenuTexture D_02002D9C[2] = { - { 5, gTexture7F4A34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4A34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2778,8 +2778,8 @@ MenuTexture D_02002D9C[2] = { * */ MenuTexture D_02002DC4[2] = { - { 5, gTexture7F4AB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4AB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2787,8 +2787,8 @@ MenuTexture D_02002DC4[2] = { * */ MenuTexture D_02002DEC[2] = { - { 5, gTexture7F4B34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4B34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2796,8 +2796,8 @@ MenuTexture D_02002DEC[2] = { * */ MenuTexture D_02002E14[2] = { - { 5, gTexture7F4D34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4D34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2805,8 +2805,8 @@ MenuTexture D_02002E14[2] = { * */ MenuTexture D_02002E3C[2] = { - { 5, gTexture7F4DB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4DB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2814,8 +2814,8 @@ MenuTexture D_02002E3C[2] = { * */ MenuTexture D_02002E64[2] = { - { 5, gTexture7F4E34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4E34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2823,8 +2823,8 @@ MenuTexture D_02002E64[2] = { * */ MenuTexture D_02002E8C[2] = { - { 5, gTexture7F4EB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4EB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2832,8 +2832,8 @@ MenuTexture D_02002E8C[2] = { * */ MenuTexture D_02002EB4[2] = { - { 5, gTexture7F4F34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4F34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2841,8 +2841,8 @@ MenuTexture D_02002EB4[2] = { * */ MenuTexture D_02002EDC[2] = { - { 5, gTexture7F4FB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4FB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2850,8 +2850,8 @@ MenuTexture D_02002EDC[2] = { * */ MenuTexture D_02002F04[2] = { - { 5, gTexture7F5034, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5034, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2859,8 +2859,8 @@ MenuTexture D_02002F04[2] = { * */ MenuTexture D_02002F2C[2] = { - { 5, gTexture7F50B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F50B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2868,8 +2868,8 @@ MenuTexture D_02002F2C[2] = { * */ MenuTexture D_02002F54[2] = { - { 5, gTexture7F5134, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5134, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2877,8 +2877,8 @@ MenuTexture D_02002F54[2] = { * */ MenuTexture D_02002F7C[2] = { - { 5, gTexture7F51B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F51B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2886,8 +2886,8 @@ MenuTexture D_02002F7C[2] = { * */ MenuTexture D_02002FA4[2] = { - { 5, gTexture7F5234, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5234, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2895,8 +2895,8 @@ MenuTexture D_02002FA4[2] = { * */ MenuTexture D_02002FCC[2] = { - { 5, gTexture7F52B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F52B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2904,8 +2904,8 @@ MenuTexture D_02002FCC[2] = { * */ MenuTexture D_02002FF4[2] = { - { 5, gTexture7F5334, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5334, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2913,8 +2913,8 @@ MenuTexture D_02002FF4[2] = { * */ MenuTexture D_0200301C[2] = { - { 5, gTexture7F53B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F53B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2922,8 +2922,8 @@ MenuTexture D_0200301C[2] = { * */ MenuTexture D_02003044[2] = { - { 5, gTexture7F5434, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5434, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2931,8 +2931,8 @@ MenuTexture D_02003044[2] = { * */ MenuTexture D_0200306C[2] = { - { 5, gTexture7F54B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F54B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2940,8 +2940,8 @@ MenuTexture D_0200306C[2] = { * */ MenuTexture D_02003094[2] = { - { 5, gTexture7F5534, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5534, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2949,8 +2949,8 @@ MenuTexture D_02003094[2] = { * */ MenuTexture D_020030BC[2] = { - { 5, gTexture7F55B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F55B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2958,8 +2958,8 @@ MenuTexture D_020030BC[2] = { * */ MenuTexture D_020030E4[2] = { - { 5, gTexture7F5634, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5634, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2967,8 +2967,8 @@ MenuTexture D_020030E4[2] = { * */ MenuTexture D_0200310C[2] = { - { 5, gTexture7F56B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F56B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2976,8 +2976,8 @@ MenuTexture D_0200310C[2] = { * */ MenuTexture D_02003134[2] = { - { 5, gTexture7F5734, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5734, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2985,8 +2985,8 @@ MenuTexture D_02003134[2] = { * */ MenuTexture D_0200315C[2] = { - { 5, gTexture7F57B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F57B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -2994,8 +2994,8 @@ MenuTexture D_0200315C[2] = { * */ MenuTexture D_02003184[2] = { - { 5, gTexture7F5834, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5834, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3003,8 +3003,8 @@ MenuTexture D_02003184[2] = { * */ MenuTexture D_020031AC[2] = { - { 5, gTexture7F58B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F58B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3012,8 +3012,8 @@ MenuTexture D_020031AC[2] = { * */ MenuTexture D_020031D4[2] = { - { 5, gTexture7F5934, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5934, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3021,8 +3021,8 @@ MenuTexture D_020031D4[2] = { * */ MenuTexture D_020031FC[2] = { - { 5, gTexture7F59B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F59B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3030,8 +3030,8 @@ MenuTexture D_020031FC[2] = { * */ MenuTexture D_02003224[2] = { - { 5, gTexture7F5A34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5A34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3039,8 +3039,8 @@ MenuTexture D_02003224[2] = { * */ MenuTexture D_0200324C[2] = { - { 5, gTexture7F5AB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5AB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3048,8 +3048,8 @@ MenuTexture D_0200324C[2] = { * */ MenuTexture D_02003274[2] = { - { 5, gTexture7F5B34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5B34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3057,8 +3057,8 @@ MenuTexture D_02003274[2] = { * */ MenuTexture D_0200329C[2] = { - { 5, gTexture7F5BB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5BB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3066,8 +3066,8 @@ MenuTexture D_0200329C[2] = { * */ MenuTexture D_020032C4[2] = { - { 5, gTexture7F5C34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5C34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3075,8 +3075,8 @@ MenuTexture D_020032C4[2] = { * */ MenuTexture D_020032EC[2] = { - { 5, gTexture7F5CB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5CB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3084,8 +3084,8 @@ MenuTexture D_020032EC[2] = { * */ MenuTexture D_02003314[2] = { - { 5, gTexture7F5D34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5D34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3093,8 +3093,8 @@ MenuTexture D_02003314[2] = { * */ MenuTexture D_0200333C[2] = { - { 5, gTexture7F4BB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4BB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3102,8 +3102,8 @@ MenuTexture D_0200333C[2] = { * */ MenuTexture D_02003364[2] = { - { 5, gTexture7F4C34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4C34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3111,8 +3111,8 @@ MenuTexture D_02003364[2] = { * */ MenuTexture D_0200338C[2] = { - { 5, gTexture7F4CB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4CB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3120,8 +3120,8 @@ MenuTexture D_0200338C[2] = { * */ MenuTexture D_020033B4[2] = { - { 5, gTexture7F4134, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F4134, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3129,8 +3129,8 @@ MenuTexture D_020033B4[2] = { * */ MenuTexture D_020033DC[2] = { - { 5, gTexture7F3834, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3834, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3138,8 +3138,8 @@ MenuTexture D_020033DC[2] = { * */ MenuTexture D_02003404[2] = { - { 5, gTexture7F38B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F38B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3147,8 +3147,8 @@ MenuTexture D_02003404[2] = { * */ MenuTexture D_0200342C[2] = { - { 5, gTexture7F3934, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3934, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3156,8 +3156,8 @@ MenuTexture D_0200342C[2] = { * */ MenuTexture D_02003454[2] = { - { 5, gTexture7F39B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F39B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3165,8 +3165,8 @@ MenuTexture D_02003454[2] = { * */ MenuTexture D_0200347C[2] = { - { 5, gTexture7F3A34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F3A34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3174,8 +3174,8 @@ MenuTexture D_0200347C[2] = { * */ MenuTexture D_020034A4[2] = { - { 5, gTexture7F5DB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5DB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3183,8 +3183,8 @@ MenuTexture D_020034A4[2] = { * */ MenuTexture D_020034CC[2] = { - { 5, gTexture7F5E34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5E34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3192,8 +3192,8 @@ MenuTexture D_020034CC[2] = { * */ MenuTexture D_020034F4[2] = { - { 5, gTexture7F5EB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5EB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3201,8 +3201,8 @@ MenuTexture D_020034F4[2] = { * */ MenuTexture D_0200351C[2] = { - { 5, gTexture7F5F34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5F34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3210,8 +3210,8 @@ MenuTexture D_0200351C[2] = { * */ MenuTexture D_02003544[2] = { - { 5, gTexture7F5FB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F5FB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3219,8 +3219,8 @@ MenuTexture D_02003544[2] = { * */ MenuTexture D_0200356C[2] = { - { 5, gTexture7F62B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F62B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3228,8 +3228,8 @@ MenuTexture D_0200356C[2] = { * */ MenuTexture D_02003594[2] = { - { 5, gTexture7F6334, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6334, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3237,8 +3237,8 @@ MenuTexture D_02003594[2] = { * */ MenuTexture D_020035BC[2] = { - { 5, gTexture7F63B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F63B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3246,8 +3246,8 @@ MenuTexture D_020035BC[2] = { * */ MenuTexture D_020035E4[2] = { - { 5, gTexture7F6434, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6434, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3255,8 +3255,8 @@ MenuTexture D_020035E4[2] = { * */ MenuTexture D_0200360C[2] = { - { 5, gTexture7F64B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F64B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3264,8 +3264,8 @@ MenuTexture D_0200360C[2] = { * */ MenuTexture D_02003634[2] = { - { 5, gTexture7F6534, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6534, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3273,8 +3273,8 @@ MenuTexture D_02003634[2] = { * */ MenuTexture D_0200365C[2] = { - { 5, gTexture7F65B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F65B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3282,8 +3282,8 @@ MenuTexture D_0200365C[2] = { * */ MenuTexture D_02003684[2] = { - { 5, gTexture7F6634, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6634, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3291,8 +3291,8 @@ MenuTexture D_02003684[2] = { * */ MenuTexture D_020036AC[2] = { - { 5, gTexture7F66B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F66B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3300,8 +3300,8 @@ MenuTexture D_020036AC[2] = { * */ MenuTexture D_020036D4[2] = { - { 5, gTexture7F6734, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6734, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3309,8 +3309,8 @@ MenuTexture D_020036D4[2] = { * */ MenuTexture D_020036FC[2] = { - { 5, gTexture7F67B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F67B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3318,8 +3318,8 @@ MenuTexture D_020036FC[2] = { * */ MenuTexture D_02003724[2] = { - { 5, gTexture7F6834, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6834, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3327,8 +3327,8 @@ MenuTexture D_02003724[2] = { * */ MenuTexture D_0200374C[2] = { - { 5, gTexture7F68B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F68B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3336,8 +3336,8 @@ MenuTexture D_0200374C[2] = { * */ MenuTexture D_02003774[2] = { - { 5, gTexture7F69B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F69B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3345,8 +3345,8 @@ MenuTexture D_02003774[2] = { * */ MenuTexture D_0200379C[2] = { - { 5, gTexture7F6A34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6A34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3354,8 +3354,8 @@ MenuTexture D_0200379C[2] = { * */ MenuTexture D_020037C4[2] = { - { 5, gTexture7F6AB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6AB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3363,8 +3363,8 @@ MenuTexture D_020037C4[2] = { * */ MenuTexture D_020037EC[2] = { - { 5, gTexture7F6B34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6B34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3372,8 +3372,8 @@ MenuTexture D_020037EC[2] = { * */ MenuTexture D_02003814[2] = { - { 5, gTexture7F6BB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6BB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3381,8 +3381,8 @@ MenuTexture D_02003814[2] = { * */ MenuTexture D_0200383C[2] = { - { 5, gTexture7F6C34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6C34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3390,8 +3390,8 @@ MenuTexture D_0200383C[2] = { * */ MenuTexture D_02003864[2] = { - { 5, gTexture7F6CB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6CB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3399,8 +3399,8 @@ MenuTexture D_02003864[2] = { * */ MenuTexture D_0200388C[2] = { - { 5, gTexture7F6D34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6D34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3408,8 +3408,8 @@ MenuTexture D_0200388C[2] = { * */ MenuTexture D_020038B4[2] = { - { 5, gTexture7F6DB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6DB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3417,8 +3417,8 @@ MenuTexture D_020038B4[2] = { * */ MenuTexture D_020038DC[2] = { - { 5, gTexture7F6E34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6E34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3426,8 +3426,8 @@ MenuTexture D_020038DC[2] = { * */ MenuTexture D_02003904[2] = { - { 5, gTexture7F6EB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6EB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3435,8 +3435,8 @@ MenuTexture D_02003904[2] = { * */ MenuTexture D_0200392C[2] = { - { 5, gTexture7F6F34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6F34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3444,8 +3444,8 @@ MenuTexture D_0200392C[2] = { * */ MenuTexture D_02003954[2] = { - { 5, gTexture7F6FB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6FB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3453,8 +3453,8 @@ MenuTexture D_02003954[2] = { * */ MenuTexture D_0200397C[2] = { - { 5, gTexture7F7034, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7034, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3462,8 +3462,8 @@ MenuTexture D_0200397C[2] = { * */ MenuTexture D_020039A4[2] = { - { 5, gTexture7F70B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F70B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3471,8 +3471,8 @@ MenuTexture D_020039A4[2] = { * */ MenuTexture D_020039CC[2] = { - { 5, gTexture7F7134, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7134, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3480,8 +3480,8 @@ MenuTexture D_020039CC[2] = { * */ MenuTexture D_020039F4[2] = { - { 5, gTexture7F71B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F71B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3489,8 +3489,8 @@ MenuTexture D_020039F4[2] = { * */ MenuTexture D_02003A1C[2] = { - { 5, gTexture7F7234, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7234, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3498,8 +3498,8 @@ MenuTexture D_02003A1C[2] = { * */ MenuTexture D_02003A44[2] = { - { 5, gTexture7F72B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F72B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3507,8 +3507,8 @@ MenuTexture D_02003A44[2] = { * */ MenuTexture D_02003A6C[2] = { - { 5, gTexture7F7334, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7334, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3516,8 +3516,8 @@ MenuTexture D_02003A6C[2] = { * */ MenuTexture D_02003A94[2] = { - { 5, gTexture7F7534, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7534, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3525,8 +3525,8 @@ MenuTexture D_02003A94[2] = { * */ MenuTexture D_02003ABC[2] = { - { 5, gTexture7F75B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F75B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3534,8 +3534,8 @@ MenuTexture D_02003ABC[2] = { * */ MenuTexture D_02003AE4[2] = { - { 5, gTexture7F7634, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7634, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3543,8 +3543,8 @@ MenuTexture D_02003AE4[2] = { * */ MenuTexture D_02003B0C[2] = { - { 5, gTexture7F76B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F76B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3552,8 +3552,8 @@ MenuTexture D_02003B0C[2] = { * */ MenuTexture D_02003B34[2] = { - { 5, gTexture7F7734, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7734, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3561,8 +3561,8 @@ MenuTexture D_02003B34[2] = { * */ MenuTexture D_02003B5C[2] = { - { 5, gTexture7F77B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F77B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3570,8 +3570,8 @@ MenuTexture D_02003B5C[2] = { * */ MenuTexture D_02003B84[2] = { - { 5, gTexture7F7834, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7834, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3579,8 +3579,8 @@ MenuTexture D_02003B84[2] = { * */ MenuTexture D_02003BAC[2] = { - { 5, gTexture7F78B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F78B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3588,8 +3588,8 @@ MenuTexture D_02003BAC[2] = { * */ MenuTexture D_02003BD4[2] = { - { 5, gTexture7F7934, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7934, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3597,8 +3597,8 @@ MenuTexture D_02003BD4[2] = { * */ MenuTexture D_02003BFC[2] = { - { 5, gTexture7F79B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F79B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3606,8 +3606,8 @@ MenuTexture D_02003BFC[2] = { * */ MenuTexture D_02003C24[2] = { - { 5, gTexture7F7A34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7A34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3615,8 +3615,8 @@ MenuTexture D_02003C24[2] = { * */ MenuTexture D_02003C4C[2] = { - { 5, gTexture7F7AB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7AB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3624,8 +3624,8 @@ MenuTexture D_02003C4C[2] = { * */ MenuTexture D_02003C74[2] = { - { 5, gTexture7F7B34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7B34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3633,8 +3633,8 @@ MenuTexture D_02003C74[2] = { * */ MenuTexture D_02003C9C[2] = { - { 5, gTexture7F7BB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7BB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3642,8 +3642,8 @@ MenuTexture D_02003C9C[2] = { * */ MenuTexture D_02003CC4[2] = { - { 5, gTexture7F7C34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7C34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3651,8 +3651,8 @@ MenuTexture D_02003CC4[2] = { * */ MenuTexture D_02003CEC[2] = { - { 5, gTexture7F7CB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7CB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3660,8 +3660,8 @@ MenuTexture D_02003CEC[2] = { * */ MenuTexture D_02003D14[2] = { - { 5, gTexture7F7D34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7D34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3669,8 +3669,8 @@ MenuTexture D_02003D14[2] = { * */ MenuTexture D_02003D3C[2] = { - { 5, gTexture7F7DB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7DB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3678,8 +3678,8 @@ MenuTexture D_02003D3C[2] = { * */ MenuTexture D_02003D64[2] = { - { 5, gTexture7F7E34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7E34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3687,8 +3687,8 @@ MenuTexture D_02003D64[2] = { * */ MenuTexture D_02003D8C[2] = { - { 5, gTexture7F7EB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7EB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3696,8 +3696,8 @@ MenuTexture D_02003D8C[2] = { * */ MenuTexture D_02003DB4[2] = { - { 5, gTexture7F7F34, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7F34, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3705,8 +3705,8 @@ MenuTexture D_02003DB4[2] = { * */ MenuTexture D_02003DDC[2] = { - { 5, gTexture7F7FB4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7FB4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3714,8 +3714,8 @@ MenuTexture D_02003DDC[2] = { * */ MenuTexture D_02003E04[2] = { - { 5, gTexture7F8034, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8034, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3723,8 +3723,8 @@ MenuTexture D_02003E04[2] = { * */ MenuTexture D_02003E2C[2] = { - { 5, gTexture7F80B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F80B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3732,8 +3732,8 @@ MenuTexture D_02003E2C[2] = { * */ MenuTexture D_02003E54[2] = { - { 5, gTexture7F8134, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8134, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3741,8 +3741,8 @@ MenuTexture D_02003E54[2] = { * */ MenuTexture D_02003E7C[2] = { - { 5, gTexture7F81B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F81B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3750,8 +3750,8 @@ MenuTexture D_02003E7C[2] = { * */ MenuTexture D_02003EA4[2] = { - { 5, gTexture7F8234, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8234, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3759,8 +3759,8 @@ MenuTexture D_02003EA4[2] = { * */ MenuTexture D_02003ECC[2] = { - { 5, gTexture7F82B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F82B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3768,8 +3768,8 @@ MenuTexture D_02003ECC[2] = { * */ MenuTexture D_02003EF4[2] = { - { 5, gTexture7F8334, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8334, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3777,8 +3777,8 @@ MenuTexture D_02003EF4[2] = { * */ MenuTexture D_02003F1C[2] = { - { 5, gTexture7F83B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F83B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3786,8 +3786,8 @@ MenuTexture D_02003F1C[2] = { * */ MenuTexture D_02003F44[2] = { - { 5, gTexture7F8434, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8434, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3795,8 +3795,8 @@ MenuTexture D_02003F44[2] = { * */ MenuTexture D_02003F6C[2] = { - { 5, gTexture7F84B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F84B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3804,8 +3804,8 @@ MenuTexture D_02003F6C[2] = { * */ MenuTexture D_02003F94[2] = { - { 5, gTexture7F8534, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8534, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3813,8 +3813,8 @@ MenuTexture D_02003F94[2] = { * */ MenuTexture D_02003FBC[2] = { - { 5, gTexture7F73B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F73B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3822,8 +3822,8 @@ MenuTexture D_02003FBC[2] = { * */ MenuTexture D_02003FE4[2] = { - { 5, gTexture7F7434, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F7434, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3831,8 +3831,8 @@ MenuTexture D_02003FE4[2] = { * */ MenuTexture D_0200400C[2] = { - { 5, gTexture7F74B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F74B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3840,8 +3840,8 @@ MenuTexture D_0200400C[2] = { * */ MenuTexture D_02004034[2] = { - { 5, gTexture7F6934, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6934, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3849,8 +3849,8 @@ MenuTexture D_02004034[2] = { * */ MenuTexture D_0200405C[2] = { - { 5, gTexture7F6034, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6034, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3858,8 +3858,8 @@ MenuTexture D_0200405C[2] = { * */ MenuTexture D_02004084[2] = { - { 5, gTexture7F60B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F60B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3867,8 +3867,8 @@ MenuTexture D_02004084[2] = { * */ MenuTexture D_020040AC[2] = { - { 5, gTexture7F6134, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6134, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3876,8 +3876,8 @@ MenuTexture D_020040AC[2] = { * */ MenuTexture D_020040D4[2] = { - { 5, gTexture7F61B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F61B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3885,8 +3885,8 @@ MenuTexture D_020040D4[2] = { * */ MenuTexture D_020040FC[2] = { - { 5, gTexture7F6234, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F6234, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3894,8 +3894,8 @@ MenuTexture D_020040FC[2] = { * */ MenuTexture D_02004124[2] = { - { 5, gTexture7F9BF4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9BF4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3903,8 +3903,8 @@ MenuTexture D_02004124[2] = { * */ MenuTexture D_0200414C[2] = { - { 5, gTexture7F8734, 30, 32, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8734, 30, 32, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3912,8 +3912,8 @@ MenuTexture D_0200414C[2] = { * */ MenuTexture D_02004174[2] = { - { 5, gTexture7F8914, 30, 32, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8914, 30, 32, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3921,8 +3921,8 @@ MenuTexture D_02004174[2] = { * */ MenuTexture D_0200419C[2] = { - { 5, gTexture7F8AF4, 30, 32, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8AF4, 30, 32, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3930,8 +3930,8 @@ MenuTexture D_0200419C[2] = { * */ MenuTexture D_020041C4[2] = { - { 5, gTexture7F8CD4, 30, 32, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8CD4, 30, 32, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3939,8 +3939,8 @@ MenuTexture D_020041C4[2] = { * */ MenuTexture D_020041EC[2] = { - { 5, gTexture7F8EB4, 30, 32, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8EB4, 30, 32, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3948,8 +3948,8 @@ MenuTexture D_020041EC[2] = { * */ MenuTexture D_02004214[2] = { - { 5, gTexture7F9094, 30, 32, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9094, 30, 32, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3957,8 +3957,8 @@ MenuTexture D_02004214[2] = { * */ MenuTexture D_0200423C[2] = { - { 5, gTexture7F9274, 30, 32, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9274, 30, 32, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3966,8 +3966,8 @@ MenuTexture D_0200423C[2] = { * */ MenuTexture D_02004264[2] = { - { 5, gTexture7F9454, 30, 32, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9454, 30, 32, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3975,8 +3975,8 @@ MenuTexture D_02004264[2] = { * */ MenuTexture D_0200428C[2] = { - { 5, gTexture7F9634, 30, 32, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9634, 30, 32, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3984,8 +3984,8 @@ MenuTexture D_0200428C[2] = { * */ MenuTexture D_020042B4[2] = { - { 5, gTexture7F9814, 30, 32, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9814, 30, 32, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -3993,8 +3993,8 @@ MenuTexture D_020042B4[2] = { * */ MenuTexture D_020042DC[2] = { - { 5, gTexture7F85B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F85B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4002,8 +4002,8 @@ MenuTexture D_020042DC[2] = { * */ MenuTexture D_02004304[2] = { - { 5, gTexture7F8634, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F8634, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4011,8 +4011,8 @@ MenuTexture D_02004304[2] = { * */ MenuTexture D_0200432C[2] = { - { 5, gTexture7F86B4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F86B4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4020,8 +4020,8 @@ MenuTexture D_0200432C[2] = { * */ MenuTexture D_02004354[2] = { - { 5, gTexture7F99F4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F99F4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4029,8 +4029,8 @@ MenuTexture D_02004354[2] = { * */ MenuTexture D_0200437C[2] = { - { 5, gTexture7F9A74, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9A74, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4038,8 +4038,8 @@ MenuTexture D_0200437C[2] = { * */ MenuTexture D_020043A4[2] = { - { 5, gTexture7F9CF4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9CF4, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4047,8 +4047,8 @@ MenuTexture D_020043A4[2] = { * */ MenuTexture D_020043CC[2] = { - { 5, gTexture7F9DC4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9DC4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4056,8 +4056,8 @@ MenuTexture D_020043CC[2] = { * */ MenuTexture D_020043F4[2] = { - { 5, gTexture7F9E44, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9E44, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4065,8 +4065,8 @@ MenuTexture D_020043F4[2] = { * */ MenuTexture D_0200441C[2] = { - { 5, gTexture7F9EC4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9EC4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4074,8 +4074,8 @@ MenuTexture D_0200441C[2] = { * */ MenuTexture D_02004444[2] = { - { 5, gTexture7FA044, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, font_apostrophe, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4083,8 +4083,8 @@ MenuTexture D_02004444[2] = { * */ MenuTexture D_0200446C[2] = { - { 5, gTexture7FA0C4, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7FA0C4, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4092,8 +4092,8 @@ MenuTexture D_0200446C[2] = { * */ MenuTexture D_02004494[2] = { - { 5, gTexture7FA194, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7FA194, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4101,8 +4101,8 @@ MenuTexture D_02004494[2] = { * */ MenuTexture D_020044BC[2] = { - { 5, gTexture7FA264, 26, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7FA264, 26, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4110,8 +4110,8 @@ MenuTexture D_020044BC[2] = { * */ MenuTexture D_020044E4[2] = { - { 5, gTexture7F9AF4, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9AF4, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4119,17 +4119,17 @@ MenuTexture D_020044E4[2] = { * */ MenuTexture D_0200450C[2] = { - { 5, gTexture7F9B74, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9B74, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown MenuTexture * */ -MenuTexture D_02004534[2] = { - { 5, gTexture7FA334, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontComma[2] = { + { 5, font_comma, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4137,16 +4137,16 @@ MenuTexture D_02004534[2] = { * */ MenuTexture D_0200455C[2] = { - { 5, gTexture7F9C74, 16, 16, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 5, gTexture7F9C74, 16, 16, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief unknown empty MenuTexture * */ -MenuTexture D_02004584[1] = { - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture gTextureFontEmpty[1] = { + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4154,8 +4154,8 @@ MenuTexture D_02004584[1] = { * */ MenuTexture seg2_blue_sky_background_texture[2] = { - { 0, gTextureBackgroundBlueSky, 320, 240, 0, 0, 0xcd60}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, background_blue_sky, 320, 240, 0, 0, 0xcd60 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4163,8 +4163,8 @@ MenuTexture seg2_blue_sky_background_texture[2] = { * */ MenuTexture seg2_sunset_background_texture[2] = { - { 0, gTextureBackgroundSunset, 320, 240, 0, 0, 0x93c4}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, background_sunset, 320, 240, 0, 0, 0x93c4 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4172,8 +4172,8 @@ MenuTexture seg2_sunset_background_texture[2] = { * */ MenuTexture seg2_copyright_1996_texture[2] = { - { 1, gTextureCopyright1996, 124, 17, 98, 199, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, copyright_1996, 124, 17, 98, 199, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4181,8 +4181,8 @@ MenuTexture seg2_copyright_1996_texture[2] = { * */ MenuTexture seg2_push_start_button_texture[2] = { - { 1, gTexturePushStartButton, 159, 16, 81, 179, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, push_start_button, 159, 16, 81, 179, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4190,8 +4190,8 @@ MenuTexture seg2_push_start_button_texture[2] = { * */ MenuTexture D_02004638[2] = { - { 0, gTextureOption, 130, 32, 95, 16, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, texture_option, 130, 32, 95, 16, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4199,8 +4199,8 @@ MenuTexture D_02004638[2] = { * */ MenuTexture seg2_game_select_texture[2] = { - { 0, gTextureGameSelect, 200, 32, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, texture_game_select, 200, 32, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4208,10 +4208,10 @@ MenuTexture seg2_game_select_texture[2] = { * */ MenuTexture seg2_menu_1p_column[4] = { - { 1, gTextureMenu1PGame, 64, 54, 0, 0, 0x0}, - { 1, gTextureMenuModeMarioGP, 64, 18, 0, 65, 0x0}, - { 1, gTextureMenuModeTimeTrials, 64, 18, 0, 83, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_menu_1p_game, 64, 54, 0, 0, 0x0 }, + { 1, texture_mode_mario_gp, 64, 18, 0, 65, 0x0 }, + { 1, texture_mode_time_trials, 64, 18, 0, 83, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4219,11 +4219,11 @@ MenuTexture seg2_menu_1p_column[4] = { * */ MenuTexture seg2_menu_2p_column[5] = { - { 1, gTextureMenu2PGame, 64, 54, 0, 0, 0x0}, - { 1, gTextureMenuModeMarioGP, 64, 18, 0, 65, 0x0}, - { 1, gTextureMenuModeVS, 64, 18, 0, 83, 0x0}, - { 1, gTextureMenuModeBattle, 64, 18, 0, 101, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_menu_2p_game, 64, 54, 0, 0, 0x0 }, + { 1, texture_mode_mario_gp, 64, 18, 0, 65, 0x0 }, + { 1, texture_mode_vs, 64, 18, 0, 83, 0x0 }, + { 1, texture_mode_battle, 64, 18, 0, 101, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4231,10 +4231,10 @@ MenuTexture seg2_menu_2p_column[5] = { * */ MenuTexture seg2_menu_3p_column[4] = { - { 1, gTextureMenu3PGame, 64, 54, 0, 0, 0x0}, - { 1, gTextureMenuModeVS, 64, 18, 0, 65, 0x0}, - { 1, gTextureMenuModeBattle, 64, 18, 0, 83, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_menu_3p_game, 64, 54, 0, 0, 0x0 }, + { 1, texture_mode_vs, 64, 18, 0, 65, 0x0 }, + { 1, texture_mode_battle, 64, 18, 0, 83, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4242,10 +4242,10 @@ MenuTexture seg2_menu_3p_column[4] = { * */ MenuTexture seg2_menu_4p_column[4] = { - { 1, gTextureMenu4PGame, 64, 54, 0, 0, 0x0}, - { 1, gTextureMenuModeVS, 64, 18, 0, 65, 0x0}, - { 1, gTextureMenuModeBattle, 64, 18, 0, 83, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_menu_4p_game, 64, 54, 0, 0, 0x0 }, + { 1, texture_mode_vs, 64, 18, 0, 65, 0x0 }, + { 1, texture_mode_battle, 64, 18, 0, 83, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4253,8 +4253,8 @@ MenuTexture seg2_menu_4p_column[4] = { * */ MenuTexture D_020047DC[2] = { - { 1, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_small_green_triangle, 12, 7, 27, 56, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4262,8 +4262,8 @@ MenuTexture D_020047DC[2] = { * */ MenuTexture D_02004804[2] = { - { 1, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_small_green_triangle, 12, 7, 27, 56, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4271,8 +4271,8 @@ MenuTexture D_02004804[2] = { * */ MenuTexture D_0200482C[2] = { - { 1, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_small_green_triangle, 12, 7, 27, 56, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4280,8 +4280,8 @@ MenuTexture D_0200482C[2] = { * */ MenuTexture D_02004854[2] = { - { 1, gTextureSmallGreenTriangle, 12, 7, 27, 56, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_small_green_triangle, 12, 7, 27, 56, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4289,26 +4289,26 @@ MenuTexture D_02004854[2] = { * */ MenuTexture D_0200487C[2] = { - { 1, gTextureMenuOK, 31, 19, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_ok, 31, 19, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief MenuTexture for Menu L Option * */ -MenuTexture D_020048A4[2] = { - { 1, gTextureMenuLOption, 58, 19, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureMenuLOption[2] = { + { 1, texture_l_option, 58, 19, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** * @brief MenuTexture for Menu R Option * */ -MenuTexture D_020048CC[2] = { - { 1, gTextureMenuRData, 58, 19, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, +MenuTexture seg2_textureMenuRData[2] = { + { 1, texture_r_data, 58, 19, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4316,8 +4316,8 @@ MenuTexture D_020048CC[2] = { * */ MenuTexture seg2_50_CC_texture[2] = { - { 1, gTextureMenu50cc, 64, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_50cc, 64, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4325,8 +4325,8 @@ MenuTexture seg2_50_CC_texture[2] = { * */ MenuTexture seg2_100_CC_texture[2] = { - { 1, gTextureMenu100cc, 64, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_100cc, 64, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4334,8 +4334,8 @@ MenuTexture seg2_100_CC_texture[2] = { * */ MenuTexture seg2_150_CC_texture[2] = { - { 1, gTextureMenu150cc, 64, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_150cc, 64, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4343,8 +4343,8 @@ MenuTexture seg2_150_CC_texture[2] = { * */ MenuTexture seg2_extra_CC_texture[2] = { - { 1, gTextureMenuExtra, 64, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_extra, 64, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4352,8 +4352,8 @@ MenuTexture seg2_extra_CC_texture[2] = { * */ MenuTexture seg2_menu_no_item_texture[2] = { - { 1, gTextureMenuWithoutItem, 64, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureMenuWithoutItem, 64, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4361,8 +4361,8 @@ MenuTexture seg2_menu_no_item_texture[2] = { * */ MenuTexture D_020049BC[2] = { - { 1, gTextureMenuWithItem, 64, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureMenuWithItem, 64, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4370,8 +4370,8 @@ MenuTexture D_020049BC[2] = { * */ MenuTexture D_020049E4[2] = { - { 1, gTextureMenuBegin, 64, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_begin, 64, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4379,8 +4379,8 @@ MenuTexture D_020049E4[2] = { * */ MenuTexture D_02004A0C[2] = { - { 1, gTextureMenuGhost, 64, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_menu_ghost, 64, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4388,8 +4388,8 @@ MenuTexture D_02004A0C[2] = { * */ MenuTexture seg2_data_texture[2] = { - { 1, gTextureMenuData, 64, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_data, 64, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4397,9 +4397,9 @@ MenuTexture seg2_data_texture[2] = { * */ MenuTexture seg2_P1_border_texture[3] = { - { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c}, - { 4, gTextureP1BorderBlue, 64, 64, 0, 0, 0x0000}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c }, + { 4, gTextureP1BorderBlue, 64, 64, 0, 0, 0x0000 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4407,9 +4407,9 @@ MenuTexture seg2_P1_border_texture[3] = { * */ MenuTexture seg2_P2_border_texture[3] = { - { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c}, - { 4, gTextureP2BorderRed, 64, 64, 0, 0, 0x0000}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c }, + { 4, gTextureP2BorderRed, 64, 64, 0, 0, 0x0000 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4417,9 +4417,9 @@ MenuTexture seg2_P2_border_texture[3] = { * */ MenuTexture seg2_P3_border_texture[3] = { - { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c}, - { 4, gTextureP3BorderOrange, 64, 64, 0, 0, 0x0000}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c }, + { 4, gTextureP3BorderOrange, 64, 64, 0, 0, 0x0000 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4427,9 +4427,9 @@ MenuTexture seg2_P3_border_texture[3] = { * */ MenuTexture seg2_P4_border_texture[3] = { - { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c}, - { 4, gTextureP4BorderGreen, 64, 64, 0, 0, 0x0000}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 3, gTexture7E56E4, 64, 64, 0, 0, 0x116c }, + { 4, gTextureP4BorderGreen, 64, 64, 0, 0, 0x0000 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4437,8 +4437,8 @@ MenuTexture seg2_P4_border_texture[3] = { * */ MenuTexture D_02004B4C[2] = { - { 0, gTexturePlayerSelect, 220, 32, 51, 16, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, texture_player_select, 220, 32, 51, 16, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4446,8 +4446,8 @@ MenuTexture D_02004B4C[2] = { * */ MenuTexture D_02004B74[2] = { - { 1, gTextureMenuOK, 31, 19, 264, 202, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_ok, 31, 19, 264, 202, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4455,8 +4455,8 @@ MenuTexture D_02004B74[2] = { * */ MenuTexture seg2_menu_select_texture[2] = { - { 0, gTextureMapSelect, 190, 32, 65, 18, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMapSelect, 190, 32, 65, 18, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4464,8 +4464,8 @@ MenuTexture seg2_menu_select_texture[2] = { * */ MenuTexture seg2_mushroom_cup_texture[2] = { - { 1, gTextureMenuMushroomCup, 65, 40, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureMenuMushroomCup, 65, 40, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4473,8 +4473,8 @@ MenuTexture seg2_mushroom_cup_texture[2] = { * */ MenuTexture seg2_flower_cup_texture[2] = { - { 1, gTextureMenuFlowerCup, 65, 40, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureMenuFlowerCup, 65, 40, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4482,8 +4482,8 @@ MenuTexture seg2_flower_cup_texture[2] = { * */ MenuTexture seg2_star_cup_texture[2] = { - { 1, gTextureMenuStarCup, 65, 40, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureMenuStarCup, 65, 40, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4491,8 +4491,8 @@ MenuTexture seg2_star_cup_texture[2] = { * */ MenuTexture seg2_special_cup_texture[2] = { - { 1, gTextureMenuSpecialCup, 65, 40, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureMenuSpecialCup, 65, 40, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4500,8 +4500,8 @@ MenuTexture seg2_special_cup_texture[2] = { * */ MenuTexture seg2_mario_raceway_preview_small_texture[2] = { - { 0, gTextureCoursePreviewMarioRaceway, 128, 78, 23, 112, 0x1e3d}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureCoursePreviewMarioRaceway, 128, 78, 23, 112, 0x1e3d }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4509,11 +4509,11 @@ MenuTexture seg2_mario_raceway_preview_small_texture[2] = { * */ MenuTexture seg2_mushroom_cup_title_texture[5] = { - { 1, gTextureTitleLuigiRaceway, 140, 18, 157, 112, 0x0}, - { 1, gTextureTitleMooMooFarm, 140, 18, 157, 136, 0x0}, - { 1, gTextureTitleKoopaTroopaBeach, 140, 18, 157, 160, 0x0}, - { 1, gTextureTitleKalimariDesert, 140, 18, 157, 184, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleLuigiRaceway, 140, 18, 157, 112, 0x0 }, + { 1, gTextureTitleMooMooFarm, 140, 18, 157, 136, 0x0 }, + { 1, gTextureTitleKoopaTroopaBeach, 140, 18, 157, 160, 0x0 }, + { 1, gTextureTitleKalimariDesert, 140, 18, 157, 184, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4521,11 +4521,11 @@ MenuTexture seg2_mushroom_cup_title_texture[5] = { * */ MenuTexture seg2_flower_cup_title_texture[5] = { - { 1, gTextureTitleToadsTurnpike, 140, 18, 157, 112, 0x0}, - { 1, gTextureTitleFrappeSnowland, 140, 18, 157, 136, 0x0}, - { 1, gTextureTitleChocoMountain, 140, 18, 157, 160, 0x0}, - { 1, gTextureTitleMarioRaceway, 140, 18, 157, 184, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleToadsTurnpike, 140, 18, 157, 112, 0x0 }, + { 1, gTextureTitleFrappeSnowland, 140, 18, 157, 136, 0x0 }, + { 1, gTextureTitleChocoMountain, 140, 18, 157, 160, 0x0 }, + { 1, gTextureTitleMarioRaceway, 140, 18, 157, 184, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4533,11 +4533,11 @@ MenuTexture seg2_flower_cup_title_texture[5] = { * */ MenuTexture seg2_star_cup_title_texture[5] = { - { 1, gTextureTitleWarioStadium, 140, 18, 157, 112, 0x0}, - { 1, gTextureTitleSherbetLand, 140, 18, 157, 136, 0x0}, - { 1, gTextureTitleRoyalRaceway, 140, 18, 157, 160, 0x0}, - { 1, gTextureTitleBowsersCastle, 140, 18, 157, 184, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleWarioStadium, 140, 18, 157, 112, 0x0 }, + { 1, gTextureTitleSherbetLand, 140, 18, 157, 136, 0x0 }, + { 1, gTextureTitleRoyalRaceway, 140, 18, 157, 160, 0x0 }, + { 1, gTextureTitleBowsersCastle, 140, 18, 157, 184, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4545,11 +4545,11 @@ MenuTexture seg2_star_cup_title_texture[5] = { * */ MenuTexture seg2_special_cup_title_texture[5] = { - { 1, gTextureTitleDKsJungleParkway, 140, 18, 157, 112, 0x0}, - { 1, gTextureTitleYoshiValley, 140, 18, 157, 136, 0x0}, - { 1, gTextureTitleBansheeBoardwalk, 140, 18, 157, 160, 0x0}, - { 1, gTextureTitleRainbowRoad, 140, 18, 157, 184, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleDKsJungleParkway, 140, 18, 157, 112, 0x0 }, + { 1, gTextureTitleYoshiValley, 140, 18, 157, 136, 0x0 }, + { 1, gTextureTitleBansheeBoardwalk, 140, 18, 157, 160, 0x0 }, + { 1, gTextureTitleRainbowRoad, 140, 18, 157, 184, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4557,11 +4557,11 @@ MenuTexture seg2_special_cup_title_texture[5] = { * */ MenuTexture seg2_battle_title_texture[5] = { - { 1, gTextureTitleBigDonut, 140, 18, 157, 112, 0x0}, - { 1, gTextureTitleBlockFort, 140, 18, 157, 136, 0x0}, - { 1, gTextureTitleDoubleDeck, 140, 18, 157, 160, 0x0}, - { 1, gTextureTitleSkyscraper, 140, 18, 157, 184, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleBigDonut, 140, 18, 157, 112, 0x0 }, + { 1, gTextureTitleBlockFort, 140, 18, 157, 136, 0x0 }, + { 1, gTextureTitleDoubleDeck, 140, 18, 157, 160, 0x0 }, + { 1, gTextureTitleSkyscraper, 140, 18, 157, 184, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4569,8 +4569,8 @@ MenuTexture seg2_battle_title_texture[5] = { * */ MenuTexture D_02004E80[2] = { - { 1, gTextureMenuOK, 31, 19, 265, 208, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, texture_ok, 31, 19, 265, 208, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4578,8 +4578,8 @@ MenuTexture D_02004E80[2] = { * */ MenuTexture seg2_mario_raceway_title_texture[2] = { - { 1, gTextureTitleMarioRaceway, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleMarioRaceway, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4587,8 +4587,8 @@ MenuTexture seg2_mario_raceway_title_texture[2] = { * */ MenuTexture seg2_choco_mountain_title_texture[2] = { - { 1, gTextureTitleChocoMountain, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleChocoMountain, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4596,8 +4596,8 @@ MenuTexture seg2_choco_mountain_title_texture[2] = { * */ MenuTexture D_02004EF8[2] = { - { 1, gTextureTitleBowsersCastle, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleBowsersCastle, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4605,8 +4605,8 @@ MenuTexture D_02004EF8[2] = { * */ MenuTexture D_02004F20[2] = { - { 1, gTextureTitleBansheeBoardwalk, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleBansheeBoardwalk, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4614,8 +4614,8 @@ MenuTexture D_02004F20[2] = { * */ MenuTexture D_02004F48[2] = { - { 1, gTextureTitleYoshiValley, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleYoshiValley, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4623,8 +4623,8 @@ MenuTexture D_02004F48[2] = { * */ MenuTexture D_02004F70[2] = { - { 1, gTextureTitleFrappeSnowland, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleFrappeSnowland, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4632,8 +4632,8 @@ MenuTexture D_02004F70[2] = { * */ MenuTexture D_02004F98[2] = { - { 1, gTextureTitleKoopaTroopaBeach, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleKoopaTroopaBeach, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4641,8 +4641,8 @@ MenuTexture D_02004F98[2] = { * */ MenuTexture D_02004FC0[2] = { - { 1, gTextureTitleRoyalRaceway, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleRoyalRaceway, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4650,8 +4650,8 @@ MenuTexture D_02004FC0[2] = { * */ MenuTexture D_02004FE8[2] = { - { 1, gTextureTitleLuigiRaceway, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleLuigiRaceway, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4659,8 +4659,8 @@ MenuTexture D_02004FE8[2] = { * */ MenuTexture D_02005010[2] = { - { 1, gTextureTitleMooMooFarm, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleMooMooFarm, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4668,8 +4668,8 @@ MenuTexture D_02005010[2] = { * */ MenuTexture D_02005038[2] = { - { 1, gTextureTitleToadsTurnpike, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleToadsTurnpike, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4677,8 +4677,8 @@ MenuTexture D_02005038[2] = { * */ MenuTexture D_02005060[2] = { - { 1, gTextureTitleKalimariDesert, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleKalimariDesert, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4686,8 +4686,8 @@ MenuTexture D_02005060[2] = { * */ MenuTexture D_02005088[2] = { - { 1, gTextureTitleSherbetLand, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleSherbetLand, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4695,8 +4695,8 @@ MenuTexture D_02005088[2] = { * */ MenuTexture D_020050B0[2] = { - { 1, gTextureTitleRainbowRoad, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleRainbowRoad, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4704,8 +4704,8 @@ MenuTexture D_020050B0[2] = { * */ MenuTexture D_020050D8[2] = { - { 1, gTextureTitleWarioStadium, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleWarioStadium, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4713,8 +4713,8 @@ MenuTexture D_020050D8[2] = { * */ MenuTexture D_02005100[2] = { - { 1, gTextureTitleBlockFort, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleBlockFort, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4722,8 +4722,8 @@ MenuTexture D_02005100[2] = { * */ MenuTexture D_02005128[2] = { - { 1, gTextureTitleSkyscraper, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleSkyscraper, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4731,8 +4731,8 @@ MenuTexture D_02005128[2] = { * */ MenuTexture D_02005150[2] = { - { 1, gTextureTitleDoubleDeck, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleDoubleDeck, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4740,8 +4740,8 @@ MenuTexture D_02005150[2] = { * */ MenuTexture D_02005178[2] = { - { 1, gTextureTitleDKsJungleParkway, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleDKsJungleParkway, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4749,8 +4749,8 @@ MenuTexture D_02005178[2] = { * */ MenuTexture D_020051A0[2] = { - { 1, gTextureTitleBigDonut, 140, 18, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 1, gTextureTitleBigDonut, 140, 18, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4758,8 +4758,8 @@ MenuTexture D_020051A0[2] = { * */ MenuTexture D_020051C8[2] = { - { 0, gTextureMarioFace00, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace00, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4767,8 +4767,8 @@ MenuTexture D_020051C8[2] = { * */ MenuTexture D_020051F0[2] = { - { 0, gTextureMarioFace01, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace01, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4776,8 +4776,8 @@ MenuTexture D_020051F0[2] = { * */ MenuTexture D_02005218[2] = { - { 0, gTextureMarioFace02, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace02, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4785,8 +4785,8 @@ MenuTexture D_02005218[2] = { * */ MenuTexture D_02005240[2] = { - { 0, gTextureMarioFace03, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace03, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4794,8 +4794,8 @@ MenuTexture D_02005240[2] = { * */ MenuTexture D_02005268[2] = { - { 0, gTextureMarioFace04, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace04, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4803,8 +4803,8 @@ MenuTexture D_02005268[2] = { * */ MenuTexture D_02005290[2] = { - { 0, gTextureMarioFace05, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace05, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4812,8 +4812,8 @@ MenuTexture D_02005290[2] = { * */ MenuTexture D_020052B8[2] = { - { 0, gTextureMarioFace06, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace06, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4821,8 +4821,8 @@ MenuTexture D_020052B8[2] = { * */ MenuTexture D_020052E0[2] = { - { 0, gTextureMarioFace07, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace07, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4830,8 +4830,8 @@ MenuTexture D_020052E0[2] = { * */ MenuTexture D_02005308[2] = { - { 0, gTextureMarioFace08, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace08, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4839,8 +4839,8 @@ MenuTexture D_02005308[2] = { * */ MenuTexture D_02005330[2] = { - { 0, gTextureMarioFace09, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace09, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4848,8 +4848,8 @@ MenuTexture D_02005330[2] = { * */ MenuTexture D_02005358[2] = { - { 0, gTextureMarioFace10, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace10, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4857,8 +4857,8 @@ MenuTexture D_02005358[2] = { * */ MenuTexture D_02005380[2] = { - { 0, gTextureMarioFace11, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace11, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4866,8 +4866,8 @@ MenuTexture D_02005380[2] = { * */ MenuTexture D_020053A8[2] = { - { 0, gTextureMarioFace12, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace12, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4875,8 +4875,8 @@ MenuTexture D_020053A8[2] = { * */ MenuTexture D_020053D0[2] = { - { 0, gTextureMarioFace13, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace13, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4884,8 +4884,8 @@ MenuTexture D_020053D0[2] = { * */ MenuTexture D_020053F8[2] = { - { 0, gTextureMarioFace14, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace14, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4893,8 +4893,8 @@ MenuTexture D_020053F8[2] = { * */ MenuTexture D_02005420[2] = { - { 0, gTextureMarioFace15, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace15, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4902,8 +4902,8 @@ MenuTexture D_02005420[2] = { * */ MenuTexture D_02005448[2] = { - { 0, gTextureMarioFace16, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureMarioFace16, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4911,8 +4911,8 @@ MenuTexture D_02005448[2] = { * */ MenuTexture D_02005470[2] = { - { 0, gTextureLuigiFace00, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace00, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4920,8 +4920,8 @@ MenuTexture D_02005470[2] = { * */ MenuTexture D_02005498[2] = { - { 0, gTextureLuigiFace01, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace01, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4929,8 +4929,8 @@ MenuTexture D_02005498[2] = { * */ MenuTexture D_020054C0[2] = { - { 0, gTextureLuigiFace02, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace02, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4938,8 +4938,8 @@ MenuTexture D_020054C0[2] = { * */ MenuTexture D_020054E8[2] = { - { 0, gTextureLuigiFace03, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace03, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4947,8 +4947,8 @@ MenuTexture D_020054E8[2] = { * */ MenuTexture D_02005510[2] = { - { 0, gTextureLuigiFace04, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace04, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4956,8 +4956,8 @@ MenuTexture D_02005510[2] = { * */ MenuTexture D_02005538[2] = { - { 0, gTextureLuigiFace05, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace05, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4965,8 +4965,8 @@ MenuTexture D_02005538[2] = { * */ MenuTexture D_02005560[2] = { - { 0, gTextureLuigiFace06, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace06, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4974,8 +4974,8 @@ MenuTexture D_02005560[2] = { * */ MenuTexture D_02005588[2] = { - { 0, gTextureLuigiFace07, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace07, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4983,8 +4983,8 @@ MenuTexture D_02005588[2] = { * */ MenuTexture D_020055B0[2] = { - { 0, gTextureLuigiFace08, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace08, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -4992,8 +4992,8 @@ MenuTexture D_020055B0[2] = { * */ MenuTexture D_020055D8[2] = { - { 0, gTextureLuigiFace09, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace09, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5001,8 +5001,8 @@ MenuTexture D_020055D8[2] = { * */ MenuTexture D_02005600[2] = { - { 0, gTextureLuigiFace10, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace10, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5010,8 +5010,8 @@ MenuTexture D_02005600[2] = { * */ MenuTexture D_02005628[2] = { - { 0, gTextureLuigiFace11, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace11, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5019,8 +5019,8 @@ MenuTexture D_02005628[2] = { * */ MenuTexture D_02005650[2] = { - { 0, gTextureLuigiFace12, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace12, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5028,8 +5028,8 @@ MenuTexture D_02005650[2] = { * */ MenuTexture D_02005678[2] = { - { 0, gTextureLuigiFace13, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace13, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5037,8 +5037,8 @@ MenuTexture D_02005678[2] = { * */ MenuTexture D_020056A0[2] = { - { 0, gTextureLuigiFace14, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace14, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5046,8 +5046,8 @@ MenuTexture D_020056A0[2] = { * */ MenuTexture D_020056C8[2] = { - { 0, gTextureLuigiFace15, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace15, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5055,8 +5055,8 @@ MenuTexture D_020056C8[2] = { * */ MenuTexture D_020056F0[2] = { - { 0, gTextureLuigiFace16, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureLuigiFace16, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5064,8 +5064,8 @@ MenuTexture D_020056F0[2] = { * */ MenuTexture D_02005718[2] = { - { 0, gTextureToadFace00, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace00, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5073,8 +5073,8 @@ MenuTexture D_02005718[2] = { * */ MenuTexture D_02005740[2] = { - { 0, gTextureToadFace01, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace01, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5082,8 +5082,8 @@ MenuTexture D_02005740[2] = { * */ MenuTexture D_02005768[2] = { - { 0, gTextureToadFace02, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace02, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5091,8 +5091,8 @@ MenuTexture D_02005768[2] = { * */ MenuTexture D_02005790[2] = { - { 0, gTextureToadFace03, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace03, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5100,8 +5100,8 @@ MenuTexture D_02005790[2] = { * */ MenuTexture D_020057B8[2] = { - { 0, gTextureToadFace04, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace04, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5109,8 +5109,8 @@ MenuTexture D_020057B8[2] = { * */ MenuTexture D_020057E0[2] = { - { 0, gTextureToadFace05, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace05, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5118,8 +5118,8 @@ MenuTexture D_020057E0[2] = { * */ MenuTexture D_02005808[2] = { - { 0, gTextureToadFace06, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace06, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5127,8 +5127,8 @@ MenuTexture D_02005808[2] = { * */ MenuTexture D_02005830[2] = { - { 0, gTextureToadFace07, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace07, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5136,8 +5136,8 @@ MenuTexture D_02005830[2] = { * */ MenuTexture D_02005858[2] = { - { 0, gTextureToadFace08, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace08, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5145,8 +5145,8 @@ MenuTexture D_02005858[2] = { * */ MenuTexture D_02005880[2] = { - { 0, gTextureToadFace09, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace09, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5154,8 +5154,8 @@ MenuTexture D_02005880[2] = { * */ MenuTexture D_020058A8[2] = { - { 0, gTextureToadFace10, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace10, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5163,8 +5163,8 @@ MenuTexture D_020058A8[2] = { * */ MenuTexture D_020058D0[2] = { - { 0, gTextureToadFace11, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace11, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5172,8 +5172,8 @@ MenuTexture D_020058D0[2] = { * */ MenuTexture D_020058F8[2] = { - { 0, gTextureToadFace12, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace12, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5181,8 +5181,8 @@ MenuTexture D_020058F8[2] = { * */ MenuTexture D_02005920[2] = { - { 0, gTextureToadFace13, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace13, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5190,8 +5190,8 @@ MenuTexture D_02005920[2] = { * */ MenuTexture D_02005948[2] = { - { 0, gTextureToadFace14, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace14, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5199,8 +5199,8 @@ MenuTexture D_02005948[2] = { * */ MenuTexture D_02005970[2] = { - { 0, gTextureToadFace15, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace15, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5208,8 +5208,8 @@ MenuTexture D_02005970[2] = { * */ MenuTexture D_02005998[2] = { - { 0, gTextureToadFace16, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureToadFace16, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5217,8 +5217,8 @@ MenuTexture D_02005998[2] = { * */ MenuTexture D_020059C0[2] = { - { 0, gTexturePeachFace00, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace00, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5226,8 +5226,8 @@ MenuTexture D_020059C0[2] = { * */ MenuTexture D_020059E8[2] = { - { 0, gTexturePeachFace01, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace01, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5235,8 +5235,8 @@ MenuTexture D_020059E8[2] = { * */ MenuTexture D_02005A10[2] = { - { 0, gTexturePeachFace02, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace02, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5244,8 +5244,8 @@ MenuTexture D_02005A10[2] = { * */ MenuTexture D_02005A38[2] = { - { 0, gTexturePeachFace03, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace03, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5253,8 +5253,8 @@ MenuTexture D_02005A38[2] = { * */ MenuTexture D_02005A60[2] = { - { 0, gTexturePeachFace04, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace04, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5262,8 +5262,8 @@ MenuTexture D_02005A60[2] = { * */ MenuTexture D_02005A88[2] = { - { 0, gTexturePeachFace05, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace05, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5271,8 +5271,8 @@ MenuTexture D_02005A88[2] = { * */ MenuTexture D_02005AB0[2] = { - { 0, gTexturePeachFace06, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace06, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5280,8 +5280,8 @@ MenuTexture D_02005AB0[2] = { * */ MenuTexture D_02005AD8[2] = { - { 0, gTexturePeachFace07, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace07, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5289,8 +5289,8 @@ MenuTexture D_02005AD8[2] = { * */ MenuTexture D_02005B00[2] = { - { 0, gTexturePeachFace08, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace08, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5298,8 +5298,8 @@ MenuTexture D_02005B00[2] = { * */ MenuTexture D_02005B28[2] = { - { 0, gTexturePeachFace09, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace09, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5307,8 +5307,8 @@ MenuTexture D_02005B28[2] = { * */ MenuTexture D_02005B50[2] = { - { 0, gTexturePeachFace10, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace10, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5316,8 +5316,8 @@ MenuTexture D_02005B50[2] = { * */ MenuTexture D_02005B78[2] = { - { 0, gTexturePeachFace11, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace11, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5325,8 +5325,8 @@ MenuTexture D_02005B78[2] = { * */ MenuTexture D_02005BA0[2] = { - { 0, gTexturePeachFace12, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace12, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5334,8 +5334,8 @@ MenuTexture D_02005BA0[2] = { * */ MenuTexture D_02005BC8[2] = { - { 0, gTexturePeachFace13, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace13, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5343,8 +5343,8 @@ MenuTexture D_02005BC8[2] = { * */ MenuTexture D_02005BF0[2] = { - { 0, gTexturePeachFace14, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace14, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5352,8 +5352,8 @@ MenuTexture D_02005BF0[2] = { * */ MenuTexture D_02005C18[2] = { - { 0, gTexturePeachFace15, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace15, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5361,8 +5361,8 @@ MenuTexture D_02005C18[2] = { * */ MenuTexture D_02005C40[2] = { - { 0, gTexturePeachFace16, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTexturePeachFace16, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5370,8 +5370,8 @@ MenuTexture D_02005C40[2] = { * */ MenuTexture D_02005C68[2] = { - { 0, gTextureYoshiFace00, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace00, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5379,8 +5379,8 @@ MenuTexture D_02005C68[2] = { * */ MenuTexture D_02005C90[2] = { - { 0, gTextureYoshiFace01, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace01, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5388,8 +5388,8 @@ MenuTexture D_02005C90[2] = { * */ MenuTexture D_02005CB8[2] = { - { 0, gTextureYoshiFace02, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace02, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5398,8 +5398,8 @@ MenuTexture D_02005CB8[2] = { */ MenuTexture D_02005CE0[2] = { - { 0, gTextureYoshiFace03, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace03, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5407,8 +5407,8 @@ MenuTexture D_02005CE0[2] = { * */ MenuTexture D_02005D08[2] = { - { 0, gTextureYoshiFace04, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace04, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5416,8 +5416,8 @@ MenuTexture D_02005D08[2] = { * */ MenuTexture D_02005D30[2] = { - { 0, gTextureYoshiFace05, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace05, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5425,8 +5425,8 @@ MenuTexture D_02005D30[2] = { * */ MenuTexture D_02005D58[2] = { - { 0, gTextureYoshiFace06, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace06, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5434,8 +5434,8 @@ MenuTexture D_02005D58[2] = { * */ MenuTexture D_02005D80[2] = { - { 0, gTextureYoshiFace07, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace07, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5443,8 +5443,8 @@ MenuTexture D_02005D80[2] = { * */ MenuTexture D_02005DA8[2] = { - { 0, gTextureYoshiFace08, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace08, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5452,8 +5452,8 @@ MenuTexture D_02005DA8[2] = { * */ MenuTexture D_02005DD0[2] = { - { 0, gTextureYoshiFace09, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace09, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5461,8 +5461,8 @@ MenuTexture D_02005DD0[2] = { * */ MenuTexture D_02005DF8[2] = { - { 0, gTextureYoshiFace10, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace10, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5470,8 +5470,8 @@ MenuTexture D_02005DF8[2] = { * */ MenuTexture D_02005E20[2] = { - { 0, gTextureYoshiFace11, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace11, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5479,8 +5479,8 @@ MenuTexture D_02005E20[2] = { * */ MenuTexture D_02005E48[2] = { - { 0, gTextureYoshiFace12, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace12, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5488,8 +5488,8 @@ MenuTexture D_02005E48[2] = { * */ MenuTexture D_02005E70[2] = { - { 0, gTextureYoshiFace13, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace13, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5497,8 +5497,8 @@ MenuTexture D_02005E70[2] = { * */ MenuTexture D_02005E98[2] = { - { 0, gTextureYoshiFace14, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace14, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5506,8 +5506,8 @@ MenuTexture D_02005E98[2] = { * */ MenuTexture D_02005EC0[2] = { - { 0, gTextureYoshiFace15, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace15, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5515,8 +5515,8 @@ MenuTexture D_02005EC0[2] = { * */ MenuTexture D_02005EE8[2] = { - { 0, gTextureYoshiFace16, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureYoshiFace16, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5524,8 +5524,8 @@ MenuTexture D_02005EE8[2] = { * */ MenuTexture D_02005F10[2] = { - { 0, gTextureDkFace00, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace00, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5533,8 +5533,8 @@ MenuTexture D_02005F10[2] = { * */ MenuTexture D_02005F38[2] = { - { 0, gTextureDkFace01, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace01, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5542,8 +5542,8 @@ MenuTexture D_02005F38[2] = { * */ MenuTexture D_02005F60[2] = { - { 0, gTextureDkFace02, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace02, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5551,8 +5551,8 @@ MenuTexture D_02005F60[2] = { * */ MenuTexture D_02005F88[2] = { - { 0, gTextureDkFace03, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace03, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5560,8 +5560,8 @@ MenuTexture D_02005F88[2] = { * */ MenuTexture D_02005FB0[2] = { - { 0, gTextureDkFace04, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace04, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5569,8 +5569,8 @@ MenuTexture D_02005FB0[2] = { * */ MenuTexture D_02005FD8[2] = { - { 0, gTextureDkFace05, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace05, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5578,8 +5578,8 @@ MenuTexture D_02005FD8[2] = { * */ MenuTexture D_02006000[2] = { - { 0, gTextureDkFace06, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace06, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5587,8 +5587,8 @@ MenuTexture D_02006000[2] = { * */ MenuTexture D_02006028[2] = { - { 0, gTextureDkFace07, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace07, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5596,8 +5596,8 @@ MenuTexture D_02006028[2] = { * */ MenuTexture D_02006050[2] = { - { 0, gTextureDkFace08, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace08, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5605,8 +5605,8 @@ MenuTexture D_02006050[2] = { * */ MenuTexture D_02006078[2] = { - { 0, gTextureDkFace09, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace09, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5614,8 +5614,8 @@ MenuTexture D_02006078[2] = { * */ MenuTexture D_020060A0[2] = { - { 0, gTextureDkFace10, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace10, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5623,8 +5623,8 @@ MenuTexture D_020060A0[2] = { * */ MenuTexture D_020060C8[2] = { - { 0, gTextureDkFace11, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace11, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5632,8 +5632,8 @@ MenuTexture D_020060C8[2] = { * */ MenuTexture D_020060F0[2] = { - { 0, gTextureDkFace12, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace12, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5641,8 +5641,8 @@ MenuTexture D_020060F0[2] = { * */ MenuTexture D_02006118[2] = { - { 0, gTextureDkFace13, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace13, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5650,8 +5650,8 @@ MenuTexture D_02006118[2] = { * */ MenuTexture D_02006140[2] = { - { 0, gTextureDkFace14, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace14, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5659,8 +5659,8 @@ MenuTexture D_02006140[2] = { * */ MenuTexture D_02006168[2] = { - { 0, gTextureDkFace15, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace15, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5668,8 +5668,8 @@ MenuTexture D_02006168[2] = { * */ MenuTexture D_02006190[2] = { - { 0, gTextureDkFace16, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureDkFace16, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5677,8 +5677,8 @@ MenuTexture D_02006190[2] = { * */ MenuTexture D_020061B8[2] = { - { 0, gTextureWarioFace00, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace00, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5686,8 +5686,8 @@ MenuTexture D_020061B8[2] = { * */ MenuTexture D_020061E0[2] = { - { 0, gTextureWarioFace01, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace01, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5695,8 +5695,8 @@ MenuTexture D_020061E0[2] = { * */ MenuTexture D_02006208[2] = { - { 0, gTextureWarioFace02, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace02, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5704,8 +5704,8 @@ MenuTexture D_02006208[2] = { * */ MenuTexture D_02006230[2] = { - { 0, gTextureWarioFace03, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace03, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5713,8 +5713,8 @@ MenuTexture D_02006230[2] = { * */ MenuTexture D_02006258[2] = { - { 0, gTextureWarioFace04, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace04, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5722,8 +5722,8 @@ MenuTexture D_02006258[2] = { * */ MenuTexture D_02006280[2] = { - { 0, gTextureWarioFace05, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace05, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5731,8 +5731,8 @@ MenuTexture D_02006280[2] = { * */ MenuTexture D_020062A8[2] = { - { 0, gTextureWarioFace06, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace06, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5740,8 +5740,8 @@ MenuTexture D_020062A8[2] = { * */ MenuTexture D_020062D0[2] = { - { 0, gTextureWarioFace07, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace07, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5749,8 +5749,8 @@ MenuTexture D_020062D0[2] = { * */ MenuTexture D_020062F8[2] = { - { 0, gTextureWarioFace08, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace08, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5758,8 +5758,8 @@ MenuTexture D_020062F8[2] = { * */ MenuTexture D_02006320[2] = { - { 0, gTextureWarioFace09, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace09, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5767,8 +5767,8 @@ MenuTexture D_02006320[2] = { * */ MenuTexture D_02006348[2] = { - { 0, gTextureWarioFace10, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace10, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5776,8 +5776,8 @@ MenuTexture D_02006348[2] = { * */ MenuTexture D_02006370[2] = { - { 0, gTextureWarioFace11, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace11, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5785,8 +5785,8 @@ MenuTexture D_02006370[2] = { * */ MenuTexture D_02006398[2] = { - { 0, gTextureWarioFace12, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace12, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5794,8 +5794,8 @@ MenuTexture D_02006398[2] = { * */ MenuTexture D_020063C0[2] = { - { 0, gTextureWarioFace13, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace13, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5803,8 +5803,8 @@ MenuTexture D_020063C0[2] = { * */ MenuTexture D_020063E8[2] = { - { 0, gTextureWarioFace14, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace14, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5812,8 +5812,8 @@ MenuTexture D_020063E8[2] = { * */ MenuTexture D_02006410[2] = { - { 0, gTextureWarioFace15, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace15, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5821,8 +5821,8 @@ MenuTexture D_02006410[2] = { * */ MenuTexture D_02006438[2] = { - { 0, gTextureWarioFace16, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureWarioFace16, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5830,8 +5830,8 @@ MenuTexture D_02006438[2] = { * */ MenuTexture D_02006460[2] = { - { 0, gTextureBowserFace00, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace00, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5839,8 +5839,8 @@ MenuTexture D_02006460[2] = { * */ MenuTexture D_02006488[2] = { - { 0, gTextureBowserFace01, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace01, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5848,8 +5848,8 @@ MenuTexture D_02006488[2] = { * */ MenuTexture D_020064B0[2] = { - { 0, gTextureBowserFace02, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace02, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5857,8 +5857,8 @@ MenuTexture D_020064B0[2] = { * */ MenuTexture D_020064D8[2] = { - { 0, gTextureBowserFace03, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace03, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5866,8 +5866,8 @@ MenuTexture D_020064D8[2] = { * */ MenuTexture D_02006500[2] = { - { 0, gTextureBowserFace04, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace04, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5875,8 +5875,8 @@ MenuTexture D_02006500[2] = { * */ MenuTexture D_02006528[2] = { - { 0, gTextureBowserFace05, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace05, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5884,8 +5884,8 @@ MenuTexture D_02006528[2] = { * */ MenuTexture D_02006550[2] = { - { 0, gTextureBowserFace06, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace06, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5893,8 +5893,8 @@ MenuTexture D_02006550[2] = { * */ MenuTexture D_02006578[2] = { - { 0, gTextureBowserFace07, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace07, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5902,8 +5902,8 @@ MenuTexture D_02006578[2] = { * */ MenuTexture D_020065A0[2] = { - { 0, gTextureBowserFace08, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace08, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5911,8 +5911,8 @@ MenuTexture D_020065A0[2] = { * */ MenuTexture D_020065C8[2] = { - { 0, gTextureBowserFace09, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace09, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5920,8 +5920,8 @@ MenuTexture D_020065C8[2] = { * */ MenuTexture D_020065F0[2] = { - { 0, gTextureBowserFace10, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace10, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5929,8 +5929,8 @@ MenuTexture D_020065F0[2] = { * */ MenuTexture D_02006618[2] = { - { 0, gTextureBowserFace11, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace11, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5938,8 +5938,8 @@ MenuTexture D_02006618[2] = { * */ MenuTexture D_02006640[2] = { - { 0, gTextureBowserFace12, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace12, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5947,8 +5947,8 @@ MenuTexture D_02006640[2] = { * */ MenuTexture D_02006668[2] = { - { 0, gTextureBowserFace13, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace13, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5956,8 +5956,8 @@ MenuTexture D_02006668[2] = { * */ MenuTexture D_02006690[2] = { - { 0, gTextureBowserFace14, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace14, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5965,8 +5965,8 @@ MenuTexture D_02006690[2] = { * */ MenuTexture D_020066B8[2] = { - { 0, gTextureBowserFace15, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace15, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** @@ -5974,8 +5974,8 @@ MenuTexture D_020066B8[2] = { * */ MenuTexture D_020066E0[2] = { - { 0, gTextureBowserFace16, 64, 64, 0, 0, 0x0}, - { 0, NULL, 0, 0, 0, 0, 0}, + { 0, gTextureBowserFace16, 64, 64, 0, 0, 0x0 }, + { 0, NULL, 0, 0, 0, 0, 0 }, }; /** diff --git a/src/effects.c b/src/effects.c index c9818c4ff..a5bbd918e 100644 --- a/src/effects.c +++ b/src/effects.c @@ -21,7 +21,7 @@ s32 D_8018D900[8]; s16 D_8018D920[8]; -s32 D_8018D930[8]; +s32 gPlayerStarEffectStartTime[8]; s32 D_8018D950[8]; s32 D_8018D970[8]; s32 D_8018D990[8]; @@ -231,7 +231,7 @@ void func_8008C62C(Player* player, s8 arg1) { player->unk_0A8 = 0x2000; func_8008C6D0(player, arg1); if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); + pop_player_balloon(player, arg1); } } } @@ -342,7 +342,7 @@ void func_8008C9EC(Player* player, s8 arg1) { player->unk_0B2--; if (player->unk_0B2 <= 0) { if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); + pop_player_balloon(player, arg1); } func_8008C8C4(player, arg1); } @@ -356,7 +356,7 @@ void func_8008C9EC(Player* player, s8 arg1) { if (player->unk_0B2 <= 0) { func_8008C8C4(player, arg1); if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); + pop_player_balloon(player, arg1); } } } @@ -836,7 +836,7 @@ void apply_hit_rotating_sound_effect(Player* player, s8 arg1) { player->unk_08C *= 0.6; player->unk_0B0 = 0; player->size = 1.0f; - D_8018D930[arg1] = gCourseTimer; + gPlayerStarEffectStartTime[arg1] = gCourseTimer; player->unk_0AE = player->rotation[1]; player->unk_0B2 = 2; player->unk_0C0 = 0; @@ -857,7 +857,7 @@ void apply_hit_rotating_sound_effect(Player* player, s8 arg1) { play_cpu_sound_effect(arg1, player); } if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); + pop_player_balloon(player, arg1); } } @@ -963,7 +963,7 @@ void func_8008E4A4(Player* player, s8 arg1) { player->currentSpeed += 100.0f; } if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); + pop_player_balloon(player, arg1); } } else { player->unk_0A8 += 0x80; @@ -980,7 +980,7 @@ void func_8008E4A4(Player* player, s8 arg1) { player->unk_042 = 0; if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); + pop_player_balloon(player, arg1); } if ((gIsPlayerTripleAButtonCombo[arg1] == true) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { player->currentSpeed += 100.0f; @@ -1074,7 +1074,7 @@ void apply_hit_by_item_effect(Player* player, s8 arg1) { } if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); + pop_player_balloon(player, arg1); } } else { player->unk_0A8 = (s16) (player->unk_0A8 + 0x90); @@ -1094,7 +1094,7 @@ void apply_hit_by_item_effect(Player* player, s8 arg1) { } if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); + pop_player_balloon(player, arg1); } } } @@ -1347,7 +1347,7 @@ void func_8008F494(Player* player, s8 arg1) { void func_8008F5A4(Player* player, s8 arg1) { if ((player->unk_044 & 0x8000) != 0) { - func_8006B8B4(player, arg1); + pop_player_balloon(player, arg1); player->unk_044 &= ~0x8000; } @@ -1369,7 +1369,7 @@ void func_8008F5A4(Player* player, s8 arg1) { } void apply_star_effect(Player* player, s8 arg1) { - if (((s32) gCourseTimer - D_8018D930[arg1]) >= 9) { + if (((s32) gCourseTimer - gPlayerStarEffectStartTime[arg1]) >= 9) { D_8018D900[arg1] = 1; if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && @@ -1384,7 +1384,7 @@ void apply_star_effect(Player* player, s8 arg1) { } } - if (((s32) gCourseTimer - D_8018D930[arg1]) >= 0xA) { + if (((s32) gCourseTimer - gPlayerStarEffectStartTime[arg1]) >= 0xA) { player->effects &= ~STAR_EFFECT; } } @@ -1395,7 +1395,7 @@ void apply_star_sound_effect(Player* player, s8 arg1) { player->effects |= STAR_EFFECT; player->soundEffects &= ~STAR_SOUND_EFFECT; - D_8018D930[arg1] = gCourseTimer; + gPlayerStarEffectStartTime[arg1] = gCourseTimer; D_8018D900[arg1] = 1; if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && @@ -1464,9 +1464,9 @@ void apply_boo_sound_effect(Player* player, s8 arg1) { player->unk_044 |= 0x200; for (temp_v1 = 0; temp_v1 < 10; ++temp_v1) { - player->unk_258[temp_v1].unk_01C = 0; - player->unk_258[temp_v1].unk_01E = 0; - player->unk_258[temp_v1].unk_012 = 0; + player->particlePool0[temp_v1].isAlive = 0; + player->particlePool0[temp_v1].unk_01E = 0; + player->particlePool0[temp_v1].type = 0; } } @@ -1543,9 +1543,9 @@ void func_8008FD4C(Player* player, UNUSED s8 arg1) { player->unk_044 |= 0x200; for (temp_v0 = 0; temp_v0 < 10; ++temp_v0) { - player->unk_258[temp_v0].unk_01C = 0; - player->unk_258[temp_v0].unk_01E = 0; - player->unk_258[temp_v0].unk_012 = 0; + player->particlePool0[temp_v0].isAlive = 0; + player->particlePool0[temp_v0].unk_01E = 0; + player->particlePool0[temp_v0].type = 0; } } @@ -1553,9 +1553,9 @@ void func_8008FDA8(Player* player, UNUSED s8 arg1) { s16 temp_v0; player->unk_044 |= 0x200; for (temp_v0 = 0; temp_v0 < 10; ++temp_v0) { - player->unk_258[temp_v0].unk_01C = 0; - player->unk_258[temp_v0].unk_01E = 0; - player->unk_258[temp_v0].unk_012 = 0; + player->particlePool0[temp_v0].isAlive = 0; + player->particlePool0[temp_v0].unk_01E = 0; + player->particlePool0[temp_v0].type = 0; } } @@ -1928,7 +1928,7 @@ void func_80090970(Player* player, s8 playerId, s8 arg2) { func_800C9018(playerId, SOUND_ARG_LOAD(0x01, 0x00, 0xFA, 0x28)); } if (gModeSelection == BATTLE) { - func_8006B8B4(player, playerId); + pop_player_balloon(player, playerId); } player->unk_0CA &= ~0x0002; player->unk_0DE &= ~0x0004; @@ -2015,30 +2015,30 @@ void func_800911B4(Player* player, s8 arg1) { player->unk_078 = 0; D_8018D920[arg1] = 0; - player->unk_258[31].unk_012 = 0; - player->unk_258[31].unk_01E = 0; - player->unk_258[31].unk_01C = 0; - player->unk_258[30].unk_012 = 0; - player->unk_258[30].unk_01E = 0; - player->unk_258[30].unk_01C = 0; + player->particlePool3[1].type = 0; + player->particlePool3[1].unk_01E = 0; + player->particlePool3[1].isAlive = 0; + player->particlePool3[0].type = 0; + player->particlePool3[0].unk_01E = 0; + player->particlePool3[0].isAlive = 0; // clang-format off temp_v0 = 2; do { // clang-format on - player->unk_258[31 + temp_v0].unk_01C = 0; - player->unk_258[31 + temp_v0].unk_01E = 0; - player->unk_258[31 + temp_v0].unk_012 = 0; - player->unk_258[32 + temp_v0].unk_01C = 0; - player->unk_258[32 + temp_v0].unk_01E = 0; - player->unk_258[32 + temp_v0].unk_012 = 0; - player->unk_258[33 + temp_v0].unk_01C = 0; - player->unk_258[33 + temp_v0].unk_01E = 0; - player->unk_258[33 + temp_v0].unk_012 = 0; + player->particlePool3[1 + temp_v0].isAlive = 0; + player->particlePool3[1 + temp_v0].unk_01E = 0; + player->particlePool3[1 + temp_v0].type = 0; + player->particlePool3[2 + temp_v0].isAlive = 0; + player->particlePool3[2 + temp_v0].unk_01E = 0; + player->particlePool3[2 + temp_v0].type = 0; + player->particlePool3[3 + temp_v0].isAlive = 0; + player->particlePool3[3 + temp_v0].unk_01E = 0; + player->particlePool3[3 + temp_v0].type = 0; temp_v0 += 4; - player->unk_258[26 + temp_v0].unk_01C = 0; - player->unk_258[26 + temp_v0].unk_01E = 0; - player->unk_258[26 + temp_v0].unk_012 = 0; + player->particlePool2[6 + temp_v0].isAlive = 0; + player->particlePool2[6 + temp_v0].unk_01E = 0; + player->particlePool2[6 + temp_v0].type = 0; } while (temp_v0 < 10); } diff --git a/src/effects.h b/src/effects.h index cecf863f2..2ca3663b6 100644 --- a/src/effects.h +++ b/src/effects.h @@ -125,7 +125,7 @@ void func_800CB064(u8); extern s32 D_8018D900[]; extern s16 D_8018D920[]; -extern s32 D_8018D930[]; +extern s32 gPlayerStarEffectStartTime[]; extern s32 D_8018D950[]; extern s32 D_8018D970[]; extern s32 D_8018D990[]; diff --git a/src/engine/World.cpp b/src/engine/World.cpp index 68ca27343..100b1275d 100644 --- a/src/engine/World.cpp +++ b/src/engine/World.cpp @@ -42,7 +42,8 @@ void World::SetCourseFromCup() { CurrentCourse = CurrentCup->GetCourse(); } -TrainCrossing* World::AddCrossing(Vec3f position, u32 waypointMin, u32 waypointMax, f32 approachRadius, f32 exitRadius) { +TrainCrossing* World::AddCrossing(Vec3f position, u32 waypointMin, u32 waypointMax, f32 approachRadius, + f32 exitRadius) { auto crossing = std::make_shared(position, waypointMin, waypointMax, approachRadius, exitRadius); Crossings.push_back(crossing); return crossing.get(); @@ -160,7 +161,7 @@ AActor* World::ConvertActorToAActor(Actor* actor) { // Move the ptr back so that it points at the vtable. // Which is the initial item in the class, or in other words // Point to the class. - return reinterpret_cast((char*)actor - sizeof(void*)); + return reinterpret_cast((char*) actor - sizeof(void*)); } /** @@ -169,7 +170,7 @@ AActor* World::ConvertActorToAActor(Actor* actor) { Actor* World::ConvertAActorToActor(AActor* actor) { // Move the ptr forward past the vtable. // This allows C to access the class variables like a normal Actor* struct. - return reinterpret_cast((char*)actor + sizeof(void*)); + return reinterpret_cast((char*) actor + sizeof(void*)); } AActor* World::GetActor(size_t index) { @@ -236,7 +237,7 @@ void World::TickObjects() { // This is a fallback to support those objects. Probably don't use this. void World::TickObjects60fps() { for (const auto& object : Objects) { - object->Tick60fps(); + object->Tick60fps(); } } @@ -247,19 +248,19 @@ ParticleEmitter* World::AddEmitter(ParticleEmitter* emitter) { void World::DrawObjects(s32 cameraId) { for (const auto& object : Objects) { - object->Draw(cameraId); + object->Draw(cameraId); } } void World::TickParticles() { for (const auto& emitter : Emitters) { - emitter->Tick(); + emitter->Tick(); } } void World::DrawParticles(s32 cameraId) { for (const auto& emitter : Emitters) { - emitter->Draw(cameraId); + emitter->Draw(cameraId); } } @@ -271,8 +272,8 @@ void World::Reset() { } Object* World::GetObjectByIndex(size_t index) { - //if (index < this->Objects.size()) { - // Assuming GameActor::a is accessible, use reinterpret_cast if needed + // if (index < this->Objects.size()) { + // Assuming GameActor::a is accessible, use reinterpret_cast if needed // return reinterpret_cast(&this->Objects[index]->o); //} return nullptr; // Or handle the error as needed diff --git a/src/engine/actors/Cloud.cpp b/src/engine/actors/Cloud.cpp index cae55e342..63139f89d 100644 --- a/src/engine/actors/Cloud.cpp +++ b/src/engine/actors/Cloud.cpp @@ -23,7 +23,7 @@ ACloud::ACloud(FVector pos) { Rot[1] = 0; Rot[2] = 0; - //Flags = -0x8000 | 0x4000; + // Flags = -0x8000 | 0x4000; BoundingBoxSize = 2.0f; } @@ -48,7 +48,7 @@ void ACloud::Tick() { extern Gfx cloud_mesh[]; -void ACloud::Draw(Camera *camera) { +void ACloud::Draw(Camera* camera) { Mat4 mtx; if (PickedUp) { @@ -58,14 +58,14 @@ void ACloud::Draw(Camera *camera) { mtxf_pos_rotation_xyz(mtx, Pos, Rot); if (render_set_position(mtx, 0) != 0) { gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH); - gSPDisplayList(gDisplayListHead++, (Gfx*)cloud_mesh); + gSPDisplayList(gDisplayListHead++, (Gfx*) cloud_mesh); } } void ACloud::Collision(Player* player, AActor* actor) { if (!PickedUp) { if (query_collision_player_vs_actor_item(player, gWorldInstance.ConvertAActorToActor(actor))) { - // Player has picked up the actor, activate the cloud effect + // Player has picked up the actor, activate the cloud effect _player = player; PickedUp = true; @@ -77,61 +77,65 @@ void ACloud::Collision(Player* player, AActor* actor) { } } -bool ACloud::IsMod() { return true; } +bool ACloud::IsMod() { + return true; +} Vtx cloud_mesh_vtx_cull[8] = { - {{ {0, -4, -4}, 0, {0, 0}, {0, 0, 0, 0} }}, - {{ {0, -4, 4}, 0, {0, 0}, {0, 0, 0, 0} }}, - {{ {0, 4, 4}, 0, {0, 0}, {0, 0, 0, 0} }}, - {{ {0, 4, -4}, 0, {0, 0}, {0, 0, 0, 0} }}, - {{ {0, -4, -4}, 0, {0, 0}, {0, 0, 0, 0} }}, - {{ {0, -4, 4}, 0, {0, 0}, {0, 0, 0, 0} }}, - {{ {0, 4, 4}, 0, {0, 0}, {0, 0, 0, 0} }}, - {{ {0, 4, -4}, 0, {0, 0}, {0, 0, 0, 0} }}, + { { { 0, -4, -4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } }, { { { 0, -4, 4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } }, + { { { 0, 4, 4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } }, { { { 0, 4, -4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } }, + { { { 0, -4, -4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } }, { { { 0, -4, 4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } }, + { { { 0, 4, 4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } }, { { { 0, 4, -4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } }, }; Vtx cloud_mesh_vtx_0[4] = { - {{ {0, 4, 4}, 0, {-524, -530}, {255, 255, 255, 166} }}, - {{ {0, -4, 4}, 0, {-530, 1516}, {255, 255, 255, 201} }}, - {{ {0, -4, -4}, 0, {1516, 1522}, {255, 255, 255, 188} }}, - {{ {0, 4, -4}, 0, {1522, -524}, {255, 255, 255, 154} }}, + { { { 0, 4, 4 }, 0, { -524, -530 }, { 255, 255, 255, 166 } } }, + { { { 0, -4, 4 }, 0, { -530, 1516 }, { 255, 255, 255, 201 } } }, + { { { 0, -4, -4 }, 0, { 1516, 1522 }, { 255, 255, 255, 188 } } }, + { { { 0, 4, -4 }, 0, { 1522, -524 }, { 255, 255, 255, 154 } } }, }; Gfx cloud_mesh_tri_0[] = { - gsSPVertex(cloud_mesh_vtx_0 + 0, 4, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPEndDisplayList(), + gsSPVertex(cloud_mesh_vtx_0 + 0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), }; Gfx mat_cloud_cutout[] = { - gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_SHADING_SMOOTH), - gsSPClearGeometryMode(G_CULL_FRONT | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_CLIPPING), - gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, PRIMITIVE, PRIMITIVE, TEXEL1, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), - gsSPSetOtherMode(G_SETOTHERMODE_H, 4, 20, G_AD_NOISE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE), - gsSPSetOtherMode(G_SETOTHERMODE_L, 0, 32, G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_TEX_EDGE2), - gsSPTexture(65535, 65535, 0, 0, 1), - gsDPSetPrimColor(0, 0, 255, 220, 203, 255), - gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_8b_LOAD_BLOCK, 1, gTexture69C4E4), - gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), - gsDPLoadBlock(7, 0, 0, 511, 512), - gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 1, G_TX_WRAP | G_TX_NOMIRROR, 5, 1), - gsDPSetTileSize(0, 98, 100, 124, 124), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, gTexture66C8F4), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 128, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), - gsDPLoadBlock(6, 0, 0, 1023, 256), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 128, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), - gsDPSetTileSize(1, 0, 0, 124, 124), - gsSPEndDisplayList(), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_SHADING_SMOOTH), + gsSPClearGeometryMode(G_CULL_FRONT | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | + G_CLIPPING), + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, PRIMITIVE, PRIMITIVE, TEXEL1, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, + COMBINED), + gsSPSetOtherMode(G_SETOTHERMODE_H, 4, 20, + G_AD_NOISE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE), + gsSPSetOtherMode(G_SETOTHERMODE_L, 0, 32, G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_TEX_EDGE2), + gsSPTexture(65535, 65535, 0, 0, 1), + gsDPSetPrimColor(0, 0, 255, 220, 203, 255), + gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_8b_LOAD_BLOCK, 1, gGroundDust), + gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, + G_TX_WRAP | G_TX_NOMIRROR, 0, 0), + gsDPLoadBlock(7, 0, 0, 511, 512), + gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 1, G_TX_WRAP | G_TX_NOMIRROR, 5, 1), + gsDPSetTileSize(0, 98, 100, 124, 124), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, gTexture66C8F4), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 128, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, + G_TX_WRAP | G_TX_NOMIRROR, 0, 0), + gsDPLoadBlock(6, 0, 0, 1023, 256), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 128, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, + 5, 0), + gsDPSetTileSize(1, 0, 0, 124, 124), + gsSPEndDisplayList(), }; Gfx cloud_mesh[] = { - //gsSPClearGeometryMode(G_LIGHTING), - //gsSPVertex(cloud_mesh_vtx_cull + 0, 8, 0), - gsSPSetGeometryMode(G_LIGHTING), - //gsSPCullDisplayList(0, 7), - gsSPDisplayList(mat_cloud_cutout), - gsSPDisplayList(cloud_mesh_tri_0), - gsSPEndDisplayList(), + // gsSPClearGeometryMode(G_LIGHTING), + // gsSPVertex(cloud_mesh_vtx_cull + 0, 8, 0), + gsSPSetGeometryMode(G_LIGHTING), + // gsSPCullDisplayList(0, 7), + gsSPDisplayList(mat_cloud_cutout), + gsSPDisplayList(cloud_mesh_tri_0), + gsSPEndDisplayList(), }; - diff --git a/src/engine/courses/BansheeBoardwalk.cpp b/src/engine/courses/BansheeBoardwalk.cpp index 5d3af6e65..869e6525a 100644 --- a/src/engine/courses/BansheeBoardwalk.cpp +++ b/src/engine/courses/BansheeBoardwalk.cpp @@ -69,7 +69,7 @@ BansheeBoardwalk::BansheeBoardwalk() { this->gfx = d_course_banshee_boardwalk_packed_dls; this->gfxSize = 3689; Props.textures = banshee_boardwalk_textures; - Props.Minimap.Texture = gTextureCourseOutlineBansheeBoardwalk; + Props.Minimap.Texture = minimap_banshee_boardwalk; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 262; @@ -79,6 +79,7 @@ BansheeBoardwalk::BansheeBoardwalk() { Props.Minimap.PlayerScaleFactor = 0.016f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Id = "mk:banshee_boardwalk"; @@ -140,6 +141,9 @@ BansheeBoardwalk::BansheeBoardwalk() { Props.Sequence = MusicSeq::MUSIC_SEQ_BANSHEE_BOARDWALK; Props.WaterLevel = -80.0f; + for (size_t i = 0; i < 100; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) banshee_boardwalk_dls[i], Props.textures); + } } void BansheeBoardwalk::Load() { diff --git a/src/engine/courses/BigDonut.cpp b/src/engine/courses/BigDonut.cpp index 86bb71615..f0f83cf5a 100644 --- a/src/engine/courses/BigDonut.cpp +++ b/src/engine/courses/BigDonut.cpp @@ -43,7 +43,7 @@ BigDonut::BigDonut() { this->gfx = d_course_big_donut_packed_dls; this->gfxSize = 528; Props.textures = big_donut_textures; - Props.Minimap.Texture = gTextureCourseOutlineBigDonut; + Props.Minimap.Texture = minimap_big_donut; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 257; @@ -53,6 +53,7 @@ BigDonut::BigDonut() { Props.Minimap.PlayerScaleFactor = 0.0257f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "big donut", sizeof(Props.Name)); Props.SetText(Props.DebugName, "doughnut", sizeof(Props.DebugName)); diff --git a/src/engine/courses/BlockFort.cpp b/src/engine/courses/BlockFort.cpp index a2a5c413a..44ffb3423 100644 --- a/src/engine/courses/BlockFort.cpp +++ b/src/engine/courses/BlockFort.cpp @@ -45,7 +45,7 @@ BlockFort::BlockFort() { this->gfx = d_course_block_fort_packed_dls; this->gfxSize = 699; Props.textures = block_fort_textures; - Props.Minimap.Texture = gTextureCourseOutlineBlockFort; + Props.Minimap.Texture = minimap_block_fort; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 257; @@ -55,6 +55,7 @@ BlockFort::BlockFort() { Props.Minimap.PlayerScaleFactor = 0.0335f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "block fort", sizeof(Props.Name)); Props.SetText(Props.DebugName, "block", sizeof(Props.DebugName)); diff --git a/src/engine/courses/BowsersCastle.cpp b/src/engine/courses/BowsersCastle.cpp index a150b0f4b..d2f7d451b 100644 --- a/src/engine/courses/BowsersCastle.cpp +++ b/src/engine/courses/BowsersCastle.cpp @@ -72,7 +72,7 @@ BowsersCastle::BowsersCastle() { this->gfx = d_course_bowsers_castle_packed_dls; this->gfxSize = 4900; Props.textures = bowsers_castle_textures; - Props.Minimap.Texture = gTextureCourseOutlineBowsersCastle; + Props.Minimap.Texture = minimap_bowsers_castle; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 265; @@ -82,6 +82,7 @@ BowsersCastle::BowsersCastle() { Props.Minimap.PlayerScaleFactor = 0.0174f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Id = "mk:bowsers_castle"; @@ -144,6 +145,9 @@ BowsersCastle::BowsersCastle() { Props.WaterLevel = -50.0f; WaterVolumes.push_back({20.0f, 1549.0f, 1859.0f, -1402.0f, -1102.0f}); + for (size_t i = 0; i < 108; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) bowsers_castle_dls[i], Props.textures); + } } void BowsersCastle::Load() { @@ -155,7 +159,7 @@ void BowsersCastle::Load() { } void BowsersCastle::LoadTextures() { - dma_textures(gTextureShrub, 0x000003FFU, 0x00000800U); + dma_textures(gTextureShrub, 0x000003FFU, 0x00000800U); // 0x03009000 } // Required for the 2 thwomps that go far diff --git a/src/engine/courses/ChocoMountain.cpp b/src/engine/courses/ChocoMountain.cpp index fc24bd764..943e5db04 100644 --- a/src/engine/courses/ChocoMountain.cpp +++ b/src/engine/courses/ChocoMountain.cpp @@ -64,7 +64,7 @@ ChocoMountain::ChocoMountain() { this->gfx = d_course_choco_mountain_packed_dls; this->gfxSize = 2910; Props.textures = choco_mountain_textures; - Props.Minimap.Texture = gTextureCourseOutlineChocoMountain; + Props.Minimap.Texture = minimap_choco_mountain; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 265; @@ -74,6 +74,7 @@ ChocoMountain::ChocoMountain() { Props.Minimap.PlayerScaleFactor = 0.022f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = -16.0; + ResizeMinimap(&Props.Minimap); Id = "mk:choco_mountain"; Props.SetText(Props.Name, "choco mountain", sizeof(Props.Name)); @@ -134,6 +135,9 @@ ChocoMountain::ChocoMountain() { Props.Sequence = MusicSeq::MUSIC_SEQ_CHOCO_MOUNTAIN; Props.WaterLevel = -80.0f; + for (size_t i = 0; i < 96; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) choco_mountain_dls[i], Props.textures); + } } void ChocoMountain::Load() { diff --git a/src/engine/courses/Course.cpp b/src/engine/courses/Course.cpp index 6049d8c69..7fb775ac9 100644 --- a/src/engine/courses/Course.cpp +++ b/src/engine/courses/Course.cpp @@ -27,6 +27,16 @@ extern "C" { extern StaffGhost* d_mario_raceway_staff_ghost; } +void ResizeMinimap(MinimapProps* minimap) { + if (minimap->Height < minimap->Width) { + minimap->Width = (minimap->Width * 64) / minimap->Height; + minimap->Height = 64; + } else { + minimap->Height = (minimap->Height * 64) / minimap->Width; + minimap->Width = 64; + } +} + Course::Course() { Props.SetText(Props.Name, "Blank Track", sizeof(Props.Name)); Props.SetText(Props.DebugName, "blnktrck", sizeof(Props.DebugName)); @@ -34,7 +44,7 @@ Course::Course() { // Props.Cup = FLOWER_CUP; // Props.CupIndex = 3; Id = ""; - Props.Minimap.Texture = gTextureCourseOutlineMarioRaceway; + Props.Minimap.Texture = minimap_mario_raceway; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 257; @@ -44,7 +54,8 @@ Course::Course() { Props.Minimap.PlayerScaleFactor = 0.22f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; - Props.Minimap.Colour = {255, 255, 255}; + Props.Minimap.Colour = { 255, 255, 255 }; + Props.WaterLevel = FLT_MAX; Props.LakituTowType = (s32) OLakitu::LakituTowType::NORMAL; @@ -117,11 +128,11 @@ void Course::LoadO2R(std::string trackPath) { for (auto& path : paths) { if (i == 0) { Props.PathSizes.unk0 = path.size(); - Props.PathTable[0] = (TrackPathPoint*)path.data(); + Props.PathTable[0] = (TrackPathPoint*) path.data(); Props.PathTable[1] = NULL; Props.PathTable[2] = NULL; Props.PathTable[3] = NULL; - Props.PathTable2[0] = (TrackPathPoint*)path.data(); + Props.PathTable2[0] = (TrackPathPoint*) path.data(); Props.PathTable2[1] = NULL; Props.PathTable2[2] = NULL; Props.PathTable2[3] = NULL; @@ -142,7 +153,7 @@ void Course::Load() { // Load from O2R if (!TrackSectionsPtr.empty()) { bIsMod = true; - //auto res = std::dynamic_pointer_cast(ResourceLoad(TrackSectionsPtr.c_str())); + // auto res = std::dynamic_pointer_cast(ResourceLoad(TrackSectionsPtr.c_str())); TrackSectionsO2R* sections = (TrackSectionsO2R*) LOAD_ASSET_RAW(TrackSectionsPtr.c_str()); size_t size = ResourceGetSizeByName(TrackSectionsPtr.c_str()); @@ -224,8 +235,9 @@ void Course::ParseCourseSections(TrackSectionsO2R* sections, size_t size) { } else { D_8015F5A4 = 0; } - printf("LOADING DL %s\n", sections[i].addr.c_str()); - generate_collision_mesh((Gfx*)LOAD_ASSET_RAW(sections[i].addr.c_str()), sections[i].surfaceType, sections[i].sectionId); + printf("LOADING DL %s\n", sections[i].addr.c_str()); + generate_collision_mesh((Gfx*) LOAD_ASSET_RAW(sections[i].addr.c_str()), sections[i].surfaceType, + sections[i].sectionId); } } @@ -235,8 +247,8 @@ void Course::TestPath() { s16 x; s16 y; s16 z; - Vec3s rot = {0, 0, 0}; - Vec3f vel = {0, 0, 0}; + Vec3s rot = { 0, 0, 0 }; + Vec3f vel = { 0, 0, 0 }; for (size_t i = 0; i < gPathCountByPathIndex[0]; i++) { x = gTrackPaths[0][i].posX; @@ -248,7 +260,7 @@ void Course::TestPath() { } f32 height = spawn_actor_on_surface(x, 2000.0f, z); - Vec3f itemPos = {x, height, z}; + Vec3f itemPos = { x, height, z }; add_actor_to_empty_slot(itemPos, rot, vel, ACTOR_ITEM_BOX); } } @@ -354,10 +366,10 @@ void Course::Render(struct UnkStruct_800DC5EC* arg0) { // d_course_big_donut_packed_dl_DE8 } - TrackSectionsO2R* sections = (TrackSectionsO2R*)LOAD_ASSET_RAW(TrackSectionsPtr.c_str()); + TrackSectionsO2R* sections = (TrackSectionsO2R*) LOAD_ASSET_RAW(TrackSectionsPtr.c_str()); size_t size = ResourceGetSizeByName(TrackSectionsPtr.c_str()); for (size_t i = 0; i < (size / sizeof(TrackSectionsO2R)); i++) { - gSPDisplayList(gDisplayListHead++, (Gfx*)LOAD_ASSET_RAW(sections[i].addr.c_str())); + gSPDisplayList(gDisplayListHead++, (Gfx*) LOAD_ASSET_RAW(sections[i].addr.c_str())); } } } @@ -370,8 +382,7 @@ f32 Course::GetWaterLevel(FVector pos, Collision* collision) { bool found = false; for (const auto& volume : gWorldInstance.CurrentCourse->WaterVolumes) { - if (pos.x >= volume.MinX && pos.x <= volume.MaxX && - pos.z >= volume.MinZ && pos.z <= volume.MaxZ) { + if (pos.x >= volume.MinX && pos.x <= volume.MaxX && pos.z >= volume.MinZ && pos.z <= volume.MaxZ) { // Choose the highest water volume the player is over if (!found || volume.Height > highestWater) { highestWater = volume.Height; diff --git a/src/engine/courses/Course.h b/src/engine/courses/Course.h index 162803b82..2370d916c 100644 --- a/src/engine/courses/Course.h +++ b/src/engine/courses/Course.h @@ -61,6 +61,8 @@ typedef struct MinimapProps { RGB8 Colour; // Colour of the visible pixels (the track path) } MinimapProps; +void ResizeMinimap(MinimapProps* minimap); + typedef struct Properties { char Name[128]; char DebugName[128]; diff --git a/src/engine/courses/DKJungle.cpp b/src/engine/courses/DKJungle.cpp index cd4c2803d..1608a2efb 100644 --- a/src/engine/courses/DKJungle.cpp +++ b/src/engine/courses/DKJungle.cpp @@ -73,7 +73,7 @@ DKJungle::DKJungle() { this->gfx = d_course_dks_jungle_parkway_packed_dls; this->gfxSize = 4997; Props.textures = dks_jungle_parkway_textures; - Props.Minimap.Texture = gTextureCourseOutlineDksJungleParkway; + Props.Minimap.Texture = minimap_dks_jungle_parkway; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 255; @@ -83,6 +83,7 @@ DKJungle::DKJungle() { Props.Minimap.PlayerScaleFactor = 0.0155f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "d.k.'s jungle parkway", sizeof(Props.Name)); Props.SetText(Props.DebugName, "jungle", sizeof(Props.DebugName)); @@ -142,6 +143,9 @@ DKJungle::DKJungle() { Props.Sequence = MusicSeq::MUSIC_SEQ_DK_JUNGLE; Props.WaterLevel = -475.0f; + for (size_t i = 0; i < 104; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) d_course_dks_jungle_parkway_unknown_dl_list[i], Props.textures); + } } void DKJungle::Load() { @@ -185,9 +189,9 @@ f32 DKJungle::GetWaterLevel(FVector pos, Collision* collision) { } void DKJungle::LoadTextures() { - dma_textures(gTextureDksJungleParkwayKiwanoFruit1, 0x0000032FU, 0x00000400U); - dma_textures(gTextureDksJungleParkwayKiwanoFruit2, 0x00000369U, 0x00000400U); - dma_textures(gTextureDksJungleParkwayKiwanoFruit3, 0x00000364U, 0x00000400U); + dma_textures(gTextureDksJungleParkwayKiwanoFruit1, 0x0000032FU, 0x00000400U); // 0x03009000 + dma_textures(gTextureDksJungleParkwayKiwanoFruit2, 0x00000369U, 0x00000400U); // 0x03009800 + dma_textures(gTextureDksJungleParkwayKiwanoFruit3, 0x00000364U, 0x00000400U); // 0x0300A000 } void DKJungle::BeginPlay() { diff --git a/src/engine/courses/DoubleDeck.cpp b/src/engine/courses/DoubleDeck.cpp index d8beccf06..0bd2fb23e 100644 --- a/src/engine/courses/DoubleDeck.cpp +++ b/src/engine/courses/DoubleDeck.cpp @@ -43,7 +43,7 @@ DoubleDeck::DoubleDeck() { this->gfx = d_course_double_deck_packed_dls; this->gfxSize = 699; Props.textures = double_deck_textures; - Props.Minimap.Texture = gTextureCourseOutlineDoubleDeck; + Props.Minimap.Texture = minimap_double_deck; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 257; @@ -53,6 +53,7 @@ DoubleDeck::DoubleDeck() { Props.Minimap.PlayerScaleFactor = 0.0285f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "double deck", sizeof(Props.Name)); Props.SetText(Props.DebugName, "deck", sizeof(Props.DebugName)); diff --git a/src/engine/courses/FrappeSnowland.cpp b/src/engine/courses/FrappeSnowland.cpp index 28d05e411..216dbd3d8 100644 --- a/src/engine/courses/FrappeSnowland.cpp +++ b/src/engine/courses/FrappeSnowland.cpp @@ -52,7 +52,7 @@ FrappeSnowland::FrappeSnowland() { this->gfx = d_course_frappe_snowland_packed_dls; this->gfxSize = 4140; Props.textures = frappe_snowland_textures; - Props.Minimap.Texture = gTextureCourseOutlineFrappeSnowland; + Props.Minimap.Texture = minimap_frappe_snowland; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 262; @@ -63,6 +63,7 @@ FrappeSnowland::FrappeSnowland() { Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; Props.Minimap.Colour = {72, 100, 255}; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "frappe snowland", sizeof(Props.Name)); Props.SetText(Props.DebugName, "snow", sizeof(Props.DebugName)); @@ -122,6 +123,9 @@ FrappeSnowland::FrappeSnowland() { Props.Sequence = MusicSeq::MUSIC_SEQ_FRAPPE_SNOWLAND; Props.WaterLevel = -50.0f; + for (size_t i = 0; i < 68; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) d_course_frappe_snowland_dl_list[i], Props.textures); + } } void FrappeSnowland::Load() { @@ -132,8 +136,8 @@ void FrappeSnowland::Load() { } void FrappeSnowland::LoadTextures() { - dma_textures(gTextureFrappeSnowlandTreeLeft, 0x00000454U, 0x00000800U); - dma_textures(gTextureFrappeSnowlandTreeRight, 0x00000432U, 0x00000800U); + dma_textures(gTextureFrappeSnowlandTreeLeft, 0x00000454U, 0x00000800U); // 0x03009000 + dma_textures(gTextureFrappeSnowlandTreeRight, 0x00000432U, 0x00000800U); // 0x03009800 } void FrappeSnowland::BeginPlay() { diff --git a/src/engine/courses/Harbour.cpp b/src/engine/courses/Harbour.cpp index 9ccbcd84b..891bfb45d 100644 --- a/src/engine/courses/Harbour.cpp +++ b/src/engine/courses/Harbour.cpp @@ -519,7 +519,7 @@ TrackPathPoint harbour_path[] = { Harbour::Harbour() { this->gfxSize = 100; this->textures = NULL; - Props.Minimap.Texture = gTextureCourseOutlineMarioRaceway; + Props.Minimap.Texture = minimap_mario_raceway; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 260; @@ -527,6 +527,7 @@ Harbour::Harbour() { Props.Minimap.PlayerX = 6; Props.Minimap.PlayerY = 28; Props.Minimap.PlayerScaleFactor = 0.022f; + ResizeMinimap(&Props.Minimap); Id = "mk:harbour"; Props.SetText(Props.Name, "Harbour", sizeof(Props.Name)); @@ -618,16 +619,16 @@ void Harbour::Load() { } void Harbour::LoadTextures() { - dma_textures(gTextureTrees1, 0x0000035BU, 0x00000800U); - D_802BA058 = dma_textures(gTexturePiranhaPlant1, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant2, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant3, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant4, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant5, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant6, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant7, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant8, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant9, 0x000003E8U, 0x00000800U); + dma_textures(gTextureTrees1, 0x0000035BU, 0x00000800U); // 0x03009000 + D_802BA058 = dma_textures(gTexturePiranhaPlant1, 0x000003E8U, 0x00000800U); // 0x03009800 + dma_textures(gTexturePiranhaPlant2, 0x000003E8U, 0x00000800U); // 0x0300A000 + dma_textures(gTexturePiranhaPlant3, 0x000003E8U, 0x00000800U); // 0x0300A800 + dma_textures(gTexturePiranhaPlant4, 0x000003E8U, 0x00000800U); // 0x0300B000 + dma_textures(gTexturePiranhaPlant5, 0x000003E8U, 0x00000800U); // 0x0300B800 + dma_textures(gTexturePiranhaPlant6, 0x000003E8U, 0x00000800U); // 0x0300C000 + dma_textures(gTexturePiranhaPlant7, 0x000003E8U, 0x00000800U); // 0x0300C800 + dma_textures(gTexturePiranhaPlant8, 0x000003E8U, 0x00000800U); // 0x0300D000 + dma_textures(gTexturePiranhaPlant9, 0x000003E8U, 0x00000800U); // 0x0300D800 } Path2D harbour_path2D[] = { diff --git a/src/engine/courses/KalimariDesert.cpp b/src/engine/courses/KalimariDesert.cpp index a5efbca46..283b81268 100644 --- a/src/engine/courses/KalimariDesert.cpp +++ b/src/engine/courses/KalimariDesert.cpp @@ -57,7 +57,7 @@ KalimariDesert::KalimariDesert() { this->gfx = d_course_kalimari_desert_packed_dls; this->gfxSize = 5328; Props.textures = kalimari_desert_textures; - Props.Minimap.Texture = gTextureCourseOutlineKalimariDesert; + Props.Minimap.Texture = minimap_kalimari_desert; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 263; @@ -67,6 +67,7 @@ KalimariDesert::KalimariDesert() { Props.Minimap.PlayerScaleFactor = 0.015f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 4.0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "kalimari desert", sizeof(Props.Name)); Props.SetText(Props.DebugName, "desert", sizeof(Props.DebugName)); @@ -125,6 +126,9 @@ KalimariDesert::KalimariDesert() { Props.Skybox.FloorBottomLeft = {0, 0, 0}; Props.Skybox.FloorTopLeft = {255, 192, 0}; Props.Sequence = MusicSeq::MUSIC_SEQ_KALIMARI_DESERT; + for (size_t i = 0; i < 80; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) kalimari_desert_dls[i], Props.textures); + } } void KalimariDesert::Load() { @@ -136,11 +140,11 @@ void KalimariDesert::Load() { } void KalimariDesert::LoadTextures() { - dma_textures(gTextureCactus1Left, 0x0000033EU, 0x00000800U); - dma_textures(gTextureCactus1Right, 0x000002FBU, 0x00000800U); - dma_textures(gTextureCactus2Left, 0x000002A8U, 0x00000800U); - dma_textures(gTextureCactus2Right, 0x00000374U, 0x00000800U); - dma_textures(gTextureCactus3, 0x000003AFU, 0x00000800U); + dma_textures(gTextureCactus1Left, 0x0000033EU, 0x00000800U); // 0x03009000 + dma_textures(gTextureCactus1Right, 0x000002FBU, 0x00000800U); // 0x03009800 + dma_textures(gTextureCactus2Left, 0x000002A8U, 0x00000800U); // 0x0300A000 + dma_textures(gTextureCactus2Right, 0x00000374U, 0x00000800U); // 0x0300A800 + dma_textures(gTextureCactus3, 0x000003AFU, 0x00000800U); // 0x0300B000 } void KalimariDesert::BeginPlay() { diff --git a/src/engine/courses/KoopaTroopaBeach.cpp b/src/engine/courses/KoopaTroopaBeach.cpp index b9a13d242..555e4e997 100644 --- a/src/engine/courses/KoopaTroopaBeach.cpp +++ b/src/engine/courses/KoopaTroopaBeach.cpp @@ -62,7 +62,7 @@ KoopaTroopaBeach::KoopaTroopaBeach() { this->gfx = d_course_koopa_troopa_beach_packed_dls; this->gfxSize = 5720; Props.textures = koopa_troopa_beach_textures; - Props.Minimap.Texture = gTextureCourseOutlineKoopaTroopaBeach; + Props.Minimap.Texture = minimap_koopa_troopa_beach; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 268; @@ -72,6 +72,7 @@ KoopaTroopaBeach::KoopaTroopaBeach() { Props.Minimap.PlayerScaleFactor = 0.014f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Id = "mk:koopa_beach"; Props.SetText(Props.Name, "koopa troopa beach", sizeof(Props.Name)); @@ -135,6 +136,12 @@ KoopaTroopaBeach::KoopaTroopaBeach() { Props.WaterLevel = 0.0f; gWaterVelocity = -0.1f; WaterVolumes.push_back({0.8f, 67.0f, 239.0f, 2233.0f, 2405.0f}); + for (size_t i = 0; i < 148; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) d_course_koopa_troopa_beach_dl_list1[i], Props.textures); + } + for (size_t i = 0; i < 148; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) koopa_troopa_beach_dls2[i], Props.textures); + } } void KoopaTroopaBeach::Load() { diff --git a/src/engine/courses/LuigiRaceway.cpp b/src/engine/courses/LuigiRaceway.cpp index add7825b3..acf1bf500 100644 --- a/src/engine/courses/LuigiRaceway.cpp +++ b/src/engine/courses/LuigiRaceway.cpp @@ -89,7 +89,7 @@ LuigiRaceway::LuigiRaceway() { this->gfx = d_course_luigi_raceway_packed_dls; this->gfxSize = 6377; Props.textures = luigi_raceway_textures; - Props.Minimap.Texture = gTextureCourseOutlineLuigiRaceway; + Props.Minimap.Texture = minimap_luigi_raceway; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 271; @@ -99,6 +99,7 @@ LuigiRaceway::LuigiRaceway() { Props.Minimap.PlayerScaleFactor = 0.0155f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Id = "mk:luigi_raceway"; Props.SetText(Props.Name, "luigi raceway", sizeof(Props.Name)); @@ -158,6 +159,9 @@ LuigiRaceway::LuigiRaceway() { Props.Skybox.FloorBottomLeft = { 0, 0, 0 }; Props.Skybox.FloorTopLeft = { 216, 232, 248 }; Props.Sequence = MusicSeq::MUSIC_SEQ_RACEWAYS_WARIO_STADIUM; + for (size_t i = 0; i < 120; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) luigi_raceway_dls[i], Props.textures); + } } void LuigiRaceway::Load() { @@ -169,8 +173,8 @@ void LuigiRaceway::Load() { } void LuigiRaceway::LoadTextures() { - dma_textures(gTextureTrees5Left, 0x000003E8U, 0x00000800U); - dma_textures(gTextureTrees5Right, 0x000003E8U, 0x00000800U); + dma_textures(gTextureTrees5Left, 0x000003E8U, 0x00000800U); // 0x03009000 + dma_textures(gTextureTrees5Right, 0x000003E8U, 0x00000800U); // 0x03009800 } void LuigiRaceway::BeginPlay() { diff --git a/src/engine/courses/MarioRaceway.cpp b/src/engine/courses/MarioRaceway.cpp index a7bd21b45..64dedd4df 100644 --- a/src/engine/courses/MarioRaceway.cpp +++ b/src/engine/courses/MarioRaceway.cpp @@ -76,7 +76,7 @@ MarioRaceway::MarioRaceway() { this->gfxSize = 3367; Props.textures = mario_raceway_textures; - Props.Minimap.Texture = gTextureCourseOutlineMarioRaceway; + Props.Minimap.Texture = minimap_mario_raceway; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 260; @@ -86,6 +86,7 @@ MarioRaceway::MarioRaceway() { Props.Minimap.PlayerScaleFactor = 0.022f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = -2.0; + ResizeMinimap(&Props.Minimap); Id = "mk:mario_raceway"; Props.SetText(Props.Name, "mario raceway", sizeof(Props.Name)); @@ -146,6 +147,9 @@ MarioRaceway::MarioRaceway() { Props.Skybox.FloorBottomLeft = {0, 0, 0}; Props.Skybox.FloorTopLeft = {0, 0, 0}; Props.Sequence = MusicSeq::MUSIC_SEQ_RACEWAYS_WARIO_STADIUM; + for (size_t i = 0; i < 68; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) mario_raceway_dls[i], Props.textures); + } } void MarioRaceway::Load() { @@ -172,16 +176,16 @@ void MarioRaceway::Load() { } void MarioRaceway::LoadTextures() { - dma_textures(gTextureTrees1, 0x0000035BU, 0x00000800U); - D_802BA058 = dma_textures(gTexturePiranhaPlant1, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant2, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant3, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant4, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant5, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant6, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant7, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant8, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant9, 0x000003E8U, 0x00000800U); + dma_textures(gTextureTrees1, 0x0000035BU, 0x00000800U); // 0x03009000 + D_802BA058 = dma_textures(gTexturePiranhaPlant1, 0x000003E8U, 0x00000800U); // 0x03009800 + dma_textures(gTexturePiranhaPlant2, 0x000003E8U, 0x00000800U); // 0x0300A000 + dma_textures(gTexturePiranhaPlant3, 0x000003E8U, 0x00000800U); // 0x0300A800 + dma_textures(gTexturePiranhaPlant4, 0x000003E8U, 0x00000800U); // 0x0300B000 + dma_textures(gTexturePiranhaPlant5, 0x000003E8U, 0x00000800U); // 0x0300B800 + dma_textures(gTexturePiranhaPlant6, 0x000003E8U, 0x00000800U); // 0x0300C000 + dma_textures(gTexturePiranhaPlant7, 0x000003E8U, 0x00000800U); // 0x0300C800 + dma_textures(gTexturePiranhaPlant8, 0x000003E8U, 0x00000800U); // 0x0300D000 + dma_textures(gTexturePiranhaPlant9, 0x000003E8U, 0x00000800U); // 0x0300D800 } void MarioRaceway::BeginPlay() { diff --git a/src/engine/courses/MooMooFarm.cpp b/src/engine/courses/MooMooFarm.cpp index 24b69ff67..7ebab2723 100644 --- a/src/engine/courses/MooMooFarm.cpp +++ b/src/engine/courses/MooMooFarm.cpp @@ -75,7 +75,7 @@ MooMooFarm::MooMooFarm() { this->gfx = d_course_moo_moo_farm_packed_dls; this->gfxSize = 3304; Props.textures = moo_moo_farm_textures; - Props.Minimap.Texture = gTextureCourseOutlineMooMooFarm; + Props.Minimap.Texture = minimap_moo_moo_farm; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 271; @@ -85,6 +85,7 @@ MooMooFarm::MooMooFarm() { Props.Minimap.PlayerScaleFactor = 0.0155f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "moo moo farm", sizeof(Props.Name)); Props.SetText(Props.DebugName, "farm", sizeof(Props.DebugName)); @@ -143,6 +144,9 @@ MooMooFarm::MooMooFarm() { Props.Skybox.FloorBottomLeft = {0, 0, 0}; Props.Skybox.FloorTopLeft = {255, 184, 99}; Props.Sequence = MusicSeq::MUSIC_SEQ_MOO_MOO_FARM_YOSHI_VALLEY; + for (size_t i = 0; i < 92; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) moo_moo_farm_dls[i], Props.textures); + } } void MooMooFarm::Load() { @@ -154,18 +158,18 @@ void MooMooFarm::Load() { } void MooMooFarm::LoadTextures() { - dma_textures(gTextureTrees4Left, 0x000003E8U, 0x00000800U); - dma_textures(gTextureTrees4Right, 0x000003E8U, 0x00000800U); - dma_textures(gTextureCow01Left, 0x00000400U, 0x00000800U); - dma_textures(gTextureCow01Right, 0x00000400U, 0x00000800U); - dma_textures(gTextureCow02Left, 0x00000400U, 0x00000800U); - dma_textures(gTextureCow02Right, 0x00000400U, 0x00000800U); - dma_textures(gTextureCow03Left, 0x00000400U, 0x00000800U); - dma_textures(gTextureCow03Right, 0x00000400U, 0x00000800U); - dma_textures(gTextureCow04Left, 0x00000400U, 0x00000800U); - dma_textures(gTextureCow04Right, 0x00000400U, 0x00000800U); - dma_textures(gTextureCow05Left, 0x00000400U, 0x00000800U); - dma_textures(gTextureCow05Right, 0x00000400U, 0x00000800U); + dma_textures(gTextureTrees4Left, 0x000003E8U, 0x00000800U); // 0x03009000 + dma_textures(gTextureTrees4Right, 0x000003E8U, 0x00000800U); // 0x03009800 + dma_textures(gTextureCow01Left, 0x00000400U, 0x00000800U); // 0x0300A000 + dma_textures(gTextureCow01Right, 0x00000400U, 0x00000800U); // 0x0300A800 + dma_textures(gTextureCow02Left, 0x00000400U, 0x00000800U); // 0x0300B000 + dma_textures(gTextureCow02Right, 0x00000400U, 0x00000800U); // 0x0300B800 + dma_textures(gTextureCow03Left, 0x00000400U, 0x00000800U); // 0x0300C000 + dma_textures(gTextureCow03Right, 0x00000400U, 0x00000800U); // 0x0300C800 + dma_textures(gTextureCow04Left, 0x00000400U, 0x00000800U); // 0x0300D000 + dma_textures(gTextureCow04Right, 0x00000400U, 0x00000800U); // 0x0300D800 + dma_textures(gTextureCow05Left, 0x00000400U, 0x00000800U); // 0x0300E000 + dma_textures(gTextureCow05Right, 0x00000400U, 0x00000800U); // 0x0300E800 } // These are full arrays that are not used in the original game diff --git a/src/engine/courses/RainbowRoad.cpp b/src/engine/courses/RainbowRoad.cpp index bcd9a2667..f3893d28a 100644 --- a/src/engine/courses/RainbowRoad.cpp +++ b/src/engine/courses/RainbowRoad.cpp @@ -49,7 +49,7 @@ RainbowRoad::RainbowRoad() { this->gfx = d_course_rainbow_road_packed_dls; this->gfxSize = 5670; Props.textures = rainbow_road_textures; - Props.Minimap.Texture = gTextureCourseOutlineRainbowRoad; + Props.Minimap.Texture = minimap_rainbow_road; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 261; @@ -59,6 +59,7 @@ RainbowRoad::RainbowRoad() { Props.Minimap.PlayerScaleFactor = 0.0103f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "rainbow road", sizeof(Props.Name)); Props.SetText(Props.DebugName, "rainbow", sizeof(Props.DebugName)); diff --git a/src/engine/courses/RoyalRaceway.cpp b/src/engine/courses/RoyalRaceway.cpp index 28d3c4e3e..b5b448e0e 100644 --- a/src/engine/courses/RoyalRaceway.cpp +++ b/src/engine/courses/RoyalRaceway.cpp @@ -87,7 +87,7 @@ RoyalRaceway::RoyalRaceway() { this->gfx = d_course_royal_raceway_packed_dls; this->gfxSize = 5670; Props.textures = royal_raceway_textures; - Props.Minimap.Texture = gTextureCourseOutlineRoyalRaceway; + Props.Minimap.Texture = minimap_royal_raceway; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 262; @@ -97,6 +97,7 @@ RoyalRaceway::RoyalRaceway() { Props.Minimap.PlayerScaleFactor = 0.014f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "royal raceway", sizeof(Props.Name)); Props.SetText(Props.DebugName, "p circuit", sizeof(Props.DebugName)); @@ -157,6 +158,9 @@ RoyalRaceway::RoyalRaceway() { Props.Sequence = MusicSeq::MUSIC_SEQ_RACEWAYS_WARIO_STADIUM; Props.WaterLevel = -60.0f; + for (size_t i = 0; i < 132; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) royal_raceway_dls[i], Props.textures); + } } void RoyalRaceway::Load() { @@ -167,17 +171,17 @@ void RoyalRaceway::Load() { } void RoyalRaceway::LoadTextures() { - dma_textures(gTextureTrees3, 0x000003E8U, 0x00000800U); - dma_textures(gTextureTrees7, 0x000003E8U, 0x00000800U); - D_802BA058 = dma_textures(gTexturePiranhaPlant1, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant2, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant3, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant4, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant5, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant6, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant7, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant8, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant9, 0x000003E8U, 0x00000800U); + dma_textures(gTextureTrees3, 0x000003E8U, 0x00000800U); // 0x03009000 + dma_textures(gTextureTrees7, 0x000003E8U, 0x00000800U); // 0x03009800 + D_802BA058 = dma_textures(gTexturePiranhaPlant1, 0x000003E8U, 0x00000800U); // 0x0300A000 + dma_textures(gTexturePiranhaPlant2, 0x000003E8U, 0x00000800U); // 0x0300A800 + dma_textures(gTexturePiranhaPlant3, 0x000003E8U, 0x00000800U); // 0x0300B000 + dma_textures(gTexturePiranhaPlant4, 0x000003E8U, 0x00000800U); // 0x0300B800 + dma_textures(gTexturePiranhaPlant5, 0x000003E8U, 0x00000800U); // 0x0300C000 + dma_textures(gTexturePiranhaPlant6, 0x000003E8U, 0x00000800U); // 0x0300C800 + dma_textures(gTexturePiranhaPlant7, 0x000003E8U, 0x00000800U); // 0x0300D000 + dma_textures(gTexturePiranhaPlant8, 0x000003E8U, 0x00000800U); // 0x0300D800 + dma_textures(gTexturePiranhaPlant9, 0x000003E8U, 0x00000800U); // 0x0300E000 } void RoyalRaceway::BeginPlay() { diff --git a/src/engine/courses/SherbetLand.cpp b/src/engine/courses/SherbetLand.cpp index 2272922fa..6bcf06aa6 100644 --- a/src/engine/courses/SherbetLand.cpp +++ b/src/engine/courses/SherbetLand.cpp @@ -49,7 +49,7 @@ SherbetLand::SherbetLand() { this->gfx = d_course_sherbet_land_packed_dls; this->gfxSize = 1803; Props.textures = sherbet_land_textures; - Props.Minimap.Texture = gTextureCourseOutlineSherbetLand; + Props.Minimap.Texture = minimap_sherbet_land; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 262; @@ -60,6 +60,7 @@ SherbetLand::SherbetLand() { Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; Props.Minimap.Colour = {72, 100, 255}; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "sherbet land", sizeof(Props.Name)); Props.SetText(Props.DebugName, "sherbet", sizeof(Props.DebugName)); @@ -122,6 +123,12 @@ SherbetLand::SherbetLand() { Props.Sequence = MusicSeq::MUSIC_SEQ_FRAPPE_SNOWLAND; Props.WaterLevel = -18.0f; + for (size_t i = 0; i < 72; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) sherbet_land_dls[i], Props.textures); + } + for (size_t i = 0; i < 72; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) sherbet_land_dls_2[i], Props.textures); + } } void SherbetLand::Load() { diff --git a/src/engine/courses/Skyscraper.cpp b/src/engine/courses/Skyscraper.cpp index d1bdd373e..637f5c521 100644 --- a/src/engine/courses/Skyscraper.cpp +++ b/src/engine/courses/Skyscraper.cpp @@ -64,7 +64,7 @@ Skyscraper::Skyscraper() { this->gfx = d_course_skyscraper_packed_dls; this->gfxSize = 548; Props.textures = skyscraper_textures; - Props.Minimap.Texture = gTextureCourseOutlineSkyscraper; + Props.Minimap.Texture = minimap_skyscraper; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 257; @@ -74,6 +74,7 @@ Skyscraper::Skyscraper() { Props.Minimap.PlayerScaleFactor = 0.0445f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "skyscraper", sizeof(Props.Name)); Props.SetText(Props.DebugName, "skyscraper", sizeof(Props.DebugName)); diff --git a/src/engine/courses/TestCourse.cpp b/src/engine/courses/TestCourse.cpp index 02d2493cf..1984fb143 100644 --- a/src/engine/courses/TestCourse.cpp +++ b/src/engine/courses/TestCourse.cpp @@ -61,7 +61,7 @@ extern "C" { TestCourse::TestCourse() { this->gfxSize = 100; this->textures = NULL; - Props.Minimap.Texture = gTextureCourseOutlineMarioRaceway; + Props.Minimap.Texture = minimap_mario_raceway; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 260; @@ -72,6 +72,7 @@ TestCourse::TestCourse() { Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; Props.Minimap.Colour = {255, 255, 255}; + ResizeMinimap(&Props.Minimap); Id = "mk:test_course"; @@ -145,16 +146,16 @@ void TestCourse::Load() { } void TestCourse::LoadTextures() { - dma_textures(gTextureTrees1, 0x0000035BU, 0x00000800U); - D_802BA058 = dma_textures(gTexturePiranhaPlant1, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant2, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant3, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant4, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant5, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant6, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant7, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant8, 0x000003E8U, 0x00000800U); - dma_textures(gTexturePiranhaPlant9, 0x000003E8U, 0x00000800U); + dma_textures(gTextureTrees1, 0x0000035BU, 0x00000800U); // 0x03009000 + D_802BA058 = dma_textures(gTexturePiranhaPlant1, 0x000003E8U, 0x00000800U); // 0x03009800 + dma_textures(gTexturePiranhaPlant2, 0x000003E8U, 0x00000800U); // 0x0300A000 + dma_textures(gTexturePiranhaPlant3, 0x000003E8U, 0x00000800U); // 0x0300A800 + dma_textures(gTexturePiranhaPlant4, 0x000003E8U, 0x00000800U); // 0x0300B000 + dma_textures(gTexturePiranhaPlant5, 0x000003E8U, 0x00000800U); // 0x0300B800 + dma_textures(gTexturePiranhaPlant6, 0x000003E8U, 0x00000800U); // 0x0300C000 + dma_textures(gTexturePiranhaPlant7, 0x000003E8U, 0x00000800U); // 0x0300C800 + dma_textures(gTexturePiranhaPlant8, 0x000003E8U, 0x00000800U); // 0x0300D000 + dma_textures(gTexturePiranhaPlant9, 0x000003E8U, 0x00000800U); // 0x0300D800 } Path2D test_course_path2D[] = { diff --git a/src/engine/courses/ToadsTurnpike.cpp b/src/engine/courses/ToadsTurnpike.cpp index 4314134ff..387e39d33 100644 --- a/src/engine/courses/ToadsTurnpike.cpp +++ b/src/engine/courses/ToadsTurnpike.cpp @@ -70,7 +70,7 @@ ToadsTurnpike::ToadsTurnpike() { this->gfx = d_course_toads_turnpike_packed_dls; this->gfxSize = 3427; Props.textures = toads_turnpike_textures; - Props.Minimap.Texture = gTextureCourseOutlineToadsTurnpike; + Props.Minimap.Texture = minimap_toads_turnpike; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 252; @@ -80,6 +80,7 @@ ToadsTurnpike::ToadsTurnpike() { Props.Minimap.PlayerScaleFactor = 0.013f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "toad's turnpike", sizeof(Props.Name)); Props.SetText(Props.DebugName, "highway", sizeof(Props.DebugName)); @@ -144,6 +145,9 @@ ToadsTurnpike::ToadsTurnpike() { Props.Skybox.FloorBottomLeft = {0, 0, 0}; Props.Skybox.FloorTopLeft = {209, 65, 23}; Props.Sequence = MusicSeq::MUSIC_SEQ_TOADS_TURNPIKE; + for (size_t i = 0; i < 80; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) d_course_toads_turnpike_dl_list[i], Props.textures); + } } void ToadsTurnpike::Load() { diff --git a/src/engine/courses/WarioStadium.cpp b/src/engine/courses/WarioStadium.cpp index f08ba2f44..f04510e96 100644 --- a/src/engine/courses/WarioStadium.cpp +++ b/src/engine/courses/WarioStadium.cpp @@ -66,7 +66,7 @@ WarioStadium::WarioStadium() { this->gfx = d_course_wario_stadium_packed_dls; this->gfxSize = 5272; Props.textures = wario_stadium_textures; - Props.Minimap.Texture = gTextureCourseOutlineWarioStadium; + Props.Minimap.Texture = minimap_wario_stadium; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.Pos[0].X = 262; @@ -76,6 +76,7 @@ WarioStadium::WarioStadium() { Props.Minimap.PlayerScaleFactor = 0.0155f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "wario stadium", sizeof(Props.Name)); Props.SetText(Props.DebugName, "stadium", sizeof(Props.DebugName)); @@ -140,6 +141,9 @@ WarioStadium::WarioStadium() { Props.Skybox.FloorBottomLeft = { 0, 0, 0 }; Props.Skybox.FloorTopLeft = { 0, 0, 0 }; Props.Sequence = MusicSeq::MUSIC_SEQ_RACEWAYS_WARIO_STADIUM; + for (size_t i = 0; i < 108; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) wario_stadium_dls[i], Props.textures); + } } void WarioStadium::Load() { diff --git a/src/engine/courses/YoshiValley.cpp b/src/engine/courses/YoshiValley.cpp index f8424e03e..5a24644f7 100644 --- a/src/engine/courses/YoshiValley.cpp +++ b/src/engine/courses/YoshiValley.cpp @@ -61,7 +61,7 @@ YoshiValley::YoshiValley() { this->gfxSize = 4140; Props.textures = yoshi_valley_textures; - Props.Minimap.Texture = gTextureCourseOutlineYoshiValley; + Props.Minimap.Texture = minimap_yoshi_valley; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); Props.Minimap.PlayerX = 61; @@ -69,6 +69,7 @@ YoshiValley::YoshiValley() { Props.Minimap.PlayerScaleFactor = 0.018f; Props.Minimap.FinishlineX = 0; Props.Minimap.FinishlineY = 0; + ResizeMinimap(&Props.Minimap); Props.SetText(Props.Name, "yoshi valley", sizeof(Props.Name)); Props.SetText(Props.DebugName, "maze", sizeof(Props.DebugName)); @@ -127,6 +128,9 @@ YoshiValley::YoshiValley() { Props.Skybox.FloorBottomLeft = {0, 0, 0}; Props.Skybox.FloorTopLeft = {95, 40, 15}; Props.Sequence = MusicSeq::MUSIC_SEQ_MOO_MOO_FARM_YOSHI_VALLEY; + for (size_t i = 0; i < 124; i++) { + replace_segmented_textures_with_o2r_textures((Gfx*) d_course_yoshi_valley_dl_list[i], Props.textures); + } } void YoshiValley::Load() { @@ -140,7 +144,7 @@ void YoshiValley::Load() { } void YoshiValley::LoadTextures() { - dma_textures(gTextureTrees2, 0x000003E8U, 0x00000800U); + dma_textures(gTextureTrees2, 0x000003E8U, 0x00000800U); // 0x03009000 } void YoshiValley::BeginPlay() { diff --git a/src/engine/editor/EditorMath.cpp b/src/engine/editor/EditorMath.cpp index f3833008b..f541d92f2 100644 --- a/src/engine/editor/EditorMath.cpp +++ b/src/engine/editor/EditorMath.cpp @@ -86,7 +86,7 @@ FVector ScreenRayTrace() { bool QueryCollisionRayActor(Vec3f rayOrigin, Vec3f rayDir, Vec3f actorMin, Vec3f actorMax, float* t) { float tmin = -FLT_MAX, tmax = FLT_MAX; - for (int i = 0; i < 3; i++) { + for (size_t i = 0; i < 3; i++) { if (fabs(rayDir[i]) > 1e-6f) { // Avoid division by zero float t1 = (actorMin[i] - rayOrigin[i]) / rayDir[i]; float t2 = (actorMax[i] - rayOrigin[i]) / rayDir[i]; @@ -109,9 +109,9 @@ bool QueryCollisionRayActor(Vec3f rayOrigin, Vec3f rayDir, Vec3f actorMin, Vec3f FVector4 MultiplyMatrixVector(float matrix[4][4], float vector[4]) { FVector4 result; float* resultPtr = &result.x; - for (int i = 0; i < 4; i++) { + for (size_t i = 0; i < 4; i++) { resultPtr[i] = 0; - for (int j = 0; j < 4; j++) { + for (size_t j = 0; j < 4; j++) { resultPtr[i] += matrix[j][i] * vector[j]; // Swap [i][j] → [j][i] for column order } } diff --git a/src/engine/editor/SceneManager.cpp b/src/engine/editor/SceneManager.cpp index c825431de..ae41f2f1d 100644 --- a/src/engine/editor/SceneManager.cpp +++ b/src/engine/editor/SceneManager.cpp @@ -147,7 +147,7 @@ namespace Editor { course->Props.Minimap.Width = texture.Width; course->Props.Minimap.Height = texture.Height; } else { // Fallback - course->Props.Minimap.Texture = gTextureCourseOutlineMarioRaceway; + course->Props.Minimap.Texture = minimap_mario_raceway; course->Props.Minimap.Width = ResourceGetTexWidthByName(course->Props.Minimap.Texture); course->Props.Minimap.Height = ResourceGetTexHeightByName(course->Props.Minimap.Texture); } diff --git a/src/engine/particles/StarEmitter.cpp b/src/engine/particles/StarEmitter.cpp index 7cb9d9979..cd1b60b25 100644 --- a/src/engine/particles/StarEmitter.cpp +++ b/src/engine/particles/StarEmitter.cpp @@ -102,8 +102,8 @@ void StarEmitter::Draw(s32 cameraId) { // func_80054BE8 Camera* camera; camera = &camera1[cameraId]; - gSPDisplayList(gDisplayListHead++, (Gfx*)D_0D007AE0); - load_texture_block_ia8_nomirror(D_8018D488, 0x00000020, 0x00000020); + gSPDisplayList(gDisplayListHead++, (Gfx*) D_0D007AE0); + load_texture_block_ia8_nomirror((u8*) gTexture69C80C, 0x00000020, 0x00000020); func_8004B35C(0x000000FF, 0x000000FF, 0, 0x000000FF); D_80183E80[0] = 0; for (var_s0 = 0; var_s0 < gObjectParticle3_SIZE; var_s0++) { @@ -126,8 +126,8 @@ void StarEmitter::func_80054AFC(s32 objectIndex, Vec3f arg1) { (s32) gObjectList[objectIndex].unk_084[2], (s32) gObjectList[objectIndex].primAlpha); rsp_set_matrix_transformation(gObjectList[objectIndex].pos, (u16*) D_80183E80, gObjectList[objectIndex].sizeScaling); - gSPVertex(gDisplayListHead++, (uintptr_t)D_0D005AE0, 4, 0); - gSPDisplayList(gDisplayListHead++, (Gfx*)common_rectangle_display); + gSPVertex(gDisplayListHead++, (uintptr_t) D_0D005AE0, 4, 0); + gSPDisplayList(gDisplayListHead++, (Gfx*) common_rectangle_display); } void StarEmitter::func_80077428(s32 objectIndex) { diff --git a/src/main.c b/src/main.c index 7b28393d1..b2590c291 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,3 @@ -#ifndef GCC -#define gRaceState_AS_U16 -#endif #include #include #include @@ -119,7 +116,7 @@ u8 gControllerBits; CollisionGrid gCollisionGrid[1024]; u16 gNumActors; u16 gMatrixObjectCount; -s32 gTickLogic; // Tick game physics at 60fps +s32 gTickLogic; // Tick game physics at 60fps s32 gTickVisuals; // Tick animations at 30fps s32 gTickGame; f32 D_80150118; @@ -179,7 +176,7 @@ OSMesgQueue gPIMesgQueue; s32 gGamestate = 0xFFFF; // gRaceState is externed as an s32 in other files. D_800DC514 is only used in main.c, likely a developer mistake. -u16 gRaceState = RACE_INIT; +s32 gRaceState = RACE_INIT; u16 D_800DC514 = 0; u16 creditsRenderMode = 0; // Renders the whole track. Displays red if used in normal race mode. u16 gDemoMode = DEMO_MODE_INACTIVE; @@ -648,8 +645,8 @@ void calculate_updaterate(void) { static u32 remainder = 0; static u32 logicAccumulator = 0; static u32 visualsAccumulator = 0; - static u32 frameCounter = 0; // For tracking frames for logic updates - u32 now = SDL_GetTicks(); // Replaces osGetTime() + static u32 frameCounter = 0; // For tracking frames for logic updates + u32 now = SDL_GetTicks(); // Replaces osGetTime() u32 frameRate = 0; s32 total; @@ -673,9 +670,9 @@ void calculate_updaterate(void) { // Avoid division by zero if (total > 0) { // Calculate approximate frame rate (milliseconds per frame) - frameRate = 1000 / total; // Frame rate in frames per second + frameRate = 1000 / total; // Frame rate in frames per second } else { - frameRate = targetFPS; // Fallback to target FPS + frameRate = targetFPS; // Fallback to target FPS } // Default both to no updates @@ -683,13 +680,13 @@ void calculate_updaterate(void) { gTickVisuals = 0; // Calculate the update rates based on target FPS - s32 logicUpdateInterval = 1000 / 60; // Time in ms between logic updates + s32 logicUpdateInterval = 1000 / 60; // Time in ms between logic updates s32 visualsUpdateInterval = 1000 / 30; // 30 FPS for visuals - // Accumulate time for logic updates + // Accumulate time for logic updates logicAccumulator += total; if (logicAccumulator >= logicUpdateInterval) { - logicAccumulator -= logicUpdateInterval; // Subtract full interval + logicAccumulator -= logicUpdateInterval; // Subtract full interval if (targetFPS < 60) { gTickLogic = 2; } else { @@ -698,8 +695,8 @@ void calculate_updaterate(void) { } // Visual updates (based on 30 FPS equivalent) - visualsAccumulator += total; // Increment for each frame - if (visualsAccumulator >= visualsUpdateInterval) { // Check if it's time to update visuals + visualsAccumulator += total; // Increment for each frame + if (visualsAccumulator >= visualsUpdateInterval) { // Check if it's time to update visuals visualsAccumulator -= visualsUpdateInterval; // gTickVisuals <-- Goes here to use the native 60fps system } @@ -711,28 +708,26 @@ void display_debug_info(void) { if (!gEnableDebugMode) { D_800DC514 = false; } else if (D_800DC514) { - if ((gControllerOne->buttonPressed & R_TRIG) && - (gControllerOne->button & A_BUTTON) && + if ((gControllerOne->buttonPressed & R_TRIG) && (gControllerOne->button & A_BUTTON) && (gControllerOne->button & B_BUTTON)) { D_800DC514 = false; } rotY = camera1->rot[1]; gDebugPathCount = D_800DC5EC->pathCounter; - if (rotY < 0x2000) { - func_80057A50(40, 100, "SOUTH ", gDebugPathCount); - } else if (rotY < 0x6000) { - func_80057A50(40, 100, "EAST ", gDebugPathCount); - } else if (rotY < 0xA000) { - func_80057A50(40, 100, "NORTH ", gDebugPathCount); - } else if (rotY < 0xE000) { - func_80057A50(40, 100, "WEST ", gDebugPathCount); - } else { - func_80057A50(40, 100, "SOUTH ", gDebugPathCount); - } + if (rotY < 0x2000) { + func_80057A50(40, 100, "SOUTH ", gDebugPathCount); + } else if (rotY < 0x6000) { + func_80057A50(40, 100, "EAST ", gDebugPathCount); + } else if (rotY < 0xA000) { + func_80057A50(40, 100, "NORTH ", gDebugPathCount); + } else if (rotY < 0xE000) { + func_80057A50(40, 100, "WEST ", gDebugPathCount); + } else { + func_80057A50(40, 100, "SOUTH ", gDebugPathCount); + } - } else if ((gControllerOne->buttonPressed & L_TRIG) && - (gControllerOne->button & A_BUTTON) && + } else if ((gControllerOne->buttonPressed & L_TRIG) && (gControllerOne->button & A_BUTTON) && (gControllerOne->button & B_BUTTON)) { D_800DC514 = true; } @@ -742,13 +737,11 @@ void display_debug_info(void) { } else { if (gEnableResourceMeters) { resource_display(); - if (!(gControllerOne->button & L_TRIG) && - (gControllerOne->button & R_TRIG) && - (gControllerOne->buttonPressed & B_BUTTON)) { + if (!(gControllerOne->button & L_TRIG) && (gControllerOne->button & R_TRIG) && + (gControllerOne->buttonPressed & B_BUTTON)) { gEnableResourceMeters = 0; } - } else if (!(gControllerOne->button & L_TRIG) && - (gControllerOne->button & R_TRIG) && + } else if (!(gControllerOne->button & L_TRIG) && (gControllerOne->button & R_TRIG) && (gControllerOne->buttonPressed & B_BUTTON)) { gEnableResourceMeters = 1; } @@ -866,7 +859,7 @@ void race_logic_loop(void) { select_framebuffer(); } - switch(gActiveScreenMode) { + switch (gActiveScreenMode) { case SCREEN_MODE_1P: render_screens(RENDER_SCREEN_MODE_1P_PLAYER_ONE, 0, 0); break; @@ -1300,9 +1293,9 @@ void thread5_iteration(void) { FB_CreateFramebuffers(); read_controllers(); game_state_handler(); - - //call_render_hook(); - + + // call_render_hook(); + end_master_display_list(); display_and_vsync(); } diff --git a/src/main.h b/src/main.h index 80871e653..0c09d9efa 100644 --- a/src/main.h +++ b/src/main.h @@ -207,15 +207,8 @@ extern OSMesg gPIMesgBuf[]; extern OSMesgQueue gPIMesgQueue; void race_logic_loop(void); extern s32 gGamestate; -#ifndef gRaceState_AS_U16 -// Prevent overlapping writes in gcc -// Whether gRaceState was intended to be a separate variable in main.c from the rest of the game is unknown -#ifdef GCC -extern u16 gRaceState; -#else + extern s32 gRaceState; -#endif -#endif extern u16 D_800DC514; extern u16 creditsRenderMode; diff --git a/src/math_util_2.c b/src/math_util_2.c index bae086ad0..7d1bc638e 100644 --- a/src/math_util_2.c +++ b/src/math_util_2.c @@ -904,7 +904,7 @@ s32 mtxf_set_matrix_gObjectList(s32 objectIndex, Mat4 transformMatrix) { transformMatrix[3][3] = 1.0f; // Search all recorded objects for the one we're drawing - for (int i = 0; i < OBJECT_LIST_SIZE; i++) { + for (size_t i = 0; i < OBJECT_LIST_SIZE; i++) { if (objectIndex == prevObject2[i].objectIndex) { // Coincidence! // Skip drawing the object this frame if it warped to the other side of the screen diff --git a/src/menu_items.c b/src/menu_items.c index 339c688ac..46957d0c1 100644 --- a/src/menu_items.c +++ b/src/menu_items.c @@ -79,9 +79,9 @@ Gfx* sGfxPtr; s32 gNumD_8018E768Entries; struct_8018E768_entry D_8018E768[D_8018E768_SIZE]; s32 gCycleFlashMenu; -s8 D_8018E7AC[5]; -u32 D_8018E7B8[5]; -u32 D_8018E7D0[5]; +s8 gTransitionType[5]; +u32 gTransitionDuration[5]; +u32 gCurrentTransitionTime[5]; struct UnkStruct_8018E7E8 D_8018E7E8[D_8018E7E8_SIZE]; struct UnkStruct_8018E7E8 D_8018E810[D_8018E810_SIZE]; s8 D_8018E838[4]; // Import to C was required for matching. @@ -288,7 +288,7 @@ RGBA16 D_800E74D0[] = { { 0xff, 0xff, 0x00, 0xff }, }; -RGBA16 D_800E74E8[] = { +RGBA16 gBackgroundColor[] = { { 0xff, 0xaf, 0xaf, 0xff }, { 0xaf, 0xff, 0xaf, 0xff }, { 0xaf, 0xaf, 0xff, 0xff }, @@ -818,33 +818,243 @@ MkAnimation* D_800E7E34[] = { }; MenuTexture* gGlyphTextureLUT[] = { - D_0200211C, D_02002144, D_0200216C, D_02002194, D_020021BC, D_020021E4, D_0200220C, D_02002234, D_0200225C, - D_02002284, D_020022AC, D_020022D4, D_020022FC, D_02002324, D_0200234C, D_02002374, D_0200239C, D_020023C4, - D_020023EC, D_02002414, D_0200243C, D_02002464, D_0200248C, D_020024B4, D_020024DC, D_02002504, D_0200252C, - D_02002554, D_0200257C, D_020025A4, D_02004584, D_0200261C, D_02002694, D_020026BC, D_020026E4, D_0200270C, - D_02002734, D_0200275C, D_02002784, D_020027AC, D_020027D4, D_020027FC, D_020025CC, D_02002644, D_020025F4, - D_0200266C, D_02004534, D_02004584, D_02002824, D_0200284C, D_02002874, D_0200289C, D_020028C4, D_020028EC, - D_02002F54, D_02002914, D_02002F7C, D_0200293C, D_02002FA4, D_02002964, D_02002FCC, D_0200298C, D_02002FF4, - D_020029B4, D_0200301C, D_020029DC, D_02003044, D_02002A04, D_0200306C, D_02002A2C, D_02003094, D_02002A54, - D_020030BC, D_02002A7C, D_020030E4, D_02002AA4, D_0200310C, D_020033B4, D_02002ACC, D_02003134, D_02002AF4, - D_0200315C, D_02002B1C, D_02003184, D_02002B44, D_02002B6C, D_02002B94, D_02002BBC, D_02002BE4, D_02002C0C, - D_020031AC, D_02003274, D_02002C34, D_020031D4, D_0200329C, D_02002C5C, D_020031FC, D_020032C4, D_02002C84, - D_02003224, D_020032EC, D_02002CAC, D_0200324C, D_02003314, D_02002CD4, D_02002CFC, D_02002D24, D_02002D4C, - D_02002D74, D_0200333C, D_02002D9C, D_02003364, D_02002DC4, D_0200338C, D_02002DEC, D_02002E14, D_02002E3C, - D_02002E64, D_02002E8C, D_02002EB4, D_02002EDC, D_02002F04, D_02002F2C, D_020033DC, D_02003404, D_0200342C, - D_02003454, D_0200347C, D_020034A4, D_020034CC, D_020034F4, D_0200351C, D_02003544, D_0200356C, D_02003BD4, - D_02003594, D_02003BFC, D_020035BC, D_02003C24, D_020035E4, D_02003C4C, D_0200360C, D_02003C74, D_02003634, - D_02003C9C, D_0200365C, D_02003CC4, D_02003684, D_02003CEC, D_020036AC, D_02003D14, D_020036D4, D_02003D3C, - D_020036FC, D_02003D64, D_02003724, D_02003D8C, D_02004034, D_0200374C, D_02003DB4, D_02003774, D_02003DDC, - D_0200379C, D_02003E04, D_020037C4, D_020037EC, D_02003814, D_0200383C, D_02003864, D_0200388C, D_02003E2C, - D_02003EF4, D_020038B4, D_02003E54, D_02003F1C, D_020038DC, D_02003E7C, D_02003F44, D_02003904, D_02003EA4, - D_02003F6C, D_0200392C, D_02003ECC, D_02003F94, D_02003954, D_0200397C, D_020039A4, D_020039CC, D_020039F4, - D_02003FBC, D_02003A1C, D_02003FE4, D_02003A44, D_0200400C, D_02003A6C, D_02003A94, D_02003ABC, D_02003AE4, - D_02003B0C, D_02003B34, D_02003B5C, D_02003B84, D_02003BAC, D_0200405C, D_02004084, D_020040AC, D_020040D4, - D_020040FC, D_020043CC, D_02004444, D_0200437C, D_020043F4, D_02004124, D_0200414C, D_02004174, D_0200419C, - D_020041C4, D_020041EC, D_02004214, D_0200423C, D_02004264, D_0200428C, D_020042B4, D_020042DC, D_02004354, - D_020043A4, D_0200441C, D_0200446C, D_02004494, D_020044BC, D_02004304, D_0200432C, D_020044E4, D_0200450C, - D_02004534, D_0200455C, + seg2_textureFontLetterA, + seg2_textureFontLetterB, + seg2_textureFontLetterC, + seg2_textureFontLetterD, + seg2_textureFontLetterE, + seg2_textureFontLetterF, + seg2_textureFontLetterG, + seg2_textureFontLetterH, + seg2_textureFontLetterI, + seg2_textureFontLetterJ, + seg2_textureFontLetterK, + seg2_textureFontLetterL, + seg2_textureFontLetterM, + seg2_textureFontLetterN, + seg2_textureFontLetterO, + seg2_textureFontLetterP, + seg2_textureFontLetterQ, + seg2_textureFontLetterR, + seg2_textureFontLetterS, + seg2_textureFontLetterT, + seg2_textureFontLetterU, + seg2_textureFontLetterV, + seg2_textureFontLetterW, + seg2_textureFontLetterX, + seg2_textureFontLetterY, + seg2_textureFontLetterZ, + gTextureFontExclamationMark, + gTextureFontMinus, + gTextureFontInterogationMark, + gTextureFontSimpleQuote, + gTextureFontEmpty, + gTextureFontDot, + gTextureFontNumberZero, + gTextureFontNumberOne, + gTextureFontNumberTwo, + gTextureFontNumberThree, + gTextureFontNumberFour, + gTextureFontNumberFive, + gTextureFontNumberSix, + gTextureFontNumberSeven, + gTextureFontNumberEight, + gTextureFontNumberNine, + gTextureFontDoubleQuote, + gTextureFontFourDote, + gTextureFontPlus, + gTextureFontCC, + gTextureFontComma, + gTextureFontEmpty, + D_02002824, + D_0200284C, + D_02002874, + D_0200289C, + D_020028C4, + D_020028EC, + D_02002F54, + D_02002914, + D_02002F7C, + D_0200293C, + D_02002FA4, + D_02002964, + D_02002FCC, + D_0200298C, + D_02002FF4, + D_020029B4, + D_0200301C, + D_020029DC, + D_02003044, + D_02002A04, + D_0200306C, + D_02002A2C, + D_02003094, + D_02002A54, + D_020030BC, + D_02002A7C, + D_020030E4, + D_02002AA4, + D_0200310C, + D_020033B4, + D_02002ACC, + D_02003134, + D_02002AF4, + D_0200315C, + D_02002B1C, + D_02003184, + D_02002B44, + D_02002B6C, + D_02002B94, + D_02002BBC, + D_02002BE4, + D_02002C0C, + D_020031AC, + D_02003274, + D_02002C34, + D_020031D4, + D_0200329C, + D_02002C5C, + D_020031FC, + D_020032C4, + D_02002C84, + D_02003224, + D_020032EC, + D_02002CAC, + D_0200324C, + D_02003314, + D_02002CD4, + D_02002CFC, + D_02002D24, + D_02002D4C, + D_02002D74, + D_0200333C, + D_02002D9C, + D_02003364, + D_02002DC4, + D_0200338C, + D_02002DEC, + D_02002E14, + D_02002E3C, + D_02002E64, + D_02002E8C, + D_02002EB4, + D_02002EDC, + D_02002F04, + D_02002F2C, + D_020033DC, + D_02003404, + D_0200342C, + D_02003454, + D_0200347C, + D_020034A4, + D_020034CC, + D_020034F4, + D_0200351C, + D_02003544, + D_0200356C, + D_02003BD4, + D_02003594, + D_02003BFC, + D_020035BC, + D_02003C24, + D_020035E4, + D_02003C4C, + D_0200360C, + D_02003C74, + D_02003634, + D_02003C9C, + D_0200365C, + D_02003CC4, + D_02003684, + D_02003CEC, + D_020036AC, + D_02003D14, + D_020036D4, + D_02003D3C, + D_020036FC, + D_02003D64, + D_02003724, + D_02003D8C, + D_02004034, + D_0200374C, + D_02003DB4, + D_02003774, + D_02003DDC, + D_0200379C, + D_02003E04, + D_020037C4, + D_020037EC, + D_02003814, + D_0200383C, + D_02003864, + D_0200388C, + D_02003E2C, + D_02003EF4, + D_020038B4, + D_02003E54, + D_02003F1C, + D_020038DC, + D_02003E7C, + D_02003F44, + D_02003904, + D_02003EA4, + D_02003F6C, + D_0200392C, + D_02003ECC, + D_02003F94, + D_02003954, + D_0200397C, + D_020039A4, + D_020039CC, + D_020039F4, + D_02003FBC, + D_02003A1C, + D_02003FE4, + D_02003A44, + D_0200400C, + D_02003A6C, + D_02003A94, + D_02003ABC, + D_02003AE4, + D_02003B0C, + D_02003B34, + D_02003B5C, + D_02003B84, + D_02003BAC, + D_0200405C, + D_02004084, + D_020040AC, + D_020040D4, + D_020040FC, + D_020043CC, + D_02004444, + D_0200437C, + D_020043F4, + D_02004124, + D_0200414C, + D_02004174, + D_0200419C, + D_020041C4, + D_020041EC, + D_02004214, + D_0200423C, + D_02004264, + D_0200428C, + D_020042B4, + D_020042DC, + D_02004354, + D_020043A4, + D_0200441C, + D_0200446C, + D_02004494, + D_020044BC, + D_02004304, + D_0200432C, + D_020044E4, + D_0200450C, + + gTextureFontComma, + D_0200455C, }; MenuTexture* D_800E8234[] = { @@ -859,8 +1069,8 @@ MenuTexture* D_800E8254[] = { seg2_menu_3p_column, seg2_menu_4p_column, D_0200487C, - D_020048A4, - D_020048CC, + seg2_textureMenuLOption, + seg2_textureMenuRData, // CC textures seg2_50_CC_texture, seg2_100_CC_texture, @@ -1207,7 +1417,7 @@ void func_80091B78(void) { unref_D_8018EE0C = 0; for (i = 0; i < 5; i++) { - D_8018E7AC[i] = 0; + gTransitionType[i] = 0; } for (i = 0; i < 4; i++) { @@ -1249,7 +1459,7 @@ s32 func_80091D74(void) { } osPfsIsPlug(&gSIEventMesgQueue, &sp67); if (sp67 & 1) { - if (osPfsInit(&gSIEventMesgQueue, &gControllerPak1FileHandle, 0)) { + if (osPfsInit(&gSIEventMesgQueue, &gControllerPak1FileHandle, CONTROLLER_1)) { return 0; } } else { @@ -1301,7 +1511,7 @@ void func_80091FA4(void) { sGPPointsCopy = get_next_available_memory_addr(4); for (i = 0; i < 5; i++) { - D_8018E7AC[i] = 0; + gTransitionType[i] = 0; } for (i = 0; i < 4; i++) { @@ -1840,7 +2050,7 @@ void print_text0(s32 column, s32 row, char* text, s32 tracking, f32 scaleX, f32 } // @port Skip Interpolation, if interpolated later remove this tag - FrameInterpolation_ShouldInterpolateFrame(false); + FrameInterpolation_ShouldInterpolateFrame(false); gSPDisplayList(gDisplayListHead++, D_020077A8); if (*text != 0) { @@ -2196,7 +2406,7 @@ void func_80093E60(void) { sGPPointsCopy = get_next_available_memory_addr(4U); for (i = 0; i < 5; i++) { - D_8018E7AC[i] = 0; + gTransitionType[i] = 0; } for (i = 0; i < 4; i++) { @@ -2537,7 +2747,7 @@ void setup_menus(void) { void func_80095574(void) { s32 var_v0; - if ((unref_D_8018EE0C < 3) || (D_8018E7AC[4] != 0)) { + if ((unref_D_8018EE0C < 3) || (gTransitionType[4] != 0)) { handle_menus_default(); } if (gDebugMenuSelection >= 2) { @@ -2759,13 +2969,13 @@ Gfx* func_80095BD0(Gfx* displayListHead, u8* arg1, f32 arg2, f32 arg3, u32 arg4, if (gMatrixEffectCount < 0) { rmonPrintf("effectcount < 0 !!!!!!(kawano)\n"); } - FrameInterpolation_RecordOpenChild("flashing_text", TAG_LETTER((uintptr_t)&arg1 << 8) + (arg4 + arg5)); + FrameInterpolation_RecordOpenChild("flashing_text", TAG_LETTER((uintptr_t) &arg1 << 8) + (arg4 + arg5)); Mat4 mf; SetTextMatrix(mf, arg2, arg3, arg6, arg7); // func_80095AE0(&gGfxPool->mtxEffect[gMatrixEffectCount], arg2, arg3, arg6, arg7); displayListHead = AddTextMatrix(displayListHead, mf); - //gSPMatrix(displayListHead++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + // gSPMatrix(displayListHead++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gMKLoadTextureTile_4b(displayListHead++, arg1, G_IM_FMT_I, arg4, 0, 0, 0, arg4, arg5, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); switch (arg4) { @@ -2800,10 +3010,10 @@ Gfx* func_80095BD0_wide_right(Gfx* displayListHead, u8* arg1, f32 arg2, f32 arg3 rmonPrintf("func_80095BD0_wide_right: effectcount < 0 !!!!!!(kawano)\n"); } - FrameInterpolation_RecordOpenChild("flashing_text_wide_right", TAG_LETTER((uintptr_t)&arg1 << 8) + (arg4 + arg5)); + FrameInterpolation_RecordOpenChild("flashing_text_wide_right", TAG_LETTER((uintptr_t) &arg1 << 8) + (arg4 + arg5)); Mat4 mf; SetTextMatrix(mf, OTRGetDimensionFromRightEdge(arg2), arg3, arg6, arg7); - //func_80095AE0(&gGfxPool->mtxEffect[gMatrixEffectCount], OTRGetDimensionFromRightEdge(arg2), arg3, arg6, arg7); + // func_80095AE0(&gGfxPool->mtxEffect[gMatrixEffectCount], OTRGetDimensionFromRightEdge(arg2), arg3, arg6, arg7); displayListHead = AddTextMatrix(displayListHead, mf); // gSPMatrix(displayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxEffect[gMatrixEffectCount++]), @@ -2834,27 +3044,25 @@ Gfx* func_80095BD0_wide_right(Gfx* displayListHead, u8* arg1, f32 arg2, f32 arg3 Gfx* func_80095E10(Gfx* displayListHead, s8 textureFormat, s32 texScaleS, s32 texScaleT, s32 srcX, s32 srcY, s32 srcWidth, s32 srcHeight, s32 screenX, s32 screenY, u8* textureData, u32 texWidth, u32 texHeight) { - s32 textureWidth = srcWidth; - s32 textureHeight = srcHeight; - gMKLoadTextureTile(displayListHead++, textureData, textureFormat, G_IM_SIZ_16b, texWidth, 0, srcX, srcY, - srcX + textureWidth, srcY + textureHeight, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPLoadTextureTile(displayListHead++, textureData, textureFormat, G_IM_SIZ_16b, texWidth, texHeight, srcX, srcY, + srcX + srcWidth - 1, srcY + srcHeight, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, G_TX_NOLOD, G_TX_NOLOD); - gSPWideTextureRectangle(displayListHead++, screenX << 2, screenY << 2, (screenX + textureWidth) << 2, - (screenY + textureHeight) << 2, G_TX_RENDERTILE, 0, 0, texScaleS, texScaleT); + gSPWideTextureRectangle(displayListHead++, screenX << 2, screenY << 2, (screenX + srcWidth) << 2, + (screenY + srcHeight) << 2, G_TX_RENDERTILE, 0, 0, texScaleS, texScaleT); return displayListHead; } Gfx* func_800963F0(Gfx* displayListHead, s8 textureFormat, s32 texScaleS, s32 texScaleT, f32 scaleX, f32 scaleY, s32 srcX, s32 srcY, s32 srcHeight, s32 srcWidth, s32 screenX, s32 screenY, u8* textureData, - u32 height, u32 width) { - gMKLoadTextureTile(displayListHead++, textureData, textureFormat, G_IM_SIZ_16b, height, width, srcX, srcY, - srcX + srcHeight, srcY + srcWidth, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, + u32 texWidth, u32 texHeight) { + gDPLoadTextureTile(displayListHead++, textureData, textureFormat, G_IM_SIZ_16b, texWidth, texHeight, srcX, srcY, + srcX + texWidth-1, srcY + texHeight-1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, G_TX_NOLOD, G_TX_NOLOD); f32 percentScaleX = 1.0f / ((f32) texScaleS / 1024.0f); f32 percentScaleY = 1.0f / ((f32) texScaleT / 1024.0f); gSPWideTextureRectangle(displayListHead++, screenX << 2, screenY << 2, - (screenX + (s32) ((f32) height * scaleX)) << 2, - (screenY + (s32) ((f32) width * scaleY)) << 2, 0, 0, 0, + (screenX + (s32) ((f32) texWidth * scaleX)) << 2, + (screenY + (s32) ((f32) texHeight * scaleY)) << 2, 0, 0, 0, (1.0f / (scaleX * percentScaleX) * 1024.0f), (1.0f / (scaleY * percentScaleY) * 1024.0f)); return displayListHead; } @@ -3058,8 +3266,8 @@ Gfx* func_80097E58(Gfx* displayListHead, s8 textureFormat, u32 uls, u32 ult, u32 return displayListHead; } f32 percent = (f32) (32 - width) / 32.0f; - gMKLoadTextureTile(displayListHead++, textureData, textureFormat, G_IM_SIZ_16b, textureWidth, textureHeight, uls, - ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, + gDPLoadTextureTile(displayListHead++, textureData, textureFormat, G_IM_SIZ_16b, textureWidth, textureHeight, uls, + ult, textureWidth - 1, textureHeight - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); screenX += (s32) ((f32) (textureWidth / 2) * (1.0f - percent)); gSPWideTextureRectangle(displayListHead++, (screenX) << 2, screenY << 2, @@ -3102,12 +3310,12 @@ Gfx* func_800987D0(Gfx* displayListHead, u32 arg1, u32 arg2, u32 width, u32 heig f32 temp_f18; f32 temp_f24; - if (D_8018E7B8[0] == 0) { - D_8018E7B8[0] = 1; + if (gTransitionDuration[0] == 0) { + gTransitionDuration[0] = 1; } - temp_f24 = sins(((D_8018E7D0[0] * 0x4E20) / D_8018E7B8[0]) % 20000U); - temp_f0 = coss(((D_8018E7D0[0] * 0x4E20) / D_8018E7B8[0]) % 20000U); - temp_f18 = (((f32) D_8018E7D0[0] * 0.5) / D_8018E7B8[0]) + 1.0; + temp_f24 = sins(((gCurrentTransitionTime[0] * 0x4E20) / gTransitionDuration[0]) % 20000U); + temp_f0 = coss(((gCurrentTransitionTime[0] * 0x4E20) / gTransitionDuration[0]) % 20000U); + temp_f18 = (((f32) gCurrentTransitionTime[0] * 0.5) / gTransitionDuration[0]) + 1.0; columnCopy = column; for (var_v0_2 = arg2; (u32) var_v0_2 < height; var_v0_2 += 0x20) { for (var_a2 = arg1; (u32) var_a2 < width; var_a2 += 0x20) { @@ -3146,7 +3354,7 @@ Gfx* draw_box_fill(Gfx* displayListHead, s32 ulx, s32 uly, s32 lrx, s32 lry, s32 if (lry < uly) { swap_values(&uly, &lry); } - if ((ulx >= 0x140) || (uly >= 0xF0)) { + if ((ulx >= SCREEN_WIDTH) || (uly >= SCREEN_HEIGHT)) { return displayListHead; } if (ulx < 0) { @@ -3563,14 +3771,12 @@ void load_menu_img_mio0_forced(MenuTexture* addr) { load_menu_img_comp_type(addr, LOAD_MENU_IMG_MIO0_FORCE); } -void load_menu_img_comp_type(MenuTexture* addr, s32 compType) { +void load_menu_img_comp_type(MenuTexture* texAddr, s32 compType) { s32 i; s32 imgLoaded; u8 clearBit; - MenuTexture* texAddr; TextureMap* texMap = &sMenuTextureMap[0]; - texAddr = segmented_to_virtual_dupe(addr); while (texAddr->textureData != NULL) { imgLoaded = false; for (i = 0; i < sMenuTextureEntries; i++) { @@ -3617,11 +3823,11 @@ void func_80099A70(void) { void func_80099A94(MenuTexture* arg0, s32 arg1) { struct_8018E060_entry* var_v1; - var_v1 = &D_8018E060[0]; + var_v1 = D_8018E060; while (var_v1->texture != NULL) { var_v1++; } - var_v1->texture = segmented_to_virtual_dupe(arg0); + var_v1->texture = arg0; var_v1->texNum = arg1; } @@ -3873,7 +4079,6 @@ s32 animate_character_select_menu(MkAnimation* anim) { s32 i; struct_8018DEE0_entry* entry; - anim = segmented_to_virtual_dupe_2(anim); i = 0; while (D_8018DEE0[i].visible) { i++; @@ -3940,16 +4145,12 @@ s32 func_8009A478(MkAnimation* anim, s32 arg1) { } void func_8009A594(s32 arg0, s32 arg1, MkAnimation* arg2) { - MkAnimation* temp_v0; MenuTexture* temp_a0; - temp_v0 = segmented_to_virtual_dupe_2(arg2); - D_8018DEE0[arg0].textureSequence = temp_v0; + D_8018DEE0[arg0].textureSequence = arg2; D_8018DEE0[arg0].sequenceIndex = arg1; - // All hail the fake match gods who, in their infinite grace, have blessed us - // with this enigma of a match on the first iteration of permutation - D_8018DEE0[arg0].frameCountDown = (temp_v0 + arg1)->frame_length; - temp_a0 = segmented_to_virtual_dupe(temp_v0[arg1].mk64Texture); + D_8018DEE0[arg0].frameCountDown = arg2[arg1].frame_length; + temp_a0 = arg2[arg1].mk64Texture; if (D_8018DEE0[arg0].unk14 != 0) { func_80099A94(temp_a0, D_8018DEE0[arg0].menuTextureIndex); D_8018DEE0[arg0].unk14 = 0; @@ -4322,8 +4523,8 @@ Gfx* render_menu_textures(Gfx* arg0, MenuTexture* arg1, s32 column, s32 row) { break; } temp_v0_3 = (u8*) func_8009B8C4(arg1->textureData); - if (temp_v0_3 != 0) { - if (D_8018E7AC[4] != 4) { + if (temp_v0_3 != NULL) { + if (gTransitionType[4] != 4) { arg0 = func_80095E10(arg0, var_s4, 0x00000400, 0x00000400, 0, 0, arg1->width, arg1->height, arg1->dX + column, arg1->dY + row, temp_v0_3, arg1->width, arg1->height); } else { @@ -4535,7 +4736,7 @@ Gfx* func_8009C434(Gfx* arg0, struct_8018DEE0_entry* arg1, s32 arg2, s32 arg3, s Gfx* temp; MenuTexture* var_s0; - var_s0 = segmented_to_virtual_dupe(arg1->textureSequence[arg1->sequenceIndex].mk64Texture); + var_s0 = arg1->textureSequence[arg1->sequenceIndex].mk64Texture; temp = D_02007728; while (var_s0->textureData != NULL) { var_t1 = 0; @@ -4571,8 +4772,8 @@ Gfx* func_8009C434(Gfx* arg0, struct_8018DEE0_entry* arg1, s32 arg2, s32 arg3, s switch (arg4) { case -1: arg0 = func_80095E10(arg0, var_t1, 0x00000400, 0x00000400, 0, 0, var_s0->width, var_s0->height, - var_s0->dX + arg2, var_s0->dY + arg3, (u8*) var_s0->textureData, - var_s0->width, var_s0->height); + var_s0->dX + arg2, var_s0->dY + arg3, (u8*) var_s0->textureData, var_s0->width, + var_s0->height); break; case -2: arg0 = func_800963F0(arg0, var_t1, 0x00000400, 0x00000400, 0.5f, 0.5f, 0, 0, var_s0->width, @@ -4660,9 +4861,9 @@ void func_8009CA6C(s32 arg0) { if ((arg0 != 4) && (gIsGamePaused != 0)) { var_a1 = 1; } - switch (D_8018E7AC[arg0]) { + switch (gTransitionType[arg0]) { case 1: - func_8009CDDC(arg0, var_a1); + draw_black_fade_in(arg0, var_a1); return; case 2: func_8009D958(arg0, var_a1); @@ -4690,7 +4891,7 @@ void func_8009CA6C(s32 arg0) { } // Lakitu tow transition out of black -void func_8009CBE4(s32 arg0, s32 arg1, s32 arg2) { +void draw_fade_in(s32 arg0, s32 arg1, s32 arg2) { RGBA16* color; s16 x, y, w, h; s32 leftEdge; @@ -4725,46 +4926,49 @@ void func_8009CBE4(s32 arg0, s32 arg1, s32 arg2) { switch (gScreenModeSelection) { case SCREEN_MODE_1P: case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: - gDisplayListHead = - draw_box_wide(gDisplayListHead, x - (w / 2), y - (h / 2), (w / 2) + x, (h / 2) + y, color->red, - color->green, color->blue, 0xFF - (D_8018E7D0[arg0] * 0xFF / D_8018E7B8[arg0])); + gDisplayListHead = draw_box_wide(gDisplayListHead, x - (w / 2), y - (h / 2), (w / 2) + x, (h / 2) + y, + color->red, color->green, color->blue, + 0xFF - (gCurrentTransitionTime[arg0] * 0xFF / gTransitionDuration[arg0])); break; case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: - gDisplayListHead = - draw_box_wide(gDisplayListHead, x - (w / 2), y - (h / 2), (w / 2) + x, (h / 2) + y, color->red, - color->green, color->blue, 0xFF - (D_8018E7D0[arg0] * 0xFF / D_8018E7B8[arg0])); + gDisplayListHead = draw_box_wide(gDisplayListHead, x - (w / 2), y - (h / 2), (w / 2) + x, (h / 2) + y, + color->red, color->green, color->blue, + 0xFF - (gCurrentTransitionTime[arg0] * 0xFF / gTransitionDuration[arg0])); break; case SCREEN_MODE_3P_4P_SPLITSCREEN: if ((arg0 == 0) || (arg0 == 2)) { leftEdge = OTRGetDimensionFromLeftEdge(0); gDisplayListHead = draw_box_wide_pause_background( gDisplayListHead, leftEdge - (x - (w / 2)), y - (h / 2), (w / 2) + x, (h / 2) + y, color->red, - color->green, color->blue, 0xFF - (D_8018E7D0[arg0] * 0xFF / D_8018E7B8[arg0])); + color->green, color->blue, + 0xFF - (gCurrentTransitionTime[arg0] * 0xFF / gTransitionDuration[arg0])); } else if ((arg0 == 1) || (arg0 == 3)) { rightEdge = OTRGetDimensionFromRightEdge(SCREEN_WIDTH); gDisplayListHead = draw_box_wide_pause_background( gDisplayListHead, x - (w / 2), y - (h / 2), rightEdge + ((w / 2) + x), (h / 2) + y, color->red, - color->green, color->blue, 0xFF - (D_8018E7D0[arg0] * 0xFF / D_8018E7B8[arg0])); + color->green, color->blue, + 0xFF - (gCurrentTransitionTime[arg0] * 0xFF / gTransitionDuration[arg0])); } break; } - if ((arg1 == 0) && (D_8018E7D0[arg0] += 1, (D_8018E7D0[arg0] >= D_8018E7B8[arg0]))) { + if ((arg1 == 0) && + (gCurrentTransitionTime[arg0] += 1, (gCurrentTransitionTime[arg0] >= gTransitionDuration[arg0]))) { if (gGamestate == 4) { - D_8018E7AC[arg0] = 6; + gTransitionType[arg0] = 6; return; } - D_8018E7AC[arg0] = 0; + gTransitionType[arg0] = 0; unref_D_8018EE0C = 0; } } -void func_8009CDDC(s32 arg0, s32 arg1) { - func_8009CBE4(arg0, arg1, 0); +void draw_black_fade_in(s32 arg0, s32 arg1) { + draw_fade_in(arg0, arg1, 0); } void func_8009CDFC(s32 arg0, s32 arg1) { - func_8009CBE4(arg0, arg1, 1); + draw_fade_in(arg0, arg1, 1); } void func_8009CE1C(void) { @@ -4801,9 +5005,9 @@ void func_8009CE64(s32 arg0) { gMenuSelection = MAIN_MENU; } } else if (gGamestate == 4) { - if (D_8018E7AC[arg0] == 2) { + if (gTransitionType[arg0] == 2) { if (arg0 != 4) { - D_8018E7AC[arg0] = 5; + gTransitionType[arg0] = 5; } else { var_a1 = 0; menuItem = find_menu_items(0x000000B0); @@ -4866,7 +5070,7 @@ void func_8009CE64(s32 arg0) { var_a1 = 1; break; default: - D_8018E7AC[arg0] = 5; + gTransitionType[arg0] = 5; break; } if (var_a1 != 0) { @@ -4905,14 +5109,14 @@ void func_8009CE64(s32 arg0) { break; } } else { - D_8018E7AC[arg0] = 5; + gTransitionType[arg0] = 5; } } } } } } else { - D_8018E7AC[arg0] = 0; + gTransitionType[arg0] = 0; if (gDebugMenuSelection != 0x40) { switch (gMenuFadeType) { case 0: @@ -5081,8 +5285,7 @@ void func_8009CE64(s32 arg0) { } } - if (IsBlockFort() || IsSkyscraper() || IsDoubleDeck() || - IsBigDonut()) { + if (IsBlockFort() || IsSkyscraper() || IsDoubleDeck() || IsBigDonut()) { gModeSelection = BATTLE; if (gPlayerCountSelection1 == 1) { @@ -5156,7 +5359,7 @@ void func_8009D77C(s32 arg0, s32 arg1, s32 arg2) { var_ra = D_8015F480[arg0].screenWidth; sp44 = D_8015F480[arg0].screenHeight; } - var_t2 = (D_8018E7D0[arg0] * 0xFF) / D_8018E7B8[arg0]; + var_t2 = (gCurrentTransitionTime[arg0] * 0xFF) / gTransitionDuration[arg0]; if (var_t2 >= 0x100) { var_t2 = 0x000000FF; } @@ -5196,8 +5399,8 @@ void func_8009D77C(s32 arg0, s32 arg1, s32 arg2) { } if (arg1 == 0) { - D_8018E7D0[arg0]++; - if ((D_8018E7B8[arg0] + 1) < D_8018E7D0[arg0]) { + gCurrentTransitionTime[arg0]++; + if ((gTransitionDuration[arg0] + 1) < gCurrentTransitionTime[arg0]) { func_8009CE64(arg0); } } @@ -5277,12 +5480,12 @@ void func_8009D998(s32 arg0) { void func_8009DAA8(void) { u32 var_t0; - D_8018E7D0[4]++; - if (D_8018E7D0[4] >= (D_8018E7B8[4] + 1)) { + gCurrentTransitionTime[4]++; + if (gCurrentTransitionTime[4] >= (gTransitionDuration[4] + 1)) { func_8009CE64(4); } gDPPipeSync(gDisplayListHead++); - var_t0 = (D_8018E7D0[4] * 255) / D_8018E7B8[4]; + var_t0 = (gCurrentTransitionTime[4] * 255) / gTransitionDuration[4]; if ((s32) var_t0 >= 0x100) { var_t0 = 0x000000FF; } @@ -5296,11 +5499,11 @@ void func_8009DB8C(void) { u32 var_s3; s32 var_v1; - D_8018E7D0[4]++; + gCurrentTransitionTime[4]++; // why? - var_v1 = D_8018E7D0[4]; - if ((u32) var_v1 >= D_8018E7B8[4]) { - if ((u32) var_v1 == D_8018E7B8[4]) { + var_v1 = gCurrentTransitionTime[4]; + if ((u32) var_v1 >= gTransitionDuration[4]) { + if ((u32) var_v1 == gTransitionDuration[4]) { for (var_s0 = 0; var_s0 < 0x4B0; var_s0++) { sTKMK00_LowResBuffer[var_s0] = 1; } @@ -5310,8 +5513,9 @@ void func_8009DB8C(void) { } else { var_s0 = 0; var_s3 = 0; - while (var_s3 < (0x4B0U / D_8018E7B8[4])) { - if ((sTKMK00_LowResBuffer[var_s0] == 0) && (random_int((0x4B0U - D_8018E7D0[4]) / D_8018E7B8[4]) == 0)) { + while (var_s3 < (0x4B0U / gTransitionDuration[4])) { + if ((sTKMK00_LowResBuffer[var_s0] == 0) && + (random_int((0x4B0U - gCurrentTransitionTime[4]) / gTransitionDuration[4]) == 0)) { var_s3 += 1; sTKMK00_LowResBuffer[var_s0] = 1; } @@ -5333,7 +5537,7 @@ void func_8009DB8C(void) { } } gDPPipeSync(gDisplayListHead++); - var_v1 = (D_8018E7D0[4] * 255) / D_8018E7B8[4]; + var_v1 = (gCurrentTransitionTime[4] * 255) / gTransitionDuration[4]; if (var_v1 >= 0x100) { var_v1 = 0x000000FF; } @@ -5344,13 +5548,13 @@ void func_8009DEF8(u32 arg0, u32 arg1) { if (arg0 == 0) { arg0 = 1; } - if ((D_8018E7AC[4] != 1) && (D_8018E7AC[4] != 6)) { - D_8018E7AC[4] = arg1; - D_8018E7B8[4] = arg0; - if (D_8018E7B8[4] >= 0x100U) { - D_8018E7B8[4] = 0xFFU; + if ((gTransitionType[4] != 1) && (gTransitionType[4] != 6)) { + gTransitionType[4] = arg1; + gTransitionDuration[4] = arg0; + if (gTransitionDuration[4] >= 0x100U) { + gTransitionDuration[4] = 0xFFU; } - D_8018E7D0[4] = 0; + gCurrentTransitionTime[4] = 0; } } @@ -5366,13 +5570,13 @@ void func_8009DF8C(u32 arg0, u32 arg1) { if (arg0 == 0) { arg0 = 1; } - if ((D_8018E7AC[4] != 2) && (D_8018E7AC[4] != 5)) { - D_8018E7AC[4] = arg1; - D_8018E7B8[4] = arg0; - if (D_8018E7B8[4] >= 0x100U) { - D_8018E7B8[4] = 0xFFU; + if ((gTransitionType[4] != 2) && (gTransitionType[4] != 5)) { + gTransitionType[4] = arg1; + gTransitionDuration[4] = arg0; + if (gTransitionDuration[4] >= 0x100U) { + gTransitionDuration[4] = 0xFFU; } - D_8018E7D0[4] = 0; + gCurrentTransitionTime[4] = 0; } } @@ -5391,14 +5595,14 @@ void func_8009E020(s32 arg0, s32 arg1) { arg1 = 1; } - temp = D_8018E7AC[arg0]; + temp = gTransitionType[arg0]; if ((temp != 1) && (temp != 6)) { - D_8018E7AC[arg0] = 1; - D_8018E7B8[arg0] = arg1; + gTransitionType[arg0] = 1; + gTransitionDuration[arg0] = arg1; if ((u32) arg1 >= 0x100U) { - D_8018E7B8[arg0] = 0xFF; + gTransitionDuration[arg0] = 0xFF; } - D_8018E7D0[arg0] = 0; + gCurrentTransitionTime[arg0] = 0; } } @@ -5409,27 +5613,27 @@ void func_8009E088(s32 arg0, s32 arg1) { arg1 = 1; } - temp = D_8018E7AC[arg0]; + temp = gTransitionType[arg0]; if ((temp != 2) && (temp != 5)) { - D_8018E7AC[arg0] = 2; - D_8018E7B8[arg0] = arg1; + gTransitionType[arg0] = 2; + gTransitionDuration[arg0] = arg1; if ((u32) arg1 >= 0x100U) { - D_8018E7B8[arg0] = 0xFF; + gTransitionDuration[arg0] = 0xFF; } - D_8018E7D0[arg0] = 0; + gCurrentTransitionTime[arg0] = 0; } } void func_8009E0F0(s32 arg0) { s32 var_v0; - if (D_8018E7AC[4] != 3) { - D_8018E7AC[4] = 3; - D_8018E7B8[4] = arg0; - if (D_8018E7B8[4] >= 0x100U) { - D_8018E7B8[4] = 0x000000FF; + if (gTransitionType[4] != 3) { + gTransitionType[4] = 3; + gTransitionDuration[4] = arg0; + if (gTransitionDuration[4] >= 0x100U) { + gTransitionDuration[4] = 0x000000FF; } - D_8018E7D0[4] = 0; + gCurrentTransitionTime[4] = arg0; for (var_v0 = 0; var_v0 < 0x4B0; var_v0++) { sTKMK00_LowResBuffer[var_v0] = 0; } @@ -5437,13 +5641,13 @@ void func_8009E0F0(s32 arg0) { } void func_8009E17C(u32 arg0) { - if (D_8018E7AC[4] != 4) { - D_8018E7AC[4] = 4; - D_8018E7B8[4] = arg0; - if (D_8018E7B8[4] >= 0x100U) { - D_8018E7B8[4] = 0x000000FFU; + if (gTransitionType[4] != 4) { + gTransitionType[4] = 4; + gTransitionDuration[4] = arg0; + if (gTransitionDuration[4] >= 0x100U) { + gTransitionDuration[4] = 0x000000FFU; } - D_8018E7D0[4] = 0; + gCurrentTransitionTime[4] = 0; } } @@ -5545,21 +5749,37 @@ void clear_menus(void) { } } +f32 integral_part(f32 arg0) { + return (f32) (s32) arg0; +} + +f32 fractional_part(f32 arg0) { + return arg0 - integral_part(arg0); +} + +void resize_menu_texture(MenuTexture* mi) { + int original_width = mi->width; + int original_height = mi->height; + float new_width = (f32) ResourceGetTexWidthByName(mi->textureData) / + ((f32) ResourceGetTexHeightByName(mi->textureData) / (f32) original_height); + mi->width = (s32) ceilf(new_width); + mi->dX += (original_width - mi->width) / 2; +} + #ifdef NON_MATCHING // https://decomp.me/scratch/1BHpa // Stack differences, can't figure out how to fix them void add_menu_item(s32 type, s32 column, s32 row, s8 priority) { MenuItem* var_ra; s32 stackPadding0; - UNUSED s32 stackPadding1; - UNUSED s32 stackPadding2; s32 temp_v0_6; s32 var_v0; s32 var_v1_3; s32 temp_a1; - UNUSED MenuTexture* mk64Texture; MkAnimation* var_a0; s32 one = 1; + int original_width; + int height; var_v0 = 0; var_ra = gMenuItems; @@ -5674,6 +5894,7 @@ void add_menu_item(s32 type, s32 column, s32 row, s8 priority) { case MENU_ITEM_UI_START_BACKGROUND: // load_menu_img_comp_type(gMenuTexturesBackground[has_unlocked_extra_mode()], LOAD_MENU_IMG_TKMK00_ONCE); load_texture_reset_cache(gMenuTexturesBackground[has_unlocked_extra_mode()]->textureData); + resize_menu_texture(gMenuTexturesBackground[has_unlocked_extra_mode()]); break; case MENU_ITEM_UI_LOGO_AND_COPYRIGHT: load_mario_kart_64_logo(); @@ -5681,18 +5902,14 @@ void add_menu_item(s32 type, s32 column, s32 row, s8 priority) { load_menu_img(seg2_copyright_1996_texture); break; case MENU_ITEM_UI_PUSH_START_BUTTON: + resize_menu_texture(seg2_push_start_button_texture); load_menu_img(seg2_push_start_button_texture); break; case MAIN_MENU_BACKGROUND: case CHARACTER_SELECT_BACKGROUND: case COURSE_SELECT_BACKGROUND: - load_texture_reset_cache(gMenuTexturesBackground[has_unlocked_extra_mode()]->textureData); - // load_menu_img_comp_type(gMenuTexturesBackground[has_unlocked_extra_mode()], LOAD_MENU_IMG_TKMK00_ONCE); + load_menu_img_comp_type(gMenuTexturesBackground[has_unlocked_extra_mode()], LOAD_MENU_IMG_TKMK00_ONCE); load_menu_img_comp_type(D_02004B74, LOAD_MENU_IMG_TKMK00_ONCE); - convert_img_to_greyscale(0, 0x00000019); - adjust_img_colour(0, SCREEN_WIDTH * SCREEN_HEIGHT, D_800E74E8[type - MAIN_MENU_BACKGROUND].red, - D_800E74E8[type - MAIN_MENU_BACKGROUND].green, - D_800E74E8[type - MAIN_MENU_BACKGROUND].blue); break; case MENU_ITEM_UI_OK: var_ra->param1 = 0x00000020; @@ -5708,16 +5925,16 @@ void add_menu_item(s32 type, s32 column, s32 row, s8 priority) { case 0x17: case MAIN_MENU_TIME_TRIALS_BEGIN: case MAIN_MENU_TIME_TRIALS_DATA: - load_menu_img_comp_type(segmented_to_virtual_dupe(D_800E8254[type - MENU_ITEM_UI_GAME_SELECT]), - LOAD_MENU_IMG_TKMK00_ONCE); + resize_menu_texture(D_800E8254[type - MENU_ITEM_UI_GAME_SELECT]); + load_menu_img_comp_type(D_800E8254[type - MENU_ITEM_UI_GAME_SELECT], LOAD_MENU_IMG_TKMK00_ONCE); break; case MENU_ITEM_UI_1P_GAME: case MENU_ITEM_UI_2P_GAME: case MENU_ITEM_UI_3P_GAME: case MENU_ITEM_UI_4P_GAME: - load_menu_img_comp_type(segmented_to_virtual_dupe(D_800E8234[((type - 0xB) * 2) + 0]), + load_menu_img_comp_type(segmented_to_virtual_dupe(D_800E8234[((type - MENU_ITEM_UI_1P_GAME) * 2) + 0]), LOAD_MENU_IMG_TKMK00_ONCE); - load_menu_img(segmented_to_virtual_dupe(D_800E8234[((type - 0xB) * 2) + 1])); + load_menu_img(segmented_to_virtual_dupe(D_800E8234[((type - MENU_ITEM_UI_1P_GAME) * 2) + 1])); break; case CHARACTER_SELECT_MENU_PLAYER_SELECT_BANNER: load_menu_img_comp_type(D_02004B4C, LOAD_MENU_IMG_TKMK00_ONCE); @@ -5740,14 +5957,15 @@ void add_menu_item(s32 type, s32 column, s32 row, s8 priority) { case CHARACTER_SELECT_MENU_DK: case CHARACTER_SELECT_MENU_WARIO: case CHARACTER_SELECT_MENU_BOWSER: - var_ra->D_8018DEE0_index = - animate_character_select_menu(segmented_to_virtual_dupe_2(D_800E8320[type - 0x2B])); - load_menu_img_comp_type(segmented_to_virtual_dupe(D_800E7D54[type - 0x2B]), LOAD_MENU_IMG_TKMK00_ONCE); + var_ra->D_8018DEE0_index = animate_character_select_menu( + segmented_to_virtual_dupe_2(D_800E8320[type - CHARACTER_SELECT_MENU_MARIO])); + load_menu_img_comp_type(segmented_to_virtual_dupe(D_800E7D54[type - CHARACTER_SELECT_MENU_MARIO]), + LOAD_MENU_IMG_TKMK00_ONCE); break; case MENU_ITEM_TYPE_0A0: case MENU_ITEM_TYPE_0A1: var_ra->D_8018DEE0_index = - animate_character_select_menu(segmented_to_virtual_dupe_2(D_800E8320[type - 0xA0])); + animate_character_select_menu(segmented_to_virtual_dupe_2(D_800E8320[type - MENU_ITEM_TYPE_0A0])); break; case COURSE_SELECT_OK: var_ra->param1 = 0x00000020; @@ -5762,8 +5980,9 @@ void add_menu_item(s32 type, s32 column, s32 row, s8 priority) { case MENU_ITEM_TYPE_05A: case MENU_ITEM_TYPE_05B: case COURSE_SELECT_BATTLE_NAMES: - load_menu_img_comp_type(segmented_to_virtual_dupe(gMenuTexturesTrackSelection[type - 0x52]), - LOAD_MENU_IMG_TKMK00_ONCE); + load_menu_img_comp_type( + gMenuTexturesTrackSelection[type - COURSE_SELECT_MAP_SELECT], + LOAD_MENU_IMG_TKMK00_ONCE); break; case MENU_ITEM_TYPE_05F: case MENU_ITEM_TYPE_060: @@ -5806,7 +6025,7 @@ void add_menu_item(s32 type, s32 column, s32 row, s8 priority) { case MENU_ITEM_TYPE_079: case MENU_ITEM_TYPE_07A: case MENU_ITEM_TYPE_07B: - load_menu_img_comp_type(segmented_to_virtual_dupe(D_800E82F4[type - 0x78]), LOAD_MENU_IMG_TKMK00_ONCE); + load_menu_img_comp_type(segmented_to_virtual_dupe(D_800E82F4[type - MENU_ITEM_TYPE_078]), LOAD_MENU_IMG_TKMK00_ONCE); break; case MENU_ITEM_TYPE_08C: load_menu_img_comp_type(segmented_to_virtual_dupe(seg2_data_texture), LOAD_MENU_IMG_TKMK00_ONCE); @@ -6126,8 +6345,14 @@ void render_menus(MenuItem* arg0) { case MAIN_MENU_BACKGROUND: case CHARACTER_SELECT_BACKGROUND: case COURSE_SELECT_BACKGROUND: + gDPSetGrayscaleColor(gDisplayListHead++, gBackgroundColor[arg0->type - MAIN_MENU_BACKGROUND].red, + gBackgroundColor[arg0->type - MAIN_MENU_BACKGROUND].green, + gBackgroundColor[arg0->type - MAIN_MENU_BACKGROUND].blue, + gBackgroundColor[arg0->type - MAIN_MENU_BACKGROUND].alpha); + gSPGrayscale(gDisplayListHead++, true); gDisplayListHead = func_8009BC9C(gDisplayListHead, gMenuTexturesBackground[has_unlocked_extra_mode()], arg0->column, arg0->row, 3, 0); + gSPGrayscale(gDisplayListHead++, false); break; case MENU_ITEM_UI_GAME_SELECT: gDisplayListHead = @@ -6137,7 +6362,7 @@ void render_menus(MenuItem* arg0) { case MENU_ITEM_UI_2P_GAME: case MENU_ITEM_UI_3P_GAME: case MENU_ITEM_UI_4P_GAME: - var_a1 = arg0->type - 0xB; + var_a1 = arg0->type - MENU_ITEM_UI_1P_GAME; func_800A8270(var_a1, arg0); func_800A0FA4(arg0, var_a1); break; @@ -6148,20 +6373,22 @@ void render_menus(MenuItem* arg0) { break; case MAIN_MENU_OPTION_GFX: case MAIN_MENU_DATA_GFX: - var_a1 = arg0->type - 0xF; + var_a1 = arg0->type - MENU_ITEM_UI_OK; + var_v1 = arg0->type - MENU_ITEM_UI_GAME_SELECT; if (arg0->param1 < 0x20) { temp_t9 = (arg0->param1 * 0x3A) / 64; if (var_a1 == gMainMenuSelection) { gDisplayListHead = - draw_flash_select_case_fast(gDisplayListHead, arg0->column + temp_t9, arg0->row, - (arg0->column - temp_t9) + 0x39, arg0->row + 0x12); + draw_flash_select_case_fast(gDisplayListHead, arg0->column + 1 + temp_t9, arg0->row, + (arg0->column - temp_t9) + D_800E8254[var_v1]->width - 1, + arg0->row + D_800E8254[var_v1]->height - 2); } else { gDisplayListHead = - draw_box_fill(gDisplayListHead, arg0->column + temp_t9, arg0->row, - (arg0->column - temp_t9) + 0x39, arg0->row + 0x12, 1, 1, 1, 0x000000FF); + draw_box_fill(gDisplayListHead, arg0->column + 1 + temp_t9, arg0->row, + (arg0->column - temp_t9) + D_800E8254[var_v1]->width - 1, + arg0->row + D_800E8254[var_v1]->height - 2, 1, 1, 1, 0x000000FF); } } - var_v1 = arg0->type - 0xA; gDisplayListHead = func_8009BC9C(gDisplayListHead, D_800E8254[var_v1], arg0->column, arg0->row, 2, arg0->param1); break; @@ -6267,7 +6494,7 @@ void render_menus(MenuItem* arg0) { case CHARACTER_SELECT_MENU_DK: case CHARACTER_SELECT_MENU_WARIO: case CHARACTER_SELECT_MENU_BOWSER: - func_800A12BC(arg0, segmented_to_virtual_dupe(D_800E7D54[arg0->type - 0x2B])); + func_800A12BC(arg0, segmented_to_virtual_dupe(D_800E7D54[arg0->type - CHARACTER_SELECT_MENU_MARIO])); /* fallthrough */ case MENU_ITEM_TYPE_0A0: case MENU_ITEM_TYPE_0A1: @@ -6301,12 +6528,17 @@ void render_menus(MenuItem* arg0) { case COURSE_SELECT_FLOWER_CUP: case COURSE_SELECT_STAR_CUP: case COURSE_SELECT_SPECIAL_CUP: - var_a1 = arg0->type - 0x53; + var_a1 = arg0->type - COURSE_SELECT_MUSHROOM_CUP; func_800A890C(var_a1, arg0); func_800A143C(arg0, var_a1); break; case COURSE_SELECT_OK: func_800A8564(arg0); + int32_t original_width = D_02004E80->width; + int32_t height = D_02004E80->height; + D_02004E80->width = ResourceGetTexWidthByName(D_02004E80->textureData) * height / + ResourceGetTexHeightByName(D_02004E80->textureData); + // D_02004E80->dX += (original_width - D_02004E80->width) / 2; gDisplayListHead = func_8009BC9C(gDisplayListHead, D_02004E80, arg0->column, arg0->row, 2, arg0->param1); break; @@ -6772,7 +7004,7 @@ void func_800A12BC(MenuItem* arg0, MenuTexture* arg1) { void func_800A1350(MenuItem* arg0) { s32 thing; - if (func_800AAFCC(arg0->type - 0x2B) < 0) { + if (func_800AAFCC(arg0->type - CHARACTER_SELECT_MENU_MARIO) < 0) { switch (arg0->state) { case 0: case 2: @@ -6796,7 +7028,7 @@ void func_800A143C(MenuItem* arg0, s32 arg1) { case 2: case 3: gDisplayListHead = - render_menu_textures(gDisplayListHead, segmented_to_virtual_dupe(gMenuTexturesTrackSelection[arg1 + 1]), + render_menu_textures(gDisplayListHead, gMenuTexturesTrackSelection[arg1 + 1], arg0->column, arg0->row); break; case 1: @@ -7920,14 +8152,16 @@ void render_pause_menu_versus(MenuItem* arg0) { break; case SCREEN_MODE_3P_4P_SPLITSCREEN: // Left side players - if ((temp_v0->player == gPlayerOne) || (temp_v0->player == gPlayerThree)) { + if ((temp_v0->player == gPlayerOne) || + (temp_v0->player == gPlayerThree)) { leftEdge = OTRGetDimensionFromLeftEdge(0); gDisplayListHead = draw_box_wide_pause_background(gDisplayListHead, leftEdge - temp_t3, temp_t0 - temp_t4, temp_v1 + temp_t3, temp_t0 + temp_t4, 0, 0, 0, 140); // Right side players - } else if ((temp_v0->player == gPlayerTwo) || (temp_v0->player == gPlayerFour)) { + } else if ((temp_v0->player == gPlayerTwo) || + (temp_v0->player == gPlayerFour)) { rightEdge = OTRGetDimensionFromRightEdge(SCREEN_WIDTH); gDisplayListHead = draw_box_wide_pause_background(gDisplayListHead, temp_v1 - temp_t3, temp_t0 - temp_t4, @@ -10018,26 +10252,26 @@ void func_800AA2EC(MenuItem* arg0) { break; } - if (gControllerPak1State != 0) { + if (gControllerPak1State != BAD) { var_t1 = 0; switch (osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, (u8*) gGameName, (u8*) gExtCode, &gControllerPak1FileNote)) { - case 5: + case PFS_ERR_INVALID: break; case 0: arg0->state = 1; var_t1 = 1; break; case 2: - gControllerPak1State = 0; + gControllerPak1State = BAD; break; default: - gControllerPak1State = 0; + gControllerPak1State = BAD; break; } } if (var_t1 == 0) { - if (gControllerPak1State == 0) { + if (gControllerPak1State == BAD) { if (check_for_controller_pak(0) == 0) { arg0->state = 2; break; @@ -10059,7 +10293,7 @@ void func_800AA2EC(MenuItem* arg0) { } return; } else { - gControllerPak1State = 1; + gControllerPak1State = OK; } if (osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, (u8*) gGameName, (u8*) gExtCode, &gControllerPak1FileNote) == 0) { @@ -10120,8 +10354,8 @@ void func_800AA69C(MenuItem* arg0) { s32 temp_a0; UNUSED s32 stackPadding0; - temp_a0 = arg0->type - 0x2B; - temp_v0 = func_800AAFCC(arg0->type - 0x2B); + temp_a0 = arg0->type - CHARACTER_SELECT_MENU_MARIO; + temp_v0 = func_800AAFCC(arg0->type - CHARACTER_SELECT_MENU_MARIO); if (temp_v0 >= 0) { var_a0 = 1; } else { @@ -10129,7 +10363,7 @@ void func_800AA69C(MenuItem* arg0) { } switch (arg0->subState) { case 0: - if ((gCharacterGridIsSelected[temp_v0] != 0) && (var_a0 != 0)) { + if ((var_a0 != 0) && (gCharacterGridIsSelected[temp_v0] != 0)) { arg0->subState = 1; func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe_2(gCharacterCelebrateAnimation[temp_a0])); @@ -10154,14 +10388,14 @@ void func_800AA69C(MenuItem* arg0) { arg0->subState = 3; func_8009A594(arg0->D_8018DEE0_index, D_800E8460[temp_a0] - D_8018DEE0[arg0->D_8018DEE0_index].sequenceIndex, - segmented_to_virtual_dupe_2(gCharacterDeselectAnimation[temp_a0])); + gCharacterDeselectAnimation[temp_a0]); } break; case 2: if ((gCharacterGridIsSelected[temp_v0] == 0) && (var_a0 != 0)) { arg0->subState = 3; func_8009A594(arg0->D_8018DEE0_index, 0, - segmented_to_virtual_dupe_2(gCharacterDeselectAnimation[temp_a0])); + gCharacterDeselectAnimation[temp_a0]); } break; case 3: @@ -10216,7 +10450,7 @@ void func_800AAA9C(MenuItem* arg0) { } /* fallthrough */ case 0: - if (func_800AAFCC(arg0->type - 0x2B) >= 0) { + if (func_800AAFCC(arg0->type - CHARACTER_SELECT_MENU_MARIO) >= 0) { arg0->state = 2; arg0->param1 = 0; } else { @@ -10224,7 +10458,7 @@ void func_800AAA9C(MenuItem* arg0) { } break; case 4: - if (func_800AAFCC(arg0->type - 0x2B) >= 0) { + if (func_800AAFCC(arg0->type - CHARACTER_SELECT_MENU_MARIO) >= 0) { arg0->state = 2; arg0->param1 = 0; } @@ -11493,8 +11727,8 @@ void func_800AD2E8(MenuItem* arg0) { } } } - if (gControllerOne->buttonPressed & 0x9000) { - if (arg0->state == 0x0000000A) { + if (gControllerOne->buttonPressed & (A_BUTTON | START_BUTTON)) { + if (arg0->state == 10) { var_v1 = 0; if (arg0->paramf < 4.2) { arg0->paramf += 4.0; @@ -11660,7 +11894,7 @@ void func_800AD2E8(MenuItem* arg0) { break; case 20: case 21: - if (((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) && (arg0->state >= 0x15)) { + if (((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) && (arg0->state >= 21)) { arg0->state--; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->paramf < 4.2) { @@ -11669,7 +11903,7 @@ void func_800AD2E8(MenuItem* arg0) { arg0->subState = -1; } if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x400) { - if (arg0->state < 0x15) { + if (arg0->state < 21) { arg0->state++; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->paramf < 4.2) { @@ -11684,8 +11918,8 @@ void func_800AD2E8(MenuItem* arg0) { return; } if (gControllerOne->buttonPressed & 0x9000) { - if (arg0->state == 0x00000015) { - arg0->state = 0x00000019; + if (arg0->state == 21) { + arg0->state = 25; arg0->param1 = 0; play_sound2(SOUND_MENU_SELECT); if (arg0->paramf < 4.2) { @@ -12082,8 +12316,8 @@ void func_800AE218(MenuItem* arg0) { arg0->state = arg0->param2 + 0x1E; play_sound2(SOUND_MENU_GO_BACK); } else if (gControllerOne->buttonPressed & 0x9000) { - if (arg0->state == 0x00000024) { - arg0->state = 0x00000028; + if (arg0->state == 36) { + arg0->state = 40; arg0->param1 = 0; play_sound2(SOUND_MENU_SELECT); if (arg0->paramf < 4.2) { diff --git a/src/menu_items.h b/src/menu_items.h index 074fc035a..ab5066649 100644 --- a/src/menu_items.h +++ b/src/menu_items.h @@ -445,8 +445,6 @@ MenuTexture* func_8009A944(struct_8018DEE0_entry*, s32); void func_8009A9FC(s32, s32, u32, s32); void func_8009AB7C(s32); void func_8009AD78(s32, s32); -void convert_img_to_greyscale(s32, u32); -void adjust_img_colour(s32, s32, s32, s32, s32); u16* func_8009B8C4(u64*); void func_8009B938(void); void func_8009B954(MenuTexture*); @@ -463,8 +461,8 @@ Gfx* func_8009C708(Gfx*, struct_8018DEE0_entry*, s32, s32, s32, s32); void func_8009C918(void); void func_8009CA2C(void); void func_8009CA6C(s32); -void func_8009CBE4(s32, s32, s32); -void func_8009CDDC(s32, s32); +void draw_fade_in(s32, s32, s32); +void draw_black_fade_in(s32, s32); void func_8009CDFC(s32, s32); void func_8009CE1C(void); void func_8009CE64(s32); @@ -689,9 +687,9 @@ extern Gfx* sGfxPtr; extern s32 gNumD_8018E768Entries; extern struct_8018E768_entry D_8018E768[D_8018E768_SIZE]; extern s32 gCycleFlashMenu; -extern s8 D_8018E7AC[]; -extern u32 D_8018E7B8[]; -extern u32 D_8018E7D0[]; +extern s8 gTransitionType[]; +extern u32 gTransitionDuration[]; +extern u32 gCurrentTransitionTime[]; extern struct UnkStruct_8018E7E8 D_8018E7E8[D_8018E7E8_SIZE]; extern struct UnkStruct_8018E7E8 D_8018E810[D_8018E810_SIZE]; extern s8 gTextColor; @@ -733,7 +731,7 @@ extern Unk_D_800E70A0 D_800E7458[]; extern Unk_D_800E70A0 D_800E7480[]; extern RGBA16 D_800E74A8[]; extern RGBA16 D_800E74D0[]; -extern RGBA16 D_800E74E8[]; +extern RGBA16 gBackgroundColor[]; extern const s16 gGlyphDisplayWidth[]; extern char* gCupNames[]; extern const s8 D_800EFD64[]; diff --git a/src/menus.c b/src/menus.c index edc56494f..85a14677f 100644 --- a/src/menus.c +++ b/src/menus.c @@ -42,10 +42,11 @@ s8 gScreenModeListIndex; // 0-4 index, selects a screen mode in sScreenModePlaye u8 gSoundMode; s8 gPlayerCount; s8 gVersusResultCursorSelection; // 4 options indexed (10-13), gets set when selecting an option -s8 gTimeTrialsResultCursorSelection; // 5 options indexed (5-9), gets set when selecting an option (excluding Save Ghost) +s8 gTimeTrialsResultCursorSelection; // 5 options indexed (5-9), gets set when selecting an option (excluding Save + // Ghost) s8 gBattleResultCursorSelection; // 4 options indexed (10-13), gets set when selecting an option s8 gTimeTrialDataCourseIndex; -s8 gCourseRecordsMenuSelection; // Used for selecting an option in course record data +s8 gCourseRecordsMenuSelection; // Used for selecting an option in course record data s8 gCourseRecordsSubMenuSelection; // Used for erase records and ghosts (Quit - Erase) s8 gDebugGotoScene; bool gGhostPlayerInit; @@ -87,13 +88,9 @@ u32 sVIGammaOffDitherOn = (OS_VI_GAMMA_OFF | OS_VI_DITHER_FILTER_ON); /** Rodata **/ // Sets the actual screen mode based on values set in sScreenModePlayerCount -const s8 sScreenModePlayerTable[] = { - SCREEN_MODE_1P, - SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL, - SCREEN_MODE_2P_SPLITSCREEN_VERTICAL, - SCREEN_MODE_3P_4P_SPLITSCREEN, - SCREEN_MODE_3P_4P_SPLITSCREEN -}; +const s8 sScreenModePlayerTable[] = { SCREEN_MODE_1P, SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL, + SCREEN_MODE_2P_SPLITSCREEN_VERTICAL, SCREEN_MODE_3P_4P_SPLITSCREEN, + SCREEN_MODE_3P_4P_SPLITSCREEN }; // Sets how many players can load on each screen mode set in sScreenModePlayerTable const s8 sScreenModePlayerCount[] = { 1, 2, 2, 3, 4 }; @@ -439,7 +436,8 @@ void options_menu_act(struct Controller* controller, u16 controllerIdx) { } case SUB_MENU_COPY_PAK_FROM_GHOST1_1P: case SUB_MENU_COPY_PAK_FROM_GHOST2_1P: { - if ((btnAndStick & D_JPAD) && (gSubMenuSelection < SUB_MENU_COPY_PAK_FROM_GHOST_MAX) && (sp30[PLAYER_TWO].ghostDataSaved)) { + if ((btnAndStick & D_JPAD) && (gSubMenuSelection < SUB_MENU_COPY_PAK_FROM_GHOST_MAX) && + (sp30[PLAYER_TWO].ghostDataSaved)) { gSubMenuSelection += 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { @@ -447,7 +445,8 @@ void options_menu_act(struct Controller* controller, u16 controllerIdx) { } sp38->subState = 1; } - if ((btnAndStick & U_JPAD) && (gSubMenuSelection > SUB_MENU_COPY_PAK_FROM_GHOST_MIN) && sp30[PLAYER_ONE].ghostDataSaved) { + if ((btnAndStick & U_JPAD) && (gSubMenuSelection > SUB_MENU_COPY_PAK_FROM_GHOST_MIN) && + sp30[PLAYER_ONE].ghostDataSaved) { gSubMenuSelection -= 1; play_sound2(SOUND_MENU_CURSOR_MOVE); if (sp38->paramf < 4.2) { @@ -462,7 +461,8 @@ void options_menu_act(struct Controller* controller, u16 controllerIdx) { } if (btnAndStick & A_BUTTON) { sp38->param2 = gSubMenuSelection - SUB_MENU_COPY_PAK_FROM_GHOST_MIN; - if (sp30[sp38->param2].courseIndex == D_8018EE10[PLAYER_TWO].courseIndex && D_8018EE10[PLAYER_TWO].ghostDataSaved) { + if (sp30[sp38->param2].courseIndex == D_8018EE10[PLAYER_TWO].courseIndex && + D_8018EE10[PLAYER_TWO].ghostDataSaved) { gSubMenuSelection = SUB_MENU_COPY_PAK_TO_GHOST2_2P; } else { gSubMenuSelection = SUB_MENU_COPY_PAK_TO_GHOST1_2P; @@ -474,7 +474,8 @@ void options_menu_act(struct Controller* controller, u16 controllerIdx) { case SUB_MENU_COPY_PAK_TO_GHOST1_2P: case SUB_MENU_COPY_PAK_TO_GHOST2_2P: { // bit of a fake match, but if it works it works? - if ((sp30[sp38->param2].courseIndex != ((0, (D_8018EE10 + (gSubMenuSelection - SUB_MENU_COPY_PAK_TO_GHOST_MIN))->courseIndex))) || + if ((sp30[sp38->param2].courseIndex != + ((0, (D_8018EE10 + (gSubMenuSelection - SUB_MENU_COPY_PAK_TO_GHOST_MIN))->courseIndex))) || ((D_8018EE10 + (gSubMenuSelection - SUB_MENU_COPY_PAK_TO_GHOST_MIN))->ghostDataSaved == 0)) { if ((btnAndStick & D_JPAD) && (gSubMenuSelection < SUB_MENU_COPY_PAK_TO_GHOST_MAX)) { gSubMenuSelection += 1; @@ -1428,11 +1429,13 @@ void main_menu_act(struct Controller* controller, u16 controllerIdx) { if (btnAndStick & D_JPAD) { cursorMoved = false; if (has_unlocked_extra_mode()) { - if (subMode < sGameModePlayerColumnExtra[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) { + if (subMode < + sGameModePlayerColumnExtra[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) { cursorMoved = true; } } else { - if (subMode < sGameModePlayerColumnDefault[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) { + if (subMode < + sGameModePlayerColumnDefault[gPlayerCount - 1][gGameModeMenuColumn[gPlayerCount - 1]]) { cursorMoved = true; } } @@ -1747,14 +1750,14 @@ void course_select_menu_act(struct Controller* controller, u16 controllerIdx) { if ((btnAndStick & R_JPAD) != 0) { sTempCupSelection = WorldNextCup(); //++gCupSelection; - //reset_cycle_flash_menu(); - //play_sound2(SOUND_MENU_CURSOR_MOVE); + // reset_cycle_flash_menu(); + // play_sound2(SOUND_MENU_CURSOR_MOVE); } if (((btnAndStick & L_JPAD) != 0)) { sTempCupSelection = WorldPreviousCup(); //--gCupSelection; - //reset_cycle_flash_menu(); - //play_sound2(SOUND_MENU_CURSOR_MOVE); + // reset_cycle_flash_menu(); + // play_sound2(SOUND_MENU_CURSOR_MOVE); } D_800DC540 = GetCupIndex(); @@ -1814,7 +1817,8 @@ void course_select_menu_act(struct Controller* controller, u16 controllerIdx) { } break; case SUB_MENU_MAP_SELECT_OK: - if ((controllerIdx == PLAYER_ONE) && ((++gMenuTimingCounter == 0x3C) || ((gMenuTimingCounter % 300) == 0))) { + if ((controllerIdx == PLAYER_ONE) && + ((++gMenuTimingCounter == 0x3C) || ((gMenuTimingCounter % 300) == 0))) { play_sound2(SOUND_MENU_OK); } @@ -2062,7 +2066,8 @@ void set_sound_mode(void) { * interacted while a fade transition is active */ bool is_screen_being_faded(void) { - if ((D_8018E7AC[4] == 2) || (D_8018E7AC[4] == 3) || (D_8018E7AC[4] == 4) || (D_8018E7AC[4] == 7)) { + if ((gTransitionType[4] == 2) || (gTransitionType[4] == 3) || (gTransitionType[4] == 4) || + (gTransitionType[4] == 7)) { return true; } return false; diff --git a/src/networking/start_game.c b/src/networking/start_game.c index 817d9b4cf..b5ab497df 100644 --- a/src/networking/start_game.c +++ b/src/networking/start_game.c @@ -69,7 +69,7 @@ void assign_player_slots(const char* data) { testa = 1; int offset = 0; printf("Assign Player Slots\n"); - for (int i = 0; i < NETWORK_MAX_PLAYERS; ++i) { + for (size_t i = 0; i < NETWORK_MAX_PLAYERS; ++i) { // Read username int usernameLength = *(int*) (data + offset); diff --git a/src/player_controller.c b/src/player_controller.c index e781c8b21..bc23ea619 100644 --- a/src/player_controller.c +++ b/src/player_controller.c @@ -1094,10 +1094,11 @@ void func_8002A704(Player* player, s8 arg1) { } void func_8002A79C(Player* player, s8 arg1) { - if (((player->effects & 0x100) != 0x100) && ((player->effects & 0x10) != 0x10) && (player->unk_22A >= 2)) { + if (((player->effects & 0x100) != 0x100) && ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT) && + (player->driftState >= 2)) { player->effects |= 0x100; player->unk_23A = 0; - player->unk_22A = 0; + player->driftState = 0; player->unk_228 = 0; if (D_8015F890 != 1) { if ((player->type & PLAYER_HUMAN) && !(player->type & PLAYER_INVISIBLE_OR_BOMB)) { @@ -1111,7 +1112,7 @@ void func_8002A79C(Player* player, s8 arg1) { if (player->unk_23A >= 0x1F) { player->unk_23A = 0; player->effects &= ~0x100; - player->unk_22A = 0; + player->driftState = 0; player->unk_228 = 0; } } @@ -1128,15 +1129,15 @@ void func_8002A8A4(Player* player, s8 arg1) { } } else { if ((player->unk_228 >= 0x12) && (player->unk_228 < 0x64)) { - if (player->unk_22A < 3) { - player->unk_22A++; + if (player->driftState < 3) { + player->driftState++; } } if ((player->unk_228 >= 0xA) && (player->unk_228 < 0x64)) { player->unk_228 = 0x000A; } else { player->unk_228 = 0; - player->unk_22A = 0; + player->driftState = 0; } } } else if (((s32) player->unk_07C >> 0x10) >= 0xA) { @@ -1148,15 +1149,15 @@ void func_8002A8A4(Player* player, s8 arg1) { } } else { if ((player->unk_228 >= 0x12) && (player->unk_228 < 0x64)) { - if (player->unk_22A < 3) { - player->unk_22A++; + if (player->driftState < 3) { + player->driftState++; } } if ((player->unk_228 >= 0xA) && (player->unk_228 < 0x64)) { player->unk_228 = 0x000A; } else { player->unk_228 = 0; - player->unk_22A = 0; + player->driftState = 0; } } } @@ -1279,7 +1280,8 @@ void func_8002AE38(Player* player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 ar sp28 = (sins(-player->rotation[1]) * player->speed) + arg2; temp_f16 = (coss(-player->rotation[1]) * player->speed) + arg3; - if (((player->effects & 0x800) != 0x800) && ((player->effects & 0x10) != 0x10) && !(player->unk_044 & 0x4000) && + if (((player->effects & 0x800) != 0x800) && ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT) && + !(player->unk_044 & 0x4000) && ((((player->speed / 18.0f) * 216.0f) <= 8.0f) || (((player->unk_07C >> 0x10) < 5) && ((player->unk_07C >> 0x10) > -5)))) { if ((player->effects & 0x20) == 0x20) { @@ -1303,8 +1305,9 @@ void func_8002AE38(Player* player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 ar } else { player->unk_0C0 = (atan2s(arg2 - arg4, arg3 - arg5) - atan2s(arg2 - sp28, arg3 - temp_f16)) * 2; } - if (((player->effects & 0x10) != 0x10) && ((((player->unk_07C >> 0x10) > 0) && (player->unk_0C0 < 0)) || - (((player->unk_07C >> 0x10) < 0) && (player->unk_0C0 > 0)))) { + if (((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT) && + ((((player->unk_07C >> 0x10) > 0) && (player->unk_0C0 < 0)) || + (((player->unk_07C >> 0x10) < 0) && (player->unk_0C0 > 0)))) { if (player->unk_0C0 > 0) { player->unk_0C0 = player->unk_078 * 0x14; } @@ -1333,14 +1336,14 @@ void func_8002B218(Player* player) { for (someIndex = 0; someIndex < 10; someIndex++) { if (player->unk_006 == sp38[someIndex]) { - player->effects |= 0x10; + player->effects |= DRIFTING_EFFECT; kart_hop(player); - player->unk_204 = 0; + player->driftDuration = 0; break; } if (player->unk_006 == sp24[someIndex]) { - player->effects &= ~0x10; + player->effects &= ~DRIFTING_EFFECT; break; } } @@ -1692,15 +1695,15 @@ void func_8002BF4C(Player* player, s8 arg1) { } void func_8002C11C(Player* player) { - if ((player->effects & 0x10) == 0x10) { - player->unk_204 += 1; - if (player->unk_204 >= 0x65) { - player->unk_204 = 0x64; + if ((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) { + player->driftDuration += 1; + if (player->driftDuration >= 0x65) { + player->driftDuration = 0x64; } } else { - player->unk_204 -= 1; - if (player->unk_204 < 0) { - player->unk_204 = 0; + player->driftDuration -= 1; + if (player->driftDuration < 0) { + player->driftDuration = 0; } } } @@ -2637,7 +2640,7 @@ void control_cpu_movement(Player* player, UNUSED Camera* camera, s8 arg2, s8 pla player->effects |= 0x1000; player->unk_044 |= 0x10; test = gPlayerPathY[playerId]; - player->unk_204 = 0; + player->driftDuration = 0; player->effects &= ~0x10; func_8002B830(player, playerId, arg2); apply_effect(player, playerId, arg2); @@ -2934,7 +2937,7 @@ f32 func_80030150(Player* player, s8 arg1) { var_f0 += -0.55; } } - if (((player->effects & 0x10) == 0x10) || (player->unk_204 > 0)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) || (player->driftDuration > 0)) { var_v0 = (s16) player->unk_0C0 / 182; if (var_v0 < 0) { var_f0 += -var_v0 * 0.004; @@ -2994,7 +2997,7 @@ f32 func_80030150(Player* player, s8 arg1) { } } if ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) { - if (((player->effects & 0x100) == 0x100) && ((player->effects & 0x10) != 0x10)) { + if (((player->effects & 0x100) == 0x100) && ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT)) { move_f32_towards(&player->unk_0E8, 580.0f, 0.2f); } else { move_f32_towards(&player->unk_0E8, 0.0f, 0.01f); @@ -3829,7 +3832,7 @@ void func_80033AE0(Player* player, struct Controller* controller, s8 arg2) { player->unk_044 &= 0xFFF9; D_801652C0[arg2] = 0; } - if (((player->effects & 2) == 2) || ((player->effects & 0x10) == 0x10)) { + if (((player->effects & 2) == 2) || ((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT)) { player->unk_044 &= 0xFFF9; } sp2E4 = player->unk_07C; @@ -3842,10 +3845,10 @@ void func_80033AE0(Player* player, struct Controller* controller, s8 arg2) { sp2D0 = sp2D0 >> 16; player->unk_0FA = (s16) sp2D0; if (((sp2D0 >= 0x5A) || (sp2D0 < (-0x59))) && (!(player->unk_044 & 0x4000))) { - if ((((((!(player->effects & 0x10)) && (gCCSelection == CC_150)) && (gModeSelection != BATTLE)) && + if ((((((!(player->effects & DRIFTING_EFFECT)) && (gCCSelection == CC_150)) && (gModeSelection != BATTLE)) && (!(player->effects & 8))) && (((player->speed / 18.0f) * 216.0f) >= 40.0f)) && - (player->unk_204 == 0)) { + (player->driftDuration == 0)) { player->soundEffects |= 0x80; } } @@ -3859,7 +3862,7 @@ void func_80033AE0(Player* player, struct Controller* controller, s8 arg2) { sp2C8 = 10; sp2CC = 10; } else { - if (((player->effects & 0x10) == 0x10) && ((player->effects & 2) != 2)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & 2) != 2)) { var_a0 = 3; } else { var_a0 = 0; @@ -3998,7 +4001,7 @@ void func_80033AE0(Player* player, struct Controller* controller, s8 arg2) { func_80033A40(player, &sp2D0, &sp2E4, player->unk_07C, 2, 0x6000 / sp2CC, 1.9f); func_80033A40(player, &sp2D0, &sp2E4, player->unk_07C, 1, 0x5000 / sp2CC, 1.9f); func_80033A40(player, &sp2D0, &sp2E4, player->unk_07C, 0, 0 / sp2CC, 1.9f); - if ((player->effects & 0x10) == 0x10) { + if ((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) { var_f2_2 = (f32) (((s32) (sp2E4 >> 16)) / 8); } else if (((player->speed / 18.0f) * 216.0f) <= 25.0f) { var_f2_2 = (f32) ((sp2E4 >> 16) / 12); @@ -4010,7 +4013,7 @@ void func_80033AE0(Player* player, struct Controller* controller, s8 arg2) { } if ((player->effects & 0x20) == 0x20) { var_f2_2 = var_f2_2 * (sp44[((s16) ((player->speed / 18.0f) * 216.0f)) + 10] * 1.5f); - } else if ((player->effects & 0x10) == 0x10) { + } else if ((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) { var_f2_2 = var_f2_2 * sp44[(s16) ((player->speed / 18.0f) * 216.0f)]; } else { var_f2_2 = var_f2_2 * (sp44[(s16) ((player->speed / 18.0f) * 216.0f)] * 1.5f); @@ -4028,7 +4031,7 @@ void func_80033AE0(Player* player, struct Controller* controller, s8 arg2) { if (((s32) player->tyres[BACK_LEFT].surfaceType) < 0xF) { var_f12 += D_800E3410[player->characterId][player->tyres[BACK_LEFT].surfaceType]; } - if (((player->effects & 2) != 2) && ((player->effects & 0x10) != 0x10)) { + if (((player->effects & 2) != 2) && ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT)) { if ((player->effects & 0x20) == 0x20) { player->unk_078 = (s16) ((s32) (((f32) ((((s32) player->unk_07C) >> 0x10) * 5)) * var_f2_2)); } else { @@ -4052,8 +4055,8 @@ void func_80033AE0(Player* player, struct Controller* controller, s8 arg2) { } } player->unk_228 = 0; - if (player->unk_22A < 2) { - player->unk_22A = 0; + if (player->driftState < 2) { + player->driftState = 0; } } } else if (((player->effects & 8) != 8) && ((player->effects & 2) != 2)) { @@ -4137,7 +4140,7 @@ void apply_cpu_turn(Player* player, s16 arg1) { sp304 = (s32) player->unk_07C >> 0x10; move_s32_towards(&sp304, (s32) arg1, 0.35f); sp304 <<= 0x10; - if ((player->effects & 0x10) == 0x10) { + if ((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) { var_f0 = (sp304 >> 0x10) / 5; } else { var_f0 = (f32) (sp304 >> 0x10) / (8.0f + (player->currentSpeed / 50.0f)); @@ -4145,13 +4148,13 @@ void apply_cpu_turn(Player* player, s16 arg1) { if (var_f0 < 0.0f) { var_f0 = -var_f0; } - if ((player->effects & 0x10) == 0x10) { + if ((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) { var_f0 = sp44[(s16) ((player->speed / 18.0f) * 216.0f)] * var_f0; } else { var_f0 = sp44[(s16) ((player->speed / 18.0f) * 216.0f)] * sp24[player->characterId] * var_f0; } player->unk_07C = sp304; - if (((player->effects & 2) != 2) && ((player->effects & 0x10) != 0x10)) { + if (((player->effects & 2) != 2) && ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT)) { if ((player->effects & 1) != 1) { player->unk_078 = (player->unk_07C >> 0x10) * var_f0; } else { @@ -4183,8 +4186,8 @@ void apply_cpu_turn(Player* player, s16 arg1) { void func_80036C5C(Player* arg0) { if (((arg0->speed / 18.0f) * 216.0f) > 20.0f) { - arg0->unk_204 = 0; - arg0->effects |= 0x10; + arg0->driftDuration = 0; + arg0->effects |= DRIFTING_EFFECT; arg0->unk_0B6 |= 0x800; } } @@ -4192,7 +4195,7 @@ void func_80036C5C(Player* arg0) { void func_80036CB4(Player* player) { s32 test; - if (((player->effects & 0x10) == 0x10) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { if ((player->unk_0C0 / 182) > 0) { test = ((((player->unk_07C >> 0x10) * 0xD) + 0x2B1) / 106) + 0x28; player->unk_07C = test << 0x10; @@ -4201,10 +4204,10 @@ void func_80036CB4(Player* player) { test = ((((player->unk_07C >> 0x10) * 0xD) + 0x2B1) / 106) - 0x35; player->unk_07C = test << 0x10; } - player->effects &= ~0x10; + player->effects &= ~DRIFTING_EFFECT; } - if (((player->effects & 0x10) == 0x10) && ((player->type & PLAYER_HUMAN) != PLAYER_HUMAN)) { - player->effects &= ~0x10; + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->type & PLAYER_HUMAN) != PLAYER_HUMAN)) { + player->effects &= ~DRIFTING_EFFECT; } } @@ -4221,7 +4224,7 @@ void func_80036DB4(Player* player, Vec3f arg1, Vec3f arg2) { arg1[2] = 0.0f; mtxf_translate_vec3f_mat3(arg1, player->orientationMatrix); } else { - if (((player->effects & 0x10) == 0x10) && ((player->effects & 2) != 2)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & 2) != 2)) { var_f18 = player->unk_208 + ((-(player->speed / 18.0f) * 216.0f) * 3.0f) + (-player->unk_20C * 10.0f); sp20 = player->unk_084 * 3.0f; } else if (!(player->effects & 0x800) && !(player->unk_044 & 0x4000)) { @@ -4249,7 +4252,7 @@ void func_80036DB4(Player* player, Vec3f arg1, Vec3f arg2) { sp20 = player->unk_084; } if ((player->effects & STAR_EFFECT) == STAR_EFFECT) { - if (((player->effects & 0x10) == 0x10) && ((player->effects & 2) != 2)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & 2) != 2)) { var_f18 = player->unk_208 + ((-(player->speed / 18.0f) * 216.0f) * 3.0f) + (-player->unk_20C * 10.0f); sp20 = player->unk_084 * 3.0f; } else { @@ -4279,7 +4282,7 @@ void func_800371F4(Player* player, Vec3f arg1, Vec3f arg2) { arg1[2] = 0.0f; mtxf_translate_vec3f_mat3(arg1, player->orientationMatrix); } else { - if (((player->effects & 0x10) == 0x10) && ((player->effects & 2) != 2)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & 2) != 2)) { var_f18 = player->unk_208 + ((-(player->speed / 18.0f) * 216.0f) * 3.0f) + (-player->unk_20C * 50.0f); sp20 = player->unk_084 * 3.0f; } else if (!(player->effects & 0x800) && !(player->unk_044 & 0x4000)) { @@ -4310,7 +4313,7 @@ void func_800371F4(Player* player, Vec3f arg1, Vec3f arg2) { sp20 = player->unk_084; } if ((player->effects & STAR_EFFECT) == STAR_EFFECT) { - if (((player->effects & 0x10) == 0x10) && ((player->effects & 2) != 2)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & 2) != 2)) { var_f18 = player->unk_208 + ((-(player->speed / 18.0f) * 216.0f) * 3.0f) + (-player->unk_20C * 50.0f); sp20 = player->unk_084 * 3.0f; } else { @@ -4338,7 +4341,7 @@ void func_80037614(Player* player, Vec3f arg1, Vec3f arg2) { arg1[2] = 0.0f; mtxf_translate_vec3f_mat3(arg1, player->orientationMatrix); } else { - if (((player->effects & 0x10) == 0x10) && ((player->effects & 2) != 2)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & 2) != 2)) { var_f2 = ((-(player->speed / 18.0f) * 216.0f) * 2) + -80.0f; var_f12 = -80.0f; } else { @@ -4365,7 +4368,7 @@ void func_8003777C(Player* player, Vec3f arg1, Vec3f arg2) { arg1[2] = 0.0f; mtxf_translate_vec3f_mat3(arg1, player->orientationMatrix); } else { - if (((player->effects & 0x10) == 0x10) && ((player->effects & 2) != 2)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & 2) != 2)) { var_f2 = ((-(player->speed / 18.0f) * 216.0f) * 2) + -80.0f; var_f12 = -80.0f; } else { @@ -4392,7 +4395,7 @@ void func_800378E8(Player* player, Vec3f arg1, Vec3f arg2) { arg1[2] = 0.0f; mtxf_translate_vec3f_mat3(arg1, player->orientationMatrix); } else { - if ((player->effects & 0x10) == 0x10) { + if ((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) { var_f2 = player->unk_208 + (-(player->speed / 18.0f) * 216.0f * 5.0f) + (-player->unk_20C * 10.0f); var_f12 = -100.0f; } else { @@ -4419,7 +4422,7 @@ void func_80037A4C(Player* player, Vec3f arg1, Vec3f arg2) { arg1[2] = 0.0f; mtxf_translate_vec3f_mat3(arg1, player->orientationMatrix); } else { - if ((player->effects & 0x10) == 0x10) { + if ((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) { var_f2 = player->unk_208 + (-(player->speed / 18.0f) * 216.0f * 5.0f) + (-player->unk_20C * 50.0f); var_f12 = -100.0f; } else { @@ -4487,7 +4490,7 @@ void func_80037CFC(Player* player, struct Controller* controller, s8 arg2) { ((player->effects & HIT_BY_ITEM_EFFECT) != HIT_BY_ITEM_EFFECT) && ((player->effects & 0x10000) != 0x10000) && ((player->effects & 0x20000) != 0x20000)) { if (((player->effects & HIT_EFFECT) != HIT_EFFECT) && ((player->effects & 8) != 8) && - ((player->effects & 2) != 2) && ((player->effects & 0x10) != 0x10) && + ((player->effects & 2) != 2) && ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT) && (controller->buttonPressed & R_TRIG)) { kart_hop(player); if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp index 5ca0b22f6..c93131bc8 100644 --- a/src/port/Engine.cpp +++ b/src/port/Engine.cpp @@ -48,6 +48,7 @@ float gInterpolationStep = 0.0f; #include #include #include +// #include #include "audio/internal.h" #include "audio/GameAudio.h" } @@ -61,6 +62,19 @@ Fast::Interpreter* GetInterpreter() { GameEngine* GameEngine::Instance; +bool CreateDirectoryRecursive(std::string const& dirName, std::error_code& err) { + err.clear(); + if (!std::filesystem::create_directories(dirName, err)) { + if (std::filesystem::exists(dirName)) { + // The folder already exists: + err.clear(); + return true; + } + return false; + } + return true; +} + GameEngine::GameEngine() { const std::string main_path = Ship::Context::GetPathRelativeToAppDirectory("mk64.o2r"); @@ -95,7 +109,6 @@ GameEngine::GameEngine() { if (std::filesystem::exists(assets_path)) { archiveFiles.push_back(assets_path); } - if (const std::string patches_path = Ship::Context::GetPathRelativeToAppDirectory("mods"); !patches_path.empty() && std::filesystem::exists(patches_path)) { if (std::filesystem::is_directory(patches_path)) { @@ -477,8 +490,8 @@ void GameEngine::HandleAudioThread() { int samples_left = AudioPlayerBuffered(); u32 num_audio_samples = samples_left < AudioPlayerGetDesiredBuffered() ? SAMPLES_HIGH : SAMPLES_LOW; - s16 audio_buffer[SAMPLES_PER_FRAME]; - for (int i = 0; i < NUM_AUDIO_CHANNELS; i++) { + s16 audio_buffer[SAMPLES_PER_FRAME] = { 0 }; + for (size_t i = 0; i < NUM_AUDIO_CHANNELS; i++) { create_next_audio_buffer(audio_buffer + i * (num_audio_samples * 2), num_audio_samples); } @@ -685,6 +698,17 @@ extern "C" bool GameEngine_OTRSigCheck(const char* data) { return strncmp(data, sOtrSignature, strlen(sOtrSignature)) == 0; } +extern "C" int32_t GameEngine_ResourceGetTexTypeByName(const char* name) { + const auto res = std::static_pointer_cast(ResourceLoad(name)); + + if (res != nullptr) { + return (int16_t) res->Type; + } + + SPDLOG_ERROR("Given texture path is a non-existent resource"); + return -1; +} + // struct TimedEntry { // uint64_t duration; // TimerAction action; diff --git a/src/port/Engine.h b/src/port/Engine.h index 569009b00..e22bfcbb1 100644 --- a/src/port/Engine.h +++ b/src/port/Engine.h @@ -112,6 +112,7 @@ uint32_t OTRGetGameViewportWidth(); uint32_t OTRGetGameViewportHeight(); uint32_t OTRCalculateCenterOfAreaFromRightEdge(int32_t center); uint32_t OTRCalculateCenterOfAreaFromLeftEdge(int32_t center); +int32_t GameEngine_ResourceGetTexTypeByName(const char* name); #ifdef __cplusplus } #endif diff --git a/src/port/Game.cpp b/src/port/Game.cpp index a54109ccc..f144664d6 100644 --- a/src/port/Game.cpp +++ b/src/port/Game.cpp @@ -658,7 +658,7 @@ void CM_CleanWorld(void) { delete actor; } - for (int i = 0; i < ARRAY_COUNT(gWorldInstance.playerBombKart); i++) { + for (size_t i = 0; i < ARRAY_COUNT(gWorldInstance.playerBombKart); i++) { gWorldInstance.playerBombKart[i].state = PlayerBombKart::PlayerBombKartState::DISABLED; gWorldInstance.playerBombKart[i]._primAlpha = 0; } diff --git a/src/port/resource/importers/AudioBankFactory.h b/src/port/resource/importers/AudioBankFactory.h index eddf256e9..49796dace 100644 --- a/src/port/resource/importers/AudioBankFactory.h +++ b/src/port/resource/importers/AudioBankFactory.h @@ -9,4 +9,4 @@ class AudioBankFactoryV0 : public Ship::ResourceFactoryBinary { std::shared_ptr ReadResource(std::shared_ptr file, std::shared_ptr initData) override; }; -} +} // namespace SM64 diff --git a/src/port/resource/importers/AudioSampleFactory.h b/src/port/resource/importers/AudioSampleFactory.h index b1fe50455..5c46449bf 100644 --- a/src/port/resource/importers/AudioSampleFactory.h +++ b/src/port/resource/importers/AudioSampleFactory.h @@ -9,4 +9,4 @@ class AudioSampleFactoryV0 : public Ship::ResourceFactoryBinary { std::shared_ptr ReadResource(std::shared_ptr file, std::shared_ptr initData) override; }; -} +} // namespace SM64 diff --git a/src/port/resource/importers/AudioSequenceFactory.h b/src/port/resource/importers/AudioSequenceFactory.h index 1132b78fb..b65c33a80 100644 --- a/src/port/resource/importers/AudioSequenceFactory.h +++ b/src/port/resource/importers/AudioSequenceFactory.h @@ -10,4 +10,4 @@ class AudioSequenceFactoryV0 : public Ship::ResourceFactoryBinary { std::shared_ptr ReadResource(std::shared_ptr file, std::shared_ptr initData) override; }; -} +} // namespace SM64 diff --git a/src/port/resource/importers/UnkActorSpawnDataFactory.h b/src/port/resource/importers/UnkActorSpawnDataFactory.h index 28ddd9ce2..991fa54bf 100644 --- a/src/port/resource/importers/UnkActorSpawnDataFactory.h +++ b/src/port/resource/importers/UnkActorSpawnDataFactory.h @@ -2,6 +2,7 @@ #include "Resource.h" #include "ResourceFactoryBinary.h" +#include "File.h" namespace MK64 { class ResourceFactoryBinaryUnkActorSpawnDataV0 : public Ship::ResourceFactoryBinary { diff --git a/src/port/ui/Properties.cpp b/src/port/ui/Properties.cpp index 0368231d9..6a8036dc2 100644 --- a/src/port/ui/Properties.cpp +++ b/src/port/ui/Properties.cpp @@ -61,7 +61,7 @@ namespace Editor { }; if (ImGui::DragInt3("##Rotation", rot, 5.0f)) { - for (int i = 0; i < 3; i++) { + for (size_t i = 0; i < 3; i++) { // Wrap around 0–65535 rot[i] = (rot[i] % 65536 + 65536) % 65536; } diff --git a/src/port/ui/TrackProperties.cpp b/src/port/ui/TrackProperties.cpp index a1520256a..fac44789b 100644 --- a/src/port/ui/TrackProperties.cpp +++ b/src/port/ui/TrackProperties.cpp @@ -180,7 +180,7 @@ namespace Editor { const char* currentItem = MusicSeqToString(gWorldInstance.CurrentCourse->Props.Sequence); // Get the current selected value's string if (ImGui::BeginCombo("Music Sequence", currentItem)) { - for (int i = 0; i < IM_ARRAYSIZE(items); ++i) { + for (size_t i = 0; i < IM_ARRAYSIZE(items); ++i) { bool isSelected = (currentItem == items[i]); if (ImGui::Selectable(items[i], isSelected)) { // Update the sequence when an option is selected @@ -239,7 +239,7 @@ namespace Editor { // Convert and pass to ImGui ColorEdit3 - for (int i = 0; i < 2; ++i) { + for (size_t i = 0; i < 2; ++i) { float ambient[3], diffuse[3], direction[3]; RGB8ToFloat((u8*)&D_800DC610[i].a.l.col, ambient); @@ -269,13 +269,13 @@ namespace Editor { // Convert s16 color values to float (normalized to [0, 1] range) void TrackPropertiesWindow::RGB8ToFloat(const u8* src, float* dst) { - for (int i = 0; i < 3; ++i) { + for (size_t i = 0; i < 3; ++i) { dst[i] = src[i] / 255.0f; // Normalize to the range [0.0f, 1.0f] } } void TrackPropertiesWindow::FloatToRGB8(const float* src, u8* dst) { - for (int i = 0; i < 3; ++i) { + for (size_t i = 0; i < 3; ++i) { dst[i] = static_cast(src[i] * 255.0f); // Scale to [0, 255] range } } diff --git a/src/racing/actors.c b/src/racing/actors.c index e30f67e25..17742bf03 100644 --- a/src/racing/actors.c +++ b/src/racing/actors.c @@ -38,8 +38,18 @@ // Appears to be textures // or tluts -u8* D_802BA050; -u8* D_802BA054; +char* texture_green_shell[] = { + texture_green_shell_0, texture_green_shell_1, texture_green_shell_2, texture_green_shell_3, + texture_green_shell_4, texture_green_shell_5, texture_green_shell_6, texture_green_shell_7, +}; +char* gTextureBlueshell[] = { + texture_blue_shell_0, texture_blue_shell_1, texture_blue_shell_2, texture_blue_shell_3, + texture_blue_shell_4, texture_blue_shell_5, texture_blue_shell_6, texture_blue_shell_7, +}; +char* texture_red_shell[] = { + texture_red_shell_0, texture_red_shell_1, texture_red_shell_2, texture_red_shell_3, + texture_red_shell_4, texture_red_shell_5, texture_red_shell_6, texture_red_shell_7, +}; u8* D_802BA058; struct Actor* gActorHotAirBalloonItemBox; @@ -716,15 +726,9 @@ void render_palm_trees(Camera* camera, Mat4 arg1) { #include "actors/kiwano_fruit/render.inc.c" void render_actor_shell(Camera* camera, Mat4 matrix, struct ShellActor* shell) { - UNUSED s16 pad; - u16 temp_t8; - UNUSED s32 pad2; - s16 sp58[15] = // D_802B87E8; - { 0x0000, 0x0400, 0x0800, 0x0c00, 0x1000, 0x1400, 0x1800, 0x1c00, - 0x1c00, 0x1800, 0x1400, 0x1000, 0x0c00, 0x0800, 0x0400 }; - //! @todo Is this making the shell spin? - // Is it doing this by modifying a an address? - uintptr_t phi_t3; + u16 index; + char* phi_t3; + bool reverseShell = false; // @port: Tag the transform. FrameInterpolation_RecordOpenChild("Shell", TAG_ITEM_ADDR(shell)); @@ -744,13 +748,24 @@ void render_actor_shell(Camera* camera, Mat4 matrix, struct ShellActor* shell) { if (temp_f0 < 40000.0f) { func_802979F8((struct Actor*) shell, 3.4f); } - if (shell->type == ACTOR_BLUE_SPINY_SHELL) { - phi_t3 = (uintptr_t) D_802BA054; - } else { - phi_t3 = (uintptr_t) D_802BA050; + + index = (u16) shell->rotVelocity / 4369; // Give a number between 0-15 + if (index >= 8) { + reverseShell = true; + index = 15 - index; + } + + switch (shell->type) { + case ACTOR_GREEN_SHELL: + phi_t3 = texture_green_shell[index]; + break; + case ACTOR_RED_SHELL: + phi_t3 = texture_red_shell[index]; + break; + case ACTOR_BLUE_SPINY_SHELL: + phi_t3 = gTextureBlueshell[index]; + break; } - temp_t8 = (u16) shell->rotVelocity / 4369; // Give a number between 0-15 - phi_t3 += sp58[temp_t8]; // Select sprite matrix[3][0] = shell->pos[0]; matrix[3][1] = (shell->pos[1] - shell->boundingBoxSize) + 1.0f; @@ -765,7 +780,7 @@ void render_actor_shell(Camera* camera, Mat4 matrix, struct ShellActor* shell) { G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - if (temp_t8 < 8) { // Reverse shell ? + if (reverseShell) { // Reverse shell ? gSPDisplayList(gDisplayListHead++, D_0D005338); } else { gSPDisplayList(gDisplayListHead++, D_0D005368); @@ -1219,32 +1234,17 @@ void spawn_course_actors(void) { */ void init_actors_and_load_textures(void) { set_segment_base_addr_x64(3, (void*) gNextFreeMemoryAddress); - D_802BA050 = dma_textures(gTextureGreenShell0, 0x00000257U, 0x00000400U); - dma_textures(gTextureGreenShell1, 0x00000242U, 0x00000400U); - dma_textures(gTextureGreenShell2, 0x00000259U, 0x00000400U); - dma_textures(gTextureGreenShell3, 0x00000256U, 0x00000400U); - dma_textures(gTextureGreenShell4, 0x00000246U, 0x00000400U); - dma_textures(gTextureGreenShell5, 0x0000025EU, 0x00000400U); - dma_textures(gTextureGreenShell6, 0x0000025CU, 0x00000400U); - dma_textures(gTextureGreenShell7, 0x00000254U, 0x00000400U); - D_802BA054 = dma_textures(gTextureBlueShell0, 0x0000022AU, 0x00000400U); - dma_textures(gTextureBlueShell1, 0x00000237U, 0x00000400U); - dma_textures(gTextureBlueShell2, 0x0000023EU, 0x00000400U); - dma_textures(gTextureBlueShell3, 0x00000243U, 0x00000400U); - dma_textures(gTextureBlueShell4, 0x00000255U, 0x00000400U); - dma_textures(gTextureBlueShell5, 0x00000259U, 0x00000400U); - dma_textures(gTextureBlueShell6, 0x00000239U, 0x00000400U); - dma_textures(gTextureBlueShell7, 0x00000236U, 0x00000400U); - dma_textures(gTextureFinishLineBanner1, 0x0000028EU, 0x00000800U); - dma_textures(gTextureFinishLineBanner2, 0x000002FBU, 0x00000800U); - dma_textures(gTextureFinishLineBanner3, 0x00000302U, 0x00000800U); - dma_textures(gTextureFinishLineBanner4, 0x000003B4U, 0x00000800U); - dma_textures(gTextureFinishLineBanner5, 0x0000031EU, 0x00000800U); - dma_textures(gTextureFinishLineBanner6, 0x0000036EU, 0x00000800U); - dma_textures(gTextureFinishLineBanner7, 0x0000029CU, 0x00000800U); - dma_textures(gTextureFinishLineBanner8, 0x0000025BU, 0x00000800U); - dma_textures(gTexture671A88, 0x00000400U, 0x00000800U); - dma_textures(gTexture6774D8, 0x00000400U, 0x00000800U); + allocate_memory(0x400 * 16); + dma_textures(gTextureFinishLineBanner1, 0x0000028EU, 0x00000800U); // 0x03004000 + dma_textures(gTextureFinishLineBanner2, 0x000002FBU, 0x00000800U); // 0x03004800 + dma_textures(gTextureFinishLineBanner3, 0x00000302U, 0x00000800U); // 0x03005000 + dma_textures(gTextureFinishLineBanner4, 0x000003B4U, 0x00000800U); // 0x03005800 + dma_textures(gTextureFinishLineBanner5, 0x0000031EU, 0x00000800U); // 0x03006000 + dma_textures(gTextureFinishLineBanner6, 0x0000036EU, 0x00000800U); // 0x03006800 + dma_textures(gTextureFinishLineBanner7, 0x0000029CU, 0x00000800U); // 0x03007000 + dma_textures(gTextureFinishLineBanner8, 0x0000025BU, 0x00000800U); // 0x03007800 + dma_textures(gTexture671A88, 0x00000400U, 0x00000800U); // 0x03008000 + dma_textures(gTexture6774D8, 0x00000400U, 0x00000800U); // 0x03008800 CM_LoadTextures(); diff --git a/src/racing/collision.c b/src/racing/collision.c index a394f0080..e76ff4f61 100644 --- a/src/racing/collision.c +++ b/src/racing/collision.c @@ -435,6 +435,11 @@ s8 get_surface_type(u16 index) { } s16 get_track_section_id(u16 index) { + if (index >= gCollisionMeshCount) { + // printf("[collision.c] [get_track_section_id] Warning: Trying to access a collision triangle index %d\n + // Which is overflows gCollisionMesh, as its total size is %d\n", index, gCollisionMeshCount); + return 0xFF; + } CollisionTriangle* triangle = &gCollisionMesh[index]; return triangle->flags & 0xFF; } diff --git a/src/racing/math_util.c b/src/racing/math_util.c index 55c953a1f..69d5c0cbc 100644 --- a/src/racing/math_util.c +++ b/src/racing/math_util.c @@ -252,7 +252,7 @@ void func_802B5564(Mat4 arg0, u16* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, } } - if (arg1 != 0) { + if (arg1 != NULL) { if ((arg4 + arg5) <= 2.0) { *arg1 = 0xFFFF; } else { diff --git a/src/racing/memory.c b/src/racing/memory.c index a3c3bf6b3..002492f41 100644 --- a/src/racing/memory.c +++ b/src/racing/memory.c @@ -19,7 +19,7 @@ #include "courses/all_course_offsets.h" #include "defines.h" -#include +#include "course_offsets.h" #include "engine/courses/Course.h" @@ -30,7 +30,7 @@ s32 sGfxSeekPosition; s32 sPackedSeekPosition; -static u8 sMemoryPool[0xFFFFF]; // Stock memory pool size: 0xAB630 +static u8 sMemoryPool[0xFFFFFFF]; // Stock memory pool size: 0xAB630 uintptr_t sPoolEnd = sMemoryPool + sizeof(sMemoryPool); uintptr_t sPoolFreeSpace; @@ -154,6 +154,73 @@ Gfx* segmented_gfx_to_virtual(const void* addr) { return (Gfx*) ((gSegmentTable[segment] + offset)); } +static uintptr_t get_texture2(size_t offset, const course_texture* textures) { + if (!(offset & 0x5000000)) { + return NULL; + } + size_t totalOffset = 0x5000000; + + while (textures->addr) { + if (totalOffset == offset) { + return (uintptr_t) (textures->addr); + } + totalOffset += textures->data_size; + textures++; + } + + printf("memory.c: get_texture()\n TEXTURE NOT FOUND DURING DISPLAYLIST EXTRACT\n"); + printf(" offset: 0x%X\n", offset); + return NULL; +} + +// Finds texture calls and replaces hard-coded addresses with direct pointers to the o2r texture. +void replace_segmented_textures_with_o2r_textures(Gfx* gfx, const course_texture* textures) { + char* name = NULL; + if (GameEngine_OTRSigCheck((char*) gfx)) { + name = (char*) gfx; + gfx = (Gfx*) LOAD_ASSET_RAW(gfx); + } + Gfx* iterator = gfx; + int i = 0; + u8 opcode; + while ((opcode = (iterator->words.w0 >> 24)) != (u8) G_ENDDL) { + if (opcode == G_DL) { + uintptr_t addr = iterator->words.w1; + if (!(addr & 0x400000000)) { // avoid segment address + replace_segmented_textures_with_o2r_textures((Gfx*) addr, textures); + } + } else if (opcode == G_DL_OTR_FILEPATH) { + char* fileName = (char*) iterator->words.w1; + Gfx* gfx2 = (Gfx*) ResourceGetDataByName((const char*) fileName); + if (((iterator->words.w0 >> (16)) & ((1U << 1) - 1)) == 0 && gfx2 != NULL) { + replace_segmented_textures_with_o2r_textures(gfx2, textures); + } + } else if (opcode == G_DL_OTR_HASH) { + if (((iterator->words.w0 >> (16)) & ((1U << 1) - 1)) == 0) { + iterator++; + Gfx* gfx2 = (Gfx*) ResourceGetDataByCrc(((uint64_t) iterator->words.w0 << 32) + iterator->words.w1); + if (gfx2 != NULL) { + replace_segmented_textures_with_o2r_textures(gfx2, textures); + } + } + } else if (opcode == G_SETTIMG) { + // If this is a texture command, we need to fix the texture segment pointer + uintptr_t tex = iterator->words.w1 & (~1); + uintptr_t addr = get_texture2(tex, textures); + if (addr != NULL) { + iterator->words.w1 = addr; + } + } + + if (opcode == G_MARKER || opcode == G_MTX_OTR || opcode == G_VTX_OTR_FILEPATH || opcode == G_VTX_OTR_HASH) { + iterator++; + } + // Move to the next command in the display list + iterator++; + i++; + } +} + void move_segment_table_to_dmem(void) { s32 i; @@ -489,7 +556,6 @@ u8* dma_textures(const char* texture, size_t arg1, size_t arg2) { #ifdef TARGET_N64 temp_v0 = (u8*) gNextFreeMemoryAddress; #else - u8* tex = (u8*) LOAD_ASSET(texture); temp_v0 = (u8*) allocate_memory(arg2); #endif @@ -504,7 +570,7 @@ u8* dma_textures(const char* texture, size_t arg1, size_t arg2) { mio0decode((u8*) temp_a0, temp_v0); gNextFreeMemoryAddress += arg2; #else - memcpy(temp_v0, tex, arg2); + strncpy(temp_v0, texture, arg2); // strcpy(temp_v0, texture); #endif return temp_v0; diff --git a/src/racing/memory.h b/src/racing/memory.h index 8f4fbe2b5..557d9f02f 100644 --- a/src/racing/memory.h +++ b/src/racing/memory.h @@ -2,6 +2,7 @@ #define MEMORY_H #include "common_structs.h" +#include "course_offsets.h" struct MainPoolBlock { struct MainPoolBlock* prev; @@ -52,6 +53,7 @@ void* segment_vtx_to_virtual(size_t offset); void* segmented_texture_to_virtual(uintptr_t addr); void* segmented_uintptr_t_to_virtual(uintptr_t); Gfx* segmented_gfx_to_virtual(const void*); +void replace_segmented_textures_with_o2r_textures(Gfx* gfx, const course_texture* textures); void move_segment_table_to_dmem(void); void initialize_memory_pool(void); void* decompress_segments(u8*, u8*); @@ -74,7 +76,7 @@ void func_802A81EC(void); struct AllocOnlyPool* alloc_only_pool_init(uintptr_t, uintptr_t); uintptr_t func_802A82AC(s32); uintptr_t func_802A8348(s32, s32, s32); -u8* dma_textures(const char*, size_t, size_t); +u8* dma_textures(const char* texture, size_t arg1, size_t arg2); uintptr_t MIO0_0F(u8*, uintptr_t, uintptr_t); void func_802A8844(void); void unpack_lights(Gfx*, u8*, s8); diff --git a/src/racing/skybox_and_splitscreen.c b/src/racing/skybox_and_splitscreen.c index eecac8375..aa65f1e75 100644 --- a/src/racing/skybox_and_splitscreen.c +++ b/src/racing/skybox_and_splitscreen.c @@ -2,6 +2,7 @@ #include #include #include +#include #include "skybox_and_splitscreen.h" #include "code_800029B0.h" @@ -382,6 +383,7 @@ void func_802A450C(Vtx* skybox) { skybox[3].v.cn[1] = prop->TopLeft.g; skybox[3].v.cn[2] = prop->TopLeft.b; + // Floor skybox[4].v.cn[0] = prop->FloorTopRight.r; skybox[4].v.cn[1] = prop->FloorTopRight.g; skybox[4].v.cn[2] = prop->FloorTopRight.b; @@ -422,18 +424,15 @@ void func_802A487C(Vtx* arg0, UNUSED struct UnkStruct_800DC5EC* arg1, UNUSED s32 } void func_802A4A0C(Vtx* vtx, struct UnkStruct_800DC5EC* arg1, UNUSED s32 arg2, UNUSED s32 arg3, UNUSED f32* arg4) { - //! @todo Confirm if this crash still happens and fix if so - s32 id = arg1 - D_8015F480; - arg1->camera = &cameras[id]; // bad fix of bowser castle crash where camera get an invalid value Camera* camera = arg1->camera; s16 temp_t5; f32 temp_f0; UNUSED s32 pad[2]; UNUSED u16 pad2; u16 sp128; - Mat4 matrix1; - Mat4 matrix2; - Mat4 matrix3; + Mat4 matrix1 = { 0 }; + Mat4 matrix2 = { 0 }; + Mat4 matrix3 = { 0 }; Vec3f sp5C; f32 sp58; @@ -443,6 +442,7 @@ void func_802A4A0C(Vtx* vtx, struct UnkStruct_800DC5EC* arg1, UNUSED s32 arg2, U vtx[1].v.ob[0] = OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH); vtx[2].v.ob[0] = OTRGetRectDimensionFromLeftEdge(0); vtx[3].v.ob[0] = OTRGetRectDimensionFromLeftEdge(0); + vtx[4].v.ob[0] = OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH); vtx[5].v.ob[0] = OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH); vtx[6].v.ob[0] = OTRGetRectDimensionFromLeftEdge(0); @@ -468,7 +468,7 @@ void func_802A4A0C(Vtx* vtx, struct UnkStruct_800DC5EC* arg1, UNUSED s32 arg2, U sp5C[0] *= 160.0f; sp5C[1] *= 120.0f; - temp_t5 = 120 - (s16) sp5C[1]; + temp_t5 = 120 - (s32) sp5C[1]; arg1->cameraHeight = temp_t5; vtx[1].v.ob[1] = temp_t5; vtx[2].v.ob[1] = temp_t5; diff --git a/src/render_objects.c b/src/render_objects.c index a11bb847f..0aa5513ba 100644 --- a/src/render_objects.c +++ b/src/render_objects.c @@ -936,7 +936,11 @@ void func_800484BC(Vec3f arg0, Vec3su arg1, f32 arg2, s32 arg3, u8* tlut, u8* te rsp_set_matrix_transformation(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007E18); set_transparency(arg3); - draw_rectangle_texture_overlap(tlut, texture, arg6, arg7, arg8, arg9, argA); + gDPLoadTLUT_pal256(gDisplayListHead++, tlut); + rsp_load_texture(texture, arg9, arg8); + gSPVertex(gDisplayListHead++, arg6, 4, 0); + gSPDisplayList(gDisplayListHead++, common_rectangle_display); + gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } void func_80048540(Vec3f arg0, Vec3su arg1, f32 arg2, s32 arg3, u8* tlut, u8* texture, Vtx* arg6, s32 arg7, s32 arg8, @@ -2068,16 +2072,16 @@ void render_texture_tile_rgba32_block(s16 x, s16 y, u8* texture, u32 width, u32 gDPLoadTextureTile(gDisplayListHead++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, height, 0, 0, width - 1, height - 1, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPWideTextureRectangle(gDisplayListHead++, currX * 4, currY * 4, ((x + width) << 2), ((y + height) << 2), - G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); + gSPWideTextureRectangle(gDisplayListHead++, currX * 4, currY * 4, ((x + (width / 2)) << 2), + ((y + (height / 2)) << 2), G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); gSPDisplayList(gDisplayListHead++, D_0D007EB8); } void render_game_logo(s16 x, s16 y) { - render_texture_tile_rgba32_block(x, y, LOAD_ASSET(gTextureLogoMarioKart64), - ResourceGetTexWidthByName(gTextureLogoMarioKart64), - ResourceGetTexHeightByName(gTextureLogoMarioKart64)); + int32_t height = 128; + int32_t width = ResourceGetTexWidthByName(logo_mario_kart_64) * height / ResourceGetTexHeightByName(logo_mario_kart_64); + render_texture_tile_rgba32_block(x, y, logo_mario_kart_64, width, height); } UNUSED void func_8004C91C(s32 arg0, s32 arg1, u8* texture, s32 arg3, s32 arg4, s32 arg5) { @@ -2253,42 +2257,34 @@ void func_8004D210(s32 arg0, s32 arg1, u8* texture, s32 arg3, s32 arg4, s32 arg5 } } -void func_8004D37C(s32 arg0, s32 arg1, u8* texture, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 width, s32 arg8, - UNUSED s32 arg9, s32 height) { +void func_8004D37C(s32 x, s32 y, u8* texture, s32 red, s32 green, s32 blue, s32 alpha, s32 width, s32 height, + UNUSED s32 width2, s32 height2) { s32 var_s3; u8* img; s32 i; - var_s3 = arg1 - (arg8 / 2); img = texture; gSPDisplayList(gDisplayListHead++, D_0D007FE0); - func_8004B414(arg3, arg4, arg5, arg6); + func_8004B414(red, green, blue, alpha); - for (i = 0; i < arg8 / height; i++) { - func_80044F34(img, width, height); - func_8004B97C_wide(arg0 - (width / 2), var_s3, width, height, 1); - img += (width * height) / 2; - var_s3 += height; - } + func_80044F34(img, width, height); + func_8004B97C_wide(x - (width / 2), y - (height / 2), width, height, 1); } -void func_8004D4E8(s32 arg0, s32 arg1, u8* texture, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 width, s32 arg8, - UNUSED s32 arg9, s32 height) { +void func_8004D4E8(s32 arg0, s32 arg1, u8* texture, s32 red, s32 green, s32 blue, s32 alpha, s32 width, s32 height, + UNUSED s32 width2, s32 height2) { s32 var_s3; u8* img; s32 i; - var_s3 = arg1 - (arg8 / 2); + var_s3 = arg1 - (height / 2); img = texture; gSPDisplayList(gDisplayListHead++, D_0D007FE0); - func_8004B414(arg3, arg4, arg5, arg6); - - for (i = 0; i < arg8 / height; i++) { - func_800450C8(img, width, height); - func_8004BA08(arg0 - (width / 2), var_s3, width, height, 1); - img += (width * height) / 2; - var_s3 += height; - } + func_8004B414(red, green, blue, alpha); + func_800450C8(img, width, height2); + func_8004BA08(arg0 - (width / 2), var_s3, width, height2, 1); + img += (width * height2) / 2; + var_s3 += height2; } void func_8004D654(s32 arg0, s32 arg1, u8* texture, f32 arg3, s32 arg4, s32 arg5, s32 arg6, UNUSED s32 arg7, s32 width, @@ -2766,17 +2762,22 @@ void set_minimap_finishline_position(s32 playerId) { draw_hud_2d_texture_8x8(var_f2, var_f0, (u8*) common_texture_minimap_finish_line); } +char* common_texture_minimap_progress[] = { + common_texture_minimap_mario, common_texture_minimap_luigi, common_texture_minimap_yoshi, + common_texture_minimap_toad, common_texture_minimap_dk, common_texture_minimap_wario, + common_texture_minimap_peach, common_texture_minimap_bowser, +}; + #ifdef NON_MATCHING // https://decomp.me/scratch/FxA1w /** * characterId of 8 appears to be a type of null check or control flow alteration. */ -#define EXPLICIT_AND 1 -void func_8004F168(s32 arg0, s32 playerId, s32 characterId) { +void draw_minimap_character(s32 arg0, s32 playerId, s32 characterId) { f32 thing0; f32 thing1; - s16 temp_a0; - s16 temp_a1; + s16 x; + s16 y; s32 center = 0; Player* player = &gPlayerOne[playerId]; @@ -2794,36 +2795,24 @@ void func_8004F168(s32 arg0, s32 playerId, s32 characterId) { center = CM_GetProps()->Minimap.Pos[arg0].X; } - temp_a0 = (center - (CM_GetProps()->Minimap.Width / 2)) + CM_GetProps()->Minimap.PlayerX + (s16) (thing0); - temp_a1 = (CM_GetProps()->Minimap.Pos[arg0].Y - (CM_GetProps()->Minimap.Height / 2)) + + x = (center - (CM_GetProps()->Minimap.Width / 2)) + CM_GetProps()->Minimap.PlayerX + (s16) (thing0); + y = (CM_GetProps()->Minimap.Pos[arg0].Y - (CM_GetProps()->Minimap.Height / 2)) + CM_GetProps()->Minimap.PlayerY + (s16) (thing1); if (characterId != 8) { if ((gGPCurrentRaceRankByPlayerId[playerId] == 0) && (gModeSelection != 3) && (gModeSelection != 1)) { -#if EXPLICIT_AND == 1 - func_80046424(temp_a0, temp_a1, (player->rotation[1] + 0x8000) & 0xFFFF, 1.0f, + func_80046424(x, y, player->rotation[1] + 0x8000, 1.0f, (u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8); -#else - func_80046424(temp_a0, temp_a1, player->rotation[1] + 0x8000, 1.0f, - (u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, - 8, 8, 8, 8); -#endif } else { -#if EXPLICIT_AND == 1 - func_800463B0(temp_a0, temp_a1, (player->rotation[1] + 0x8000) & 0xFFFF, 1.0f, + func_800463B0(x, y, player->rotation[1] + 0x8000, 1.0f, (u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8); -#else - func_800463B0(temp_a0, temp_a1, player->rotation[1] + 0x8000, 1.0f, - (u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, - 8, 8, 8, 8); -#endif } } else { if (gGPCurrentRaceRankByPlayerId[playerId] == 0) { - func_8004C450(temp_a0, temp_a1, 8, 8, (u8*) common_texture_minimap_progress_dot); + func_8004C450(x, y, 8, 8, (u8*) common_texture_minimap_progress[player->characterId]); } else { - draw_hud_2d_texture_wide(temp_a0, temp_a1, 8, 8, (u8*) common_texture_minimap_progress_dot); + draw_hud_2d_texture_wide(x, y, 8, 8, (u8*) common_texture_minimap_progress[player->characterId]); } } } @@ -2832,9 +2821,8 @@ void func_8004F168(s32 arg0, s32 playerId, s32 characterId) { FrameInterpolation_ShouldInterpolateFrame(true); } -#undef EXPLICIT_AND #else -GLOBAL_ASM("asm/non_matchings/render_objects/func_8004F168.s") +GLOBAL_ASM("asm/non_matchings/render_objects/draw_minimap_character.s") #endif // WTF is up with the gPlayerOne access in this function? @@ -2848,34 +2836,34 @@ void func_8004F3E4(s32 arg0) { for (idx = D_8018D158 - 1; idx >= 0; idx--) { playerId = gGPCurrentRacePlayerIdByRank[idx]; if ((gPlayerOne + playerId)->type & PLAYER_CPU) { - func_8004F168(arg0, playerId, 8); + draw_minimap_character(arg0, playerId, 8); } } for (idx = D_8018D158 - 1; idx >= 0; idx--) { playerId = gGPCurrentRacePlayerIdByRank[idx]; if (((gPlayerOne + playerId)->type & PLAYER_CPU) != PLAYER_CPU) { - func_8004F168(arg0, playerId, (gPlayerOne + playerId)->characterId); + draw_minimap_character(arg0, playerId, (gPlayerOne + playerId)->characterId); } } break; case TIME_TRIALS: for (idx = 0; idx < 8; idx++) { if (((gPlayerOne + idx)->type & PLAYER_INVISIBLE_OR_BOMB) == PLAYER_INVISIBLE_OR_BOMB) { - func_8004F168(arg0, idx, 8); + draw_minimap_character(arg0, idx, 8); } } - func_8004F168(arg0, 0, gPlayerOne->characterId); + draw_minimap_character(arg0, 0, gPlayerOne->characterId); break; case VERSUS: for (idx = gPlayerCountSelection1 - 1; idx >= 0; idx--) { playerId = gGPCurrentRacePlayerIdByRank[idx]; - func_8004F168(arg0, playerId, (gPlayerOne + playerId)->characterId); + draw_minimap_character(arg0, playerId, (gPlayerOne + playerId)->characterId); } break; case BATTLE: for (idx = 0; idx < gPlayerCountSelection1; idx++) { if (!((gPlayerOne + idx)->type & PLAYER_UNKNOWN_0x40)) { - func_8004F168(arg0, idx, (gPlayerOne + idx)->characterId); + draw_minimap_character(arg0, idx, (gPlayerOne + idx)->characterId); } } break; @@ -3472,7 +3460,7 @@ struct ObjectInterpData prevObject[OBJECT_LIST_SIZE] = { 0 }; void func_800518F8(s32 objectIndex, s16 x, s16 y) { // Search all recorded objects for the one we're drawing - for (int i = 0; i < OBJECT_LIST_SIZE; i++) { + for (size_t i = 0; i < OBJECT_LIST_SIZE; i++) { if (objectIndex == prevObject[i].objectIndex) { // Coincidence! // Skip drawing the object this frame if it warped to the other side of the screen diff --git a/src/render_objects.h b/src/render_objects.h index e914de5d9..9ad238eef 100644 --- a/src/render_objects.h +++ b/src/render_objects.h @@ -297,7 +297,7 @@ void func_8004EE54(s32); void func_8004EF9C(s32); void set_minimap_finishline_position(s32); -void func_8004F168(s32, s32, s32); +void draw_minimap_character(s32, s32, s32); void func_8004F3E4(s32); s32 func_8004F674(s32*, s32); void print_timer(s32, s32, s32); diff --git a/src/render_player.c b/src/render_player.c index ab4637c93..18f695616 100644 --- a/src/render_player.c +++ b/src/render_player.c @@ -33,6 +33,7 @@ #include "port/Game.h" #include "engine/Matrix.h" #include "port/interpolation/FrameInterpolation.h" +#include "port/Engine.h" s8 gRenderingFramebufferByPlayer[] = { 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02 }; @@ -47,7 +48,7 @@ Player* gPlayersToRenderPlayer[8]; s16 gMatrixEffectCount; s32 D_80164AF4[3]; struct_D_802F1F80* gPlayerPalette; -static const char* sKartUpperTexture; +static const char* sKartTexture; u16 gPlayerRedEffect[8]; u16 gPlayerGreenEffect[8]; u16 gPlayerBlueEffect[8]; @@ -584,7 +585,7 @@ void render_players_on_screen_one(void) { s32 junk[] = { 0, 0, 0 }; -Vtx* D_800DDBB4[] = { D_800E49C0, D_800E4AC0, D_800E4BC0, D_800E4CC0, D_800E4DC0, D_800E4EC0, D_800E4FD0, D_800E50D0 }; +Vtx* gPlayerVtx[] = { gPlayerOneVtx, gPlayerTwoVtx, gPlayerThreeVtx, gPlayerFourVtx, gPlayerFiveVtx, gPlayerSixVtx, gPlayerSevenVtx, gPlayerEightVtx }; f32 gCharacterSize[] = { MARIO_SIZE, LUIGI_SIZE, YOSHI_SIZE, TOAD_SIZE, DK_SIZE, WARIO_SIZE, PEACH_SIZE, BOWSER_SIZE }; @@ -1197,24 +1198,24 @@ void func_80022BC4(Player* player, UNUSED s8 arg1) { player->unk_DB4.unk2 = temp_v0; } -void func_80022CA8(Player* player, s8 playerId, UNUSED s8 screenId, s8 arg3) { +void func_80022CA8(Player* player, s8 playerId, UNUSED s8 screenId, s8 flipOffset) { s16 temp_v0 = player->unk_DA4; - D_800DDBB4[playerId][arg3 + 0x0].v.ob[1] = 18 - (temp_v0 * 2.3); - D_800DDBB4[playerId][arg3 + 0x1].v.ob[1] = 9 - temp_v0; - D_800DDBB4[playerId][arg3 + 0x2].v.ob[1] = 9 - temp_v0; - D_800DDBB4[playerId][arg3 + 0x3].v.ob[1] = 18 - (temp_v0 * 2.3); - D_800DDBB4[playerId][arg3 + 0x4].v.ob[1] = 9 - temp_v0; - D_800DDBB4[playerId][arg3 + 0x7].v.ob[1] = 9 - temp_v0; + gPlayerVtx[playerId][flipOffset + 0x0].v.ob[1] = 18 - (temp_v0 * 2.3); + gPlayerVtx[playerId][flipOffset + 0x1].v.ob[1] = 9 - temp_v0; + gPlayerVtx[playerId][flipOffset + 0x2].v.ob[1] = 9 - temp_v0; + gPlayerVtx[playerId][flipOffset + 0x3].v.ob[1] = 18 - (temp_v0 * 2.3); + gPlayerVtx[playerId][flipOffset + 0x4].v.ob[1] = 9 - temp_v0; + gPlayerVtx[playerId][flipOffset + 0x7].v.ob[1] = 9 - temp_v0; } /** * Seems to stretch/warp a specific players texture for a * short period of time. Perhaps does not do anything **/ -void func_80022D60(UNUSED Player* player, s8 playerId, UNUSED s8 screenId, s8 arg3) { - D_800DDBB4[playerId][arg3].v.ob[1] = 21; - D_800DDBB4[playerId][arg3 + 0x3].v.ob[1] = 21; +void func_80022D60(UNUSED Player* player, s8 playerId, UNUSED s8 screenId, s8 flipOffset) { + gPlayerVtx[playerId][flipOffset].v.ob[1] = 21; + gPlayerVtx[playerId][flipOffset + 0x3].v.ob[1] = 21; } void func_80022DB4(Player* player, UNUSED s8 arg1) { @@ -1241,15 +1242,15 @@ void func_80022DB4(Player* player, UNUSED s8 arg1) { player->unk_DB4.unk18 = temp_v0; } -void func_80022E84(Player* player, s8 playerId, UNUSED s8 screenId, s8 arg3) { +void func_80022E84(Player* player, s8 playerId, UNUSED s8 screenId, s8 flipOffset) { s16 temp_v0 = player->unk_DB4.unk1E; - D_800DDBB4[playerId][arg3 + 0x0].v.ob[1] = 18 - temp_v0; - D_800DDBB4[playerId][arg3 + 0x1].v.ob[1] = 9 - temp_v0; - D_800DDBB4[playerId][arg3 + 0x2].v.ob[1] = 9 - temp_v0; - D_800DDBB4[playerId][arg3 + 0x3].v.ob[1] = 18 - temp_v0; - D_800DDBB4[playerId][arg3 + 0x4].v.ob[1] = 9 - temp_v0; - D_800DDBB4[playerId][arg3 + 0x7].v.ob[1] = 9 - temp_v0; + gPlayerVtx[playerId][flipOffset + 0x0].v.ob[1] = 18 - temp_v0; + gPlayerVtx[playerId][flipOffset + 0x1].v.ob[1] = 9 - temp_v0; + gPlayerVtx[playerId][flipOffset + 0x2].v.ob[1] = 9 - temp_v0; + gPlayerVtx[playerId][flipOffset + 0x3].v.ob[1] = 18 - temp_v0; + gPlayerVtx[playerId][flipOffset + 0x4].v.ob[1] = 9 - temp_v0; + gPlayerVtx[playerId][flipOffset + 0x7].v.ob[1] = 9 - temp_v0; } /** @@ -1404,7 +1405,7 @@ void func_800235AC(Player* player, s8 arg1) { return; } if ((player->effects & STAR_EFFECT) != 0) { - temp = (s32) gCourseTimer - D_8018D930[arg1]; + temp = (s32) gCourseTimer - gPlayerStarEffectStartTime[arg1]; if (temp <= 8) { if (temp >= 7) { @@ -1460,6 +1461,13 @@ void func_80023BF0(Player* player, s8 playerId, s8 screenId, s8 arg3) { } } +Vtx gKartShadowVertices[] = { + { { { 9, 0, 9 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -9 }, 0, { 4032, 4032 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -9 }, 0, { 0, 4032 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, 9 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, +}; + void render_player_shadow(Player* player, s8 playerId, s8 screenId) { Mat4 mtx; UNUSED Mat4 pad; @@ -1522,19 +1530,12 @@ void render_player_shadow(Player* player, s8 playerId, s8 screenId) { gSPDisplayList(gDisplayListHead++, D_0D008D58); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D474, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, - G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - func_8004B414(0, 0, 0, 0xFF); - gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); - gSPVertex(gDisplayListHead++, &D_800E51D0[0], 4, 0); - - gSPDisplayList(gDisplayListHead++, common_square_plain_render); - gDPLoadTextureBlock(gDisplayListHead++, (D_8018D474 + SOME_TEXTURE_POINTER_MATH), G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, - 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, + gDPLoadTextureBlock(gDisplayListHead++, gTextureKartShadow, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B414(0, 0, 0, 0xFF); gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); - gSPVertex(gDisplayListHead++, &D_800E5210[0], 4, 0); + gSPVertex(gDisplayListHead++, gKartShadowVertices, 4, 0); gSPDisplayList(gDisplayListHead++, common_square_plain_render); gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); @@ -1581,38 +1582,18 @@ void render_player_shadow_credits(Player* player, s8 playerId, s8 arg2) { gSPDisplayList(gDisplayListHead++, D_0D008D58); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); - gDPLoadTextureBlock(gDisplayListHead++, D_8018D474, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, - G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - func_8004B414(0, 0, 0, 0x000000D0); - gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); - gSPVertex(gDisplayListHead++, &D_800E51D0[0], 4, 0); - - gSPDisplayList(gDisplayListHead++, common_square_plain_render); - gDPLoadTextureBlock(gDisplayListHead++, (D_8018D474 + SOME_TEXTURE_POINTER_MATH), G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, - 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, + gDPLoadTextureBlock(gDisplayListHead++, gTextureKartShadow, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B414(0, 0, 0, 0x000000D0); gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); - gSPVertex(gDisplayListHead++, &D_800E5210[0], 4, 0); + gSPVertex(gDisplayListHead++, gKartShadowVertices, 4, 0); gSPDisplayList(gDisplayListHead++, common_square_plain_render); gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } -Vtx player_vtx[] = { - { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 4032, 4032 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 0, 4032 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, -}; -Vtx player_vtx_flip[] = { - { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { 9, 0, -6 }, 0, { 0, 4032 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, - { { { -9, 0, -6 }, 0, { 4032, 4032 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, -}; - -void render_kart(Player* player, s8 playerId, s8 screenId, s8 arg3) { +void render_kart(Player* player, s8 playerId, s8 screenId, s8 flipOffset) { UNUSED s32 pad; Mat4 mtx; UNUSED s32 pad2[17]; @@ -1665,18 +1646,9 @@ void render_kart(Player* player, s8 playerId, s8 screenId, s8 arg3) { #endif if ((screenId == 0) || (screenId == 1)) { load_kart_texture(player, playerId, screenId, screenId, 0); - sKartUpperTexture = gEncodedKartTexture[D_801651D0[screenId][playerId]][screenId][playerId].unk_00; -#ifdef TARGET_N64 - sKartLowerTexture = - &D_802BFB80.arraySize8[D_801651D0[screenId][playerId]][screenId][playerId].pixel_index_array[0x7C0]; -#endif + sKartTexture = gEncodedKartTexture[D_801651D0[screenId][playerId]][screenId][playerId].unk_00; } else { - load_kart_texture(player, playerId - 4, screenId - 1, screenId - 1, 0); - sKartUpperTexture = gEncodedKartTexture[D_801651D0[screenId][playerId]][screenId - 1][playerId - 4].unk_00; -#ifdef TARGET_N64 - sKartLowerTexture = - &D_802BFB80.arraySize8[D_801651D0[screenId][playerId]][screenId - 1][playerId - 4].pixel_index_array[0x7C0]; -#endif + sKartTexture = gEncodedKartTexture[D_801651D0[screenId][playerId]][screenId - 1][playerId - 4].unk_00; } mtxf_translate_rotate(mtx, sp154, sp14C); mtxf_scale(mtx, gCharacterSize[player->characterId] * player->size); @@ -1740,16 +1712,13 @@ void render_kart(Player* player, s8 playerId, s8 screenId, s8 arg3) { gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2); } - // Render heads - gDPLoadTextureBlock(gDisplayListHead++, sKartUpperTexture, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 64, 0, + // Render kart + gDPLoadTextureBlock(gDisplayListHead++, sKartTexture, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - if (arg3 == 0) { - gSPVertex(gDisplayListHead++, player_vtx, 4, 0); - } else { - gSPVertex(gDisplayListHead++, player_vtx_flip, 4, 0); - } - gSP2Triangles(gDisplayListHead++, 0, 1, 2, 0, 1, 3, 2, 0); + gSPVertex(gDisplayListHead++, &gPlayerVtx[playerId][flipOffset], 8, 0); + gSP2Triangles(gDisplayListHead++, 0, 1, 2, 0, 0, 2, 3, 0); + gSP2Triangles(gDisplayListHead++, 4, 5, 6, 4, 4, 6, 7, 4); gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE); @@ -1757,7 +1726,7 @@ void render_kart(Player* player, s8 playerId, s8 screenId, s8 arg3) { FrameInterpolation_RecordCloseChild(); } -void render_ghost(Player* player, s8 playerId, s8 screenId, s8 arg3) { +void render_ghost(Player* player, s8 playerId, s8 screenId, s8 flipOffset) { UNUSED s32 pad; Mat4 mtx; UNUSED s32 pad2[17]; @@ -1791,13 +1760,9 @@ void render_ghost(Player* player, s8 playerId, s8 screenId, s8 arg3) { (struct_D_802F1F80*) &gPlayerPalettesList[D_801651D0[screenId][playerId]][screenId][playerId * 0x100]; #endif if ((screenId == 0) || (screenId == 1)) { - sKartUpperTexture = gEncodedKartTexture[D_801651D0[screenId][playerId]][screenId][playerId].unk_00; - // sKartLowerTexture = - // &D_802BFB80.arraySize8[D_801651D0[screenId][playerId]][screenId][playerId].pixel_index_array[0x7C0]; + sKartTexture = gEncodedKartTexture[D_801651D0[screenId][playerId]][screenId][playerId].unk_00; } else { - sKartUpperTexture = gEncodedKartTexture[D_801651D0[screenId][playerId]][screenId - 1][playerId - 4].unk_00; - // sKartLowerTexture = &D_802BFB80.arraySize8[D_801651D0[screenId][playerId]][screenId - 1][playerId - - // 4].pixel_index_array[0x7C0]; + sKartTexture = gEncodedKartTexture[D_801651D0[screenId][playerId]][screenId - 1][playerId - 4].unk_00; } mtxf_translate_rotate(mtx, spDC, spD4); @@ -1818,23 +1783,17 @@ void render_ghost(Player* player, s8 playerId, s8 screenId, s8 arg3) { GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_WRAP | ZMODE_XLU | CVG_X_ALPHA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); - gDPLoadTextureBlock(gDisplayListHead++, sKartUpperTexture, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, sKartTexture, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPVertex(gDisplayListHead++, &D_800DDBB4[playerId][arg3], 4, 0); - gSPDisplayList(gDisplayListHead++, common_square_plain_render); - - u8* test = (u8*) LOAD_ASSET(sKartUpperTexture); - gDPLoadTextureBlock(gDisplayListHead++, test + 0x7C0, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, - G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD); - gSPVertex(gDisplayListHead++, &D_800DDBB4[playerId][arg3 + 4], 4, 0); - gSPDisplayList(gDisplayListHead++, common_square_plain_render); + gSPVertex(gDisplayListHead++, &gPlayerVtx[playerId][flipOffset], 8, 0); + gSP2Triangles(gDisplayListHead++, 0, 1, 2, 0, 0, 2, 3, 0); + gSP2Triangles(gDisplayListHead++, 4, 5, 6, 4, 4, 6, 7, 4); gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE); } -void func_80025DE8(Player* player, s8 playerId, s8 screenId, s8 arg3) { +void func_80025DE8(Player* player, s8 playerId, s8 screenId, s8 flipOffset) { Mat4 mtx; Vec3f sp9C; Vec3s sp94; @@ -1866,25 +1825,19 @@ void func_80025DE8(Player* player, s8 playerId, s8 screenId, s8 arg3) { GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_WRAP | ZMODE_XLU | CVG_X_ALPHA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); - gDPLoadTextureBlock(gDisplayListHead++, sKartUpperTexture, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, sKartTexture, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPVertex(gDisplayListHead++, &D_800DDBB4[playerId][arg3], 4, 0); - gSPDisplayList(gDisplayListHead++, common_square_plain_render); - - u8* test = (u8*) LOAD_ASSET(sKartUpperTexture); - gDPLoadTextureBlock(gDisplayListHead++, test + 0x7C0, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, - G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD); - gSPVertex(gDisplayListHead++, &D_800DDBB4[playerId][arg3 + 4], 4, 0); - gSPDisplayList(gDisplayListHead++, common_square_plain_render); + gSPVertex(gDisplayListHead++, &gPlayerVtx[playerId][flipOffset], 8, 0); + gSP2Triangles(gDisplayListHead++, 0, 1, 2, 0, 0, 2, 3, 0); + gSP2Triangles(gDisplayListHead++, 4, 5, 6, 4, 4, 6, 7, 4); gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); gMatrixEffectCount += 1; FrameInterpolation_RecordCloseChild(); } -void render_player_ice_reflection(Player* player, s8 playerId, s8 screenId, s8 arg3) { +void render_player_ice_reflection(Player* player, s8 playerId, s8 screenId, s8 flipOffset) { Mat4 mtx; Vec3f sp9C; Vec3s sp94; @@ -1896,9 +1849,9 @@ void render_player_ice_reflection(Player* player, s8 playerId, s8 screenId, s8 a sp9C[1] = player->unk_074 + (4.0f * player->size); sp9C[2] = player->pos[2]; if (!(player->unk_002 & (4 << (screenId * 4)))) { - arg3 = 8; + flipOffset = 8; } else { - arg3 = 0; + flipOffset = 0; } // @port: Tag the transform. @@ -1917,18 +1870,12 @@ void render_player_ice_reflection(Player* player, s8 playerId, s8 screenId, s8 a gPlayerCyanEffect[playerId], gPlayerMagentaEffect[playerId], gPlayerYellowEffect[playerId], (s16) player->unk_0C6 / 2); gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2); - gDPLoadTextureBlock(gDisplayListHead++, sKartUpperTexture, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, + gDPLoadTextureBlock(gDisplayListHead++, sKartTexture, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPVertex(gDisplayListHead++, &D_800DDBB4[playerId][arg3], 4, 0); - gSPDisplayList(gDisplayListHead++, common_square_plain_render); - - u8* test = (u8*) LOAD_ASSET(sKartUpperTexture); - gDPLoadTextureBlock(gDisplayListHead++, test + 0x7C0, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, - G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD); - gSPVertex(gDisplayListHead++, &D_800DDBB4[playerId][arg3 + 4], 4, 0); - gSPDisplayList(gDisplayListHead++, common_square_plain_render); + gSPVertex(gDisplayListHead++, &gPlayerVtx[playerId][flipOffset], 8, 0); + gSP2Triangles(gDisplayListHead++, 0, 1, 2, 0, 0, 2, 3, 0); + gSP2Triangles(gDisplayListHead++, 4, 5, 6, 4, 4, 6, 7, 4); gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); gMatrixEffectCount += 1; @@ -1974,7 +1921,9 @@ void render_player(Player* player, s8 playerId, s8 screenId) { func_80025DE8(player, playerId, screenId, var_v1); } // Allows wheels to spin - gSPInvalidateTexCache(gDisplayListHead++, sKartUpperTexture); + if (GameEngine_ResourceGetTexTypeByName(sKartTexture) == 6 || GameEngine_ResourceGetTexTypeByName(sKartTexture) == 5) { // only invalidate texture cache if it's a palette texture + gSPInvalidateTexCache(gDisplayListHead++, sKartTexture); + } } void func_80026A48(Player* player, s8 arg1) { diff --git a/src/render_player.h b/src/render_player.h index 3f9d06406..3d3d7204c 100644 --- a/src/render_player.h +++ b/src/render_player.h @@ -82,11 +82,11 @@ extern u16 gPlayerMagentaEffect[]; extern u16 gPlayerYellowEffect[]; extern s32 D_80164B80[]; -extern s32 D_8018D930[]; +extern s32 gPlayerStarEffectStartTime[]; extern s32 gPlayersToRenderCount; extern void* D_800DDB5C[]; -extern Vtx* D_800DDBB4[]; +extern Vtx* gPlayerVtx[]; extern f32 gCharacterSize[]; extern s32 D_800DDE74[]; extern Vtx D_800E51D0[]; @@ -96,14 +96,14 @@ extern f64 D_800ED688; extern f32 D_800ED6A8; // There are actually found in data_0DD0A0_2_0.s -extern Vtx D_800E49C0[]; -extern Vtx D_800E4AC0[]; -extern Vtx D_800E4BC0[]; -extern Vtx D_800E4CC0[]; -extern Vtx D_800E4DC0[]; -extern Vtx D_800E4EC0[]; -extern Vtx D_800E4FD0[]; -extern Vtx D_800E50D0[]; +extern Vtx gPlayerOneVtx[]; +extern Vtx gPlayerTwoVtx[]; +extern Vtx gPlayerThreeVtx[]; +extern Vtx gPlayerFourVtx[]; +extern Vtx gPlayerFiveVtx[]; +extern Vtx gPlayerSixVtx[]; +extern Vtx gPlayerSevenVtx[]; +extern Vtx gPlayerEightVtx[]; extern u32 gKartMarioWheels0[]; extern u32 gKartMarioWheels1[]; diff --git a/src/save.c b/src/save.c index a73bd8f2f..ddb88aeb0 100644 --- a/src/save.c +++ b/src/save.c @@ -1015,7 +1015,8 @@ s32 func_800B6A68(void) { } void func_8800B6AF8(void) { - if (check_for_controller_pak(CONTROLLER_1) && osPfsInit(&gSIEventMesgQueue, &gControllerPak1FileHandle, 0) == 0 && + if (check_for_controller_pak(CONTROLLER_1) && + osPfsInit(&gSIEventMesgQueue, &gControllerPak1FileHandle, CONTROLLER_1) == 0 && osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, (u8*) gGameName, (u8*) gExtCode, &gControllerPak1FileNote) && osPfsNumFiles(&gControllerPak1FileHandle, &gControllerPak1NumFilesUsed, &gControllerPak1MaxWriteableFiles) == diff --git a/src/spawn_players.c b/src/spawn_players.c index 63bd8782a..83532896c 100644 --- a/src/spawn_players.c +++ b/src/spawn_players.c @@ -213,10 +213,10 @@ void spawn_player(Player* player, s8 playerIndex, f32 startingRow, f32 startingC player->unk_0E2 = 0; player->unk_10C = 0; player->unk_200 = 0; - player->unk_204 = 0; + player->driftDuration = 0; player->nearestPathPointId = 0; player->unk_228 = 0; - player->unk_22A = 0; + player->driftState = 0; player->unk_234 = 0; player->unk_236 = 0; player->unk_238 = 0; @@ -376,10 +376,10 @@ void spawn_player(Player* player, s8 playerIndex, f32 startingRow, f32 startingC D_8018CE10[playerIndex].unk_04[0] = 0.0f; D_8018CE10[playerIndex].unk_04[2] = 0.0f; func_80295BF8(playerIndex); - func_8005D6C0(player); - func_8006B87C(player, playerIndex); + reset_player_particle_pool(player); + clear_all_player_balloons(player, playerIndex); if (gModeSelection == BATTLE) { - func_8006B7E4(player, playerIndex); + init_all_player_balloons(player, playerIndex); } calculate_orientation_matrix(player->unk_150, player->unk_058, player->unk_05C, player->unk_060, player->rotation[1]); diff --git a/src/staff_ghosts.c b/src/staff_ghosts.c index 804ac6306..16620e0d1 100644 --- a/src/staff_ghosts.c +++ b/src/staff_ghosts.c @@ -81,7 +81,7 @@ void func_80004EF0(void) { } // Manual memcpy required for byte swap - for (int i = 0; i < size; i += 4) { + for (size_t i = 0; i < size; i += 4) { dest[i] = ghost[i + 3]; dest[i + 1] = ghost[i + 2]; dest[i + 2] = ghost[i + 1]; @@ -123,6 +123,7 @@ void set_staff_ghost(void) { CM_SetStaffGhost(); } +// Always returns true because mio0encode is stubbed. s32 func_800051C4(void) { s32 phi_v0; diff --git a/src/stubs.c b/src/stubs.c index b197ec6e3..029448860 100644 --- a/src/stubs.c +++ b/src/stubs.c @@ -124,7 +124,7 @@ s32 osPfsFreeBlocks(OSPfs* pfs, s32* bytes_not_used) { s32 osPfsFindFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name, s32* file_no) { char filename[1024]; sprintf(filename, "channel_%d_%hu_%hd_%s.sav", pfs->channel, company_code, game_code, game_name); - for (int i = 0; i < 16; i++) { + for (size_t i = 0; i < 16; i++) { if (openFile[i].state.game_code == game_code && openFile[i].state.company_code == company_code && strcmp(openFile[i].state.game_name, game_name) == 0 && strcmp(openFile[i].state.ext_name, ext_name) == 0) { *file_no = i; @@ -141,4 +141,4 @@ s32 osPfsFindFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8 strcpy(openFile[*file_no].state.game_name, game_name); strcpy(openFile[*file_no].state.ext_name, ext_name); return PFS_NO_ERROR; -} \ No newline at end of file +} diff --git a/src/textures.h b/src/textures.h index 64a9774a6..cba41f6d0 100644 --- a/src/textures.h +++ b/src/textures.h @@ -17,8 +17,8 @@ typedef struct { /* 0x04 */ u64* textureData; // This should be interpreted as a segmented address /* 0x08 */ u16 width; /* 0x0A */ u16 height; - /* 0x0C */ u16 dX; - /* 0x0E */ u16 dY; + /* 0x0C */ s16 dX; + /* 0x0E */ s16 dY; /* 0x10 */ u16 size; // This size is NOT equal to width*height. Its likely the size of the compressed texture } MenuTexture; // size = 0x14 @@ -257,51 +257,51 @@ extern MkAnimation D_020020DC[2]; extern MkAnimation D_020020EC[2]; extern MkAnimation D_020020FC[2]; extern MkAnimation D_0200210C[2]; -extern MenuTexture D_0200211C[2]; -extern MenuTexture D_02002144[2]; -extern MenuTexture D_0200216C[2]; -extern MenuTexture D_02002194[2]; -extern MenuTexture D_020021BC[2]; -extern MenuTexture D_020021E4[2]; -extern MenuTexture D_0200220C[2]; -extern MenuTexture D_02002234[2]; -extern MenuTexture D_0200225C[2]; -extern MenuTexture D_02002284[2]; -extern MenuTexture D_020022AC[2]; -extern MenuTexture D_020022D4[2]; -extern MenuTexture D_020022FC[2]; -extern MenuTexture D_02002324[2]; -extern MenuTexture D_0200234C[2]; -extern MenuTexture D_02002374[2]; -extern MenuTexture D_0200239C[2]; -extern MenuTexture D_020023C4[2]; -extern MenuTexture D_020023EC[2]; -extern MenuTexture D_02002414[2]; -extern MenuTexture D_0200243C[2]; -extern MenuTexture D_02002464[2]; -extern MenuTexture D_0200248C[2]; -extern MenuTexture D_020024B4[2]; -extern MenuTexture D_020024DC[2]; -extern MenuTexture D_02002504[2]; -extern MenuTexture D_0200252C[2]; -extern MenuTexture D_02002554[2]; -extern MenuTexture D_0200257C[2]; -extern MenuTexture D_020025A4[2]; -extern MenuTexture D_020025CC[2]; -extern MenuTexture D_020025F4[2]; -extern MenuTexture D_0200261C[2]; -extern MenuTexture D_02002644[2]; -extern MenuTexture D_0200266C[2]; -extern MenuTexture D_02002694[2]; -extern MenuTexture D_020026BC[2]; -extern MenuTexture D_020026E4[2]; -extern MenuTexture D_0200270C[2]; -extern MenuTexture D_02002734[2]; -extern MenuTexture D_0200275C[2]; -extern MenuTexture D_02002784[2]; -extern MenuTexture D_020027AC[2]; -extern MenuTexture D_020027D4[2]; -extern MenuTexture D_020027FC[2]; +extern MenuTexture seg2_textureFontLetterA[2]; +extern MenuTexture seg2_textureFontLetterB[2]; +extern MenuTexture seg2_textureFontLetterC[2]; +extern MenuTexture seg2_textureFontLetterD[2]; +extern MenuTexture seg2_textureFontLetterE[2]; +extern MenuTexture seg2_textureFontLetterF[2]; +extern MenuTexture seg2_textureFontLetterG[2]; +extern MenuTexture seg2_textureFontLetterH[2]; +extern MenuTexture seg2_textureFontLetterI[2]; +extern MenuTexture seg2_textureFontLetterJ[2]; +extern MenuTexture seg2_textureFontLetterK[2]; +extern MenuTexture seg2_textureFontLetterL[2]; +extern MenuTexture seg2_textureFontLetterM[2]; +extern MenuTexture seg2_textureFontLetterN[2]; +extern MenuTexture seg2_textureFontLetterO[2]; +extern MenuTexture seg2_textureFontLetterP[2]; +extern MenuTexture seg2_textureFontLetterQ[2]; +extern MenuTexture seg2_textureFontLetterR[2]; +extern MenuTexture seg2_textureFontLetterS[2]; +extern MenuTexture seg2_textureFontLetterT[2]; +extern MenuTexture seg2_textureFontLetterU[2]; +extern MenuTexture seg2_textureFontLetterV[2]; +extern MenuTexture seg2_textureFontLetterW[2]; +extern MenuTexture seg2_textureFontLetterX[2]; +extern MenuTexture seg2_textureFontLetterY[2]; +extern MenuTexture seg2_textureFontLetterZ[2]; +extern MenuTexture gTextureFontExclamationMark[2]; +extern MenuTexture gTextureFontMinus[2]; +extern MenuTexture gTextureFontInterogationMark[2]; +extern MenuTexture gTextureFontSimpleQuote[2]; +extern MenuTexture gTextureFontDoubleQuote[2]; +extern MenuTexture gTextureFontPlus[2]; +extern MenuTexture gTextureFontDot[2]; +extern MenuTexture gTextureFontFourDote[2]; +extern MenuTexture gTextureFontCC[2]; +extern MenuTexture gTextureFontNumberZero[2]; +extern MenuTexture gTextureFontNumberOne[2]; +extern MenuTexture gTextureFontNumberTwo[2]; +extern MenuTexture gTextureFontNumberThree[2]; +extern MenuTexture gTextureFontNumberFour[2]; +extern MenuTexture gTextureFontNumberFive[2]; +extern MenuTexture gTextureFontNumberSix[2]; +extern MenuTexture gTextureFontNumberSeven[2]; +extern MenuTexture gTextureFontNumberEight[2]; +extern MenuTexture gTextureFontNumberNine[2]; extern MenuTexture D_02002824[2]; extern MenuTexture D_0200284C[2]; extern MenuTexture D_02002874[2]; @@ -488,9 +488,9 @@ extern MenuTexture D_02004494[2]; extern MenuTexture D_020044BC[2]; extern MenuTexture D_020044E4[2]; extern MenuTexture D_0200450C[2]; -extern MenuTexture D_02004534[2]; +extern MenuTexture gTextureFontComma[2]; extern MenuTexture D_0200455C[2]; -extern MenuTexture D_02004584[1]; +extern MenuTexture gTextureFontEmpty[1]; extern MenuTexture seg2_blue_sky_background_texture[2]; extern MenuTexture seg2_sunset_background_texture[2]; extern MenuTexture seg2_copyright_1996_texture[2]; @@ -506,8 +506,8 @@ extern MenuTexture D_02004804[2]; extern MenuTexture D_0200482C[2]; extern MenuTexture D_02004854[2]; extern MenuTexture D_0200487C[2]; -extern MenuTexture D_020048A4[2]; -extern MenuTexture D_020048CC[2]; +extern MenuTexture seg2_textureMenuLOption[2]; +extern MenuTexture seg2_textureMenuRData[2]; extern MenuTexture seg2_50_CC_texture[2]; extern MenuTexture seg2_100_CC_texture[2]; extern MenuTexture seg2_150_CC_texture[2]; diff --git a/src/update_objects.c b/src/update_objects.c index 3c2c232ee..6164fe1d0 100644 --- a/src/update_objects.c +++ b/src/update_objects.c @@ -168,26 +168,18 @@ s32 add_unused_obj_index(s32* listIdx, s32* nextFree, s32 size) { } count = 0; id = &listIdx[*nextFree]; - /** - * @todo This HAS to be a for-loop of some variety, but I can't make a for-loop to match. - * If you replace this with ```for(var_v1 = 0; var_v1 < size; var_v1++)``` - * The diff gets massive. - */ - if (size > 0) { - loop_3: + + for (count = 0; count < size; count++) { if (*id == NULL_OBJECT_ID) { objectIndex = find_unused_obj_index(id); *nextFree += 1; + break; } else { *nextFree += 1; if (*nextFree >= size) { *nextFree = 0; } - count += 1; id = &listIdx[*nextFree]; - if (count != size) { // check if don't check all element of the list - goto loop_3; - } } } if (count == size) { @@ -2656,6 +2648,7 @@ void consume_item(s32 playerId) { } typedef struct { + u8 none; // ITEM_NONE u8 banana; // ITEM_BANANA u8 bananaBunch; // ITEM_BANANA_BUNCH u8 greenShell; // ITEM_GREEN_SHELL @@ -2675,7 +2668,8 @@ typedef struct { // Each row corresponds to a rank, each column to an item ItemProbabilities grandPrixHumanProbabilityTable[] = { - { .banana = 30, + { .none = 0, + .banana = 30, .bananaBunch = 5, .greenShell = 30, .tripleGreenShell = 5, @@ -2690,7 +2684,8 @@ ItemProbabilities grandPrixHumanProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 5, .greenShell = 5, .tripleGreenShell = 10, @@ -2705,7 +2700,8 @@ ItemProbabilities grandPrixHumanProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 15, .superMushroom = 5 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 0, .greenShell = 0, .tripleGreenShell = 10, @@ -2720,7 +2716,8 @@ ItemProbabilities grandPrixHumanProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 20, .superMushroom = 10 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 0, .greenShell = 0, .tripleGreenShell = 0, @@ -2735,7 +2732,8 @@ ItemProbabilities grandPrixHumanProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 20, .superMushroom = 10 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 0, .greenShell = 0, .tripleGreenShell = 0, @@ -2750,7 +2748,8 @@ ItemProbabilities grandPrixHumanProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 25, .superMushroom = 10 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 0, .greenShell = 0, .tripleGreenShell = 0, @@ -2765,7 +2764,8 @@ ItemProbabilities grandPrixHumanProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 25, .superMushroom = 10 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 0, .greenShell = 0, .tripleGreenShell = 0, @@ -2780,7 +2780,8 @@ ItemProbabilities grandPrixHumanProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 10, .superMushroom = 10 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 0, .greenShell = 0, .tripleGreenShell = 0, @@ -2798,7 +2799,8 @@ ItemProbabilities grandPrixHumanProbabilityTable[] = { }; ItemProbabilities grandPrixCPUProbabilityTable[] = { - { .banana = 60, + { .none = 0, + .banana = 60, .bananaBunch = 0, .greenShell = 25, .tripleGreenShell = 0, @@ -2813,7 +2815,8 @@ ItemProbabilities grandPrixCPUProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 50, + { .none = 0, + .banana = 50, .bananaBunch = 0, .greenShell = 25, .tripleGreenShell = 5, @@ -2828,7 +2831,8 @@ ItemProbabilities grandPrixCPUProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 40, + { .none = 0, + .banana = 40, .bananaBunch = 0, .greenShell = 25, .tripleGreenShell = 10, @@ -2843,7 +2847,8 @@ ItemProbabilities grandPrixCPUProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 35, + { .none = 0, + .banana = 35, .bananaBunch = 0, .greenShell = 25, .tripleGreenShell = 15, @@ -2858,7 +2863,8 @@ ItemProbabilities grandPrixCPUProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 30, + { .none = 0, + .banana = 30, .bananaBunch = 0, .greenShell = 20, .tripleGreenShell = 20, @@ -2873,7 +2879,8 @@ ItemProbabilities grandPrixCPUProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 30, + { .none = 0, + .banana = 30, .bananaBunch = 0, .greenShell = 20, .tripleGreenShell = 20, @@ -2888,7 +2895,8 @@ ItemProbabilities grandPrixCPUProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 30, + { .none = 0, + .banana = 30, .bananaBunch = 0, .greenShell = 20, .tripleGreenShell = 20, @@ -2903,7 +2911,8 @@ ItemProbabilities grandPrixCPUProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 25, + { .none = 0, + .banana = 25, .bananaBunch = 0, .greenShell = 20, .tripleGreenShell = 20, @@ -2921,7 +2930,8 @@ ItemProbabilities grandPrixCPUProbabilityTable[] = { }; ItemProbabilities grandPrixHardCPUProbabilityTable[] = { - { .banana = 30, + { .none = 5, + .banana = 25, .bananaBunch = 5, .greenShell = 30, .tripleGreenShell = 5, @@ -2936,7 +2946,8 @@ ItemProbabilities grandPrixHardCPUProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 5, + { .none = 0, + .banana = 5, .bananaBunch = 5, .greenShell = 5, .tripleGreenShell = 10, @@ -2951,12 +2962,13 @@ ItemProbabilities grandPrixHardCPUProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 15, .superMushroom = 5 }, - { .banana = 3, + { .none = 3, + .banana = 3, .bananaBunch = 2, .greenShell = 0, .tripleGreenShell = 10, .redShell = 20, - .tripleRedShell = 20, + .tripleRedShell = 19, .blueSpinyShell = 0, .thunderbolt = 0, .fakeItemBox = 0, @@ -2964,9 +2976,10 @@ ItemProbabilities grandPrixHardCPUProbabilityTable[] = { .boo = 0, .mushroom = 5, .doubleMushroom = 0, - .tripleMushroom = 20, - .superMushroom = 10 }, - { .banana = 5, + .tripleMushroom = 19, + .superMushroom = 9 }, + { .none = 0, + .banana = 5, .bananaBunch = 0, .greenShell = 5, .tripleGreenShell = 5, @@ -2981,7 +2994,8 @@ ItemProbabilities grandPrixHardCPUProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 20, .superMushroom = 10 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 0, .greenShell = 0, .tripleGreenShell = 0, @@ -2996,7 +3010,8 @@ ItemProbabilities grandPrixHardCPUProbabilityTable[] = { .doubleMushroom = 5, .tripleMushroom = 25, .superMushroom = 10 }, - { .banana = 0, + { .none = 5, + .banana = 0, .bananaBunch = 0, .greenShell = 0, .tripleGreenShell = 0, @@ -3008,10 +3023,11 @@ ItemProbabilities grandPrixHardCPUProbabilityTable[] = { .star = 20, .boo = 0, .mushroom = 5, - .doubleMushroom = 5, + .doubleMushroom = 0, .tripleMushroom = 25, .superMushroom = 10 }, - { .banana = 0, + { .none = 5, + .banana = 0, .bananaBunch = 0, .greenShell = 5, .tripleGreenShell = 0, @@ -3023,10 +3039,11 @@ ItemProbabilities grandPrixHardCPUProbabilityTable[] = { .star = 30, .boo = 0, .mushroom = 5, - .doubleMushroom = 5, + .doubleMushroom = 0, .tripleMushroom = 10, .superMushroom = 10 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 0, .greenShell = 0, .tripleGreenShell = 5, @@ -3044,7 +3061,8 @@ ItemProbabilities grandPrixHardCPUProbabilityTable[] = { }; ItemProbabilities versus2PlayerProbabilityTable[] = { - { .banana = 25, + { .none = 0, + .banana = 25, .bananaBunch = 10, .greenShell = 30, .tripleGreenShell = 5, @@ -3059,7 +3077,8 @@ ItemProbabilities versus2PlayerProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 5, .greenShell = 0, .tripleGreenShell = 5, @@ -3077,7 +3096,8 @@ ItemProbabilities versus2PlayerProbabilityTable[] = { }; ItemProbabilities versus3PlayerProbabilityTable[] = { - { .banana = 35, + { .none = 0, + .banana = 35, .bananaBunch = 5, .greenShell = 30, .tripleGreenShell = 0, @@ -3092,7 +3112,8 @@ ItemProbabilities versus3PlayerProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 5, + { .none = 0, + .banana = 5, .bananaBunch = 5, .greenShell = 0, .tripleGreenShell = 10, @@ -3107,7 +3128,8 @@ ItemProbabilities versus3PlayerProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 20, .superMushroom = 5 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 0, .greenShell = 0, .tripleGreenShell = 0, @@ -3125,7 +3147,8 @@ ItemProbabilities versus3PlayerProbabilityTable[] = { }; ItemProbabilities versus4PlayerProbabilityTable[] = { - { .banana = 35, + { .none = 0, + .banana = 35, .bananaBunch = 5, .greenShell = 30, .tripleGreenShell = 0, @@ -3140,7 +3163,8 @@ ItemProbabilities versus4PlayerProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 0, .superMushroom = 0 }, - { .banana = 5, + { .none = 0, + .banana = 5, .bananaBunch = 5, .greenShell = 5, .tripleGreenShell = 10, @@ -3155,7 +3179,8 @@ ItemProbabilities versus4PlayerProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 25, .superMushroom = 0 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 5, .greenShell = 0, .tripleGreenShell = 5, @@ -3170,7 +3195,8 @@ ItemProbabilities versus4PlayerProbabilityTable[] = { .doubleMushroom = 0, .tripleMushroom = 25, .superMushroom = 5 }, - { .banana = 0, + { .none = 0, + .banana = 0, .bananaBunch = 0, .greenShell = 0, .tripleGreenShell = 0, @@ -3187,7 +3213,8 @@ ItemProbabilities versus4PlayerProbabilityTable[] = { .superMushroom = 10 }, }; -ItemProbabilities battleProbabilityCurve[] = { { .banana = 10, +ItemProbabilities battleProbabilityCurve[] = { { .none = 0, + .banana = 10, .bananaBunch = 5, .greenShell = 5, .tripleGreenShell = 20, @@ -3204,21 +3231,22 @@ ItemProbabilities battleProbabilityCurve[] = { { .banana = 10, .superMushroom = 0 } }; void getProbabilityArray(const ItemProbabilities* probStruct, u8* probArray) { - probArray[0] = probStruct->banana; - probArray[1] = probStruct->bananaBunch; - probArray[2] = probStruct->greenShell; - probArray[3] = probStruct->tripleGreenShell; - probArray[4] = probStruct->redShell; - probArray[5] = probStruct->tripleRedShell; - probArray[6] = probStruct->blueSpinyShell; - probArray[7] = probStruct->thunderbolt; - probArray[8] = probStruct->fakeItemBox; - probArray[9] = probStruct->star; - probArray[10] = probStruct->boo; - probArray[11] = probStruct->mushroom; - probArray[12] = probStruct->doubleMushroom; - probArray[13] = probStruct->tripleMushroom; - probArray[14] = probStruct->superMushroom; + probArray[ITEM_NONE] = probStruct->none; + probArray[ITEM_BANANA] = probStruct->banana; + probArray[ITEM_BANANA_BUNCH] = probStruct->bananaBunch; + probArray[ITEM_GREEN_SHELL] = probStruct->greenShell; + probArray[ITEM_TRIPLE_GREEN_SHELL] = probStruct->tripleGreenShell; + probArray[ITEM_RED_SHELL] = probStruct->redShell; + probArray[ITEM_TRIPLE_RED_SHELL] = probStruct->tripleRedShell; + probArray[ITEM_BLUE_SPINY_SHELL] = probStruct->blueSpinyShell; + probArray[ITEM_THUNDERBOLT] = probStruct->thunderbolt; + probArray[ITEM_FAKE_ITEM_BOX] = probStruct->fakeItemBox; + probArray[ITEM_STAR] = probStruct->star; + probArray[ITEM_BOO] = probStruct->boo; + probArray[ITEM_MUSHROOM] = probStruct->mushroom; + probArray[ITEM_DOUBLE_MUSHROOM] = probStruct->doubleMushroom; + probArray[ITEM_TRIPLE_MUSHROOM] = probStruct->tripleMushroom; + probArray[ITEM_SUPER_MUSHROOM] = probStruct->superMushroom; } // Output a warning if a probability table does not add up to 100 @@ -3298,17 +3326,16 @@ u8 gen_random_item(s16 rank, s16 option) { break; } - u8 itemProbabilities[ITEM_MAX - 1]; + u8 itemProbabilities[ITEM_MAX]; getProbabilityArray(distributionTable, itemProbabilities); - for (int i = 0; i < ITEM_MAX - 1; i++) { + for (size_t i = 0; i < ITEM_MAX; i++) { cumulativeProbability += itemProbabilities[i]; if (rand < cumulativeProbability) { - randomItem = i + 1; // + 1 to account for the ITEM_NONE spot + randomItem = i; break; } } - return randomItem; } diff --git a/valgrind_callgrind.sh b/valgrind_callgrind.sh new file mode 100755 index 000000000..cd0345d73 --- /dev/null +++ b/valgrind_callgrind.sh @@ -0,0 +1,2 @@ +timeout 2m valgrind --tool=callgrind --callgrind-out-file=spaghetti.out ./build/Spaghettify +callgrind_annotate spaghetti.out > spaghetti_bench.out \ No newline at end of file diff --git a/yamls/us/banshee_boardwalk_data.yml b/yamls/us/banshee_boardwalk_data.yml index ee3ad7579..d7c15de03 100644 --- a/yamls/us/banshee_boardwalk_data.yml +++ b/yamls/us/banshee_boardwalk_data.yml @@ -550,6 +550,7 @@ gTextureBat1: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_banshee_boardwalk_bat_tlut gTextureBat2: symbol: gTextureBat2 type: texture @@ -558,6 +559,7 @@ gTextureBat2: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_banshee_boardwalk_bat_tlut gTextureBat3: symbol: gTextureBat3 type: texture @@ -566,6 +568,7 @@ gTextureBat3: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_banshee_boardwalk_bat_tlut gTextureBat4: symbol: gTextureBat4 type: texture @@ -574,6 +577,7 @@ gTextureBat4: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_banshee_boardwalk_bat_tlut d_course_banshee_boardwalk_texture: symbol: d_course_banshee_boardwalk_texture type: texture diff --git a/yamls/us/boo_frames.yml b/yamls/us/boo_frames.yml index 2c563b000..522659d86 100644 --- a/yamls/us/boo_frames.yml +++ b/yamls/us/boo_frames.yml @@ -19,7 +19,7 @@ gTextureBoo01: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo02: symbol: gTextureBoo02 @@ -27,7 +27,7 @@ gTextureBoo02: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo03: symbol: gTextureBoo03 @@ -35,7 +35,7 @@ gTextureBoo03: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo04: symbol: gTextureBoo04 @@ -43,7 +43,7 @@ gTextureBoo04: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo05: symbol: gTextureBoo05 @@ -51,7 +51,7 @@ gTextureBoo05: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo06: symbol: gTextureBoo06 @@ -59,7 +59,7 @@ gTextureBoo06: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo07: symbol: gTextureBoo07 @@ -67,7 +67,7 @@ gTextureBoo07: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo08: symbol: gTextureBoo08 @@ -75,7 +75,7 @@ gTextureBoo08: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo09: symbol: gTextureBoo09 @@ -83,7 +83,7 @@ gTextureBoo09: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo10: symbol: gTextureBoo10 @@ -91,7 +91,7 @@ gTextureBoo10: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo11: symbol: gTextureBoo11 @@ -99,7 +99,7 @@ gTextureBoo11: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo12: symbol: gTextureBoo12 @@ -107,7 +107,7 @@ gTextureBoo12: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo13: symbol: gTextureBoo13 @@ -115,7 +115,7 @@ gTextureBoo13: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo14: symbol: gTextureBoo14 @@ -123,7 +123,7 @@ gTextureBoo14: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo15: symbol: gTextureBoo15 @@ -131,7 +131,7 @@ gTextureBoo15: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo16: symbol: gTextureBoo16 @@ -139,7 +139,7 @@ gTextureBoo16: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo17: symbol: gTextureBoo17 @@ -147,7 +147,7 @@ gTextureBoo17: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo18: symbol: gTextureBoo18 @@ -155,7 +155,7 @@ gTextureBoo18: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo19: symbol: gTextureBoo19 @@ -163,7 +163,7 @@ gTextureBoo19: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo20: symbol: gTextureBoo20 @@ -171,7 +171,7 @@ gTextureBoo20: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo21: symbol: gTextureBoo21 @@ -179,7 +179,7 @@ gTextureBoo21: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo22: symbol: gTextureBoo22 @@ -187,7 +187,7 @@ gTextureBoo22: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo23: symbol: gTextureBoo23 @@ -195,7 +195,7 @@ gTextureBoo23: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo24: symbol: gTextureBoo24 @@ -203,7 +203,7 @@ gTextureBoo24: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo25: symbol: gTextureBoo25 @@ -211,7 +211,7 @@ gTextureBoo25: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo26: symbol: gTextureBoo26 @@ -219,7 +219,7 @@ gTextureBoo26: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo27: symbol: gTextureBoo27 @@ -227,7 +227,7 @@ gTextureBoo27: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo28: symbol: gTextureBoo28 @@ -235,7 +235,7 @@ gTextureBoo28: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo29: symbol: gTextureBoo29 @@ -243,5 +243,5 @@ gTextureBoo29: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 \ No newline at end of file diff --git a/yamls/us/bowsers_castle_data.yml b/yamls/us/bowsers_castle_data.yml index f4b77099d..8559d5cb5 100644 --- a/yamls/us/bowsers_castle_data.yml +++ b/yamls/us/bowsers_castle_data.yml @@ -480,6 +480,7 @@ gTextureThwompFace1: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut gTextureThwompFace2: symbol: gTextureThwompFace2 type: texture @@ -488,6 +489,7 @@ gTextureThwompFace2: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut gTextureThwompFace3: symbol: gTextureThwompFace3 type: texture @@ -496,6 +498,7 @@ gTextureThwompFace3: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut gTextureThwompFace4: symbol: gTextureThwompFace4 type: texture @@ -504,6 +507,7 @@ gTextureThwompFace4: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut gTextureThwompFace5: symbol: gTextureThwompFace5 type: texture @@ -512,6 +516,7 @@ gTextureThwompFace5: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut gTextureThwompFace6: symbol: gTextureThwompFace6 type: texture @@ -520,6 +525,7 @@ gTextureThwompFace6: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut d_course_bowsers_castle_thwomp_model1: symbol: d_course_bowsers_castle_thwomp_model1 type: vtx diff --git a/yamls/us/common_data.yml b/yamls/us/common_data.yml index 8a773c16e..60ad277cd 100644 --- a/yamls/us/common_data.yml +++ b/yamls/us/common_data.yml @@ -3,14 +3,14 @@ - [0x0D, 0x132B50] header: code: - - '#include ' - - '#include ' - - '#include ' + - "#include " + - "#include " + - "#include " header: - - '#include ' - - '#include ' - - '#include ' - - '#include ' + - "#include " + - "#include " + - "#include " + - "#include " tables: common_texture_hud_place: range: [0xD258, 0x14258] @@ -56,8 +56,8 @@ common_texture_particle_fire: ctype: u16 offset: 0x200 size: 0x1000 - width: 16 - height: 16 + width: 32 + height: 64 format: RGBA16 D_0D001200: symbol: D_0D001200 @@ -573,8 +573,8 @@ common_tlut_debug_font: size: 0x20 type: texture ctype: u16 - colors: 32 - height: 32 + colors: 4 + height: 4 format: tlut common_texture_debug_font: symbol: common_texture_debug_font @@ -2253,3 +2253,67 @@ common_texture_minimap_progress_dot: height: 8 type: texture format: rgba16 +common_texture_minimap_mario: + symbol: common_texture_minimap_mario + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_luigi: + symbol: common_texture_minimap_luigi + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_yoshi: + symbol: common_texture_minimap_yoshi + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_toad: + symbol: common_texture_minimap_toad + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_dk: + symbol: common_texture_minimap_dk + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_wario: + symbol: common_texture_minimap_wario + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_peach: + symbol: common_texture_minimap_peach + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_bowser: + symbol: common_texture_minimap_bowser + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 diff --git a/yamls/us/frappe_snowland_data.yml b/yamls/us/frappe_snowland_data.yml index 4e53e2b1a..aee8f92b1 100644 --- a/yamls/us/frappe_snowland_data.yml +++ b/yamls/us/frappe_snowland_data.yml @@ -308,6 +308,7 @@ d_course_frappe_snowland_snowman_head: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_frappe_snowland_snowman_tlut d_course_frappe_snowland_snowman_body: symbol: d_course_frappe_snowland_snowman_body type: texture @@ -316,6 +317,7 @@ d_course_frappe_snowland_snowman_body: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_frappe_snowland_snowman_tlut d_course_frappe_snowland_snow_tlut: symbol: d_course_frappe_snowland_snow_tlut type: texture @@ -332,6 +334,7 @@ d_course_frappe_snowland_snow: height: 32 format: ci8 ctype: u8 + tlut_symbol: d_course_frappe_snowland_snow_tlut d_course_frappe_snowland_tree_tlut: symbol: d_course_frappe_snowland_tree_tlut type: texture diff --git a/yamls/us/koopa_troopa_beach_data.yml b/yamls/us/koopa_troopa_beach_data.yml index abe4c6a6d..ecdef9a46 100644 --- a/yamls/us/koopa_troopa_beach_data.yml +++ b/yamls/us/koopa_troopa_beach_data.yml @@ -1242,6 +1242,7 @@ gTextureCrab1: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab2: symbol: gTextureCrab2 type: texture @@ -1250,6 +1251,7 @@ gTextureCrab2: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab3: symbol: gTextureCrab3 type: texture @@ -1258,6 +1260,7 @@ gTextureCrab3: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab4: symbol: gTextureCrab4 type: texture @@ -1266,6 +1269,7 @@ gTextureCrab4: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab5: symbol: gTextureCrab5 type: texture @@ -1274,6 +1278,7 @@ gTextureCrab5: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab6: symbol: gTextureCrab6 type: texture @@ -1282,6 +1287,7 @@ gTextureCrab6: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab7: symbol: gTextureCrab7 type: texture @@ -1290,6 +1296,7 @@ gTextureCrab7: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut d_course_koopa_troopa_beach_light1: symbol: d_course_koopa_troopa_beach_light1 type: lights diff --git a/yamls/us/luigi_raceway_data.yml b/yamls/us/luigi_raceway_data.yml index c0a16c494..db678bba4 100644 --- a/yamls/us/luigi_raceway_data.yml +++ b/yamls/us/luigi_raceway_data.yml @@ -620,7 +620,7 @@ d_course_luigi_raceway_track_waypoints: offset: 0xA6D0 count: 632 type: mk64:TRACK_PATH - d_course_luigi_raceway_basket_model_lod2: +d_course_luigi_raceway_basket_model_lod2: symbol: d_course_luigi_raceway_basket_model_lod2 type: vtx offset: 0xBA90 diff --git a/yamls/us/moo_moo_farm_data.yml b/yamls/us/moo_moo_farm_data.yml index c6ce2f67a..fc9f36a7b 100644 --- a/yamls/us/moo_moo_farm_data.yml +++ b/yamls/us/moo_moo_farm_data.yml @@ -525,6 +525,7 @@ gTextureMole1: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole2: symbol: gTextureMole2 type: texture @@ -533,6 +534,7 @@ gTextureMole2: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole3: symbol: gTextureMole3 type: texture @@ -541,6 +543,7 @@ gTextureMole3: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole4: symbol: gTextureMole4 type: texture @@ -549,6 +552,7 @@ gTextureMole4: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole5: symbol: gTextureMole5 type: texture @@ -557,6 +561,7 @@ gTextureMole5: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole6: symbol: gTextureMole6 type: texture @@ -565,6 +570,7 @@ gTextureMole6: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole7: symbol: gTextureMole7 type: texture @@ -573,6 +579,7 @@ gTextureMole7: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut d_course_moo_moo_farm_mole_dirt: symbol: d_course_moo_moo_farm_mole_dirt type: texture diff --git a/yamls/us/other_textures.yml b/yamls/us/other_textures.yml index 8af958165..43d683782 100644 --- a/yamls/us/other_textures.yml +++ b/yamls/us/other_textures.yml @@ -2575,8 +2575,8 @@ texture_68E2D0: offset: 0x4C360 mio0: true format: rgba16 -gTextureGreenShell0: - symbol: gTextureGreenShell0 +texture_green_shell_0: + symbol: texture_green_shell_0 type: texture mio0: true offset: 0x4CBE0 @@ -2585,8 +2585,8 @@ gTextureGreenShell0: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell1: - symbol: gTextureGreenShell1 +texture_green_shell_1: + symbol: texture_green_shell_1 type: texture mio0: true offset: 0x4CE30 @@ -2595,8 +2595,8 @@ gTextureGreenShell1: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell2: - symbol: gTextureGreenShell2 +texture_green_shell_2: + symbol: texture_green_shell_2 type: texture mio0: true offset: 0x4D080 @@ -2605,8 +2605,8 @@ gTextureGreenShell2: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell3: - symbol: gTextureGreenShell3 +texture_green_shell_3: + symbol: texture_green_shell_3 type: texture mio0: true offset: 0x4D2D8 @@ -2615,8 +2615,8 @@ gTextureGreenShell3: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell4: - symbol: gTextureGreenShell4 +texture_green_shell_4: + symbol: texture_green_shell_4 type: texture mio0: true offset: 0x4D538 @@ -2625,8 +2625,8 @@ gTextureGreenShell4: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell5: - symbol: gTextureGreenShell5 +texture_green_shell_5: + symbol: texture_green_shell_5 type: texture mio0: true offset: 0x4D790 @@ -2635,8 +2635,8 @@ gTextureGreenShell5: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell6: - symbol: gTextureGreenShell6 +texture_green_shell_6: + symbol: texture_green_shell_6 type: texture mio0: true offset: 0x4D9FC @@ -2645,8 +2645,8 @@ gTextureGreenShell6: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell7: - symbol: gTextureGreenShell7 +texture_green_shell_7: + symbol: texture_green_shell_7 type: texture mio0: true offset: 0x4DC5C @@ -2655,8 +2655,88 @@ gTextureGreenShell7: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureBlueShell0: - symbol: gTextureBlueShell0 +texture_red_shell_0: + symbol: texture_red_shell_0 + type: texture + mio0: true + offset: 0x4CBE0 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_1: + symbol: texture_red_shell_1 + type: texture + mio0: true + offset: 0x4CE30 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_2: + symbol: texture_red_shell_2 + type: texture + mio0: true + offset: 0x4D080 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_3: + symbol: texture_red_shell_3 + type: texture + mio0: true + offset: 0x4D2D8 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_4: + symbol: texture_red_shell_4 + type: texture + mio0: true + offset: 0x4D538 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_5: + symbol: texture_red_shell_5 + type: texture + mio0: true + offset: 0x4D790 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_6: + symbol: texture_red_shell_6 + type: texture + mio0: true + offset: 0x4D9FC + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_7: + symbol: texture_red_shell_7 + type: texture + mio0: true + offset: 0x4DC5C + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_blue_shell_0: + symbol: texture_blue_shell_0 type: texture mio0: true offset: 0x4DEB0 @@ -2665,8 +2745,8 @@ gTextureBlueShell0: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell1: - symbol: gTextureBlueShell1 +texture_blue_shell_1: + symbol: texture_blue_shell_1 type: texture mio0: true offset: 0x4E0DC @@ -2675,8 +2755,8 @@ gTextureBlueShell1: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell2: - symbol: gTextureBlueShell2 +texture_blue_shell_2: + symbol: texture_blue_shell_2 type: texture mio0: true offset: 0x4E314 @@ -2685,8 +2765,8 @@ gTextureBlueShell2: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell3: - symbol: gTextureBlueShell3 +texture_blue_shell_3: + symbol: texture_blue_shell_3 type: texture mio0: true offset: 0x4E554 @@ -2695,8 +2775,8 @@ gTextureBlueShell3: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell4: - symbol: gTextureBlueShell4 +texture_blue_shell_4: + symbol: texture_blue_shell_4 type: texture mio0: true offset: 0x4E798 @@ -2705,8 +2785,8 @@ gTextureBlueShell4: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell5: - symbol: gTextureBlueShell5 +texture_blue_shell_5: + symbol: texture_blue_shell_5 type: texture mio0: true offset: 0x4E9F0 @@ -2715,8 +2795,8 @@ gTextureBlueShell5: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell6: - symbol: gTextureBlueShell6 +texture_blue_shell_6: + symbol: texture_blue_shell_6 type: texture mio0: true offset: 0x4EC4C @@ -2725,8 +2805,8 @@ gTextureBlueShell6: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell7: - symbol: gTextureBlueShell7 +texture_blue_shell_7: + symbol: texture_blue_shell_7 type: texture mio0: true offset: 0x4EE88 @@ -2743,7 +2823,6 @@ question_mark_yellow: width: 32 height: 64 offset: 0x4F0C0 - mio0: true format: rgba16 gTextureTrees1: symbol: gTextureTrees1 @@ -2754,7 +2833,7 @@ gTextureTrees1: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees2: symbol: gTextureTrees2 type: texture @@ -2764,7 +2843,7 @@ gTextureTrees2: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees3: symbol: gTextureTrees3 type: texture @@ -2774,7 +2853,7 @@ gTextureTrees3: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees4Left: symbol: gTextureTrees4Left type: texture @@ -2784,7 +2863,7 @@ gTextureTrees4Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees4Right: symbol: gTextureTrees4Right type: texture @@ -2794,7 +2873,7 @@ gTextureTrees4Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees5Left: symbol: gTextureTrees5Left type: texture @@ -2804,7 +2883,7 @@ gTextureTrees5Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees5Right: symbol: gTextureTrees5Right type: texture @@ -2814,7 +2893,7 @@ gTextureTrees5Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees6: symbol: gTextureTrees6 type: texture @@ -2824,7 +2903,7 @@ gTextureTrees6: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees7: symbol: gTextureTrees7 type: texture @@ -2834,7 +2913,7 @@ gTextureTrees7: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import shrub: symbol: gTextureShrub type: texture @@ -2843,7 +2922,6 @@ shrub: width: 32 height: 32 offset: 0x50FCC - mio0: true format: rgba16 gTextureFrappeSnowlandTreeLeft: symbol: gTextureFrappeSnowlandTreeLeft @@ -2854,7 +2932,7 @@ gTextureFrappeSnowlandTreeLeft: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTFrappeSnowlandTree + tlut_symbol: d_course_frappe_snowland_tree_tlut gTextureFrappeSnowlandTreeRight: symbol: gTextureFrappeSnowlandTreeRight type: texture @@ -2864,7 +2942,7 @@ gTextureFrappeSnowlandTreeRight: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTFrappeSnowlandTree + tlut_symbol: d_course_frappe_snowland_tree_tlut gTextureCow01Left: symbol: gTextureCow01Left type: texture @@ -2874,7 +2952,7 @@ gTextureCow01Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow01Right: symbol: gTextureCow01Right type: texture @@ -2884,7 +2962,7 @@ gTextureCow01Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow02Left: symbol: gTextureCow02Left type: texture @@ -2894,7 +2972,7 @@ gTextureCow02Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow02Right: symbol: gTextureCow02Right type: texture @@ -2904,7 +2982,7 @@ gTextureCow02Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow03Left: symbol: gTextureCow03Left type: texture @@ -2914,7 +2992,7 @@ gTextureCow03Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow03Right: symbol: gTextureCow03Right type: texture @@ -2924,7 +3002,7 @@ gTextureCow03Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow04Left: symbol: gTextureCow04Left type: texture @@ -2934,7 +3012,7 @@ gTextureCow04Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow04Right: symbol: gTextureCow04Right type: texture @@ -2944,7 +3022,7 @@ gTextureCow04Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow05Left: symbol: gTextureCow05Left type: texture @@ -2954,7 +3032,7 @@ gTextureCow05Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow05Right: symbol: gTextureCow05Right type: texture @@ -2964,7 +3042,7 @@ gTextureCow05Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCactus1Left: symbol: gTextureCactus1Left type: texture @@ -2974,7 +3052,7 @@ gTextureCactus1Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCactus + tlut_symbol: d_course_kalimari_desert_tree_tlut gTextureCactus1Right: symbol: gTextureCactus1Right type: texture @@ -2984,7 +3062,7 @@ gTextureCactus1Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCactus + tlut_symbol: d_course_kalimari_desert_tree_tlut gTextureCactus2Left: symbol: gTextureCactus2Left type: texture @@ -2994,7 +3072,7 @@ gTextureCactus2Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCactus + tlut_symbol: d_course_kalimari_desert_tree_tlut gTextureCactus2Right: symbol: gTextureCactus2Right type: texture @@ -3004,7 +3082,7 @@ gTextureCactus2Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCactus + tlut_symbol: d_course_kalimari_desert_tree_tlut gTextureCactus3: symbol: gTextureCactus3 type: texture @@ -3014,7 +3092,7 @@ gTextureCactus3: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCactus + tlut_symbol: d_course_kalimari_desert_tree_tlut gTextureFinishLineBanner1: symbol: gTextureFinishLineBanner1 type: texture @@ -3104,7 +3182,7 @@ gTexturePiranhaPlant1: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant2: symbol: gTexturePiranhaPlant2 type: texture @@ -3114,7 +3192,7 @@ gTexturePiranhaPlant2: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant3: symbol: gTexturePiranhaPlant3 type: texture @@ -3124,7 +3202,7 @@ gTexturePiranhaPlant3: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant4: symbol: gTexturePiranhaPlant4 type: texture @@ -3134,7 +3212,7 @@ gTexturePiranhaPlant4: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant5: symbol: gTexturePiranhaPlant5 type: texture @@ -3144,7 +3222,7 @@ gTexturePiranhaPlant5: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant6: symbol: gTexturePiranhaPlant6 type: texture @@ -3154,7 +3232,7 @@ gTexturePiranhaPlant6: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant7: symbol: gTexturePiranhaPlant7 type: texture @@ -3164,7 +3242,7 @@ gTexturePiranhaPlant7: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant8: symbol: gTexturePiranhaPlant8 type: texture @@ -3174,7 +3252,7 @@ gTexturePiranhaPlant8: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant9: symbol: gTexturePiranhaPlant9 type: texture @@ -3184,7 +3262,7 @@ gTexturePiranhaPlant9: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut texture_6997E0: symbol: gTexture6997E0 type: texture @@ -3203,7 +3281,7 @@ gTextureDksJungleParkwayKiwanoFruit1: width: 32 height: 32 format: CI8 - tlut_symbol: gTLUTDksJungleParkwayKiwanoFruit + tlut_symbol: d_course_dks_jungle_parkway_kiwano_tlut gTextureDksJungleParkwayKiwanoFruit2: symbol: gTextureDksJungleParkwayKiwanoFruit2 type: texture @@ -3213,7 +3291,7 @@ gTextureDksJungleParkwayKiwanoFruit2: width: 32 height: 32 format: CI8 - tlut_symbol: gTLUTDksJungleParkwayKiwanoFruit + tlut_symbol: d_course_dks_jungle_parkway_kiwano_tlut gTextureDksJungleParkwayKiwanoFruit3: symbol: gTextureDksJungleParkwayKiwanoFruit3 type: texture @@ -3223,7 +3301,7 @@ gTextureDksJungleParkwayKiwanoFruit3: width: 32 height: 32 format: CI8 - tlut_symbol: gTLUTDksJungleParkwayKiwanoFruit + tlut_symbol: d_course_dks_jungle_parkway_kiwano_tlut kart_shadow: symbol: gTextureKartShadow type: texture @@ -3251,8 +3329,8 @@ texture_69B140: height: 32 offset: 0x591D0 format: i8 -texture_69B378: - symbol: gTexture69B378 +gGrassParticle: + symbol: gGrassParticle type: texture mio0: true ctype: u16 @@ -3332,8 +3410,8 @@ texture_69C354: height: 32 offset: 0x5A3E4 format: ia8 -texture_69C4E4: - symbol: gTexture69C4E4 +gGroundDust: + symbol: gGroundDust type: texture mio0: true ctype: u16 @@ -4656,7 +4734,6 @@ exhaust_0: width: 32 height: 96 offset: 0xD5B14 - mio0: true format: ia8 exhaust_1: symbol: gTextureExhaust1 @@ -4666,7 +4743,6 @@ exhaust_1: width: 32 height: 96 offset: 0xD5F90 - mio0: true format: ia8 exhaust_2: symbol: gTextureExhaust2 @@ -4676,7 +4752,6 @@ exhaust_2: width: 32 height: 96 offset: 0xD6418 - mio0: true format: ia8 exhaust_3: symbol: gTextureExhaust3 @@ -4686,7 +4761,6 @@ exhaust_3: width: 32 height: 128 offset: 0xD690C - mio0: true format: ia8 exhaust_4: symbol: gTextureExhaust4 @@ -4696,7 +4770,6 @@ exhaust_4: width: 32 height: 128 offset: 0xD6CD4 - mio0: true format: ia8 exhaust_5: symbol: gTextureExhaust5 @@ -4706,20 +4779,18 @@ exhaust_5: width: 32 height: 128 offset: 0xD70CC - mio0: true format: ia8 logo_mario_kart_64: - symbol: gTextureLogoMarioKart64 + symbol: logo_mario_kart_64 type: texture mio0: true ctype: u32 width: 256 height: 128 offset: 0xD7510 - mio0: true format: rgba32 -gTextureCourseOutlineMarioRaceway: - symbol: gTextureCourseOutlineMarioRaceway +minimap_mario_raceway: + symbol: minimap_mario_raceway mio0: true type: texture offset: 0xDEC9C @@ -4727,8 +4798,8 @@ gTextureCourseOutlineMarioRaceway: width: 64 height: 64 format: I4 -gTextureCourseOutlineChocoMountain: - symbol: gTextureCourseOutlineChocoMountain +minimap_choco_mountain: + symbol: minimap_choco_mountain mio0: true type: texture offset: 0xDEF60 @@ -4736,8 +4807,8 @@ gTextureCourseOutlineChocoMountain: width: 64 height: 64 format: I4 -gTextureCourseOutlineBowsersCastle: - symbol: gTextureCourseOutlineBowsersCastle +minimap_bowsers_castle: + symbol: minimap_bowsers_castle mio0: true type: texture offset: 0xDF268 @@ -4745,8 +4816,8 @@ gTextureCourseOutlineBowsersCastle: width: 64 height: 64 format: I4 -gTextureCourseOutlineBansheeBoardwalk: - symbol: gTextureCourseOutlineBansheeBoardwalk +minimap_banshee_boardwalk: + symbol: minimap_banshee_boardwalk mio0: true type: texture offset: 0xDF4CC @@ -4754,8 +4825,8 @@ gTextureCourseOutlineBansheeBoardwalk: width: 64 height: 64 format: I4 -gTextureCourseOutlineYoshiValley: - symbol: gTextureCourseOutlineYoshiValley +minimap_yoshi_valley: + symbol: minimap_yoshi_valley mio0: true type: texture offset: 0xDF6C4 @@ -4763,8 +4834,8 @@ gTextureCourseOutlineYoshiValley: width: 64 height: 64 format: I4 -gTextureCourseOutlineFrappeSnowland: - symbol: gTextureCourseOutlineFrappeSnowland +minimap_frappe_snowland: + symbol: minimap_frappe_snowland mio0: true type: texture offset: 0xDFAE8 @@ -4772,8 +4843,8 @@ gTextureCourseOutlineFrappeSnowland: width: 64 height: 64 format: I4 -gTextureCourseOutlineKoopaTroopaBeach: - symbol: gTextureCourseOutlineKoopaTroopaBeach +minimap_koopa_troopa_beach: + symbol: minimap_koopa_troopa_beach mio0: true type: texture offset: 0xDFD60 @@ -4781,8 +4852,8 @@ gTextureCourseOutlineKoopaTroopaBeach: width: 64 height: 64 format: I4 -gTextureCourseOutlineRoyalRaceway: - symbol: gTextureCourseOutlineRoyalRaceway +minimap_royal_raceway: + symbol: minimap_royal_raceway mio0: true type: texture offset: 0xDFFC8 @@ -4790,8 +4861,8 @@ gTextureCourseOutlineRoyalRaceway: width: 64 height: 64 format: I4 -gTextureCourseOutlineLuigiRaceway: - symbol: gTextureCourseOutlineLuigiRaceway +minimap_luigi_raceway: + symbol: minimap_luigi_raceway mio0: true type: texture offset: 0xE02A0 @@ -4799,8 +4870,8 @@ gTextureCourseOutlineLuigiRaceway: width: 64 height: 96 format: I4 -gTextureCourseOutlineMooMooFarm: - symbol: gTextureCourseOutlineMooMooFarm +minimap_moo_moo_farm: + symbol: minimap_moo_moo_farm mio0: true type: texture offset: 0xE051C @@ -4808,8 +4879,8 @@ gTextureCourseOutlineMooMooFarm: width: 64 height: 64 format: I4 -gTextureCourseOutlineToadsTurnpike: - symbol: gTextureCourseOutlineToadsTurnpike +minimap_toads_turnpike: + symbol: minimap_toads_turnpike mio0: true type: texture offset: 0xE0754 @@ -4817,8 +4888,8 @@ gTextureCourseOutlineToadsTurnpike: width: 128 height: 64 format: I4 -gTextureCourseOutlineKalimariDesert: - symbol: gTextureCourseOutlineKalimariDesert +minimap_kalimari_desert: + symbol: minimap_kalimari_desert mio0: true type: texture offset: 0xE0A50 @@ -4826,8 +4897,8 @@ gTextureCourseOutlineKalimariDesert: width: 64 height: 96 format: I4 -gTextureCourseOutlineSherbetLand: - symbol: gTextureCourseOutlineSherbetLand +minimap_sherbet_land: + symbol: minimap_sherbet_land mio0: true type: texture offset: 0xE0DBC @@ -4835,8 +4906,8 @@ gTextureCourseOutlineSherbetLand: width: 64 height: 64 format: I4 -gTextureCourseOutlineRainbowRoad: - symbol: gTextureCourseOutlineRainbowRoad +minimap_rainbow_road: + symbol: minimap_rainbow_road mio0: true type: texture offset: 0xE10C4 @@ -4844,8 +4915,8 @@ gTextureCourseOutlineRainbowRoad: width: 64 height: 96 format: I4 -gTextureCourseOutlineWarioStadium: - symbol: gTextureCourseOutlineWarioStadium +minimap_wario_stadium: + symbol: minimap_wario_stadium mio0: true type: texture offset: 0xE1400 @@ -4853,8 +4924,8 @@ gTextureCourseOutlineWarioStadium: width: 64 height: 64 format: I4 -gTextureCourseOutlineBlockFort: - symbol: gTextureCourseOutlineBlockFort +minimap_block_fort: + symbol: minimap_block_fort mio0: true type: texture offset: 0xE16D4 @@ -4862,8 +4933,8 @@ gTextureCourseOutlineBlockFort: width: 64 height: 64 format: I4 -gTextureCourseOutlineSkyscraper: - symbol: gTextureCourseOutlineSkyscraper +minimap_skyscraper: + symbol: minimap_skyscraper mio0: true type: texture offset: 0xE1974 @@ -4871,8 +4942,8 @@ gTextureCourseOutlineSkyscraper: width: 64 height: 64 format: I4 -gTextureCourseOutlineDoubleDeck: - symbol: gTextureCourseOutlineDoubleDeck +minimap_double_deck: + symbol: minimap_double_deck mio0: true type: texture offset: 0xE1BA8 @@ -4880,8 +4951,8 @@ gTextureCourseOutlineDoubleDeck: width: 64 height: 64 format: I4 -gTextureCourseOutlineDksJungleParkway: - symbol: gTextureCourseOutlineDksJungleParkway +minimap_dks_jungle_parkway: + symbol: minimap_dks_jungle_parkway mio0: true type: texture offset: 0xE1D2C @@ -4889,8 +4960,8 @@ gTextureCourseOutlineDksJungleParkway: width: 64 height: 64 format: I4 -gTextureCourseOutlineBigDonut: - symbol: gTextureCourseOutlineBigDonut +minimap_big_donut: + symbol: minimap_big_donut mio0: true type: texture offset: 0xE2014 diff --git a/yamls/us/player_selection.yml b/yamls/us/player_selection.yml index 2dc6ed903..b57360636 100644 --- a/yamls/us/player_selection.yml +++ b/yamls/us/player_selection.yml @@ -4,13 +4,13 @@ no_compression: true header: code: - - '#include ' - - '#include ' - - '#include ' + - "#include " + - "#include " + - "#include " header: - - '#include ' - - '#include ' - - '#include ' + - "#include " + - "#include " + - "#include " mario_face_00: symbol: gTextureMarioFace00 type: texture @@ -1470,7 +1470,7 @@ cup_bronze: mio0: true format: rgba16 push_start_button: - symbol: gTexturePushStartButton + symbol: push_start_button type: texture ctype: u16 width: 159 @@ -1478,7 +1478,7 @@ push_start_button: offset: 0xB17B4 format: rgba16 copyright_1996: - symbol: gTextureCopyright1996 + symbol: copyright_1996 type: texture ctype: u16 width: 124 @@ -1517,8 +1517,8 @@ p4_border_green: height: 64 offset: 0xB9C0C format: rgba16 -small_green_triangle: - symbol: gTextureSmallGreenTriangle +texture_small_green_triangle: + symbol: texture_small_green_triangle type: texture ctype: u16 width: 12 diff --git a/yamls/us/texture_data_2.yml b/yamls/us/texture_data_2.yml index 640636545..784797b7b 100644 --- a/yamls/us/texture_data_2.yml +++ b/yamls/us/texture_data_2.yml @@ -4,12 +4,12 @@ no_compression: true header: code: - - '#include ' - - '#include ' - - '#include ' + - "#include " + - "#include " + - "#include " header: - - '#include ' - - '#include ' + - "#include " + - "#include " small_letter_0: symbol: gTextureSmallFont0 type: texture @@ -667,7 +667,7 @@ tiny_font_minus: offset: 0xC5118 mio0: true format: ia16 -tiny_font_comma: +tiny_font_dot: symbol: gTextureTinyFontComma type: texture ctype: u16 @@ -1468,40 +1468,40 @@ texture_7F109C: offset: 0xC766C mio0: true format: ia16 -7F1124: - symbol: gTexture7F1124 +font_four_dote: + symbol: font_four_dote type: texture ctype: u16 width: 26 height: 16 offset: 0xC76F4 format: i4 -7F11F4: - symbol: gTexture7F11F4 +font_cc: + symbol: font_cc type: texture ctype: u16 width: 26 height: 16 offset: 0xC77C4 format: i4 -7F12C4: - symbol: gTexture7F12C4 +font_double_quote: + symbol: font_double_quote type: texture ctype: u16 width: 26 height: 16 offset: 0xC7894 format: i4 -7F1394: - symbol: gTexture7F1394 +font_exclamation_mark: + symbol: font_exclamation_mark type: texture ctype: u16 width: 26 height: 16 offset: 0xC7964 format: i4 -7F1464: - symbol: gTexture7F1464 +font_minus: + symbol: font_minus type: texture ctype: u16 width: 26 @@ -1509,15 +1509,15 @@ texture_7F109C: offset: 0xC7A34 format: i4 7F1534: - symbol: gTexture7F1534 + symbol: font_dot type: texture ctype: u16 width: 26 height: 16 offset: 0xC7B04 format: i4 -7F1604: - symbol: gTexture7F1604 +font_plus: + symbol: font_plus type: texture ctype: u16 width: 26 @@ -1525,7 +1525,7 @@ texture_7F109C: offset: 0xC7BD4 format: i4 7F16D4: - symbol: gTexture7F16D4 + symbol: font_interogation_mark type: texture ctype: u16 width: 26 @@ -1533,295 +1533,295 @@ texture_7F109C: offset: 0xC7CA4 format: i4 7F17A4: - symbol: gTexture7F17A4 + symbol: font_simple_quote type: texture ctype: u16 width: 26 height: 16 offset: 0xC7D74 format: i4 -7F1874: - symbol: gTexture7F1874 +font_number_zero: + symbol: font_number_zero type: texture ctype: u16 width: 26 height: 16 offset: 0xC7E44 format: i4 -7F1944: - symbol: gTexture7F1944 +font_number_one: + symbol: font_number_one type: texture ctype: u16 width: 26 height: 16 offset: 0xC7F14 format: i4 -7F1A14: - symbol: gTexture7F1A14 +font_number_two: + symbol: font_number_two type: texture ctype: u16 width: 26 height: 16 offset: 0xC7FE4 format: i4 -7F1AE4: - symbol: gTexture7F1AE4 +font_number_three: + symbol: font_number_three type: texture ctype: u16 width: 26 height: 16 offset: 0xC80B4 format: i4 -7F1BB4: - symbol: gTexture7F1BB4 +font_number_four: + symbol: font_number_four type: texture ctype: u16 width: 26 height: 16 offset: 0xC8184 format: i4 -7F1C84: - symbol: gTexture7F1C84 +font_number_five: + symbol: font_number_five type: texture ctype: u16 width: 26 height: 16 offset: 0xC8254 format: i4 -7F1D54: - symbol: gTexture7F1D54 +font_number_six: + symbol: font_number_six type: texture ctype: u16 width: 26 height: 16 offset: 0xC8324 format: i4 -7F1E24: - symbol: gTexture7F1E24 +font_number_seven: + symbol: font_number_seven type: texture ctype: u16 width: 26 height: 16 offset: 0xC83F4 format: i4 -7F1EF4: - symbol: gTexture7F1EF4 +font_number_eight: + symbol: font_number_eight type: texture ctype: u16 width: 26 height: 16 offset: 0xC84C4 format: i4 -7F1FC4: - symbol: gTexture7F1FC4 +font_number_nine: + symbol: font_number_nine type: texture ctype: u16 width: 26 height: 16 offset: 0xC8594 format: i4 -7F2094: - symbol: gTexture7F2094 +font_letter_A: + symbol: font_letter_A type: texture ctype: u16 width: 26 height: 16 offset: 0xC8664 format: i4 -7F2164: - symbol: gTexture7F2164 +font_letter_B: + symbol: font_letter_B type: texture ctype: u16 width: 26 height: 16 offset: 0xC8734 format: i4 -7F2234: - symbol: gTexture7F2234 +font_letter_C: + symbol: font_letter_C type: texture ctype: u16 width: 26 height: 16 offset: 0xC8804 format: i4 -7F2304: - symbol: gTexture7F2304 +font_letter_D: + symbol: font_letter_D type: texture ctype: u16 width: 26 height: 16 offset: 0xC88D4 format: i4 -7F23D4: - symbol: gTexture7F23D4 +font_letter_E: + symbol: font_letter_E type: texture ctype: u16 width: 26 height: 16 offset: 0xC89A4 format: i4 -7F24A4: - symbol: gTexture7F24A4 +font_letter_F: + symbol: font_letter_F type: texture ctype: u16 width: 26 height: 16 offset: 0xC8A74 format: i4 -7F2574: - symbol: gTexture7F2574 +font_letter_G: + symbol: font_letter_G type: texture ctype: u16 width: 26 height: 16 offset: 0xC8B44 format: i4 -7F2644: - symbol: gTexture7F2644 +font_letter_H: + symbol: font_letter_H type: texture ctype: u16 width: 26 height: 16 offset: 0xC8C14 format: i4 -7F2714: - symbol: gTexture7F2714 +font_letter_I: + symbol: font_letter_I type: texture ctype: u16 width: 26 height: 16 offset: 0xC8CE4 format: i4 -7F27E4: - symbol: gTexture7F27E4 +font_letter_J: + symbol: font_letter_J type: texture ctype: u16 width: 26 height: 16 offset: 0xC8DB4 format: i4 -7F28B4: - symbol: gTexture7F28B4 +font_letter_K: + symbol: font_letter_K type: texture ctype: u16 width: 26 height: 16 offset: 0xC8E84 format: i4 -7F2984: - symbol: gTexture7F2984 +font_letter_L: + symbol: font_letter_L type: texture ctype: u16 width: 26 height: 16 offset: 0xC8F54 format: i4 -7F2A54: - symbol: gTexture7F2A54 +font_letter_M: + symbol: font_letter_M type: texture ctype: u16 width: 26 height: 16 offset: 0xC9024 format: i4 -7F2B24: - symbol: gTexture7F2B24 +font_letter_N: + symbol: font_letter_N type: texture ctype: u16 width: 26 height: 16 offset: 0xC90F4 format: i4 -7F2BF4: - symbol: gTexture7F2BF4 +font_letter_O: + symbol: font_letter_O type: texture ctype: u16 width: 26 height: 16 offset: 0xC91C4 format: i4 -7F2CC4: - symbol: gTexture7F2CC4 +font_letter_P: + symbol: font_letter_P type: texture ctype: u16 width: 26 height: 16 offset: 0xC9294 format: i4 -7F2D94: - symbol: gTexture7F2D94 +font_letter_Q: + symbol: font_letter_Q type: texture ctype: u16 width: 26 height: 16 offset: 0xC9364 format: i4 -7F2E64: - symbol: gTexture7F2E64 +font_letter_R: + symbol: font_letter_R type: texture ctype: u16 width: 26 height: 16 offset: 0xC9434 format: i4 -7F2F34: - symbol: gTexture7F2F34 +font_letter_S: + symbol: font_letter_S type: texture ctype: u16 width: 26 height: 16 offset: 0xC9504 format: i4 -7F3004: - symbol: gTexture7F3004 +font_letter_T: + symbol: font_letter_T type: texture ctype: u16 width: 26 height: 16 offset: 0xC95D4 format: i4 -7F30D4: - symbol: gTexture7F30D4 +font_letter_U: + symbol: font_letter_U type: texture ctype: u16 width: 26 height: 16 offset: 0xC96A4 format: i4 -7F31A4: - symbol: gTexture7F31A4 +font_letter_V: + symbol: font_letter_V type: texture ctype: u16 width: 26 height: 16 offset: 0xC9774 format: i4 -7F3274: - symbol: gTexture7F3274 +font_letter_W: + symbol: font_letter_W type: texture ctype: u16 width: 26 height: 16 offset: 0xC9844 format: i4 -7F3344: - symbol: gTexture7F3344 +font_letter_X: + symbol: font_letter_X type: texture ctype: u16 width: 26 height: 16 offset: 0xC9914 format: i4 -7F3414: - symbol: gTexture7F3414 +font_letter_Y: + symbol: font_letter_Y type: texture ctype: u16 width: 26 height: 16 offset: 0xC99E4 format: i4 -7F34E4: - symbol: gTexture7F34E4 +font_letter_Z: + symbol: font_letter_Z type: texture ctype: u16 width: 26 @@ -3308,8 +3308,8 @@ texture_7F109C: height: 16 offset: 0xD0594 format: i4 -7FA044: - symbol: gTexture7FA044 +font_apostrophe: + symbol: font_apostrophe type: texture ctype: u16 width: 16 @@ -3341,7 +3341,7 @@ texture_7F109C: offset: 0xD0834 format: i4 7FA334: - symbol: gTexture7FA334 + symbol: font_comma type: texture ctype: u16 width: 16 diff --git a/yamls/us/texture_tkmk00.yml b/yamls/us/texture_tkmk00.yml index c75da0472..85c3dac42 100644 --- a/yamls/us/texture_tkmk00.yml +++ b/yamls/us/texture_tkmk00.yml @@ -4,14 +4,14 @@ no_compression: true header: code: - - '#include ' - - '#include ' - - '#include ' + - "#include " + - "#include " + - "#include " header: - - '#include ' - - '#include ' -gTexturePlayerSelect: - symbol: gTexturePlayerSelect + - "#include " + - "#include " +texture_player_select: + symbol: texture_player_select type: texture ctype: u16 width: 220 @@ -20,8 +20,8 @@ gTexturePlayerSelect: tkmk00: true alpha: 0x1 format: rgba16 -gTextureOption: - symbol: gTextureOption +texture_option: + symbol: texture_option type: texture ctype: u16 width: 130 @@ -30,8 +30,8 @@ gTextureOption: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameDK: - symbol: gTextureNameDK +texture_name_dk: + symbol: texture_name_dk type: texture ctype: u16 width: 64 @@ -40,8 +40,8 @@ gTextureNameDK: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameToad: - symbol: gTextureNameToad +texture_name_toad: + symbol: texture_name_toad type: texture ctype: u16 width: 64 @@ -50,8 +50,8 @@ gTextureNameToad: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameBowser: - symbol: gTextureNameBowser +texture_name_bowser: + symbol: texture_name_bowser type: texture ctype: u16 width: 64 @@ -60,8 +60,8 @@ gTextureNameBowser: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameLuigi: - symbol: gTextureNameLuigi +texture_name_luigi: + symbol: texture_name_luigi type: texture ctype: u16 width: 64 @@ -70,8 +70,8 @@ gTextureNameLuigi: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameMario: - symbol: gTextureNameMario +texture_name_mario: + symbol: texture_name_mario type: texture ctype: u16 width: 64 @@ -80,8 +80,8 @@ gTextureNameMario: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNamePeach: - symbol: gTextureNamePeach +texture_name_peach: + symbol: texture_name_peach type: texture ctype: u16 width: 64 @@ -90,8 +90,8 @@ gTextureNamePeach: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameWario: - symbol: gTextureNameWario +texture_name_wario: + symbol: texture_name_wario type: texture ctype: u16 width: 64 @@ -100,8 +100,8 @@ gTextureNameWario: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameYoshi: - symbol: gTextureNameYoshi +texture_name_yoshi: + symbol: texture_name_yoshi type: texture ctype: u16 width: 64 @@ -360,8 +360,8 @@ gTextureMenuSpecialCup: tkmk00: true alpha: 0xBE format: rgba16 -gTextureGameSelect: - symbol: gTextureGameSelect +texture_game_select: + symbol: texture_game_select type: texture ctype: u16 width: 200 @@ -370,8 +370,8 @@ gTextureGameSelect: tkmk00: true alpha: 0x1 format: rgba16 -gTextureMenu1PGame: - symbol: gTextureMenu1PGame +texture_menu_1p_game: + symbol: texture_menu_1p_game type: texture ctype: u16 width: 64 @@ -380,8 +380,8 @@ gTextureMenu1PGame: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu2PGame: - symbol: gTextureMenu2PGame +texture_menu_2p_game: + symbol: texture_menu_2p_game type: texture ctype: u16 width: 64 @@ -390,8 +390,8 @@ gTextureMenu2PGame: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu3PGame: - symbol: gTextureMenu3PGame +texture_menu_3p_game: + symbol: texture_menu_3p_game type: texture ctype: u16 width: 64 @@ -400,8 +400,8 @@ gTextureMenu3PGame: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu4PGame: - symbol: gTextureMenu4PGame +texture_menu_4p_game: + symbol: texture_menu_4p_game type: texture ctype: u16 width: 64 @@ -410,8 +410,8 @@ gTextureMenu4PGame: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuModeBattle: - symbol: gTextureMenuModeBattle +texture_mode_battle: + symbol: texture_mode_battle type: texture ctype: u16 width: 64 @@ -420,8 +420,8 @@ gTextureMenuModeBattle: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuModeTimeTrials: - symbol: gTextureMenuModeTimeTrials +texture_mode_time_trials: + symbol: texture_mode_time_trials type: texture ctype: u16 width: 64 @@ -430,8 +430,8 @@ gTextureMenuModeTimeTrials: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuModeMarioGP: - symbol: gTextureMenuModeMarioGP +texture_mode_mario_gp: + symbol: texture_mode_mario_gp type: texture ctype: u16 width: 64 @@ -440,8 +440,8 @@ gTextureMenuModeMarioGP: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuModeVS: - symbol: gTextureMenuModeVS +texture_mode_vs: + symbol: texture_mode_vs type: texture ctype: u16 width: 64 @@ -450,8 +450,8 @@ gTextureMenuModeVS: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuLOption: - symbol: gTextureMenuLOption +texture_l_option: + symbol: texture_l_option type: texture ctype: u16 width: 58 @@ -460,8 +460,8 @@ gTextureMenuLOption: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuRData: - symbol: gTextureMenuRData +texture_r_data: + symbol: texture_r_data type: texture ctype: u16 width: 58 @@ -470,8 +470,8 @@ gTextureMenuRData: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu50cc: - symbol: gTextureMenu50cc +texture_50cc: + symbol: texture_50cc type: texture ctype: u16 width: 64 @@ -480,8 +480,8 @@ gTextureMenu50cc: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu100cc: - symbol: gTextureMenu100cc +texture_100cc: + symbol: texture_100cc type: texture ctype: u16 width: 64 @@ -490,8 +490,8 @@ gTextureMenu100cc: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu150cc: - symbol: gTextureMenu150cc +texture_150cc: + symbol: texture_150cc type: texture ctype: u16 width: 64 @@ -500,8 +500,8 @@ gTextureMenu150cc: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuExtra: - symbol: gTextureMenuExtra +texture_extra: + symbol: texture_extra type: texture ctype: u16 width: 64 @@ -530,8 +530,8 @@ gTextureMenuWithItem: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuBegin: - symbol: gTextureMenuBegin +texture_begin: + symbol: texture_begin type: texture ctype: u16 width: 64 @@ -540,8 +540,8 @@ gTextureMenuBegin: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuGhost: - symbol: gTextureMenuGhost +texture_menu_ghost: + symbol: texture_menu_ghost type: texture ctype: u16 width: 64 @@ -550,8 +550,8 @@ gTextureMenuGhost: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuData: - symbol: gTextureMenuData +texture_data: + symbol: texture_data type: texture ctype: u16 width: 64 @@ -560,8 +560,8 @@ gTextureMenuData: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuOK: - symbol: gTextureMenuOK +texture_ok: + symbol: texture_ok type: texture ctype: u16 width: 31 @@ -570,8 +570,8 @@ gTextureMenuOK: tkmk00: true alpha: 0xBE format: rgba16 -gTextureBackgroundBlueSky: - symbol: gTextureBackgroundBlueSky +background_blue_sky: + symbol: background_blue_sky type: texture ctype: u16 width: 320 @@ -580,8 +580,8 @@ gTextureBackgroundBlueSky: tkmk00: true alpha: 0x1 format: rgba16 -gTextureBackgroundSunset: - symbol: gTextureBackgroundSunset +background_sunset: + symbol: background_sunset type: texture ctype: u16 width: 320