From 163050584ab314a47c702a90574700d87d5203d3 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sat, 19 Oct 2024 23:32:33 -0700 Subject: [PATCH 01/13] Identify unk_02018340 -> bg_window --- include/battle/ov16_0223DF00.h | 3 +- include/battle/ov16_0226871C.h | 3 +- include/battle/struct_ov16_0225BFFC_t.h | 2 +- include/battle/struct_ov16_02264408.h | 3 +- include/battle/struct_ov16_022674C4.h | 2 +- include/{unk_02018340.h => bg_window.h} | 91 ++++++++++++++++--- include/colored_arrow.h | 3 +- include/field/field_system.h | 2 +- include/field_system.h | 3 +- include/overlay005/encounter_effect.h | 3 +- include/overlay005/ov5_021D0D80.h | 4 +- include/overlay005/ov5_021DC018.h | 3 +- include/overlay005/ov5_021DD6FC.h | 4 +- include/overlay005/ov5_021E1B08.h | 4 +- include/overlay005/struct_ov5_021E52A8_sub2.h | 2 +- include/overlay007/ov7_0224BE9C.h | 3 +- include/overlay007/struct_ov7_0224D008.h | 3 +- include/overlay008/ov8_02249960.h | 3 +- include/overlay012/ov12_0221FC20.h | 2 +- include/overlay012/struct_ov12_0223595C.h | 3 +- include/overlay013/struct_ov13_022213F0.h | 3 +- include/overlay013/struct_ov13_02227244.h | 3 +- include/overlay017/ov17_0223F118.h | 2 +- include/overlay017/ov17_0223F7E4.h | 3 +- include/overlay017/ov17_022492DC.h | 3 +- include/overlay017/struct_ov17_0223F88C.h | 3 +- include/overlay017/struct_ov17_022476F8.h | 3 +- include/overlay017/struct_ov17_0224A1EC.h | 3 +- include/overlay017/struct_ov17_022507C4.h | 3 +- include/overlay019/ov19_021D79F8.h | 3 +- include/overlay019/ov19_021DA92C.h | 2 +- include/overlay019/ov19_021DB2FC.h | 2 +- include/overlay019/ov19_021DB8E4.h | 2 +- include/overlay019/ov19_021DC5F0.h | 2 +- include/overlay019/ov19_021DCF88.h | 2 +- include/overlay019/ov19_021DE3E8.h | 3 +- include/overlay019/ov19_021DEC04.h | 2 +- include/overlay019/struct_ov19_021D8318.h | 4 +- include/overlay019/struct_ov19_021DA9E0.h | 3 +- include/overlay019/struct_ov19_021DB6F0.h | 4 +- include/overlay019/struct_ov19_021DBA9C.h | 4 +- include/overlay019/struct_ov19_021DC680.h | 3 +- include/overlay020/ov20_021D2098.h | 2 +- include/overlay020/ov20_021D4E38.h | 4 +- include/overlay020/struct_ov20_021D4E8C.h | 3 +- include/overlay021/ov21_021D0D80.h | 4 +- include/overlay021/ov21_021D1FA4.h | 2 +- include/overlay021/ov21_021D4C0C.h | 3 +- include/overlay021/ov21_021D517C.h | 2 +- include/overlay021/ov21_021DE668.h | 4 +- include/overlay021/struct_ov21_021D13FC.h | 3 +- include/overlay021/struct_ov21_021D157C.h | 2 +- include/overlay021/struct_ov21_021D1FA4.h | 3 +- include/overlay021/struct_ov21_021D4CB8.h | 3 +- include/overlay021/struct_ov21_021E8E0C.h | 2 +- include/overlay022/ov22_02255094.h | 2 +- include/overlay022/struct_ov22_02256BAC.h | 2 +- .../overlay022/struct_ov22_02257964_sub2.h | 3 +- .../overlay022/struct_ov22_02257F50_sub2.h | 3 +- include/overlay022/struct_ov22_02258470.h | 3 +- include/overlay022/struct_ov22_022597BC.h | 2 +- include/overlay022/struct_ov22_022599A0.h | 2 +- include/overlay022/struct_ov22_02259C9C.h | 3 +- include/overlay022/struct_ov22_0225A0E4.h | 2 +- include/overlay022/struct_ov22_0225A428.h | 3 +- include/overlay022/struct_ov22_0225AB54.h | 2 +- include/overlay022/struct_ov22_0225AF8C.h | 2 +- include/overlay022/struct_ov22_0225B388.h | 3 +- include/overlay023/ov23_0224340C.h | 3 +- include/overlay023/ov23_02253598.h | 2 +- include/overlay023/ov23_02253D40.h | 3 +- include/overlay023/struct_ov23_02250CD4.h | 2 +- include/overlay024/ov24_02253CE0.h | 2 +- include/overlay025/ov25_02254560.h | 4 +- include/overlay025/ov25_02255090.h | 4 +- include/overlay025/poketch_system.h | 3 +- include/overlay026/ov26_02256404.h | 4 +- include/overlay027/ov27_0225680C.h | 4 +- include/overlay028/ov28_0225697C.h | 4 +- include/overlay029/ov29_022566C8.h | 4 +- include/overlay030/ov30_022563EC.h | 4 +- include/overlay031/ov31_02256554.h | 4 +- include/overlay032/ov32_02256470.h | 4 +- include/overlay033/ov33_02256474.h | 4 +- include/overlay034/ov34_02256540.h | 4 +- include/overlay035/ov35_02256410.h | 4 +- include/overlay037/ov37_022563D4.h | 4 +- include/overlay038/ov38_0225632C.h | 4 +- include/overlay039/ov39_022563DC.h | 4 +- include/overlay040/ov40_0225645C.h | 4 +- include/overlay041/ov41_022567B0.h | 4 +- include/overlay042/ov42_022563D4.h | 4 +- include/overlay043/ov43_02256544.h | 4 +- include/overlay044/ov44_022565BC.h | 4 +- include/overlay045/ov45_022566EC.h | 4 +- include/overlay046/ov46_02256BCC.h | 4 +- include/overlay047/ov47_02256634.h | 4 +- include/overlay048/ov48_0225650C.h | 4 +- include/overlay049/ov49_022563D4.h | 4 +- include/overlay050/ov50_02256510.h | 4 +- include/overlay051/ov51_0225632C.h | 4 +- include/overlay052/ov52_02256694.h | 4 +- include/overlay053/ov53_02256420.h | 4 +- include/overlay054/ov54_0225642C.h | 4 +- include/overlay055/ov55_0225632C.h | 4 +- include/overlay061/struct_ov61_0222C884.h | 14 --- include/overlay062/ov62_02231690.h | 2 +- include/overlay062/struct_ov62_0223118C.h | 2 +- include/overlay062/struct_ov62_022323B8.h | 3 +- include/overlay062/struct_ov62_02233310.h | 2 +- include/overlay062/struct_ov62_02233F74.h | 3 +- .../overlay062/struct_ov62_02246BF4_sub2.h | 2 +- include/overlay063/ov63_0222D1C0.h | 3 +- include/overlay065/ov65_02235060.h | 3 +- include/overlay065/struct_ov65_0222EBE0_t.h | 3 +- include/overlay065/struct_ov65_02234E50.h | 2 +- include/overlay065/struct_ov65_02235130.h | 4 +- include/overlay071/ov71_0223C69C.h | 3 +- include/overlay071/struct_ov71_0223B620.h | 3 +- include/overlay072/struct_ov72_0223DB98_t.h | 3 +- include/overlay076/ov76_0223B870.h | 4 +- include/overlay076/ov76_0223D338.h | 3 +- include/overlay076/struct_ov76_0223C398.h | 3 +- include/overlay079/struct_ov79_021D0E1C.h | 3 +- include/overlay080/struct_ov80_021D2A08.h | 2 +- include/overlay081/struct_ov81_021D1610.h | 4 +- include/overlay083/ov83_0223D6A8.h | 2 +- include/overlay083/struct_ov83_0223B784.h | 3 +- include/overlay083/struct_ov83_0223E138.h | 5 +- include/overlay083/struct_ov83_0223E824.h | 4 +- include/overlay083/struct_ov83_0223F7A4.h | 3 +- include/overlay084/ov84_0223F040.h | 3 +- include/overlay084/struct_ov84_0223B5A0.h | 3 +- include/overlay084/struct_ov84_0223BA5C.h | 13 --- include/overlay084/struct_ov84_02240FA8.h | 3 +- include/overlay088/ov88_0223E9C4.h | 3 +- include/overlay094/ov94_0223BCB0.h | 2 +- include/overlay094/ov94_0223C610.h | 3 +- include/overlay094/ov94_0223D0C4.h | 3 +- include/overlay094/ov94_022414B8.h | 2 +- include/overlay094/ov94_02244950.h | 3 +- include/overlay094/struct_ov94_0223FD4C.h | 3 +- include/overlay095/ov95_02246C20.h | 3 +- include/overlay096/ov96_0223B6A0.h | 2 +- include/overlay096/ov96_0223BCE0.h | 3 +- include/overlay096/struct_ov96_0223BF40_t.h | 3 +- include/overlay097/ov97_02232054.h | 3 +- include/overlay097/ov97_02237694.h | 3 +- include/overlay097/struct_ov97_0222D04C.h | 3 +- include/overlay097/struct_ov97_0222DB78.h | 20 ---- include/overlay097/struct_ov97_02237808.h | 3 +- include/overlay099/ov99_021D3E78.h | 3 +- include/overlay099/struct_ov99_021D2CB0.h | 3 +- include/overlay100/struct_ov100_021D46C8.h | 3 +- include/overlay101/struct_ov101_021D13C8.h | 2 +- include/overlay101/struct_ov101_021D148C.h | 3 +- include/overlay104/ov104_0223B6F4.h | 2 +- include/overlay104/ov104_0223C164.h | 4 +- include/overlay104/ov104_0223D9E4.h | 3 +- include/overlay104/ov104_0223E894.h | 4 +- include/overlay104/struct_ov104_022320B4_t.h | 2 +- include/overlay104/struct_ov104_0223C4CC.h | 2 +- include/overlay105/ov105_02246214.h | 3 +- include/overlay106/ov106_022436E0.h | 3 +- include/overlay107/ov107_02249D14.h | 3 +- include/overlay108/ov108_02243630.h | 3 +- include/overlay109/struct_ov109_021D5140.h | 3 +- include/overlay110/ov110_021D2124.h | 3 +- include/overlay111/ov111_021D3548.h | 3 +- include/overlay113/ov113_02260620.h | 3 +- include/overlay116/struct_ov116_02262A8C.h | 3 +- include/overlay116/struct_ov116_022649E4.h | 2 +- include/overlay117/ov117_02263AF0.h | 2 +- include/overlay117/struct_ov117_02261280.h | 3 +- include/overlay119/ov119_021D0D80.h | 3 +- include/overlay119/struct_ov119_021D17B8.h | 4 +- include/render_text.h | 3 +- include/script_manager.h | 2 +- include/struct_decls/struct_02018340_decl.h | 6 -- include/struct_defs/battle_system.h | 3 +- include/struct_defs/pokemon_summary_app.h | 3 +- include/struct_defs/struct_020127E8.h | 2 +- include/struct_defs/struct_02015958.h | 2 +- include/struct_defs/struct_0201AE08.h | 10 -- include/struct_defs/struct_0205AA50.h | 19 ---- include/struct_defs/struct_020708E0.h | 3 +- include/struct_defs/struct_0207A778.h | 4 +- include/struct_defs/struct_0207AE68_t.h | 3 +- include/struct_defs/struct_0207F248.h | 3 +- include/struct_defs/struct_02081CF4.h | 3 +- include/struct_defs/struct_02089688_sub1.h | 3 +- include/struct_defs/struct_0208C06C.h | 2 +- include/struct_defs/struct_02095E80_t.h | 3 +- include/struct_defs/struct_02095EAC_t.h | 3 +- include/struct_defs/struct_020961E8_t.h | 3 +- include/text.h | 3 +- include/unk_02001AF4.h | 4 +- include/unk_02006E3C.h | 3 +- include/unk_0200C440.h | 3 +- include/unk_0200DA60.h | 4 +- include/unk_02012744.h | 2 +- include/unk_020366A0.h | 2 +- include/unk_0205D8CC.h | 4 +- include/unk_0208A3F4.h | 4 +- include/unk_0208C098.h | 3 +- include/unk_0208EA44.h | 3 +- platinum.us/main.lsf | 2 +- src/battle/battle_display.c | 4 +- src/battle/battle_io_command.c | 3 +- src/battle/battle_script.c | 4 +- src/battle/healthbar.c | 4 +- src/battle/ov16_0223B140.c | 5 +- src/battle/ov16_0223DF00.c | 4 +- src/battle/ov16_0226871C.c | 5 +- src/{unk_02018340.c => bg_window.c} | 34 +------ src/choose_starter/choose_starter_app.c | 7 +- src/colored_arrow.c | 4 +- src/error_message_reset.c | 8 +- src/field_map_change.c | 4 +- src/field_menu.c | 2 +- src/field_system.c | 2 +- src/library_tv/library_tv.c | 7 +- src/meson.build | 2 +- src/overlay005/encounter_effect.c | 6 +- src/overlay005/encounter_effect_core.c | 4 +- src/overlay005/fieldmap.c | 5 +- src/overlay005/ov5_021D5EB8.c | 2 +- src/overlay005/ov5_021DC018.c | 3 +- src/overlay005/ov5_021DD42C.c | 3 +- src/overlay005/ov5_021DD6FC.c | 5 +- src/overlay005/ov5_021E1B08.c | 4 +- src/overlay005/ov5_021E1D20.c | 4 +- src/overlay005/ov5_021EA874.c | 4 +- src/overlay005/ov5_021F007C.c | 3 +- src/overlay005/ov5_021F08CC.c | 3 +- src/overlay005/ov5_021F6454.c | 3 +- src/overlay005/ov5_021F77A8.c | 3 +- src/overlay006/ov6_0223E140.c | 5 +- src/overlay006/ov6_02243258.c | 3 +- src/overlay006/ov6_02247A0C.c | 4 +- src/overlay007/communication_club.c | 4 +- src/overlay007/ov7_0224B4E8.c | 3 +- src/overlay007/ov7_0224BE9C.c | 5 +- src/overlay007/ov7_0224CD28.c | 3 +- src/overlay008/ov8_02249960.c | 3 +- src/overlay009/ov9_02249960.c | 2 +- src/overlay010/ov10_0221F800.c | 7 +- src/overlay012/ov12_0221FC20.c | 3 +- src/overlay012/ov12_02226B84.c | 3 +- src/overlay012/ov12_0222AC70.c | 3 +- src/overlay012/ov12_0222D6B0.c | 2 +- src/overlay012/ov12_0222E91C.c | 2 +- src/overlay012/ov12_0222F700.c | 2 +- src/overlay012/ov12_02234E44.c | 2 +- src/overlay013/ov13_0221FC20.c | 5 +- src/overlay013/ov13_02221A88.c | 5 +- src/overlay013/ov13_02225710.c | 2 +- src/overlay013/ov13_022264F4.c | 5 +- src/overlay013/ov13_02227288.c | 5 +- src/overlay013/ov13_02228128.c | 2 +- src/overlay017/ov17_0223B140.c | 5 +- src/overlay017/ov17_0223CB1C.c | 5 +- src/overlay017/ov17_0223DAD0.c | 5 +- src/overlay017/ov17_0223F118.c | 4 +- src/overlay017/ov17_0223F7E4.c | 5 +- src/overlay017/ov17_022413D8.c | 2 +- src/overlay017/ov17_022476F8.c | 2 +- src/overlay017/ov17_02247A48.c | 2 +- src/overlay017/ov17_022492DC.c | 5 +- src/overlay017/ov17_0224A0FC.c | 2 +- src/overlay017/ov17_0224CFB8.c | 2 +- src/overlay017/ov17_0224F4D4.c | 5 +- src/overlay017/ov17_02250744.c | 2 +- src/overlay017/ov17_02251D6C.c | 2 +- src/overlay019/ov19_021D61B0.c | 5 +- src/overlay019/ov19_021D79F8.c | 4 +- src/overlay019/ov19_021DA92C.c | 5 +- src/overlay019/ov19_021DB2FC.c | 5 +- src/overlay019/ov19_021DB8E4.c | 5 +- src/overlay019/ov19_021DC5F0.c | 3 +- src/overlay019/ov19_021DCF88.c | 4 +- src/overlay019/ov19_021DE3E8.c | 3 +- src/overlay019/ov19_021DEC04.c | 5 +- src/overlay020/ov20_021D2098.c | 5 +- src/overlay020/ov20_021D2EA4.c | 4 +- src/overlay020/ov20_021D3864.c | 5 +- src/overlay020/ov20_021D3A54.c | 4 +- src/overlay020/ov20_021D40E8.c | 4 +- src/overlay020/ov20_021D4728.c | 4 +- src/overlay020/ov20_021D4E38.c | 4 +- src/overlay021/ov21_021D0D80.c | 4 +- src/overlay021/ov21_021D1FA4.c | 5 +- src/overlay021/ov21_021D4C0C.c | 4 +- src/overlay021/ov21_021D517C.c | 4 +- src/overlay021/ov21_021D5AEC.c | 3 +- src/overlay021/ov21_021D76B0.c | 4 +- src/overlay021/ov21_021D85B0.c | 2 +- src/overlay021/ov21_021D94BC.c | 3 +- src/overlay021/ov21_021DC9BC.c | 3 +- src/overlay021/ov21_021DDD2C.c | 2 +- src/overlay021/ov21_021DE668.c | 3 +- src/overlay021/ov21_021DF734.c | 3 +- src/overlay021/ov21_021E0C68.c | 3 +- src/overlay021/ov21_021E1924.c | 3 +- src/overlay021/ov21_021E29DC.c | 3 +- src/overlay021/ov21_021E3FFC.c | 3 +- src/overlay021/ov21_021E4CA4.c | 3 +- src/overlay021/ov21_021E6014.c | 2 +- src/overlay021/ov21_021E68F4.c | 3 +- src/overlay021/ov21_021E737C.c | 2 +- src/overlay021/ov21_021E8484.c | 3 +- src/overlay021/ov21_021E8D48.c | 5 +- src/overlay022/ov22_02255094.c | 5 +- src/overlay022/ov22_02255D44.c | 3 +- src/overlay022/ov22_022597BC.c | 4 +- src/overlay022/ov22_02259C58.c | 3 +- src/overlay022/ov22_0225A428.c | 4 +- src/overlay022/ov22_0225AF8C.c | 3 +- src/overlay022/ov22_0225B660.c | 3 +- src/overlay023/ov23_0223E140.c | 6 +- src/overlay023/ov23_0224340C.c | 3 +- src/overlay023/ov23_02248C08.c | 2 +- src/overlay023/ov23_02248F1C.c | 5 +- src/overlay023/ov23_0224B05C.c | 4 +- src/overlay023/ov23_0224DC40.c | 4 +- src/overlay023/ov23_0224F294.c | 3 +- src/overlay023/ov23_0225128C.c | 3 +- src/overlay023/ov23_022521F0.c | 3 +- src/overlay023/ov23_02253598.c | 4 +- src/overlay023/ov23_02253D40.c | 5 +- src/overlay023/ov23_022542CC.c | 3 +- src/overlay024/ov24_02253CE0.c | 5 +- src/overlay025/ov25_02254560.c | 5 +- src/overlay025/ov25_02255090.c | 3 +- src/overlay025/poketch_system.c | 3 +- src/overlay026/ov26_022561C0.c | 3 +- src/overlay026/ov26_02256404.c | 5 +- src/overlay027/ov27_022561C0.c | 3 +- src/overlay027/ov27_0225680C.c | 5 +- src/overlay028/ov28_022561C0.c | 2 +- src/overlay028/ov28_0225697C.c | 5 +- src/overlay029/ov29_022561C0.c | 3 +- src/overlay029/ov29_022566C8.c | 7 +- src/overlay030/ov30_022561C0.c | 3 +- src/overlay030/ov30_022563EC.c | 5 +- src/overlay031/ov31_022561C0.c | 3 +- src/overlay031/ov31_02256554.c | 5 +- src/overlay032/ov32_022561C0.c | 2 +- src/overlay032/ov32_02256470.c | 5 +- src/overlay033/ov33_022561C0.c | 2 +- src/overlay033/ov33_02256474.c | 4 +- src/overlay034/ov34_022561C0.c | 2 +- src/overlay034/ov34_02256540.c | 5 +- src/overlay035/ov35_022561C0.c | 3 +- src/overlay035/ov35_02256410.c | 5 +- src/overlay036/ov36_022561C0.c | 3 +- src/overlay036/ov36_02256404.c | 5 +- src/overlay037/ov37_022561C0.c | 3 +- src/overlay037/ov37_022563D4.c | 5 +- src/overlay038/ov38_022561C0.c | 3 +- src/overlay038/ov38_0225632C.c | 5 +- src/overlay039/ov39_022561C0.c | 3 +- src/overlay039/ov39_022563DC.c | 5 +- src/overlay040/ov40_022561C0.c | 2 +- src/overlay040/ov40_0225645C.c | 5 +- src/overlay041/ov41_022561C0.c | 3 +- src/overlay041/ov41_022567B0.c | 7 +- src/overlay042/ov42_022561C0.c | 3 +- src/overlay042/ov42_022563D4.c | 5 +- src/overlay043/ov43_022561C0.c | 3 +- src/overlay043/ov43_02256544.c | 6 +- src/overlay044/ov44_022561C0.c | 2 +- src/overlay044/ov44_022565BC.c | 5 +- src/overlay045/ov45_022561C0.c | 3 +- src/overlay045/ov45_022566EC.c | 5 +- src/overlay046/ov46_022561C0.c | 3 +- src/overlay046/ov46_02256BCC.c | 5 +- src/overlay047/ov47_022561C0.c | 2 +- src/overlay047/ov47_02256634.c | 5 +- src/overlay048/ov48_022561C0.c | 2 +- src/overlay048/ov48_0225650C.c | 6 +- src/overlay049/ov49_022561C0.c | 3 +- src/overlay049/ov49_022563D4.c | 5 +- src/overlay050/ov50_022561C0.c | 3 +- src/overlay050/ov50_02256510.c | 5 +- src/overlay051/ov51_022561C0.c | 3 +- src/overlay051/ov51_0225632C.c | 5 +- src/overlay052/ov52_022561C0.c | 3 +- src/overlay052/ov52_02256694.c | 6 +- src/overlay053/ov53_022561C0.c | 3 +- src/overlay053/ov53_02256420.c | 5 +- src/overlay054/ov54_022561C0.c | 3 +- src/overlay054/ov54_0225642C.c | 6 +- src/overlay055/ov55_022561C0.c | 3 +- src/overlay055/ov55_0225632C.c | 5 +- src/overlay056/ov56_022561C0.c | 5 +- src/overlay058/ov58_021D0D80.c | 6 +- src/overlay059/ov59_021D0D80.c | 7 +- src/overlay061/ov61_0222BF44.c | 7 +- src/overlay062/ov62_0222F2C0.c | 5 +- src/overlay062/ov62_022300D8.c | 4 +- src/overlay062/ov62_02231690.c | 4 +- src/overlay062/ov62_02234A10.c | 3 +- src/overlay062/ov62_02235E64.c | 3 +- src/overlay062/ov62_02236CBC.c | 3 +- src/overlay062/ov62_02237D24.c | 3 +- src/overlay062/ov62_02239D60.c | 3 +- src/overlay062/ov62_0223CAEC.c | 3 +- src/overlay062/ov62_0223DFA8.c | 3 +- src/overlay062/ov62_02241204.c | 3 +- src/overlay062/ov62_02246B00.c | 2 +- src/overlay062/ov62_02247D74.c | 3 +- src/overlay063/ov63_0222D1C0.c | 4 +- src/overlay064/ov64_0222DCE0.c | 7 +- src/overlay065/ov65_0222DCE0.c | 7 +- src/overlay065/ov65_02235060.c | 3 +- src/overlay065/ov65_0223648C.c | 7 +- src/overlay067/ov67_0225C700.c | 7 +- src/overlay068/ov68_0225C700.c | 7 +- src/overlay069/ov69_0225C700.c | 6 +- src/overlay070/ov70_0225D9A4.c | 7 +- src/overlay071/ov71_0223B140.c | 5 +- src/overlay071/ov71_0223C69C.c | 6 +- src/overlay072/ov72_0223D7A0.c | 6 +- src/overlay073/ov73_021D0D80.c | 7 +- src/overlay073/ov73_021D3250.c | 8 +- src/overlay074/ov74_021D0D80.c | 8 +- src/overlay075/ov75_021D0D80.c | 7 +- src/overlay076/ov76_0223B870.c | 4 +- src/overlay076/ov76_0223D338.c | 5 +- src/overlay077/ov77_021D0D80.c | 7 +- src/overlay077/ov77_021D25B0.c | 5 +- src/overlay079/ov79_021D0D80.c | 4 +- src/overlay079/ov79_021D183C.c | 3 +- src/overlay079/ov79_021D2268.c | 7 +- src/overlay080/ov80_021D0D80.c | 5 +- src/overlay080/ov80_021D1458.c | 3 +- src/overlay081/ov81_021D0D80.c | 5 +- src/overlay081/ov81_021D1610.c | 4 +- src/overlay083/ov83_0223C958.c | 5 +- src/overlay083/ov83_0223D6A8.c | 4 +- src/overlay084/ov84_0223B5A0.c | 5 +- src/overlay084/ov84_0223F040.c | 4 +- src/overlay085/ov85_02241440.c | 7 +- src/overlay086/ov86_0223B140.c | 6 +- src/overlay087/ov87_021D106C.c | 6 +- src/overlay088/ov88_0223B140.c | 6 +- src/overlay088/ov88_0223E9C4.c | 5 +- src/overlay090/ov90_021D0D80.c | 7 +- src/overlay091/ov91_021D0D80.c | 7 +- src/overlay092/ov92_021D0D80.c | 7 +- src/overlay094/ov94_0223BCB0.c | 5 +- src/overlay094/ov94_0223C610.c | 6 +- src/overlay094/ov94_0223D0C4.c | 5 +- src/overlay094/ov94_0223DC04.c | 6 +- src/overlay094/ov94_0223E46C.c | 5 +- src/overlay094/ov94_0223FB48.c | 6 +- src/overlay094/ov94_022414B8.c | 5 +- src/overlay094/ov94_02242AD0.c | 5 +- src/overlay094/ov94_02244950.c | 5 +- src/overlay095/ov95_02246C20.c | 3 +- src/overlay095/ov95_02247B6C.c | 6 +- src/overlay095/ov95_02248590.c | 5 +- src/overlay095/ov95_02249740.c | 5 +- src/overlay095/ov95_02249F90.c | 5 +- src/overlay095/ov95_0224A390.c | 5 +- src/overlay095/ov95_0224ABC0.c | 5 +- src/overlay095/ov95_0224B3D8.c | 6 +- src/overlay096/ov96_0223B6A0.c | 5 +- src/overlay096/ov96_0223BCE0.c | 5 +- src/overlay097/ov97_0222AE60.c | 5 +- src/overlay097/ov97_0222C174.c | 5 +- src/overlay097/ov97_0222D30C.c | 6 +- src/overlay097/ov97_02230410.c | 4 +- src/overlay097/ov97_02232054.c | 5 +- src/overlay097/ov97_02233B18.c | 6 +- src/overlay097/ov97_02237694.c | 5 +- src/overlay098/ov98_022471C8.c | 7 +- src/overlay099/ov99_021D0D80.c | 5 +- src/overlay099/ov99_021D1A54.c | 3 +- src/overlay099/ov99_021D2C08.c | 2 +- src/overlay099/ov99_021D2E28.c | 2 +- src/overlay099/ov99_021D3C18.c | 2 +- src/overlay099/ov99_021D3E78.c | 5 +- src/overlay099/ov99_021D4134.c | 3 +- src/overlay100/ov100_021D0D80.c | 6 +- src/overlay100/ov100_021D13E4.c | 2 +- src/overlay100/ov100_021D1C44.c | 2 +- src/overlay100/ov100_021D2F0C.c | 2 +- src/overlay100/ov100_021D46C8.c | 2 +- src/overlay100/ov100_021D4E04.c | 3 +- src/overlay101/ov101_021D0D80.c | 6 +- src/overlay101/ov101_021D1A28.c | 2 +- src/overlay102/ov102_021D0D80.c | 8 +- src/overlay104/ov104_0222EA90.c | 2 +- src/overlay104/ov104_0222FBE4.c | 5 +- src/overlay104/ov104_02231F74.c | 3 +- src/overlay104/ov104_022332B4.c | 2 +- src/overlay104/ov104_022361B4.c | 4 +- src/overlay104/ov104_02237DD8.c | 2 +- src/overlay104/ov104_0223B6F4.c | 3 +- src/overlay104/ov104_0223C164.c | 4 +- src/overlay104/ov104_0223C2D4.c | 5 +- src/overlay104/ov104_0223D9E4.c | 3 +- src/overlay104/ov104_0223DC7C.c | 4 +- src/overlay104/ov104_0223E894.c | 4 +- src/overlay105/ov105_02241AE0.c | 6 +- src/overlay105/ov105_02246214.c | 7 +- src/overlay106/ov106_02241AE0.c | 6 +- src/overlay106/ov106_022436E0.c | 7 +- src/overlay107/ov107_02241AE0.c | 6 +- src/overlay107/ov107_02245EB0.c | 6 +- src/overlay107/ov107_02249D14.c | 7 +- src/overlay108/ov108_02241AE0.c | 6 +- src/overlay108/ov108_02243630.c | 7 +- src/overlay109/ov109_021D0D80.c | 7 +- src/overlay109/ov109_021D3D50.c | 7 +- src/overlay110/ov110_021D0D80.c | 6 +- src/overlay110/ov110_021D2124.c | 7 +- src/overlay111/ov111_021D0D80.c | 6 +- src/overlay111/ov111_021D3548.c | 7 +- src/overlay112/ov112_0225C700.c | 6 +- src/overlay113/ov113_0225C700.c | 6 +- src/overlay113/ov113_02260620.c | 4 +- src/overlay114/ov114_0225C700.c | 6 +- src/overlay115/ov115_02260CEC.c | 6 +- src/overlay116/ov116_022604C4.c | 5 +- src/overlay116/ov116_02261870.c | 4 +- src/overlay116/ov116_0226432C.c | 2 +- src/overlay117/ov117_02260668.c | 5 +- src/overlay117/ov117_02263AF0.c | 4 +- src/overlay119/ov119_021D0D80.c | 6 +- src/pokemon_summary_app.c | 6 +- src/render_text.c | 2 +- src/scrcmd.c | 4 +- src/text.c | 4 +- src/unk_0200112C.c | 2 +- src/unk_02001AF4.c | 6 +- src/unk_02006E3C.c | 3 +- src/unk_0200C440.c | 4 +- src/unk_0200DA60.c | 5 +- src/unk_02012744.c | 2 +- src/unk_0201567C.c | 2 +- src/unk_02015920.c | 3 +- src/unk_020366A0.c | 2 +- src/unk_02039814.c | 8 +- src/unk_02039A64.c | 8 +- src/unk_020494DC.c | 2 +- src/unk_0204C6C8.c | 3 +- src/unk_0204C8F0.c | 3 +- src/unk_020528D0.c | 7 +- src/unk_02052C6C.c | 5 +- src/unk_0205A0D8.c | 3 +- src/unk_0205CA94.c | 2 +- src/unk_0205D8CC.c | 5 +- src/unk_020683F4.c | 3 +- src/unk_0206F314.c | 5 +- src/unk_020722AC.c | 5 +- src/unk_0207AE68.c | 7 +- src/unk_0207E0B8.c | 6 +- src/unk_020819DC.c | 6 +- src/unk_02083370.c | 2 +- src/unk_02084B70.c | 2 +- src/unk_0208694C.c | 6 +- src/unk_020890F4.c | 5 +- src/unk_0208A3F4.c | 4 +- src/unk_0208C098.c | 3 +- src/unk_0208EA44.c | 3 +- src/unk_0208FCF8.c | 5 +- src/unk_020920C0.c | 2 +- src/unk_02095E98.c | 2 +- src/unk_02097B18.c | 2 +- src/unk_02098218.c | 2 +- src/unk_02099DFC.c | 8 +- src/unk_0209A2C4.c | 8 +- src/unk_0209A74C.c | 8 +- src/unk_0209AA74.c | 8 +- src/unk_0209ACF4.c | 3 +- 578 files changed, 723 insertions(+), 1672 deletions(-) rename include/{unk_02018340.h => bg_window.h} (80%) delete mode 100644 include/overlay061/struct_ov61_0222C884.h delete mode 100644 include/overlay084/struct_ov84_0223BA5C.h delete mode 100644 include/overlay097/struct_ov97_0222DB78.h delete mode 100644 include/struct_decls/struct_02018340_decl.h delete mode 100644 include/struct_defs/struct_0201AE08.h delete mode 100644 include/struct_defs/struct_0205AA50.h rename src/{unk_02018340.c => bg_window.c} (99%) diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index 46bd6c7fd6..78bf2d6baa 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -12,11 +12,9 @@ #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/chatot_cry.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/trainer_data.h" #include "battle/battle_context.h" @@ -31,6 +29,7 @@ #include "overlay012/struct_ov12_0221FCDC_decl.h" #include "bag.h" +#include "bg_window.h" #include "game_options.h" #include "message.h" #include "pokemon.h" diff --git a/include/battle/ov16_0226871C.h b/include/battle/ov16_0226871C.h index f01059d261..4e617a09a6 100644 --- a/include/battle/ov16_0226871C.h +++ b/include/battle/ov16_0226871C.h @@ -3,12 +3,13 @@ #include "struct_decls/battle_system.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0209C370.h" #include "battle/struct_ov16_02268A14_decl.h" #include "battle/struct_ov16_0226AC98.h" +#include "bg_window.h" + void ov16_02268744(BGL *param0); void ov16_022687A0(BGL *param0); void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3, UnkStruct_0209C370 *param4); diff --git a/include/battle/struct_ov16_0225BFFC_t.h b/include/battle/struct_ov16_0225BFFC_t.h index bfd6896c90..f92fd63eea 100644 --- a/include/battle/struct_ov16_0225BFFC_t.h +++ b/include/battle/struct_ov16_0225BFFC_t.h @@ -4,7 +4,6 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "battle/struct_ov16_0225BFFC_sub1.h" #include "battle/struct_ov16_022674C4.h" @@ -12,6 +11,7 @@ #include "overlay012/struct_ball_rotation_decl.h" #include "overlay012/struct_ov12_02223764.h" +#include "bg_window.h" #include "sys_task_manager.h" #define DATA_BUF_SIZE 256 diff --git a/include/battle/struct_ov16_02264408.h b/include/battle/struct_ov16_02264408.h index 88889131a9..571c84d695 100644 --- a/include/battle/struct_ov16_02264408.h +++ b/include/battle/struct_ov16_02264408.h @@ -4,12 +4,13 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/chatot_cry.h" #include "battle/struct_ov16_0223E0C8.h" #include "battle/struct_ov16_02264408_sub1.h" +#include "bg_window.h" + typedef struct { SpriteRenderer *unk_00; BGL *unk_04; diff --git a/include/battle/struct_ov16_022674C4.h b/include/battle/struct_ov16_022674C4.h index 990be9942d..31c95b23d0 100644 --- a/include/battle/struct_ov16_022674C4.h +++ b/include/battle/struct_ov16_022674C4.h @@ -3,8 +3,8 @@ #include "struct_decls/battle_system.h" #include "struct_decls/cell_actor_data.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" #include "sys_task_manager.h" typedef struct { diff --git a/include/unk_02018340.h b/include/bg_window.h similarity index 80% rename from include/unk_02018340.h rename to include/bg_window.h index 31e95973d8..f3a5d00434 100644 --- a/include/unk_02018340.h +++ b/include/bg_window.h @@ -1,15 +1,8 @@ -#ifndef POKEPLATINUM_UNK_02018340_H -#define POKEPLATINUM_UNK_02018340_H +#ifndef POKEPLATINUM_BG_WINDOW_H +#define POKEPLATINUM_BG_WINDOW_H #include - -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0201AE08.h" -#include "struct_defs/struct_0205AA50.h" - -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include enum BGLFrame { BGL_FRAME_MAIN_0 = 0, @@ -31,6 +24,82 @@ enum BGLScreenSize { SCREEN_SIZE_1024x1024, }; +typedef struct { + const u8 *unk_00; + u16 unk_04; + u16 unk_06; +} UnkStruct_0201AE08; + +typedef struct { + int unk_00; + int unk_04; + u32 unk_08; + u32 unk_0C; + u8 unk_10; + u8 unk_11; + u8 unk_12; + u8 unk_13; + u8 unk_14; + u8 unk_15; + u8 unk_16; + u8 unk_17; + BOOL unk_18; +} UnkStruct_ov97_0222DB78; + +typedef struct { + void *unk_00; + u32 unk_04; + u32 unk_08; + int unk_0C; + int unk_10; + u8 unk_14; + u8 unk_15; + u8 unk_16; + u8 unk_17; + u16 unk_18; + fx32 unk_1C; + fx32 unk_20; + int unk_24; + int unk_28; +} UnkStruct_02019304; + +typedef struct UnkStruct_02018340_t { + u32 unk_00; + u16 unk_04; + u16 unk_06; + UnkStruct_02019304 unk_08[8]; +} BGL; + +typedef struct { + u8 unk_00; + u8 unk_01; + u8 unk_02; + u8 unk_03; + u8 unk_04; + u8 unk_05; + u16 unk_06; +} UnkStruct_ov61_0222C884; + +typedef struct { + BGL *unk_00; + u8 unk_04; + u8 unk_05; + u8 unk_06; + u8 unk_07; + u8 unk_08; + u8 unk_09; + u16 unk_0A_0 : 15; + u16 unk_0A_15 : 1; + void *unk_0C; +} Window; + +typedef struct { + GXDispMode unk_00; + GXBGMode unk_04; + GXBGMode unk_08; + GXBG0As unk_0C; +} UnkStruct_ov84_0223BA5C; + BGL *sub_02018340(u32 param0); u32 sub_02018364(BGL *param0); void sub_02018368(const UnkStruct_ov84_0223BA5C *param0); @@ -112,4 +181,4 @@ void sub_0201C6A8(BGL *param0, u8 param1, u8 param2, fx32 param3); void sub_0201C718(BGL *param0, u8 param1, u8 param2, int param3); u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4); -#endif // POKEPLATINUM_UNK_02018340_H +#endif // POKEPLATINUM_BG_WINDOW_H diff --git a/include/colored_arrow.h b/include/colored_arrow.h index 9d7d65a5f0..912b2b84f8 100644 --- a/include/colored_arrow.h +++ b/include/colored_arrow.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_COLORED_ARROW_H #define POKEPLATINUM_COLORED_ARROW_H -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "strbuf.h" #include "text.h" diff --git a/include/field/field_system.h b/include/field/field_system.h index 48f5cc08cb..6a6b6338fa 100644 --- a/include/field/field_system.h +++ b/include/field/field_system.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_FIELD_SYSTEM_STRUCT_H #define POKEPLATINUM_FIELD_SYSTEM_STRUCT_H -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02039E30_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02054C18_decl.h" @@ -40,6 +39,7 @@ #include "overlay066/struct_ov66_0222DCE0_sub1.h" #include "bag.h" +#include "bg_window.h" #include "camera.h" #include "journal.h" #include "map_header_data.h" diff --git a/include/field_system.h b/include/field_system.h index b0cfa16adf..40a81954fa 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -1,11 +1,10 @@ #ifndef POKEPLATINUM_FIELD_SYSTEM_H #define POKEPLATINUM_FIELD_SYSTEM_H -#include "struct_decls/struct_02018340_decl.h" - #include "field/field_system_decl.h" #include "overlay025/poketch_system.h" +#include "bg_window.h" #include "overlay_manager.h" #include "savedata.h" diff --git a/include/overlay005/encounter_effect.h b/include/overlay005/encounter_effect.h index e3db8e0032..b1ab853be0 100644 --- a/include/overlay005/encounter_effect.h +++ b/include/overlay005/encounter_effect.h @@ -4,8 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system_decl.h" #include "overlay005/encounter_effect.h" @@ -18,6 +16,7 @@ #include "overlay005/struct_ov5_021DE5A4.h" #include "overlay006/battle_params.h" +#include "bg_window.h" #include "cell_actor.h" #include "enc_effects.h" #include "sys_task_manager.h" diff --git a/include/overlay005/ov5_021D0D80.h b/include/overlay005/ov5_021D0D80.h index 78f9e514d2..11d443e961 100644 --- a/include/overlay005/ov5_021D0D80.h +++ b/include/overlay005/ov5_021D0D80.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_OV5_021D0D80_H #define POKEPLATINUM_OV5_021D0D80_H -#include "struct_decls/struct_02018340_decl.h" - #include "field/field_system_decl.h" +#include "bg_window.h" + void ov5_021D12D0(FieldSystem *fieldSystem, u32 param1); void ov5_021D1434(BGL *param0); void ov5_021D143C(BGL *param0); diff --git a/include/overlay005/ov5_021DC018.h b/include/overlay005/ov5_021DC018.h index eab4797801..dca362de5a 100644 --- a/include/overlay005/ov5_021DC018.h +++ b/include/overlay005/ov5_021DC018.h @@ -1,11 +1,10 @@ #ifndef POKEPLATINUM_OV5_021DC018_H #define POKEPLATINUM_OV5_021DC018_H -#include "struct_defs/struct_0205AA50.h" - #include "field/field_system_decl.h" #include "overlay005/struct_ov5_021DC1A4_decl.h" +#include "bg_window.h" #include "message.h" #include "string_template.h" diff --git a/include/overlay005/ov5_021DD6FC.h b/include/overlay005/ov5_021DD6FC.h index e61a8f7eab..433bd1333f 100644 --- a/include/overlay005/ov5_021DD6FC.h +++ b/include/overlay005/ov5_021DD6FC.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV5_021DD6FC_H #define POKEPLATINUM_OV5_021DD6FC_H -#include "struct_decls/struct_02018340_decl.h" - #include "field/field_system_decl.h" #include "overlay005/struct_ov5_021DD9C8_decl.h" +#include "bg_window.h" + UnkStruct_ov5_021DD9C8 *ov5_021DD98C(BGL *param0); void ov5_021DD9C8(UnkStruct_ov5_021DD9C8 *param0); void ov5_021DD9E8(UnkStruct_ov5_021DD9C8 *param0, const int param1, const int param2); diff --git a/include/overlay005/ov5_021E1B08.h b/include/overlay005/ov5_021E1B08.h index 65322422f0..8e28df603b 100644 --- a/include/overlay005/ov5_021E1B08.h +++ b/include/overlay005/ov5_021E1B08.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV5_021E1B08_H #define POKEPLATINUM_OV5_021E1B08_H -#include "struct_defs/struct_0205AA50.h" - #include "field/field_system_decl.h" #include "overlay005/struct_ov5_021E1B20_decl.h" +#include "bg_window.h" + void *ov5_021E1B08(u32 param0); void ov5_021E1B20(UnkStruct_ov5_021E1B20 *param0); void ov5_021E1B38(UnkStruct_ov5_021E1B20 *param0, u16 param1, u16 param2); diff --git a/include/overlay005/struct_ov5_021E52A8_sub2.h b/include/overlay005/struct_ov5_021E52A8_sub2.h index 8a72bd087d..4f7aa6676d 100644 --- a/include/overlay005/struct_ov5_021E52A8_sub2.h +++ b/include/overlay005/struct_ov5_021E52A8_sub2.h @@ -3,7 +3,7 @@ #include -#include "struct_decls/struct_02018340_decl.h" +#include "bg_window.h" typedef struct { BGL *unk_00; diff --git a/include/overlay007/ov7_0224BE9C.h b/include/overlay007/ov7_0224BE9C.h index 9c25a5f9c9..0966557f6a 100644 --- a/include/overlay007/ov7_0224BE9C.h +++ b/include/overlay007/ov7_0224BE9C.h @@ -1,10 +1,9 @@ #ifndef POKEPLATINUM_OV7_0224BE9C_H #define POKEPLATINUM_OV7_0224BE9C_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay007/struct_ov7_0224BEFC_decl.h" +#include "bg_window.h" #include "savedata.h" UnkStruct_ov7_0224BEFC *ov7_0224BE9C(u32 param0, SaveData *param1, BGL *param2); diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h index 041b7ce56f..e2822cad73 100644 --- a/include/overlay007/struct_ov7_0224D008.h +++ b/include/overlay007/struct_ov7_0224D008.h @@ -5,11 +5,10 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay005/struct_ov5_021D30A8.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "game_options.h" diff --git a/include/overlay008/ov8_02249960.h b/include/overlay008/ov8_02249960.h index f0dc9dee9a..9d740e3f12 100644 --- a/include/overlay008/ov8_02249960.h +++ b/include/overlay008/ov8_02249960.h @@ -1,10 +1,9 @@ #ifndef POKEPLATINUM_OV8_02249960_H #define POKEPLATINUM_OV8_02249960_H -#include "struct_defs/struct_0205AA50.h" - #include "field/field_system_decl.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" diff --git a/include/overlay012/ov12_0221FC20.h b/include/overlay012/ov12_0221FC20.h index 3df1cfbc5b..7bfd4fe18f 100644 --- a/include/overlay012/ov12_0221FC20.h +++ b/include/overlay012/ov12_0221FC20.h @@ -8,7 +8,6 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "battle/struct_ov16_02264408.h" @@ -19,6 +18,7 @@ #include "overlay012/struct_ov12_02223764.h" #include "overlay012/struct_ov12_022380DC.h" +#include "bg_window.h" #include "spl.h" #include "sys_task_manager.h" diff --git a/include/overlay012/struct_ov12_0223595C.h b/include/overlay012/struct_ov12_0223595C.h index 79382426b8..e757e2c5e0 100644 --- a/include/overlay012/struct_ov12_0223595C.h +++ b/include/overlay012/struct_ov12_0223595C.h @@ -4,10 +4,11 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay012/struct_ov12_0221FCDC_decl.h" +#include "bg_window.h" + typedef struct { u8 unk_00; u8 unk_01; diff --git a/include/overlay013/struct_ov13_022213F0.h b/include/overlay013/struct_ov13_022213F0.h index d805ee55c4..8df02e251e 100644 --- a/include/overlay013/struct_ov13_022213F0.h +++ b/include/overlay013/struct_ov13_022213F0.h @@ -5,13 +5,12 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay013/struct_ov13_0221FC20.h" #include "overlay013/struct_ov13_02221ED0.h" #include "overlay013/struct_ov13_02228A50_decl.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay013/struct_ov13_02227244.h b/include/overlay013/struct_ov13_02227244.h index 6bb0f7ddda..c22b5a665f 100644 --- a/include/overlay013/struct_ov13_02227244.h +++ b/include/overlay013/struct_ov13_02227244.h @@ -5,14 +5,13 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "battle/struct_ov16_0226DEEC_decl.h" #include "overlay013/struct_ov13_022264F4.h" #include "overlay013/struct_ov13_02228A50_decl.h" #include "bag.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay017/ov17_0223F118.h b/include/overlay017/ov17_0223F118.h index 6f04e5e375..86448cb85d 100644 --- a/include/overlay017/ov17_0223F118.h +++ b/include/overlay017/ov17_0223F118.h @@ -5,7 +5,6 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02095C48.h" @@ -13,6 +12,7 @@ #include "overlay017/struct_ov17_0223F6E8.h" #include "overlay017/struct_ov17_0223F744.h" +#include "bg_window.h" #include "strbuf.h" #include "text.h" diff --git a/include/overlay017/ov17_0223F7E4.h b/include/overlay017/ov17_0223F7E4.h index 9401fba0cd..4780265e63 100644 --- a/include/overlay017/ov17_0223F7E4.h +++ b/include/overlay017/ov17_0223F7E4.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_OV17_0223F7E4_H #define POKEPLATINUM_OV17_0223F7E4_H -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02095C48.h" #include "overlay017/struct_ov17_0223F7E4_decl.h" #include "overlay017/struct_ov17_0223F88C.h" #include "overlay017/struct_ov17_022472F8.h" +#include "bg_window.h" + void ov17_0223F80C(BGL *param0); void ov17_0223F864(BGL *param0); void *ov17_0223F88C(UnkStruct_02095C48 *param0, UnkStruct_ov17_0223F88C *param1, UnkStruct_ov17_022472F8 *param2); diff --git a/include/overlay017/ov17_022492DC.h b/include/overlay017/ov17_022492DC.h index 4bc767a191..62e50cb8b3 100644 --- a/include/overlay017/ov17_022492DC.h +++ b/include/overlay017/ov17_022492DC.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_OV17_022492DC_H #define POKEPLATINUM_OV17_022492DC_H -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02095C48.h" #include "overlay017/struct_ov17_022492DC_decl.h" #include "overlay017/struct_ov17_0224A1EC.h" +#include "bg_window.h" + void ov17_02249300(BGL *param0); void ov17_02249358(BGL *param0); void *ov17_02249380(UnkStruct_02095C48 *param0, UnkStruct_ov17_0224A1EC *param1); diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h index 05e665c4b7..ddd0b34f75 100644 --- a/include/overlay017/struct_ov17_0223F88C.h +++ b/include/overlay017/struct_ov17_0223F88C.h @@ -8,14 +8,13 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48_sub1.h" #include "battle/struct_ov16_0223E0C8.h" #include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay017/struct_ov17_0223F2E4.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay017/struct_ov17_022476F8.h b/include/overlay017/struct_ov17_022476F8.h index 006c1dc0a1..60439ba41b 100644 --- a/include/overlay017/struct_ov17_022476F8.h +++ b/include/overlay017/struct_ov17_022476F8.h @@ -7,13 +7,12 @@ #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48_sub1.h" #include "battle/struct_ov16_0223E0C8.h" #include "overlay017/struct_ov17_0223F6E8.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay017/struct_ov17_0224A1EC.h b/include/overlay017/struct_ov17_0224A1EC.h index ef0ccfefac..48661d5e5d 100644 --- a/include/overlay017/struct_ov17_0224A1EC.h +++ b/include/overlay017/struct_ov17_0224A1EC.h @@ -8,8 +8,6 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48_sub1.h" #include "battle/struct_ov16_0223E0C8.h" @@ -24,6 +22,7 @@ #include "overlay017/struct_ov17_0224C9A4.h" #include "overlay017/struct_ov17_02253084.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay017/struct_ov17_022507C4.h b/include/overlay017/struct_ov17_022507C4.h index ace346c613..3ee7e89a34 100644 --- a/include/overlay017/struct_ov17_022507C4.h +++ b/include/overlay017/struct_ov17_022507C4.h @@ -8,13 +8,12 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48_sub1.h" #include "battle/struct_ov16_0223E0C8.h" #include "overlay017/struct_ov17_0223F6E8.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay019/ov19_021D79F8.h b/include/overlay019/ov19_021D79F8.h index 9f6271afc6..2e4c41cffb 100644 --- a/include/overlay019/ov19_021D79F8.h +++ b/include/overlay019/ov19_021D79F8.h @@ -1,14 +1,13 @@ #ifndef POKEPLATINUM_OV19_021D79F8_H #define POKEPLATINUM_OV19_021D79F8_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D4F5C.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021D8318.h" #include "overlay019/struct_ov19_021DCD18.h" +#include "bg_window.h" #include "cell_actor.h" BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4); diff --git a/include/overlay019/ov19_021DA92C.h b/include/overlay019/ov19_021DA92C.h index e62717dd9c..96a44b3c69 100644 --- a/include/overlay019/ov19_021DA92C.h +++ b/include/overlay019/ov19_021DA92C.h @@ -2,12 +2,12 @@ #define POKEPLATINUM_OV19_021DA92C_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA9E0.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" diff --git a/include/overlay019/ov19_021DB2FC.h b/include/overlay019/ov19_021DB2FC.h index 8f7acf63cb..53f37bcdcb 100644 --- a/include/overlay019/ov19_021DB2FC.h +++ b/include/overlay019/ov19_021DB2FC.h @@ -2,13 +2,13 @@ #define POKEPLATINUM_OV19_021DB2FC_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DB6F0.h" #include "overlay019/struct_ov19_021DF964.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" diff --git a/include/overlay019/ov19_021DB8E4.h b/include/overlay019/ov19_021DB8E4.h index cdb4444aa2..c799603ff3 100644 --- a/include/overlay019/ov19_021DB8E4.h +++ b/include/overlay019/ov19_021DB8E4.h @@ -4,12 +4,12 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DBA9C.h" +#include "bg_window.h" #include "cell_actor.h" BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, NARC *param5); diff --git a/include/overlay019/ov19_021DC5F0.h b/include/overlay019/ov19_021DC5F0.h index f072438850..d1479c2e07 100644 --- a/include/overlay019/ov19_021DC5F0.h +++ b/include/overlay019/ov19_021DC5F0.h @@ -2,13 +2,13 @@ #define POKEPLATINUM_OV19_021DC5F0_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DC680.h" #include "overlay019/struct_ov19_021DCD18.h" +#include "bg_window.h" #include "cell_actor.h" BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, NARC *param5); diff --git a/include/overlay019/ov19_021DCF88.h b/include/overlay019/ov19_021DCF88.h index 53884f3a09..8887bc8f9e 100644 --- a/include/overlay019/ov19_021DCF88.h +++ b/include/overlay019/ov19_021DCF88.h @@ -2,12 +2,12 @@ #define POKEPLATINUM_OV19_021DCF88_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DCF88_decl.h" +#include "bg_window.h" #include "cell_actor.h" BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4); diff --git a/include/overlay019/ov19_021DE3E8.h b/include/overlay019/ov19_021DE3E8.h index 51afb4d1aa..5271cf93eb 100644 --- a/include/overlay019/ov19_021DE3E8.h +++ b/include/overlay019/ov19_021DE3E8.h @@ -3,12 +3,11 @@ #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DE3E8_decl.h" +#include "bg_window.h" #include "cell_actor.h" BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4); diff --git a/include/overlay019/ov19_021DEC04.h b/include/overlay019/ov19_021DEC04.h index 77e0f16f30..f8ac335dc8 100644 --- a/include/overlay019/ov19_021DEC04.h +++ b/include/overlay019/ov19_021DEC04.h @@ -2,12 +2,12 @@ #define POKEPLATINUM_OV19_021DEC04_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DEC04_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" diff --git a/include/overlay019/struct_ov19_021D8318.h b/include/overlay019/struct_ov19_021D8318.h index aaa2237aef..1e2c98b11f 100644 --- a/include/overlay019/struct_ov19_021D8318.h +++ b/include/overlay019/struct_ov19_021D8318.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021D8318_H #define POKEPLATINUM_STRUCT_OV19_021D8318_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DCD18.h" +#include "bg_window.h" + typedef struct { u8 unk_00; u8 unk_01; diff --git a/include/overlay019/struct_ov19_021DA9E0.h b/include/overlay019/struct_ov19_021DA9E0.h index e2189fecd3..87f680e05c 100644 --- a/include/overlay019/struct_ov19_021DA9E0.h +++ b/include/overlay019/struct_ov19_021DA9E0.h @@ -6,12 +6,11 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C440_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "strbuf.h" #include "sys_task_manager.h" diff --git a/include/overlay019/struct_ov19_021DB6F0.h b/include/overlay019/struct_ov19_021DB6F0.h index 54db9c128d..358086470d 100644 --- a/include/overlay019/struct_ov19_021DB6F0.h +++ b/include/overlay019/struct_ov19_021DB6F0.h @@ -3,12 +3,10 @@ #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay019/struct_ov19_021DBA9C.h b/include/overlay019/struct_ov19_021DBA9C.h index 4551f2b15e..ce0f0cdff3 100644 --- a/include/overlay019/struct_ov19_021DBA9C.h +++ b/include/overlay019/struct_ov19_021DBA9C.h @@ -4,13 +4,11 @@ #include #include "struct_decls/struct_0200C440_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0201AE08.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" #include "strbuf.h" diff --git a/include/overlay019/struct_ov19_021DC680.h b/include/overlay019/struct_ov19_021DC680.h index 56e2f7f14e..c71e562e1e 100644 --- a/include/overlay019/struct_ov19_021DC680.h +++ b/include/overlay019/struct_ov19_021DC680.h @@ -3,14 +3,13 @@ #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021D8318.h" #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DCD18.h" +#include "bg_window.h" #include "cell_actor.h" typedef struct { diff --git a/include/overlay020/ov20_021D2098.h b/include/overlay020/ov20_021D2098.h index ed4c006046..ad70498457 100644 --- a/include/overlay020/ov20_021D2098.h +++ b/include/overlay020/ov20_021D2098.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_OV20_021D2098_H #define POKEPLATINUM_OV20_021D2098_H -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020998EC_decl.h" #include "overlay020/struct_ov20_021D16E8_decl.h" #include "overlay020/struct_ov20_021D2128_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "sys_task_manager.h" diff --git a/include/overlay020/ov20_021D4E38.h b/include/overlay020/ov20_021D4E38.h index 74b4a8a938..54082269aa 100644 --- a/include/overlay020/ov20_021D4E38.h +++ b/include/overlay020/ov20_021D4E38.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV20_021D4E38_H #define POKEPLATINUM_OV20_021D4E38_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay020/struct_ov20_021D4E8C.h" #include "overlay020/struct_ov20_021D4FF0.h" +#include "bg_window.h" + void ov20_021D4E38(UnkStruct_ov20_021D4E8C *param0, BGL *param1, u32 param2, int param3, int param4, int param5); BOOL ov20_021D4E8C(UnkStruct_ov20_021D4E8C *param0); void ov20_021D4F1C(UnkStruct_ov20_021D4FF0 *param0, int param1, int param2, int param3, int param4, int param5); diff --git a/include/overlay020/struct_ov20_021D4E8C.h b/include/overlay020/struct_ov20_021D4E8C.h index 2750ea85ec..675a5e55fb 100644 --- a/include/overlay020/struct_ov20_021D4E8C.h +++ b/include/overlay020/struct_ov20_021D4E8C.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV20_021D4E8C_H #define POKEPLATINUM_STRUCT_OV20_021D4E8C_H -#include "struct_decls/struct_02018340_decl.h" - +#include "bg_window.h" #include "sys_task_manager.h" typedef struct { diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h index 2e0bf0c5bc..1bf1cda4cf 100644 --- a/include/overlay021/ov21_021D0D80.h +++ b/include/overlay021/ov21_021D0D80.h @@ -3,9 +3,6 @@ #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay021/struct_ov21_021D0D80_1.h" #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" @@ -18,6 +15,7 @@ #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "bg_window.h" #include "cell_actor.h" #include "overlay_manager.h" #include "strbuf.h" diff --git a/include/overlay021/ov21_021D1FA4.h b/include/overlay021/ov21_021D1FA4.h index 474d117af7..28c7836679 100644 --- a/include/overlay021/ov21_021D1FA4.h +++ b/include/overlay021/ov21_021D1FA4.h @@ -6,7 +6,6 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D22F8.h" @@ -16,6 +15,7 @@ #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021D4EE4_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "sprite_resource.h" diff --git a/include/overlay021/ov21_021D4C0C.h b/include/overlay021/ov21_021D4C0C.h index 2b1c55c706..092a00839c 100644 --- a/include/overlay021/ov21_021D4C0C.h +++ b/include/overlay021/ov21_021D4C0C.h @@ -1,13 +1,12 @@ #ifndef POKEPLATINUM_OV21_021D4C0C_H #define POKEPLATINUM_OV21_021D4C0C_H -#include "struct_defs/struct_0205AA50.h" - #include "overlay021/struct_ov21_021D1FA4.h" #include "overlay021/struct_ov21_021D4C0C_decl.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" +#include "bg_window.h" #include "strbuf.h" UnkStruct_ov21_021D4C0C *ov21_021D4C0C(const UnkStruct_ov21_021D1FA4 *param0); diff --git a/include/overlay021/ov21_021D517C.h b/include/overlay021/ov21_021D517C.h index 56b0ae29b0..9914396165 100644 --- a/include/overlay021/ov21_021D517C.h +++ b/include/overlay021/ov21_021D517C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV21_021D517C_H #define POKEPLATINUM_OV21_021D517C_H -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" void ov21_021D517C(Window *param0, u8 *param1, u16 param2, u16 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u16 param8, u16 param9); void ov21_021D5214(u8 *param0, u8 param1, u8 param2); diff --git a/include/overlay021/ov21_021DE668.h b/include/overlay021/ov21_021DE668.h index 275fd840f2..d53ebf5629 100644 --- a/include/overlay021/ov21_021DE668.h +++ b/include/overlay021/ov21_021DE668.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_OV21_021DE668_H #define POKEPLATINUM_OV21_021DE668_H -#include "struct_defs/struct_0205AA50.h" - #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D4C0C_decl.h" #include "overlay021/struct_ov21_021DE6D4.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "bg_window.h" + void ov21_021DE668(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); void ov21_021DE6C0(UnkStruct_ov21_021E68F4 *param0); BOOL ov21_021DE6D4(UnkStruct_ov21_021DE6D4 *param0, int param1); diff --git a/include/overlay021/struct_ov21_021D13FC.h b/include/overlay021/struct_ov21_021D13FC.h index e1604b80ea..581905fda8 100644 --- a/include/overlay021/struct_ov21_021D13FC.h +++ b/include/overlay021/struct_ov21_021D13FC.h @@ -5,9 +5,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02015064_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/struct_ov21_021D22F8.h" #include "overlay021/struct_ov21_021D23F8.h" @@ -15,6 +13,7 @@ #include "overlay021/struct_ov21_021D3124.h" #include "overlay021/struct_ov21_021D4C0C_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "sprite_resource.h" #include "sys_task_manager.h" diff --git a/include/overlay021/struct_ov21_021D157C.h b/include/overlay021/struct_ov21_021D157C.h index 8dc047de7b..155a0540a2 100644 --- a/include/overlay021/struct_ov21_021D157C.h +++ b/include/overlay021/struct_ov21_021D157C.h @@ -3,7 +3,7 @@ #include -#include "struct_decls/struct_02018340_decl.h" +#include "bg_window.h" typedef struct { BGL *unk_00; diff --git a/include/overlay021/struct_ov21_021D1FA4.h b/include/overlay021/struct_ov21_021D1FA4.h index 0515c43ac3..d3efdbebf5 100644 --- a/include/overlay021/struct_ov21_021D1FA4.h +++ b/include/overlay021/struct_ov21_021D1FA4.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV21_021D1FA4_H #define POKEPLATINUM_STRUCT_OV21_021D1FA4_H -#include "struct_decls/struct_02018340_decl.h" - +#include "bg_window.h" #include "cell_actor.h" typedef struct { diff --git a/include/overlay021/struct_ov21_021D4CB8.h b/include/overlay021/struct_ov21_021D4CB8.h index 234268a0d0..49f1eabbdd 100644 --- a/include/overlay021/struct_ov21_021D4CB8.h +++ b/include/overlay021/struct_ov21_021D4CB8.h @@ -3,10 +3,9 @@ #include -#include "struct_defs/struct_0205AA50.h" - #include "overlay021/struct_ov21_021D4C0C_decl.h" +#include "bg_window.h" #include "cell_actor.h" typedef struct { diff --git a/include/overlay021/struct_ov21_021E8E0C.h b/include/overlay021/struct_ov21_021E8E0C.h index 77b334ff49..30da353bc9 100644 --- a/include/overlay021/struct_ov21_021E8E0C.h +++ b/include/overlay021/struct_ov21_021E8E0C.h @@ -3,8 +3,8 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/struct_02018340_decl.h" +#include "bg_window.h" #include "pokemon.h" typedef struct { diff --git a/include/overlay022/ov22_02255094.h b/include/overlay022/ov22_02255094.h index d267be4421..eddd975f8b 100644 --- a/include/overlay022/ov22_02255094.h +++ b/include/overlay022/ov22_02255094.h @@ -5,12 +5,12 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay022/struct_ov22_022550D4.h" #include "overlay022/struct_ov22_02255CB8.h" #include "overlay022/struct_ov22_0225A0E4.h" +#include "bg_window.h" #include "cell_actor.h" void ov22_02255094(void); diff --git a/include/overlay022/struct_ov22_02256BAC.h b/include/overlay022/struct_ov22_02256BAC.h index ee6fea1d27..33e7ef0fb8 100644 --- a/include/overlay022/struct_ov22_02256BAC.h +++ b/include/overlay022/struct_ov22_02256BAC.h @@ -2,9 +2,9 @@ #define POKEPLATINUM_STRUCT_OV22_02256BAC_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02095C60.h" +#include "bg_window.h" #include "cell_actor.h" #include "game_options.h" #include "sprite_resource.h" diff --git a/include/overlay022/struct_ov22_02257964_sub2.h b/include/overlay022/struct_ov22_02257964_sub2.h index fe32b68c9f..7bee1af051 100644 --- a/include/overlay022/struct_ov22_02257964_sub2.h +++ b/include/overlay022/struct_ov22_02257964_sub2.h @@ -5,12 +5,13 @@ #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_020298D8.h" #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_022597BC.h" +#include "bg_window.h" + typedef struct { UnkStruct_02015064 *unk_00; UnkStruct_02015128 **unk_04; diff --git a/include/overlay022/struct_ov22_02257F50_sub2.h b/include/overlay022/struct_ov22_02257F50_sub2.h index 81ac238d19..baa7f781b9 100644 --- a/include/overlay022/struct_ov22_02257F50_sub2.h +++ b/include/overlay022/struct_ov22_02257F50_sub2.h @@ -4,11 +4,12 @@ #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_022597BC.h" +#include "bg_window.h" + typedef struct { UnkStruct_02015064 *unk_00; UnkStruct_02015128 **unk_04; diff --git a/include/overlay022/struct_ov22_02258470.h b/include/overlay022/struct_ov22_02258470.h index 3920fe08c6..dfa0e24b86 100644 --- a/include/overlay022/struct_ov22_02258470.h +++ b/include/overlay022/struct_ov22_02258470.h @@ -4,12 +4,13 @@ #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_0225899C.h" #include "overlay022/struct_ov22_02259484.h" +#include "bg_window.h" + typedef struct { UnkStruct_02015064 *unk_00; UnkStruct_02015128 **unk_04; diff --git a/include/overlay022/struct_ov22_022597BC.h b/include/overlay022/struct_ov22_022597BC.h index 57005a1d5b..efdd9d35cb 100644 --- a/include/overlay022/struct_ov22_022597BC.h +++ b/include/overlay022/struct_ov22_022597BC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV22_022597BC_H #define POKEPLATINUM_STRUCT_OV22_022597BC_H -#include "struct_decls/struct_02018340_decl.h" +#include "bg_window.h" typedef struct { BGL *unk_00; diff --git a/include/overlay022/struct_ov22_022599A0.h b/include/overlay022/struct_ov22_022599A0.h index 7ab22d7425..5c0d7caf49 100644 --- a/include/overlay022/struct_ov22_022599A0.h +++ b/include/overlay022/struct_ov22_022599A0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV22_022599A0_H #define POKEPLATINUM_STRUCT_OV22_022599A0_H -#include "struct_decls/struct_02018340_decl.h" +#include "bg_window.h" typedef struct { BGL *unk_00; diff --git a/include/overlay022/struct_ov22_02259C9C.h b/include/overlay022/struct_ov22_02259C9C.h index 594869464f..379fbc9e75 100644 --- a/include/overlay022/struct_ov22_02259C9C.h +++ b/include/overlay022/struct_ov22_02259C9C.h @@ -4,10 +4,11 @@ #include #include "struct_decls/struct_02012744_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay022/struct_ov22_02259C58_1.h" +#include "bg_window.h" + typedef struct { UnkStruct_ov22_02259C58_1 unk_00; const Window *unk_10; diff --git a/include/overlay022/struct_ov22_0225A0E4.h b/include/overlay022/struct_ov22_0225A0E4.h index c6adc25b5a..8f6f7ffc24 100644 --- a/include/overlay022/struct_ov22_0225A0E4.h +++ b/include/overlay022/struct_ov22_0225A0E4.h @@ -8,9 +8,9 @@ #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" +#include "bg_window.h" #include "cell_actor.h" #include "resource_collection.h" #include "sprite_resource.h" diff --git a/include/overlay022/struct_ov22_0225A428.h b/include/overlay022/struct_ov22_0225A428.h index 81e1f0b8a8..15b174a753 100644 --- a/include/overlay022/struct_ov22_0225A428.h +++ b/include/overlay022/struct_ov22_0225A428.h @@ -1,12 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV22_0225A428_H #define POKEPLATINUM_STRUCT_OV22_0225A428_H -#include "struct_defs/struct_0205AA50.h" - #include "overlay022/struct_ov22_022597BC.h" #include "overlay022/struct_ov22_0225A914.h" #include "overlay022/struct_ov22_0225AB54.h" +#include "bg_window.h" #include "cell_actor.h" #include "sprite_resource.h" #include "strbuf.h" diff --git a/include/overlay022/struct_ov22_0225AB54.h b/include/overlay022/struct_ov22_0225AB54.h index 99f2dbd18a..ac0102121d 100644 --- a/include/overlay022/struct_ov22_0225AB54.h +++ b/include/overlay022/struct_ov22_0225AB54.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV22_0225AB54_H #define POKEPLATINUM_STRUCT_OV22_0225AB54_H -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C60.h" #include "overlay022/struct_ov22_0225AE9C.h" +#include "bg_window.h" #include "cell_actor.h" #include "sprite_resource.h" #include "sys_task_manager.h" diff --git a/include/overlay022/struct_ov22_0225AF8C.h b/include/overlay022/struct_ov22_0225AF8C.h index de8211dc7a..d87612d092 100644 --- a/include/overlay022/struct_ov22_0225AF8C.h +++ b/include/overlay022/struct_ov22_0225AF8C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV22_0225AF8C_H #define POKEPLATINUM_STRUCT_OV22_0225AF8C_H -#include "struct_decls/struct_02018340_decl.h" +#include "bg_window.h" typedef struct { BGL *unk_00; diff --git a/include/overlay022/struct_ov22_0225B388.h b/include/overlay022/struct_ov22_0225B388.h index a37b63584f..110c0417bd 100644 --- a/include/overlay022/struct_ov22_0225B388.h +++ b/include/overlay022/struct_ov22_0225B388.h @@ -5,11 +5,12 @@ #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_02259484.h" +#include "bg_window.h" + typedef struct { UnkStruct_02015064 *unk_00; UnkStruct_02015128 **unk_04; diff --git a/include/overlay023/ov23_0224340C.h b/include/overlay023/ov23_0224340C.h index 658af2a753..6ab9e14a22 100644 --- a/include/overlay023/ov23_0224340C.h +++ b/include/overlay023/ov23_0224340C.h @@ -3,11 +3,10 @@ #include -#include "struct_decls/struct_02018340_decl.h" - #include "field/field_system_decl.h" #include "overlay023/struct_ov23_0224271C_decl.h" +#include "bg_window.h" #include "strbuf.h" void ov23_022434BC(void *param0, FieldSystem *fieldSystem); diff --git a/include/overlay023/ov23_02253598.h b/include/overlay023/ov23_02253598.h index dbea306de7..7a6d705086 100644 --- a/include/overlay023/ov23_02253598.h +++ b/include/overlay023/ov23_02253598.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_OV23_02253598_H #define POKEPLATINUM_OV23_02253598_H -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "overlay023/funcptr_ov23_02253834.h" #include "overlay023/struct_ov23_02253598_decl.h" +#include "bg_window.h" #include "savedata.h" #include "trainer_info.h" diff --git a/include/overlay023/ov23_02253D40.h b/include/overlay023/ov23_02253D40.h index dcc3dd97fc..bd104ca0a0 100644 --- a/include/overlay023/ov23_02253D40.h +++ b/include/overlay023/ov23_02253D40.h @@ -1,12 +1,11 @@ #ifndef POKEPLATINUM_OV23_02253D40_H #define POKEPLATINUM_OV23_02253D40_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay023/struct_ov23_02253E2C_decl.h" #include "overlay023/struct_ov23_02253F60.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "message.h" #include "trainer_info.h" diff --git a/include/overlay023/struct_ov23_02250CD4.h b/include/overlay023/struct_ov23_02250CD4.h index 0278a77483..d4695f4f2e 100644 --- a/include/overlay023/struct_ov23_02250CD4.h +++ b/include/overlay023/struct_ov23_02250CD4.h @@ -5,7 +5,6 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0206A844.h" #include "field/field_system_decl.h" @@ -17,6 +16,7 @@ #include "overlay023/funcptr_ov23_022515D8.h" #include "overlay023/struct_ov23_02248D20.h" +#include "bg_window.h" #include "strbuf.h" #include "string_template.h" #include "sys_task_manager.h" diff --git a/include/overlay024/ov24_02253CE0.h b/include/overlay024/ov24_02253CE0.h index 437541ca41..6d37119cb6 100644 --- a/include/overlay024/ov24_02253CE0.h +++ b/include/overlay024/ov24_02253CE0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV24_02253CE0_H #define POKEPLATINUM_OV24_02253CE0_H -#include "struct_decls/struct_02018340_decl.h" +#include "bg_window.h" void ov24_02253CE0(BGL *param0); void ov24_02253DA4(BGL *param0); diff --git a/include/overlay025/ov25_02254560.h b/include/overlay025/ov25_02254560.h index 3eeb4b0008..32e10d6231 100644 --- a/include/overlay025/ov25_02254560.h +++ b/include/overlay025/ov25_02254560.h @@ -3,13 +3,13 @@ #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02254560_1.h" #include "overlay025/struct_ov25_02254560_decl.h" #include "overlay025/struct_ov25_022555E8_decl.h" +#include "bg_window.h" + BOOL ov25_02254560(UnkStruct_ov25_02254560 **param0, const UnkStruct_ov25_02254560_1 *param1, NNSG2dOamManagerInstance *param2, PoketchSystem *poketchSys); UnkStruct_ov25_022555E8 *ov25_02254664(void); BGL *ov25_02254674(void); diff --git a/include/overlay025/ov25_02255090.h b/include/overlay025/ov25_02255090.h index 80071acf10..36fe9909cc 100644 --- a/include/overlay025/ov25_02255090.h +++ b/include/overlay025/ov25_02255090.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV25_02255090_H #define POKEPLATINUM_OV25_02255090_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255224_decl.h" +#include "bg_window.h" + void ov25_02255090(u32 *param0, u32 param1); BOOL ov25_02255130(u32 *param0, u32 param1); BOOL ov25_02255154(u32 *param0); diff --git a/include/overlay025/poketch_system.h b/include/overlay025/poketch_system.h index c10317d93b..36606195fd 100644 --- a/include/overlay025/poketch_system.h +++ b/include/overlay025/poketch_system.h @@ -3,13 +3,12 @@ #include -#include "struct_decls/struct_02018340_decl.h" - #include "field/field_system_decl.h" #include "overlay025/poketch_button.h" #include "overlay025/struct_ov25_02254560_1.h" #include "overlay025/struct_ov25_02254560_decl.h" +#include "bg_window.h" #include "poketch_data.h" #include "savedata.h" #include "sys_task_manager.h" diff --git a/include/overlay026/ov26_02256404.h b/include/overlay026/ov26_02256404.h index f753d30ac1..de90bb3aa9 100644 --- a/include/overlay026/ov26_02256404.h +++ b/include/overlay026/ov26_02256404.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV26_02256404_H #define POKEPLATINUM_OV26_02256404_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay026/struct_ov26_02256404_1.h" #include "overlay026/struct_ov26_02256404_decl.h" +#include "bg_window.h" + BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_02256404_1 *param1, BGL *param2); void ov26_0225649C(UnkStruct_ov26_02256404 *param0); void ov26_022564A8(UnkStruct_ov26_02256404 *param0, u32 param1); diff --git a/include/overlay027/ov27_0225680C.h b/include/overlay027/ov27_0225680C.h index bf91fb5c13..35de17e471 100644 --- a/include/overlay027/ov27_0225680C.h +++ b/include/overlay027/ov27_0225680C.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV27_0225680C_H #define POKEPLATINUM_OV27_0225680C_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay027/struct_ov27_0225680C_1.h" #include "overlay027/struct_ov27_0225680C_decl.h" +#include "bg_window.h" + BOOL ov27_0225680C(UnkStruct_ov27_0225680C **param0, const UnkStruct_ov27_0225680C_1 *param1, BGL *param2); void ov27_02256890(UnkStruct_ov27_0225680C *param0); void ov27_022569C8(UnkStruct_ov27_0225680C *param0, u32 param1); diff --git a/include/overlay028/ov28_0225697C.h b/include/overlay028/ov28_0225697C.h index db467c7fb9..6bcaf3118c 100644 --- a/include/overlay028/ov28_0225697C.h +++ b/include/overlay028/ov28_0225697C.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV28_0225697C_H #define POKEPLATINUM_OV28_0225697C_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay028/struct_ov28_0225697C_1.h" #include "overlay028/struct_ov28_0225697C_decl.h" +#include "bg_window.h" + BOOL ov28_0225697C(UnkStruct_ov28_0225697C **param0, const UnkStruct_ov28_0225697C_1 *param1, BGL *param2); void ov28_022569AC(UnkStruct_ov28_0225697C *param0); void ov28_022569B8(UnkStruct_ov28_0225697C *param0, u32 param1); diff --git a/include/overlay029/ov29_022566C8.h b/include/overlay029/ov29_022566C8.h index 5655d8c32d..c8bbc774ae 100644 --- a/include/overlay029/ov29_022566C8.h +++ b/include/overlay029/ov29_022566C8.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV29_022566C8_H #define POKEPLATINUM_OV29_022566C8_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay029/struct_ov29_022566C8_1.h" #include "overlay029/struct_ov29_022566C8_decl.h" +#include "bg_window.h" + BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566C8_1 *param1, BGL *param2); void ov29_02256770(UnkStruct_ov29_022566C8 *param0); void ov29_022567B4(UnkStruct_ov29_022566C8 *param0, u32 param1); diff --git a/include/overlay030/ov30_022563EC.h b/include/overlay030/ov30_022563EC.h index a9d6d502e2..e4cf9b47e0 100644 --- a/include/overlay030/ov30_022563EC.h +++ b/include/overlay030/ov30_022563EC.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV30_022563EC_H #define POKEPLATINUM_OV30_022563EC_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay030/struct_ov30_022563EC_1.h" #include "overlay030/struct_ov30_022563EC_decl.h" +#include "bg_window.h" + BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563EC_1 *param1, BGL *param2); void ov30_02256444(UnkStruct_ov30_022563EC *param0); void ov30_02256464(UnkStruct_ov30_022563EC *param0, u32 param1); diff --git a/include/overlay031/ov31_02256554.h b/include/overlay031/ov31_02256554.h index 3544bb348a..a8fa74711f 100644 --- a/include/overlay031/ov31_02256554.h +++ b/include/overlay031/ov31_02256554.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV31_02256554_H #define POKEPLATINUM_OV31_02256554_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay031/struct_ov31_02256554_1.h" #include "overlay031/struct_ov31_02256554_decl.h" +#include "bg_window.h" + BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_02256554_1 *param1, BGL *param2); void ov31_02256584(UnkStruct_ov31_02256554 *param0); void ov31_02256590(UnkStruct_ov31_02256554 *param0, u32 param1); diff --git a/include/overlay032/ov32_02256470.h b/include/overlay032/ov32_02256470.h index ca584d9b96..0bc31763f1 100644 --- a/include/overlay032/ov32_02256470.h +++ b/include/overlay032/ov32_02256470.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV32_02256470_H #define POKEPLATINUM_OV32_02256470_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay032/struct_ov32_02256470_1.h" #include "overlay032/struct_ov32_02256470_decl.h" +#include "bg_window.h" + BOOL ov32_02256470(UnkStruct_ov32_02256470 **param0, const UnkStruct_ov32_02256470_1 *param1, BGL *param2); void ov32_02256508(UnkStruct_ov32_02256470 *param0); void ov32_02256538(UnkStruct_ov32_02256470 *param0, u32 param1); diff --git a/include/overlay033/ov33_02256474.h b/include/overlay033/ov33_02256474.h index 8849c96ab0..1b711e2f18 100644 --- a/include/overlay033/ov33_02256474.h +++ b/include/overlay033/ov33_02256474.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV33_02256474_H #define POKEPLATINUM_OV33_02256474_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay033/struct_ov33_02256474_1.h" #include "overlay033/struct_ov33_02256474_decl.h" +#include "bg_window.h" + BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_02256474_1 *param1, BGL *param2); void ov33_022564F0(UnkStruct_ov33_02256474 *param0); void ov33_02256548(UnkStruct_ov33_02256474 *param0, u32 param1); diff --git a/include/overlay034/ov34_02256540.h b/include/overlay034/ov34_02256540.h index 94b229f9c8..8aa39d0d94 100644 --- a/include/overlay034/ov34_02256540.h +++ b/include/overlay034/ov34_02256540.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV34_02256540_H #define POKEPLATINUM_OV34_02256540_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay034/struct_ov34_02256540_1.h" #include "overlay034/struct_ov34_02256540_decl.h" +#include "bg_window.h" + BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const UnkStruct_ov34_02256540_1 *param1, BGL *param2); void ov34_02256604(UnkStruct_ov34_02256540 *param0); void ov34_02256640(UnkStruct_ov34_02256540 *param0, u32 param1); diff --git a/include/overlay035/ov35_02256410.h b/include/overlay035/ov35_02256410.h index bc2094dd99..e00c51cd39 100644 --- a/include/overlay035/ov35_02256410.h +++ b/include/overlay035/ov35_02256410.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV35_02256410_H #define POKEPLATINUM_OV35_02256410_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay035/struct_ov35_02256410_1.h" #include "overlay035/struct_ov35_02256410_decl.h" +#include "bg_window.h" + BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_02256410_1 *param1, BGL *param2); void ov35_0225644C(UnkStruct_ov35_02256410 *param0); void ov35_02256548(UnkStruct_ov35_02256410 *param0, u32 param1); diff --git a/include/overlay037/ov37_022563D4.h b/include/overlay037/ov37_022563D4.h index 7ff5a96b64..244373b4fe 100644 --- a/include/overlay037/ov37_022563D4.h +++ b/include/overlay037/ov37_022563D4.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV37_022563D4_H #define POKEPLATINUM_OV37_022563D4_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay037/struct_ov37_022563D4_1.h" #include "overlay037/struct_ov37_022563D4_decl.h" +#include "bg_window.h" + BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563D4_1 *param1, BGL *param2); void ov37_02256410(UnkStruct_ov37_022563D4 *param0); void ov37_02256488(UnkStruct_ov37_022563D4 *param0, u32 param1); diff --git a/include/overlay038/ov38_0225632C.h b/include/overlay038/ov38_0225632C.h index 0850cd73a0..0ca794cb38 100644 --- a/include/overlay038/ov38_0225632C.h +++ b/include/overlay038/ov38_0225632C.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV38_0225632C_H #define POKEPLATINUM_OV38_0225632C_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay038/struct_ov38_0225632C_1.h" #include "overlay038/struct_ov38_0225632C_decl.h" +#include "bg_window.h" + BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_0225632C_1 *param1, BGL *param2); void ov38_0225635C(UnkStruct_ov38_0225632C *param0); void ov38_02256368(UnkStruct_ov38_0225632C *param0, u32 param1); diff --git a/include/overlay039/ov39_022563DC.h b/include/overlay039/ov39_022563DC.h index 8d2b07dc6e..36c137e7f9 100644 --- a/include/overlay039/ov39_022563DC.h +++ b/include/overlay039/ov39_022563DC.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV39_022563DC_H #define POKEPLATINUM_OV39_022563DC_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay039/struct_ov39_022563DC_1.h" #include "overlay039/struct_ov39_022563DC_decl.h" +#include "bg_window.h" + BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563DC_1 *param1, BGL *param2); void ov39_0225640C(UnkStruct_ov39_022563DC *param0); void ov39_02256418(UnkStruct_ov39_022563DC *param0, u32 param1); diff --git a/include/overlay040/ov40_0225645C.h b/include/overlay040/ov40_0225645C.h index ed0aa14b3b..0f8adff1ac 100644 --- a/include/overlay040/ov40_0225645C.h +++ b/include/overlay040/ov40_0225645C.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV40_0225645C_H #define POKEPLATINUM_OV40_0225645C_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay040/struct_ov40_0225645C_1.h" #include "overlay040/struct_ov40_0225645C_decl.h" +#include "bg_window.h" + BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_0225645C_1 *param1, BGL *param2); void ov40_022564B8(UnkStruct_ov40_0225645C *param0); void ov40_022565C8(UnkStruct_ov40_0225645C *param0, u32 param1); diff --git a/include/overlay041/ov41_022567B0.h b/include/overlay041/ov41_022567B0.h index 08c2363fce..0648b5c87b 100644 --- a/include/overlay041/ov41_022567B0.h +++ b/include/overlay041/ov41_022567B0.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV41_022567B0_H #define POKEPLATINUM_OV41_022567B0_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay041/struct_ov41_022567B0_1.h" #include "overlay041/struct_ov41_022567B0_decl.h" +#include "bg_window.h" + BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567B0_1 *param1, BGL *param2); void ov41_022567F8(UnkStruct_ov41_022567B0 *param0); void ov41_0225688C(UnkStruct_ov41_022567B0 *param0, u32 param1); diff --git a/include/overlay042/ov42_022563D4.h b/include/overlay042/ov42_022563D4.h index 7aadde08f9..1f0c653f7e 100644 --- a/include/overlay042/ov42_022563D4.h +++ b/include/overlay042/ov42_022563D4.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV42_022563D4_H #define POKEPLATINUM_OV42_022563D4_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay042/struct_ov42_022563D4_1.h" #include "overlay042/struct_ov42_022563D4_decl.h" +#include "bg_window.h" + BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563D4_1 *param1, BGL *param2); void ov42_0225648C(UnkStruct_ov42_022563D4 *param0); void ov42_022564A0(UnkStruct_ov42_022563D4 *param0, u32 param1); diff --git a/include/overlay043/ov43_02256544.h b/include/overlay043/ov43_02256544.h index 7681d7b2a9..cf0dc8a27c 100644 --- a/include/overlay043/ov43_02256544.h +++ b/include/overlay043/ov43_02256544.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV43_02256544_H #define POKEPLATINUM_OV43_02256544_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay043/struct_ov43_02256544_1.h" #include "overlay043/struct_ov43_02256544_decl.h" +#include "bg_window.h" + BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_02256544_1 *param1, BGL *param2); void ov43_02256680(UnkStruct_ov43_02256544 *param0); void ov43_022566B0(UnkStruct_ov43_02256544 *param0, u32 param1); diff --git a/include/overlay044/ov44_022565BC.h b/include/overlay044/ov44_022565BC.h index 9b2e12810d..06b1ada074 100644 --- a/include/overlay044/ov44_022565BC.h +++ b/include/overlay044/ov44_022565BC.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV44_022565BC_H #define POKEPLATINUM_OV44_022565BC_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay044/struct_ov44_022565BC_1.h" #include "overlay044/struct_ov44_022565BC_decl.h" +#include "bg_window.h" + BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565BC_1 *param1, BGL *param2); void ov44_022565F8(UnkStruct_ov44_022565BC *param0); void ov44_02256744(UnkStruct_ov44_022565BC *param0, u32 param1); diff --git a/include/overlay045/ov45_022566EC.h b/include/overlay045/ov45_022566EC.h index 2d2f9e9b2e..347072abf4 100644 --- a/include/overlay045/ov45_022566EC.h +++ b/include/overlay045/ov45_022566EC.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV45_022566EC_H #define POKEPLATINUM_OV45_022566EC_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay045/struct_ov45_022566EC_1.h" #include "overlay045/struct_ov45_022566EC_decl.h" +#include "bg_window.h" + BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566EC_1 *param1, BGL *param2); void ov45_02256728(UnkStruct_ov45_022566EC *param0); void ov45_02256918(UnkStruct_ov45_022566EC *param0, u32 param1); diff --git a/include/overlay046/ov46_02256BCC.h b/include/overlay046/ov46_02256BCC.h index c4c83aaed6..056c6b6065 100644 --- a/include/overlay046/ov46_02256BCC.h +++ b/include/overlay046/ov46_02256BCC.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV46_02256BCC_H #define POKEPLATINUM_OV46_02256BCC_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay046/struct_ov46_02256BCC_1.h" #include "overlay046/struct_ov46_02256BCC_decl.h" +#include "bg_window.h" + BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256BCC_1 *param1, BGL *param2); void ov46_02256C0C(UnkStruct_ov46_02256BCC *param0); void ov46_02256D24(UnkStruct_ov46_02256BCC *param0, u32 param1); diff --git a/include/overlay047/ov47_02256634.h b/include/overlay047/ov47_02256634.h index 8e20b5c634..6533007a55 100644 --- a/include/overlay047/ov47_02256634.h +++ b/include/overlay047/ov47_02256634.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV47_02256634_H #define POKEPLATINUM_OV47_02256634_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay047/struct_ov47_02256634_1.h" #include "overlay047/struct_ov47_02256634_decl.h" +#include "bg_window.h" + BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_02256634_1 *param1, BGL *param2); void ov47_02256670(UnkStruct_ov47_02256634 *param0); void ov47_0225686C(UnkStruct_ov47_02256634 *param0, u32 param1); diff --git a/include/overlay048/ov48_0225650C.h b/include/overlay048/ov48_0225650C.h index 780eeacdc9..093a6531fd 100644 --- a/include/overlay048/ov48_0225650C.h +++ b/include/overlay048/ov48_0225650C.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV48_0225650C_H #define POKEPLATINUM_OV48_0225650C_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay048/struct_ov48_0225650C_1.h" #include "overlay048/struct_ov48_0225650C_decl.h" +#include "bg_window.h" + BOOL ov48_0225650C(UnkStruct_ov48_0225650C **param0, const UnkStruct_ov48_0225650C_1 *param1, BGL *param2); void ov48_0225654C(UnkStruct_ov48_0225650C *param0); void ov48_02256558(UnkStruct_ov48_0225650C *param0, u32 param1); diff --git a/include/overlay049/ov49_022563D4.h b/include/overlay049/ov49_022563D4.h index f22b8a3804..06dd9bdfa6 100644 --- a/include/overlay049/ov49_022563D4.h +++ b/include/overlay049/ov49_022563D4.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV49_022563D4_H #define POKEPLATINUM_OV49_022563D4_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay049/struct_ov49_022563D4_1.h" #include "overlay049/struct_ov49_022563D4_decl.h" +#include "bg_window.h" + BOOL ov49_022563D4(UnkStruct_ov49_022563D4 **param0, const UnkStruct_ov49_022563D4_1 *param1, BGL *param2); void ov49_02256480(UnkStruct_ov49_022563D4 *param0); void ov49_02256494(UnkStruct_ov49_022563D4 *param0, u32 param1); diff --git a/include/overlay050/ov50_02256510.h b/include/overlay050/ov50_02256510.h index f9ed9785f0..81442937d2 100644 --- a/include/overlay050/ov50_02256510.h +++ b/include/overlay050/ov50_02256510.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV50_02256510_H #define POKEPLATINUM_OV50_02256510_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay050/struct_ov50_02256510_1.h" #include "overlay050/struct_ov50_02256510_decl.h" +#include "bg_window.h" + BOOL ov50_02256510(UnkStruct_ov50_02256510 **param0, const UnkStruct_ov50_02256510_1 *param1, BGL *param2); void ov50_0225654C(UnkStruct_ov50_02256510 *param0); void ov50_022565FC(UnkStruct_ov50_02256510 *param0, u32 param1); diff --git a/include/overlay051/ov51_0225632C.h b/include/overlay051/ov51_0225632C.h index ceace0e1f7..9ffb3d489d 100644 --- a/include/overlay051/ov51_0225632C.h +++ b/include/overlay051/ov51_0225632C.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV51_0225632C_H #define POKEPLATINUM_OV51_0225632C_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay051/struct_ov51_0225632C_1.h" #include "overlay051/struct_ov51_0225632C_decl.h" +#include "bg_window.h" + BOOL ov51_0225632C(UnkStruct_ov51_0225632C **param0, const UnkStruct_ov51_0225632C_1 *param1, BGL *param2); void ov51_0225635C(UnkStruct_ov51_0225632C *param0); void ov51_02256368(UnkStruct_ov51_0225632C *param0, u32 param1); diff --git a/include/overlay052/ov52_02256694.h b/include/overlay052/ov52_02256694.h index 2e0ae0421a..b43b0699ba 100644 --- a/include/overlay052/ov52_02256694.h +++ b/include/overlay052/ov52_02256694.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV52_02256694_H #define POKEPLATINUM_OV52_02256694_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay052/struct_ov52_02256694_1.h" #include "overlay052/struct_ov52_02256694_decl.h" +#include "bg_window.h" + BOOL ov52_02256694(UnkStruct_ov52_02256694 **param0, const UnkStruct_ov52_02256694_1 *param1, BGL *param2); void ov52_022566EC(UnkStruct_ov52_02256694 *param0); void ov52_022567A4(UnkStruct_ov52_02256694 *param0, u32 param1); diff --git a/include/overlay053/ov53_02256420.h b/include/overlay053/ov53_02256420.h index 626dff51a2..7deedd3b7b 100644 --- a/include/overlay053/ov53_02256420.h +++ b/include/overlay053/ov53_02256420.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV53_02256420_H #define POKEPLATINUM_OV53_02256420_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay053/struct_ov53_02256420_1.h" #include "overlay053/struct_ov53_02256420_decl.h" +#include "bg_window.h" + BOOL ov53_02256420(UnkStruct_ov53_02256420 **param0, const UnkStruct_ov53_02256420_1 *param1, BGL *param2); void ov53_02256454(UnkStruct_ov53_02256420 *param0); void ov53_02256460(UnkStruct_ov53_02256420 *param0, u32 param1); diff --git a/include/overlay054/ov54_0225642C.h b/include/overlay054/ov54_0225642C.h index 4489d0af7a..8c1f9bd316 100644 --- a/include/overlay054/ov54_0225642C.h +++ b/include/overlay054/ov54_0225642C.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV54_0225642C_H #define POKEPLATINUM_OV54_0225642C_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay054/struct_ov54_0225642C_1.h" #include "overlay054/struct_ov54_0225642C_decl.h" +#include "bg_window.h" + BOOL ov54_0225642C(UnkStruct_ov54_0225642C **param0, const UnkStruct_ov54_0225642C_1 *param1, BGL *param2); void ov54_02256460(UnkStruct_ov54_0225642C *param0); void ov54_0225646C(UnkStruct_ov54_0225642C *param0, u32 param1); diff --git a/include/overlay055/ov55_0225632C.h b/include/overlay055/ov55_0225632C.h index 507ccc5a7f..f2e77b78eb 100644 --- a/include/overlay055/ov55_0225632C.h +++ b/include/overlay055/ov55_0225632C.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV55_0225632C_H #define POKEPLATINUM_OV55_0225632C_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay055/struct_ov55_0225632C_1.h" #include "overlay055/struct_ov55_0225632C_decl.h" +#include "bg_window.h" + BOOL ov55_0225632C(UnkStruct_ov55_0225632C **param0, const UnkStruct_ov55_0225632C_1 *param1, BGL *param2); void ov55_02256360(UnkStruct_ov55_0225632C *param0); void ov55_02256378(UnkStruct_ov55_0225632C *param0, u32 param1); diff --git a/include/overlay061/struct_ov61_0222C884.h b/include/overlay061/struct_ov61_0222C884.h deleted file mode 100644 index 6cf4aaa6af..0000000000 --- a/include/overlay061/struct_ov61_0222C884.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV61_0222C884_H -#define POKEPLATINUM_STRUCT_OV61_0222C884_H - -typedef struct { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u8 unk_04; - u8 unk_05; - u16 unk_06; -} UnkStruct_ov61_0222C884; - -#endif // POKEPLATINUM_STRUCT_OV61_0222C884_H diff --git a/include/overlay062/ov62_02231690.h b/include/overlay062/ov62_02231690.h index fe1d584d94..6cb59e42c3 100644 --- a/include/overlay062/ov62_02231690.h +++ b/include/overlay062/ov62_02231690.h @@ -4,7 +4,6 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0202F41C_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208B878.h" #include "struct_defs/struct_0208C06C.h" @@ -16,6 +15,7 @@ #include "overlay062/struct_ov62_0223CAA4.h" #include "overlay062/struct_ov62_02248CDC.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" diff --git a/include/overlay062/struct_ov62_0223118C.h b/include/overlay062/struct_ov62_0223118C.h index d5675400f9..ee195b77f0 100644 --- a/include/overlay062/struct_ov62_0223118C.h +++ b/include/overlay062/struct_ov62_0223118C.h @@ -7,7 +7,6 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_0207C690.h" @@ -16,6 +15,7 @@ #include "overlay062/struct_ov62_0223359C.h" #include "overlay062/struct_ov62_022349A8.h" +#include "bg_window.h" #include "message.h" #include "touch_screen.h" diff --git a/include/overlay062/struct_ov62_022323B8.h b/include/overlay062/struct_ov62_022323B8.h index d42231f443..51a2e2dc31 100644 --- a/include/overlay062/struct_ov62_022323B8.h +++ b/include/overlay062/struct_ov62_022323B8.h @@ -3,7 +3,8 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02030A80_decl.h" -#include "struct_defs/struct_0205AA50.h" + +#include "bg_window.h" typedef struct { UnkStruct_02030A80 *unk_00; diff --git a/include/overlay062/struct_ov62_02233310.h b/include/overlay062/struct_ov62_02233310.h index 2e80ec342c..e827b7e423 100644 --- a/include/overlay062/struct_ov62_02233310.h +++ b/include/overlay062/struct_ov62_02233310.h @@ -2,11 +2,11 @@ #define POKEPLATINUM_STRUCT_OV62_02233310_H #include "struct_decls/cell_actor_data.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay062/struct_ov62_02233310_sub1.h" #include "overlay062/struct_ov62_02248CDC.h" +#include "bg_window.h" #include "message.h" typedef struct { diff --git a/include/overlay062/struct_ov62_02233F74.h b/include/overlay062/struct_ov62_02233F74.h index edcf9df2a3..4f527fcfb0 100644 --- a/include/overlay062/struct_ov62_02233F74.h +++ b/include/overlay062/struct_ov62_02233F74.h @@ -4,7 +4,8 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0202F41C_decl.h" #include "struct_decls/struct_02030A80_decl.h" -#include "struct_defs/struct_0205AA50.h" + +#include "bg_window.h" typedef struct { UnkStruct_02030A80 *unk_00; diff --git a/include/overlay062/struct_ov62_02246BF4_sub2.h b/include/overlay062/struct_ov62_02246BF4_sub2.h index 4b0f5dfaa8..582005524c 100644 --- a/include/overlay062/struct_ov62_02246BF4_sub2.h +++ b/include/overlay062/struct_ov62_02246BF4_sub2.h @@ -5,9 +5,9 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023FCC_decl.h" +#include "bg_window.h" #include "touch_screen.h" typedef struct { diff --git a/include/overlay063/ov63_0222D1C0.h b/include/overlay063/ov63_0222D1C0.h index 2da7ea2d03..ea6da513f5 100644 --- a/include/overlay063/ov63_0222D1C0.h +++ b/include/overlay063/ov63_0222D1C0.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_OV63_0222D1C0_H #define POKEPLATINUM_OV63_0222D1C0_H -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" #include "overlay063/struct_ov63_0222D160.h" #include "overlay063/struct_ov63_0222D1C0_decl.h" #include "overlay065/struct_ov65_0223582C.h" +#include "bg_window.h" + UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(UnkStruct_0200C738 *param0, BGL *param1, const UnkStruct_ov65_0223582C *param2, u32 param3); void ov63_0222D214(UnkStruct_ov63_0222D1C0 *param0); void ov63_0222D228(UnkStruct_ov63_0222D1C0 *param0, const UnkStruct_ov63_0222D160 *param1); diff --git a/include/overlay065/ov65_02235060.h b/include/overlay065/ov65_02235060.h index 47451f3e0b..bef7ba989c 100644 --- a/include/overlay065/ov65_02235060.h +++ b/include/overlay065/ov65_02235060.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV65_02235060_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay065/struct_ov65_02235130_decl.h" #include "overlay065/struct_ov65_022354D8.h" +#include "bg_window.h" + void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, BGL *param3, u32 param4, u32 param5); void ov65_02235130(UnkStruct_ov65_02235130 *param0); BOOL ov65_02235194(const UnkStruct_ov65_02235130 *param0); diff --git a/include/overlay065/struct_ov65_0222EBE0_t.h b/include/overlay065/struct_ov65_0222EBE0_t.h index edfcb69343..3d200e28a8 100644 --- a/include/overlay065/struct_ov65_0222EBE0_t.h +++ b/include/overlay065/struct_ov65_0222EBE0_t.h @@ -5,10 +5,8 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207DFAC.h" #include "overlay061/struct_ov61_0222C3B0.h" @@ -17,6 +15,7 @@ #include "overlay065/struct_ov65_02235130.h" #include "overlay065/struct_ov65_022354D8.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" #include "overlay_manager.h" diff --git a/include/overlay065/struct_ov65_02234E50.h b/include/overlay065/struct_ov65_02234E50.h index 76d096b9bf..933c990289 100644 --- a/include/overlay065/struct_ov65_02234E50.h +++ b/include/overlay065/struct_ov65_02234E50.h @@ -6,8 +6,8 @@ #include "struct_decls/font_oam.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/sprite_manager_allocation.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" #include "cell_actor.h" #include "sprite_resource.h" #include "string_template.h" diff --git a/include/overlay065/struct_ov65_02235130.h b/include/overlay065/struct_ov65_02235130.h index 9818c91737..6134b41677 100644 --- a/include/overlay065/struct_ov65_02235130.h +++ b/include/overlay065/struct_ov65_02235130.h @@ -1,8 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV65_02235130_H #define POKEPLATINUM_STRUCT_OV65_02235130_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay063/struct_ov63_0222BCE8_decl.h" #include "overlay063/struct_ov63_0222BE18_decl.h" #include "overlay063/struct_ov63_0222CD2C.h" @@ -13,6 +11,8 @@ #include "overlay065/struct_ov65_022358CC.h" #include "overlay065/struct_ov65_02236318.h" +#include "bg_window.h" + typedef struct UnkStruct_ov65_02235130_t { BOOL unk_00; u32 unk_04; diff --git a/include/overlay071/ov71_0223C69C.h b/include/overlay071/ov71_0223C69C.h index 59fd4afa3a..5da46e5c9d 100644 --- a/include/overlay071/ov71_0223C69C.h +++ b/include/overlay071/ov71_0223C69C.h @@ -1,10 +1,9 @@ #ifndef POKEPLATINUM_OV71_0223C69C_H #define POKEPLATINUM_OV71_0223C69C_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02072014.h" +#include "bg_window.h" #include "strbuf.h" void ov71_0223C69C(BGL *param0, Window *param1); diff --git a/include/overlay071/struct_ov71_0223B620.h b/include/overlay071/struct_ov71_0223B620.h index 00b4e0306a..c6ccd22613 100644 --- a/include/overlay071/struct_ov71_0223B620.h +++ b/include/overlay071/struct_ov71_0223B620.h @@ -3,14 +3,13 @@ #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02072014.h" #include "overlay071/struct_ov71_0223C444.h" #include "overlay071/struct_ov71_0223D238.h" #include "overlay071/struct_ov71_0223D324.h" +#include "bg_window.h" #include "strbuf.h" typedef struct { diff --git a/include/overlay072/struct_ov72_0223DB98_t.h b/include/overlay072/struct_ov72_0223DB98_t.h index 08ea54843b..60feb3c888 100644 --- a/include/overlay072/struct_ov72_0223DB98_t.h +++ b/include/overlay072/struct_ov72_0223DB98_t.h @@ -2,14 +2,13 @@ #define POKEPLATINUM_STRUCT_OV72_0223DB98_T_H #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay072/struct_ov72_0223E7D8.h" #include "overlay072/struct_ov72_0223E80C.h" #include "overlay072/struct_ov72_0223EAD8.h" +#include "bg_window.h" #include "cell_actor.h" #include "game_options.h" #include "game_records.h" diff --git a/include/overlay076/ov76_0223B870.h b/include/overlay076/ov76_0223B870.h index f47c9b9eee..3aa0872d7f 100644 --- a/include/overlay076/ov76_0223B870.h +++ b/include/overlay076/ov76_0223B870.h @@ -5,13 +5,13 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "overlay076/struct_ov76_0223C398.h" #include "overlay076/struct_ov76_0223DE00.h" +#include "bg_window.h" + void ov76_0223B8A8(UnkStruct_ov76_0223DE00 *param0); void ov76_0223B8C4(UnkStruct_ov76_0223DE00 *param0); void ov76_0223B904(UnkStruct_ov76_0223DE00 *param0); diff --git a/include/overlay076/ov76_0223D338.h b/include/overlay076/ov76_0223D338.h index 06da0a0eda..fe087454e6 100644 --- a/include/overlay076/ov76_0223D338.h +++ b/include/overlay076/ov76_0223D338.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV76_0223D338_H #include "struct_decls/cell_actor_data.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0202CA28.h" #include "overlay076/struct_ov76_0223DE00.h" +#include "bg_window.h" + void ov76_0223D338(UnkStruct_ov76_0223DE00 *param0); void ov76_0223D350(UnkStruct_ov76_0223DE00 *param0); void ov76_0223D368(UnkStruct_ov76_0223DE00 *param0); diff --git a/include/overlay076/struct_ov76_0223C398.h b/include/overlay076/struct_ov76_0223C398.h index a147489d68..c76a33a1b0 100644 --- a/include/overlay076/struct_ov76_0223C398.h +++ b/include/overlay076/struct_ov76_0223C398.h @@ -12,16 +12,15 @@ #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/sprite_manager_allocation.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "overlay012/struct_ball_rotation_decl.h" #include "overlay012/struct_ov12_02235FE0_decl.h" #include "overlay022/struct_ov22_02258A48.h" +#include "bg_window.h" #include "touch_screen.h" typedef struct { diff --git a/include/overlay079/struct_ov79_021D0E1C.h b/include/overlay079/struct_ov79_021D0E1C.h index c089630a50..5404c176db 100644 --- a/include/overlay079/struct_ov79_021D0E1C.h +++ b/include/overlay079/struct_ov79_021D0E1C.h @@ -8,16 +8,15 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_020158A8.h" #include "struct_defs/struct_0203D9B8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0209903C.h" #include "struct_defs/struct_0209916C.h" #include "overlay079/struct_ov79_021D0E1C_sub1.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" diff --git a/include/overlay080/struct_ov80_021D2A08.h b/include/overlay080/struct_ov80_021D2A08.h index 06d3f0ca26..aa6abda1f6 100644 --- a/include/overlay080/struct_ov80_021D2A08.h +++ b/include/overlay080/struct_ov80_021D2A08.h @@ -6,7 +6,6 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02039EBC_decl.h" #include "struct_defs/struct_0203D8AC.h" @@ -15,6 +14,7 @@ #include "overlay080/struct_ov80_021D2C1C.h" #include "overlay080/struct_ov80_021D2E10.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" diff --git a/include/overlay081/struct_ov81_021D1610.h b/include/overlay081/struct_ov81_021D1610.h index d7a0bc31aa..23dcb2b8cb 100644 --- a/include/overlay081/struct_ov81_021D1610.h +++ b/include/overlay081/struct_ov81_021D1610.h @@ -1,9 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV81_021D1610_H #define POKEPLATINUM_STRUCT_OV81_021D1610_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "journal.h" #include "message.h" #include "savedata.h" diff --git a/include/overlay083/ov83_0223D6A8.h b/include/overlay083/ov83_0223D6A8.h index 0beb02eb50..147cd5d5f2 100644 --- a/include/overlay083/ov83_0223D6A8.h +++ b/include/overlay083/ov83_0223D6A8.h @@ -5,7 +5,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02015064_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay083/struct_ov83_0223D4CC_decl.h" #include "overlay083/struct_ov83_0223D784.h" @@ -27,6 +26,7 @@ #include "overlay083/struct_ov83_0223F7A4.h" #include "overlay083/struct_ov83_0223FE50.h" +#include "bg_window.h" #include "cell_actor.h" #include "sprite_resource.h" diff --git a/include/overlay083/struct_ov83_0223B784.h b/include/overlay083/struct_ov83_0223B784.h index 912c7efebf..d688f6f635 100644 --- a/include/overlay083/struct_ov83_0223B784.h +++ b/include/overlay083/struct_ov83_0223B784.h @@ -2,7 +2,6 @@ #define POKEPLATINUM_STRUCT_OV83_0223B784_H #include "struct_decls/struct_02015064_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay083/struct_ov83_0223D4CC_decl.h" #include "overlay083/struct_ov83_0223D784.h" @@ -23,6 +22,8 @@ #include "overlay083/struct_ov83_0223FDB0.h" #include "overlay083/struct_ov83_0223FE50.h" +#include "bg_window.h" + typedef struct { int unk_00; BOOL unk_04; diff --git a/include/overlay083/struct_ov83_0223E138.h b/include/overlay083/struct_ov83_0223E138.h index 7fb8a51e1a..2bf80f5d6f 100644 --- a/include/overlay083/struct_ov83_0223E138.h +++ b/include/overlay083/struct_ov83_0223E138.h @@ -3,12 +3,11 @@ #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay083/struct_ov83_0223DEA0.h" #include "overlay083/struct_ov83_0223FE50.h" +#include "bg_window.h" + typedef struct { int unk_00; BGL *unk_04; diff --git a/include/overlay083/struct_ov83_0223E824.h b/include/overlay083/struct_ov83_0223E824.h index e6ecc529e7..2d82e401d9 100644 --- a/include/overlay083/struct_ov83_0223E824.h +++ b/include/overlay083/struct_ov83_0223E824.h @@ -1,12 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_OV83_0223E824_H #define POKEPLATINUM_STRUCT_OV83_0223E824_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay083/struct_ov83_0223DEA0.h" #include "overlay083/struct_ov83_0223FE50.h" +#include "bg_window.h" #include "sys_task_manager.h" typedef struct { diff --git a/include/overlay083/struct_ov83_0223F7A4.h b/include/overlay083/struct_ov83_0223F7A4.h index ef69f2549c..bc9d7d1f75 100644 --- a/include/overlay083/struct_ov83_0223F7A4.h +++ b/include/overlay083/struct_ov83_0223F7A4.h @@ -2,7 +2,8 @@ #define POKEPLATINUM_STRUCT_OV83_0223F7A4_H #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_02018340_decl.h" + +#include "bg_window.h" typedef struct { UnkStruct_02015920 *unk_00; diff --git a/include/overlay084/ov84_0223F040.h b/include/overlay084/ov84_0223F040.h index 1176447101..97fe2b1644 100644 --- a/include/overlay084/ov84_0223F040.h +++ b/include/overlay084/ov84_0223F040.h @@ -1,11 +1,10 @@ #ifndef POKEPLATINUM_OV84_0223F040_H #define POKEPLATINUM_OV84_0223F040_H -#include "struct_defs/struct_0205AA50.h" - #include "overlay084/struct_ov84_0223B5A0.h" #include "bag.h" +#include "bg_window.h" void ov84_0223F040(UnkStruct_ov84_0223B5A0 *param0); void ov84_0223F1DC(Window *param0); diff --git a/include/overlay084/struct_ov84_0223B5A0.h b/include/overlay084/struct_ov84_0223B5A0.h index a722e3111f..0e7ab551e9 100644 --- a/include/overlay084/struct_ov84_0223B5A0.h +++ b/include/overlay084/struct_ov84_0223B5A0.h @@ -9,14 +9,13 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0207CB08_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay084/struct_ov84_0223B5A0_sub1.h" #include "overlay084/struct_ov84_0223C920.h" #include "bag.h" +#include "bg_window.h" #include "game_options.h" #include "message.h" #include "strbuf.h" diff --git a/include/overlay084/struct_ov84_0223BA5C.h b/include/overlay084/struct_ov84_0223BA5C.h deleted file mode 100644 index 6bfb44791d..0000000000 --- a/include/overlay084/struct_ov84_0223BA5C.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV84_0223BA5C_H -#define POKEPLATINUM_STRUCT_OV84_0223BA5C_H - -#include - -typedef struct { - GXDispMode unk_00; - GXBGMode unk_04; - GXBGMode unk_08; - GXBG0As unk_0C; -} UnkStruct_ov84_0223BA5C; - -#endif // POKEPLATINUM_STRUCT_OV84_0223BA5C_H diff --git a/include/overlay084/struct_ov84_02240FA8.h b/include/overlay084/struct_ov84_02240FA8.h index 96bd9b101f..12ea9599ce 100644 --- a/include/overlay084/struct_ov84_02240FA8.h +++ b/include/overlay084/struct_ov84_02240FA8.h @@ -3,7 +3,8 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_defs/struct_0205AA50.h" + +#include "bg_window.h" typedef struct { const ResourceMetadata *unk_00; diff --git a/include/overlay088/ov88_0223E9C4.h b/include/overlay088/ov88_0223E9C4.h index aef230f3c3..40b613ab63 100644 --- a/include/overlay088/ov88_0223E9C4.h +++ b/include/overlay088/ov88_0223E9C4.h @@ -4,9 +4,8 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" #include "game_options.h" #include "message.h" #include "strbuf.h" diff --git a/include/overlay094/ov94_0223BCB0.h b/include/overlay094/ov94_0223BCB0.h index bb8f8ea0f2..488a69a349 100644 --- a/include/overlay094/ov94_0223BCB0.h +++ b/include/overlay094/ov94_0223BCB0.h @@ -2,10 +2,10 @@ #define POKEPLATINUM_OV94_0223BCB0_H #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay094/struct_ov94_0223FD4C_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "overlay_manager.h" diff --git a/include/overlay094/ov94_0223C610.h b/include/overlay094/ov94_0223C610.h index 0da260c2c0..5459f24d20 100644 --- a/include/overlay094/ov94_0223C610.h +++ b/include/overlay094/ov94_0223C610.h @@ -1,10 +1,9 @@ #ifndef POKEPLATINUM_OV94_0223C610_H #define POKEPLATINUM_OV94_0223C610_H -#include "struct_defs/struct_0205AA50.h" - #include "overlay094/struct_ov94_0223FD4C_decl.h" +#include "bg_window.h" #include "message.h" int ov94_0223C610(UnkStruct_ov94_0223FD4C *param0, int param1); diff --git a/include/overlay094/ov94_0223D0C4.h b/include/overlay094/ov94_0223D0C4.h index d283fda7c1..cfa7903e7c 100644 --- a/include/overlay094/ov94_0223D0C4.h +++ b/include/overlay094/ov94_0223D0C4.h @@ -1,11 +1,10 @@ #ifndef POKEPLATINUM_OV94_0223D0C4_H #define POKEPLATINUM_OV94_0223D0C4_H -#include "struct_defs/struct_0205AA50.h" - #include "overlay094/struct_ov94_0223BA88_sub2.h" #include "overlay094/struct_ov94_0223FD4C_decl.h" +#include "bg_window.h" #include "message.h" #include "pokemon.h" #include "string_template.h" diff --git a/include/overlay094/ov94_022414B8.h b/include/overlay094/ov94_022414B8.h index 3e7335d81d..5625f80d55 100644 --- a/include/overlay094/ov94_022414B8.h +++ b/include/overlay094/ov94_022414B8.h @@ -4,7 +4,6 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay094/struct_ov94_0223BA88.h" #include "overlay094/struct_ov94_0223BA88_sub3.h" @@ -12,6 +11,7 @@ #include "overlay094/struct_ov94_0223FD4C_sub3.h" #include "overlay094/struct_ov94_02242AAC.h" +#include "bg_window.h" #include "message.h" #include "string_template.h" #include "text.h" diff --git a/include/overlay094/ov94_02244950.h b/include/overlay094/ov94_02244950.h index 04270e05e8..881fbdcdd8 100644 --- a/include/overlay094/ov94_02244950.h +++ b/include/overlay094/ov94_02244950.h @@ -1,10 +1,9 @@ #ifndef POKEPLATINUM_OV94_02244950_H #define POKEPLATINUM_OV94_02244950_H -#include "struct_defs/struct_0205AA50.h" - #include "overlay094/struct_ov94_0223FD4C_decl.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h index af00e3e6c9..383a4e153e 100644 --- a/include/overlay094/struct_ov94_0223FD4C.h +++ b/include/overlay094/struct_ov94_0223FD4C.h @@ -7,13 +7,11 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_0207AE68_decl.h" #include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0203E0FC.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay006/struct_ov6_02246254.h" #include "overlay061/struct_ov61_0222C3B0.h" @@ -27,6 +25,7 @@ #include "overlay096/struct_ov96_0223B574.h" #include "overlay096/struct_ov96_0223B574_1.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" #include "overlay_manager.h" diff --git a/include/overlay095/ov95_02246C20.h b/include/overlay095/ov95_02246C20.h index d0f7247a08..6b9abb111b 100644 --- a/include/overlay095/ov95_02246C20.h +++ b/include/overlay095/ov95_02246C20.h @@ -3,13 +3,12 @@ #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay095/struct_ov95_02247004_decl.h" #include "overlay095/struct_ov95_022472C4_decl.h" #include "overlay095/struct_ov95_02247568.h" #include "overlay095/struct_ov95_02247628_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" #include "overlay_manager.h" diff --git a/include/overlay096/ov96_0223B6A0.h b/include/overlay096/ov96_0223B6A0.h index 33eb28b577..005c603e89 100644 --- a/include/overlay096/ov96_0223B6A0.h +++ b/include/overlay096/ov96_0223B6A0.h @@ -2,10 +2,10 @@ #define POKEPLATINUM_OV96_0223B6A0_H #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay096/struct_ov96_0223BF40_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "overlay_manager.h" diff --git a/include/overlay096/ov96_0223BCE0.h b/include/overlay096/ov96_0223BCE0.h index 92d5b70e17..8e4f91ec34 100644 --- a/include/overlay096/ov96_0223BCE0.h +++ b/include/overlay096/ov96_0223BCE0.h @@ -1,10 +1,9 @@ #ifndef POKEPLATINUM_OV96_0223BCE0_H #define POKEPLATINUM_OV96_0223BCE0_H -#include "struct_defs/struct_0205AA50.h" - #include "overlay096/struct_ov96_0223BF40_decl.h" +#include "bg_window.h" #include "strbuf.h" #include "text.h" diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h index 480ee34ef6..b2583a096f 100644 --- a/include/overlay096/struct_ov96_0223BF40_t.h +++ b/include/overlay096/struct_ov96_0223BF40_t.h @@ -5,9 +5,7 @@ #include #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0206BC70.h" #include "overlay061/struct_ov61_0222C3B0.h" @@ -16,6 +14,7 @@ #include "overlay096/struct_ov96_0223B574.h" #include "overlay096/struct_ov96_0223B574_1.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" #include "pokemon.h" diff --git a/include/overlay097/ov97_02232054.h b/include/overlay097/ov97_02232054.h index 2d2d284825..d9e5828c72 100644 --- a/include/overlay097/ov97_02232054.h +++ b/include/overlay097/ov97_02232054.h @@ -1,10 +1,9 @@ #ifndef POKEPLATINUM_OV97_02232054_H #define POKEPLATINUM_OV97_02232054_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay097/struct_ov97_0223829C.h" +#include "bg_window.h" #include "savedata.h" void ov97_02232054(void); diff --git a/include/overlay097/ov97_02237694.h b/include/overlay097/ov97_02237694.h index f38ab7e68e..4128a0d3a6 100644 --- a/include/overlay097/ov97_02237694.h +++ b/include/overlay097/ov97_02237694.h @@ -2,15 +2,14 @@ #define POKEPLATINUM_OV97_02237694_H #include "struct_decls/struct_0200112C_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0202DF40.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay097/struct_ov97_02237808.h" #include "overlay097/struct_ov97_02237AEC.h" #include "overlay097/struct_ov97_0223829C.h" #include "overlay097/union_ov97_0222D2B0.h" +#include "bg_window.h" #include "cell_actor.h" #include "overlay_manager.h" #include "savedata.h" diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h index f919a3a57a..4c3e39012f 100644 --- a/include/overlay097/struct_ov97_0222D04C.h +++ b/include/overlay097/struct_ov97_0222D04C.h @@ -5,13 +5,12 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay097/struct_ov97_0223829C.h" #include "overlay097/union_ov97_0222D2B0.h" +#include "bg_window.h" #include "cell_actor.h" #include "game_options.h" #include "message.h" diff --git a/include/overlay097/struct_ov97_0222DB78.h b/include/overlay097/struct_ov97_0222DB78.h deleted file mode 100644 index 3b76b60bd8..0000000000 --- a/include/overlay097/struct_ov97_0222DB78.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV97_0222DB78_H -#define POKEPLATINUM_STRUCT_OV97_0222DB78_H - -typedef struct { - int unk_00; - int unk_04; - u32 unk_08; - u32 unk_0C; - u8 unk_10; - u8 unk_11; - u8 unk_12; - u8 unk_13; - u8 unk_14; - u8 unk_15; - u8 unk_16; - u8 unk_17; - BOOL unk_18; -} UnkStruct_ov97_0222DB78; - -#endif // POKEPLATINUM_STRUCT_OV97_0222DB78_H diff --git a/include/overlay097/struct_ov97_02237808.h b/include/overlay097/struct_ov97_02237808.h index 2f4f72805e..427fad3efc 100644 --- a/include/overlay097/struct_ov97_02237808.h +++ b/include/overlay097/struct_ov97_02237808.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV97_02237808_H #define POKEPLATINUM_STRUCT_OV97_02237808_H -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "string_template.h" #include "text.h" diff --git a/include/overlay099/ov99_021D3E78.h b/include/overlay099/ov99_021D3E78.h index 7f44134771..ce3b9e9d37 100644 --- a/include/overlay099/ov99_021D3E78.h +++ b/include/overlay099/ov99_021D3E78.h @@ -1,10 +1,9 @@ #ifndef POKEPLATINUM_OV99_021D3E78_H #define POKEPLATINUM_OV99_021D3E78_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay099/struct_ov99_021D3E78_decl.h" +#include "bg_window.h" #include "message.h" UnkStruct_ov99_021D3E78 *ov99_021D3E78(BGL *param0, int param1, int param2, int param3, MessageLoader *param4); diff --git a/include/overlay099/struct_ov99_021D2CB0.h b/include/overlay099/struct_ov99_021D2CB0.h index 871e3d6201..1f04b3613c 100644 --- a/include/overlay099/struct_ov99_021D2CB0.h +++ b/include/overlay099/struct_ov99_021D2CB0.h @@ -6,9 +6,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0203E274.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "overlay099/struct_ov99_021D2CB0_sub1.h" @@ -16,6 +14,7 @@ #include "overlay099/struct_ov99_021D3A40.h" #include "overlay099/struct_ov99_021D3E78_decl.h" +#include "bg_window.h" #include "camera.h" #include "easy3d_object.h" #include "message.h" diff --git a/include/overlay100/struct_ov100_021D46C8.h b/include/overlay100/struct_ov100_021D46C8.h index 0c6e826e51..adfc4e40ec 100644 --- a/include/overlay100/struct_ov100_021D46C8.h +++ b/include/overlay100/struct_ov100_021D46C8.h @@ -8,8 +8,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "overlay100/struct_ov100_021D36CC.h" @@ -17,6 +15,7 @@ #include "overlay100/struct_ov100_021D4890.h" #include "overlay100/struct_ov100_021D4F9C_decl.h" +#include "bg_window.h" #include "camera.h" #include "message.h" diff --git a/include/overlay101/struct_ov101_021D13C8.h b/include/overlay101/struct_ov101_021D13C8.h index 0cabd2a5f9..fff69cf2f3 100644 --- a/include/overlay101/struct_ov101_021D13C8.h +++ b/include/overlay101/struct_ov101_021D13C8.h @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020711EC_decl.h" #include "overlay101/struct_ov101_021D148C.h" @@ -16,6 +15,7 @@ #include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D7E48_decl.h" +#include "bg_window.h" #include "enums.h" typedef struct UnkStruct_ov101_021D13C8_t { diff --git a/include/overlay101/struct_ov101_021D148C.h b/include/overlay101/struct_ov101_021D148C.h index 8a51226dae..e7859d5f3a 100644 --- a/include/overlay101/struct_ov101_021D148C.h +++ b/include/overlay101/struct_ov101_021D148C.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D148C_H #define POKEPLATINUM_STRUCT_OV101_021D148C_H -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "message.h" #include "string_template.h" diff --git a/include/overlay104/ov104_0223B6F4.h b/include/overlay104/ov104_0223B6F4.h index ad578b1a8a..3222f4caf1 100644 --- a/include/overlay104/ov104_0223B6F4.h +++ b/include/overlay104/ov104_0223B6F4.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_OV104_0223B6F4_H #define POKEPLATINUM_OV104_0223B6F4_H -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_party_decl.h" @@ -9,6 +8,7 @@ #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223BA10.h" +#include "bg_window.h" #include "pokemon.h" void ov104_0223B760(u8 param0, int param1, u16 param2[], u8 param3); diff --git a/include/overlay104/ov104_0223C164.h b/include/overlay104/ov104_0223C164.h index 97d7630500..9205529d6e 100644 --- a/include/overlay104/ov104_0223C164.h +++ b/include/overlay104/ov104_0223C164.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_OV104_0223C164_H #define POKEPLATINUM_OV104_0223C164_H -#include "struct_decls/struct_02018340_decl.h" - #include "overlay104/struct_ov104_0223C23C_decl.h" +#include "bg_window.h" + UnkStruct_ov104_0223C23C *ov104_0223C164(BGL *param0); void ov104_0223C23C(UnkStruct_ov104_0223C23C *param0); u16 ov104_0223C264(u8 param0); diff --git a/include/overlay104/ov104_0223D9E4.h b/include/overlay104/ov104_0223D9E4.h index 168120cbe2..17aa44afd6 100644 --- a/include/overlay104/ov104_0223D9E4.h +++ b/include/overlay104/ov104_0223D9E4.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV104_0223D9E4_H #include "struct_decls/struct_02002F38_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay104/struct_ov104_0223DA28_decl.h" +#include "bg_window.h" + UnkStruct_ov104_0223DA28 *ov104_0223D9E4(BGL *param0, PaletteData *param1); void ov104_0223DA28(UnkStruct_ov104_0223DA28 *param0); diff --git a/include/overlay104/ov104_0223E894.h b/include/overlay104/ov104_0223E894.h index f96f3c7e03..fae1298c20 100644 --- a/include/overlay104/ov104_0223E894.h +++ b/include/overlay104/ov104_0223E894.h @@ -1,8 +1,6 @@ #ifndef POKEPLATINUM_OV104_0223E894_H #define POKEPLATINUM_OV104_0223E894_H -#include "struct_defs/struct_0205AA50.h" - #include "overlay104/struct_ov104_0223E9EC.h" #include "overlay104/struct_ov104_0223EA38.h" #include "overlay104/struct_ov104_0223EA84_decl.h" @@ -11,6 +9,8 @@ #include "overlay104/struct_ov104_0223F174_decl.h" #include "overlay104/struct_ov104_0223F1B4.h" +#include "bg_window.h" + void ov104_0223E894(int param0, u32 param1, u32 param2, BOOL *param3, u32 param4); void ov104_0223E9CC(int param0, int param1); void ov104_0223E9EC(UnkStruct_ov104_0223E9EC *param0, int param1, int param2, int param3, int param4); diff --git a/include/overlay104/struct_ov104_022320B4_t.h b/include/overlay104/struct_ov104_022320B4_t.h index 6ef795d84a..e792f94b4a 100644 --- a/include/overlay104/struct_ov104_022320B4_t.h +++ b/include/overlay104/struct_ov104_022320B4_t.h @@ -3,12 +3,12 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_0209B75C_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay104/struct_ov104_0222E8C8.h" #include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_02232B5C_decl.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay104/struct_ov104_0223C4CC.h b/include/overlay104/struct_ov104_0223C4CC.h index 7d34cd3cc5..de6504ff64 100644 --- a/include/overlay104/struct_ov104_0223C4CC.h +++ b/include/overlay104/struct_ov104_0223C4CC.h @@ -5,7 +5,6 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0209B75C_decl.h" #include "struct_defs/struct_0207C690.h" @@ -21,6 +20,7 @@ #include "overlay104/struct_ov104_0223D3B0_1.h" #include "overlay104/struct_ov104_0223D5F0_decl.h" +#include "bg_window.h" #include "sys_task_manager.h" typedef struct UnkStruct_ov104_0223C4CC_t { diff --git a/include/overlay105/ov105_02246214.h b/include/overlay105/ov105_02246214.h index 0c558cb3a2..51c2298e2c 100644 --- a/include/overlay105/ov105_02246214.h +++ b/include/overlay105/ov105_02246214.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_OV105_02246214_H #define POKEPLATINUM_OV105_02246214_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" void ov105_02246214(BGL *param0, Window *param1); void ov105_02246244(Window *param0); diff --git a/include/overlay106/ov106_022436E0.h b/include/overlay106/ov106_022436E0.h index b7e66dba41..4b0326749a 100644 --- a/include/overlay106/ov106_022436E0.h +++ b/include/overlay106/ov106_022436E0.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_OV106_022436E0_H #define POKEPLATINUM_OV106_022436E0_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" void ov106_022436E0(BGL *param0, Window *param1); void ov106_02243710(Window *param0); diff --git a/include/overlay107/ov107_02249D14.h b/include/overlay107/ov107_02249D14.h index 7ea837654e..4bcfdf782f 100644 --- a/include/overlay107/ov107_02249D14.h +++ b/include/overlay107/ov107_02249D14.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_OV107_02249D14_H #define POKEPLATINUM_OV107_02249D14_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" void ov107_02249D14(BGL *param0, Window *param1, u8 param2); void ov107_02249D5C(Window *param0, u8 param1); diff --git a/include/overlay108/ov108_02243630.h b/include/overlay108/ov108_02243630.h index fa6f56b8ed..8f41f3ec90 100644 --- a/include/overlay108/ov108_02243630.h +++ b/include/overlay108/ov108_02243630.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_OV108_02243630_H #define POKEPLATINUM_OV108_02243630_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" void ov108_02243630(BGL *param0, Window *param1); void ov108_02243660(Window *param0); diff --git a/include/overlay109/struct_ov109_021D5140.h b/include/overlay109/struct_ov109_021D5140.h index 72436133f9..2a7777e758 100644 --- a/include/overlay109/struct_ov109_021D5140.h +++ b/include/overlay109/struct_ov109_021D5140.h @@ -4,16 +4,15 @@ #include #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0209C194_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0209BDF8.h" #include "overlay109/struct_ov109_021D5140_sub1.h" #include "overlay109/struct_ov109_021D5140_sub2.h" #include "overlay109/struct_ov109_021D5140_sub3.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" #include "sprite_resource.h" diff --git a/include/overlay110/ov110_021D2124.h b/include/overlay110/ov110_021D2124.h index 3d71958079..5482bacc52 100644 --- a/include/overlay110/ov110_021D2124.h +++ b/include/overlay110/ov110_021D2124.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_OV110_021D2124_H #define POKEPLATINUM_OV110_021D2124_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" void ov110_021D2124(BGL *param0, Window *param1, u8 param2); void ov110_021D216C(Window *param0, u8 param1); diff --git a/include/overlay111/ov111_021D3548.h b/include/overlay111/ov111_021D3548.h index 9a3f71d089..53da3c9d87 100644 --- a/include/overlay111/ov111_021D3548.h +++ b/include/overlay111/ov111_021D3548.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_OV111_021D3548_H #define POKEPLATINUM_OV111_021D3548_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" void ov111_021D3548(BGL *param0, Window *param1); void ov111_021D3578(Window *param0); diff --git a/include/overlay113/ov113_02260620.h b/include/overlay113/ov113_02260620.h index fed00bfc00..859e7ad9a5 100644 --- a/include/overlay113/ov113_02260620.h +++ b/include/overlay113/ov113_02260620.h @@ -1,11 +1,10 @@ #ifndef POKEPLATINUM_OV113_02260620_H #define POKEPLATINUM_OV113_02260620_H -#include "struct_defs/struct_0205AA50.h" - #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay113/struct_ov113_02260818.h" +#include "bg_window.h" #include "message.h" #include "string_template.h" diff --git a/include/overlay116/struct_ov116_02262A8C.h b/include/overlay116/struct_ov116_02262A8C.h index 77249acee1..6cb5fe7859 100644 --- a/include/overlay116/struct_ov116_02262A8C.h +++ b/include/overlay116/struct_ov116_02262A8C.h @@ -4,7 +4,6 @@ #include #include "struct_decls/cell_actor_data.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay116/struct_ov116_02260490.h" #include "overlay116/struct_ov116_02262A8C_sub1.h" @@ -16,6 +15,8 @@ #include "overlay116/struct_ov116_0226534C.h" #include "overlay116/struct_ov116_022660A8.h" +#include "bg_window.h" + typedef struct { u32 unk_00; int unk_04; diff --git a/include/overlay116/struct_ov116_022649E4.h b/include/overlay116/struct_ov116_022649E4.h index e6854b72a9..700b6d454c 100644 --- a/include/overlay116/struct_ov116_022649E4.h +++ b/include/overlay116/struct_ov116_022649E4.h @@ -7,11 +7,11 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0207C690.h" #include "overlay116/struct_ov116_022649E4_sub1.h" +#include "bg_window.h" #include "camera.h" typedef struct { diff --git a/include/overlay117/ov117_02263AF0.h b/include/overlay117/ov117_02263AF0.h index edef28814d..6487bd9c1c 100644 --- a/include/overlay117/ov117_02263AF0.h +++ b/include/overlay117/ov117_02263AF0.h @@ -4,7 +4,6 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay117/struct_ov117_02261280_decl.h" #include "overlay117/struct_ov117_02263DAC.h" @@ -16,6 +15,7 @@ #include "overlay117/struct_ov117_02265EC8.h" #include "overlay117/struct_ov117_02266274.h" +#include "bg_window.h" #include "font.h" #include "strbuf.h" #include "text.h" diff --git a/include/overlay117/struct_ov117_02261280.h b/include/overlay117/struct_ov117_02261280.h index 2aa576e30b..42a30ead40 100644 --- a/include/overlay117/struct_ov117_02261280.h +++ b/include/overlay117/struct_ov117_02261280.h @@ -8,8 +8,6 @@ #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02014014_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "overlay114/struct_ov114_0225CAD4_decl.h" @@ -31,6 +29,7 @@ #include "overlay117/struct_ov117_02265EC8.h" #include "overlay117/struct_ov117_02266274.h" +#include "bg_window.h" #include "camera.h" #include "message.h" #include "strbuf.h" diff --git a/include/overlay119/ov119_021D0D80.h b/include/overlay119/ov119_021D0D80.h index 3ef358d3fd..0ed6f8b058 100644 --- a/include/overlay119/ov119_021D0D80.h +++ b/include/overlay119/ov119_021D0D80.h @@ -3,8 +3,6 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02014014_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "overlay119/struct_ov119_021D0FD0.h" @@ -12,6 +10,7 @@ #include "overlay119/struct_ov119_021D17B8.h" #include "overlay119/struct_ov119_021D1930.h" +#include "bg_window.h" #include "pokemon.h" void ov119_021D0D80(void); diff --git a/include/overlay119/struct_ov119_021D17B8.h b/include/overlay119/struct_ov119_021D17B8.h index 91be488609..76829d3602 100644 --- a/include/overlay119/struct_ov119_021D17B8.h +++ b/include/overlay119/struct_ov119_021D17B8.h @@ -9,12 +9,12 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "overlay119/struct_ov119_021D14DC.h" +#include "bg_window.h" + typedef struct { BGL *unk_00; PaletteData *unk_04; diff --git a/include/render_text.h b/include/render_text.h index f678962a1a..db2f397811 100644 --- a/include/render_text.h +++ b/include/render_text.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_RENDER_TEXT_H #define POKEPLATINUM_RENDER_TEXT_H -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "charcode.h" #include "strbuf.h" diff --git a/include/script_manager.h b/include/script_manager.h index 0a7cff258f..4e553c13e0 100644 --- a/include/script_manager.h +++ b/include/script_manager.h @@ -5,13 +5,13 @@ #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" #include "struct_defs/struct_0203F478.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system_decl.h" #include "overlay005/struct_ov5_021DC1A4_decl.h" #include "overlay005/struct_ov5_021E1FF4_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" +#include "bg_window.h" #include "field_script_context.h" #include "string_template.h" #include "sys_task_manager.h" diff --git a/include/struct_decls/struct_02018340_decl.h b/include/struct_decls/struct_02018340_decl.h deleted file mode 100644 index 77d8b3d3ce..0000000000 --- a/include/struct_decls/struct_02018340_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02018340_DECL_H -#define POKEPLATINUM_STRUCT_02018340_DECL_H - -typedef struct UnkStruct_02018340_t BGL; - -#endif // POKEPLATINUM_STRUCT_02018340_DECL_H diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index bfac3c7561..43b215808c 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -13,13 +13,11 @@ #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0206D140_decl.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/chatot_cry.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_0209C370.h" #include "struct_defs/trainer_data.h" @@ -35,6 +33,7 @@ #include "overlay012/struct_ov12_0221FCDC_decl.h" #include "bag.h" +#include "bg_window.h" #include "game_options.h" #include "message.h" #include "poketch_data.h" diff --git a/include/struct_defs/pokemon_summary_app.h b/include/struct_defs/pokemon_summary_app.h index fd05b78b39..29005c74a3 100644 --- a/include/struct_defs/pokemon_summary_app.h +++ b/include/struct_defs/pokemon_summary_app.h @@ -10,13 +10,12 @@ #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_poke_sprite_data.h" #include "struct_defs/pokemon_summary.h" #include "struct_defs/sprite_animation_frame.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02091850.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "message.h" diff --git a/include/struct_defs/struct_020127E8.h b/include/struct_defs/struct_020127E8.h index 3758fbce43..5f43cfdc13 100644 --- a/include/struct_defs/struct_020127E8.h +++ b/include/struct_defs/struct_020127E8.h @@ -4,8 +4,8 @@ #include #include "struct_decls/struct_02012744_decl.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" #include "cell_actor.h" typedef struct { diff --git a/include/struct_defs/struct_02015958.h b/include/struct_defs/struct_02015958.h index 94adb24a56..ea0c6607a2 100644 --- a/include/struct_defs/struct_02015958.h +++ b/include/struct_defs/struct_02015958.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_02015958_H #define POKEPLATINUM_STRUCT_02015958_H -#include "struct_decls/struct_02018340_decl.h" +#include "bg_window.h" typedef struct { BGL *unk_00; diff --git a/include/struct_defs/struct_0201AE08.h b/include/struct_defs/struct_0201AE08.h deleted file mode 100644 index f3d2c5d339..0000000000 --- a/include/struct_defs/struct_0201AE08.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_0201AE08_H -#define POKEPLATINUM_STRUCT_0201AE08_H - -typedef struct { - const u8 *unk_00; - u16 unk_04; - u16 unk_06; -} UnkStruct_0201AE08; - -#endif // POKEPLATINUM_STRUCT_0201AE08_H diff --git a/include/struct_defs/struct_0205AA50.h b/include/struct_defs/struct_0205AA50.h deleted file mode 100644 index 3221ab2d89..0000000000 --- a/include/struct_defs/struct_0205AA50.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_0205AA50_H -#define POKEPLATINUM_STRUCT_0205AA50_H - -#include "struct_decls/struct_02018340_decl.h" - -typedef struct { - BGL *unk_00; - u8 unk_04; - u8 unk_05; - u8 unk_06; - u8 unk_07; - u8 unk_08; - u8 unk_09; - u16 unk_0A_0 : 15; - u16 unk_0A_15 : 1; - void *unk_0C; -} Window; - -#endif // POKEPLATINUM_STRUCT_0205AA50_H diff --git a/include/struct_defs/struct_020708E0.h b/include/struct_defs/struct_020708E0.h index 63942b90a6..f4fecb32bd 100644 --- a/include/struct_defs/struct_020708E0.h +++ b/include/struct_defs/struct_020708E0.h @@ -4,13 +4,14 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020684D0.h" #include "struct_defs/struct_02070950.h" #include "functypes/funcptr_02050904.h" #include "overlay005/struct_ov5_021D30A8.h" +#include "bg_window.h" + typedef struct { Window unk_00; Window unk_10; diff --git a/include/struct_defs/struct_0207A778.h b/include/struct_defs/struct_0207A778.h index 7eb5c32c0a..2701f589ec 100644 --- a/include/struct_defs/struct_0207A778.h +++ b/include/struct_defs/struct_0207A778.h @@ -2,12 +2,12 @@ #define POKEPLATINUM_STRUCT_0207A778_H #include "struct_decls/struct_02002F38_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02027F8C_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay006/battle_params.h" +#include "bg_window.h" + typedef struct { BattleParams *unk_00; BGL *unk_04; diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index c3e1b24e53..c35c7e0bc2 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -7,14 +7,13 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/pokemon_summary.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_0207C8C4.h" #include "bag.h" +#include "bg_window.h" #include "game_options.h" #include "game_records.h" #include "message.h" diff --git a/include/struct_defs/struct_0207F248.h b/include/struct_defs/struct_0207F248.h index 7c7c3649d7..0a28f53ad4 100644 --- a/include/struct_defs/struct_0207F248.h +++ b/include/struct_defs/struct_0207F248.h @@ -7,10 +7,8 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02098700_decl.h" #include "struct_defs/funcptr_0207F248_sub1.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_020831B4.h" #include "struct_defs/struct_02083D1C.h" @@ -20,6 +18,7 @@ #include "functypes/funcptr_0207F248.h" #include "overlay118/struct_ov118_021D0FDC_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" #include "strbuf.h" diff --git a/include/struct_defs/struct_02081CF4.h b/include/struct_defs/struct_02081CF4.h index ddb2b70e74..d60fb98057 100644 --- a/include/struct_defs/struct_02081CF4.h +++ b/include/struct_defs/struct_02081CF4.h @@ -2,7 +2,8 @@ #define POKEPLATINUM_STRUCT_02081CF4_H #include "struct_decls/struct_02013A04_decl.h" -#include "struct_defs/struct_0205AA50.h" + +#include "bg_window.h" typedef struct { const ResourceMetadata *unk_00; diff --git a/include/struct_defs/struct_02089688_sub1.h b/include/struct_defs/struct_02089688_sub1.h index b25785067b..020b38c03d 100644 --- a/include/struct_defs/struct_02089688_sub1.h +++ b/include/struct_defs/struct_02089688_sub1.h @@ -7,11 +7,10 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/sprite_manager_allocation.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" #include "touch_screen.h" typedef struct { diff --git a/include/struct_defs/struct_0208C06C.h b/include/struct_defs/struct_0208C06C.h index da9c40ab30..5d6a525883 100644 --- a/include/struct_defs/struct_0208C06C.h +++ b/include/struct_defs/struct_0208C06C.h @@ -3,7 +3,6 @@ #include "struct_decls/struct_0202F41C_decl.h" #include "struct_decls/struct_02030A80_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208B878.h" #include "struct_defs/struct_0208BA84.h" #include "struct_defs/struct_0208C06C_sub1.h" @@ -16,6 +15,7 @@ #include "overlay062/struct_ov62_02233750.h" #include "overlay062/struct_ov62_02233828.h" +#include "bg_window.h" #include "savedata.h" #include "sys_task_manager.h" diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h index 740366407c..d83d7a82b7 100644 --- a/include/struct_defs/struct_02095E80_t.h +++ b/include/struct_defs/struct_02095E80_t.h @@ -7,7 +7,6 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_02095E80_decl.h" @@ -17,13 +16,13 @@ #include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02027F8C.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095E80_sub1.h" #include "field/field_system_decl.h" #include "overlay088/struct_ov88_0223C370.h" #include "overlay088/struct_ov88_0223C8AC.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" #include "overlay_manager.h" diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h index 97cb38ee5b..9acecd1431 100644 --- a/include/struct_defs/struct_02095EAC_t.h +++ b/include/struct_defs/struct_02095EAC_t.h @@ -2,15 +2,14 @@ #define POKEPLATINUM_STRUCT_02095EAC_T_H #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0203DDFC.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095EAC_sub1.h" #include "overlay058/struct_ov58_021D2754.h" #include "overlay058/struct_ov58_021D2820.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" #include "sprite_resource.h" diff --git a/include/struct_defs/struct_020961E8_t.h b/include/struct_defs/struct_020961E8_t.h index f23cec17ed..7f61ee8844 100644 --- a/include/struct_defs/struct_020961E8_t.h +++ b/include/struct_defs/struct_020961E8_t.h @@ -4,15 +4,14 @@ #include #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0203DE34.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020961E8_sub1.h" #include "overlay059/struct_ov59_021D109C.h" #include "overlay059/struct_ov59_021D30E0.h" +#include "bg_window.h" #include "cell_actor.h" #include "message.h" #include "savedata.h" diff --git a/include/text.h b/include/text.h index 8cb50c8ff2..229fc98681 100644 --- a/include/text.h +++ b/include/text.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_TEXT_H #define POKEPLATINUM_TEXT_H -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "font.h" #include "render_text.h" #include "strbuf.h" diff --git a/include/unk_02001AF4.h b/include/unk_02001AF4.h index a7044443f7..03dc9eeed1 100644 --- a/include/unk_02001AF4.h +++ b/include/unk_02001AF4.h @@ -2,11 +2,9 @@ #define POKEPLATINUM_UNK_02001AF4_H #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" -#include "overlay061/struct_ov61_0222C884.h" +#include "bg_window.h" UIControlData *sub_02001AF4(const UnkStruct_02081CF4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5); UIControlData *sub_02001B7C(const UnkStruct_02081CF4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5); diff --git a/include/unk_02006E3C.h b/include/unk_02006E3C.h index 401ea1e857..eaeea9d4e3 100644 --- a/include/unk_02006E3C.h +++ b/include/unk_02006E3C.h @@ -4,7 +4,8 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" + +#include "bg_window.h" u32 sub_02006E3C(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); void sub_02006E60(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); diff --git a/include/unk_0200C440.h b/include/unk_0200C440.h index 2d2fd81bfe..e4857fa625 100644 --- a/include/unk_0200C440.h +++ b/include/unk_0200C440.h @@ -2,7 +2,8 @@ #define POKEPLATINUM_UNK_0200C440_H #include "struct_decls/struct_0200C440_decl.h" -#include "struct_defs/struct_0205AA50.h" + +#include "bg_window.h" UnkStruct_0200C440 *sub_0200C440(u32 param0, u32 param1, u32 param2, u32 param3); void sub_0200C560(UnkStruct_0200C440 *param0); diff --git a/include/unk_0200DA60.h b/include/unk_0200DA60.h index 1d641ad6c0..43a4868832 100644 --- a/include/unk_0200DA60.h +++ b/include/unk_0200DA60.h @@ -1,9 +1,7 @@ #ifndef POKEPLATINUM_UNK_0200DA60_H #define POKEPLATINUM_UNK_0200DA60_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "pokemon.h" #define TEXT_WINDOW_SIZE 30 diff --git a/include/unk_02012744.h b/include/unk_02012744.h index 052393c95b..4ee5d41e11 100644 --- a/include/unk_02012744.h +++ b/include/unk_02012744.h @@ -7,8 +7,8 @@ #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02012B20_decl.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" #include "cell_actor.h" UnkStruct_02012744 *sub_02012744(int param0, int param1); diff --git a/include/unk_020366A0.h b/include/unk_020366A0.h index d098379aa9..1efd6f1858 100644 --- a/include/unk_020366A0.h +++ b/include/unk_020366A0.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_UNK_020366A0_H #define POKEPLATINUM_UNK_020366A0_H -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0202610C.h" #include "overlay065/struct_ov65_0222F6EC.h" +#include "bg_window.h" #include "enums.h" #include "savedata.h" diff --git a/include/unk_0205D8CC.h b/include/unk_0205D8CC.h index 52bb95b140..afeedb3154 100644 --- a/include/unk_0205D8CC.h +++ b/include/unk_0205D8CC.h @@ -1,9 +1,7 @@ #ifndef POKEPLATINUM_UNK_0205D8CC_H #define POKEPLATINUM_UNK_0205D8CC_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "game_options.h" #include "strbuf.h" diff --git a/include/unk_0208A3F4.h b/include/unk_0208A3F4.h index 3d1357a940..107941eaab 100644 --- a/include/unk_0208A3F4.h +++ b/include/unk_0208A3F4.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_UNK_0208A3F4_H #define POKEPLATINUM_UNK_0208A3F4_H -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02089688.h" +#include "bg_window.h" + void sub_0208A3F4(UnkStruct_02089688 *param0); void sub_0208A490(UnkStruct_02089688 *param0); void sub_0208A6CC(UnkStruct_02089688 *param0); diff --git a/include/unk_0208C098.h b/include/unk_0208C098.h index 856883838a..ba76de9f39 100644 --- a/include/unk_0208C098.h +++ b/include/unk_0208C098.h @@ -4,7 +4,8 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" + +#include "bg_window.h" enum BarColor { BARCOLOR_EMPTY = 0, diff --git a/include/unk_0208EA44.h b/include/unk_0208EA44.h index 5efe27268b..9fa108c13f 100644 --- a/include/unk_0208EA44.h +++ b/include/unk_0208EA44.h @@ -2,7 +2,8 @@ #define POKEPLATINUM_UNK_0208EA44_H #include "struct_defs/pokemon_summary_app.h" -#include "struct_defs/struct_0205AA50.h" + +#include "bg_window.h" void sub_0208EA44(PokemonSummaryApp *param0); void sub_0208EAF4(PokemonSummaryApp *param0); diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 343fa4fb94..89c09f6d52 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -68,7 +68,7 @@ Static main Object main.nef.p/src_unk_02017498.c.o Object main.nef.p/src_unk_02017728.c.o Object main.nef.p/src_heap.c.o - Object main.nef.p/src_unk_02018340.c.o + Object main.nef.p/src_bg_window.c.o Object main.nef.p/src_easy3d.c.o Object main.nef.p/src_sys_task_manager.c.o Object main.nef.p/src_unk_0201CED8.c.o diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index d29d7006c6..c69e6a9a81 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -13,13 +13,11 @@ #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/battle_io.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/trainer_data.h" #include "battle/battle_context.h" @@ -124,6 +122,7 @@ #include "overlay013/struct_ov13_022264F4.h" #include "assert.h" +#include "bg_window.h" #include "core_sys.h" #include "enums.h" #include "flags.h" @@ -148,7 +147,6 @@ #include "unk_020131EC.h" #include "unk_0201567C.h" #include "unk_02015F84.h" -#include "unk_02018340.h" static void ov16_0225E4E8(SysTask *param0, void *param1); static void ov16_0225E894(SysTask *param0, void *param1); diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c index 355c4ef319..292ef6172d 100644 --- a/src/battle/battle_io_command.c +++ b/src/battle/battle_io_command.c @@ -13,7 +13,6 @@ #include "struct_decls/struct_party_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/battle_io.h" -#include "struct_defs/struct_0205AA50.h" #include "battle/battle_display.h" #include "battle/battle_io.h" @@ -72,6 +71,7 @@ #include "overlay012/ov12_022380BC.h" #include "overlay012/struct_ov12_02237728.h" +#include "bg_window.h" #include "flags.h" #include "heap.h" #include "narc.h" @@ -80,7 +80,6 @@ #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_020131EC.h" -#include "unk_02018340.h" typedef void (*UnkFuncPtr_ov16_0226F068)(BattleSystem *, BattlerData *); diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 5019fa76ee..2f8cfd9cf0 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -18,7 +18,6 @@ #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/archived_sprite.h" @@ -28,7 +27,6 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208737C.h" #include "struct_defs/trainer_data.h" @@ -52,6 +50,7 @@ #include "overlay021/ov21_021E8D48.h" #include "overlay021/struct_ov21_021E8E0C.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "flags.h" @@ -79,7 +78,6 @@ #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_0201567C.h" -#include "unk_02018340.h" #include "unk_0201E86C.h" #include "unk_020797C8.h" #include "unk_0207A274.h" diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index 26a2ba2bdb..a0f496b56a 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -10,16 +10,15 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/struct_0205AA50.h" #include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_022674C4.h" #include "gmm/message_bank_battle_strings.h" #include "assert.h" +#include "bg_window.h" #include "cell_actor.h" #include "heap.h" #include "message.h" @@ -33,7 +32,6 @@ #include "unk_02002F38.h" #include "unk_0200C440.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0208C098.h" diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 2fb88a2e87..3640f8d940 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -10,7 +10,6 @@ #include "struct_decls/battle_system.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0207AE68_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/battle_system.h" @@ -36,13 +35,12 @@ #include "overlay010/struct_ov10_0221F800.h" #include "overlay011/ov11_0221F840.h" #include "overlay012/ov12_0221FC20.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" #include "bag.h" +#include "bg_window.h" #include "communication_system.h" #include "flags.h" #include "font.h" @@ -77,7 +75,6 @@ #include "unk_0201567C.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 4b7e5239b6..309ca5551e 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -19,13 +19,11 @@ #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/battle_system.h" #include "struct_defs/chatot_cry.h" #include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/trainer_data.h" #include "battle/battle_context.h" @@ -47,6 +45,7 @@ #include "overlay012/struct_ov12_0221FCDC_decl.h" #include "bag.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "flags.h" @@ -70,7 +69,6 @@ #include "unk_02005474.h" #include "unk_0200F174.h" #include "unk_02014A84.h" -#include "unk_02018340.h" #include "unk_0202631C.h" #include "unk_0202F1D4.h" #include "unk_0206CCB0.h" diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 174495f282..22ad543a94 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -11,12 +11,10 @@ #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02012B20_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0209C370.h" #include "battle/battle_display.h" @@ -32,9 +30,9 @@ #include "battle/struct_ov16_0226DC24_decl.h" #include "battle/struct_ov16_0226DEEC_decl.h" #include "overlay011/ov11_0221F800.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "assert.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "enums.h" @@ -60,7 +58,6 @@ #include "unk_0200DA60.h" #include "unk_02012744.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201E86C.h" #include "unk_0207C908.h" diff --git a/src/unk_02018340.c b/src/bg_window.c similarity index 99% rename from src/unk_02018340.c rename to src/bg_window.c index 6bf90185b6..07937ff83d 100644 --- a/src/unk_02018340.c +++ b/src/bg_window.c @@ -1,15 +1,9 @@ -#include "unk_02018340.h" +#include "bg_window.h" #include #include -#include "struct_defs/struct_0201AE08.h" -#include "struct_defs/struct_0205AA50.h" - -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "gx_layers.h" #include "heap.h" #include "unk_0201D15C.h" @@ -19,30 +13,6 @@ enum { UnkEnum_01 = 1, }; -typedef struct { - void *unk_00; - u32 unk_04; - u32 unk_08; - int unk_0C; - int unk_10; - u8 unk_14; - u8 unk_15; - u8 unk_16; - u8 unk_17; - u16 unk_18; - fx32 unk_1C; - fx32 unk_20; - int unk_24; - int unk_28; -} UnkStruct_02019304; - -typedef struct UnkStruct_02018340_t { - u32 unk_00; - u16 unk_04; - u16 unk_06; - UnkStruct_02019304 unk_08[8]; -} BGL; - static u8 sub_02018F80(u8 param0, u8 param1); static void sub_02019304(UnkStruct_02019304 *param0, u8 param1, int param2); static void sub_020193E4(BGL *param0, u8 param1); diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index b9906e378b..33d592ecd3 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -15,11 +15,9 @@ #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02015214_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/choose_starter_data.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay021/struct_ov21_021E7F40.h" @@ -27,11 +25,9 @@ #include "overlay022/struct_ov22_022557A0.h" #include "overlay022/struct_ov22_02255800.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "core_sys.h" @@ -61,7 +57,6 @@ #include "unk_0200F174.h" #include "unk_02015064.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_0201E86C.h" diff --git a/src/colored_arrow.c b/src/colored_arrow.c index 1b4c07e711..1caec969a6 100644 --- a/src/colored_arrow.c +++ b/src/colored_arrow.c @@ -5,13 +5,11 @@ #include "constants/charcode.h" -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "charcode.h" #include "heap.h" #include "strbuf.h" #include "text.h" -#include "unk_02018340.h" ColoredArrow *ColoredArrow_New(u32 heapID) { diff --git a/src/error_message_reset.c b/src/error_message_reset.c index 66392f14e2..7454aea66e 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -3,15 +3,10 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02017E74.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "communication_system.h" #include "core_sys.h" #include "font.h" @@ -25,7 +20,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_020366A0.h" static const UnkStruct_02099F80 sErrorMessageBanksConfig = { diff --git a/src/field_map_change.c b/src/field_map_change.c index dd6ab2fe7c..7b714331f2 100644 --- a/src/field_map_change.c +++ b/src/field_map_change.c @@ -12,7 +12,6 @@ #include "struct_decls/struct_020508D4_decl.h" #include "struct_defs/map_load_mode.h" #include "struct_defs/struct_02049FA8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0205EC34.h" #include "field/field_system.h" @@ -26,8 +25,8 @@ #include "overlay023/ov23_02248F1C.h" #include "overlay023/ov23_022499E4.h" #include "overlay023/ov23_0224B05C.h" -#include "overlay061/struct_ov61_0222C884.h" +#include "bg_window.h" #include "communication_system.h" #include "core_sys.h" #include "field_overworld_state.h" @@ -55,7 +54,6 @@ #include "unk_0200A9DC.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_02027F50.h" #include "unk_0202854C.h" #include "unk_02039C80.h" diff --git a/src/field_menu.c b/src/field_menu.c index 7bb60acf55..e77a5ac2c4 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -37,6 +37,7 @@ #include "overlay104/struct_ov104_02241308.h" #include "bag.h" +#include "bg_window.h" #include "cell_actor.h" #include "field_overworld_state.h" #include "field_system.h" @@ -69,7 +70,6 @@ #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02014A84.h" -#include "unk_02018340.h" #include "unk_0202631C.h" #include "unk_02028124.h" #include "unk_0202D778.h" diff --git a/src/field_system.c b/src/field_system.c index f0e72e4b2e..60f9d6a2b4 100644 --- a/src/field_system.c +++ b/src/field_system.c @@ -5,7 +5,6 @@ #include "constants/field/map_load.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0203CC84.h" #include "field/field_system_sub1_decl.h" @@ -20,6 +19,7 @@ #include "overlay077/const_ov77_021D742C.h" #include "bag.h" +#include "bg_window.h" #include "comm_player_manager.h" #include "communication_system.h" #include "core_sys.h" diff --git a/src/library_tv/library_tv.c b/src/library_tv/library_tv.c index 1842b55e55..666ff5b934 100644 --- a/src/library_tv/library_tv.c +++ b/src/library_tv/library_tv.c @@ -5,13 +5,9 @@ #include "constants/narc.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "font.h" #include "gx_layers.h" #include "heap.h" @@ -21,7 +17,6 @@ #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #define LIBRARY_TV_DURATION 90 + 150 diff --git a/src/meson.build b/src/meson.build index c42ec4c8e7..9008d53889 100644 --- a/src/meson.build +++ b/src/meson.build @@ -63,7 +63,7 @@ pokeplatinum_c = files( 'unk_02017428.c', 'unk_02017498.c', 'unk_02017728.c', - 'unk_02018340.c', + 'bg_window.c', 'easy3d.c', 'sys_task_manager.c', 'unk_0201CED8.c', diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c index 92b441ce28..2ab3e89769 100644 --- a/src/overlay005/encounter_effect.c +++ b/src/overlay005/encounter_effect.c @@ -9,8 +9,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02014014_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "field/field_system.h" @@ -27,9 +25,8 @@ #include "overlay005/struct_ov5_021DE5A4.h" #include "overlay005/struct_ov5_021DE5D0.h" #include "overlay006/battle_params.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "enc_effects.h" @@ -46,7 +43,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_02014000.h" -#include "unk_02018340.h" #include "unk_02054884.h" enum ScreenFlashState { diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c index 2a03ebd053..0b50388ca4 100644 --- a/src/overlay005/encounter_effect_core.c +++ b/src/overlay005/encounter_effect_core.c @@ -6,8 +6,6 @@ #include "constants/heap.h" #include "constants/trainer.h" -#include "struct_defs/struct_0205AA50.h" - #include "field/field_system.h" #include "field/field_system_sub2_t.h" #include "overlay005/encounter_effect.h" @@ -22,6 +20,7 @@ #include "overlay005/struct_ov5_021E52A8_sub2.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "gx_layers.h" @@ -38,7 +37,6 @@ #include "unk_02006E3C.h" #include "unk_0200A9DC.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0202419C.h" // EncounterEffect_Grass_HigherLevel diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index b233d5bd1f..0ab47f0107 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -3,7 +3,6 @@ #include "constants/field/map_load.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02020C44_decl.h" #include "struct_decls/struct_02027860_decl.h" #include "struct_decls/struct_0203A790_decl.h" @@ -48,9 +47,8 @@ #include "overlay005/struct_ov5_021ED0A4.h" #include "overlay009/ov9_02249960.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "camera.h" #include "comm_player_manager.h" #include "core_sys.h" @@ -74,7 +72,6 @@ #include "unk_0200A784.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c index 8453a3a22c..386e3311b9 100644 --- a/src/overlay005/ov5_021D5EB8.c +++ b/src/overlay005/ov5_021D5EB8.c @@ -11,6 +11,7 @@ #include "overlay005/ov5_021D57BC.h" #include "overlay005/struct_ov5_021D57D8_decl.h" +#include "bg_window.h" #include "buffer_manager.h" #include "camera.h" #include "cell_actor.h" @@ -26,7 +27,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201E190.h" #include "unk_0202309C.h" diff --git a/src/overlay005/ov5_021DC018.c b/src/overlay005/ov5_021DC018.c index 82fa9d88a0..e1c58d15ad 100644 --- a/src/overlay005/ov5_021DC018.c +++ b/src/overlay005/ov5_021DC018.c @@ -7,13 +7,13 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "field/field_system.h" #include "overlay005/struct_ov5_021DC1A4_decl.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "coins.h" #include "core_sys.h" #include "font.h" @@ -31,7 +31,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0202D05C.h" struct UnkStruct_ov5_021DC1A4_t { diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index acc2849e6c..1432382abc 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -4,11 +4,11 @@ #include #include "struct_defs/sentence.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "overlay005/struct_ov5_021DD42C.h" +#include "bg_window.h" #include "field_script_context.h" #include "game_options.h" #include "message.h" @@ -18,7 +18,6 @@ #include "string_template.h" #include "text.h" #include "unk_02014A84.h" -#include "unk_02018340.h" #include "unk_0205D8CC.h" typedef struct { diff --git a/src/overlay005/ov5_021DD6FC.c b/src/overlay005/ov5_021DD6FC.c index 93c4650609..0c6d91a655 100644 --- a/src/overlay005/ov5_021DD6FC.c +++ b/src/overlay005/ov5_021DD6FC.c @@ -3,12 +3,10 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "bg_window.h" #include "heap.h" #include "map_header.h" #include "message.h" @@ -17,7 +15,6 @@ #include "sys_task_manager.h" #include "text.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_02071CFC.h" typedef struct UnkStruct_ov5_021DD9C8_t { diff --git a/src/overlay005/ov5_021E1B08.c b/src/overlay005/ov5_021E1B08.c index 726fda18a4..eb94af7b04 100644 --- a/src/overlay005/ov5_021E1B08.c +++ b/src/overlay005/ov5_021E1B08.c @@ -3,13 +3,11 @@ #include #include -#include "struct_defs/struct_0205AA50.h" - #include "field/field_system.h" #include "overlay005/struct_ov5_021E1B20_decl.h" +#include "bg_window.h" #include "heap.h" -#include "unk_02018340.h" #include "unk_0205D8CC.h" struct UnkStruct_ov5_021E1B20_t { diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index 102587032c..dc91cb1470 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -4,14 +4,13 @@ #include #include "struct_decls/pokedexdata_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02049FA8.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "overlay005/ov5_021EA714.h" #include "overlay005/struct_ov5_021E1FF4_decl.h" +#include "bg_window.h" #include "field_overworld_state.h" #include "font.h" #include "heap.h" @@ -27,7 +26,6 @@ #include "text.h" #include "trainer_info.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_0202631C.h" #include "unk_020366A0.h" diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c index cb9d5c5872..e909b8936c 100644 --- a/src/overlay005/ov5_021EA874.c +++ b/src/overlay005/ov5_021EA874.c @@ -9,13 +9,12 @@ #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" #include "bag.h" +#include "bg_window.h" #include "communication_information.h" #include "communication_system.h" #include "field_system.h" @@ -33,7 +32,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202ACE0.h" #include "unk_0203061C.h" #include "unk_0203909C.h" diff --git a/src/overlay005/ov5_021F007C.c b/src/overlay005/ov5_021F007C.c index 293d94e0ca..5e1b0daf10 100644 --- a/src/overlay005/ov5_021F007C.c +++ b/src/overlay005/ov5_021F007C.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "field/field_system.h" @@ -14,6 +13,7 @@ #include "overlay006/ov6_02240C9C.h" #include "overlay006/struct_ov6_0223E6EC.h" +#include "bg_window.h" #include "gx_layers.h" #include "heap.h" #include "map_header.h" @@ -22,7 +22,6 @@ #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_020508D4.h" #include "unk_02054D00.h" diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index f64f3208f6..cbe524d10e 100644 --- a/src/overlay005/ov5_021F08CC.c +++ b/src/overlay005/ov5_021F08CC.c @@ -8,7 +8,6 @@ #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "overlay005/ov5_021DFB54.h" @@ -17,6 +16,7 @@ #include "overlay006/ov6_02240C9C.h" #include "overlay101/struct_ov101_021D5D90_decl.h" +#include "bg_window.h" #include "core_sys.h" #include "game_records.h" #include "heap.h" @@ -32,7 +32,6 @@ #include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_020508D4.h" #include "unk_02050A74.h" diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 1137481a62..befb89c930 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -14,7 +14,6 @@ #include "struct_decls/struct_02061AB4_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "overlay005/ov5_021EB1A0.h" @@ -23,6 +22,7 @@ #include "overlay084/struct_ov84_02240FA8.h" #include "bag.h" +#include "bg_window.h" #include "field_script_context.h" #include "game_records.h" #include "heap.h" @@ -45,7 +45,6 @@ #include "unk_02006E3C.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_02020AEC.h" #include "unk_0202631C.h" diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 142083f35d..57f3f8ea34 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -9,7 +9,6 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "overlay005/ov5_021DC018.h" @@ -18,6 +17,7 @@ #include "overlay084/struct_ov84_02240FA8.h" #include "bag.h" +#include "bg_window.h" #include "field_script_context.h" #include "heap.h" #include "inlines.h" @@ -34,7 +34,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0202631C.h" #include "unk_02054884.h" diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index 795867a045..33da74e90c 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" @@ -21,10 +20,9 @@ #include "overlay006/funcptr_ov6_0223E6EC.h" #include "overlay006/struct_ov6_0223E6EC.h" #include "overlay006/struct_ov6_0223FDE4_decl.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "core_sys.h" #include "easy3d_object.h" @@ -38,7 +36,6 @@ #include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_020508D4.h" #include "unk_020655F4.h" diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c index 44363ab5cc..30c193bd73 100644 --- a/src/overlay006/ov6_02243258.c +++ b/src/overlay006/ov6_02243258.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02061AB4_decl.h" #include "struct_decls/struct_020711EC_decl.h" #include "struct_defs/archived_sprite.h" @@ -15,6 +14,7 @@ #include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" +#include "bg_window.h" #include "cell_actor.h" #include "gx_layers.h" #include "heap.h" @@ -30,7 +30,6 @@ #include "unk_0200A328.h" #include "unk_0200F174.h" #include "unk_020131EC.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0205D8CC.h" #include "unk_020711EC.h" diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c index 01ed5dfc9f..880c8365f6 100644 --- a/src/overlay006/ov6_02247A0C.c +++ b/src/overlay006/ov6_02247A0C.c @@ -3,12 +3,11 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" +#include "bg_window.h" #include "core_sys.h" #include "field_system.h" #include "font.h" @@ -20,7 +19,6 @@ #include "string_template.h" #include "text.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_0202F108.h" #include "unk_020508D4.h" diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c index 5683fe86dc..96f5c034c0 100644 --- a/src/overlay007/communication_club.c +++ b/src/overlay007/communication_club.c @@ -10,13 +10,12 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "gmm/message_bank_unk_0353.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "communication_information.h" #include "communication_system.h" #include "core_sys.h" @@ -37,7 +36,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_02033200.h" #include "unk_020363E8.h" #include "unk_020366A0.h" diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c index a04e9aab9f..8f8ba547c3 100644 --- a/src/overlay007/ov7_0224B4E8.c +++ b/src/overlay007/ov7_0224B4E8.c @@ -10,11 +10,11 @@ #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0202610C.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "heap.h" @@ -28,7 +28,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202602C.h" #include "unk_02026150.h" #include "unk_020508D4.h" diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index 284c195454..9d08641353 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -7,17 +7,15 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02029D04_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay007/struct_ov7_0224BEFC_decl.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" #include "bag.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -37,7 +35,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_020298BC.h" #include "unk_0205D8CC.h" diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index c0286a2b2c..e359b0a784 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -16,10 +16,10 @@ #include "overlay007/struct_ov7_0224D008.h" #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" #include "bag.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "core_sys.h" @@ -50,7 +50,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202854C.h" #include "unk_0202C9F4.h" #include "unk_0202D05C.h" diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 8f370eed55..cfe54fb77d 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -9,7 +9,6 @@ #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" #include "struct_defs/struct_02055130.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02071B10.h" #include "struct_defs/struct_02071B30.h" #include "struct_defs/struct_02071B6C.h" @@ -36,6 +35,7 @@ #include "overlay008/struct_ov8_02249FB8.h" #include "overlay101/struct_ov101_021D5D90_decl.h" +#include "bg_window.h" #include "camera.h" #include "core_sys.h" #include "field_system.h" @@ -54,7 +54,6 @@ #include "trainer_info.h" #include "unk_02005474.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_02027F50.h" #include "unk_020508D4.h" diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index 90183be9e3..ff8050a8c5 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -40,6 +40,7 @@ #include "overlay101/struct_ov101_021D86B0.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "field_system.h" @@ -59,7 +60,6 @@ #include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_0200A328.h" -#include "unk_02018340.h" #include "unk_0201CED8.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 061ee9a55b..d338a3e9cb 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -12,24 +12,20 @@ #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02014014_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" #include "overlay010/struct_ov10_0221F800.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" #include "bag.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "communication_information.h" @@ -66,7 +62,6 @@ #include "unk_02012744.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0202419C.h" diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index 27b8c26196..da10f5e153 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -10,7 +10,6 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/chatot_cry.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" @@ -37,6 +36,7 @@ #include "overlay017/ov17_022413D8.h" #include "overlay104/struct_ov104_02241308.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -53,7 +53,6 @@ #include "unk_020093B4.h" #include "unk_0200C6E4.h" #include "unk_02014000.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201F834.h" diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c index b4b06cf25f..55e611b6ed 100644 --- a/src/overlay012/ov12_02226B84.c +++ b/src/overlay012/ov12_02226B84.c @@ -8,7 +8,6 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200D0F4.h" #include "overlay012/ov12_0221FC20.h" @@ -25,6 +24,7 @@ #include "overlay012/struct_ov12_0223595C.h" #include "overlay012/struct_ov12_02235998.h" +#include "bg_window.h" #include "cell_actor.h" #include "heap.h" #include "inlines.h" @@ -35,7 +35,6 @@ #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_02014000.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201F834.h" diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c index 89595cca55..03e7d17c8b 100644 --- a/src/overlay012/ov12_0222AC70.c +++ b/src/overlay012/ov12_0222AC70.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" @@ -24,13 +23,13 @@ #include "overlay012/struct_ov12_0223595C.h" #include "overlay012/struct_ov12_02235998.h" +#include "bg_window.h" #include "cell_actor.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" #include "unk_0201F834.h" typedef struct { diff --git a/src/overlay012/ov12_0222D6B0.c b/src/overlay012/ov12_0222D6B0.c index b0a8d15429..0dc5ac9467 100644 --- a/src/overlay012/ov12_0222D6B0.c +++ b/src/overlay012/ov12_0222D6B0.c @@ -20,11 +20,11 @@ #include "overlay012/struct_ov12_02235350.h" #include "overlay012/struct_ov12_0223595C.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" typedef struct { diff --git a/src/overlay012/ov12_0222E91C.c b/src/overlay012/ov12_0222E91C.c index 125c2138db..daf6087585 100644 --- a/src/overlay012/ov12_0222E91C.c +++ b/src/overlay012/ov12_0222E91C.c @@ -22,6 +22,7 @@ #include "overlay012/struct_ov12_02235998.h" #include "overlay012/struct_ov12_022380DC.h" +#include "bg_window.h" #include "cell_actor.h" #include "heap.h" #include "pokemon.h" @@ -29,7 +30,6 @@ #include "unk_02002F38.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" #include "unk_0201F834.h" typedef struct { diff --git a/src/overlay012/ov12_0222F700.c b/src/overlay012/ov12_0222F700.c index 2272edcf85..d673d8e357 100644 --- a/src/overlay012/ov12_0222F700.c +++ b/src/overlay012/ov12_0222F700.c @@ -21,6 +21,7 @@ #include "overlay012/struct_ov12_02226504_decl.h" #include "overlay012/struct_ov12_0222660C_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "heap.h" @@ -29,7 +30,6 @@ #include "unk_0200762C.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" typedef struct { UnkStruct_ov12_0221FCDC *unk_00; diff --git a/src/overlay012/ov12_02234E44.c b/src/overlay012/ov12_02234E44.c index 2853862110..a329166217 100644 --- a/src/overlay012/ov12_02234E44.c +++ b/src/overlay012/ov12_02234E44.c @@ -10,11 +10,11 @@ #include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_0223595C.h" +#include "bg_window.h" #include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" typedef struct { int unk_00; diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index 4cf3288525..84da96479d 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -5,7 +5,6 @@ #include "struct_decls/battle_system.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "battle/ov16_0223DF00.h" #include "overlay013/ov13_02221A88.h" @@ -16,10 +15,9 @@ #include "overlay013/struct_ov13_022213F0.h" #include "overlay013/struct_ov13_02221ED0.h" #include "overlay013/struct_ov13_022236B8.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "bag.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "gx_layers.h" @@ -43,7 +41,6 @@ #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_0208C098.h" #include "unk_02094EDC.h" diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c index e7fdb9f067..28539bc8d2 100644 --- a/src/overlay013/ov13_02221A88.c +++ b/src/overlay013/ov13_02221A88.c @@ -3,15 +3,13 @@ #include #include -#include "struct_defs/struct_0205AA50.h" - #include "battle/ov16_0223DF00.h" #include "overlay013/struct_ov13_0221FC20.h" #include "overlay013/struct_ov13_022213F0.h" #include "overlay013/struct_ov13_02221ED0.h" #include "overlay013/struct_ov13_022236B8.h" -#include "overlay061/struct_ov61_0222C884.h" +#include "bg_window.h" #include "font.h" #include "heap.h" #include "item.h" @@ -26,7 +24,6 @@ #include "text.h" #include "unk_0200C440.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_0208C098.h" #include "unk_02094EDC.h" diff --git a/src/overlay013/ov13_02225710.c b/src/overlay013/ov13_02225710.c index 503a22e110..7a3ee67c48 100644 --- a/src/overlay013/ov13_02225710.c +++ b/src/overlay013/ov13_02225710.c @@ -6,10 +6,10 @@ #include "overlay013/ov13_0221FC20.h" #include "overlay013/struct_ov13_022213F0.h" +#include "bg_window.h" #include "heap.h" #include "unk_02002F38.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" typedef struct { u8 unk_00; diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index bf5285a674..0be08d7285 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -5,7 +5,6 @@ #include "struct_decls/battle_system.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" @@ -19,10 +18,9 @@ #include "overlay013/ov13_02228A38.h" #include "overlay013/struct_ov13_022264F4.h" #include "overlay013/struct_ov13_02227244.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "bag.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "gx_layers.h" @@ -44,7 +42,6 @@ #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_020797C8.h" static void ov13_02226590(SysTask *param0, void *param1); diff --git a/src/overlay013/ov13_02227288.c b/src/overlay013/ov13_02227288.c index bc2afa549c..47ce6f0c0a 100644 --- a/src/overlay013/ov13_02227288.c +++ b/src/overlay013/ov13_02227288.c @@ -3,12 +3,10 @@ #include #include -#include "struct_defs/struct_0205AA50.h" - #include "battle/ov16_0223DF00.h" #include "overlay013/struct_ov13_02227244.h" -#include "overlay061/struct_ov61_0222C884.h" +#include "bg_window.h" #include "font.h" #include "item.h" #include "message.h" @@ -17,7 +15,6 @@ #include "string_template.h" #include "text.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" static void ov13_022273CC(UnkStruct_ov13_02227244 *param0); static void ov13_02227888(UnkStruct_ov13_02227244 *param0); diff --git a/src/overlay013/ov13_02228128.c b/src/overlay013/ov13_02228128.c index 68602715d5..52d7fc28e5 100644 --- a/src/overlay013/ov13_02228128.c +++ b/src/overlay013/ov13_02228128.c @@ -8,9 +8,9 @@ #include "overlay013/ov13_02227A4C.h" #include "overlay013/struct_ov13_02227244.h" +#include "bg_window.h" #include "heap.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" typedef struct { u8 unk_00; diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index 6714b3b468..eea56ff6fc 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" #include "overlay011/ov11_0221F840.h" @@ -23,12 +22,11 @@ #include "overlay017/struct_ov17_0223BCE8.h" #include "overlay017/struct_ov17_0223BE58.h" #include "overlay017/struct_ov17_02246F24.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "font.h" #include "game_overlay.h" #include "gx_layers.h" @@ -52,7 +50,6 @@ #include "unk_02012744.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_020366A0.h" diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index b3b11e5268..c3f2639d09 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" #include "overlay011/ov11_0221F840.h" @@ -15,12 +14,11 @@ #include "overlay017/struct_ov17_0223D60C.h" #include "overlay017/struct_ov17_02247A48.h" #include "overlay022/ov22_0225AF8C.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "font.h" #include "game_options.h" #include "game_overlay.h" @@ -44,7 +42,6 @@ #include "unk_0200F174.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_020366A0.h" diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index ab57e90be5..7bbb7b5a74 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" #include "overlay011/ov11_0221F840.h" @@ -21,12 +20,11 @@ #include "overlay017/struct_ov17_02252FC4.h" #include "overlay017/struct_ov17_02253084.h" #include "overlay022/ov22_0225AF8C.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "camera.h" #include "font.h" #include "game_options.h" @@ -53,7 +51,6 @@ #include "unk_02012744.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_020366A0.h" diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index a317c873e4..24ff30eee0 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -9,12 +9,10 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02095C48.h" @@ -23,6 +21,7 @@ #include "overlay017/struct_ov17_0223F6E8.h" #include "overlay017/struct_ov17_0223F744.h" +#include "bg_window.h" #include "font.h" #include "game_overlay.h" #include "gx_layers.h" @@ -37,7 +36,6 @@ #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201E86C.h" #include "unk_02024220.h" diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index 430035ced5..6aefd817d5 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -9,12 +9,10 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48.h" #include "overlay017/ov17_0223F118.h" @@ -25,9 +23,9 @@ #include "overlay017/struct_ov17_0223F88C.h" #include "overlay017/struct_ov17_022472F8.h" #include "overlay017/struct_ov17_02252B48_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "assert.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "heap.h" @@ -46,7 +44,6 @@ #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201E86C.h" #include "unk_02094EDC.h" diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index 9a0f7424a0..bb0f2fc8a5 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -27,6 +27,7 @@ #include "overlay017/struct_ov17_022538F0.h" #include "assert.h" +#include "bg_window.h" #include "game_options.h" #include "heap.h" #include "inlines.h" @@ -44,7 +45,6 @@ #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0208C098.h" #include "unk_02094EDC.h" diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c index ab5c77ae32..9628b88941 100644 --- a/src/overlay017/ov17_022476F8.c +++ b/src/overlay017/ov17_022476F8.c @@ -15,6 +15,7 @@ #include "overlay017/struct_ov17_02247A48.h" #include "overlay017/struct_ov17_0225442C.h" +#include "bg_window.h" #include "game_options.h" #include "heap.h" #include "message.h" @@ -27,7 +28,6 @@ #include "unk_02005474.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" typedef struct { diff --git a/src/overlay017/ov17_02247A48.c b/src/overlay017/ov17_02247A48.c index a8b2156a54..440879160e 100644 --- a/src/overlay017/ov17_02247A48.c +++ b/src/overlay017/ov17_02247A48.c @@ -34,6 +34,7 @@ #include "overlay022/struct_ov22_0225AF8C.h" #include "assert.h" +#include "bg_window.h" #include "core_sys.h" #include "heap.h" #include "pokemon.h" @@ -46,7 +47,6 @@ #include "unk_0200762C.h" #include "unk_0200A9DC.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index a7819b60d5..d1023ce23d 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -7,16 +7,14 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48.h" #include "overlay017/struct_ov17_0224A1EC.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "heap.h" @@ -30,7 +28,6 @@ #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201E86C.h" #include "unk_02094EDC.h" diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index 19f3b5f047..3f35424148 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -36,6 +36,7 @@ #include "overlay022/struct_ov22_0225B1BC_decl.h" #include "assert.h" +#include "bg_window.h" #include "cell_actor.h" #include "game_options.h" #include "heap.h" @@ -54,7 +55,6 @@ #include "unk_0200DA60.h" #include "unk_02012744.h" #include "unk_02014000.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" diff --git a/src/overlay017/ov17_0224CFB8.c b/src/overlay017/ov17_0224CFB8.c index 70b2cbdd2a..8a8d416f0f 100644 --- a/src/overlay017/ov17_0224CFB8.c +++ b/src/overlay017/ov17_0224CFB8.c @@ -34,6 +34,7 @@ #include "overlay017/struct_ov17_022539E4.h" #include "overlay022/ov22_0225AF8C.h" +#include "bg_window.h" #include "communication_system.h" #include "heap.h" #include "pokemon.h" @@ -42,7 +43,6 @@ #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_02094EDC.h" static int ov17_0224CFF8(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index 55540c9681..bdda1775ed 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" #include "overlay011/ov11_0221F840.h" @@ -13,12 +12,11 @@ #include "overlay017/ov17_02251D6C.h" #include "overlay017/struct_ov17_0224FCA0.h" #include "overlay017/struct_ov17_0224FECC.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "font.h" #include "game_overlay.h" #include "gx_layers.h" @@ -40,7 +38,6 @@ #include "unk_02012744.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_020366A0.h" diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 740b65129e..6cef5ab9ee 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -16,6 +16,7 @@ #include "overlay017/struct_ov17_02254C0C.h" #include "assert.h" +#include "bg_window.h" #include "cell_actor.h" #include "game_options.h" #include "heap.h" @@ -34,7 +35,6 @@ #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" diff --git a/src/overlay017/ov17_02251D6C.c b/src/overlay017/ov17_02251D6C.c index 8c79b97de4..5585087970 100644 --- a/src/overlay017/ov17_02251D6C.c +++ b/src/overlay017/ov17_02251D6C.c @@ -23,6 +23,7 @@ #include "overlay017/struct_ov17_022529C8.h" #include "overlay017/struct_ov17_022539E4.h" +#include "bg_window.h" #include "heap.h" #include "pokemon.h" #include "sys_task.h" @@ -32,7 +33,6 @@ #include "unk_0200A9DC.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" static int ov17_02251DAC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); static void ov17_02251DC0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index 529c5bd642..3ae60f3b13 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02099F80.h" @@ -36,9 +35,8 @@ #include "overlay019/struct_ov19_021DCF88_decl.h" #include "overlay019/struct_ov19_021DE3E8_decl.h" #include "overlay019/struct_ov19_021DEC04_decl.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "font.h" @@ -54,7 +52,6 @@ #include "unk_0200A784.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" struct UnkStruct_ov19_021D61B0_t { SysTask *unk_00; diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c index ed78c37238..6435ed1ee7 100644 --- a/src/overlay019/ov19_021D79F8.c +++ b/src/overlay019/ov19_021D79F8.c @@ -3,9 +3,7 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020797DC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay019/ov19_021D0D80.h" #include "overlay019/ov19_021D61B0.h" @@ -18,6 +16,7 @@ #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DCD18.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -27,7 +26,6 @@ #include "sys_task_manager.h" #include "text.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_020797C8.h" static const struct { diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index 8717755bc9..253778f103 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -4,9 +4,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay019/ov19_021D0D80.h" #include "overlay019/ov19_021D61B0.h" @@ -14,8 +12,8 @@ #include "overlay019/struct_ov19_021D5BAC.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA9E0.h" -#include "overlay061/struct_ov61_0222C884.h" +#include "bg_window.h" #include "cell_actor.h" #include "heap.h" #include "message.h" @@ -27,7 +25,6 @@ #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_0200C440.h" -#include "unk_02018340.h" #include "unk_0207C908.h" typedef struct { diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c index 5be34a9beb..f5558a8ae5 100644 --- a/src/overlay019/ov19_021DB2FC.c +++ b/src/overlay019/ov19_021DB2FC.c @@ -4,15 +4,13 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DB6F0.h" #include "overlay019/struct_ov19_021DF964.h" -#include "overlay061/struct_ov61_0222C884.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "heap.h" @@ -23,7 +21,6 @@ #include "unk_02001AF4.h" #include "unk_02006E3C.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" static void ov19_021DB4B4(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); static void ov19_021DB638(UnkStruct_ov19_021DB6F0 *param0, Window *param1, u8 param2, u32 param3); diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index 62c1f6ba38..b537394be6 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -4,9 +4,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020797DC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay019/ov19_021D0D80.h" #include "overlay019/ov19_021D61B0.h" @@ -14,8 +12,8 @@ #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DBA9C.h" -#include "overlay061/struct_ov61_0222C884.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -28,7 +26,6 @@ #include "text.h" #include "unk_02006E3C.h" #include "unk_0200C440.h" -#include "unk_02018340.h" #include "unk_020797C8.h" typedef struct { diff --git a/src/overlay019/ov19_021DC5F0.c b/src/overlay019/ov19_021DC5F0.c index 68acda2baf..98e525daf4 100644 --- a/src/overlay019/ov19_021DC5F0.c +++ b/src/overlay019/ov19_021DC5F0.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay019/ov19_021D0D80.h" #include "overlay019/ov19_021D61B0.h" @@ -16,6 +15,7 @@ #include "overlay019/struct_ov19_021DC680.h" #include "overlay019/struct_ov19_021DCD18.h" +#include "bg_window.h" #include "cell_actor.h" #include "heap.h" #include "party.h" @@ -23,7 +23,6 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" static const struct { u16 unk_00; diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c index 9201f4494f..0de5a2d921 100644 --- a/src/overlay019/ov19_021DCF88.c +++ b/src/overlay019/ov19_021DCF88.c @@ -4,8 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay019/ov19_021D0D80.h" #include "overlay019/ov19_021D61B0.h" @@ -15,6 +13,7 @@ #include "overlay019/struct_ov19_021DBA9C.h" #include "overlay019/struct_ov19_021DCF88_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "heap.h" @@ -23,7 +22,6 @@ #include "sys_task_manager.h" #include "text.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_020797C8.h" diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c index d548baab71..7a7fd2dbf1 100644 --- a/src/overlay019/ov19_021DE3E8.c +++ b/src/overlay019/ov19_021DE3E8.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay019/ov19_021D0D80.h" #include "overlay019/ov19_021D61B0.h" #include "overlay019/ov19_021D8B54.h" @@ -15,6 +13,7 @@ #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DE3E8_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "heap.h" #include "item.h" diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c index f05128cbae..fb55b40956 100644 --- a/src/overlay019/ov19_021DEC04.c +++ b/src/overlay019/ov19_021DEC04.c @@ -4,8 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay019/ov19_021D0D80.h" #include "overlay019/ov19_021D61B0.h" @@ -15,8 +13,8 @@ #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DEC04_decl.h" -#include "overlay061/struct_ov61_0222C884.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -29,7 +27,6 @@ #include "sys_task_manager.h" #include "text.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov19_021DEC04_t { BOOL unk_00; diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c index 5670eeeb51..92397993e4 100644 --- a/src/overlay020/ov20_021D2098.c +++ b/src/overlay020/ov20_021D2098.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020998EC_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02099F80.h" @@ -21,9 +20,8 @@ #include "overlay020/struct_ov20_021D3E0C_decl.h" #include "overlay020/struct_ov20_021D4210_decl.h" #include "overlay020/struct_ov20_021D4AD4_decl.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "gx_layers.h" #include "heap.h" @@ -35,7 +33,6 @@ #include "unk_0200A784.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" typedef struct UnkStruct_ov20_021D2128_t { SysTask *unk_00; diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c index 96e0b562e2..51e5d5cf80 100644 --- a/src/overlay020/ov20_021D2EA4.c +++ b/src/overlay020/ov20_021D2EA4.c @@ -4,15 +4,14 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020998EC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay020/ov20_021D0D80.h" #include "overlay020/ov20_021D2098.h" #include "overlay020/struct_ov20_021D16E8_decl.h" #include "overlay020/struct_ov20_021D2128_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "charcode.h" #include "colored_arrow.h" @@ -25,7 +24,6 @@ #include "unk_02006E3C.h" #include "unk_0200DA60.h" #include "unk_02014D38.h" -#include "unk_02018340.h" typedef struct { s16 unk_00; diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c index 8839aba207..e1e2c79539 100644 --- a/src/overlay020/ov20_021D3864.c +++ b/src/overlay020/ov20_021D3864.c @@ -4,15 +4,13 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020998EC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay020/ov20_021D2098.h" #include "overlay020/struct_ov20_021D16E8_decl.h" #include "overlay020/struct_ov20_021D2128_decl.h" -#include "overlay061/struct_ov61_0222C884.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -20,7 +18,6 @@ #include "strbuf.h" #include "text.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" typedef struct UnkStruct_ov20_021D3980_t { UnkStruct_ov20_021D2128 *unk_00; diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c index a4a7b4de85..57e550827a 100644 --- a/src/overlay020/ov20_021D3A54.c +++ b/src/overlay020/ov20_021D3A54.c @@ -4,9 +4,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020998EC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay020/ov20_021D0D80.h" #include "overlay020/ov20_021D2098.h" @@ -17,6 +15,7 @@ #include "overlay020/struct_ov20_021D4E8C.h" #include "overlay020/struct_ov20_021D4FF0.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "font.h" @@ -26,7 +25,6 @@ #include "sys_task_manager.h" #include "text.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_020998EC.h" typedef struct UnkStruct_ov20_021D3E0C_t { diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c index 38b227ba5e..f32e556236 100644 --- a/src/overlay020/ov20_021D40E8.c +++ b/src/overlay020/ov20_021D40E8.c @@ -3,9 +3,7 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020998EC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay020/ov20_021D0D80.h" #include "overlay020/ov20_021D2098.h" @@ -15,12 +13,12 @@ #include "overlay020/struct_ov20_021D4E8C.h" #include "overlay020/struct_ov20_021D4FF0.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "heap.h" #include "strbuf.h" #include "text.h" -#include "unk_02018340.h" typedef struct UnkStruct_ov20_021D4210_t { UnkStruct_ov20_021D2128 *unk_00; diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c index 4307050206..9a22be4561 100644 --- a/src/overlay020/ov20_021D4728.c +++ b/src/overlay020/ov20_021D4728.c @@ -6,15 +6,14 @@ #include "constants/heap.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020998EC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay020/ov20_021D0D80.h" #include "overlay020/ov20_021D2098.h" #include "overlay020/struct_ov20_021D16E8_decl.h" #include "overlay020/struct_ov20_021D2128_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -24,7 +23,6 @@ #include "sys_task_manager.h" #include "text.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" typedef struct { void *unk_00; diff --git a/src/overlay020/ov20_021D4E38.c b/src/overlay020/ov20_021D4E38.c index de79b3d195..f7f0f93d79 100644 --- a/src/overlay020/ov20_021D4E38.c +++ b/src/overlay020/ov20_021D4E38.c @@ -3,15 +3,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay020/ov20_021D2098.h" #include "overlay020/struct_ov20_021D4E8C.h" #include "overlay020/struct_ov20_021D4FF0.h" +#include "bg_window.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02018340.h" static void ov20_021D4ED8(SysTask *param0, void *param1); static void ov20_021D4F74(SysTask *param0, void *param1); diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 5e563f9983..1cc772761c 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -4,9 +4,7 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0209ACBC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay021/funcptr_ov21_021E9B74.h" @@ -52,6 +50,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay022/struct_ov22_022559F8.h" +#include "bg_window.h" #include "cell_actor.h" #include "gx_layers.h" #include "heap.h" @@ -70,7 +69,6 @@ #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_0201E86C.h" diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c index cbce7af0cf..1a778843e5 100644 --- a/src/overlay021/ov21_021D1FA4.c +++ b/src/overlay021/ov21_021D1FA4.c @@ -5,7 +5,6 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "overlay021/ov21_021D4C0C.h" @@ -20,9 +19,8 @@ #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021D4EE4_decl.h" #include "overlay022/struct_ov22_022550D4.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "gx_layers.h" @@ -37,7 +35,6 @@ #include "unk_0200A328.h" #include "unk_02012744.h" #include "unk_02015064.h" -#include "unk_02018340.h" static void ov21_021D2830(BGL *param0, int param1); static void ov21_021D299C(BGL *param0); diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c index 821899bc4b..98e2460642 100644 --- a/src/overlay021/ov21_021D4C0C.c +++ b/src/overlay021/ov21_021D4C0C.c @@ -4,14 +4,13 @@ #include #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/struct_ov21_021D1FA4.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -19,7 +18,6 @@ #include "strbuf.h" #include "text.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201E86C.h" typedef struct UnkStruct_ov21_021D4C0C_t { diff --git a/src/overlay021/ov21_021D517C.c b/src/overlay021/ov21_021D517C.c index 5c41f0d5e0..941f22bf94 100644 --- a/src/overlay021/ov21_021D517C.c +++ b/src/overlay021/ov21_021D517C.c @@ -3,9 +3,7 @@ #include #include -#include "struct_defs/struct_0205AA50.h" - -#include "unk_02018340.h" +#include "bg_window.h" static void ov21_021D5248(Window *param0, u8 *param1, u16 param2, u16 param3, int param4, int param5, u8 param6, u8 param7); static void ov21_021D52A0(u8 *param0, int param1, int param2, int param3, int param4); diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c index 24beb9835d..ebe6381f79 100644 --- a/src/overlay021/ov21_021D5AEC.c +++ b/src/overlay021/ov21_021D5AEC.c @@ -5,7 +5,6 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -25,6 +24,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -38,7 +38,6 @@ #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "unk_02018340.h" typedef struct { UnkStruct_ov21_021D13FC *unk_00; diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index c0b44bdc4d..34f160494c 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -4,9 +4,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -25,6 +23,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -35,7 +34,6 @@ #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201F834.h" #include "unk_02023FCC.h" diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c index ca948157cc..ffe66e53ad 100644 --- a/src/overlay021/ov21_021D85B0.c +++ b/src/overlay021/ov21_021D85B0.c @@ -20,6 +20,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -31,7 +32,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" -#include "unk_02018340.h" typedef struct { int *unk_00; diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c index d78cb5136e..669b805368 100644 --- a/src/overlay021/ov21_021D94BC.c +++ b/src/overlay021/ov21_021D94BC.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -27,6 +26,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -37,7 +37,6 @@ #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201F834.h" #include "unk_02023FCC.h" diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c index b4dc7369c7..d1ec708a30 100644 --- a/src/overlay021/ov21_021DC9BC.c +++ b/src/overlay021/ov21_021DC9BC.c @@ -5,7 +5,6 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -27,6 +26,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "gx_layers.h" #include "heap.h" @@ -35,7 +35,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201F834.h" static const u16 Unk_ov21_021E9D78[] = { diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c index 69319ef5d3..48d83be82c 100644 --- a/src/overlay021/ov21_021DDD2C.c +++ b/src/overlay021/ov21_021DDD2C.c @@ -19,6 +19,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -28,7 +29,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_02023FCC.h" diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c index 31825fbc76..7c12b15fb1 100644 --- a/src/overlay021/ov21_021DE668.c +++ b/src/overlay021/ov21_021DE668.c @@ -5,7 +5,6 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1F90.h" @@ -25,6 +24,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -39,7 +39,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_02012744.h" -#include "unk_02018340.h" typedef struct { UnkStruct_ov21_021D13FC *unk_00; diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c index c78731ca65..f5a89d1bc6 100644 --- a/src/overlay021/ov21_021DF734.c +++ b/src/overlay021/ov21_021DF734.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -21,6 +20,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "heap.h" #include "inlines.h" @@ -30,7 +30,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201F834.h" typedef struct { diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c index 8f92e4d06b..5770e3cc3b 100644 --- a/src/overlay021/ov21_021E0C68.c +++ b/src/overlay021/ov21_021E0C68.c @@ -5,7 +5,6 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -23,6 +22,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -34,7 +34,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_02012744.h" -#include "unk_02018340.h" typedef struct { int *unk_00; diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c index 95f7680131..35993fa351 100644 --- a/src/overlay021/ov21_021E1924.c +++ b/src/overlay021/ov21_021E1924.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -27,6 +26,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -37,7 +37,6 @@ #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201F834.h" #include "unk_02023FCC.h" diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c index 0b1c55e213..160a1975c6 100644 --- a/src/overlay021/ov21_021E29DC.c +++ b/src/overlay021/ov21_021E29DC.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -30,6 +29,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -40,7 +40,6 @@ #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201F834.h" #include "unk_02023FCC.h" diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c index 02886bb425..e92b60ed61 100644 --- a/src/overlay021/ov21_021E3FFC.c +++ b/src/overlay021/ov21_021E3FFC.c @@ -5,7 +5,6 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -20,6 +19,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "heap.h" #include "sprite_resource.h" @@ -28,7 +28,6 @@ #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_0200A328.h" -#include "unk_02018340.h" typedef struct { int *unk_00; diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c index d29353d056..900b2f66c0 100644 --- a/src/overlay021/ov21_021E4CA4.c +++ b/src/overlay021/ov21_021E4CA4.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -22,6 +21,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -33,7 +33,6 @@ #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201F834.h" diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c index 1ae88284e6..b12fed06ec 100644 --- a/src/overlay021/ov21_021E6014.c +++ b/src/overlay021/ov21_021E6014.c @@ -18,6 +18,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -31,7 +32,6 @@ #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_0200A328.h" -#include "unk_02018340.h" typedef struct { int *unk_00; diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c index 6781a40974..11b2553454 100644 --- a/src/overlay021/ov21_021E68F4.c +++ b/src/overlay021/ov21_021E68F4.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -23,6 +22,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -33,7 +33,6 @@ #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201F834.h" #include "unk_02023FCC.h" diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c index e40d11b30d..131c50e4e2 100644 --- a/src/overlay021/ov21_021E737C.c +++ b/src/overlay021/ov21_021E737C.c @@ -22,6 +22,7 @@ #include "overlay022/struct_ov22_022557A0.h" #include "overlay022/struct_ov22_02255800.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -40,7 +41,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_02015064.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" typedef struct { diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c index 46e3d893ff..a31064a7df 100644 --- a/src/overlay021/ov21_021E8484.c +++ b/src/overlay021/ov21_021E8484.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -23,6 +22,7 @@ #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -32,7 +32,6 @@ #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201F834.h" #include "unk_02023FCC.h" diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 8f720cb037..86b71d2ba2 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -7,10 +7,8 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1F90.h" @@ -24,8 +22,8 @@ #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021E8E0C.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "gx_layers.h" #include "heap.h" @@ -44,7 +42,6 @@ #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_0200A328.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c index 738173b341..2f596195e3 100644 --- a/src/overlay022/ov22_02255094.c +++ b/src/overlay022/ov22_02255094.c @@ -6,7 +6,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022550D4.h" @@ -15,9 +14,8 @@ #include "overlay022/struct_ov22_022559F8.h" #include "overlay022/struct_ov22_02255CB8.h" #include "overlay022/struct_ov22_0225A0E4.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "gx_layers.h" @@ -31,7 +29,6 @@ #include "unk_0200A328.h" #include "unk_0200A784.h" #include "unk_02015064.h" -#include "unk_02018340.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" #include "unk_0202419C.h" diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index 2c8c8d8e14..3f6ecb51d4 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -11,7 +11,6 @@ #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0203DA00.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02093BBC.h" #include "struct_defs/struct_02095C60.h" @@ -49,6 +48,7 @@ #include "overlay022/struct_ov22_0225AF68.h" #include "overlay022/struct_ov22_0225B388.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -74,7 +74,6 @@ #include "unk_0200F174.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201E3D8.h" #include "unk_020298BC.h" #include "unk_020363E8.h" diff --git a/src/overlay022/ov22_022597BC.c b/src/overlay022/ov22_022597BC.c index e9fa190719..385cc19527 100644 --- a/src/overlay022/ov22_022597BC.c +++ b/src/overlay022/ov22_022597BC.c @@ -3,19 +3,17 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay022/struct_ov22_022597BC.h" #include "overlay022/struct_ov22_02259820.h" #include "overlay022/struct_ov22_022599A0.h" #include "overlay022/struct_ov22_0225AF44.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_0200679C.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" typedef struct { UnkStruct_ov22_022597BC *unk_00; diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c index 060492a5bc..4344c3ebce 100644 --- a/src/overlay022/ov22_02259C58.c +++ b/src/overlay022/ov22_02259C58.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_02012744_decl.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay022/funcptr_ov22_02259D78.h" #include "overlay022/ov22_02255094.h" @@ -16,6 +15,7 @@ #include "overlay022/struct_ov22_0225A0E4.h" #include "overlay022/struct_ov22_0225A154.h" +#include "bg_window.h" #include "cell_actor.h" #include "error_handling.h" #include "font.h" @@ -28,7 +28,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" #include "unk_02023FCC.h" diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c index 7d1690c777..32ed79a3c3 100644 --- a/src/overlay022/ov22_0225A428.c +++ b/src/overlay022/ov22_0225A428.c @@ -4,8 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C60.h" #include "overlay022/ov22_022597BC.h" @@ -18,6 +16,7 @@ #include "overlay022/struct_ov22_0225AD68.h" #include "overlay022/struct_ov22_0225AE9C.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "game_options.h" @@ -30,7 +29,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_02095AF0.h" static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BGL *param1); diff --git a/src/overlay022/ov22_0225AF8C.c b/src/overlay022/ov22_0225AF8C.c index 6aca5a2308..9d648499e1 100644 --- a/src/overlay022/ov22_0225AF8C.c +++ b/src/overlay022/ov22_0225AF8C.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029C88_decl.h" #include "struct_decls/struct_0202A138_decl.h" @@ -26,12 +25,12 @@ #include "overlay022/struct_ov22_0225AF8C.h" #include "overlay022/struct_ov22_0225B388.h" +#include "bg_window.h" #include "heap.h" #include "narc.h" #include "pokemon.h" #include "resource_collection.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_020298BC.h" typedef struct UnkStruct_ov22_0225B1BC_t { diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index a3c3a958d2..f12a457265 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -6,7 +6,6 @@ #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029C88_decl.h" #include "struct_defs/struct_02041DC8.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay022/ov22_02255094.h" #include "overlay022/ov22_0225AF8C.h" @@ -14,6 +13,7 @@ #include "overlay022/struct_ov22_0225AF8C.h" #include "overlay022/struct_ov22_0225B1BC_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -28,7 +28,6 @@ #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0202419C.h" #include "unk_020298BC.h" #include "unk_02094EDC.h" diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index e18e783904..ba40f4a130 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_defs/struct_0200C738.h" @@ -26,10 +25,8 @@ #include "overlay023/ov23_0224F294.h" #include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_0224271C.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "comm_player_manager.h" @@ -61,7 +58,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index 6aaa6f8e4e..38e386663b 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -6,7 +6,6 @@ #include "consts/game_records.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_decls/struct_020508D4_decl.h" @@ -25,6 +24,7 @@ #include "overlay023/struct_ov23_0224271C.h" #include "overlay101/struct_ov101_021D5D90_decl.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "comm_player_manager.h" @@ -49,7 +49,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay023/ov23_02248C08.c b/src/overlay023/ov23_02248C08.c index e4943a0909..4fd53ff71e 100644 --- a/src/overlay023/ov23_02248C08.c +++ b/src/overlay023/ov23_02248C08.c @@ -7,12 +7,12 @@ #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay023/funcptr_ov23_02248D20.h" #include "overlay023/struct_ov23_02248D20.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "colored_arrow.h" #include "core_sys.h" #include "heap.h" diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c index b164e006f5..f1bf93e21c 100644 --- a/src/overlay023/ov23_02248F1C.c +++ b/src/overlay023/ov23_02248F1C.c @@ -4,16 +4,14 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "overlay023/ov23_02241F74.h" #include "overlay023/struct_ov23_0224942C_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "comm_player_manager.h" #include "communication_system.h" @@ -30,7 +28,6 @@ #include "unk_0200A328.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0205D8CC.h" diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index 011ba0139d..c467d2259f 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_02029894_decl.h" #include "struct_decls/struct_020298B0_decl.h" @@ -32,8 +31,8 @@ #include "overlay023/ov23_02253598.h" #include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_0224271C.h" -#include "overlay061/struct_ov61_0222C884.h" +#include "bg_window.h" #include "comm_player_manager.h" #include "communication_information.h" #include "communication_system.h" @@ -57,7 +56,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202854C.h" #include "unk_02030EE0.h" #include "unk_02033200.h" diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c index 6da8511681..c17e1785c1 100644 --- a/src/overlay023/ov23_0224DC40.c +++ b/src/overlay023/ov23_0224DC40.c @@ -9,7 +9,6 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "overlay023/funcptr_ov23_0224DCB8.h" @@ -18,9 +17,9 @@ #include "overlay023/ov23_02253598.h" #include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_02250CD4.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "comm_player_manager.h" #include "communication_information.h" #include "communication_system.h" @@ -37,7 +36,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0202854C.h" #include "unk_020573FC.h" diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c index 61d790226b..80fe44cdee 100644 --- a/src/overlay023/ov23_0224F294.c +++ b/src/overlay023/ov23_0224F294.c @@ -29,11 +29,11 @@ #include "overlay023/ov23_02253598.h" #include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_02250CD4.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay104/struct_ov104_02241308.h" #include "bag.h" +#include "bg_window.h" #include "cell_actor.h" #include "comm_player_manager.h" #include "communication_system.h" @@ -58,7 +58,6 @@ #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202854C.h" #include "unk_0206A780.h" diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c index 96010de54a..10531295f7 100644 --- a/src/overlay023/ov23_0225128C.c +++ b/src/overlay023/ov23_0225128C.c @@ -25,9 +25,9 @@ #include "overlay023/ov23_02254A14.h" #include "overlay023/struct_ov23_0224271C.h" #include "overlay023/struct_ov23_02250CD4.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "camera.h" #include "comm_player_manager.h" #include "communication_information.h" @@ -49,7 +49,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202854C.h" #include "unk_02033200.h" #include "unk_020508D4.h" diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index b49a6b4933..a6f6aca419 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -15,9 +15,9 @@ #include "overlay023/ov23_0225426C.h" #include "overlay023/ov23_0225429C.h" #include "overlay023/struct_ov23_02250CD4.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "comm_player_manager.h" #include "communication_information.h" #include "communication_system.h" @@ -38,7 +38,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202631C.h" #include "unk_0202854C.h" #include "unk_020573FC.h" diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index f035e531f5..082b88be66 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -7,11 +7,9 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay023/funcptr_ov23_0224DCB8.h" #include "overlay023/funcptr_ov23_02253834.h" @@ -20,6 +18,7 @@ #include "overlay023/struct_ov23_02253598_decl.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "comm_player_manager.h" #include "communication_system.h" #include "core_sys.h" @@ -35,7 +34,6 @@ #include "trainer_info.h" #include "unk_02005474.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_0202854C.h" typedef int (*UnkFuncPtr_ov23_022576EC)(const SecretBaseRecord *); diff --git a/src/overlay023/ov23_02253D40.c b/src/overlay023/ov23_02253D40.c index b3d96861a8..d343ba1e61 100644 --- a/src/overlay023/ov23_02253D40.c +++ b/src/overlay023/ov23_02253D40.c @@ -3,13 +3,11 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay023/struct_ov23_02253E2C_decl.h" #include "overlay023/struct_ov23_02253F60.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "core_sys.h" #include "heap.h" #include "message.h" @@ -20,7 +18,6 @@ #include "text.h" #include "trainer_info.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" typedef struct UnkStruct_ov23_02253E2C_t { Strbuf *unk_00; diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c index 8492fe2961..a36294cb6d 100644 --- a/src/overlay023/ov23_022542CC.c +++ b/src/overlay023/ov23_022542CC.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0206A844.h" #include "field/field_system.h" @@ -19,6 +18,7 @@ #include "overlay023/struct_ov23_02254594_decl.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "heap.h" #include "message.h" #include "strbuf.h" @@ -28,7 +28,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202854C.h" #include "unk_0206A780.h" diff --git a/src/overlay024/ov24_02253CE0.c b/src/overlay024/ov24_02253CE0.c index 3c46483287..e76a7d0a51 100644 --- a/src/overlay024/ov24_02253CE0.c +++ b/src/overlay024/ov24_02253CE0.c @@ -4,14 +4,11 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" - -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "narc.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" void ov24_02253CE0(BGL *param0) { diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index 634f0c8828..6464579fba 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" #include "overlay025/poketch_system.h" @@ -16,8 +14,8 @@ #include "overlay025/struct_ov25_02255810.h" #include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "gx_layers.h" #include "heap.h" #include "poketch_data.h" @@ -25,7 +23,6 @@ #include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" typedef struct { BOOL unk_00; diff --git a/src/overlay025/ov25_02255090.c b/src/overlay025/ov25_02255090.c index 990fa2c27e..35885d2476 100644 --- a/src/overlay025/ov25_02255090.c +++ b/src/overlay025/ov25_02255090.c @@ -4,19 +4,18 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay025/ov25_02254560.h" #include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255224_decl.h" +#include "bg_window.h" #include "heap.h" #include "narc.h" #include "pokemon_icon.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov25_02255224_t { u32 unk_00; diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c index 5cad2b07f8..44d59702aa 100644 --- a/src/overlay025/poketch_system.c +++ b/src/overlay025/poketch_system.c @@ -5,13 +5,12 @@ #include "consts/sdat.h" -#include "struct_decls/struct_02018340_decl.h" - #include "field/field_system_decl.h" #include "overlay025/ov25_02254560.h" #include "overlay025/poketch_button.h" #include "overlay025/struct_ov25_02254560_decl.h" +#include "bg_window.h" #include "enums.h" #include "field_system.h" #include "game_overlay.h" diff --git a/src/overlay026/ov26_022561C0.c b/src/overlay026/ov26_022561C0.c index 28a6fdb323..30230085d2 100644 --- a/src/overlay026/ov26_022561C0.c +++ b/src/overlay026/ov26_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay026/ov26_02256404.h" #include "overlay026/struct_ov26_02256404_1.h" #include "overlay026/struct_ov26_02256404_decl.h" +#include "bg_window.h" #include "heap.h" #include "rtc.h" #include "sys_task.h" diff --git a/src/overlay026/ov26_02256404.c b/src/overlay026/ov26_02256404.c index 3eb694ab3f..f85643decc 100644 --- a/src/overlay026/ov26_02256404.c +++ b/src/overlay026/ov26_02256404.c @@ -3,20 +3,17 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255224_decl.h" #include "overlay026/struct_ov26_02256404_1.h" #include "overlay026/struct_ov26_02256404_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov26_02256404_t { const UnkStruct_ov26_02256404_1 *unk_00; diff --git a/src/overlay027/ov27_022561C0.c b/src/overlay027/ov27_022561C0.c index 1f5bfab8e1..00cd54e7d5 100644 --- a/src/overlay027/ov27_022561C0.c +++ b/src/overlay027/ov27_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay027/ov27_0225680C.h" #include "overlay027/struct_ov27_0225680C_1.h" #include "overlay027/struct_ov27_0225680C_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay027/ov27_0225680C.c b/src/overlay027/ov27_0225680C.c index 96b17c6113..16c4cc9610 100644 --- a/src/overlay027/ov27_0225680C.c +++ b/src/overlay027/ov27_0225680C.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,13 +15,12 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay027/struct_ov27_0225680C_1.h" #include "overlay027/struct_ov27_0225680C_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" typedef struct { u16 unk_00; diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index 2e9f32b169..a67e276d6f 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -5,7 +5,6 @@ #include "constants/species.h" #include "struct_decls/pokedexdata_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" @@ -15,6 +14,7 @@ #include "overlay028/struct_ov28_0225697C_decl.h" #include "overlay028/struct_ov28_02256E9C_decl.h" +#include "bg_window.h" #include "heap.h" #include "pokemon.h" #include "sys_task.h" diff --git a/src/overlay028/ov28_0225697C.c b/src/overlay028/ov28_0225697C.c index 58a954c5d6..249fe04d41 100644 --- a/src/overlay028/ov28_0225697C.c +++ b/src/overlay028/ov28_0225697C.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/poketch_system.h" @@ -13,12 +11,11 @@ #include "overlay028/ov28_02256E9C.h" #include "overlay028/struct_ov28_0225697C_1.h" #include "overlay028/struct_ov28_0225697C_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov28_0225697C_t { const UnkStruct_ov28_0225697C_1 *unk_00; diff --git a/src/overlay029/ov29_022561C0.c b/src/overlay029/ov29_022561C0.c index 71f1ce8e92..ed7e4d6d4b 100644 --- a/src/overlay029/ov29_022561C0.c +++ b/src/overlay029/ov29_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay029/ov29_022566C8.h" #include "overlay029/struct_ov29_022566C8_1.h" #include "overlay029/struct_ov29_022566C8_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c index f7d15de52b..c7342b17d8 100644 --- a/src/overlay029/ov29_022566C8.c +++ b/src/overlay029/ov29_022566C8.c @@ -3,9 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -18,13 +15,11 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay029/struct_ov29_022566C8_1.h" #include "overlay029/struct_ov29_022566C8_decl.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_02099D44.h" struct UnkStruct_ov29_022566C8_t { diff --git a/src/overlay030/ov30_022561C0.c b/src/overlay030/ov30_022561C0.c index ec0ca2ab50..e1410c3bc4 100644 --- a/src/overlay030/ov30_022561C0.c +++ b/src/overlay030/ov30_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay030/ov30_022563EC.h" #include "overlay030/struct_ov30_022563EC_1.h" #include "overlay030/struct_ov30_022563EC_decl.h" +#include "bg_window.h" #include "heap.h" #include "rtc.h" #include "sys_task.h" diff --git a/src/overlay030/ov30_022563EC.c b/src/overlay030/ov30_022563EC.c index 2156743f08..6a403b5946 100644 --- a/src/overlay030/ov30_022563EC.c +++ b/src/overlay030/ov30_022563EC.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -16,13 +14,12 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay030/struct_ov30_022563EC_1.h" #include "overlay030/struct_ov30_022563EC_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov30_022563EC_t { const UnkStruct_ov30_022563EC_1 *unk_00; diff --git a/src/overlay031/ov31_022561C0.c b/src/overlay031/ov31_022561C0.c index 8b5e5f86bb..ce22173bca 100644 --- a/src/overlay031/ov31_022561C0.c +++ b/src/overlay031/ov31_022561C0.c @@ -2,13 +2,12 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_system.h" #include "overlay031/ov31_02256554.h" #include "overlay031/struct_ov31_02256554_1.h" #include "overlay031/struct_ov31_02256554_decl.h" +#include "bg_window.h" #include "heap.h" #include "inlines.h" #include "poketch_data.h" diff --git a/src/overlay031/ov31_02256554.c b/src/overlay031/ov31_02256554.c index 4af7452af7..2e831579aa 100644 --- a/src/overlay031/ov31_02256554.c +++ b/src/overlay031/ov31_02256554.c @@ -3,19 +3,16 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255224_decl.h" #include "overlay031/struct_ov31_02256554_1.h" #include "overlay031/struct_ov31_02256554_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" -#include "unk_02018340.h" struct UnkStruct_ov31_02256554_t { const UnkStruct_ov31_02256554_1 *unk_00; diff --git a/src/overlay032/ov32_022561C0.c b/src/overlay032/ov32_022561C0.c index c52c0fedf6..1c563c609e 100644 --- a/src/overlay032/ov32_022561C0.c +++ b/src/overlay032/ov32_022561C0.c @@ -2,7 +2,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" #include "overlay025/poketch_system.h" @@ -10,6 +9,7 @@ #include "overlay032/struct_ov32_02256470_1.h" #include "overlay032/struct_ov32_02256470_decl.h" +#include "bg_window.h" #include "heap.h" #include "party.h" #include "pokemon.h" diff --git a/src/overlay032/ov32_02256470.c b/src/overlay032/ov32_02256470.c index b37fd9589c..065bec67b0 100644 --- a/src/overlay032/ov32_02256470.c +++ b/src/overlay032/ov32_02256470.c @@ -4,8 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" @@ -19,8 +17,8 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay032/struct_ov32_02256470_1.h" #include "overlay032/struct_ov32_02256470_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "item.h" #include "narc.h" @@ -28,7 +26,6 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" typedef struct { UnkStruct_ov32_02256470 *unk_00; diff --git a/src/overlay033/ov33_022561C0.c b/src/overlay033/ov33_022561C0.c index 307b8f8fe3..8fc7043cf1 100644 --- a/src/overlay033/ov33_022561C0.c +++ b/src/overlay033/ov33_022561C0.c @@ -2,7 +2,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" #include "overlay025/poketch_system.h" @@ -10,6 +9,7 @@ #include "overlay033/struct_ov33_02256474_1.h" #include "overlay033/struct_ov33_02256474_decl.h" +#include "bg_window.h" #include "heap.h" #include "party.h" #include "pokemon.h" diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c index 60955a6a46..f07ad30e54 100644 --- a/src/overlay033/ov33_02256474.c +++ b/src/overlay033/ov33_02256474.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" @@ -18,8 +17,8 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay033/struct_ov33_02256474_1.h" #include "overlay033/struct_ov33_02256474_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "core_sys.h" #include "heap.h" #include "inlines.h" @@ -29,7 +28,6 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" typedef struct { diff --git a/src/overlay034/ov34_022561C0.c b/src/overlay034/ov34_022561C0.c index b0e346281c..d7d472d0ff 100644 --- a/src/overlay034/ov34_022561C0.c +++ b/src/overlay034/ov34_022561C0.c @@ -2,7 +2,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0203F478.h" #include "overlay025/poketch_system.h" @@ -10,6 +9,7 @@ #include "overlay034/struct_ov34_02256540_1.h" #include "overlay034/struct_ov34_02256540_decl.h" +#include "bg_window.h" #include "heap.h" #include "script_manager.h" #include "sys_task.h" diff --git a/src/overlay034/ov34_02256540.c b/src/overlay034/ov34_02256540.c index b7fe405cb1..155fbea6d6 100644 --- a/src/overlay034/ov34_02256540.c +++ b/src/overlay034/ov34_02256540.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -16,12 +14,11 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay034/struct_ov34_02256540_1.h" #include "overlay034/struct_ov34_02256540_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov34_02256540_t { const UnkStruct_ov34_02256540_1 *unk_00; diff --git a/src/overlay035/ov35_022561C0.c b/src/overlay035/ov35_022561C0.c index 259f328156..2677c54180 100644 --- a/src/overlay035/ov35_022561C0.c +++ b/src/overlay035/ov35_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay035/ov35_02256410.h" #include "overlay035/struct_ov35_02256410_1.h" #include "overlay035/struct_ov35_02256410_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay035/ov35_02256410.c b/src/overlay035/ov35_02256410.c index 0c6fce5f6d..94d7709701 100644 --- a/src/overlay035/ov35_02256410.c +++ b/src/overlay035/ov35_02256410.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,12 +15,11 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay035/struct_ov35_02256410_1.h" #include "overlay035/struct_ov35_02256410_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov35_02256410_t { const UnkStruct_ov35_02256410_1 *unk_00; diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index c2fa36ce45..84f5641405 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/src/overlay036/ov36_022561C0.c @@ -2,12 +2,11 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay036/poketch_app_pedometer.h" +#include "bg_window.h" #include "heap.h" #include "poketch_data.h" #include "sys_task.h" diff --git a/src/overlay036/ov36_02256404.c b/src/overlay036/ov36_02256404.c index 7f05502037..d937f72558 100644 --- a/src/overlay036/ov36_02256404.c +++ b/src/overlay036/ov36_02256404.c @@ -1,8 +1,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -14,12 +12,11 @@ #include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay036/poketch_app_pedometer.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov36_02256404_t { const UnkStruct_ov36_02256404_1 *unk_00; diff --git a/src/overlay037/ov37_022561C0.c b/src/overlay037/ov37_022561C0.c index 1e3ea32811..71439553ac 100644 --- a/src/overlay037/ov37_022561C0.c +++ b/src/overlay037/ov37_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay037/ov37_022563D4.h" #include "overlay037/struct_ov37_022563D4_1.h" #include "overlay037/struct_ov37_022563D4_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay037/ov37_022563D4.c b/src/overlay037/ov37_022563D4.c index c6adbb4bf7..051f23f544 100644 --- a/src/overlay037/ov37_022563D4.c +++ b/src/overlay037/ov37_022563D4.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,12 +15,11 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay037/struct_ov37_022563D4_1.h" #include "overlay037/struct_ov37_022563D4_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov37_022563D4_t { const UnkStruct_ov37_022563D4_1 *unk_00; diff --git a/src/overlay038/ov38_022561C0.c b/src/overlay038/ov38_022561C0.c index db62fe2a93..eaa025b5c0 100644 --- a/src/overlay038/ov38_022561C0.c +++ b/src/overlay038/ov38_022561C0.c @@ -2,13 +2,12 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_system.h" #include "overlay038/ov38_0225632C.h" #include "overlay038/struct_ov38_0225632C_1.h" #include "overlay038/struct_ov38_0225632C_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay038/ov38_0225632C.c b/src/overlay038/ov38_0225632C.c index fce4f164fd..0fa9e9ab8f 100644 --- a/src/overlay038/ov38_0225632C.c +++ b/src/overlay038/ov38_0225632C.c @@ -3,20 +3,17 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255224_decl.h" #include "overlay038/struct_ov38_0225632C_1.h" #include "overlay038/struct_ov38_0225632C_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov38_0225632C_t { const UnkStruct_ov38_0225632C_1 *unk_00; diff --git a/src/overlay039/ov39_022561C0.c b/src/overlay039/ov39_022561C0.c index c8dc55e4d2..76c33d524a 100644 --- a/src/overlay039/ov39_022561C0.c +++ b/src/overlay039/ov39_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay039/ov39_022563DC.h" #include "overlay039/struct_ov39_022563DC_1.h" #include "overlay039/struct_ov39_022563DC_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay039/ov39_022563DC.c b/src/overlay039/ov39_022563DC.c index e0e684fb03..c25e979206 100644 --- a/src/overlay039/ov39_022563DC.c +++ b/src/overlay039/ov39_022563DC.c @@ -3,20 +3,17 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255224_decl.h" #include "overlay039/struct_ov39_022563DC_1.h" #include "overlay039/struct_ov39_022563DC_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov39_022563DC_t { const UnkStruct_ov39_022563DC_1 *unk_00; diff --git a/src/overlay040/ov40_022561C0.c b/src/overlay040/ov40_022561C0.c index 5296c8cb05..e8ed0f139a 100644 --- a/src/overlay040/ov40_022561C0.c +++ b/src/overlay040/ov40_022561C0.c @@ -2,7 +2,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02026218_decl.h" #include "struct_decls/struct_02026310_decl.h" @@ -12,6 +11,7 @@ #include "overlay040/struct_ov40_0225645C_1.h" #include "overlay040/struct_ov40_0225645C_decl.h" +#include "bg_window.h" #include "heap.h" #include "pokemon.h" #include "pokemon_icon.h" diff --git a/src/overlay040/ov40_0225645C.c b/src/overlay040/ov40_0225645C.c index 50bd218ecf..fc5f16bf26 100644 --- a/src/overlay040/ov40_0225645C.c +++ b/src/overlay040/ov40_0225645C.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,15 +15,14 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay040/struct_ov40_0225645C_1.h" #include "overlay040/struct_ov40_0225645C_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "pokemon.h" #include "pokemon_icon.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov40_0225645C_t { const UnkStruct_ov40_0225645C_1 *unk_00; diff --git a/src/overlay041/ov41_022561C0.c b/src/overlay041/ov41_022561C0.c index 7124efca92..50d422bdb6 100644 --- a/src/overlay041/ov41_022561C0.c +++ b/src/overlay041/ov41_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay041/ov41_022567B0.h" #include "overlay041/struct_ov41_022567B0_1.h" #include "overlay041/struct_ov41_022567B0_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c index 0083707e7d..2dda02e558 100644 --- a/src/overlay041/ov41_022567B0.c +++ b/src/overlay041/ov41_022567B0.c @@ -3,9 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -18,13 +15,11 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay041/struct_ov41_022567B0_1.h" #include "overlay041/struct_ov41_022567B0_decl.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_02099D44.h" diff --git a/src/overlay042/ov42_022561C0.c b/src/overlay042/ov42_022561C0.c index 6f77293de3..850ff4683e 100644 --- a/src/overlay042/ov42_022561C0.c +++ b/src/overlay042/ov42_022561C0.c @@ -2,13 +2,12 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_system.h" #include "overlay042/ov42_022563D4.h" #include "overlay042/struct_ov42_022563D4_1.h" #include "overlay042/struct_ov42_022563D4_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay042/ov42_022563D4.c b/src/overlay042/ov42_022563D4.c index 251eead7b8..506b3866de 100644 --- a/src/overlay042/ov42_022563D4.c +++ b/src/overlay042/ov42_022563D4.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,12 +15,11 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay042/struct_ov42_022563D4_1.h" #include "overlay042/struct_ov42_022563D4_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" static fx32 Unk_ov42_02256720 = 0; static fx32 Unk_ov42_02256724 = 0; diff --git a/src/overlay043/ov43_022561C0.c b/src/overlay043/ov43_022561C0.c index 4d98f78ee0..6e2d1d5448 100644 --- a/src/overlay043/ov43_022561C0.c +++ b/src/overlay043/ov43_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay043/ov43_02256544.h" #include "overlay043/struct_ov43_02256544_1.h" #include "overlay043/struct_ov43_02256544_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index bc5a2f3e28..de87a7422a 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -3,9 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -18,8 +15,8 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay043/struct_ov43_02256544_1.h" #include "overlay043/struct_ov43_02256544_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "font.h" #include "heap.h" #include "message.h" @@ -27,7 +24,6 @@ #include "sys_task_manager.h" #include "text.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov43_02256544_t { const UnkStruct_ov43_02256544_1 *unk_00; diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c index 53f3ec31ba..c0530951f6 100644 --- a/src/overlay044/ov44_022561C0.c +++ b/src/overlay044/ov44_022561C0.c @@ -2,7 +2,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" #include "overlay005/ov5_021E622C.h" @@ -12,6 +11,7 @@ #include "overlay044/struct_ov44_022565BC_1.h" #include "overlay044/struct_ov44_022565BC_decl.h" +#include "bg_window.h" #include "heap.h" #include "party.h" #include "pokemon.h" diff --git a/src/overlay044/ov44_022565BC.c b/src/overlay044/ov44_022565BC.c index 923089def3..51d4cf129c 100644 --- a/src/overlay044/ov44_022565BC.c +++ b/src/overlay044/ov44_022565BC.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,14 +15,13 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay044/struct_ov44_022565BC_1.h" #include "overlay044/struct_ov44_022565BC_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "pokemon.h" #include "pokemon_icon.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov44_022565BC_t { const UnkStruct_ov44_022565BC_1 *unk_00; diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index f7eee417b8..e0ad394ec5 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/src/overlay045/ov45_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay045/ov45_022566EC.h" #include "overlay045/struct_ov45_022566EC_1.h" #include "overlay045/struct_ov45_022566EC_decl.h" +#include "bg_window.h" #include "heap.h" #include "poketch_data.h" #include "rtc.h" diff --git a/src/overlay045/ov45_022566EC.c b/src/overlay045/ov45_022566EC.c index c967ac854d..e950a98cdc 100644 --- a/src/overlay045/ov45_022566EC.c +++ b/src/overlay045/ov45_022566EC.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,13 +15,12 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay045/struct_ov45_022566EC_1.h" #include "overlay045/struct_ov45_022566EC_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov45_022566EC_t { const UnkStruct_ov45_022566EC_1 *unk_00; diff --git a/src/overlay046/ov46_022561C0.c b/src/overlay046/ov46_022561C0.c index 19feccda62..41010860a9 100644 --- a/src/overlay046/ov46_022561C0.c +++ b/src/overlay046/ov46_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay046/ov46_02256BCC.h" #include "overlay046/struct_ov46_02256BCC_1.h" #include "overlay046/struct_ov46_02256BCC_decl.h" +#include "bg_window.h" #include "enums.h" #include "heap.h" #include "sys_task.h" diff --git a/src/overlay046/ov46_02256BCC.c b/src/overlay046/ov46_02256BCC.c index ab9e1b6f37..5e5264c8fd 100644 --- a/src/overlay046/ov46_02256BCC.c +++ b/src/overlay046/ov46_02256BCC.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,12 +15,11 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay046/struct_ov46_02256BCC_1.h" #include "overlay046/struct_ov46_02256BCC_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov46_02256BCC_t { const UnkStruct_ov46_02256BCC_1 *unk_00; diff --git a/src/overlay047/ov47_022561C0.c b/src/overlay047/ov47_022561C0.c index 561b57853a..76a05b5acb 100644 --- a/src/overlay047/ov47_022561C0.c +++ b/src/overlay047/ov47_022561C0.c @@ -2,7 +2,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0202D7B0.h" #include "struct_defs/struct_0206C638.h" @@ -11,6 +10,7 @@ #include "overlay047/struct_ov47_02256634_1.h" #include "overlay047/struct_ov47_02256634_decl.h" +#include "bg_window.h" #include "heap.h" #include "inlines.h" #include "poketch_data.h" diff --git a/src/overlay047/ov47_02256634.c b/src/overlay047/ov47_02256634.c index 27b73c4d21..d47e06a77d 100644 --- a/src/overlay047/ov47_02256634.c +++ b/src/overlay047/ov47_02256634.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,13 +15,12 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay047/struct_ov47_02256634_1.h" #include "overlay047/struct_ov47_02256634_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov47_02256634_t { const UnkStruct_ov47_02256634_1 *unk_00; diff --git a/src/overlay048/ov48_022561C0.c b/src/overlay048/ov48_022561C0.c index 3f48ae9056..e5ecc81f7d 100644 --- a/src/overlay048/ov48_022561C0.c +++ b/src/overlay048/ov48_022561C0.c @@ -2,7 +2,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02027854_decl.h" #include "overlay025/poketch_system.h" @@ -10,6 +9,7 @@ #include "overlay048/struct_ov48_0225650C_1.h" #include "overlay048/struct_ov48_0225650C_decl.h" +#include "bg_window.h" #include "heap.h" #include "inlines.h" #include "savedata_misc.h" diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c index 19d78efc88..c0ef18f164 100644 --- a/src/overlay048/ov48_0225650C.c +++ b/src/overlay048/ov48_0225650C.c @@ -3,9 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -19,8 +16,8 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay048/struct_ov48_0225650C_1.h" #include "overlay048/struct_ov48_0225650C_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "message.h" #include "strbuf.h" @@ -28,7 +25,6 @@ #include "sys_task_manager.h" #include "text.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov48_0225650C_t { const UnkStruct_ov48_0225650C_1 *unk_00; diff --git a/src/overlay049/ov49_022561C0.c b/src/overlay049/ov49_022561C0.c index 470a4c4b61..126d4ba693 100644 --- a/src/overlay049/ov49_022561C0.c +++ b/src/overlay049/ov49_022561C0.c @@ -2,13 +2,12 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_system.h" #include "overlay049/ov49_022563D4.h" #include "overlay049/struct_ov49_022563D4_1.h" #include "overlay049/struct_ov49_022563D4_decl.h" +#include "bg_window.h" #include "heap.h" #include "poketch_data.h" #include "sys_task.h" diff --git a/src/overlay049/ov49_022563D4.c b/src/overlay049/ov49_022563D4.c index c896405287..64f954752c 100644 --- a/src/overlay049/ov49_022563D4.c +++ b/src/overlay049/ov49_022563D4.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,12 +15,11 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay049/struct_ov49_022563D4_1.h" #include "overlay049/struct_ov49_022563D4_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov49_022563D4_t { const UnkStruct_ov49_022563D4_1 *unk_00; diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index 985e046f1f..4c705c8be4 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/src/overlay050/ov50_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay050/ov50_02256510.h" #include "overlay050/struct_ov50_02256510_1.h" #include "overlay050/struct_ov50_02256510_decl.h" +#include "bg_window.h" #include "heap.h" #include "poketch_data.h" #include "rtc.h" diff --git a/src/overlay050/ov50_02256510.c b/src/overlay050/ov50_02256510.c index dbf3715e54..9436739cd2 100644 --- a/src/overlay050/ov50_02256510.c +++ b/src/overlay050/ov50_02256510.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -16,12 +14,11 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay050/struct_ov50_02256510_1.h" #include "overlay050/struct_ov50_02256510_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov50_02256510_t { const UnkStruct_ov50_02256510_1 *unk_00; diff --git a/src/overlay051/ov51_022561C0.c b/src/overlay051/ov51_022561C0.c index 27929e59c9..cf500b6d68 100644 --- a/src/overlay051/ov51_022561C0.c +++ b/src/overlay051/ov51_022561C0.c @@ -2,13 +2,12 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_system.h" #include "overlay051/ov51_0225632C.h" #include "overlay051/struct_ov51_0225632C_1.h" #include "overlay051/struct_ov51_0225632C_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay051/ov51_0225632C.c b/src/overlay051/ov51_0225632C.c index c5f9b60de5..2f9b3d026d 100644 --- a/src/overlay051/ov51_0225632C.c +++ b/src/overlay051/ov51_0225632C.c @@ -3,20 +3,17 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255224_decl.h" #include "overlay051/struct_ov51_0225632C_1.h" #include "overlay051/struct_ov51_0225632C_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov51_0225632C_t { const UnkStruct_ov51_0225632C_1 *unk_00; diff --git a/src/overlay052/ov52_022561C0.c b/src/overlay052/ov52_022561C0.c index 1044f9ce21..103fa069fc 100644 --- a/src/overlay052/ov52_022561C0.c +++ b/src/overlay052/ov52_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "field/field_system.h" #include "overlay025/poketch_system.h" #include "overlay052/ov52_02256694.h" #include "overlay052/struct_ov52_02256694_1.h" #include "overlay052/struct_ov52_02256694_decl.h" +#include "bg_window.h" #include "communication_system.h" #include "heap.h" #include "map_header.h" diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c index 2e236419bb..104a7ccdce 100644 --- a/src/overlay052/ov52_02256694.c +++ b/src/overlay052/ov52_02256694.c @@ -3,9 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -18,8 +15,8 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay052/struct_ov52_02256694_1.h" #include "overlay052/struct_ov52_02256694_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "font.h" #include "heap.h" #include "message.h" @@ -27,7 +24,6 @@ #include "sys_task_manager.h" #include "text.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov52_02256694_t { const UnkStruct_ov52_02256694_1 *unk_00; diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c index 86653c9e2b..a68615ec34 100644 --- a/src/overlay053/ov53_022561C0.c +++ b/src/overlay053/ov53_022561C0.c @@ -2,8 +2,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "field/field_system_decl.h" #include "overlay006/ov6_022430C4.h" #include "overlay025/poketch_button.h" @@ -12,6 +10,7 @@ #include "overlay053/struct_ov53_02256420_1.h" #include "overlay053/struct_ov53_02256420_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay053/ov53_02256420.c b/src/overlay053/ov53_02256420.c index effab8a425..910492effb 100644 --- a/src/overlay053/ov53_02256420.c +++ b/src/overlay053/ov53_02256420.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,13 +15,12 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay053/struct_ov53_02256420_1.h" #include "overlay053/struct_ov53_02256420_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "pokemon_icon.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" struct UnkStruct_ov53_02256420_t { diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index 1e460df1ac..ea43f1d1e1 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/src/overlay054/ov54_022561C0.c @@ -2,14 +2,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_button.h" #include "overlay025/poketch_system.h" #include "overlay054/ov54_0225642C.h" #include "overlay054/struct_ov54_0225642C_1.h" #include "overlay054/struct_ov54_0225642C_decl.h" +#include "bg_window.h" #include "heap.h" #include "poketch_data.h" #include "sys_task.h" diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c index 9dc49c3a64..cfbd4d7106 100644 --- a/src/overlay054/ov54_0225642C.c +++ b/src/overlay054/ov54_0225642C.c @@ -3,9 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -17,8 +14,8 @@ #include "overlay025/struct_ov25_02255958.h" #include "overlay054/struct_ov54_0225642C_1.h" #include "overlay054/struct_ov54_0225642C_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "font.h" #include "heap.h" #include "message.h" @@ -26,7 +23,6 @@ #include "strbuf.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_02018340.h" struct UnkStruct_ov54_0225642C_t { const UnkStruct_ov54_0225642C_1 *unk_00; diff --git a/src/overlay055/ov55_022561C0.c b/src/overlay055/ov55_022561C0.c index 0deb1a7900..fdf7aa5600 100644 --- a/src/overlay055/ov55_022561C0.c +++ b/src/overlay055/ov55_022561C0.c @@ -2,13 +2,12 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/poketch_system.h" #include "overlay055/ov55_0225632C.h" #include "overlay055/struct_ov55_0225632C_1.h" #include "overlay055/struct_ov55_0225632C_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay055/ov55_0225632C.c b/src/overlay055/ov55_0225632C.c index 8541a3ab0e..3ee2665dd4 100644 --- a/src/overlay055/ov55_0225632C.c +++ b/src/overlay055/ov55_0225632C.c @@ -3,19 +3,16 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255224_decl.h" #include "overlay055/struct_ov55_0225632C_1.h" #include "overlay055/struct_ov55_0225632C_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" struct UnkStruct_ov55_0225632C_t { const UnkStruct_ov55_0225632C_1 *unk_00; diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index 51cefff607..55c53bf3d0 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -3,21 +3,19 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0205B43C_decl.h" #include "struct_defs/sentence.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0203330C.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0205C22C.h" #include "struct_defs/struct_0205C924.h" #include "struct_defs/struct_0205C95C.h" #include "field/field_system.h" #include "overlay056/struct_ov56_02256468_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -40,7 +38,6 @@ #include "unk_0200A328.h" #include "unk_02014A84.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_02027F84.h" #include "unk_02033200.h" #include "unk_020508D4.h" diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 245d792605..8f5b8de17e 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -4,11 +4,9 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02095EAC_decl.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0203DDFC.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095EAC_t.h" #include "struct_defs/struct_02095FE4.h" #include "struct_defs/struct_02099F80.h" @@ -17,9 +15,8 @@ #include "overlay058/struct_ov58_021D2754.h" #include "overlay058/struct_ov58_021D2820.h" #include "overlay072/struct_ov72_0223E2A8.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" @@ -48,7 +45,6 @@ #include "unk_0200F174.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index e6001ba31a..bad989ac32 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -6,10 +6,8 @@ #include "consts/game_records.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020961E8_decl.h" #include "struct_defs/struct_0203DE34.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020961E8_t.h" #include "struct_defs/struct_02096274.h" #include "struct_defs/struct_02099F80.h" @@ -17,10 +15,8 @@ #include "overlay022/struct_ov22_022559F8.h" #include "overlay059/ov59_021D2F88.h" #include "overlay059/struct_ov59_021D109C.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" @@ -52,7 +48,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index 9046fc1239..02b4c08157 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -8,20 +8,16 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02025CCC_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_02017498.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay004/ov4_021D0D80.h" #include "overlay061/struct_ov61_0222C3B0.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "game_options.h" @@ -42,7 +38,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_02025CB0.h" diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index 2c649d443d..69e461d03c 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_defs/struct_0208B284.h" #include "struct_defs/struct_0208C06C.h" @@ -13,12 +12,11 @@ #include "overlay062/ov62_02231690.h" #include "overlay062/ov62_0224112C.h" #include "overlay062/ov62_const_funcptr_tables.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "core_sys.h" #include "gx_layers.h" #include "heap.h" @@ -34,7 +32,6 @@ #include "unk_0200C6E4.h" #include "unk_02012744.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_02023FCC.h" diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index ecdb9fa5e0..70e31fd426 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -7,11 +7,9 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "struct_defs/struct_020F3DCC.h" @@ -23,6 +21,7 @@ #include "overlay062/struct_ov62_0223118C.h" #include "overlay062/struct_ov62_022312B0.h" +#include "bg_window.h" #include "message.h" #include "strbuf.h" #include "string_template.h" @@ -33,7 +32,6 @@ #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201E86C.h" #include "unk_02030A80.h" diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index 5807471d1b..aec1915317 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -7,14 +7,12 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202F298_decl.h" #include "struct_decls/struct_0202F41C_decl.h" #include "struct_defs/sentence.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02030A80.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208B878.h" #include "struct_defs/struct_0208C06C.h" @@ -35,6 +33,7 @@ #include "overlay062/struct_ov62_0223CAA4.h" #include "overlay062/struct_ov62_02248CDC.h" +#include "bg_window.h" #include "core_sys.h" #include "enums.h" #include "font.h" @@ -58,7 +57,6 @@ #include "unk_0200C6E4.h" #include "unk_02012744.h" #include "unk_02014A84.h" -#include "unk_02018340.h" #include "unk_0202F1D4.h" #include "unk_02030A80.h" #include "unk_020393C8.h" diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c index 110e33bed0..bb44441568 100644 --- a/src/overlay062/ov62_02234A10.c +++ b/src/overlay062/ov62_02234A10.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay062/ov62_0222F2C0.h" @@ -12,6 +11,7 @@ #include "overlay062/ov62_const_funcptr_tables.h" #include "overlay062/struct_ov62_02235008.h" +#include "bg_window.h" #include "gx_layers.h" #include "heap.h" #include "message.h" @@ -24,7 +24,6 @@ #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0208B284.h" diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c index 35c3940239..3d2e8ea620 100644 --- a/src/overlay062/ov62_02235E64.c +++ b/src/overlay062/ov62_02235E64.c @@ -2,7 +2,6 @@ #include #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay062/ov62_0222F2C0.h" @@ -14,6 +13,7 @@ #include "overlay062/struct_ov62_022323B8.h" #include "overlay062/struct_ov62_02233F74.h" +#include "bg_window.h" #include "gx_layers.h" #include "heap.h" #include "message.h" @@ -26,7 +26,6 @@ #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_02023FCC.h" #include "unk_0202F1D4.h" #include "unk_0208BA78.h" diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c index 7962273ba9..ac68d44e73 100644 --- a/src/overlay062/ov62_02236CBC.c +++ b/src/overlay062/ov62_02236CBC.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202D750_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" @@ -17,6 +16,7 @@ #include "overlay062/ov62_const_funcptr_tables.h" #include "overlay062/struct_ov62_022312B0.h" +#include "bg_window.h" #include "gx_layers.h" #include "heap.h" #include "touch_screen.h" @@ -25,7 +25,6 @@ #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0202D05C.h" #include "unk_02030A80.h" diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index bd95c2829e..3c70132b44 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_defs/struct_02030A80.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay022/ov22_0225AF8C.h" @@ -30,6 +29,7 @@ #include "overlay062/struct_ov62_02248CDC.h" #include "overlay062/struct_ov62_02249380.h" +#include "bg_window.h" #include "font.h" #include "game_overlay.h" #include "gx_layers.h" @@ -45,7 +45,6 @@ #include "unk_0200C6E4.h" #include "unk_02012744.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_02023FCC.h" #include "unk_0202419C.h" diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index 77f0c36584..2766e83b6c 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -15,7 +15,6 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02030A80.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay061/ov61_0222AE60.h" @@ -34,6 +33,7 @@ #include "overlay062/struct_ov62_02248CDC.h" #include "savedata/save_table.h" +#include "bg_window.h" #include "font.h" #include "gx_layers.h" #include "heap.h" @@ -51,7 +51,6 @@ #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_02023FCC.h" #include "unk_02030A80.h" #include "unk_020797C8.h" diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index 3bec61bf6d..d119c536ad 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay061/ov61_0222B008.h" @@ -23,6 +22,7 @@ #include "overlay062/struct_ov62_02248CDC.h" #include "overlay062/struct_ov62_02249380.h" +#include "bg_window.h" #include "game_records.h" #include "gx_layers.h" #include "heap.h" @@ -38,7 +38,6 @@ #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_02023FCC.h" #include "unk_02030A80.h" #include "unk_0208B284.h" diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c index 6f011a0f55..55e90c80ea 100644 --- a/src/overlay062/ov62_0223DFA8.c +++ b/src/overlay062/ov62_0223DFA8.c @@ -4,7 +4,6 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "struct_decls/struct_0202F41C_decl.h" #include "struct_defs/struct_02030A80.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay061/ov61_0222AE60.h" @@ -25,6 +24,7 @@ #include "overlay062/struct_ov62_02248CDC.h" #include "overlay062/struct_ov62_02249380.h" +#include "bg_window.h" #include "font.h" #include "gx_layers.h" #include "heap.h" @@ -39,7 +39,6 @@ #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_02023FCC.h" #include "unk_0202F1D4.h" #include "unk_02030A80.h" diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index 85284d9268..b8af98444e 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "struct_decls/struct_0202F41C_decl.h" #include "struct_defs/struct_02030A80.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay061/ov61_0222AE60.h" @@ -33,6 +32,7 @@ #include "overlay062/struct_ov62_02248CDC.h" #include "overlay062/struct_ov62_02249380.h" +#include "bg_window.h" #include "enums.h" #include "font.h" #include "gx_layers.h" @@ -49,7 +49,6 @@ #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_02023FCC.h" #include "unk_0202631C.h" #include "unk_0202F1D4.h" diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c index ac6a50fb9e..483bbb13bc 100644 --- a/src/overlay062/ov62_02246B00.c +++ b/src/overlay062/ov62_02246B00.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" @@ -15,6 +14,7 @@ #include "overlay062/struct_ov62_02246BF4.h" #include "overlay062/struct_ov62_02246BF4_sub1.h" +#include "bg_window.h" #include "game_options.h" #include "heap.h" #include "inlines.h" diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c index 8f7b79b794..25671b41b0 100644 --- a/src/overlay062/ov62_02247D74.c +++ b/src/overlay062/ov62_02247D74.c @@ -2,7 +2,6 @@ #include #include "struct_defs/struct_02030A80.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay062/ov62_0222F2C0.h" @@ -10,6 +9,7 @@ #include "overlay062/ov62_02231690.h" #include "overlay062/ov62_const_funcptr_tables.h" +#include "bg_window.h" #include "gx_layers.h" #include "heap.h" #include "message.h" @@ -19,7 +19,6 @@ #include "touch_screen.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_02030A80.h" typedef struct { diff --git a/src/overlay063/ov63_0222D1C0.c b/src/overlay063/ov63_0222D1C0.c index ea85edcbe4..d1ce2e0243 100644 --- a/src/overlay063/ov63_0222D1C0.c +++ b/src/overlay063/ov63_0222D1C0.c @@ -3,19 +3,17 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" #include "overlay063/ov63_0222D160.h" #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay063/struct_ov63_0222D160.h" #include "overlay065/struct_ov65_0223582C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "heap.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" -#include "unk_02018340.h" typedef struct UnkStruct_ov63_0222D1C0_t { UnkStruct_0200C738 *unk_00; diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index 8cc1e1d750..f55d2c88a6 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -8,28 +8,24 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208737C.h" #include "struct_defs/struct_02089438.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay063/ov63_0222AE60.h" #include "overlay063/struct_ov63_0222AE60_decl.h" #include "overlay063/struct_ov63_0222BB38_decl.h" #include "overlay064/struct_ov64_022302EC.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "ascii_util.h" #include "bag.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "enums.h" @@ -64,7 +60,6 @@ #include "unk_020131EC.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 42c5e96d4d..5875fdd233 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -8,20 +8,17 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02012B20_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207DFAC.h" #include "struct_defs/struct_0207E060.h" #include "struct_defs/struct_02099F80.h" #include "overlay004/ov4_021D0D80.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay065/ov65_02235060.h" #include "overlay065/struct_ov65_0222E99C.h" #include "overlay065/struct_ov65_0222EBE0_decl.h" @@ -29,13 +26,12 @@ #include "overlay065/struct_ov65_0222F6EC.h" #include "overlay065/struct_ov65_02234E50.h" #include "overlay065/struct_ov65_022354D8.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay098/struct_ov98_02247168.h" #include "assert.h" #include "bag.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" @@ -79,7 +75,6 @@ #include "unk_02012744.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_0201E86C.h" diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c index eeb6e1f4fa..e2829aa70e 100644 --- a/src/overlay065/ov65_02235060.c +++ b/src/overlay065/ov65_02235060.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay063/ov63_0222BCE8.h" #include "overlay063/ov63_0222BE18.h" @@ -25,6 +24,7 @@ #include "overlay065/struct_ov65_02236318.h" #include "overlay065/struct_ov65_022376D0.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -32,7 +32,6 @@ #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_0200A328.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index d92817bd13..52af0aac5a 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -5,9 +5,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207DE04.h" #include "struct_defs/struct_0207DFAC.h" #include "struct_defs/struct_0207E060.h" @@ -15,7 +13,6 @@ #include "overlay004/ov4_021D0D80.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay063/ov63_0222BE18.h" #include "overlay063/ov63_0222CCE4.h" #include "overlay063/struct_ov63_0222BE18_decl.h" @@ -26,9 +23,8 @@ #include "overlay065/struct_ov65_02236744_decl.h" #include "overlay065/struct_ov65_02236760.h" #include "overlay065/struct_ov65_022376D0.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" @@ -58,7 +54,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 41fe4426e5..b9d88c5c97 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -7,12 +7,9 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay061/struct_ov61_0222C3B0.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay065/struct_ov65_0222F6EC.h" #include "overlay066/ov66_0222DDF0.h" #include "overlay066/ov66_02231428.h" @@ -20,9 +17,8 @@ #include "overlay066/struct_ov66_0222E71C_decl.h" #include "overlay066/struct_ov66_02231024.h" #include "overlay066/struct_ov66_02231300.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "game_options.h" @@ -45,7 +41,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_020366A0.h" #include "unk_020393C8.h" diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index e8d06716c7..4913c03450 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -7,14 +7,11 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02030EC4_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay066/ov66_0222DDF0.h" #include "overlay066/ov66_02231428.h" #include "overlay066/ov66_022324F0.h" @@ -23,9 +20,8 @@ #include "overlay066/struct_ov66_0222E908.h" #include "overlay066/struct_ov66_02231374.h" #include "overlay068/struct_ov68_0225DC74.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -51,7 +47,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index d2adee7f17..d859ed1d4a 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -5,11 +5,9 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" @@ -20,11 +18,10 @@ #include "overlay066/struct_ov66_02231428.h" #include "overlay066/struct_ov66_02231560.h" #include "overlay069/struct_ov69_0225C980.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay092/struct_ov92_021D1530.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "core_sys.h" @@ -53,7 +50,6 @@ #include "unk_0200F174.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 52477e03a5..12fdc09625 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -7,17 +7,14 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" #include "overlay005/struct_ov5_021DE5D0.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay065/struct_ov65_0222F6EC.h" #include "overlay066/ov66_0222DDF0.h" #include "overlay066/ov66_02231428.h" @@ -42,10 +39,9 @@ #include "overlay070/struct_ov70_02263910.h" #include "overlay070/struct_ov70_02269204_decl.h" #include "overlay070/struct_ov70_0226C6F8_decl.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "enums.h" @@ -79,7 +75,6 @@ #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index c821ffb2c3..0ef6c7ceb9 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" #include "overlay071/ov71_0223C69C.h" @@ -12,9 +11,8 @@ #include "overlay071/ov71_0223D324.h" #include "overlay071/struct_ov71_0223B620.h" #include "overlay071/struct_ov71_0223C444.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "gx_layers.h" @@ -30,7 +28,6 @@ #include "unk_0200A784.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_020393C8.h" diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index 868b3447f4..48632d1141 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -3,19 +3,15 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02072014.h" -#include "overlay061/struct_ov61_0222C884.h" - +#include "bg_window.h" #include "font.h" #include "message.h" #include "play_time.h" #include "strbuf.h" #include "string_template.h" #include "text.h" -#include "unk_02018340.h" static void ov71_0223CD64(Window * param0, const u32 param1, const u32 param2, const u32 param3, Strbuf *param4, const u32 param5, const u8 param6, const int param7); static void ov71_0223CDB0(Window * param0, const u32 param1, const u32 param2, const u32 param3, const Strbuf *param4); diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 836b64b646..2079346184 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -7,9 +7,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" @@ -19,10 +17,9 @@ #include "overlay072/struct_ov72_0223E7D8.h" #include "overlay072/struct_ov72_0223E80C.h" #include "overlay072/struct_ov72_0223EAD8.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "assert.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -52,7 +49,6 @@ #include "unk_02012744.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index afd4f530d7..2604d39c44 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -4,21 +4,17 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0203CC84.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208737C.h" #include "struct_defs/struct_02099F80.h" #include "overlay057/const_ov57_021D0F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "game_options.h" @@ -50,7 +46,6 @@ #include "unk_0201567C.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0208694C.h" #include "constdata/const_020F2DAC.h" diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c index 5c6b4a0487..627006e120 100644 --- a/src/overlay073/ov73_021D3250.c +++ b/src/overlay073/ov73_021D3250.c @@ -1,14 +1,9 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "gx_layers.h" @@ -22,7 +17,6 @@ #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_020241F0.h" typedef struct { diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index a7291497a6..9a97f4cec6 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -7,16 +7,11 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0203D8EC.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "game_options.h" @@ -35,7 +30,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_020393C8.h" diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index e05fffde5c..2d08cb4683 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -8,20 +8,16 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020978D8.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "core_sys.h" #include "enums.h" #include "font.h" @@ -46,7 +42,6 @@ #include "unk_0200F174.h" #include "unk_02014A84.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_020393C8.h" diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index 0b96890825..d12118e088 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -7,12 +7,10 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" #include "struct_defs/struct_0202CA28.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02081CF4.h" @@ -27,6 +25,7 @@ #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "gx_layers.h" @@ -48,7 +47,6 @@ #include "unk_02012744.h" #include "unk_02013A04.h" #include "unk_02014000.h" -#include "unk_02018340.h" #include "unk_0201E86C.h" #include "unk_0202419C.h" #include "unk_02024220.h" diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index 0c919593b2..df9531796d 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -7,7 +7,6 @@ #include "struct_decls/font_oam.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_0200D0F4.h" @@ -25,9 +24,8 @@ #include "overlay076/ov76_0223B870.h" #include "overlay076/struct_ov76_0223BF74.h" #include "overlay076/struct_ov76_0223DE00.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "core_sys.h" #include "game_records.h" #include "gx_layers.h" @@ -49,7 +47,6 @@ #include "unk_02015920.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_02023FCC.h" #include "unk_0202C9F4.h" diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index c1faaf9f81..cb6db82d4f 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -2,17 +2,13 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay077/const_ov77_021D742C.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "core_sys.h" #include "easy3d.h" @@ -32,7 +28,6 @@ #include "unk_0200A9DC.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201E190.h" #include "unk_0202419C.h" diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c index 8ecd0b6b8b..ffb148f4ec 100644 --- a/src/overlay077/ov77_021D25B0.c +++ b/src/overlay077/ov77_021D25B0.c @@ -2,7 +2,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" @@ -14,10 +13,9 @@ #include "overlay077/struct_ov77_021D670C_decl.h" #include "overlay077/struct_ov77_021D6734_decl.h" #include "overlay077/struct_ov77_021D6CFC_decl.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "core_sys.h" #include "easy3d.h" @@ -35,7 +33,6 @@ #include "unk_0200F174.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0202419C.h" diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index 0de6d7057d..c105ab5841 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -11,9 +11,8 @@ #include "overlay079/ov79_021D183C.h" #include "overlay079/ov79_021D20F4.h" #include "overlay079/struct_ov79_021D0E1C.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -35,7 +34,6 @@ #include "unk_0200F174.h" #include "unk_020158A8.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_0208C098.h" diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c index 3a8ad1de15..911130249a 100644 --- a/src/overlay079/ov79_021D183C.c +++ b/src/overlay079/ov79_021D183C.c @@ -7,10 +7,10 @@ #include "struct_defs/struct_0203D9B8.h" #include "struct_defs/struct_020989DC.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay079/struct_ov79_021D0E1C.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "render_text.h" @@ -24,7 +24,6 @@ #include "unk_0200DA60.h" #include "unk_02013A04.h" #include "unk_020158A8.h" -#include "unk_02018340.h" #include "unk_02098FFC.h" static void ov79_021D1D88(BmpList *param0, u32 param1, u8 param2); diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index d2c71fc392..d810de642b 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -6,24 +6,20 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020158A8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02098DE8.h" #include "struct_defs/struct_0209903C.h" #include "struct_defs/struct_0209916C.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay079/ov79_021D3768.h" #include "overlay079/struct_ov79_021D3820.h" #include "overlay079/struct_ov79_021D38D0.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_system.h" #include "core_sys.h" @@ -46,7 +42,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_020393C8.h" diff --git a/src/overlay080/ov80_021D0D80.c b/src/overlay080/ov80_021D0D80.c index 8bd6a3584a..9f66177154 100644 --- a/src/overlay080/ov80_021D0D80.c +++ b/src/overlay080/ov80_021D0D80.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0203D8AC.h" #include "struct_defs/struct_02099F80.h" @@ -12,9 +11,8 @@ #include "overlay080/ov80_021D2AF4.h" #include "overlay080/struct_ov80_021D2A08.h" #include "overlay080/struct_ov80_021D2E94.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "font.h" #include "gx_layers.h" #include "heap.h" @@ -25,7 +23,6 @@ #include "unk_020041CC.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201E3D8.h" #include "unk_02039C80.h" #include "unk_0208C098.h" diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c index f4dc0409a8..1909c4c506 100644 --- a/src/overlay080/ov80_021D1458.c +++ b/src/overlay080/ov80_021D1458.c @@ -2,7 +2,6 @@ #include #include "struct_decls/struct_02039EBC_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay080/ov80_021D2AF4.h" @@ -13,6 +12,7 @@ #include "overlay080/struct_ov80_021D2C1C.h" #include "overlay080/struct_ov80_021D2C5C.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -27,7 +27,6 @@ #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_02039C80.h" #include "unk_02071CFC.h" diff --git a/src/overlay081/ov81_021D0D80.c b/src/overlay081/ov81_021D0D80.c index 15a1ba226f..3d4df98fca 100644 --- a/src/overlay081/ov81_021D0D80.c +++ b/src/overlay081/ov81_021D0D80.c @@ -4,15 +4,13 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0202BC58.h" #include "struct_defs/struct_02099F80.h" #include "overlay081/ov81_021D1610.h" #include "overlay081/struct_ov81_021D1610.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "gx_layers.h" @@ -31,7 +29,6 @@ #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_020393C8.h" #include "unk_0208C098.h" diff --git a/src/overlay081/ov81_021D1610.c b/src/overlay081/ov81_021D1610.c index 68c57dbab1..708ed230cc 100644 --- a/src/overlay081/ov81_021D1610.c +++ b/src/overlay081/ov81_021D1610.c @@ -8,11 +8,10 @@ #include "struct_defs/struct_0202BE38.h" #include "struct_defs/struct_0202BF4C.h" #include "struct_defs/struct_0202BFCC.h" -#include "struct_defs/struct_0205AA50.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay081/struct_ov81_021D1610.h" +#include "bg_window.h" #include "font.h" #include "heap.h" #include "journal.h" @@ -23,7 +22,6 @@ #include "string_template.h" #include "text.h" #include "trainer_data.h" -#include "unk_02018340.h" static u8 ov81_021D16B0(UnkStruct_ov81_021D1610 *param0, Window *param1, Window *param2); static void ov81_021D17C8(UnkStruct_ov81_021D1610 *param0, Window *param1); diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index bd29072937..5b88e235a5 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -4,16 +4,14 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022550D4.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay083/ov83_0223D6A8.h" #include "overlay083/struct_ov83_0223B784.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "gx_layers.h" @@ -24,7 +22,6 @@ #include "string_template.h" #include "unk_0200A784.h" #include "unk_02015064.h" -#include "unk_02018340.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" #include "unk_0202419C.h" diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c index 022df7d62b..b1a8b11dde 100644 --- a/src/overlay083/ov83_0223D6A8.c +++ b/src/overlay083/ov83_0223D6A8.c @@ -8,9 +8,7 @@ #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02015214_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay021/struct_ov21_021E7F40.h" #include "overlay022/struct_ov22_022557A0.h" @@ -40,6 +38,7 @@ #include "overlay083/struct_ov83_0223FCE8.h" #include "overlay083/struct_ov83_0223FE50.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "gx_layers.h" @@ -58,7 +57,6 @@ #include "unk_0200DA60.h" #include "unk_02015064.h" #include "unk_02015920.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201E3BC.h" #include "unk_02098FFC.h" diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index fdbd4126b1..157494a876 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -6,7 +6,6 @@ #include "constants/field/map_load.h" #include "struct_decls/struct_0200112C_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0202D7B0.h" #include "struct_defs/struct_0207CB08.h" #include "struct_defs/struct_02099F80.h" @@ -17,13 +16,12 @@ #include "overlay084/ov84_0223F040.h" #include "overlay084/ov84_022403F4.h" #include "overlay084/struct_ov84_0223B5A0.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_0223BE5C.h" #include "overlay084/struct_ov84_0223C920.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "bag.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "game_options.h" @@ -51,7 +49,6 @@ #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" diff --git a/src/overlay084/ov84_0223F040.c b/src/overlay084/ov84_0223F040.c index b53625e8c8..80f0851aec 100644 --- a/src/overlay084/ov84_0223F040.c +++ b/src/overlay084/ov84_0223F040.c @@ -3,11 +3,9 @@ #include #include -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207CB08.h" #include "struct_defs/struct_02081CF4.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/ov84_0223B5A0.h" #include "overlay084/ov84_022403F4.h" #include "overlay084/struct_ov84_0223B5A0.h" @@ -15,6 +13,7 @@ #include "overlay084/struct_ov84_0223C920.h" #include "bag.h" +#include "bg_window.h" #include "font.h" #include "game_options.h" #include "heap.h" @@ -33,7 +32,6 @@ #include "unk_0200C440.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" static void ov84_0223F9B0(UnkStruct_ov84_0223B5A0 *param0, u32 param1); static BOOL ov84_022400E0(TextPrinterTemplate *param0, u16 param1); diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index 56fb0a0f8c..781cb81e70 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -5,18 +5,14 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C440_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_berry_data_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020972FC.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" #include "berry_data.h" +#include "bg_window.h" #include "camera.h" #include "core_sys.h" #include "font.h" @@ -32,7 +28,6 @@ #include "unk_0200C440.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201E3D8.h" #include "unk_0202419C.h" #include "unk_020393C8.h" diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 0984712a8f..4502fe76dc 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -4,21 +4,18 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_02008900.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013610.h" #include "struct_defs/struct_0203E234.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay005/struct_ov5_021DE5D0.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "core_sys.h" @@ -48,7 +45,6 @@ #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" typedef struct { diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index e8d3086750..712ab5043e 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -3,19 +3,16 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013610.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay087/struct_ov87_021D0D80_decl.h" #include "overlay087/struct_ov87_021D12C0.h" #include "overlay087/struct_ov87_021D1640.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "font.h" @@ -35,7 +32,6 @@ #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02017728.h" -#include "unk_02018340.h" typedef struct UnkStruct_ov87_021D106C_t { UnkStruct_ov87_021D0D80 *unk_00; diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 28f6cd03d4..c172775005 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -7,27 +7,24 @@ #include "consts/game_records.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_02095E80_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/chatot_cry.h" #include "struct_defs/struct_02027F8C.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02095E80_t.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay088/ov88_0223E9C4.h" #include "overlay088/struct_ov88_0223C370.h" #include "overlay088/struct_ov88_0223C8AC.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "bag.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" @@ -72,7 +69,6 @@ #include "unk_020131EC.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c index bd022b1686..8d503acc63 100644 --- a/src/overlay088/ov88_0223E9C4.c +++ b/src/overlay088/ov88_0223E9C4.c @@ -6,13 +6,11 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "font.h" #include "game_options.h" #include "message.h" @@ -23,7 +21,6 @@ #include "unk_02001AF4.h" #include "unk_02005474.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" static void ov88_0223EE14(BmpList *param0, u32 param1, u8 param2); diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 7925f4ef83..5719f70db2 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -6,25 +6,21 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202D750_decl.h" #include "struct_decls/struct_0202D764_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_defs/sentence.h" #include "struct_defs/struct_02049A68.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay090/struct_ov90_021D0D80.h" #include "overlay090/struct_ov90_021D1750.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -45,7 +41,6 @@ #include "unk_0200F174.h" #include "unk_02014A84.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0202D05C.h" #include "unk_0203061C.h" diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 35468d0f04..ce8226c555 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -9,23 +9,19 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/pokemon_summary.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020997B8.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -51,7 +47,6 @@ #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0207C908.h" #include "unk_0208C098.h" diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 6e9eaeef84..690de9008f 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -7,19 +7,15 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay092/struct_ov92_021D28C0.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "core_sys.h" #include "easy3d.h" @@ -44,7 +40,6 @@ #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0202419C.h" #include "unk_0202C858.h" diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index 22a71a0b94..153263a8c4 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -6,13 +6,10 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0203E0FC.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay094/ov94_0223B140.h" #include "overlay094/ov94_0223C610.h" #include "overlay094/ov94_0223D0C4.h" @@ -27,6 +24,7 @@ #include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223FD4C.h" +#include "bg_window.h" #include "cell_actor.h" #include "game_options.h" #include "gx_layers.h" @@ -48,7 +46,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index 5d3787f731..f6cecafdcc 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -5,16 +5,13 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay094/ov94_0223BCB0.h" #include "overlay094/ov94_02243EF8.h" #include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223FD4C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -31,7 +28,6 @@ #include "unk_02006E3C.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_020393C8.h" static void ov94_0223C720(BGL *param0); diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index ae60de947a..f9bbe1ff87 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -5,9 +5,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "overlay094/const_ov94_02245FD8.h" @@ -17,8 +15,8 @@ #include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223BA88_sub2.h" #include "overlay094/struct_ov94_0223FD4C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -40,7 +38,6 @@ #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_020393C8.h" static void ov94_0223D1D4(BGL *param0); diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index f0e8ef12b2..48ca0caab3 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -4,9 +4,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay094/ov94_0223BCB0.h" #include "overlay094/ov94_0223D0C4.h" #include "overlay094/ov94_022414B8.h" @@ -15,8 +12,8 @@ #include "overlay094/struct_ov94_0223BA88.h" #include "overlay094/struct_ov94_0223BA88_sub3.h" #include "overlay094/struct_ov94_0223FD4C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -32,7 +29,6 @@ #include "unk_02006E3C.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_020393C8.h" static void ov94_0223DD1C(BGL *param0); diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index e743a3f20b..44b5c5566d 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -5,8 +5,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay094/const_ov94_02245FD4.h" #include "overlay094/ov94_0223B140.h" @@ -18,8 +16,8 @@ #include "overlay094/struct_ov94_0223BA88_sub3.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay094/struct_ov94_0223FD4C_sub3.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -38,7 +36,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202DA40.h" #include "unk_020366A0.h" #include "unk_020393C8.h" diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 96cc980152..e41c9aa178 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -5,13 +5,10 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay094/ov94_0223BCB0.h" #include "overlay094/ov94_022414B8.h" #include "overlay094/ov94_02244950.h" @@ -20,8 +17,8 @@ #include "overlay094/struct_ov94_0223BA88_sub3.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay094/struct_ov94_0223FD4C_sub2.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -43,7 +40,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_020393C8.h" #include "unk_020797C8.h" diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index ac32339339..de9620d5c7 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -9,9 +9,7 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay094/const_ov94_02245FD4.h" @@ -25,8 +23,8 @@ #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay094/struct_ov94_0223FD4C_sub3.h" #include "overlay094/struct_ov94_02242AAC.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "game_options.h" @@ -47,7 +45,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202631C.h" #include "unk_0202C858.h" #include "unk_020393C8.h" diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index c52c51f6b5..250d89abf0 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -7,13 +7,11 @@ #include "constants/species.h" #include "consts/game_records.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202DA40_decl.h" #include "struct_defs/chatot_cry.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay094/ov94_0223B140.h" #include "overlay094/ov94_0223BCB0.h" #include "overlay094/ov94_0223C610.h" @@ -22,9 +20,9 @@ #include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223BA88.h" #include "overlay094/struct_ov94_0223FD4C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "savedata/save_table.h" +#include "bg_window.h" #include "font.h" #include "game_options.h" #include "game_records.h" @@ -41,7 +39,6 @@ #include "unk_02006E3C.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0202CC64.h" #include "unk_0202DA40.h" #include "unk_0202F180.h" diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index b355c2c1d5..fe4f807b42 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -5,15 +5,13 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay004/ov4_021D0D80.h" #include "overlay094/ov94_0223B140.h" #include "overlay094/ov94_0223BCB0.h" #include "overlay094/struct_ov94_0223FD4C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "game_options.h" @@ -28,7 +26,6 @@ #include "unk_02006E3C.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_02025CB0.h" #include "unk_0202ACE0.h" #include "unk_02030CE8.h" diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index 1d92de1de9..d87ccbeb9f 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013610.h" @@ -21,6 +20,7 @@ #include "overlay095/struct_ov95_02247568.h" #include "overlay095/struct_ov95_02247628_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "game_options.h" #include "gx_layers.h" @@ -40,7 +40,6 @@ #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_020393C8.h" struct UnkStruct_ov95_02247628_t { diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 2576a26694..2d07ba74f2 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -6,21 +6,18 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay095/ov95_02246C20.h" #include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247568.h" #include "overlay095/struct_ov95_02247628_decl.h" #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "gx_layers.h" #include "heap.h" @@ -37,7 +34,6 @@ #include "unk_0200762C.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0202419C.h" #include "unk_020393C8.h" diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c index 6360238e06..66416615a9 100644 --- a/src/overlay095/ov95_02248590.c +++ b/src/overlay095/ov95_02248590.c @@ -3,10 +3,8 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay095/ov95_02246C20.h" #include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247004_decl.h" @@ -15,9 +13,9 @@ #include "overlay095/struct_ov95_02247628_decl.h" #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "gx_layers.h" @@ -27,7 +25,6 @@ #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0202419C.h" diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c index cbb816c8a6..9de7cb1ddf 100644 --- a/src/overlay095/ov95_02249740.c +++ b/src/overlay095/ov95_02249740.c @@ -3,19 +3,17 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay095/ov95_02246C20.h" #include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247568.h" #include "overlay095/struct_ov95_02247628_decl.h" #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "gx_layers.h" @@ -26,7 +24,6 @@ #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0202419C.h" diff --git a/src/overlay095/ov95_02249F90.c b/src/overlay095/ov95_02249F90.c index 58913b84e0..3f25b1e5de 100644 --- a/src/overlay095/ov95_02249F90.c +++ b/src/overlay095/ov95_02249F90.c @@ -3,14 +3,12 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay095/ov95_02246C20.h" #include "overlay095/struct_ov95_02247628_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "enums.h" #include "gx_layers.h" #include "heap.h" @@ -19,7 +17,6 @@ #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200F174.h" -#include "unk_02018340.h" enum { UnkEnum_ov95_0224A020_00 = 0x50, diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c index 6b50df3994..fcf586fce8 100644 --- a/src/overlay095/ov95_0224A390.c +++ b/src/overlay095/ov95_0224A390.c @@ -3,19 +3,17 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay095/ov95_02246C20.h" #include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247568.h" #include "overlay095/struct_ov95_02247628_decl.h" #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "gx_layers.h" @@ -26,7 +24,6 @@ #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0202419C.h" #include "unk_020393C8.h" diff --git a/src/overlay095/ov95_0224ABC0.c b/src/overlay095/ov95_0224ABC0.c index a3a9e01dd9..3beb9d762b 100644 --- a/src/overlay095/ov95_0224ABC0.c +++ b/src/overlay095/ov95_0224ABC0.c @@ -3,10 +3,8 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay095/ov95_02246C20.h" #include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247004_decl.h" @@ -14,9 +12,9 @@ #include "overlay095/struct_ov95_02247628_decl.h" #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "enums.h" #include "gx_layers.h" #include "heap.h" @@ -24,7 +22,6 @@ #include "sys_task_manager.h" #include "unk_02006E3C.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0202419C.h" enum { diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 2af0ef5bde..898ebb131b 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -6,21 +6,18 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay095/ov95_02246C20.h" #include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247568.h" #include "overlay095/struct_ov95_02247628_decl.h" #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "enums.h" #include "gx_layers.h" @@ -38,7 +35,6 @@ #include "unk_0200762C.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0202419C.h" enum { diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c index 74f4e4352c..371e8994d4 100644 --- a/src/overlay096/ov96_0223B6A0.c +++ b/src/overlay096/ov96_0223B6A0.c @@ -6,18 +6,16 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0206BC70.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay096/ov96_0223B140.h" #include "overlay096/ov96_0223BCE0.h" #include "overlay096/struct_ov96_0223BF40_decl.h" #include "overlay096/struct_ov96_0223BF40_t.h" +#include "bg_window.h" #include "cell_actor.h" #include "gx_layers.h" #include "heap.h" @@ -34,7 +32,6 @@ #include "unk_0200A784.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index 10c83fee41..0d2f53eff5 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -5,9 +5,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02049A68.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay004/ov4_021D0D80.h" #include "overlay096/ov96_0223B140.h" @@ -17,8 +15,8 @@ #include "overlay096/struct_ov96_0223B450_sub2.h" #include "overlay096/struct_ov96_0223BF40_decl.h" #include "overlay096/struct_ov96_0223BF40_t.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -36,7 +34,6 @@ #include "unk_02006E3C.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_02025CB0.h" #include "unk_0202D05C.h" #include "unk_02030CE8.h" diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 651b31842c..80e78fecd0 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -2,16 +2,13 @@ #include #include "struct_decls/pokedexdata_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202442C_decl.h" #include "struct_defs/struct_0203CC84.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay057/const_ov57_021D0F70.h" #include "overlay057/const_ov57_021D0F90.h" #include "overlay077/const_ov77_021D742C.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/const_ov97_0223D674.h" #include "overlay097/ov97_02235D18.h" #include "overlay097/ov97_02237520.h" @@ -19,6 +16,7 @@ #include "overlay097/struct_ov97_02237808.h" #include "savedata/save_table.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -42,7 +40,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_02024358.h" #include "unk_02025CB0.h" diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index b335a0c20b..d42228e173 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -2,16 +2,13 @@ #include #include "struct_decls/pokedexdata_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202442C_decl.h" #include "struct_defs/struct_0202DBAC.h" #include "struct_defs/struct_0202DF40.h" #include "struct_defs/struct_0203CC84.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay077/const_ov77_021D742C.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/ov97_02232DC8.h" #include "overlay097/ov97_02233408.h" #include "overlay097/ov97_02237694.h" @@ -20,6 +17,7 @@ #include "overlay097/struct_ov97_02237808.h" #include "savedata/save_table.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "enums.h" @@ -42,7 +40,6 @@ #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_0202631C.h" #include "unk_0202DAB4.h" #include "unk_02033200.h" diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index 1053e3fb89..c3ad9e8be7 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -3,15 +3,12 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202442C_decl.h" #include "struct_decls/struct_02025CCC_decl.h" #include "struct_defs/struct_0202DF40.h" #include "struct_defs/struct_0203CC84.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay077/const_ov77_021D742C.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay097/ov97_0222D04C.h" #include "overlay097/ov97_02232054.h" @@ -20,13 +17,13 @@ #include "overlay097/ov97_02238534.h" #include "overlay097/struct_ov97_0222D04C.h" #include "overlay097/struct_ov97_0222D250.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay097/struct_ov97_02237808.h" #include "overlay097/struct_ov97_02237AEC.h" #include "overlay097/struct_ov97_0223829C.h" #include "overlay097/union_ov97_0222D2B0.h" #include "savedata/save_table.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_system.h" #include "core_sys.h" @@ -58,7 +55,6 @@ #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0202DAB4.h" #include "unk_02033200.h" diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index ad4caf5bb7..2e5ee0da51 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -3,13 +3,11 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202442C_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0202DBAC.h" #include "struct_defs/struct_0203CC84.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay097/ov97_0222D04C.h" @@ -20,6 +18,7 @@ #include "overlay097/union_ov97_0222D2B0.h" #include "savedata/save_table.h" +#include "bg_window.h" #include "buffer_manager.h" #include "cell_actor.h" #include "communication_information.h" @@ -49,7 +48,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202DAB4.h" #include "unk_02033200.h" #include "unk_020363E8.h" diff --git a/src/overlay097/ov97_02232054.c b/src/overlay097/ov97_02232054.c index ea254e407c..69da9d6358 100644 --- a/src/overlay097/ov97_02232054.c +++ b/src/overlay097/ov97_02232054.c @@ -3,18 +3,15 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202442C_decl.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay097/struct_ov97_0223829C.h" #include "savedata/save_table.h" +#include "bg_window.h" #include "gx_layers.h" #include "savedata.h" -#include "unk_02018340.h" #include "unk_0202DAB4.h" void ov97_02232054(void) diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 747ed01227..8fe1c8964f 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -6,27 +6,24 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02024440_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0203CC84.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay077/const_ov77_021D742C.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/box_pokemon_gba.h" #include "overlay097/ov97_02235D18.h" #include "overlay097/ov97_0223635C.h" #include "overlay097/ov97_02236380.h" #include "overlay097/ov97_02237694.h" #include "overlay097/ov97_022392E4.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay097/struct_ov97_02236340.h" #include "savedata/save_table.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -59,7 +56,6 @@ #include "unk_0200F174.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index e3f91ef80f..ccbeb96f1c 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -6,20 +6,18 @@ #include "constants/species.h" #include "struct_decls/struct_0200112C_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0202DF40.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay097/struct_ov97_0222D250.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay097/struct_ov97_02237808.h" #include "overlay097/struct_ov97_02237AEC.h" #include "overlay097/struct_ov97_0223829C.h" #include "overlay097/union_ov97_0222D2B0.h" #include "assert.h" +#include "bg_window.h" #include "cell_actor.h" #include "crypto.h" #include "font.h" @@ -44,7 +42,6 @@ #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index 09c629ae49..5d77cff653 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -8,24 +8,20 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02025CCC_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay004/ov4_021D0D80.h" #include "overlay061/struct_ov61_0222C3B0.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay094/ov94_0223B140.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay098/ov98_02246C20.h" #include "overlay098/ov98_022499C8.h" #include "overlay098/struct_ov98_02246E88.h" +#include "bg_window.h" #include "colored_arrow.h" #include "core_sys.h" #include "font.h" @@ -51,7 +47,6 @@ #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_02025CB0.h" diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index a7d1922553..fbacaaac0c 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -3,12 +3,9 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay099/ov99_021D1A54.h" #include "overlay099/ov99_021D3E78.h" #include "overlay099/struct_ov99_021D2CB0.h" @@ -18,6 +15,7 @@ #include "overlay104/struct_ov104_0224133C.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "core_sys.h" #include "easy3d_object.h" @@ -36,7 +34,6 @@ #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_0202419C.h" diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c index f3357a790c..5c4846c9b5 100644 --- a/src/overlay099/ov99_021D1A54.c +++ b/src/overlay099/ov99_021D1A54.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" @@ -20,6 +19,7 @@ #include "overlay099/struct_ov99_021D2CB0_sub2.h" #include "overlay099/struct_ov99_021D3A40.h" +#include "bg_window.h" #include "core_sys.h" #include "easy3d_object.h" #include "font.h" @@ -33,7 +33,6 @@ #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" -#include "unk_02018340.h" typedef void (*UnkFuncPtr_ov99_021D4A04)(UnkStruct_ov99_021D2CB0 *); typedef BOOL (*UnkFuncPtr_ov99_021D4A04_1)(UnkStruct_ov99_021D2CB0 *, UnkStruct_ov99_021D3A40 *); diff --git a/src/overlay099/ov99_021D2C08.c b/src/overlay099/ov99_021D2C08.c index f9e40e09f1..779e82a663 100644 --- a/src/overlay099/ov99_021D2C08.c +++ b/src/overlay099/ov99_021D2C08.c @@ -11,9 +11,9 @@ #include "overlay099/struct_ov99_021D2D18.h" #include "overlay099/struct_ov99_021D3A40.h" +#include "bg_window.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" typedef struct { diff --git a/src/overlay099/ov99_021D2E28.c b/src/overlay099/ov99_021D2E28.c index 2c3a737931..360151cbff 100644 --- a/src/overlay099/ov99_021D2E28.c +++ b/src/overlay099/ov99_021D2E28.c @@ -11,10 +11,10 @@ #include "overlay099/struct_ov99_021D2FD4.h" #include "overlay099/struct_ov99_021D3A40.h" +#include "bg_window.h" #include "unk_02002F38.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" typedef struct { diff --git a/src/overlay099/ov99_021D3C18.c b/src/overlay099/ov99_021D3C18.c index 6af1a63521..f9d2294ba1 100644 --- a/src/overlay099/ov99_021D3C18.c +++ b/src/overlay099/ov99_021D3C18.c @@ -8,8 +8,8 @@ #include "overlay099/struct_ov99_021D3A40.h" #include "overlay099/struct_ov99_021D3C18.h" +#include "bg_window.h" #include "unk_0200A9DC.h" -#include "unk_02018340.h" static void ov99_021D3CF8(UnkStruct_ov99_021D3C18 *param0, u32 param1); static BOOL ov99_021D3D50(UnkStruct_ov99_021D3C18 *param0); diff --git a/src/overlay099/ov99_021D3E78.c b/src/overlay099/ov99_021D3E78.c index 47cfa3ef54..ddc76d16c1 100644 --- a/src/overlay099/ov99_021D3E78.c +++ b/src/overlay099/ov99_021D3E78.c @@ -3,11 +3,9 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay099/struct_ov99_021D3E78_decl.h" +#include "bg_window.h" #include "font.h" #include "heap.h" #include "message.h" @@ -15,7 +13,6 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_02018340.h" static const struct { u16 unk_00; diff --git a/src/overlay099/ov99_021D4134.c b/src/overlay099/ov99_021D4134.c index c376dae2b3..846f895535 100644 --- a/src/overlay099/ov99_021D4134.c +++ b/src/overlay099/ov99_021D4134.c @@ -3,19 +3,18 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200D0F4.h" #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D5434.h" +#include "bg_window.h" #include "cell_actor.h" #include "easy3d_object.h" #include "heap.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" typedef struct { diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index 28359ed317..ccd7a262b6 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -3,12 +3,8 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay100/ov100_021D13E4.h" #include "overlay100/ov100_021D1C44.h" #include "overlay100/ov100_021D2F0C.h" @@ -19,6 +15,7 @@ #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "camera.h" #include "core_sys.h" #include "game_options.h" @@ -33,7 +30,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_02024220.h" diff --git a/src/overlay100/ov100_021D13E4.c b/src/overlay100/ov100_021D13E4.c index 54ea9216a7..0676c02bd6 100644 --- a/src/overlay100/ov100_021D13E4.c +++ b/src/overlay100/ov100_021D13E4.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "overlay100/ov100_021D400C.h" @@ -18,6 +17,7 @@ #include "overlay100/struct_ov100_021D4EBC.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "easy3d_object.h" #include "gx_layers.h" diff --git a/src/overlay100/ov100_021D1C44.c b/src/overlay100/ov100_021D1C44.c index 6a234eff4f..17609f5e44 100644 --- a/src/overlay100/ov100_021D1C44.c +++ b/src/overlay100/ov100_021D1C44.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "overlay100/ov100_021D400C.h" @@ -19,6 +18,7 @@ #include "overlay100/struct_ov100_021D54D0.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "easy3d_object.h" #include "heap.h" diff --git a/src/overlay100/ov100_021D2F0C.c b/src/overlay100/ov100_021D2F0C.c index aef9d71c98..2fcc878b5e 100644 --- a/src/overlay100/ov100_021D2F0C.c +++ b/src/overlay100/ov100_021D2F0C.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "overlay100/ov100_021D46C8.h" #include "overlay100/ov100_021D4E04.h" @@ -18,6 +17,7 @@ #include "overlay100/struct_ov100_021D4EBC.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "easy3d_object.h" #include "heap.h" diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index 6acb48435f..2f6ce46cb4 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -13,6 +13,7 @@ #include "overlay100/struct_ov100_021D4DD8.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "core_sys.h" #include "easy3d_object.h" @@ -25,7 +26,6 @@ #include "trainer_info.h" #include "unk_02002F38.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" int ov100_021D46C8(UnkStruct_ov100_021D46C8 *param0, UnkStruct_020985E4 *param1, int param2) { diff --git a/src/overlay100/ov100_021D4E04.c b/src/overlay100/ov100_021D4E04.c index 91ed6653fc..0a611e26ae 100644 --- a/src/overlay100/ov100_021D4E04.c +++ b/src/overlay100/ov100_021D4E04.c @@ -3,13 +3,12 @@ #include #include -#include "struct_defs/struct_0205AA50.h" - #include "overlay005/struct_ov5_021DDF24_sub1.h" #include "overlay100/struct_ov100_021D4E3C.h" #include "overlay100/struct_ov100_021D4EBC.h" #include "overlay104/ov104_0223E894.h" +#include "bg_window.h" #include "buffer_manager.h" #include "heap.h" #include "inlines.h" diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index 22540ade73..00eb8ee01d 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -5,14 +5,10 @@ #include "consts/game_records.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0203E348.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay101/ov101_021D1A28.h" #include "overlay101/ov101_021D59AC.h" #include "overlay101/ov101_021D7E48.h" @@ -20,6 +16,7 @@ #include "overlay101/struct_ov101_021D148C.h" #include "overlay101/struct_ov101_021D1894.h" +#include "bg_window.h" #include "enums.h" #include "font.h" #include "game_records.h" @@ -39,7 +36,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay101/ov101_021D1A28.c b/src/overlay101/ov101_021D1A28.c index 6c9245cdfa..98f7e6232d 100644 --- a/src/overlay101/ov101_021D1A28.c +++ b/src/overlay101/ov101_021D1A28.c @@ -32,13 +32,13 @@ #include "overlay101/struct_ov101_021D9934.h" #include "overlay101/struct_ov101_021D9AE4.h" +#include "bg_window.h" #include "core_sys.h" #include "enums.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02005474.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_020711EC.h" diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index bf767aa706..1b50ffb73c 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -3,15 +3,10 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0203E53C.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "gx_layers.h" @@ -28,7 +23,6 @@ #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" typedef struct { int unk_00; diff --git a/src/overlay104/ov104_0222EA90.c b/src/overlay104/ov104_0222EA90.c index 0b03881f55..b9a3f89a31 100644 --- a/src/overlay104/ov104_0222EA90.c +++ b/src/overlay104/ov104_0222EA90.c @@ -7,9 +7,9 @@ #include "overlay104/ov104_0223D9E4.h" #include "overlay104/struct_ov104_0223C4CC.h" +#include "bg_window.h" #include "gx_layers.h" #include "heap.h" -#include "unk_02018340.h" typedef void (*UnkFuncPtr_ov104_0223F394)(UnkStruct_ov104_0223C4CC *, void **); diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index 1c7513c7e4..31bf781acd 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -10,16 +10,13 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay004/ov4_021D0D80.h" #include "overlay006/battle_params.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay063/ov63_0222BE18.h" #include "overlay063/ov63_0222CCE4.h" #include "overlay063/struct_ov63_0222BEC0_decl.h" @@ -64,6 +61,7 @@ #include "overlay104/struct_ov104_0223F1B4.h" #include "savedata/save_table.h" +#include "bg_window.h" #include "communication_information.h" #include "communication_system.h" #include "core_sys.h" @@ -92,7 +90,6 @@ #include "unk_0200F174.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0202ACE0.h" #include "unk_0202D05C.h" diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index 6611f7e697..7762322a70 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -15,7 +15,6 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "overlay063/ov63_0222BE18.h" @@ -37,6 +36,7 @@ #include "overlay104/struct_ov104_022331E8.h" #include "overlay104/struct_ov104_0223C4CC.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -62,7 +62,6 @@ #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02014A84.h" -#include "unk_02018340.h" #include "unk_0201F834.h" #include "unk_0207E0B8.h" #include "unk_0209B6F8.h" diff --git a/src/overlay104/ov104_022332B4.c b/src/overlay104/ov104_022332B4.c index afefd44339..7f4be3b43d 100644 --- a/src/overlay104/ov104_022332B4.c +++ b/src/overlay104/ov104_022332B4.c @@ -18,6 +18,7 @@ #include "overlay104/struct_ov104_0223C4CC.h" #include "overlay105/ov105_02241AE0.h" +#include "bg_window.h" #include "heap.h" #include "party.h" #include "pokemon.h" @@ -25,7 +26,6 @@ #include "string_template.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02018340.h" #include "unk_0202FF4C.h" #include "unk_02051D8C.h" #include "unk_0209B6F8.h" diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index eef2d56558..beab5b1642 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -5,13 +5,11 @@ #include "consts/game_records.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020302DC_decl.h" #include "struct_decls/struct_0203041C_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0204B184.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay104/ov104_0222DCE0.h" #include "overlay104/ov104_0222E63C.h" @@ -25,6 +23,7 @@ #include "overlay104/struct_ov104_0223BA10.h" #include "overlay104/struct_ov104_0223C4CC.h" +#include "bg_window.h" #include "communication_information.h" #include "communication_system.h" #include "game_records.h" @@ -39,7 +38,6 @@ #include "text.h" #include "trainer_info.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_020302D0.h" #include "unk_0203061C.h" #include "unk_0205DFC4.h" diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c index 2486b8ceef..07a2c0c067 100644 --- a/src/overlay104/ov104_02237DD8.c +++ b/src/overlay104/ov104_02237DD8.c @@ -20,6 +20,7 @@ #include "overlay104/struct_ov104_0223BFFC.h" #include "overlay104/struct_ov104_0223C4CC.h" +#include "bg_window.h" #include "cell_actor.h" #include "gx_layers.h" #include "heap.h" @@ -29,7 +30,6 @@ #include "savedata.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_02030494.h" #include "unk_0203061C.h" diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c index 9fcd94c69b..4c561dbd68 100644 --- a/src/overlay104/ov104_0223B6F4.c +++ b/src/overlay104/ov104_0223B6F4.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0204B184.h" @@ -14,6 +13,7 @@ #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223BA10.h" +#include "bg_window.h" #include "communication_information.h" #include "communication_system.h" #include "heap.h" @@ -23,7 +23,6 @@ #include "save_player.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0203061C.h" #include "unk_02051D8C.h" diff --git a/src/overlay104/ov104_0223C164.c b/src/overlay104/ov104_0223C164.c index 871b2386e6..84e0b01b60 100644 --- a/src/overlay104/ov104_0223C164.c +++ b/src/overlay104/ov104_0223C164.c @@ -3,14 +3,12 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" - #include "overlay104/struct_ov104_0223C23C_decl.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02018340.h" typedef struct { SysTask *unk_00; diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index 3860a18578..a329daca11 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0209B75C_decl.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0207C690.h" @@ -24,8 +23,6 @@ #include "overlay063/union_ov63_0222BDAC.h" #include "overlay065/struct_ov65_0223582C.h" #include "overlay065/struct_ov65_022376D0.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/ov104_0222DCE0.h" #include "overlay104/ov104_0222EA90.h" #include "overlay104/ov104_0223D5D0.h" @@ -41,6 +38,7 @@ #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "game_options.h" #include "gx_layers.h" #include "heap.h" @@ -57,7 +55,6 @@ #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_0202419C.h" diff --git a/src/overlay104/ov104_0223D9E4.c b/src/overlay104/ov104_0223D9E4.c index d41792c3e2..59ea3cb5c3 100644 --- a/src/overlay104/ov104_0223D9E4.c +++ b/src/overlay104/ov104_0223D9E4.c @@ -5,8 +5,8 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" +#include "bg_window.h" #include "enums.h" #include "heap.h" #include "narc.h" @@ -14,7 +14,6 @@ #include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" typedef struct { SysTask *unk_00; diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c index 28f5c1e1e5..4d2d219d56 100644 --- a/src/overlay104/ov104_0223DC7C.c +++ b/src/overlay104/ov104_0223DC7C.c @@ -7,13 +7,12 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "heap.h" @@ -30,7 +29,6 @@ #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201E86C.h" typedef struct { diff --git a/src/overlay104/ov104_0223E894.c b/src/overlay104/ov104_0223E894.c index 5f40716572..dcffc50b48 100644 --- a/src/overlay104/ov104_0223E894.c +++ b/src/overlay104/ov104_0223E894.c @@ -3,19 +3,17 @@ #include #include -#include "struct_defs/struct_0205AA50.h" - #include "overlay104/struct_ov104_0223E9EC.h" #include "overlay104/struct_ov104_0223EA38.h" #include "overlay104/struct_ov104_0223F094.h" #include "overlay104/struct_ov104_0223F1B4.h" +#include "bg_window.h" #include "buffer_manager.h" #include "heap.h" #include "screen_scroll_manager.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02018340.h" typedef struct { int unk_00; diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 9278386623..508a96c072 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -9,17 +9,13 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/ov104_0222DCE0.h" #include "overlay104/ov104_0223A7F4.h" #include "overlay104/struct_ov104_02234130.h" @@ -35,6 +31,7 @@ #include "overlay105/struct_ov105_02245EA8_decl.h" #include "overlay105/struct_ov105_02246060_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" @@ -66,7 +63,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_02024220.h" #include "unk_020363E8.h" diff --git a/src/overlay105/ov105_02246214.c b/src/overlay105/ov105_02246214.c index d4242d94fe..73dc2a3993 100644 --- a/src/overlay105/ov105_02246214.c +++ b/src/overlay105/ov105_02246214.c @@ -3,13 +3,8 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - -#include "overlay061/struct_ov61_0222C884.h" - +#include "bg_window.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" void ov105_02246214(BGL *param0, Window *param1); void ov105_02246244(Window *param0); diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index e6e31e7b11..4e7ae5d8cd 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -8,16 +8,12 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/ov104_0222DCE0.h" #include "overlay104/ov104_0223AF58.h" #include "overlay104/struct_ov104_02235208.h" @@ -28,6 +24,7 @@ #include "overlay106/struct_ov106_02243310.h" #include "overlay106/struct_ov106_02243650_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_system.h" #include "core_sys.h" @@ -58,7 +55,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_02030108.h" #include "unk_020363E8.h" diff --git a/src/overlay106/ov106_022436E0.c b/src/overlay106/ov106_022436E0.c index 10f1d02898..4341dd1182 100644 --- a/src/overlay106/ov106_022436E0.c +++ b/src/overlay106/ov106_022436E0.c @@ -3,13 +3,8 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - -#include "overlay061/struct_ov61_0222C884.h" - +#include "bg_window.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" void ov106_022436E0(BGL *param0, Window *param1); void ov106_02243710(Window *param0); diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index 3c0a599357..6628912831 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -9,19 +9,15 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020302DC_decl.h" #include "struct_decls/struct_0203041C_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/ov104_0222DCE0.h" #include "overlay104/ov104_0223B6F4.h" #include "overlay104/struct_ov104_0223597C.h" @@ -33,6 +29,7 @@ #include "overlay107/struct_ov107_02249954.h" #include "overlay107/struct_ov107_02249B8C_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" @@ -65,7 +62,6 @@ #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_020302D0.h" #include "unk_0203061C.h" diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index e61a27fe02..2a3257ac48 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -9,19 +9,15 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020302DC_decl.h" #include "struct_decls/struct_0203041C_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/ov104_0222DCE0.h" #include "overlay104/ov104_0223B6F4.h" #include "overlay104/struct_ov104_0223597C.h" @@ -33,6 +29,7 @@ #include "overlay107/struct_ov107_02249954.h" #include "overlay107/struct_ov107_02249B8C_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" @@ -65,7 +62,6 @@ #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_020302D0.h" #include "unk_0203061C.h" diff --git a/src/overlay107/ov107_02249D14.c b/src/overlay107/ov107_02249D14.c index f2551c8f6b..4bc3cba0ab 100644 --- a/src/overlay107/ov107_02249D14.c +++ b/src/overlay107/ov107_02249D14.c @@ -3,13 +3,8 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - -#include "overlay061/struct_ov61_0222C884.h" - +#include "bg_window.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" typedef struct { const UnkStruct_ov61_0222C884 *unk_00; diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 847c879e3a..53ab103197 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -7,18 +7,14 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020304A0_decl.h" #include "struct_decls/struct_020305B8_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/ov104_0223BCBC.h" #include "overlay104/struct_ov104_02238240.h" #include "overlay108/ov108_02243030.h" @@ -28,6 +24,7 @@ #include "overlay108/struct_ov108_02243030.h" #include "overlay108/struct_ov108_02243594_decl.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_system.h" #include "core_sys.h" @@ -54,7 +51,6 @@ #include "unk_0200A784.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_02030494.h" diff --git a/src/overlay108/ov108_02243630.c b/src/overlay108/ov108_02243630.c index dae45dfdba..44a402db5c 100644 --- a/src/overlay108/ov108_02243630.c +++ b/src/overlay108/ov108_02243630.c @@ -3,12 +3,7 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - -#include "overlay061/struct_ov61_0222C884.h" - -#include "unk_02018340.h" +#include "bg_window.h" void ov108_02243630(BGL *param0, Window *param1); void ov108_02243660(Window *param0); diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index beb2d1b608..3804c5b701 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -9,11 +9,9 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" @@ -23,10 +21,7 @@ #include "struct_defs/struct_0209C194.h" #include "overlay005/struct_ov5_02201C58.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay072/struct_ov72_0223E2A8.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" @@ -35,6 +30,7 @@ #include "overlay115/camera_angle.h" #include "bag.h" +#include "bg_window.h" #include "camera.h" #include "communication_information.h" #include "communication_system.h" @@ -63,7 +59,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 08eb86bb15..f09b9b698b 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -6,20 +6,16 @@ #include "consts/game_records.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "struct_defs/struct_0209BF64.h" #include "struct_defs/struct_0209C194.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay109/struct_ov109_021D5140.h" #include "overlay109/struct_ov109_021D5140_sub1.h" #include "overlay109/struct_ov109_021D5140_sub2.h" +#include "bg_window.h" #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" @@ -52,7 +48,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 557d5ee7ed..c229980d8f 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -5,18 +5,15 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202D750_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_020308A0_decl.h" #include "struct_defs/struct_0203E564.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay110/ov110_021D2124.h" +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "game_options.h" @@ -34,7 +31,6 @@ #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0202D05C.h" #include "unk_0202FF4C.h" #include "unk_020302D0.h" diff --git a/src/overlay110/ov110_021D2124.c b/src/overlay110/ov110_021D2124.c index 241e1bf71f..95f46f41e5 100644 --- a/src/overlay110/ov110_021D2124.c +++ b/src/overlay110/ov110_021D2124.c @@ -3,12 +3,7 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - -#include "overlay061/struct_ov61_0222C884.h" - -#include "unk_02018340.h" +#include "bg_window.h" typedef struct { const UnkStruct_ov61_0222C884 *unk_00; diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index ba6c63b318..a8988c7b82 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -7,15 +7,11 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0203E608.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay072/struct_ov72_0223E2A8.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay111/ov111_021D2F80.h" #include "overlay111/ov111_021D33F4.h" #include "overlay111/ov111_021D3548.h" @@ -24,6 +20,7 @@ #include "overlay111/struct_ov111_021D33F4_decl.h" #include "overlay111/struct_ov111_021D3620.h" +#include "bg_window.h" #include "cell_actor.h" #include "font.h" #include "game_options.h" @@ -49,7 +46,6 @@ #include "unk_0201567C.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" diff --git a/src/overlay111/ov111_021D3548.c b/src/overlay111/ov111_021D3548.c index 21d80ee2cf..9b4d7eff4d 100644 --- a/src/overlay111/ov111_021D3548.c +++ b/src/overlay111/ov111_021D3548.c @@ -3,13 +3,8 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - -#include "overlay061/struct_ov61_0222C884.h" - +#include "bg_window.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" static const UnkStruct_ov61_0222C884 Unk_ov111_021D38B8[] = { { 0x2, 0x2, 0x1, 0x1B, 0x4, 0xC, 0x1 }, diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index 4fdcf6d663..1b01a8b6f1 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -4,9 +4,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" @@ -18,9 +16,8 @@ #include "overlay066/struct_ov66_02231428.h" #include "overlay066/struct_ov66_0223177C_decl.h" #include "overlay066/struct_ov66_02232068.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "enums.h" @@ -40,7 +37,6 @@ #include "unk_0200A784.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index bbc84ee846..4955e393bd 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -13,14 +13,12 @@ #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" @@ -30,8 +28,6 @@ #include "overlay066/struct_ov66_0223127C.h" #include "overlay066/struct_ov66_02232B20.h" #include "overlay066/struct_ov66_022589B4.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" @@ -44,6 +40,7 @@ #include "overlay113/struct_ov113_02260818.h" #include "overlay115/camera_angle.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "core_sys.h" @@ -75,7 +72,6 @@ #include "unk_02012744.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E190.h" #include "unk_0201E3D8.h" diff --git a/src/overlay113/ov113_02260620.c b/src/overlay113/ov113_02260620.c index bffb9a17af..913d4b1255 100644 --- a/src/overlay113/ov113_02260620.c +++ b/src/overlay113/ov113_02260620.c @@ -6,8 +6,6 @@ #include "constants/species.h" #include "consts/pokemon.h" -#include "struct_defs/struct_0205AA50.h" - #include "overlay066/ov66_0222DDF0.h" #include "overlay066/ov66_022324F0.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" @@ -15,6 +13,7 @@ #include "overlay113/footprint_data.h" #include "overlay113/struct_ov113_02260818.h" +#include "bg_window.h" #include "heap.h" #include "message.h" #include "strbuf.h" @@ -22,7 +21,6 @@ #include "text.h" #include "touch_screen.h" #include "trainer_info.h" -#include "unk_02018340.h" __attribute__((aligned(4))) static const u16 Unk_ov113_02260D6C[][2] = { { 0x4210, 0x6f7b }, diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index a753dba16f..0482aec0c6 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -5,23 +5,20 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay004/ov4_021D0D80.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay066/ov66_0222DDF0.h" #include "overlay066/struct_ov66_02230DBC.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay114/ov114_02260044.h" #include "overlay114/struct_ov114_0225C76C.h" #include "overlay114/struct_ov114_0225C9A8.h" +#include "bg_window.h" #include "buffer_manager.h" #include "cell_actor.h" #include "communication_information.h" @@ -53,7 +50,6 @@ #include "unk_0200F174.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index 33e1d36ed8..52bbee27b9 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -8,19 +8,15 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02012B20_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay072/struct_ov72_0223E2A8.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay092/struct_ov92_021D28C0.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay114/ov114_0225C700.h" #include "overlay114/struct_ov114_0225CAD4_decl.h" #include "overlay115/camera_angle.h" @@ -30,6 +26,7 @@ #include "overlay115/struct_ov115_02265AD0.h" #include "overlay115/struct_ov115_02265AD4.h" +#include "bg_window.h" #include "camera.h" #include "cell_actor.h" #include "core_sys.h" @@ -53,7 +50,6 @@ #include "unk_0200A9DC.h" #include "unk_0200DA60.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c index a3f217e675..d928a18f5a 100644 --- a/src/overlay116/ov116_022604C4.c +++ b/src/overlay116/ov116_022604C4.c @@ -3,12 +3,9 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02099F80.h" #include "overlay004/ov4_021D0D80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" @@ -26,6 +23,7 @@ #include "overlay116/struct_ov116_02262A8C.h" #include "overlay116/struct_ov116_0226501C.h" +#include "bg_window.h" #include "camera.h" #include "communication_information.h" #include "communication_system.h" @@ -41,7 +39,6 @@ #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c index 2c7b3347ef..fe3b58082e 100644 --- a/src/overlay116/ov116_02261870.c +++ b/src/overlay116/ov116_02261870.c @@ -7,10 +7,8 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay114/ov114_0225C700.h" #include "overlay116/ov116_0226432C.h" @@ -18,6 +16,7 @@ #include "overlay116/struct_ov116_02262A8C.h" #include "overlay116/struct_ov116_0226501C.h" +#include "bg_window.h" #include "camera.h" #include "easy3d_object.h" #include "font.h" @@ -31,7 +30,6 @@ #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_0202419C.h" static inline void inline_ov116_02261940(UnkStruct_ov116_0226501C *param0); diff --git a/src/overlay116/ov116_0226432C.c b/src/overlay116/ov116_0226432C.c index d28a9f7d99..79c8f202ca 100644 --- a/src/overlay116/ov116_0226432C.c +++ b/src/overlay116/ov116_0226432C.c @@ -21,6 +21,7 @@ #include "overlay116/struct_ov116_022660A8.h" #include "overlay116/union_ov116_02266FEC.h" +#include "bg_window.h" #include "easy3d_object.h" #include "heap.h" #include "inlines.h" @@ -30,7 +31,6 @@ #include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" typedef struct { diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index 5daf9a89ed..a76b6c7f59 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -5,13 +5,10 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" #include "overlay004/ov4_021D0D80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" @@ -27,6 +24,7 @@ #include "overlay117/struct_ov117_022621D4.h" #include "overlay117/struct_ov117_02262664.h" +#include "bg_window.h" #include "camera.h" #include "communication_system.h" #include "core_sys.h" @@ -55,7 +53,6 @@ #include "unk_02012744.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_0202419C.h" diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c index e56715dbd8..f5f8cbfeaf 100644 --- a/src/overlay117/ov117_02263AF0.c +++ b/src/overlay117/ov117_02263AF0.c @@ -7,12 +7,10 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay117/ov117_02260668.h" #include "overlay117/ov117_022666C0.h" @@ -34,6 +32,7 @@ #include "overlay117/struct_ov117_02266344.h" #include "overlay117/struct_ov117_02266F10.h" +#include "bg_window.h" #include "communication_system.h" #include "error_handling.h" #include "font.h" @@ -46,7 +45,6 @@ #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201E86C.h" diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index baf314a08b..9506d73da9 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -7,17 +7,13 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/sprite_template.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" @@ -27,6 +23,7 @@ #include "overlay119/struct_ov119_021D17B8.h" #include "overlay119/struct_ov119_021D1930.h" +#include "bg_window.h" #include "camera.h" #include "gx_layers.h" #include "heap.h" @@ -45,7 +42,6 @@ #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02014000.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0202419C.h" #include "unk_02024220.h" diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c index fdf3aa8b4e..c028829553 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_app.c @@ -6,13 +6,10 @@ #include "constants/pokemon.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -42,7 +39,6 @@ #include "unk_0200F174.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_020393C8.h" diff --git a/src/render_text.c b/src/render_text.c index 8159069055..c8fa6b72e4 100644 --- a/src/render_text.c +++ b/src/render_text.c @@ -6,13 +6,13 @@ #include "constants/charcode.h" #include "consts/sdat.h" +#include "bg_window.h" #include "charcode.h" #include "core_sys.h" #include "font.h" #include "render_text.h" #include "text.h" #include "unk_02005474.h" -#include "unk_02018340.h" #define SPEED_UP_ON_TOUCH_PRESS (gCoreSys.touchPressed && sRenderControlFlags.speedUpOnTouch) #define SPEED_UP_ON_TOUCH_HOLD (gCoreSys.touchHeld && sRenderControlFlags.speedUpOnTouch) diff --git a/src/scrcmd.c b/src/scrcmd.c index df2150be25..89503640f5 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -42,7 +42,6 @@ #include "struct_defs/struct_02042434.h" #include "struct_defs/struct_02049FA8.h" #include "struct_defs/struct_0204AFC4.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02098C44.h" #include "field/field_system.h" @@ -89,13 +88,13 @@ #include "overlay008/ov8_02249960.h" #include "overlay009/ov9_02249960.h" #include "overlay023/ov23_022521F0.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay090/struct_ov90_021D0D80.h" #include "overlay098/struct_ov98_02247168.h" #include "overlay104/struct_ov104_02230BE4.h" #include "savedata/save_table.h" #include "bag.h" +#include "bg_window.h" #include "camera.h" #include "comm_player_manager.h" #include "communication_system.h" @@ -137,7 +136,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02014D38.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_02025CB0.h" #include "unk_020261E4.h" diff --git a/src/text.c b/src/text.c index 24c363a928..8a7e865f11 100644 --- a/src/text.c +++ b/src/text.c @@ -6,8 +6,7 @@ #include "constants/heap.h" #include "constants/narc.h" -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "font.h" #include "heap.h" #include "render_text.h" @@ -15,7 +14,6 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" static enum RenderResult TextPrinter_Render(TextPrinter *printer); static u8 Text_CreatePrinterTask(SysTaskFunc taskFunc, TextPrinter *printer, u32 priority); diff --git a/src/unk_0200112C.c b/src/unk_0200112C.c index 082ef19bcf..4857dd1deb 100644 --- a/src/unk_0200112C.c +++ b/src/unk_0200112C.c @@ -9,12 +9,12 @@ #include "overlay084/struct_ov84_02240FA8.h" +#include "bg_window.h" #include "colored_arrow.h" #include "core_sys.h" #include "font.h" #include "heap.h" #include "text.h" -#include "unk_02018340.h" typedef struct { u8 unk_00_0 : 4; diff --git a/src/unk_02001AF4.c b/src/unk_02001AF4.c index 2e5405bc66..fdc0bb99f5 100644 --- a/src/unk_02001AF4.c +++ b/src/unk_02001AF4.c @@ -4,13 +4,10 @@ #include #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" -#include "overlay061/struct_ov61_0222C884.h" - +#include "bg_window.h" #include "colored_arrow.h" #include "core_sys.h" #include "font.h" @@ -20,7 +17,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" typedef struct UIControlData_t { UnkStruct_02081CF4 unk_00; diff --git a/src/unk_02006E3C.c b/src/unk_02006E3C.c index d51665b6e3..dea785ef95 100644 --- a/src/unk_02006E3C.c +++ b/src/unk_02006E3C.c @@ -4,11 +4,10 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" +#include "bg_window.h" #include "heap.h" #include "narc.h" -#include "unk_02018340.h" static u32 sub_020072D0(void *param0, BGL *param1, u32 param2, u32 param3, u32 param4); static void sub_02007314(void *param0, BGL *param1, u32 param2, u32 param3, u32 param4); diff --git a/src/unk_0200C440.c b/src/unk_0200C440.c index 6ffa1f9d2e..752cb90269 100644 --- a/src/unk_0200C440.c +++ b/src/unk_0200C440.c @@ -3,12 +3,10 @@ #include #include -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "heap.h" #include "unk_020021B0.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" typedef struct UnkStruct_0200C440_t { void *unk_00; diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c index 7bff6cb369..0b57fdf761 100644 --- a/src/unk_0200DA60.c +++ b/src/unk_0200DA60.c @@ -3,18 +3,16 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02013610.h" -#include "struct_defs/struct_0201AE08.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay005/ov5_021D2F14.h" #include "overlay005/struct_ov5_021D30A8.h" #include "overlay104/struct_ov104_02241308.h" +#include "bg_window.h" #include "cell_actor.h" #include "gx_layers.h" #include "heap.h" @@ -30,7 +28,6 @@ #include "unk_0200A328.h" #include "unk_0200C6E4.h" #include "unk_020131EC.h" -#include "unk_02018340.h" typedef struct { Window *unk_00; diff --git a/src/unk_02012744.c b/src/unk_02012744.c index b9f4f3bf87..2ac1b85b24 100644 --- a/src/unk_02012744.c +++ b/src/unk_02012744.c @@ -4,8 +4,8 @@ #include #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" +#include "bg_window.h" #include "cell_actor.h" #include "heap.h" #include "unk_02006E3C.h" diff --git a/src/unk_0201567C.c b/src/unk_0201567C.c index acf5500310..19347e10d1 100644 --- a/src/unk_0201567C.c +++ b/src/unk_0201567C.c @@ -5,10 +5,10 @@ #include "struct_decls/struct_02002F38_decl.h" +#include "bg_window.h" #include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_0200679C.h" -#include "unk_02018340.h" #include "unk_020241F0.h" typedef void (*UnkFuncPtr_020157E4)(void *, u16 *); diff --git a/src/unk_02015920.c b/src/unk_02015920.c index 223cd1282a..028db91ee1 100644 --- a/src/unk_02015920.c +++ b/src/unk_02015920.c @@ -3,17 +3,16 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_02015958.h" +#include "bg_window.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" #include "touch_screen.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "unk_02018340.h" #include "unk_02023FCC.h" typedef struct { diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c index c3d9a3b30d..7c83fa24f9 100644 --- a/src/unk_020366A0.c +++ b/src/unk_020366A0.c @@ -4,13 +4,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0202610C.h" #include "overlay004/ov4_021D0D80.h" #include "overlay065/struct_ov65_0222F6EC.h" #include "overlay066/ov66_022324F0.h" +#include "bg_window.h" #include "communication_information.h" #include "communication_system.h" #include "core_sys.h" diff --git a/src/unk_02039814.c b/src/unk_02039814.c index b95449878c..d5acd2ea6f 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -3,14 +3,9 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "gx_layers.h" @@ -23,7 +18,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" void sub_02039834(int param0, int param1, int param2); diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index 453341647e..9b6af15884 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -1,14 +1,9 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "gx_layers.h" @@ -21,7 +16,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" void sub_0201777C(void); diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c index 6d384e7933..1a84b23034 100644 --- a/src/unk_020494DC.c +++ b/src/unk_020494DC.c @@ -7,11 +7,11 @@ #include "struct_defs/struct_02049A68.h" #include "struct_defs/struct_0204AFC4.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "overlay005/ov5_021DC018.h" +#include "bg_window.h" #include "communication_system.h" #include "field_script_context.h" #include "field_system.h" diff --git a/src/unk_0204C6C8.c b/src/unk_0204C6C8.c index 64bf6548b1..3577776605 100644 --- a/src/unk_0204C6C8.c +++ b/src/unk_0204C6C8.c @@ -3,11 +3,10 @@ #include #include -#include "struct_defs/struct_0205AA50.h" - #include "field/field_system.h" #include "overlay005/ov5_021DC018.h" +#include "bg_window.h" #include "coins.h" #include "field_script_context.h" #include "field_system.h" diff --git a/src/unk_0204C8F0.c b/src/unk_0204C8F0.c index 6b3bd8b70b..d98708a882 100644 --- a/src/unk_0204C8F0.c +++ b/src/unk_0204C8F0.c @@ -3,11 +3,10 @@ #include #include -#include "struct_defs/struct_0205AA50.h" - #include "field/field_system.h" #include "overlay005/ov5_021DC018.h" +#include "bg_window.h" #include "field_script_context.h" #include "field_system.h" #include "inlines.h" diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index 8833a556fe..c29b129887 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -3,18 +3,14 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0203A790_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_defs/struct_02049FA8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "field/field_system.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "core_sys.h" #include "field_map_change.h" #include "field_overworld_state.h" @@ -35,7 +31,6 @@ #include "unk_0200A9DC.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0203A7D8.h" #include "unk_020508D4.h" #include "unk_020553DC.h" diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index 729c22465c..5a628f6081 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -11,14 +11,12 @@ #include "struct_defs/struct_0203E234.h" #include "struct_defs/struct_0203E274.h" #include "struct_defs/struct_02049FA8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "field/field_system.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "savedata/save_table.h" +#include "bg_window.h" #include "field_overworld_state.h" #include "game_options.h" #include "game_records.h" @@ -36,7 +34,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0202631C.h" #include "unk_0202DF8C.h" #include "unk_0203D178.h" diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 8a586d71ed..66a0645833 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -6,7 +6,6 @@ #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/pokemon_summary.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02072014.h" #include "struct_defs/struct_02098C44.h" @@ -15,6 +14,7 @@ #include "overlay005/ov5_021D0D80.h" #include "bag.h" +#include "bg_window.h" #include "colored_arrow.h" #include "comm_player_manager.h" #include "communication_information.h" @@ -38,7 +38,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0202602C.h" #include "unk_0202D778.h" #include "unk_020363E8.h" diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c index 883b38d2ce..e582af585e 100644 --- a/src/unk_0205CA94.c +++ b/src/unk_0205CA94.c @@ -8,6 +8,7 @@ #include "field/field_system.h" +#include "bg_window.h" #include "cell_actor.h" #include "gx_layers.h" #include "heap.h" @@ -23,7 +24,6 @@ #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_0200F174.h" -#include "unk_02018340.h" typedef struct { CellActorCollection *unk_00; diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c index f41631184d..7ed2304f86 100644 --- a/src/unk_0205D8CC.c +++ b/src/unk_0205D8CC.c @@ -3,16 +3,13 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" - +#include "bg_window.h" #include "font.h" #include "game_options.h" #include "render_text.h" #include "strbuf.h" #include "text.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" void sub_0205D8CC(u32 param0, u32 param1) { diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index 61e2a5fb0e..90205b457c 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -6,7 +6,6 @@ #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" #include "struct_defs/struct_0203D9B8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020684D0.h" #include "struct_defs/struct_02068630.h" #include "struct_defs/struct_020708E0.h" @@ -26,6 +25,7 @@ #include "savedata/save_table.h" #include "bag.h" +#include "bg_window.h" #include "core_sys.h" #include "field_map_change.h" #include "field_menu.h" @@ -45,7 +45,6 @@ #include "strbuf.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_02018340.h" #include "unk_0202631C.h" #include "unk_02028124.h" #include "unk_0203C954.h" diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index 42debd766f..b52029a950 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202E8C0_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_defs/sprite_template.h" @@ -15,15 +14,14 @@ #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0202EE10.h" #include "struct_defs/struct_0202EE10_sub1.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "overlay005/ov5_021D2F14.h" #include "overlay005/struct_ov5_021D30A8.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay104/struct_ov104_02241308.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -42,7 +40,6 @@ #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0202E840.h" #include "unk_020508D4.h" diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index 4e0df49a72..f9b0a62b11 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -4,13 +4,11 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02028430_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0202818C.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0206A844.h" #include "struct_defs/struct_02097728.h" #include "struct_defs/struct_02098C44.h" @@ -19,10 +17,10 @@ #include "overlay005/ov5_021D37AC.h" #include "overlay005/ov5_021D431C.h" #include "overlay006/ov6_02247078.h" -#include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" #include "bag.h" +#include "bg_window.h" #include "core_sys.h" #include "field_system.h" #include "font.h" @@ -46,7 +44,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_02028124.h" #include "unk_0203D1B8.h" #include "unk_020508D4.h" diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 41cdff5aed..a7ed1bd28c 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -6,7 +6,6 @@ #include "consts/game_records.h" #include "struct_decls/pokedexdata_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0207AE68_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/archived_sprite.h" @@ -18,11 +17,8 @@ #include "struct_defs/struct_0207C894.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - #include "bag.h" +#include "bg_window.h" #include "core_sys.h" #include "game_options.h" #include "game_records.h" @@ -51,7 +47,6 @@ #include "unk_0201567C.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0202419C.h" #include "unk_020241F0.h" diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index cdcd6eef95..d07d9de683 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -4,8 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_0207F248.h" #include "struct_defs/struct_02099F80.h" @@ -13,11 +11,10 @@ #include "field/field_system.h" #include "functypes/funcptr_0207E634.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" #include "overlay118/ov118_021D0D80.h" #include "bag.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -47,7 +44,6 @@ #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E010.h" #include "unk_0201E3D8.h" diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index 12ed0afa27..3dff2c4d7f 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -3,13 +3,10 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207F248.h" #include "struct_defs/struct_02081CF4.h" -#include "overlay061/struct_ov61_0222C884.h" - +#include "bg_window.h" #include "font.h" #include "game_options.h" #include "message.h" @@ -24,7 +21,6 @@ #include "unk_0200C440.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0207E0B8.h" #include "unk_02083370.h" #include "unk_02084B70.h" diff --git a/src/unk_02083370.c b/src/unk_02083370.c index cc3c0c9ac9..eb1d60c52d 100644 --- a/src/unk_02083370.c +++ b/src/unk_02083370.c @@ -14,6 +14,7 @@ #include "overlay118/ov118_021D0D80.h" #include "bag.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "heap.h" @@ -27,7 +28,6 @@ #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0207070C.h" #include "unk_0207E0B8.h" #include "unk_020819DC.h" diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c index caafa899aa..34251cba57 100644 --- a/src/unk_02084B70.c +++ b/src/unk_02084B70.c @@ -9,6 +9,7 @@ #include "field/field_system.h" #include "bag.h" +#include "bg_window.h" #include "core_sys.h" #include "heap.h" #include "item.h" @@ -25,7 +26,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_02018340.h" #include "unk_0207E0B8.h" #include "unk_020819DC.h" #include "unk_02082C2C.h" diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index 800b13ae2d..2f16cffc44 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -4,17 +4,14 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02087A10_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208737C.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" +#include "bg_window.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -45,7 +42,6 @@ #include "unk_02012744.h" #include "unk_0201567C.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index 6c3756bd79..9519c12a7f 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -4,13 +4,11 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02089438.h" #include "struct_defs/struct_02089688.h" #include "struct_defs/struct_02099F80.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "core_sys.h" #include "game_options.h" #include "gx_layers.h" @@ -21,7 +19,6 @@ #include "unk_02002F38.h" #include "unk_0200C6E4.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_02023FCC.h" diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index 2f60e4dd47..6ababafe45 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -8,11 +8,9 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02089688.h" #include "struct_defs/struct_0208AF44.h" @@ -20,6 +18,7 @@ #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "font.h" #include "game_options.h" #include "inlines.h" @@ -31,7 +30,6 @@ #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_02012744.h" -#include "unk_02018340.h" #include "unk_0201E86C.h" void sub_0208A3F4 (UnkStruct_02089688 * param0) diff --git a/src/unk_0208C098.c b/src/unk_0208C098.c index eb41570f43..3214f38bbd 100644 --- a/src/unk_0208C098.c +++ b/src/unk_0208C098.c @@ -4,13 +4,12 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_02018340_decl.h" +#include "bg_window.h" #include "core_sys.h" #include "heap.h" #include "narc.h" #include "unk_0200F174.h" -#include "unk_02018340.h" __attribute__((aligned(4))) static const u16 Unk_020F4030[] = { 0x20, diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c index 5818bd9879..0a11f62b30 100644 --- a/src/unk_0208EA44.c +++ b/src/unk_0208EA44.c @@ -4,13 +4,13 @@ #include #include "struct_defs/pokemon_summary_app.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bg_window.h" #include "cell_actor.h" #include "gx_layers.h" #include "move_table.h" @@ -18,7 +18,6 @@ #include "pokemon_icon.h" #include "pokemon_summary_app.h" #include "unk_0200C6E4.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0207C908.h" #include "unk_020920C0.h" diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index 9159d81e3c..7b81575e48 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -4,11 +4,9 @@ #include #include "struct_defs/pokemon_summary_app.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02090800.h" -#include "overlay061/struct_ov61_0222C884.h" - +#include "bg_window.h" #include "font.h" #include "heap.h" #include "message.h" @@ -20,7 +18,6 @@ #include "text.h" #include "unk_0200C440.h" #include "unk_0200DA60.h" -#include "unk_02018340.h" #include "unk_0207A274.h" #include "unk_0208EA44.h" #include "unk_020923C0.h" diff --git a/src/unk_020920C0.c b/src/unk_020920C0.c index 78e186aaca..76f443d23f 100644 --- a/src/unk_020920C0.c +++ b/src/unk_020920C0.c @@ -5,10 +5,10 @@ #include "struct_defs/pokemon_summary_app.h" +#include "bg_window.h" #include "core_sys.h" #include "touch_screen.h" #include "unk_02005474.h" -#include "unk_02018340.h" #include "unk_0208EA44.h" typedef struct { diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c index e9fd12a0fe..2f2f8a9a82 100644 --- a/src/unk_02095E98.c +++ b/src/unk_02095E98.c @@ -11,8 +11,8 @@ #include "overlay058/ov58_021D0D80.h" #include "overlay058/struct_ov58_021D2820.h" +#include "bg_window.h" #include "communication_system.h" -#include "unk_02018340.h" #include "unk_02030EE0.h" #include "unk_02032798.h" #include "unk_020366A0.h" diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index d8adfed043..2a64fd5e0c 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -18,6 +18,7 @@ #include "savedata/save_table.h" #include "bag.h" +#include "bg_window.h" #include "game_options.h" #include "game_overlay.h" #include "gx_layers.h" @@ -34,7 +35,6 @@ #include "unk_0200F174.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_02023FCC.h" diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 694b4467fe..1f4c85166e 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -15,6 +15,7 @@ #include "overlay119/ov119_021D191C.h" #include "overlay119/struct_ov119_021D0FD0.h" +#include "bg_window.h" #include "field_system.h" #include "game_options.h" #include "game_records.h" @@ -32,7 +33,6 @@ #include "unk_0200F174.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_02024220.h" #include "unk_0202F180.h" diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index 4ba07279bc..d630d1e073 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -2,15 +2,10 @@ #include #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0203CC84.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "gx_layers.h" @@ -27,7 +22,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" FS_EXTERN_OVERLAY(overlay77); diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index 58ec896024..2b4bac9c01 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -2,15 +2,10 @@ #include #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0203CC84.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "gx_layers.h" @@ -24,7 +19,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" FS_EXTERN_OVERLAY(overlay97); diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index c49ad01243..0b2b9aa88f 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -3,14 +3,9 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "gx_layers.h" @@ -23,7 +18,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" static const UnkStruct_02099F80 Unk_020F8AF8 = { GX_VRAM_BG_256_AB, diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index 6e939092f5..cb78110ab2 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -3,14 +3,9 @@ #include #include -#include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" -#include "overlay061/struct_ov61_0222C884.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay097/struct_ov97_0222DB78.h" - +#include "bg_window.h" #include "core_sys.h" #include "font.h" #include "gx_layers.h" @@ -23,7 +18,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02018340.h" void sub_0201777C(void); diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c index b4b1835a2b..db206366d3 100644 --- a/src/unk_0209ACF4.c +++ b/src/unk_0209ACF4.c @@ -6,11 +6,11 @@ #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0209747C_decl.h" #include "struct_defs/sentence.h" -#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "overlay005/ov5_021D0D80.h" +#include "bg_window.h" #include "colored_arrow.h" #include "core_sys.h" #include "heap.h" @@ -23,7 +23,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02014A84.h" -#include "unk_02018340.h" #include "unk_0202D05C.h" #include "unk_0203D1B8.h" #include "unk_020508D4.h" From 0293caca8a2b8e9b26790468b141c414f1b853e1 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sat, 19 Oct 2024 23:39:35 -0700 Subject: [PATCH 02/13] Identify UnkStruct_0201AE08 -> Bitmap and document fields --- include/bg_window.h | 18 ++-- include/overlay019/struct_ov19_021DBA9C.h | 2 +- src/bg_window.c | 100 +++++++++++----------- src/overlay019/ov19_021DB8E4.c | 6 +- src/unk_0200DA60.c | 16 ++-- 5 files changed, 71 insertions(+), 71 deletions(-) diff --git a/include/bg_window.h b/include/bg_window.h index f3a5d00434..ffb2f54bb7 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -24,11 +24,11 @@ enum BGLScreenSize { SCREEN_SIZE_1024x1024, }; -typedef struct { - const u8 *unk_00; - u16 unk_04; - u16 unk_06; -} UnkStruct_0201AE08; +typedef struct Bitmap { + const u8 *pixels; + u16 width; + u16 height; +} Bitmap; typedef struct { int unk_00; @@ -137,10 +137,10 @@ void *sub_02019FE4(BGL *param0, u8 param1); int sub_02019FF0(BGL *param0, u8 param1); u16 sub_02019FFC(BGL *param0, u8 param1); u8 sub_0201A008(BGL *param0, u8 param1); -void sub_0201A1E4(const UnkStruct_0201AE08 *param0, const UnkStruct_0201AE08 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); -void sub_0201A424(const UnkStruct_0201AE08 *param0, const UnkStruct_0201AE08 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); -void sub_0201A60C(const UnkStruct_0201AE08 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); -void sub_0201A6D0(const UnkStruct_0201AE08 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); +void sub_0201A1E4(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); +void sub_0201A424(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); +void sub_0201A60C(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); +void sub_0201A6D0(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); Window *sub_0201A778(u32 param0, u8 param1); void Window_Init(Window *param0); u8 BGL_WindowAdded(Window *param0); diff --git a/include/overlay019/struct_ov19_021DBA9C.h b/include/overlay019/struct_ov19_021DBA9C.h index ce0f0cdff3..57c4ad49dc 100644 --- a/include/overlay019/struct_ov19_021DBA9C.h +++ b/include/overlay019/struct_ov19_021DBA9C.h @@ -29,7 +29,7 @@ typedef struct { NNSG2dScreenData *unk_30; void *unk_34; NNSG2dScreenData *unk_38; - UnkStruct_0201AE08 unk_3C; + Bitmap unk_3C; UnkStruct_0200C440 *unk_44; CellActor *unk_48[18]; CellActor *unk_90; diff --git a/src/bg_window.c b/src/bg_window.c index 07937ff83d..63380800a5 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -1377,31 +1377,31 @@ u8 sub_0201A008(BGL *param0, u8 param1) return 0; } -void sub_0201A1E4(const UnkStruct_0201AE08 *param0, const UnkStruct_0201AE08 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) +void sub_0201A1E4(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) { int v0, v1, v2, v3, v4, v5, v6, v7, v8, v9; u8 *v10, *v11; - if (((param1->unk_04) - (param4)) < (param6)) { - v6 = (param1->unk_04) - (param4) + (param2); + if (((param1->width) - (param4)) < (param6)) { + v6 = (param1->width) - (param4) + (param2); } else { v6 = (param6) + (param2); } - if (((param1->unk_06) - (param5)) < (param7)) { - v7 = (param1->unk_06) - (param5) + (param3); + if (((param1->height) - (param5)) < (param7)) { + v7 = (param1->height) - (param5) + (param3); } else { v7 = (param7) + (param3); } - v8 = (((param0->unk_04) + ((param0->unk_04) & 7)) >> 3); - v9 = (((param1->unk_04) + ((param1->unk_04) & 7)) >> 3); + v8 = (((param0->width) + ((param0->width) & 7)) >> 3); + v9 = (((param1->width) + ((param1->width) & 7)) >> 3); if (param8 == 0xffff) { for (v2 = (param3), v3 = (param5); v2 < v7; v2++, v3++) { for (v0 = (param2), v1 = (param4); v0 < v6; v0++, v1++) { - v10 = (u8 *)((param0->unk_00) + ((v0 >> 1) & 0x3) + ((v0 << 2) & 0x3fe0) + (((v2 << 2) & 0x3fe0) * v8) + ((u32)((v2 << 2) & 0x1c))); - v11 = (u8 *)((param1->unk_00) + ((v1 >> 1) & 0x3) + ((v1 << 2) & 0x3fe0) + (((v3 << 2) & 0x3fe0) * v9) + ((u32)((v3 << 2) & 0x1c))); + v10 = (u8 *)((param0->pixels) + ((v0 >> 1) & 0x3) + ((v0 << 2) & 0x3fe0) + (((v2 << 2) & 0x3fe0) * v8) + ((u32)((v2 << 2) & 0x1c))); + v11 = (u8 *)((param1->pixels) + ((v1 >> 1) & 0x3) + ((v1 << 2) & 0x3fe0) + (((v3 << 2) & 0x3fe0) * v9) + ((u32)((v3 << 2) & 0x1c))); v4 = (*v10 >> ((v0 & 1) * 4)) & 0xf; v5 = (v1 & 1) * 4; @@ -1411,8 +1411,8 @@ void sub_0201A1E4(const UnkStruct_0201AE08 *param0, const UnkStruct_0201AE08 *pa } else { for (v2 = (param3), v3 = (param5); v2 < v7; v2++, v3++) { for (v0 = (param2), v1 = (param4); v0 < v6; v0++, v1++) { - v10 = (u8 *)((param0->unk_00) + ((v0 >> 1) & 0x3) + ((v0 << 2) & 0x3fe0) + (((v2 << 2) & 0x3fe0) * v8) + ((u32)((v2 << 2) & 0x1c))); - v11 = (u8 *)((param1->unk_00) + ((v1 >> 1) & 0x3) + ((v1 << 2) & 0x3fe0) + (((v3 << 2) & 0x3fe0) * v9) + ((u32)((v3 << 2) & 0x1c))); + v10 = (u8 *)((param0->pixels) + ((v0 >> 1) & 0x3) + ((v0 << 2) & 0x3fe0) + (((v2 << 2) & 0x3fe0) * v8) + ((u32)((v2 << 2) & 0x1c))); + v11 = (u8 *)((param1->pixels) + ((v1 >> 1) & 0x3) + ((v1 << 2) & 0x3fe0) + (((v3 << 2) & 0x3fe0) * v9) + ((u32)((v3 << 2) & 0x1c))); v4 = (*v10 >> ((v0 & 1) * 4)) & 0xf; @@ -1425,40 +1425,40 @@ void sub_0201A1E4(const UnkStruct_0201AE08 *param0, const UnkStruct_0201AE08 *pa } } -void sub_0201A424(const UnkStruct_0201AE08 *param0, const UnkStruct_0201AE08 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) +void sub_0201A424(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) { int v0, v1, v2, v3, v4, v5, v6, v7; u8 *v8; u8 *v9; - if (((param1->unk_04) - (param4)) < (param6)) { - v4 = (param1->unk_04) - (param4) + (param2); + if (((param1->width) - (param4)) < (param6)) { + v4 = (param1->width) - (param4) + (param2); } else { v4 = (param6) + (param2); } - if (((param1->unk_06) - (param5)) < (param7)) { - v5 = (param1->unk_06) - (param5) + (param3); + if (((param1->height) - (param5)) < (param7)) { + v5 = (param1->height) - (param5) + (param3); } else { v5 = (param7) + (param3); } - v6 = (((param0->unk_04) + ((param0->unk_04) & 7)) >> 3); - v7 = (((param1->unk_04) + ((param1->unk_04) & 7)) >> 3); + v6 = (((param0->width) + ((param0->width) & 7)) >> 3); + v7 = (((param1->width) + ((param1->width) & 7)) >> 3); if (param8 == 0xffff) { for (v2 = (param3), v3 = (param5); v2 < v5; v2++, v3++) { for (v0 = (param2), v1 = (param4); v0 < v4; v0++, v1++) { - v8 = (u8 *)((param0->unk_00) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v2 << 3) & 0x7fc0) * v6) + ((u32)((v2 << 3) & 0x38))); - v9 = (u8 *)((param1->unk_00) + (v1 & 0x7) + ((v1 << 3) & 0x7fc0) + (((v3 << 3) & 0x7fc0) * v7) + ((u32)((v3 << 3) & 0x38))); + v8 = (u8 *)((param0->pixels) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v2 << 3) & 0x7fc0) * v6) + ((u32)((v2 << 3) & 0x38))); + v9 = (u8 *)((param1->pixels) + (v1 & 0x7) + ((v1 << 3) & 0x7fc0) + (((v3 << 3) & 0x7fc0) * v7) + ((u32)((v3 << 3) & 0x38))); *v9 = *v8; } } } else { for (v2 = (param3), v3 = (param5); v2 < v5; v2++, v3++) { for (v0 = (param2), v1 = (param4); v0 < v4; v0++, v1++) { - v8 = (u8 *)((param0->unk_00) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v2 << 3) & 0x7fc0) * v6) + ((u32)((v2 << 3) & 0x38))); - v9 = (u8 *)((param1->unk_00) + (v1 & 0x7) + ((v1 << 3) & 0x7fc0) + (((v3 << 3) & 0x7fc0) * v7) + ((u32)((v3 << 3) & 0x38))); + v8 = (u8 *)((param0->pixels) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v2 << 3) & 0x7fc0) * v6) + ((u32)((v2 << 3) & 0x38))); + v9 = (u8 *)((param1->pixels) + (v1 & 0x7) + ((v1 << 3) & 0x7fc0) + (((v3 << 3) & 0x7fc0) * v7) + ((u32)((v3 << 3) & 0x38))); if (*v8 != (param8)) { *v9 = *v8; @@ -1468,28 +1468,28 @@ void sub_0201A424(const UnkStruct_0201AE08 *param0, const UnkStruct_0201AE08 *pa } } -void sub_0201A60C(const UnkStruct_0201AE08 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) +void sub_0201A60C(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) { int v0, v1, v2, v3, v4; u8 *v5; v2 = param1 + param3; - if (v2 > param0->unk_04) { - v2 = param0->unk_04; + if (v2 > param0->width) { + v2 = param0->width; } v3 = param2 + param4; - if (v3 > param0->unk_06) { - v3 = param0->unk_06; + if (v3 > param0->height) { + v3 = param0->height; } - v4 = (((param0->unk_04) + (param0->unk_04 & 7)) >> 3); + v4 = (((param0->width) + (param0->width & 7)) >> 3); for (v1 = param2; v1 < v3; v1++) { for (v0 = param1; v0 < v2; v0++) { - v5 = (u8 *)((param0->unk_00) + ((v0 >> 1) & 0x3) + ((v0 << 2) & 0x3fe0) + (((v1 << 2) & 0x3fe0) * v4) + ((u32)((v1 << 2) & 0x1c))); + v5 = (u8 *)((param0->pixels) + ((v0 >> 1) & 0x3) + ((v0 << 2) & 0x3fe0) + (((v1 << 2) & 0x3fe0) * v4) + ((u32)((v1 << 2) & 0x1c))); if (v0 & 1) { *v5 &= 0xf; @@ -1502,28 +1502,28 @@ void sub_0201A60C(const UnkStruct_0201AE08 *param0, u16 param1, u16 param2, u16 } } -void sub_0201A6D0(const UnkStruct_0201AE08 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) +void sub_0201A6D0(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) { int v0, v1, v2, v3, v4; u8 *v5; v2 = param1 + param3; - if (v2 > param0->unk_04) { - v2 = param0->unk_04; + if (v2 > param0->width) { + v2 = param0->width; } v3 = param2 + param4; - if (v3 > param0->unk_06) { - v3 = param0->unk_06; + if (v3 > param0->height) { + v3 = param0->height; } - v4 = (param0->unk_04 + (param0->unk_04 & 7)) >> 3; + v4 = (param0->width + (param0->width & 7)) >> 3; for (v1 = param2; v1 < v3; v1++) { for (v0 = param1; v0 < v2; v0++) { - v5 = (u8 *)((param0->unk_00) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v1 << 3) & 0x7fc0) * v4) + ((u32)((v1 << 3) & 0x38))); + v5 = (u8 *)((param0->pixels) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v1 << 3) & 0x7fc0) * v4) + ((u32)((v1 << 3) & 0x38))); *v5 = param5; } } @@ -1917,15 +1917,15 @@ void sub_0201ADDC(Window *param0, void *param1, u16 param2, u16 param3, u16 para void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10) { - UnkStruct_0201AE08 v0; - UnkStruct_0201AE08 v1; + Bitmap v0; + Bitmap v1; - v0.unk_00 = (u8 *)param1; - v0.unk_04 = param4; - v0.unk_06 = param5; - v1.unk_00 = (u8 *)param0->unk_0C; - v1.unk_04 = (u16)(param0->unk_07 * 0x8); - v1.unk_06 = (u16)(param0->unk_08 * 0x8); + v0.pixels = (u8 *)param1; + v0.width = param4; + v0.height = param5; + v1.pixels = (u8 *)param0->unk_0C; + v1.width = (u16)(param0->unk_07 * 0x8); + v1.height = (u16)(param0->unk_08 * 0x8); if (param0->unk_00->unk_08[param0->unk_04].unk_16 == GX_BG_COLORMODE_16) { sub_0201A1E4(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); @@ -1936,16 +1936,16 @@ void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 para void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5) { - UnkStruct_0201AE08 v0; + Bitmap v0; - v0.unk_00 = (u8 *)param0->unk_0C; - v0.unk_04 = (u16)(param0->unk_07 * 0x8); - v0.unk_06 = (u16)(param0->unk_08 * 0x8); + v0.pixels = (u8 *)param0->unk_0C; + v0.width = (u16)(param0->unk_07 * 0x8); + v0.height = (u16)(param0->unk_08 * 0x8); if (param0->unk_00->unk_08[param0->unk_04].unk_16 == GX_BG_COLORMODE_16) { - sub_0201A60C((const UnkStruct_0201AE08 *)&v0, param2, param3, param4, param5, param1); + sub_0201A60C((const Bitmap *)&v0, param2, param3, param4, param5, param1); } else { - sub_0201A6D0((const UnkStruct_0201AE08 *)&v0, param2, param3, param4, param5, param1); + sub_0201A6D0((const Bitmap *)&v0, param2, param3, param4, param5, param1); } } diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index b537394be6..2ba919e805 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -116,9 +116,9 @@ BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *par param0->unk_44 = sub_0200C440(2, 13, 4, 10); param0->unk_4BFC = Strbuf_Init(500, 10); param0->unk_10 = NULL; - param0->unk_3C.unk_00 = param0->unk_18->pRawData; - param0->unk_3C.unk_04 = 32; - param0->unk_3C.unk_06 = 32; + param0->unk_3C.pixels = param0->unk_18->pRawData; + param0->unk_3C.width = 32; + param0->unk_3C.height = 32; param0->unk_4BF8 = MessageLoader_Init(1, 26, 391, 10); for (v0 = 0; v0 < 18; v0++) { diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c index 0b57fdf761..d074973710 100644 --- a/src/unk_0200DA60.c +++ b/src/unk_0200DA60.c @@ -223,16 +223,16 @@ void sub_0200E084(Window *param0, u8 param1) static void sub_0200E0EC(void *param0, u16 param1, u16 param2, u16 param3, u16 param4, void *param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10, u16 param11) { - UnkStruct_0201AE08 v0; - UnkStruct_0201AE08 v1; + Bitmap v0; + Bitmap v1; - v0.unk_00 = (u8 *)param0; - v0.unk_04 = param3; - v0.unk_06 = param4; + v0.pixels = (u8 *)param0; + v0.width = param3; + v0.height = param4; - v1.unk_00 = (u8 *)param5; - v1.unk_04 = param6; - v1.unk_06 = param7; + v1.pixels = (u8 *)param5; + v1.width = param6; + v1.height = param7; sub_0201A1E4(&v0, &v1, param1, param2, param8, param9, param10, param11, 0); } From b464aca6b84fece0e9f7c025441e0f2804a61259 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 20 Oct 2024 00:26:28 -0700 Subject: [PATCH 03/13] Identify UnkStruct_ov97_0222DB78 -> BgTemplate and document fields --- include/bg_window.h | 32 ++++----- src/battle/ov16_0223B140.c | 6 +- src/battle/ov16_0226871C.c | 2 +- src/bg_window.c | 88 ++++++++++++------------- src/choose_starter/choose_starter_app.c | 6 +- src/error_message_reset.c | 2 +- src/library_tv/library_tv.c | 8 +-- src/overlay005/encounter_effect.c | 8 +-- src/overlay005/fieldmap.c | 6 +- src/overlay006/ov6_0223E140.c | 2 +- src/overlay010/ov10_0221F800.c | 14 ++-- src/overlay013/ov13_0221FC20.c | 8 +-- src/overlay013/ov13_022264F4.c | 6 +- src/overlay017/ov17_0223B140.c | 2 +- src/overlay017/ov17_0223CB1C.c | 4 +- src/overlay017/ov17_0223DAD0.c | 2 +- src/overlay017/ov17_0223F7E4.c | 2 +- src/overlay017/ov17_022492DC.c | 2 +- src/overlay017/ov17_0224F4D4.c | 4 +- src/overlay019/ov19_021D61B0.c | 20 +++--- src/overlay020/ov20_021D2098.c | 10 +-- src/overlay021/ov21_021D1FA4.c | 12 ++-- src/overlay021/ov21_021E8D48.c | 6 +- src/overlay022/ov22_02255094.c | 12 ++-- src/overlay023/ov23_0223E140.c | 8 +-- src/overlay023/ov23_02248F1C.c | 6 +- src/overlay024/ov24_02253CE0.c | 2 +- src/overlay025/ov25_02254560.c | 4 +- src/overlay026/ov26_02256404.c | 2 +- src/overlay027/ov27_0225680C.c | 2 +- src/overlay028/ov28_0225697C.c | 2 +- src/overlay029/ov29_022566C8.c | 4 +- src/overlay030/ov30_022563EC.c | 2 +- src/overlay031/ov31_02256554.c | 2 +- src/overlay032/ov32_02256470.c | 2 +- src/overlay033/ov33_02256474.c | 2 +- src/overlay034/ov34_02256540.c | 2 +- src/overlay035/ov35_02256410.c | 2 +- src/overlay036/ov36_02256404.c | 2 +- src/overlay037/ov37_022563D4.c | 2 +- src/overlay038/ov38_0225632C.c | 2 +- src/overlay039/ov39_022563DC.c | 2 +- src/overlay040/ov40_0225645C.c | 2 +- src/overlay041/ov41_022567B0.c | 4 +- src/overlay042/ov42_022563D4.c | 2 +- src/overlay043/ov43_02256544.c | 2 +- src/overlay044/ov44_022565BC.c | 2 +- src/overlay045/ov45_022566EC.c | 2 +- src/overlay046/ov46_02256BCC.c | 2 +- src/overlay047/ov47_02256634.c | 2 +- src/overlay048/ov48_0225650C.c | 2 +- src/overlay049/ov49_022563D4.c | 2 +- src/overlay050/ov50_02256510.c | 4 +- src/overlay051/ov51_0225632C.c | 2 +- src/overlay052/ov52_02256694.c | 2 +- src/overlay053/ov53_02256420.c | 2 +- src/overlay054/ov54_0225642C.c | 2 +- src/overlay055/ov55_0225632C.c | 2 +- src/overlay056/ov56_022561C0.c | 8 +-- src/overlay058/ov58_021D0D80.c | 10 +-- src/overlay059/ov59_021D0D80.c | 10 +-- src/overlay061/ov61_0222BF44.c | 4 +- src/overlay062/ov62_0222F2C0.c | 4 +- src/overlay063/ov63_0222D1C0.c | 16 ++--- src/overlay064/ov64_0222DCE0.c | 32 ++++----- src/overlay065/ov65_0222DCE0.c | 16 ++--- src/overlay065/ov65_0223648C.c | 6 +- src/overlay067/ov67_0225C700.c | 2 +- src/overlay068/ov68_0225C700.c | 2 +- src/overlay069/ov69_0225C700.c | 2 +- src/overlay070/ov70_0225D9A4.c | 2 +- src/overlay071/ov71_0223B140.c | 10 +-- src/overlay072/ov72_0223D7A0.c | 10 +-- src/overlay073/ov73_021D0D80.c | 36 +++++----- src/overlay073/ov73_021D3250.c | 8 +-- src/overlay074/ov74_021D0D80.c | 2 +- src/overlay075/ov75_021D0D80.c | 2 +- src/overlay076/ov76_0223D338.c | 4 +- src/overlay077/ov77_021D0D80.c | 16 ++--- src/overlay077/ov77_021D25B0.c | 36 +++++----- src/overlay079/ov79_021D0D80.c | 2 +- src/overlay079/ov79_021D2268.c | 2 +- src/overlay080/ov80_021D0D80.c | 2 +- src/overlay081/ov81_021D0D80.c | 8 +-- src/overlay083/ov83_0223C958.c | 2 +- src/overlay084/ov84_0223B5A0.c | 14 ++-- src/overlay085/ov85_02241440.c | 6 +- src/overlay086/ov86_0223B140.c | 6 +- src/overlay087/ov87_021D106C.c | 4 +- src/overlay088/ov88_0223B140.c | 14 ++-- src/overlay090/ov90_021D0D80.c | 2 +- src/overlay091/ov91_021D0D80.c | 6 +- src/overlay092/ov92_021D0D80.c | 4 +- src/overlay094/ov94_0223C610.c | 10 +-- src/overlay094/ov94_0223D0C4.c | 10 +-- src/overlay094/ov94_0223DC04.c | 8 +-- src/overlay094/ov94_0223E46C.c | 8 +-- src/overlay094/ov94_0223FB48.c | 10 +-- src/overlay094/ov94_022414B8.c | 10 +-- src/overlay094/ov94_02242AD0.c | 10 +-- src/overlay094/ov94_02244950.c | 8 +-- src/overlay095/ov95_02247B6C.c | 4 +- src/overlay095/ov95_02248590.c | 4 +- src/overlay095/ov95_02249740.c | 2 +- src/overlay095/ov95_02249F90.c | 6 +- src/overlay095/ov95_0224A390.c | 2 +- src/overlay095/ov95_0224ABC0.c | 4 +- src/overlay095/ov95_0224B3D8.c | 4 +- src/overlay096/ov96_0223BCE0.c | 8 +-- src/overlay097/ov97_0222D30C.c | 6 +- src/overlay097/ov97_02232054.c | 8 +-- src/overlay097/ov97_02233B18.c | 8 +-- src/overlay097/ov97_02237694.c | 16 ++--- src/overlay098/ov98_022471C8.c | 40 ++++------- src/overlay099/ov99_021D0D80.c | 8 +-- src/overlay100/ov100_021D0D80.c | 4 +- src/overlay101/ov101_021D0D80.c | 8 +-- src/overlay102/ov102_021D0D80.c | 51 +++++++------- src/overlay104/ov104_0223C2D4.c | 16 ++--- src/overlay105/ov105_02241AE0.c | 8 +-- src/overlay106/ov106_02241AE0.c | 8 +-- src/overlay107/ov107_02241AE0.c | 10 +-- src/overlay107/ov107_02245EB0.c | 10 +-- src/overlay108/ov108_02241AE0.c | 6 +- src/overlay109/ov109_021D0D80.c | 10 +-- src/overlay109/ov109_021D3D50.c | 10 +-- src/overlay110/ov110_021D0D80.c | 6 +- src/overlay111/ov111_021D0D80.c | 12 ++-- src/overlay112/ov112_0225C700.c | 2 +- src/overlay113/ov113_0225C700.c | 4 +- src/overlay114/ov114_0225C700.c | 2 +- src/overlay115/ov115_02260CEC.c | 12 ++-- src/overlay116/ov116_022604C4.c | 4 +- src/overlay117/ov117_02260668.c | 4 +- src/overlay119/ov119_021D0D80.c | 4 +- src/pokemon_summary_app.c | 10 +-- src/unk_02039814.c | 2 +- src/unk_02039A64.c | 2 +- src/unk_020528D0.c | 2 +- src/unk_02052C6C.c | 2 +- src/unk_0207AE68.c | 4 +- src/unk_0207E0B8.c | 12 ++-- src/unk_0208694C.c | 8 +-- src/unk_020890F4.c | 4 +- src/unk_02099DFC.c | 2 +- src/unk_0209A2C4.c | 2 +- src/unk_0209A74C.c | 2 +- src/unk_0209AA74.c | 2 +- 148 files changed, 538 insertions(+), 561 deletions(-) diff --git a/include/bg_window.h b/include/bg_window.h index ffb2f54bb7..295d4bc545 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -30,21 +30,21 @@ typedef struct Bitmap { u16 height; } Bitmap; -typedef struct { - int unk_00; - int unk_04; - u32 unk_08; - u32 unk_0C; - u8 unk_10; - u8 unk_11; - u8 unk_12; - u8 unk_13; - u8 unk_14; - u8 unk_15; - u8 unk_16; - u8 unk_17; - BOOL unk_18; -} UnkStruct_ov97_0222DB78; +typedef struct BgTemplate { + u32 x; + u32 y; + u32 bufferSize; + u32 baseTile; + u8 screenSize; + u8 colorMode; + u8 screenBase; + u8 charBase; + u8 bgExtPltt; + u8 priority; + u8 areaOver; + u8 dummy; + BOOL mosaic; +} BgTemplate; typedef struct { void *unk_00; @@ -104,7 +104,7 @@ BGL *sub_02018340(u32 param0); u32 sub_02018364(BGL *param0); void sub_02018368(const UnkStruct_ov84_0223BA5C *param0); void sub_020183A0(const UnkStruct_ov84_0223BA5C *param0, u8 param1); -void sub_020183C4(BGL *param0, u8 param1, const UnkStruct_ov97_0222DB78 *param2, u8 param3); +void sub_020183C4(BGL *param0, u8 param1, const BgTemplate *param2, u8 param3); void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3); void sub_02019044(BGL *param0, u8 param1); void BGL_SetPriority(u8 param0, u8 param1); diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 3640f8d940..8cacdc1ec7 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -382,7 +382,7 @@ void ov16_0223B578(BattleSystem *param0) } { - UnkStruct_ov97_0222DB78 v0[] = { + BgTemplate v0[] = { { 0, 0, @@ -863,7 +863,7 @@ static void ov16_0223C004(BattleSystem *param0, BGL *param1) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, @@ -1698,7 +1698,7 @@ static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 22ad543a94..77409bac11 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -415,7 +415,7 @@ __attribute__((aligned(4))) static const u16 Unk_ov16_02270304[][2] = { { 0x3C, 0x38 } }; -static const UnkStruct_ov97_0222DB78 Unk_ov16_02270540[] = { +static const BgTemplate Unk_ov16_02270540[] = { { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, diff --git a/src/bg_window.c b/src/bg_window.c index 63380800a5..454538b5b3 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -85,22 +85,22 @@ void sub_020183A0(const UnkStruct_ov84_0223BA5C *param0, u8 param1) } } -void sub_020183C4(BGL *param0, u8 param1, const UnkStruct_ov97_0222DB78 *param2, u8 param3) +void sub_020183C4(BGL *param0, u8 param1, const BgTemplate *param2, u8 param3) { - u8 v0 = sub_02018F80(param2->unk_10, param3); + u8 v0 = sub_02018F80(param2->screenSize, param3); switch (param1) { case 0: GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); - G2_SetBG0Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->unk_11, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13, (GXBGExtPltt)param2->unk_14); - G2_SetBG0Priority((int)param2->unk_15); - G2_BG0Mosaic((BOOL)param2->unk_18); + G2_SetBG0Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase, (GXBGExtPltt)param2->bgExtPltt); + G2_SetBG0Priority((int)param2->priority); + G2_BG0Mosaic((BOOL)param2->mosaic); break; case 1: GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); - G2_SetBG1Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->unk_11, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13, (GXBGExtPltt)param2->unk_14); - G2_SetBG1Priority((int)param2->unk_15); - G2_BG1Mosaic((BOOL)param2->unk_18); + G2_SetBG1Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase, (GXBGExtPltt)param2->bgExtPltt); + G2_SetBG1Priority((int)param2->priority); + G2_BG1Mosaic((BOOL)param2->mosaic); break; case 2: GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); @@ -108,18 +108,18 @@ void sub_020183C4(BGL *param0, u8 param1, const UnkStruct_ov97_0222DB78 *param2, switch (param3) { default: case 0: - G2_SetBG2ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->unk_11, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2_SetBG2ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; case 1: - G2_SetBG2ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->unk_16, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2_SetBG2ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; case 2: - G2_SetBG2Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->unk_16, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2_SetBG2Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; } - G2_SetBG2Priority((int)param2->unk_15); - G2_BG2Mosaic((BOOL)param2->unk_18); + G2_SetBG2Priority((int)param2->priority); + G2_BG2Mosaic((BOOL)param2->mosaic); break; case 3: GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); @@ -127,30 +127,30 @@ void sub_020183C4(BGL *param0, u8 param1, const UnkStruct_ov97_0222DB78 *param2, switch (param3) { default: case 0: - G2_SetBG3ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->unk_11, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2_SetBG3ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; case 1: - G2_SetBG3ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->unk_16, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2_SetBG3ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; case 2: - G2_SetBG3Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->unk_16, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2_SetBG3Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; } - G2_SetBG3Priority((int)param2->unk_15); - G2_BG3Mosaic((BOOL)param2->unk_18); + G2_SetBG3Priority((int)param2->priority); + G2_BG3Mosaic((BOOL)param2->mosaic); break; case 4: GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); - G2S_SetBG0Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->unk_11, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13, (GXBGExtPltt)param2->unk_14); - G2S_SetBG0Priority((int)param2->unk_15); - G2S_BG0Mosaic((BOOL)param2->unk_18); + G2S_SetBG0Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase, (GXBGExtPltt)param2->bgExtPltt); + G2S_SetBG0Priority((int)param2->priority); + G2S_BG0Mosaic((BOOL)param2->mosaic); break; case 5: GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1); - G2S_SetBG1Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->unk_11, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13, (GXBGExtPltt)param2->unk_14); - G2S_SetBG1Priority((int)param2->unk_15); - G2S_BG1Mosaic((BOOL)param2->unk_18); + G2S_SetBG1Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase, (GXBGExtPltt)param2->bgExtPltt); + G2S_SetBG1Priority((int)param2->priority); + G2S_BG1Mosaic((BOOL)param2->mosaic); break; case 6: GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1); @@ -158,18 +158,18 @@ void sub_020183C4(BGL *param0, u8 param1, const UnkStruct_ov97_0222DB78 *param2, switch (param3) { default: case 0: - G2S_SetBG2ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->unk_11, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2S_SetBG2ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; case 1: - G2S_SetBG2ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->unk_16, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2S_SetBG2ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; case 2: - G2S_SetBG2Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->unk_16, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2S_SetBG2Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; } - G2S_SetBG2Priority((int)param2->unk_15); - G2S_BG2Mosaic((BOOL)param2->unk_18); + G2S_SetBG2Priority((int)param2->priority); + G2S_BG2Mosaic((BOOL)param2->mosaic); break; case 7: GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1); @@ -177,18 +177,18 @@ void sub_020183C4(BGL *param0, u8 param1, const UnkStruct_ov97_0222DB78 *param2, switch (param3) { default: case 0: - G2S_SetBG3ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->unk_11, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2S_SetBG3ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; case 1: - G2S_SetBG3ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->unk_16, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2S_SetBG3ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; case 2: - G2S_SetBG3Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->unk_16, (GXBGScrBase)param2->unk_12, (GXBGCharBase)param2->unk_13); + G2S_SetBG3Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); break; } - G2S_SetBG3Priority((int)param2->unk_15); - G2S_BG3Mosaic((BOOL)param2->unk_18); + G2S_SetBG3Priority((int)param2->priority); + G2S_BG3Mosaic((BOOL)param2->mosaic); break; } @@ -198,31 +198,31 @@ void sub_020183C4(BGL *param0, u8 param1, const UnkStruct_ov97_0222DB78 *param2, param0->unk_08[param1].unk_24 = 0; param0->unk_08[param1].unk_28 = 0; - if (param2->unk_08) { - param0->unk_08[param1].unk_00 = Heap_AllocFromHeap(param0->unk_00, param2->unk_08); + if (param2->bufferSize) { + param0->unk_08[param1].unk_00 = Heap_AllocFromHeap(param0->unk_00, param2->bufferSize); - MI_CpuClear16(param0->unk_08[param1].unk_00, param2->unk_08); + MI_CpuClear16(param0->unk_08[param1].unk_00, param2->bufferSize); - param0->unk_08[param1].unk_04 = param2->unk_08; - param0->unk_08[param1].unk_08 = param2->unk_0C; + param0->unk_08[param1].unk_04 = param2->bufferSize; + param0->unk_08[param1].unk_08 = param2->baseTile; } else { param0->unk_08[param1].unk_00 = NULL; param0->unk_08[param1].unk_04 = 0; param0->unk_08[param1].unk_08 = 0; } - param0->unk_08[param1].unk_15 = param2->unk_10; + param0->unk_08[param1].unk_15 = param2->screenSize; param0->unk_08[param1].unk_14 = param3; - param0->unk_08[param1].unk_16 = param2->unk_11; + param0->unk_08[param1].unk_16 = param2->colorMode; - if ((param3 == 0) && (param2->unk_11 == GX_BG_COLORMODE_16)) { + if ((param3 == 0) && (param2->colorMode == GX_BG_COLORMODE_16)) { param0->unk_08[param1].unk_17 = 0x20; } else { param0->unk_08[param1].unk_17 = 0x40; } - sub_02019184(param0, param1, 0, param2->unk_00); - sub_02019184(param0, param1, 3, param2->unk_04); + sub_02019184(param0, param1, 0, param2->x); + sub_02019184(param0, param1, 3, param2->y); } void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index 33d592ecd3..25ec6c59ad 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -589,7 +589,7 @@ static void SetupBGL(BGL *bgl, enum HeapId heapID) G2_SetBG0Priority(1); { - UnkStruct_ov97_0222DB78 header = { + BgTemplate header = { 0, 0, 0x800, @@ -611,7 +611,7 @@ static void SetupBGL(BGL *bgl, enum HeapId heapID) } { - UnkStruct_ov97_0222DB78 header = { + BgTemplate header = { 0, 0, 0x800, @@ -633,7 +633,7 @@ static void SetupBGL(BGL *bgl, enum HeapId heapID) } { - UnkStruct_ov97_0222DB78 header = { + BgTemplate header = { 0, 0, 0x800, diff --git a/src/error_message_reset.c b/src/error_message_reset.c index 7454aea66e..d60edc1ee5 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -42,7 +42,7 @@ static const UnkStruct_ov84_0223BA5C sErrorMessageBgModeSet = { GX_BG0_AS_2D }; -static const UnkStruct_ov97_0222DB78 sErrorMessageBgTemplate = { +static const BgTemplate sErrorMessageBgTemplate = { 0x0, 0x0, 0x800, diff --git a/src/library_tv/library_tv.c b/src/library_tv/library_tv.c index 666ff5b934..eaaf6cbc0c 100644 --- a/src/library_tv/library_tv.c +++ b/src/library_tv/library_tv.c @@ -192,13 +192,13 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv) sub_02018368(&bgData); int frame, charSetID, screenID; - UnkStruct_ov97_0222DB78 bgHeader0 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0000, GX_BG_CHARBASE_0x18000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; + BgTemplate bgHeader0 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0000, GX_BG_CHARBASE_0x18000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; frame = 2; sub_020183C4(ltv->bgl, frame, &bgHeader0, 0); sub_02019690(frame, 32, 0, ltv->heapID); sub_02019EBC(ltv->bgl, frame); - UnkStruct_ov97_0222DB78 bgHeader1 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0800, GX_BG_CHARBASE_0x14000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; + BgTemplate bgHeader1 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0800, GX_BG_CHARBASE_0x14000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; frame = 0; charSetID = 1; screenID = 4; @@ -206,7 +206,7 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv) sub_02006E3C(NARC_INDEX_DEMO__INTRO__INTRO_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); sub_02006E60(NARC_INDEX_DEMO__INTRO__INTRO_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); - UnkStruct_ov97_0222DB78 bgHeader2 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x1000, GX_BG_CHARBASE_0x10000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; + BgTemplate bgHeader2 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x1000, GX_BG_CHARBASE_0x10000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; frame = 1; charSetID = 2; screenID = 5; @@ -214,7 +214,7 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv) sub_02006E3C(NARC_INDEX_DEMO__INTRO__INTRO_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); sub_02006E60(NARC_INDEX_DEMO__INTRO__INTRO_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); - UnkStruct_ov97_0222DB78 bgHeader3 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_256, GX_BG_SCRBASE_0x1800, GX_BG_CHARBASE_0x20000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; + BgTemplate bgHeader3 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_256, GX_BG_SCRBASE_0x1800, GX_BG_CHARBASE_0x20000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; frame = 3; charSetID = 2; screenID = 4; diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c index 2ab3e89769..38fd70088b 100644 --- a/src/overlay005/encounter_effect.c +++ b/src/overlay005/encounter_effect.c @@ -656,7 +656,7 @@ static void EncounterEffect_UnusedTask(SysTask *dummy1, void *dummy2) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -674,7 +674,7 @@ static void EncounterEffect_UnusedTask(SysTask *dummy1, void *dummy2) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -692,7 +692,7 @@ static void EncounterEffect_UnusedTask(SysTask *dummy1, void *dummy2) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -1601,7 +1601,7 @@ static void ov5_021DF30C(FieldSystem *fieldSystem) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index 0ab47f0107..f5f81bf6a1 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -584,7 +584,7 @@ static void ov5_021D1444(BGL *bgl) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -606,7 +606,7 @@ static void ov5_021D1444(BGL *bgl) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -627,7 +627,7 @@ static void ov5_021D1444(BGL *bgl) sub_02019EBC(bgl, 2); } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index 33da74e90c..60e40f9b4b 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -382,7 +382,7 @@ static void ov6_0223E1D0(BGL *param0) GX_PLANEMASK_BG0, 1); { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index d338a3e9cb..9788cd8ae3 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -1291,7 +1291,7 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x1000, @@ -1313,7 +1313,7 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x1000, @@ -1335,7 +1335,7 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -1361,7 +1361,7 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p } if (param1 == GX_BG0_AS_2D) { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -1846,7 +1846,7 @@ static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -1867,7 +1867,7 @@ static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -1888,7 +1888,7 @@ static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index 84da96479d..c86d574a50 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -1025,7 +1025,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -1045,7 +1045,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -1065,7 +1065,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -1086,7 +1086,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 0be08d7285..3c2fffc08b 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -646,7 +646,7 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x2000, @@ -666,7 +666,7 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -687,7 +687,7 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index eea56ff6fc..e68d633ea4 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -451,7 +451,7 @@ static void ov17_0223B728(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index c3f2639d09..19b3cf87de 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -444,7 +444,7 @@ static void ov17_0223D1B8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, @@ -510,7 +510,7 @@ static void ov17_0223D1B8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 7bbb7b5a74..84764ea192 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -604,7 +604,7 @@ static void ov17_0223E250(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index 6aefd817d5..b4a1b7b6ca 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -351,7 +351,7 @@ __attribute__((aligned(4))) const u16 Unk_ov17_022534B8[] = { 0x0 }; -static const UnkStruct_ov97_0222DB78 Unk_ov17_02253448[] = { +static const BgTemplate Unk_ov17_02253448[] = { { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index d1023ce23d..2ad0868d7a 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -151,7 +151,7 @@ static void ov17_0224981C(UnkStruct_ov17_022492DC *param0, int param1, int param static void ov17_022493DC(UnkStruct_ov17_022492DC *param0); static void ov17_022495F8(UnkStruct_ov17_022492DC *param0); -static const UnkStruct_ov97_0222DB78 Unk_ov17_022545C0[] = { +static const BgTemplate Unk_ov17_022545C0[] = { { 0x0, 0x0, diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index bdda1775ed..65f0651a60 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -445,7 +445,7 @@ static void ov17_0224FB34(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, @@ -511,7 +511,7 @@ static void ov17_0224FB34(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index 3ae60f3b13..57d96fc99d 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -1609,7 +1609,7 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ GX_BG0_AS_3D, }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0x800, @@ -1625,7 +1625,7 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ 0 }; - static const UnkStruct_ov97_0222DB78 v3 = { + static const BgTemplate v3 = { 0, 0, 0x800, @@ -1641,7 +1641,7 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ 0 }; - static const UnkStruct_ov97_0222DB78 v4 = { + static const BgTemplate v4 = { 0, 0, 0x800, @@ -1657,7 +1657,7 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ 0 }; - static const UnkStruct_ov97_0222DB78 v5 = { + static const BgTemplate v5 = { 0, 0, 0x1000, @@ -1673,7 +1673,7 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ 0 }; - static const UnkStruct_ov97_0222DB78 v6 = { + static const BgTemplate v6 = { 0, 0, 0x800, @@ -1689,7 +1689,7 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ 0 }; - static const UnkStruct_ov97_0222DB78 v7 = { + static const BgTemplate v7 = { 0, 0, 0x0, @@ -1705,7 +1705,7 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ 0 }; - static const UnkStruct_ov97_0222DB78 v8 = { + static const BgTemplate v8 = { 0, 0, 0x0, @@ -1721,7 +1721,7 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ 0 }; - static const UnkStruct_ov97_0222DB78 v9 = { + static const BgTemplate v9 = { 0, 0, 0x0, @@ -1737,7 +1737,7 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ 0 }; - static const UnkStruct_ov97_0222DB78 v10 = { + static const BgTemplate v10 = { 0, 0, 0x0, @@ -1753,7 +1753,7 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ 0 }; - static const UnkStruct_ov97_0222DB78 v11 = { + static const BgTemplate v11 = { 0, 0, 0x0, diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c index 92397993e4..6841f48700 100644 --- a/src/overlay020/ov20_021D2098.c +++ b/src/overlay020/ov20_021D2098.c @@ -392,7 +392,7 @@ static void ov20_021D24EC(UnkStruct_ov20_021D2238 *param0) GX_BGMODE_0, GX_BG0_AS_2D, }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0x800, @@ -407,7 +407,7 @@ static void ov20_021D24EC(UnkStruct_ov20_021D2238 *param0) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v3 = { + static const BgTemplate v3 = { 0, 0, 0x1000, @@ -422,7 +422,7 @@ static void ov20_021D24EC(UnkStruct_ov20_021D2238 *param0) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v4 = { + static const BgTemplate v4 = { 0, 0, 0x800, @@ -437,7 +437,7 @@ static void ov20_021D24EC(UnkStruct_ov20_021D2238 *param0) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v5 = { + static const BgTemplate v5 = { 0, 0, 0x800, @@ -452,7 +452,7 @@ static void ov20_021D24EC(UnkStruct_ov20_021D2238 *param0) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v6 = { + static const BgTemplate v6 = { 0, 0, 0x800, diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c index 1a778843e5..2e44b4c37e 100644 --- a/src/overlay021/ov21_021D1FA4.c +++ b/src/overlay021/ov21_021D1FA4.c @@ -591,7 +591,7 @@ void *ov21_021D2808(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, NN static void ov21_021D2830(BGL *param0, int param1) { { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -613,7 +613,7 @@ static void ov21_021D2830(BGL *param0, int param1) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -638,7 +638,7 @@ static void ov21_021D2830(BGL *param0, int param1) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -660,7 +660,7 @@ static void ov21_021D2830(BGL *param0, int param1) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -682,7 +682,7 @@ static void ov21_021D2830(BGL *param0, int param1) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -704,7 +704,7 @@ static void ov21_021D2830(BGL *param0, int param1) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x400, diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 86b71d2ba2..6cb1933633 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -277,7 +277,7 @@ static void ov21_021E900C(UnkStruct_ov21_021E8D48 *param0) static void ov21_021E90B0(BGL *param0, int param1) { { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -300,7 +300,7 @@ static void ov21_021E90B0(BGL *param0, int param1) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -327,7 +327,7 @@ static void ov21_021E90B0(BGL *param0, int param1) sub_02019044(param0, 0); { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c index 2f596195e3..738a653290 100644 --- a/src/overlay022/ov22_02255094.c +++ b/src/overlay022/ov22_02255094.c @@ -316,7 +316,7 @@ void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BGL *param1, int param2) param0->unk_40 = param1; { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -554,7 +554,7 @@ static void ov22_02255800(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_022558 static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0) { { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -576,7 +576,7 @@ static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -598,7 +598,7 @@ static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, -(16 + 129), 0x800, @@ -620,7 +620,7 @@ static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -642,7 +642,7 @@ static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index ba40f4a130..b1147a1e43 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -1161,7 +1161,7 @@ static void ov23_0223EC34(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x1000, @@ -1183,7 +1183,7 @@ static void ov23_0223EC34(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x1000, @@ -1204,7 +1204,7 @@ static void ov23_0223EC34(BGL *param0) sub_02019EBC(param0, 1); } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x1000, @@ -1225,7 +1225,7 @@ static void ov23_0223EC34(BGL *param0) sub_02019EBC(param0, 2); } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c index f1bf93e21c..e0f86968e0 100644 --- a/src/overlay023/ov23_02248F1C.c +++ b/src/overlay023/ov23_02248F1C.c @@ -350,7 +350,7 @@ static void ov23_0224944C(BGL *param0, Window *param1) ov23_02249438(param0); { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -370,7 +370,7 @@ static void ov23_0224944C(BGL *param0, Window *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -390,7 +390,7 @@ static void ov23_0224944C(BGL *param0, Window *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, diff --git a/src/overlay024/ov24_02253CE0.c b/src/overlay024/ov24_02253CE0.c index e76a7d0a51..65adb48488 100644 --- a/src/overlay024/ov24_02253CE0.c +++ b/src/overlay024/ov24_02253CE0.c @@ -12,7 +12,7 @@ void ov24_02253CE0(BGL *param0) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index 6464579fba..05fdb7d17e 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -276,7 +276,7 @@ static void ov25_0225480C(UnkStruct_ov25_02255224 *param0) static void ov25_02254820(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x824, @@ -291,7 +291,7 @@ static void ov25_02254820(SysTask *param0, void *param1) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v1 = { + static const BgTemplate v1 = { 0, 0, 0x800, diff --git a/src/overlay026/ov26_02256404.c b/src/overlay026/ov26_02256404.c index f85643decc..90c2da2cc4 100644 --- a/src/overlay026/ov26_02256404.c +++ b/src/overlay026/ov26_02256404.c @@ -115,7 +115,7 @@ static void ov26_022564E4(UnkStruct_ov25_02255224 *param0) static void ov26_022564F8(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay027/ov27_0225680C.c b/src/overlay027/ov27_0225680C.c index 16c4cc9610..044bfebb9c 100644 --- a/src/overlay027/ov27_0225680C.c +++ b/src/overlay027/ov27_0225680C.c @@ -172,7 +172,7 @@ static void ov27_02256A04(UnkStruct_ov25_02255224 *param0) static void ov27_02256A18(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay028/ov28_0225697C.c b/src/overlay028/ov28_0225697C.c index 249fe04d41..6a8a8e9d44 100644 --- a/src/overlay028/ov28_0225697C.c +++ b/src/overlay028/ov28_0225697C.c @@ -518,7 +518,7 @@ static void ov28_022569F4(UnkStruct_ov25_02255224 *param0) static void ov28_02256A08(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c index c7342b17d8..82ffbe131d 100644 --- a/src/overlay029/ov29_022566C8.c +++ b/src/overlay029/ov29_022566C8.c @@ -133,7 +133,7 @@ static void ov29_022567F0(UnkStruct_ov25_02255224 *param0) static void ov29_02256804(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0, @@ -148,7 +148,7 @@ static void ov29_02256804(SysTask *param0, void *param1) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v1 = { + static const BgTemplate v1 = { 0, 0, 0x800, diff --git a/src/overlay030/ov30_022563EC.c b/src/overlay030/ov30_022563EC.c index 6a403b5946..e33c2242e5 100644 --- a/src/overlay030/ov30_022563EC.c +++ b/src/overlay030/ov30_022563EC.c @@ -119,7 +119,7 @@ static void ov30_022564A0(UnkStruct_ov25_02255224 *param0) static void ov30_022564B4(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay031/ov31_02256554.c b/src/overlay031/ov31_02256554.c index 2e831579aa..ab3bd30a9c 100644 --- a/src/overlay031/ov31_02256554.c +++ b/src/overlay031/ov31_02256554.c @@ -83,7 +83,7 @@ static void ov31_022565CC(UnkStruct_ov25_02255224 *param0) static void ov31_022565E0(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay032/ov32_02256470.c b/src/overlay032/ov32_02256470.c index 065bec67b0..c28d4eab86 100644 --- a/src/overlay032/ov32_02256470.c +++ b/src/overlay032/ov32_02256470.c @@ -157,7 +157,7 @@ static void ov32_02256574(UnkStruct_ov25_02255224 *param0) static void ov32_02256588(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c index f07ad30e54..b01700feed 100644 --- a/src/overlay033/ov33_02256474.c +++ b/src/overlay033/ov33_02256474.c @@ -198,7 +198,7 @@ static void ov33_02256584(UnkStruct_ov25_02255224 *param0) static void ov33_02256598(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay034/ov34_02256540.c b/src/overlay034/ov34_02256540.c index 155fbea6d6..21c8399940 100644 --- a/src/overlay034/ov34_02256540.c +++ b/src/overlay034/ov34_02256540.c @@ -158,7 +158,7 @@ static void ov34_0225667C(UnkStruct_ov25_02255224 *param0) static void ov34_02256690(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay035/ov35_02256410.c b/src/overlay035/ov35_02256410.c index 94d7709701..0d936f546f 100644 --- a/src/overlay035/ov35_02256410.c +++ b/src/overlay035/ov35_02256410.c @@ -153,7 +153,7 @@ static void ov35_02256584(UnkStruct_ov25_02255224 *param0) static void ov35_02256598(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay036/ov36_02256404.c b/src/overlay036/ov36_02256404.c index d937f72558..4a6519bb46 100644 --- a/src/overlay036/ov36_02256404.c +++ b/src/overlay036/ov36_02256404.c @@ -146,7 +146,7 @@ static void ov36_02256578(UnkStruct_ov25_02255224 *param0) static void ov36_0225658C(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay037/ov37_022563D4.c b/src/overlay037/ov37_022563D4.c index 051f23f544..88552cc63b 100644 --- a/src/overlay037/ov37_022563D4.c +++ b/src/overlay037/ov37_022563D4.c @@ -121,7 +121,7 @@ static void ov37_022564C4(UnkStruct_ov25_02255224 *param0) static void ov37_022564D8(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay038/ov38_0225632C.c b/src/overlay038/ov38_0225632C.c index 0fa9e9ab8f..c66c32b026 100644 --- a/src/overlay038/ov38_0225632C.c +++ b/src/overlay038/ov38_0225632C.c @@ -80,7 +80,7 @@ static void ov38_022563A4(UnkStruct_ov25_02255224 *param0) static void ov38_022563B8(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay039/ov39_022563DC.c b/src/overlay039/ov39_022563DC.c index c25e979206..0a684ffbd5 100644 --- a/src/overlay039/ov39_022563DC.c +++ b/src/overlay039/ov39_022563DC.c @@ -85,7 +85,7 @@ static void ov39_02256454(UnkStruct_ov25_02255224 *param0) static void ov39_02256468(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay040/ov40_0225645C.c b/src/overlay040/ov40_0225645C.c index fc5f16bf26..4cedf921ea 100644 --- a/src/overlay040/ov40_0225645C.c +++ b/src/overlay040/ov40_0225645C.c @@ -250,7 +250,7 @@ static void ov40_02256604(UnkStruct_ov25_02255224 *param0) static void ov40_02256618(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c index 2dda02e558..0e8e34c5d0 100644 --- a/src/overlay041/ov41_022567B0.c +++ b/src/overlay041/ov41_022567B0.c @@ -180,7 +180,7 @@ static void ov41_022568C8(UnkStruct_ov25_02255224 *param0) static void ov41_022568DC(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0, @@ -195,7 +195,7 @@ static void ov41_022568DC(SysTask *param0, void *param1) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v1 = { + static const BgTemplate v1 = { 0, 0, 0x800, diff --git a/src/overlay042/ov42_022563D4.c b/src/overlay042/ov42_022563D4.c index 506b3866de..e4583ee719 100644 --- a/src/overlay042/ov42_022563D4.c +++ b/src/overlay042/ov42_022563D4.c @@ -129,7 +129,7 @@ static void ov42_022564DC(UnkStruct_ov25_02255224 *param0) static void ov42_022564F0(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index de87a7422a..a4a08ad2f8 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -215,7 +215,7 @@ static void ov43_022566EC(UnkStruct_ov25_02255224 *param0) static void ov43_02256700(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay044/ov44_022565BC.c b/src/overlay044/ov44_022565BC.c index 51d4cf129c..c6554b46d6 100644 --- a/src/overlay044/ov44_022565BC.c +++ b/src/overlay044/ov44_022565BC.c @@ -214,7 +214,7 @@ static void ov44_02256780(UnkStruct_ov25_02255224 *param0) static void ov44_02256794(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay045/ov45_022566EC.c b/src/overlay045/ov45_022566EC.c index e950a98cdc..7868b8d0b2 100644 --- a/src/overlay045/ov45_022566EC.c +++ b/src/overlay045/ov45_022566EC.c @@ -273,7 +273,7 @@ static void ov45_02256954(UnkStruct_ov25_02255224 *param0) static void ov45_02256968(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay046/ov46_02256BCC.c b/src/overlay046/ov46_02256BCC.c index 5e5264c8fd..873382f420 100644 --- a/src/overlay046/ov46_02256BCC.c +++ b/src/overlay046/ov46_02256BCC.c @@ -292,7 +292,7 @@ static void ov46_02256D60(UnkStruct_ov25_02255224 *param0) static void ov46_02256D74(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay047/ov47_02256634.c b/src/overlay047/ov47_02256634.c index d47e06a77d..bea04f4890 100644 --- a/src/overlay047/ov47_02256634.c +++ b/src/overlay047/ov47_02256634.c @@ -195,7 +195,7 @@ static void ov47_022568A8(UnkStruct_ov25_02255224 *param0) static void ov47_022568BC(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c index c0ef18f164..b4be297bbb 100644 --- a/src/overlay048/ov48_0225650C.c +++ b/src/overlay048/ov48_0225650C.c @@ -106,7 +106,7 @@ static void ov48_02256594(UnkStruct_ov25_02255224 *param0) static void ov48_022565A8(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay049/ov49_022563D4.c b/src/overlay049/ov49_022563D4.c index 64f954752c..23977c2273 100644 --- a/src/overlay049/ov49_022563D4.c +++ b/src/overlay049/ov49_022563D4.c @@ -122,7 +122,7 @@ static void ov49_022564D0(UnkStruct_ov25_02255224 *param0) static void ov49_022564E4(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay050/ov50_02256510.c b/src/overlay050/ov50_02256510.c index 9436739cd2..b099375ebf 100644 --- a/src/overlay050/ov50_02256510.c +++ b/src/overlay050/ov50_02256510.c @@ -132,7 +132,7 @@ static void ov50_02256638(UnkStruct_ov25_02255224 *param0) static void ov50_0225664C(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, @@ -147,7 +147,7 @@ static void ov50_0225664C(SysTask *param0, void *param1) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v1 = { + static const BgTemplate v1 = { 0, 0, 0x800, diff --git a/src/overlay051/ov51_0225632C.c b/src/overlay051/ov51_0225632C.c index 2f9b3d026d..e376db5f59 100644 --- a/src/overlay051/ov51_0225632C.c +++ b/src/overlay051/ov51_0225632C.c @@ -80,7 +80,7 @@ static void ov51_022563A4(UnkStruct_ov25_02255224 *param0) static void ov51_022563B8(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c index 104a7ccdce..3e316f15f6 100644 --- a/src/overlay052/ov52_02256694.c +++ b/src/overlay052/ov52_02256694.c @@ -182,7 +182,7 @@ static void ov52_022567E0(UnkStruct_ov25_02255224 *param0) static void ov52_022567F4(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay053/ov53_02256420.c b/src/overlay053/ov53_02256420.c index 910492effb..7e6d4b23d5 100644 --- a/src/overlay053/ov53_02256420.c +++ b/src/overlay053/ov53_02256420.c @@ -103,7 +103,7 @@ static void ov53_0225649C(UnkStruct_ov25_02255224 *param0) static void ov53_022564B0(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0, diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c index cfbd4d7106..e26fbefdba 100644 --- a/src/overlay054/ov54_0225642C.c +++ b/src/overlay054/ov54_0225642C.c @@ -93,7 +93,7 @@ static void ov54_022564A8(UnkStruct_ov25_02255224 *param0) static void ov54_022564BC(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay055/ov55_0225632C.c b/src/overlay055/ov55_0225632C.c index 3ee2665dd4..c9b777386d 100644 --- a/src/overlay055/ov55_0225632C.c +++ b/src/overlay055/ov55_0225632C.c @@ -83,7 +83,7 @@ static void ov55_022563B4(UnkStruct_ov25_02255224 *param0) static void ov55_022563C8(SysTask *param0, void *param1) { - static const UnkStruct_ov97_0222DB78 v0 = { + static const BgTemplate v0 = { 0, 0, 0x800, diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index 55c53bf3d0..000dda796f 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -282,7 +282,7 @@ static void ov56_02256508(BGL *param0) ov56_022564E4(param0); { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -304,7 +304,7 @@ static void ov56_02256508(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -326,7 +326,7 @@ static void ov56_02256508(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -348,7 +348,7 @@ static void ov56_02256508(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 8f5b8de17e..1ab46ce488 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -410,7 +410,7 @@ static void ov58_021D11A4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -431,7 +431,7 @@ static void ov58_021D11A4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -452,7 +452,7 @@ static void ov58_021D11A4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -472,7 +472,7 @@ static void ov58_021D11A4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -493,7 +493,7 @@ static void ov58_021D11A4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index bad989ac32..db4b66bc8b 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -404,7 +404,7 @@ static void ov59_021D1148(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -425,7 +425,7 @@ static void ov59_021D1148(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -446,7 +446,7 @@ static void ov59_021D1148(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -466,7 +466,7 @@ static void ov59_021D1148(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -487,7 +487,7 @@ static void ov59_021D1148(BGL *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index 02b4c08157..fe6a1a042e 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -328,7 +328,7 @@ static void ov61_0222C224(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, @@ -372,7 +372,7 @@ static void ov61_0222C224(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index 69e461d03c..a89074ead9 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -212,14 +212,14 @@ void ov62_0222F514(UnkStruct_0208C06C *param0) sub_0201DC3C(); } -static const UnkStruct_ov97_0222DB78 Unk_ov62_022487B0[] = { +static const BgTemplate Unk_ov62_022487B0[] = { { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x2000, GX_BG_CHARBASE_0x10000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0 }, { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x2800, GX_BG_CHARBASE_0x14000, GX_BG_EXTPLTT_01, 0x3, 0x0, 0x0, 0x0 }, { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x3000, GX_BG_CHARBASE_0x18000, GX_BG_EXTPLTT_01, 0x2, 0x0, 0x0, 0x0 }, { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x3800, GX_BG_CHARBASE_0x1c000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0 } }; -static const UnkStruct_ov97_0222DB78 Unk_ov62_02248820[] = { +static const BgTemplate Unk_ov62_02248820[] = { { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xc000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0 }, { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xc800, GX_BG_CHARBASE_0x04000, GX_BG_EXTPLTT_01, 0x3, 0x0, 0x0, 0x0 }, { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xd000, GX_BG_CHARBASE_0x08000, GX_BG_EXTPLTT_01, 0x2, 0x0, 0x0, 0x0 }, diff --git a/src/overlay063/ov63_0222D1C0.c b/src/overlay063/ov63_0222D1C0.c index d1ce2e0243..dc7c495454 100644 --- a/src/overlay063/ov63_0222D1C0.c +++ b/src/overlay063/ov63_0222D1C0.c @@ -77,7 +77,7 @@ void ov63_0222D228(UnkStruct_ov63_0222D1C0 *param0, const UnkStruct_ov63_0222D16 static void ov63_0222D31C(BGL *param0, int param1, const UnkStruct_ov65_0223582C *param2) { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x1000, @@ -85,13 +85,13 @@ static void ov63_0222D31C(BGL *param0, int param1, const UnkStruct_ov65_0223582C 3, }; - v0.unk_11 = param2->unk_02; - v0.unk_12 = param2->unk_03; - v0.unk_13 = param2->unk_04; - v0.unk_14 = param2->unk_05; - v0.unk_15 = param2->unk_06; - v0.unk_16 = 0; - v0.unk_18 = param2->unk_07; + v0.colorMode = param2->unk_02; + v0.screenBase = param2->unk_03; + v0.charBase = param2->unk_04; + v0.bgExtPltt = param2->unk_05; + v0.priority = param2->unk_06; + v0.areaOver = 0; + v0.mosaic = param2->unk_07; sub_02019044(param0, param1); sub_020183C4(param0, param1, &v0, 0); diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index f55d2c88a6..b9f1ee2018 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -387,9 +387,8 @@ static const UnkStruct_ov64_0223221C Unk_ov64_0223221C[3] = { {0xFFFFFFFFFFFFFFE0, 0x0, 0x20, 0x18} }; -static const UnkStruct_ov97_0222DB78 Unk_ov64_02232390[5] = { - { - 0x0, +static const BgTemplate Unk_ov64_02232390[5] = { + { 0x0, 0x0, 0x800, 0x0, @@ -401,10 +400,8 @@ static const UnkStruct_ov97_0222DB78 Unk_ov64_02232390[5] = { 0x3, 0x0, 0x0, - 0x0 - }, - { - 0x0, + 0x0 }, + { 0x0, 0x0, 0x800, 0x0, @@ -416,10 +413,8 @@ static const UnkStruct_ov97_0222DB78 Unk_ov64_02232390[5] = { 0x0, 0x0, 0x0, - 0x0 - }, - { - 0x0, + 0x0 }, + { 0x0, 0x0, 0x1000, 0x0, @@ -431,10 +426,8 @@ static const UnkStruct_ov97_0222DB78 Unk_ov64_02232390[5] = { 0x2, 0x0, 0x0, - 0x0 - }, - { - 0x0, + 0x0 }, + { 0x0, 0x0, 0x1000, 0x0, @@ -446,10 +439,8 @@ static const UnkStruct_ov97_0222DB78 Unk_ov64_02232390[5] = { 0x1, 0x0, 0x0, - 0x0 - }, - { - 0x0, + 0x0 }, + { 0x0, 0x0, 0x800, 0x0, @@ -461,8 +452,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov64_02232390[5] = { 0x0, 0x0, 0x0, - 0x0 - } + 0x0 } }; static const u32 Unk_ov64_02232258[5] = { diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 5875fdd233..62c34e805d 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -978,7 +978,7 @@ static void ov65_0222E638 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x1000, @@ -1000,7 +1000,7 @@ static void ov65_0222E638 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -1022,7 +1022,7 @@ static void ov65_0222E638 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -1044,7 +1044,7 @@ static void ov65_0222E638 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -1066,7 +1066,7 @@ static void ov65_0222E638 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, @@ -1087,7 +1087,7 @@ static void ov65_0222E638 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v6 = { + BgTemplate v6 = { 0, 0, 0x800, @@ -1108,7 +1108,7 @@ static void ov65_0222E638 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v7 = { + BgTemplate v7 = { 0, 0, 0x800, @@ -1129,7 +1129,7 @@ static void ov65_0222E638 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v8 = { + BgTemplate v8 = { 0, 0, 0x800, diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 52af0aac5a..b833024d65 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -637,7 +637,7 @@ static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -659,7 +659,7 @@ static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -681,7 +681,7 @@ static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index b9d88c5c97..b0f37968d2 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -108,7 +108,7 @@ static const u32 Unk_ov67_0225D3F4[3] = { 0x4 }; -static const UnkStruct_ov97_0222DB78 Unk_ov67_0225D438[3] = { +static const BgTemplate Unk_ov67_0225D438[3] = { { 0x0, 0x0, diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index 4913c03450..fabc14b782 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -241,7 +241,7 @@ static const u32 Unk_ov68_0225DD68[4] = { 0x4 }; -static const UnkStruct_ov97_0222DB78 Unk_ov68_0225DE18[4] = { +static const BgTemplate Unk_ov68_0225DE18[4] = { { 0x0, 0x0, diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index d859ed1d4a..62561b98a8 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -428,7 +428,7 @@ static const u32 Unk_ov69_0225F060[5] = { 0x5 }; -static const UnkStruct_ov97_0222DB78 Unk_ov69_0225F154[5] = { +static const BgTemplate Unk_ov69_0225F154[5] = { { 0x0, 0x0, diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 12fdc09625..e15da27d9a 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -497,7 +497,7 @@ static const u32 Unk_ov70_0226D5CC[4] = { 0x6 }; -static const UnkStruct_ov97_0222DB78 Unk_ov70_0226D6B4[4] = { +static const BgTemplate Unk_ov70_0226D6B4[4] = { { 0x0, 0x0, diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index 0ef6c7ceb9..f207ab969e 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -549,7 +549,7 @@ static void ov71_0223B858(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -570,7 +570,7 @@ static void ov71_0223B858(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -591,7 +591,7 @@ static void ov71_0223B858(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -612,7 +612,7 @@ static void ov71_0223B858(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -633,7 +633,7 @@ static void ov71_0223B858(BGL *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 2079346184..55c85f64c1 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -283,7 +283,7 @@ static void ov72_0223DA90(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -304,7 +304,7 @@ static void ov72_0223DA90(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -325,7 +325,7 @@ static void ov72_0223DA90(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -345,7 +345,7 @@ static void ov72_0223DA90(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -366,7 +366,7 @@ static void ov72_0223DA90(BGL *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 2604d39c44..96a61a01b6 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -327,7 +327,7 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) sub_02018368(&v1); } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -343,23 +343,23 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) 0 }; - v2.unk_12 = GX_BG_SCRBASE_0x7800; - v2.unk_13 = GX_BG_CHARBASE_0x18000; + v2.screenBase = GX_BG_SCRBASE_0x7800; + v2.charBase = GX_BG_CHARBASE_0x18000; sub_020183C4(param0->unk_18, 0, &v2, 0); sub_02019EBC(param0->unk_18, 0); - v2.unk_12 = GX_BG_SCRBASE_0x7000; - v2.unk_13 = GX_BG_CHARBASE_0x14000; + v2.screenBase = GX_BG_SCRBASE_0x7000; + v2.charBase = GX_BG_CHARBASE_0x14000; sub_020183C4(param0->unk_18, 1, &v2, 0); sub_02019EBC(param0->unk_18, 1); - v2.unk_12 = GX_BG_SCRBASE_0x6800; - v2.unk_13 = GX_BG_CHARBASE_0x10000; + v2.screenBase = GX_BG_SCRBASE_0x6800; + v2.charBase = GX_BG_CHARBASE_0x10000; sub_020183C4(param0->unk_18, 2, &v2, 0); sub_02019EBC(param0->unk_18, 2); - v2.unk_12 = GX_BG_SCRBASE_0x6000; - v2.unk_13 = GX_BG_CHARBASE_0x0c000; + v2.screenBase = GX_BG_SCRBASE_0x6000; + v2.charBase = GX_BG_CHARBASE_0x0c000; sub_020183C4(param0->unk_18, 3, &v2, 0); sub_02019EBC(param0->unk_18, 3); @@ -369,7 +369,7 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) Font_LoadScreenIndicatorsPalette(0, 6 * (2 * 16), param0->unk_00); } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -385,23 +385,23 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) 0 }; - v2.unk_12 = GX_BG_SCRBASE_0x7800; - v2.unk_13 = GX_BG_CHARBASE_0x18000; + v2.screenBase = GX_BG_SCRBASE_0x7800; + v2.charBase = GX_BG_CHARBASE_0x18000; sub_020183C4(param0->unk_18, 4, &v2, 0); sub_02019EBC(param0->unk_18, 4); - v2.unk_12 = GX_BG_SCRBASE_0x7000; - v2.unk_13 = GX_BG_CHARBASE_0x14000; + v2.screenBase = GX_BG_SCRBASE_0x7000; + v2.charBase = GX_BG_CHARBASE_0x14000; sub_020183C4(param0->unk_18, 5, &v2, 0); sub_02019EBC(param0->unk_18, 5); - v2.unk_12 = GX_BG_SCRBASE_0x6800; - v2.unk_13 = GX_BG_CHARBASE_0x10000; + v2.screenBase = GX_BG_SCRBASE_0x6800; + v2.charBase = GX_BG_CHARBASE_0x10000; sub_020183C4(param0->unk_18, 6, &v2, 0); sub_02019EBC(param0->unk_18, 6); - v2.unk_12 = GX_BG_SCRBASE_0x6000; - v2.unk_13 = GX_BG_CHARBASE_0x0c000; + v2.screenBase = GX_BG_SCRBASE_0x6000; + v2.charBase = GX_BG_CHARBASE_0x0c000; sub_020183C4(param0->unk_18, 7, &v2, 0); sub_02019EBC(param0->unk_18, 7); } diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c index 627006e120..d7e6c3667b 100644 --- a/src/overlay073/ov73_021D3250.c +++ b/src/overlay073/ov73_021D3250.c @@ -195,7 +195,7 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) { int v2, v3, v4; { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, @@ -218,7 +218,7 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) sub_02019EBC(param0->unk_04, v2); } { - UnkStruct_ov97_0222DB78 v6 = { + BgTemplate v6 = { 0, 0, 0x800, @@ -243,7 +243,7 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) sub_02006E60(136, v4, param0->unk_04, v2, 0, 0, 0, param0->unk_00); } { - UnkStruct_ov97_0222DB78 v7 = { + BgTemplate v7 = { 0, 0, 0x800, @@ -268,7 +268,7 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) sub_02006E60(136, v4, param0->unk_04, v2, 0, 0, 0, param0->unk_00); } { - UnkStruct_ov97_0222DB78 v8 = { + BgTemplate v8 = { 0, 0, 0x800, diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index 9a97f4cec6..2801f2ae29 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -346,7 +346,7 @@ static void ov74_021D12D4(UnkStruct_ov74_021D0D80 *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 2d08cb4683..535def6957 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -586,7 +586,7 @@ static void ov75_021D1480(UnkStruct_ov75_021D1184 *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index df9531796d..a8e5ae0aea 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -1363,7 +1363,7 @@ void ov76_0223EB64(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, @@ -1423,7 +1423,7 @@ void ov76_0223EB64(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index cb6db82d4f..6d5a9e0d78 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -638,7 +638,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -657,7 +657,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) sub_020183C4(param0->unk_04, 4, &v1, 0); } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x1000, @@ -676,7 +676,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) sub_020183C4(param0->unk_04, 5, &v2, 0); } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x1000, @@ -695,7 +695,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) sub_020183C4(param0->unk_04, 6, &v3, 0); } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -715,7 +715,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, @@ -734,7 +734,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) sub_020183C4(param0->unk_04, 3, &v5, 0); } { - UnkStruct_ov97_0222DB78 v6 = { + BgTemplate v6 = { 0, 0, 0x800, @@ -930,7 +930,7 @@ static void ov77_021D1CC0(BGL *param0, int param1) { sub_02019044(param0, 5); { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -963,7 +963,7 @@ static void ov77_021D1D48(BGL *param0, int param1) sub_02019044(param0, 4); { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x1000, diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c index ffb148f4ec..1bc09e2c3b 100644 --- a/src/overlay077/ov77_021D25B0.c +++ b/src/overlay077/ov77_021D25B0.c @@ -303,7 +303,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -323,7 +323,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -343,7 +343,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -363,7 +363,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -383,7 +383,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, @@ -403,7 +403,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v6 = { + BgTemplate v6 = { 0, 0, 0x800, @@ -442,7 +442,7 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0, @@ -462,7 +462,7 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0, @@ -482,7 +482,7 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0, @@ -502,7 +502,7 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x1000, @@ -522,7 +522,7 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v5[] = { + BgTemplate v5[] = { { 0, 0, @@ -584,7 +584,7 @@ static void ov77_021D2828(UnkStruct_ov77_021D2E9C *param0) ov77_021D361C(param0, 0); { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0, @@ -604,7 +604,7 @@ static void ov77_021D2828(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0, @@ -624,7 +624,7 @@ static void ov77_021D2828(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0, @@ -644,7 +644,7 @@ static void ov77_021D2828(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, @@ -721,7 +721,7 @@ static void ov77_021D2900(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0, @@ -741,7 +741,7 @@ static void ov77_021D2900(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0, @@ -795,7 +795,7 @@ static void ov77_021D2A00(UnkStruct_ov77_021D2E9C *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x1000, diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index c105ab5841..4fae3db012 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -497,7 +497,7 @@ static void ov79_021D132C(UnkStruct_ov79_021D0E1C *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0x0, 0x0, diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index d810de642b..69a56fb4e8 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -377,7 +377,7 @@ static void ov79_021D257C(UnkStruct_ov79_021D2928 *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay080/ov80_021D0D80.c b/src/overlay080/ov80_021D0D80.c index 9f66177154..33602dd24a 100644 --- a/src/overlay080/ov80_021D0D80.c +++ b/src/overlay080/ov80_021D0D80.c @@ -292,7 +292,7 @@ static void ov80_021D1088(UnkStruct_ov80_021D2A08 *param0, BGL *param1) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay081/ov81_021D0D80.c b/src/overlay081/ov81_021D0D80.c index 3d4df98fca..652c18ce04 100644 --- a/src/overlay081/ov81_021D0D80.c +++ b/src/overlay081/ov81_021D0D80.c @@ -193,7 +193,7 @@ static void ov81_021D0F40(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -213,7 +213,7 @@ static void ov81_021D0F40(BGL *param0) sub_02019EBC(param0, 0); } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -233,7 +233,7 @@ static void ov81_021D0F40(BGL *param0) sub_02019EBC(param0, 1); } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -252,7 +252,7 @@ static void ov81_021D0F40(BGL *param0) sub_020183C4(param0, 2, &v3, 0); } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index 5b88e235a5..3fbd8626d2 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -186,7 +186,7 @@ static void ov83_0223CC30(BGL **param0, int param1) BGL_SetPriority(0, 2); { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index 157494a876..f00bad7549 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -662,7 +662,7 @@ static void ov84_0223BA5C(BGL *param0) sub_02018368(&v0); } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0x0, 0x0, 0x800, @@ -681,7 +681,7 @@ static void ov84_0223BA5C(BGL *param0) sub_02019EBC(param0, 0); } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0x0, 0x0, 0x800, @@ -699,7 +699,7 @@ static void ov84_0223BA5C(BGL *param0) sub_020183C4(param0, 1, &v2, 0); } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0x0, 0x0, 0x800, @@ -719,7 +719,7 @@ static void ov84_0223BA5C(BGL *param0) sub_02019EBC(param0, 2); } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0x0, 0x0, 0x800, @@ -737,7 +737,7 @@ static void ov84_0223BA5C(BGL *param0) sub_020183C4(param0, 3, &v4, 0); } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0x0, 0x0, 0x800, @@ -756,7 +756,7 @@ static void ov84_0223BA5C(BGL *param0) sub_02019EBC(param0, 4); } { - UnkStruct_ov97_0222DB78 v6 = { + BgTemplate v6 = { 0x0, 0x0, 0x800, @@ -774,7 +774,7 @@ static void ov84_0223BA5C(BGL *param0) sub_020183C4(param0, 5, &v6, 0); } { - UnkStruct_ov97_0222DB78 v7 = { + BgTemplate v7 = { 0x0, 0x0, 0x400, diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index 781cb81e70..0ef1e4ed46 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -345,7 +345,7 @@ static void ov85_02241634(BGL *param0) ov85_02241F5C(); { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -366,7 +366,7 @@ static void ov85_02241634(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -387,7 +387,7 @@ static void ov85_02241634(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 4502fe76dc..ca7615ec38 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -627,7 +627,7 @@ static void ov86_0223B74C(UnkStruct_ov86_0223B3C8 *param0) GX_BGMODE_0, GX_BG0_AS_3D }; - static const UnkStruct_ov97_0222DB78 v3 = { + static const BgTemplate v3 = { 0, 0, 0x1000, @@ -642,7 +642,7 @@ static void ov86_0223B74C(UnkStruct_ov86_0223B3C8 *param0) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v4 = { + static const BgTemplate v4 = { 0, 0, 0, @@ -657,7 +657,7 @@ static void ov86_0223B74C(UnkStruct_ov86_0223B3C8 *param0) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v5 = { + static const BgTemplate v5 = { 0, 0, 0, diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index 712ab5043e..e065260fa2 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -265,7 +265,7 @@ static void ov87_021D139C(UnkStruct_ov87_021D106C *param0) GX_BGMODE_0, GX_BG0_AS_3D, }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0x800, @@ -280,7 +280,7 @@ static void ov87_021D139C(UnkStruct_ov87_021D106C *param0) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v3 = { + static const BgTemplate v3 = { 0, 0, 0, diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index c172775005..784d3614d3 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -953,7 +953,7 @@ static void ov88_0223C17C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -974,7 +974,7 @@ static void ov88_0223C17C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -995,7 +995,7 @@ static void ov88_0223C17C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -1016,7 +1016,7 @@ static void ov88_0223C17C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -1036,7 +1036,7 @@ static void ov88_0223C17C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, @@ -1057,7 +1057,7 @@ static void ov88_0223C17C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v6 = { + BgTemplate v6 = { 0, 0, 0x800, @@ -1077,7 +1077,7 @@ static void ov88_0223C17C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v7 = { + BgTemplate v7 = { 0, 0, 0x800, diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 5719f70db2..40598096bb 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -459,7 +459,7 @@ static void ov90_021D11EC(UnkStruct_ov90_021D0ECC *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index ce8226c555..8b86a5438b 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -528,7 +528,7 @@ static void ov91_021D0FE4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -549,7 +549,7 @@ static void ov91_021D0FE4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -570,7 +570,7 @@ static void ov91_021D0FE4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x1000, diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 690de9008f..f28ca4f688 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -164,7 +164,7 @@ static void ov92_021D2868(UnkStruct_ov92_021D28C0 *param0); static u32 ov92_021D28C0(const UnkStruct_ov92_021D28C0 *param0, const UnkStruct_ov92_021D28C0 *param1); void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1); -static const UnkStruct_ov97_0222DB78 Unk_ov92_021D2970 = { +static const BgTemplate Unk_ov92_021D2970 = { 0x0, 0x0, 0x800, @@ -180,7 +180,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov92_021D2970 = { 0x0 }; -static const UnkStruct_ov97_0222DB78 Unk_ov92_021D298C = { +static const BgTemplate Unk_ov92_021D298C = { 0x0, 0x0, 0x800, diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index f6cecafdcc..a878969f2f 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -146,7 +146,7 @@ static void ov94_0223C720(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -167,7 +167,7 @@ static void ov94_0223C720(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -187,7 +187,7 @@ static void ov94_0223C720(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -207,7 +207,7 @@ static void ov94_0223C720(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -228,7 +228,7 @@ static void ov94_0223C720(BGL *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index f9bbe1ff87..37a9fb290b 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -119,7 +119,7 @@ int ov94_0223D1B0(UnkStruct_ov94_0223FD4C *param0, int param1) static void ov94_0223D1D4(BGL *param0) { { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -140,7 +140,7 @@ static void ov94_0223D1D4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -160,7 +160,7 @@ static void ov94_0223D1D4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -180,7 +180,7 @@ static void ov94_0223D1D4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -201,7 +201,7 @@ static void ov94_0223D1D4(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index 48ca0caab3..41f923eb72 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -109,7 +109,7 @@ int ov94_0223DCF8(UnkStruct_ov94_0223FD4C *param0, int param1) static void ov94_0223DD1C(BGL *param0) { { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -130,7 +130,7 @@ static void ov94_0223DD1C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -150,7 +150,7 @@ static void ov94_0223DD1C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -171,7 +171,7 @@ static void ov94_0223DD1C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 44b5c5566d..62b739424b 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -171,7 +171,7 @@ int ov94_0223E574(UnkStruct_ov94_0223FD4C *param0, int param1) static void ov94_0223E598(BGL *param0) { { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -192,7 +192,7 @@ static void ov94_0223E598(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -213,7 +213,7 @@ static void ov94_0223E598(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -234,7 +234,7 @@ static void ov94_0223E598(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index e41c9aa178..3058fa6acd 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -174,7 +174,7 @@ static void ov94_0223FC08(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -195,7 +195,7 @@ static void ov94_0223FC08(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -215,7 +215,7 @@ static void ov94_0223FC08(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -236,7 +236,7 @@ static void ov94_0223FC08(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -257,7 +257,7 @@ static void ov94_0223FC08(BGL *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index de9620d5c7..08cae888c8 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -338,7 +338,7 @@ static void ov94_0224158C(UnkStruct_ov94_0223FD4C *param0, int param1, int param static void ov94_022415F8(BGL *param0) { { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -359,7 +359,7 @@ static void ov94_022415F8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -379,7 +379,7 @@ static void ov94_022415F8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -399,7 +399,7 @@ static void ov94_022415F8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -420,7 +420,7 @@ static void ov94_022415F8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index 250d89abf0..c1f7014aba 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -202,7 +202,7 @@ static void ov94_02242B54(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -223,7 +223,7 @@ static void ov94_02242B54(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -244,7 +244,7 @@ static void ov94_02242B54(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -265,7 +265,7 @@ static void ov94_02242B54(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -286,7 +286,7 @@ static void ov94_02242B54(BGL *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index fe4f807b42..00a4d71ba7 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -169,7 +169,7 @@ int ov94_02244A2C(UnkStruct_ov94_0223FD4C *param0, int param1) static void ov94_02244A7C(BGL *param0) { { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -191,7 +191,7 @@ static void ov94_02244A7C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -212,7 +212,7 @@ static void ov94_02244A7C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -234,7 +234,7 @@ static void ov94_02244A7C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 2d07ba74f2..c74c9575da 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -213,7 +213,7 @@ static int ov95_02247CB4(UnkStruct_ov95_02247C6C *param0, int *param1) GX_BGMODE_0, GX_BG0_AS_3D }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0x800, @@ -228,7 +228,7 @@ static int ov95_02247CB4(UnkStruct_ov95_02247C6C *param0, int *param1) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v3 = { + static const BgTemplate v3 = { 0, 0, 0, diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c index 66416615a9..f87a771da7 100644 --- a/src/overlay095/ov95_02248590.c +++ b/src/overlay095/ov95_02248590.c @@ -427,7 +427,7 @@ static void ov95_022488A4(UnkStruct_ov95_02248688 *param0) GX_BGMODE_4, GX_BG0_AS_3D }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0, @@ -442,7 +442,7 @@ static void ov95_022488A4(UnkStruct_ov95_02248688 *param0) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v3 = { + static const BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c index 9de7cb1ddf..50ed940d79 100644 --- a/src/overlay095/ov95_02249740.c +++ b/src/overlay095/ov95_02249740.c @@ -256,7 +256,7 @@ static void ov95_02249910(UnkStruct_ov95_022497D8 *param0) GX_BGMODE_0, GX_BG0_AS_3D }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0x0, diff --git a/src/overlay095/ov95_02249F90.c b/src/overlay095/ov95_02249F90.c index 3f25b1e5de..300254ad5c 100644 --- a/src/overlay095/ov95_02249F90.c +++ b/src/overlay095/ov95_02249F90.c @@ -170,7 +170,7 @@ static void ov95_0224A10C(UnkStruct_ov95_02249FF8 *param0) GX_BGMODE_0, GX_BG0_AS_3D }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0x1000, @@ -185,7 +185,7 @@ static void ov95_0224A10C(UnkStruct_ov95_02249FF8 *param0) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v3 = { + static const BgTemplate v3 = { 0, 0, 0x1000, @@ -200,7 +200,7 @@ static void ov95_0224A10C(UnkStruct_ov95_02249FF8 *param0) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v4 = { + static const BgTemplate v4 = { 0, 0, 0x0, diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c index fcf586fce8..a96a7e004a 100644 --- a/src/overlay095/ov95_0224A390.c +++ b/src/overlay095/ov95_0224A390.c @@ -236,7 +236,7 @@ static void ov95_0224A518(UnkStruct_ov95_0224A42C *param0) GX_BGMODE_0, GX_BG0_AS_3D }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0x0, diff --git a/src/overlay095/ov95_0224ABC0.c b/src/overlay095/ov95_0224ABC0.c index 3beb9d762b..aa974d2157 100644 --- a/src/overlay095/ov95_0224ABC0.c +++ b/src/overlay095/ov95_0224ABC0.c @@ -305,7 +305,7 @@ static void ov95_0224AE1C(UnkStruct_ov95_0224AC64 *param0) GX_BGMODE_4, GX_BG0_AS_3D }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0, @@ -320,7 +320,7 @@ static void ov95_0224AE1C(UnkStruct_ov95_0224AC64 *param0) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v3 = { + static const BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 898ebb131b..a4bdf07ca1 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -242,7 +242,7 @@ static int ov95_0224B520(UnkStruct_ov95_0224B4D4 *param0, int *param1) GX_BGMODE_0, GX_BG0_AS_3D }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0x800, @@ -257,7 +257,7 @@ static int ov95_0224B520(UnkStruct_ov95_0224B4D4 *param0, int *param1) 0, 0 }; - static const UnkStruct_ov97_0222DB78 v3 = { + static const BgTemplate v3 = { 0, 0, 0, diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index 0d2f53eff5..ac0c8e03c3 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -250,7 +250,7 @@ int ov96_0223BDEC(UnkStruct_ov96_0223BF40 *param0, int param1) static void ov96_0223BE38(BGL *param0) { { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -272,7 +272,7 @@ static void ov96_0223BE38(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -293,7 +293,7 @@ static void ov96_0223BE38(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -315,7 +315,7 @@ static void ov96_0223BE38(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index c3ad9e8be7..b93791c219 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -716,7 +716,7 @@ static int ov97_0222DB40(OverlayManager *param0) static void ov97_0222DB78(BGL *param0, int param1, u32 param2, u32 param3) { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -732,8 +732,8 @@ static void ov97_0222DB78(BGL *param0, int param1, u32 param2, u32 param3) 0 }; - v0.unk_12 = param2 / 0x800; - v0.unk_13 = param3 / 0x4000; + v0.screenBase = param2 / 0x800; + v0.charBase = param3 / 0x4000; sub_020183C4(param0, param1, &v0, 0); sub_02019EBC(param0, param1); diff --git a/src/overlay097/ov97_02232054.c b/src/overlay097/ov97_02232054.c index 69da9d6358..73af486f79 100644 --- a/src/overlay097/ov97_02232054.c +++ b/src/overlay097/ov97_02232054.c @@ -46,7 +46,7 @@ void ov97_02232074(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -67,7 +67,7 @@ void ov97_02232074(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -88,7 +88,7 @@ void ov97_02232074(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -109,7 +109,7 @@ void ov97_02232074(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 8fe1c8964f..4164859e66 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -1296,7 +1296,7 @@ static void ov97_02234D28(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -1317,7 +1317,7 @@ static void ov97_02234D28(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -1338,7 +1338,7 @@ static void ov97_02234D28(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -1359,7 +1359,7 @@ static void ov97_02234D28(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index ccbeb96f1c..901c9319ff 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -98,7 +98,7 @@ void *ov97_022376C4(OverlayManager *param0, int param1, int param2, int param3) void ov97_022376FC(BGL *param0, int param1, u8 param2, u32 param3, u32 param4) { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -114,25 +114,25 @@ void ov97_022376FC(BGL *param0, int param1, u8 param2, u32 param3, u32 param4) 0 }; - v0.unk_10 = param2; + v0.screenSize = param2; switch (param2) { case 1: - v0.unk_08 = 0x800; + v0.bufferSize = 0x800; break; case 2: - v0.unk_08 = 0x1000; + v0.bufferSize = 0x1000; break; case 3: - v0.unk_08 = 0x1000; + v0.bufferSize = 0x1000; break; case 4: - v0.unk_08 = 0x2000; + v0.bufferSize = 0x2000; break; } - v0.unk_12 = param3 / 0x800; - v0.unk_13 = param4 / 0x4000; + v0.screenBase = param3 / 0x800; + v0.charBase = param4 / 0x4000; sub_020183C4(param0, param1, &v0, 0); sub_02019EBC(param0, param1); diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index 5d77cff653..d8685c8fd9 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -490,9 +490,8 @@ static void ov98_02247510 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v2[] = { - { - 0, + BgTemplate v2[] = { + { 0, 0, 0x800, 0, @@ -504,10 +503,8 @@ static void ov98_02247510 (BGL * param0) 2, 0, 0, - 0 - }, - { - 0, + 0 }, + { 0, 0, 0x800, 0, @@ -519,10 +516,8 @@ static void ov98_02247510 (BGL * param0) 3, 0, 0, - 0 - }, - { - 0, + 0 }, + { 0, 0, 0x800, 0, @@ -534,10 +529,8 @@ static void ov98_02247510 (BGL * param0) 1, 0, 0, - 0 - }, - { - 0, + 0 }, + { 0, 0, 0x800, 0, @@ -549,8 +542,7 @@ static void ov98_02247510 (BGL * param0) 0, 0, 0, - 0 - }, + 0 }, }; sub_020183C4(param0, 0, &v2[0], 0); @@ -575,9 +567,8 @@ static void ov98_02247510 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v3[] = { - { - 0, + BgTemplate v3[] = { + { 0, 0, 0x800, 0, @@ -589,10 +580,8 @@ static void ov98_02247510 (BGL * param0) 0, 0, 0, - 0 - }, - { - 0, + 0 }, + { 0, 0, 0x800, 0, @@ -604,8 +593,7 @@ static void ov98_02247510 (BGL * param0) 2, 0, 0, - 0 - }, + 0 }, }; sub_020183C4(param0, 4, &v3[0], 0); diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index fbacaaac0c..9d89580404 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -400,7 +400,7 @@ static void ov99_021D1380(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, @@ -467,7 +467,7 @@ static void ov99_021D1380(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, @@ -579,7 +579,7 @@ static void ov99_021D1580(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, @@ -644,7 +644,7 @@ static void ov99_021D1580(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index ccd7a262b6..8c15aec458 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -310,7 +310,7 @@ static void ov100_021D1208(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, @@ -388,7 +388,7 @@ static void ov100_021D1208(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index 00eb8ee01d..c096cf3128 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -276,7 +276,7 @@ static void ov101_021D10B8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -298,7 +298,7 @@ static void ov101_021D10B8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -319,7 +319,7 @@ static void ov101_021D10B8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -340,7 +340,7 @@ static void ov101_021D10B8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index 1b50ffb73c..75eb8fa87c 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -19,7 +19,6 @@ #include "string_template.h" #include "text.h" #include "trainer_info.h" -#include "unk_02000C88.h" #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" @@ -211,7 +210,7 @@ static void ov102_021D0F8C(UnkStruct_ov102_021D0F8C *param0) sub_02018368(&v1); } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0, @@ -227,50 +226,50 @@ static void ov102_021D0F8C(UnkStruct_ov102_021D0F8C *param0) 0 }; - v2.unk_12 = GX_BG_SCRBASE_0x0000; - v2.unk_13 = GX_BG_CHARBASE_0x10000; - v2.unk_08 = 0x1000; - v2.unk_10 = 2; + v2.screenBase = GX_BG_SCRBASE_0x0000; + v2.charBase = GX_BG_CHARBASE_0x10000; + v2.bufferSize = 0x1000; + v2.screenSize = 2; sub_020183C4(param0->unk_10, 0, &v2, 0); sub_02019EBC(param0->unk_10, 0); - v2.unk_12 = GX_BG_SCRBASE_0x1000; - v2.unk_13 = GX_BG_CHARBASE_0x08000; - v2.unk_08 = 0x1000; - v2.unk_10 = 2; + v2.screenBase = GX_BG_SCRBASE_0x1000; + v2.charBase = GX_BG_CHARBASE_0x08000; + v2.bufferSize = 0x1000; + v2.screenSize = 2; sub_020183C4(param0->unk_10, 1, &v2, 0); sub_02019EBC(param0->unk_10, 1); - v2.unk_12 = GX_BG_SCRBASE_0x2000; - v2.unk_13 = GX_BG_CHARBASE_0x04000; - v2.unk_08 = 0x800; - v2.unk_10 = 1; + v2.screenBase = GX_BG_SCRBASE_0x2000; + v2.charBase = GX_BG_CHARBASE_0x04000; + v2.bufferSize = 0x800; + v2.screenSize = 1; sub_020183C4(param0->unk_10, 3, &v2, 0); sub_02019EBC(param0->unk_10, 3); - v2.unk_12 = GX_BG_SCRBASE_0x0000; - v2.unk_13 = GX_BG_CHARBASE_0x10000; - v2.unk_08 = 0x1000; - v2.unk_10 = 2; + v2.screenBase = GX_BG_SCRBASE_0x0000; + v2.charBase = GX_BG_CHARBASE_0x10000; + v2.bufferSize = 0x1000; + v2.screenSize = 2; sub_020183C4(param0->unk_10, 4, &v2, 0); sub_02019EBC(param0->unk_10, 4); - v2.unk_12 = GX_BG_SCRBASE_0x1000; - v2.unk_13 = GX_BG_CHARBASE_0x08000; - v2.unk_08 = 0x1000; - v2.unk_10 = 2; + v2.screenBase = GX_BG_SCRBASE_0x1000; + v2.charBase = GX_BG_CHARBASE_0x08000; + v2.bufferSize = 0x1000; + v2.screenSize = 2; sub_020183C4(param0->unk_10, 5, &v2, 0); sub_02019EBC(param0->unk_10, 5); - v2.unk_12 = GX_BG_SCRBASE_0x2000; - v2.unk_13 = GX_BG_CHARBASE_0x04000; - v2.unk_08 = 0x800; - v2.unk_10 = 1; + v2.screenBase = GX_BG_SCRBASE_0x2000; + v2.charBase = GX_BG_CHARBASE_0x04000; + v2.bufferSize = 0x800; + v2.screenSize = 1; sub_020183C4(param0->unk_10, 7, &v2, 0); sub_02019EBC(param0->unk_10, 7); diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index a329daca11..be7ed10fd9 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -491,7 +491,7 @@ static void ov104_0223C948(BGL *param0, int param1) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, @@ -541,17 +541,17 @@ static void ov104_0223C948(BGL *param0, int param1) u16 v4; if (v0 == GX_BGMODE_0) { - v3[1].unk_11 = GX_BG_COLORMODE_16; - v3[2].unk_11 = GX_BG_COLORMODE_16; - v3[1].unk_14 = GX_BG_EXTPLTT_01; - v3[2].unk_14 = GX_BG_EXTPLTT_01; + v3[1].colorMode = GX_BG_COLORMODE_16; + v3[2].colorMode = GX_BG_COLORMODE_16; + v3[1].bgExtPltt = GX_BG_EXTPLTT_01; + v3[2].bgExtPltt = GX_BG_EXTPLTT_01; } v4 = ov104_0222EA90(param1, 4); - v3[2].unk_10 = v4; + v3[2].screenSize = v4; if (ov104_0222EA90(param1, 9) != 0xffff) { - v3[1].unk_10 = v4; + v3[1].screenSize = v4; } if (v0 == GX_BGMODE_0) { @@ -587,7 +587,7 @@ static void ov104_0223C948(BGL *param0, int param1) } { - UnkStruct_ov97_0222DB78 v5[] = { + BgTemplate v5[] = { { 0, 0, diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 508a96c072..0fb71f6702 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -2178,7 +2178,7 @@ static void ov105_02244584(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -2200,7 +2200,7 @@ static void ov105_02244584(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -2221,7 +2221,7 @@ static void ov105_02244584(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -2242,7 +2242,7 @@ static void ov105_02244584(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index 4e7ae5d8cd..c3338b7a20 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -935,7 +935,7 @@ static void ov106_0224273C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -957,7 +957,7 @@ static void ov106_0224273C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -979,7 +979,7 @@ static void ov106_0224273C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -1000,7 +1000,7 @@ static void ov106_0224273C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index 6628912831..3e20d588ac 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -1622,7 +1622,7 @@ static void ov107_02243444 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -1644,7 +1644,7 @@ static void ov107_02243444 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -1666,7 +1666,7 @@ static void ov107_02243444 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -1688,7 +1688,7 @@ static void ov107_02243444 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -1710,7 +1710,7 @@ static void ov107_02243444 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index 2a3257ac48..80ff4e0141 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -1289,7 +1289,7 @@ static void ov107_02247340 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -1311,7 +1311,7 @@ static void ov107_02247340 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -1333,7 +1333,7 @@ static void ov107_02247340 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -1355,7 +1355,7 @@ static void ov107_02247340 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -1377,7 +1377,7 @@ static void ov107_02247340 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 53ab103197..154a05ef5a 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -956,7 +956,7 @@ static void ov108_02242760(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -978,7 +978,7 @@ static void ov108_02242760(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -999,7 +999,7 @@ static void ov108_02242760(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index 3804c5b701..3dce3a4013 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -1703,7 +1703,7 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -1725,7 +1725,7 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -1746,7 +1746,7 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -1767,7 +1767,7 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -1788,7 +1788,7 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index f09b9b698b..e567df328e 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -403,7 +403,7 @@ static void ov109_021D40F0(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -424,7 +424,7 @@ static void ov109_021D40F0(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -445,7 +445,7 @@ static void ov109_021D40F0(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -465,7 +465,7 @@ static void ov109_021D40F0(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -486,7 +486,7 @@ static void ov109_021D40F0(BGL *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index c229980d8f..8b63f2caaf 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -295,7 +295,7 @@ static void ov110_021D1098 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -317,7 +317,7 @@ static void ov110_021D1098 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -339,7 +339,7 @@ static void ov110_021D1098 (BGL * param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index a8988c7b82..518d70afa8 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -1326,7 +1326,7 @@ static void ov111_021D20EC(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x1000, @@ -1348,7 +1348,7 @@ static void ov111_021D20EC(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x1000, @@ -1369,7 +1369,7 @@ static void ov111_021D20EC(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x1000, @@ -1390,7 +1390,7 @@ static void ov111_021D20EC(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x1000, @@ -1411,7 +1411,7 @@ static void ov111_021D20EC(BGL *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x1000, @@ -1432,7 +1432,7 @@ static void ov111_021D20EC(BGL *param0) } { - UnkStruct_ov97_0222DB78 v6 = { + BgTemplate v6 = { 0, 0, 0x800, diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index 1b01a8b6f1..84c6a0e4e2 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -215,7 +215,7 @@ static const u32 Unk_ov112_0225D844[5] = { 0x4 }; -static const UnkStruct_ov97_0222DB78 Unk_ov112_0225D8C0[5] = { +static const BgTemplate Unk_ov112_0225D8C0[5] = { { 0x0, 0x0, 0x800, diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 4955e393bd..ade65935dc 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -740,7 +740,7 @@ static void ov113_0225CF58(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, @@ -808,7 +808,7 @@ static void ov113_0225CF58(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index 0482aec0c6..361525f34c 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -88,7 +88,7 @@ typedef struct { typedef struct { u32 unk_00; - UnkStruct_ov97_0222DB78 unk_04; + BgTemplate unk_04; } UnkStruct_ov114_02260284; typedef struct { diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index 52bbee27b9..4c407b7192 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -3003,7 +3003,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -3025,7 +3025,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -3047,7 +3047,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -3069,7 +3069,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -3091,7 +3091,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, @@ -3113,7 +3113,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) } { - UnkStruct_ov97_0222DB78 v6 = { + BgTemplate v6 = { 0, 0, 0x800, diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c index d928a18f5a..983f881e34 100644 --- a/src/overlay116/ov116_022604C4.c +++ b/src/overlay116/ov116_022604C4.c @@ -869,7 +869,7 @@ static void ov116_02261494(BGL *param0) MI_CpuClear32((void *)HW_DB_OBJ_VRAM, HW_DB_OBJ_VRAM_SIZE); } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0x0, 0x0, @@ -944,7 +944,7 @@ static void ov116_02261494(BGL *param0) sub_02019EBC(param0, 3); } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index a76b6c7f59..5927d62130 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -672,7 +672,7 @@ static void ov117_022610D8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, 0x1000, @@ -735,7 +735,7 @@ static void ov117_022610D8(BGL *param0) { int v3; - static const UnkStruct_ov97_0222DB78 v4[] = { + static const BgTemplate v4[] = { { 0, 0, 0x800, diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index 9506d73da9..1e178b1cce 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -151,7 +151,7 @@ void ov119_021D0EB8(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, @@ -214,7 +214,7 @@ void ov119_021D0EB8(BGL *param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c index c028829553..00b9245c2b 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_app.c @@ -339,7 +339,7 @@ static void sub_0208C658(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -360,7 +360,7 @@ static void sub_0208C658(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x2000, @@ -382,7 +382,7 @@ static void sub_0208C658(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -402,7 +402,7 @@ static void sub_0208C658(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -422,7 +422,7 @@ static void sub_0208C658(BGL *param0) sub_02019EBC(param0, 4); } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/unk_02039814.c b/src/unk_02039814.c index d5acd2ea6f..561d0ca2d8 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -41,7 +41,7 @@ static const UnkStruct_ov84_0223BA5C Unk_020E5ED0 = { GX_BG0_AS_2D }; -static const UnkStruct_ov97_0222DB78 Unk_020E5EE0 = { +static const BgTemplate Unk_020E5EE0 = { 0x0, 0x0, 0x800, diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index 9b6af15884..07182b61d0 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -41,7 +41,7 @@ static const UnkStruct_ov84_0223BA5C Unk_020E5F50 = { GX_BG0_AS_2D }; -static const UnkStruct_ov97_0222DB78 Unk_020E5F60 = { +static const BgTemplate Unk_020E5F60 = { 0x0, 0x0, 0x800, diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index c29b129887..c4726fe8f7 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -80,7 +80,7 @@ static void sub_020528D0(BGL *param0) GX_BGMODE_0, GX_BG0_AS_2D }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0x800, diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index 5a628f6081..885b6d6200 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -235,7 +235,7 @@ static void sub_02052F28(FieldSystem *fieldSystem, UnkStruct_0205300C *param1) GX_BGMODE_0, GX_BG0_AS_2D }; - static const UnkStruct_ov97_0222DB78 v2 = { + static const BgTemplate v2 = { 0, 0, 0x800, diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index a7ed1bd28c..8bc475f769 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -793,7 +793,7 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BGL *param1) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, @@ -853,7 +853,7 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BGL *param1) } { - UnkStruct_ov97_0222DB78 v3[] = { + BgTemplate v3[] = { { 0, 0, diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index d07d9de683..f083bc4984 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -706,7 +706,7 @@ static void sub_0207E8C0(void) static void sub_0207E8E0(BGL *param0) { - UnkStruct_ov97_0222DB78 v0 = { + BgTemplate v0 = { 0, 0, 0x800, @@ -744,7 +744,7 @@ static void sub_0207E918(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x800, @@ -765,7 +765,7 @@ static void sub_0207E918(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x800, @@ -786,7 +786,7 @@ static void sub_0207E918(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -806,7 +806,7 @@ static void sub_0207E918(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, @@ -827,7 +827,7 @@ static void sub_0207E918(BGL *param0) } { - UnkStruct_ov97_0222DB78 v5 = { + BgTemplate v5 = { 0, 0, 0x800, diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index 2f16cffc44..5024841a21 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -1272,7 +1272,7 @@ static void sub_020871EC(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1 = { + BgTemplate v1 = { 0, 0, 0x1000, @@ -1293,7 +1293,7 @@ static void sub_020871EC(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0, 0, 0x1000, @@ -1314,7 +1314,7 @@ static void sub_020871EC(BGL *param0) } { - UnkStruct_ov97_0222DB78 v3 = { + BgTemplate v3 = { 0, 0, 0x800, @@ -1335,7 +1335,7 @@ static void sub_020871EC(BGL *param0) } { - UnkStruct_ov97_0222DB78 v4 = { + BgTemplate v4 = { 0, 0, 0x800, diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index 9519c12a7f..e71f1c5851 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -230,7 +230,7 @@ static void sub_0208945C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v1[] = { + BgTemplate v1[] = { { 0, 0, @@ -291,7 +291,7 @@ static void sub_0208945C(BGL *param0) } { - UnkStruct_ov97_0222DB78 v2[] = { + BgTemplate v2[] = { { 0, 0, diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index d630d1e073..04e58c1b33 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -197,7 +197,7 @@ static void sub_02099F80(UnkStruct_02099DFC *param0) sub_02018368(&v1); } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0x0, 0x0, 0x800, diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index 2b4bac9c01..143e7b31e4 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -164,7 +164,7 @@ static void sub_0209A3D0(UnkStruct_0209A3D0 *param0) sub_02018368(&v1); } { - UnkStruct_ov97_0222DB78 v2 = { + BgTemplate v2 = { 0x0, 0x0, 0x800, diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index 0b2b9aa88f..b628086906 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -39,7 +39,7 @@ static const UnkStruct_ov84_0223BA5C Unk_020F8ACC = { GX_BG0_AS_2D }; -static const UnkStruct_ov97_0222DB78 Unk_020F8ADC = { +static const BgTemplate Unk_020F8ADC = { 0x0, 0x0, 0x800, diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index cb78110ab2..c6d3b88964 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -41,7 +41,7 @@ static const UnkStruct_ov84_0223BA5C Unk_020F8B28 = { GX_BG0_AS_2D }; -static const UnkStruct_ov97_0222DB78 Unk_020F8B38 = { +static const BgTemplate Unk_020F8B38 = { 0x0, 0x0, 0x800, From 85f6ad9c09dd450b1e7b8c93ad9eeeed05088080 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 20 Oct 2024 01:00:02 -0700 Subject: [PATCH 04/13] Identify UnkStruct_02019304 -> Background and document fields --- include/bg_window.h | 38 +++-- src/bg_window.c | 394 ++++++++++++++++++++++---------------------- 2 files changed, 218 insertions(+), 214 deletions(-) diff --git a/include/bg_window.h b/include/bg_window.h index 295d4bc545..2e7f0b5330 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -46,28 +46,32 @@ typedef struct BgTemplate { BOOL mosaic; } BgTemplate; -typedef struct { - void *unk_00; - u32 unk_04; - u32 unk_08; - int unk_0C; - int unk_10; - u8 unk_14; - u8 unk_15; - u8 unk_16; - u8 unk_17; - u16 unk_18; - fx32 unk_1C; - fx32 unk_20; - int unk_24; - int unk_28; -} UnkStruct_02019304; +typedef struct Background { + void *tilemapBuffer; + u32 bufferSize; + u32 baseTile; + + int xOffset; + int yOffset; + + u8 type; + u8 screenSize; + u8 colorMode; + u8 tileSize; + + u16 rotation; + + fx32 xScale; + fx32 yScale; + int xCenter; + int yCenter; +} Background; typedef struct UnkStruct_02018340_t { u32 unk_00; u16 unk_04; u16 unk_06; - UnkStruct_02019304 unk_08[8]; + Background unk_08[8]; } BGL; typedef struct { diff --git a/src/bg_window.c b/src/bg_window.c index 454538b5b3..021f96ae2a 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -14,15 +14,15 @@ enum { }; static u8 sub_02018F80(u8 param0, u8 param1); -static void sub_02019304(UnkStruct_02019304 *param0, u8 param1, int param2); +static void sub_02019304(Background *param0, u8 param1, int param2); static void sub_020193E4(BGL *param0, u8 param1); static void sub_020194E0(u8 param0, void *param1, u32 param2, u32 param3); static void sub_020195B8(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4); static void sub_020195FC(u8 param0, void *param1, u32 param2, u32 param3); -static void sub_020199E0(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); -static void sub_02019B54(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); -static void sub_02019D08(UnkStruct_02019304 *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); -static void sub_02019DB8(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5); +static void sub_020199E0(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); +static void sub_02019B54(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); +static void sub_02019D08(Background *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); +static void sub_02019DB8(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5); static void sub_0201AC20(Window *param0); static void sub_0201AC4C(Window *param0); static void sub_0201AC64(Window *param0); @@ -38,9 +38,9 @@ static void sub_0201AA58(Window *param0); static void sub_0201AADC(Window *param0); static void sub_0201AB38(Window *param0); static void sub_0201ABC8(Window *param0); -static void sub_0201C684(UnkStruct_02019304 *param0, u8 param1, u16 param2); -static void sub_0201C6CC(UnkStruct_02019304 *param0, u8 param1, fx32 param2); -static void sub_0201C73C(UnkStruct_02019304 *param0, u8 param1, int param2); +static void sub_0201C684(Background *param0, u8 param1, u16 param2); +static void sub_0201C6CC(Background *param0, u8 param1, fx32 param2); +static void sub_0201C73C(Background *param0, u8 param1, int param2); static void sub_0201C3D0(BGL *param0); static void sub_0201C2D0(BGL *param0); @@ -192,33 +192,33 @@ void sub_020183C4(BGL *param0, u8 param1, const BgTemplate *param2, u8 param3) break; } - param0->unk_08[param1].unk_18 = 0; - param0->unk_08[param1].unk_1C = FX32_ONE; - param0->unk_08[param1].unk_20 = FX32_ONE; - param0->unk_08[param1].unk_24 = 0; - param0->unk_08[param1].unk_28 = 0; + param0->unk_08[param1].rotation = 0; + param0->unk_08[param1].xScale = FX32_ONE; + param0->unk_08[param1].yScale = FX32_ONE; + param0->unk_08[param1].xCenter = 0; + param0->unk_08[param1].yCenter = 0; if (param2->bufferSize) { - param0->unk_08[param1].unk_00 = Heap_AllocFromHeap(param0->unk_00, param2->bufferSize); + param0->unk_08[param1].tilemapBuffer = Heap_AllocFromHeap(param0->unk_00, param2->bufferSize); - MI_CpuClear16(param0->unk_08[param1].unk_00, param2->bufferSize); + MI_CpuClear16(param0->unk_08[param1].tilemapBuffer, param2->bufferSize); - param0->unk_08[param1].unk_04 = param2->bufferSize; - param0->unk_08[param1].unk_08 = param2->baseTile; + param0->unk_08[param1].bufferSize = param2->bufferSize; + param0->unk_08[param1].baseTile = param2->baseTile; } else { - param0->unk_08[param1].unk_00 = NULL; - param0->unk_08[param1].unk_04 = 0; - param0->unk_08[param1].unk_08 = 0; + param0->unk_08[param1].tilemapBuffer = NULL; + param0->unk_08[param1].bufferSize = 0; + param0->unk_08[param1].baseTile = 0; } - param0->unk_08[param1].unk_15 = param2->screenSize; - param0->unk_08[param1].unk_14 = param3; - param0->unk_08[param1].unk_16 = param2->colorMode; + param0->unk_08[param1].screenSize = param2->screenSize; + param0->unk_08[param1].type = param3; + param0->unk_08[param1].colorMode = param2->colorMode; if ((param3 == 0) && (param2->colorMode == GX_BG_COLORMODE_16)) { - param0->unk_08[param1].unk_17 = 0x20; + param0->unk_08[param1].tileSize = 0x20; } else { - param0->unk_08[param1].unk_17 = 0x40; + param0->unk_08[param1].tileSize = 0x40; } sub_02019184(param0, param1, 0, param2->x); @@ -228,7 +228,7 @@ void sub_020183C4(BGL *param0, u8 param1, const BgTemplate *param2, u8 param3) void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) { if (param2 == 0) { - param0->unk_08[param1].unk_16 = param3; + param0->unk_08[param1].colorMode = param3; } switch (param1) { @@ -241,7 +241,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v0.charBase = param3; } - G2_SetBG0Control((GXBGScrSizeText)v0.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v0.screenBase, (GXBGCharBase)v0.charBase, (GXBGExtPltt)v0.bgExtPltt); + G2_SetBG0Control((GXBGScrSizeText)v0.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v0.screenBase, (GXBGCharBase)v0.charBase, (GXBGExtPltt)v0.bgExtPltt); } break; case 1: { GXBg01Control v1 = G2_GetBG1Control(); @@ -252,10 +252,10 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v1.charBase = param3; } - G2_SetBG1Control((GXBGScrSizeText)v1.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v1.screenBase, (GXBGCharBase)v1.charBase, (GXBGExtPltt)v1.bgExtPltt); + G2_SetBG1Control((GXBGScrSizeText)v1.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v1.screenBase, (GXBGCharBase)v1.charBase, (GXBGExtPltt)v1.bgExtPltt); } break; case 2: - switch (param0->unk_08[param1].unk_14) { + switch (param0->unk_08[param1].type) { default: case 0: { GXBg23ControlText v2 = G2_GetBG2ControlText(); @@ -266,7 +266,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v2.charBase = param3; } - G2_SetBG2ControlText((GXBGScrSizeText)v2.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v2.screenBase, (GXBGCharBase)v2.charBase); + G2_SetBG2ControlText((GXBGScrSizeText)v2.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v2.screenBase, (GXBGCharBase)v2.charBase); } break; case 1: { GXBg23ControlAffine v3 = G2_GetBG2ControlAffine(); @@ -294,7 +294,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) break; case 3: - switch (param0->unk_08[param1].unk_14) { + switch (param0->unk_08[param1].type) { default: case 0: { GXBg23ControlText v5 = G2_GetBG3ControlText(); @@ -305,7 +305,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v5.charBase = param3; } - G2_SetBG3ControlText((GXBGScrSizeText)v5.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v5.screenBase, (GXBGCharBase)v5.charBase); + G2_SetBG3ControlText((GXBGScrSizeText)v5.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v5.screenBase, (GXBGCharBase)v5.charBase); } break; case 1: { GXBg23ControlAffine v6 = G2_GetBG3ControlAffine(); @@ -341,7 +341,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v8.charBase = param3; } - G2S_SetBG0Control((GXBGScrSizeText)v8.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v8.screenBase, (GXBGCharBase)v8.charBase, (GXBGExtPltt)v8.bgExtPltt); + G2S_SetBG0Control((GXBGScrSizeText)v8.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v8.screenBase, (GXBGCharBase)v8.charBase, (GXBGExtPltt)v8.bgExtPltt); } break; case 5: { GXBg01Control v9 = G2S_GetBG1Control(); @@ -352,10 +352,10 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v9.charBase = param3; } - G2S_SetBG1Control((GXBGScrSizeText)v9.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v9.screenBase, (GXBGCharBase)v9.charBase, (GXBGExtPltt)v9.bgExtPltt); + G2S_SetBG1Control((GXBGScrSizeText)v9.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v9.screenBase, (GXBGCharBase)v9.charBase, (GXBGExtPltt)v9.bgExtPltt); } break; case 6: - switch (param0->unk_08[param1].unk_14) { + switch (param0->unk_08[param1].type) { default: case 0: { GXBg23ControlText v10 = G2S_GetBG2ControlText(); @@ -366,7 +366,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v10.charBase = param3; } - G2S_SetBG2ControlText((GXBGScrSizeText)v10.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v10.screenBase, (GXBGCharBase)v10.charBase); + G2S_SetBG2ControlText((GXBGScrSizeText)v10.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v10.screenBase, (GXBGCharBase)v10.charBase); } break; case 1: { GXBg23ControlAffine v11 = G2S_GetBG2ControlAffine(); @@ -394,7 +394,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) break; case 7: - switch (param0->unk_08[param1].unk_14) { + switch (param0->unk_08[param1].type) { default: case 0: { GXBg23ControlText v13 = G2S_GetBG3ControlText(); @@ -405,7 +405,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v13.charBase = param3; } - G2S_SetBG3ControlText((GXBGScrSizeText)v13.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v13.screenBase, (GXBGCharBase)v13.charBase); + G2S_SetBG3ControlText((GXBGScrSizeText)v13.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v13.screenBase, (GXBGCharBase)v13.charBase); } break; case 1: { GXBg23ControlAffine v14 = G2S_GetBG3ControlAffine(); @@ -525,12 +525,12 @@ static void sub_02018FF4(u8 param0, u8 *param1, u8 *param2) void sub_02019044(BGL *param0, u8 param1) { - if (param0->unk_08[param1].unk_00 == NULL) { + if (param0->unk_08[param1].tilemapBuffer == NULL) { return; } - Heap_FreeToHeap(param0->unk_08[param1].unk_00); - param0->unk_08[param1].unk_00 = NULL; + Heap_FreeToHeap(param0->unk_08[param1].tilemapBuffer); + param0->unk_08[param1].tilemapBuffer = NULL; } void BGL_SetPriority(u8 param0, u8 param1) @@ -599,8 +599,8 @@ void sub_02019184(BGL *param0, u8 param1, u8 param2, int param3) sub_02019304(¶m0->unk_08[param1], param2, param3); - v0 = param0->unk_08[param1].unk_0C; - v1 = param0->unk_08[param1].unk_10; + v0 = param0->unk_08[param1].xOffset; + v1 = param0->unk_08[param1].yOffset; switch (param1) { case 0: @@ -610,14 +610,14 @@ void sub_02019184(BGL *param0, u8 param1, u8 param2, int param3) G2_SetBG1Offset(v0, v1); return; case 2: - if (param0->unk_08[2].unk_14 == 0) { + if (param0->unk_08[2].type == 0) { G2_SetBG2Offset(v0, v1); } else { sub_020193E4(param0, 2); } return; case 3: - if (param0->unk_08[3].unk_14 == 0) { + if (param0->unk_08[3].type == 0) { G2_SetBG3Offset(v0, v1); } else { sub_020193E4(param0, 3); @@ -630,14 +630,14 @@ void sub_02019184(BGL *param0, u8 param1, u8 param2, int param3) G2S_SetBG1Offset(v0, v1); return; case 6: - if (param0->unk_08[6].unk_14 == 0) { + if (param0->unk_08[6].type == 0) { G2S_SetBG2Offset(v0, v1); } else { sub_020193E4(param0, 6); } return; case 7: - if (param0->unk_08[7].unk_14 == 0) { + if (param0->unk_08[7].type == 0) { G2S_SetBG3Offset(v0, v1); } else { sub_020193E4(param0, 7); @@ -649,34 +649,34 @@ void sub_02019184(BGL *param0, u8 param1, u8 param2, int param3) int sub_020192EC(BGL *param0, u32 param1) { - return param0->unk_08[param1].unk_0C; + return param0->unk_08[param1].xOffset; } int sub_020192F8(BGL *param0, u32 param1) { - return param0->unk_08[param1].unk_10; + return param0->unk_08[param1].yOffset; } -static void sub_02019304(UnkStruct_02019304 *param0, u8 param1, int param2) +static void sub_02019304(Background *param0, u8 param1, int param2) { switch (param1) { case 0: - param0->unk_0C = param2; + param0->xOffset = param2; break; case 1: - param0->unk_0C += param2; + param0->xOffset += param2; break; case 2: - param0->unk_0C -= param2; + param0->xOffset -= param2; break; case 3: - param0->unk_10 = param2; + param0->yOffset = param2; break; case 4: - param0->unk_10 += param2; + param0->yOffset += param2; break; case 5: - param0->unk_10 -= param2; + param0->yOffset -= param2; break; } } @@ -685,16 +685,16 @@ void sub_02019348(BGL *param0, u8 param1, const MtxFx22 *param2, int param3, int { switch (param1) { case 2: - G2_SetBG2Affine(param2, param3, param4, param0->unk_08[param1].unk_0C, param0->unk_08[param1].unk_10); + G2_SetBG2Affine(param2, param3, param4, param0->unk_08[param1].xOffset, param0->unk_08[param1].yOffset); return; case 3: - G2_SetBG3Affine(param2, param3, param4, param0->unk_08[param1].unk_0C, param0->unk_08[param1].unk_10); + G2_SetBG3Affine(param2, param3, param4, param0->unk_08[param1].xOffset, param0->unk_08[param1].yOffset); return; case 6: - G2S_SetBG2Affine(param2, param3, param4, param0->unk_08[param1].unk_0C, param0->unk_08[param1].unk_10); + G2S_SetBG2Affine(param2, param3, param4, param0->unk_08[param1].xOffset, param0->unk_08[param1].yOffset); return; case 7: - G2S_SetBG3Affine(param2, param3, param4, param0->unk_08[param1].unk_0C, param0->unk_08[param1].unk_10); + G2S_SetBG3Affine(param2, param3, param4, param0->unk_08[param1].xOffset, param0->unk_08[param1].yOffset); return; } } @@ -722,7 +722,7 @@ void sub_02019410(const void *param0, void *param1, u32 param2) void sub_02019448(BGL *param0, u8 param1) { - sub_02019460(param0, param1, param0->unk_08[param1].unk_00, param0->unk_08[param1].unk_04, param0->unk_08[param1].unk_08); + sub_02019460(param0, param1, param0->unk_08[param1].tilemapBuffer, param0->unk_08[param1].bufferSize, param0->unk_08[param1].baseTile); } void sub_02019460(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4) @@ -730,10 +730,10 @@ void sub_02019460(BGL *param0, u8 param1, const void *param2, u32 param3, u32 pa void *v0; if (param3 == 0) { - if (param0->unk_08[param1].unk_00 != NULL) { - v0 = param0->unk_08[param1].unk_00; + if (param0->unk_08[param1].tilemapBuffer != NULL) { + v0 = param0->unk_08[param1].tilemapBuffer; sub_02019410(param2, v0, param3); - sub_020194E0(param1, v0, param0->unk_08[param1].unk_08 * 0x2, param0->unk_08[param1].unk_04); + sub_020194E0(param1, v0, param0->unk_08[param1].baseTile * 0x2, param0->unk_08[param1].bufferSize); } else { u32 v1; @@ -783,12 +783,12 @@ static void sub_020194E0(u8 param0, void *param1, u32 param2, u32 param3) void sub_02019574(BGL *param0, u8 param1, const void *param2, u32 param3) { - sub_02019410(param2, param0->unk_08[param1].unk_00, param3); + sub_02019410(param2, param0->unk_08[param1].tilemapBuffer, param3); } void sub_0201958C(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4) { - if (param0->unk_08[param1].unk_16 == GX_BG_COLORMODE_16) { + if (param0->unk_08[param1].colorMode == GX_BG_COLORMODE_16) { sub_020195B8(param0, param1, param2, param3, param4 * 0x20); } else { sub_020195B8(param0, param1, param2, param3, param4 * 0x40); @@ -860,10 +860,10 @@ void sub_020196C0(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4) u32 *v0; u32 v1; - v1 = param3 * param0->unk_08[param1].unk_17; + v1 = param3 * param0->unk_08[param1].tileSize; v0 = (u32 *)Heap_AllocFromHeapAtEnd(param0->unk_00, v1); - if (param0->unk_08[param1].unk_17 == 0x20) { + if (param0->unk_08[param1].tileSize == 0x20) { param2 = (param2 << 12) | (param2 << 8) | (param2 << 4) | param2; param2 |= (param2 << 16); } else { @@ -872,7 +872,7 @@ void sub_020196C0(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4) MI_CpuFillFast(v0, param2, v1); - sub_020195FC(param1, (void *)v0, param4 * param0->unk_08[param1].unk_17, v1); + sub_020195FC(param1, (void *)v0, param4 * param0->unk_08[param1].tileSize, v1); Heap_FreeToHeap(v0); } @@ -976,7 +976,7 @@ void sub_020198C0(BGL *param0, u8 param1, const void *param2, u8 param3, u8 para void sub_020198E8(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) { - if (param0->unk_08[param1].unk_14 != 1) { + if (param0->unk_08[param1].type != 1) { sub_020199E0(¶m0->unk_08[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 0); } else { sub_02019B54(¶m0->unk_08[param1], param2, param3, param4, param5, (u8 *)param6, param7, param8, param9, param10, 0); @@ -985,25 +985,25 @@ void sub_020198E8(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 pa void sub_02019964(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) { - if (param0->unk_08[param1].unk_14 != 1) { + if (param0->unk_08[param1].type != 1) { sub_020199E0(¶m0->unk_08[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 1); } else { sub_02019B54(¶m0->unk_08[param1], param2, param3, param4, param5, (u8 *)param6, param7, param8, param9, param10, 1); } } -static void sub_020199E0(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10) +static void sub_020199E0(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10) { u16 *v0; u8 v1, v2; u8 v3, v4; - if (param0->unk_00 == NULL) { + if (param0->tilemapBuffer == NULL) { return; } - v0 = (u16 *)param0->unk_00; - sub_02018FF4(param0->unk_15, &v1, &v2); + v0 = (u16 *)param0->tilemapBuffer; + sub_02018FF4(param0->screenSize, &v1, &v2); if (param10 == 0) { for (v3 = 0; v3 < param4; v3++) { @@ -1016,7 +1016,7 @@ static void sub_020199E0(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 pa break; } - v0[sub_02019774(param1 + v4, param2 + v3, param0->unk_15)] = param5[(param7 + v3) * param8 + param6 + v4]; + v0[sub_02019774(param1 + v4, param2 + v3, param0->screenSize)] = param5[(param7 + v3) * param8 + param6 + v4]; } } } else { @@ -1030,24 +1030,24 @@ static void sub_020199E0(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 pa break; } - v0[sub_02019774(param1 + v4, param2 + v3, param0->unk_15)] = param5[sub_020197E0(param6 + v4, param7 + v3, param8, param9)]; + v0[sub_02019774(param1 + v4, param2 + v3, param0->screenSize)] = param5[sub_020197E0(param6 + v4, param7 + v3, param8, param9)]; } } } } -static void sub_02019B54(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10) +static void sub_02019B54(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10) { u8 *v0; u8 v1, v2; u8 v3, v4; - if (param0->unk_00 == NULL) { + if (param0->tilemapBuffer == NULL) { return; } - v0 = (u8 *)param0->unk_00; - sub_02018FF4(param0->unk_15, &v1, &v2); + v0 = (u8 *)param0->tilemapBuffer; + sub_02018FF4(param0->screenSize, &v1, &v2); if (param10 == 0) { for (v3 = 0; v3 < param4; v3++) { @@ -1060,7 +1060,7 @@ static void sub_02019B54(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 pa break; } - v0[sub_02019774(param1 + v4, param2 + v3, param0->unk_15)] = param5[(param7 + v3) * param8 + param6 + v4]; + v0[sub_02019774(param1 + v4, param2 + v3, param0->screenSize)] = param5[(param7 + v3) * param8 + param6 + v4]; } } } else { @@ -1074,7 +1074,7 @@ static void sub_02019B54(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 pa break; } - v0[sub_02019774(param1 + v4, param2 + v3, param0->unk_15)] = param5[sub_020197E0(param6 + v4, param7 + v3, param8, param9)]; + v0[sub_02019774(param1 + v4, param2 + v3, param0->screenSize)] = param5[sub_020197E0(param6 + v4, param7 + v3, param8, param9)]; } } } @@ -1082,25 +1082,25 @@ static void sub_02019B54(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 pa void sub_02019CB8(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7) { - if (param0->unk_08[param1].unk_14 != 1) { + if (param0->unk_08[param1].type != 1) { sub_02019D08(¶m0->unk_08[param1], param2, param3, param4, param5, param6, param7); } else { sub_02019DB8(¶m0->unk_08[param1], (u8)param2, param3, param4, param5, param6); } } -static void sub_02019D08(UnkStruct_02019304 *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) +static void sub_02019D08(Background *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) { u16 *v0; u8 v1, v2; u8 v3, v4; - if (param0->unk_00 == NULL) { + if (param0->tilemapBuffer == NULL) { return; } - v0 = (u16 *)param0->unk_00; - sub_02018FF4(param0->unk_15, &v1, &v2); + v0 = (u16 *)param0->tilemapBuffer; + sub_02018FF4(param0->screenSize, &v1, &v2); for (v3 = param3; v3 < param3 + param5; v3++) { if (v3 >= v2) { @@ -1113,7 +1113,7 @@ static void sub_02019D08(UnkStruct_02019304 *param0, u16 param1, u8 param2, u8 p } { - u16 v5 = sub_02019774(v4, v3, param0->unk_15); + u16 v5 = sub_02019774(v4, v3, param0->screenSize); if (param6 == 17) { v0[v5] = param1; @@ -1127,18 +1127,18 @@ static void sub_02019D08(UnkStruct_02019304 *param0, u16 param1, u8 param2, u8 p } } -static void sub_02019DB8(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5) +static void sub_02019DB8(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5) { u8 *v0; u8 v1, v2; u8 v3, v4; - if (param0->unk_00 == NULL) { + if (param0->tilemapBuffer == NULL) { return; } - v0 = (u8 *)param0->unk_00; - sub_02018FF4(param0->unk_15, &v1, &v2); + v0 = (u8 *)param0->tilemapBuffer; + sub_02018FF4(param0->screenSize, &v1, &v2); for (v3 = param3; v3 < param3 + param5; v3++) { if (v3 >= v2) { @@ -1150,7 +1150,7 @@ static void sub_02019DB8(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 pa break; } - v0[sub_02019774(v4, v3, param0->unk_15)] = param1; + v0[sub_02019774(v4, v3, param0->screenSize)] = param1; } } } @@ -1161,12 +1161,12 @@ void sub_02019E2C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 pa u8 v1, v2; u8 v3, v4; - if (param0->unk_08[param1].unk_00 == NULL) { + if (param0->unk_08[param1].tilemapBuffer == NULL) { return; } - v0 = (u16 *)param0->unk_08[param1].unk_00; - sub_02018FF4(param0->unk_08[param1].unk_15, &v1, &v2); + v0 = (u16 *)param0->unk_08[param1].tilemapBuffer; + sub_02018FF4(param0->unk_08[param1].screenSize, &v1, &v2); for (v3 = param3; v3 < param3 + param5; v3++) { if (v3 >= v2) { @@ -1179,7 +1179,7 @@ void sub_02019E2C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 pa } { - u16 v5 = sub_02019774(v4, v3, param0->unk_08[param1].unk_15); + u16 v5 = sub_02019774(v4, v3, param0->unk_08[param1].screenSize); v0[v5] = (v0[v5] & 0xfff) | (param6 << 12); } } @@ -1188,31 +1188,31 @@ void sub_02019E2C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 pa void sub_02019EBC(BGL *param0, u8 param1) { - if (param0->unk_08[param1].unk_00 == NULL) { + if (param0->unk_08[param1].tilemapBuffer == NULL) { return; } - MI_CpuClear16(param0->unk_08[param1].unk_00, param0->unk_08[param1].unk_04); + MI_CpuClear16(param0->unk_08[param1].tilemapBuffer, param0->unk_08[param1].bufferSize); sub_02019448(param0, param1); } void sub_02019EE0(BGL *param0, u8 param1, u16 param2) { - if (param0->unk_08[param1].unk_00 == NULL) { + if (param0->unk_08[param1].tilemapBuffer == NULL) { return; } - MI_CpuFill16(param0->unk_08[param1].unk_00, param2, param0->unk_08[param1].unk_04); + MI_CpuFill16(param0->unk_08[param1].tilemapBuffer, param2, param0->unk_08[param1].bufferSize); sub_02019448(param0, param1); } void sub_02019F04(BGL *param0, u8 param1, u16 param2) { - if (param0->unk_08[param1].unk_00 == NULL) { + if (param0->unk_08[param1].tilemapBuffer == NULL) { return; } - MI_CpuFill16(param0->unk_08[param1].unk_00, param2, param0->unk_08[param1].unk_04); + MI_CpuFill16(param0->unk_08[param1].tilemapBuffer, param2, param0->unk_08[param1].bufferSize); sub_0201C3C0(param0, param1); } @@ -1273,17 +1273,17 @@ void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3) void *sub_02019FE4(BGL *param0, u8 param1) { - return param0->unk_08[param1].unk_00; + return param0->unk_08[param1].tilemapBuffer; } int sub_02019FF0(BGL *param0, u8 param1) { - return param0->unk_08[param1].unk_0C; + return param0->unk_08[param1].xOffset; } u16 sub_02019FFC(BGL *param0, u8 param1) { - return param0->unk_08[param1].unk_18; + return param0->unk_08[param1].rotation; } u8 sub_0201A008(BGL *param0, u8 param1) @@ -1298,7 +1298,7 @@ u8 sub_0201A008(BGL *param0, u8 param1) return (u8)v1.priority; } case 2: - switch (param0->unk_08[param1].unk_14) { + switch (param0->unk_08[param1].type) { default: case 0: { GXBg23ControlText v2 = G2_GetBG2ControlText(); @@ -1315,7 +1315,7 @@ u8 sub_0201A008(BGL *param0, u8 param1) } case 3: - switch (param0->unk_08[param1].unk_14) { + switch (param0->unk_08[param1].type) { default: case 0: { GXBg23ControlText v5 = G2_GetBG3ControlText(); @@ -1340,7 +1340,7 @@ u8 sub_0201A008(BGL *param0, u8 param1) return (u8)v9.priority; } case 6: - switch (param0->unk_08[param1].unk_14) { + switch (param0->unk_08[param1].type) { default: case 0: { GXBg23ControlText v10 = G2S_GetBG2ControlText(); @@ -1357,7 +1357,7 @@ u8 sub_0201A008(BGL *param0, u8 param1) } case 7: - switch (param0->unk_08[param1].unk_14) { + switch (param0->unk_08[param1].type) { default: case 0: { GXBg23ControlText v13 = G2S_GetBG3ControlText(); @@ -1571,11 +1571,11 @@ void BGL_AddWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u8 param4, void *v0; u32 v1; - if (param0->unk_08[param2].unk_00 == NULL) { + if (param0->unk_08[param2].tilemapBuffer == NULL) { return; } - v1 = param5 * param6 * param0->unk_08[param2].unk_17; + v1 = param5 * param6 * param0->unk_08[param2].tileSize; v0 = Heap_AllocFromHeap(param0->unk_00, v1); if (v0 == NULL) { @@ -1591,7 +1591,7 @@ void BGL_AddWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u8 param4, param1->unk_09 = param7; param1->unk_0A_0 = param8; param1->unk_0C = v0; - param1->unk_0A_15 = (param0->unk_08[param2].unk_16 == GX_BG_COLORMODE_16) ? UnkEnum_00 : UnkEnum_01; + param1->unk_0A_15 = (param0->unk_08[param2].colorMode == GX_BG_COLORMODE_16) ? UnkEnum_00 : UnkEnum_01; } void BGL_AddFramelessWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5) @@ -1703,9 +1703,9 @@ void sub_0201A954(Window *param0) GF_ASSERT(param0 != NULL); GF_ASSERT(param0->unk_00 != NULL); GF_ASSERT(param0->unk_04 < 8); - GF_ASSERT(param0->unk_00->unk_08[param0->unk_04].unk_14 < NELEMS(Unk_020E56CC)); + GF_ASSERT(param0->unk_00->unk_08[param0->unk_04].type < NELEMS(Unk_020E56CC)); - Unk_020E56CC[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); + Unk_020E56CC[param0->unk_00->unk_08[param0->unk_04].type](param0); } void sub_0201A9A4(Window *param0) @@ -1713,14 +1713,14 @@ void sub_0201A9A4(Window *param0) GF_ASSERT(param0 != NULL); GF_ASSERT(param0->unk_00 != NULL); GF_ASSERT(param0->unk_04 < 8); - GF_ASSERT(param0->unk_00->unk_08[param0->unk_04].unk_14 < NELEMS(Unk_020E56C0)); + GF_ASSERT(param0->unk_00->unk_08[param0->unk_04].type < NELEMS(Unk_020E56C0)); - Unk_020E56C0[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); + Unk_020E56C0[param0->unk_00->unk_08[param0->unk_04].type](param0); } void sub_0201A9F4(Window *param0) { - Unk_020E569C[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); + Unk_020E569C[param0->unk_00->unk_08[param0->unk_04].type](param0); } void sub_0201AA10(Window *param0, u32 param1, u32 param2) @@ -1733,7 +1733,7 @@ void sub_0201AA10(Window *param0, u32 param1, u32 param2) param0->unk_07 = param1; param0->unk_08 = param2; - Unk_020E569C[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); + Unk_020E569C[param0->unk_00->unk_08[param0->unk_04].type](param0); param0->unk_07 = v0; param0->unk_08 = v1; @@ -1741,17 +1741,17 @@ void sub_0201AA10(Window *param0, u32 param1, u32 param2) void sub_0201AA3C(Window *param0) { - Unk_020E56D8[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); + Unk_020E56D8[param0->unk_00->unk_08[param0->unk_04].type](param0); } static void sub_0201AA58(Window *param0) { - if (param0->unk_00->unk_08[param0->unk_04].unk_00) { + if (param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) { u32 v0, v1, v2, v3, v4, v5, v6; u16 *v7; v6 = 32; - v7 = (u16 *)(param0->unk_00->unk_08[param0->unk_04].unk_00); + v7 = (u16 *)(param0->unk_00->unk_08[param0->unk_04].tilemapBuffer); v4 = param0->unk_0A_0; v2 = param0->unk_05 + param0->unk_07; v3 = param0->unk_06 + param0->unk_08; @@ -1768,12 +1768,12 @@ static void sub_0201AA58(Window *param0) static void sub_0201AADC(Window *param0) { - if (param0->unk_00->unk_08[param0->unk_04].unk_00) { + if (param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) { int v0, v1, v2, v3; u8 *v4; - v3 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].unk_15]; - v4 = (u8 *)(param0->unk_00->unk_08[param0->unk_04].unk_00) + param0->unk_06 * v3 + param0->unk_05; + v3 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].screenSize]; + v4 = (u8 *)(param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) + param0->unk_06 * v3 + param0->unk_05; v2 = param0->unk_0A_0; for (v1 = 0; v1 < param0->unk_08; v1++) { @@ -1788,12 +1788,12 @@ static void sub_0201AADC(Window *param0) static void sub_0201AB38(Window *param0) { - if (param0->unk_00->unk_08[param0->unk_04].unk_00) { + if (param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) { u32 v0, v1, v2, v3, v4, v5; u16 *v6; - v5 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].unk_15]; - v6 = (u16 *)(param0->unk_00->unk_08[param0->unk_04].unk_00); + v5 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].screenSize]; + v6 = (u16 *)(param0->unk_00->unk_08[param0->unk_04].tilemapBuffer); v2 = param0->unk_05 + param0->unk_07; v3 = param0->unk_06 + param0->unk_08; @@ -1808,12 +1808,12 @@ static void sub_0201AB38(Window *param0) static void sub_0201ABC8(Window *param0) { - if (param0->unk_00->unk_08[param0->unk_04].unk_00) { + if (param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) { int v0, v1, v2; u8 *v3; - v2 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].unk_15]; - v3 = (u8 *)(param0->unk_00->unk_08[param0->unk_04].unk_00) + param0->unk_06 * v2 + param0->unk_05; + v2 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].screenSize]; + v3 = (u8 *)(param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) + param0->unk_06 * v2 + param0->unk_05; for (v1 = 0; v1 < param0->unk_08; v1++) { for (v0 = 0; v0 < param0->unk_07; v0++) { @@ -1829,7 +1829,7 @@ static void sub_0201AC20(Window *param0) { sub_0201AA58(param0); sub_0201ACCC(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].unk_00, param0->unk_00->unk_08[param0->unk_04].unk_04, param0->unk_00->unk_08[param0->unk_04].unk_08); + sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].tilemapBuffer, param0->unk_00->unk_08[param0->unk_04].bufferSize, param0->unk_00->unk_08[param0->unk_04].baseTile); } static void sub_0201AC4C(Window *param0) @@ -1843,7 +1843,7 @@ static void sub_0201AC64(Window *param0) { sub_0201AADC(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].unk_00, param0->unk_00->unk_08[param0->unk_04].unk_04, param0->unk_00->unk_08[param0->unk_04].unk_08); + sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].tilemapBuffer, param0->unk_00->unk_08[param0->unk_04].bufferSize, param0->unk_00->unk_08[param0->unk_04].baseTile); sub_0201958C(param0->unk_00, param0->unk_04, param0->unk_0C, (u32)(param0->unk_07 * param0->unk_08 * 0x40), (u32)param0->unk_0A_0); } @@ -1857,24 +1857,24 @@ static void sub_0201ACA0(Window *param0) void sub_0201ACCC(Window *param0) { - u32 v0 = param0->unk_07 * param0->unk_08 * param0->unk_00->unk_08[param0->unk_04].unk_17; + u32 v0 = param0->unk_07 * param0->unk_08 * param0->unk_00->unk_08[param0->unk_04].tileSize; sub_0201958C(param0->unk_00, param0->unk_04, param0->unk_0C, v0, param0->unk_0A_0); } void sub_0201ACF4(Window *param0) { - Unk_020E56B4[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); + Unk_020E56B4[param0->unk_00->unk_08[param0->unk_04].type](param0); } void sub_0201AD10(Window *param0) { - Unk_020E56A8[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); + Unk_020E56A8[param0->unk_00->unk_08[param0->unk_04].type](param0); } static void sub_0201AD2C(Window *param0) { sub_0201AB38(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].unk_00, param0->unk_00->unk_08[param0->unk_04].unk_04, param0->unk_00->unk_08[param0->unk_04].unk_08); + sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].tilemapBuffer, param0->unk_00->unk_08[param0->unk_04].bufferSize, param0->unk_00->unk_08[param0->unk_04].baseTile); } static void sub_0201AD54(Window *param0) @@ -1886,7 +1886,7 @@ static void sub_0201AD54(Window *param0) static void sub_0201AD68(Window *param0) { sub_0201ABC8(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].unk_00, param0->unk_00->unk_08[param0->unk_04].unk_04, param0->unk_00->unk_08[param0->unk_04].unk_08); + sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].tilemapBuffer, param0->unk_00->unk_08[param0->unk_04].bufferSize, param0->unk_00->unk_08[param0->unk_04].baseTile); } static void sub_0201AD90(Window *param0) @@ -1900,12 +1900,12 @@ void BGL_FillWindow(Window *param0, u8 param1) u32 v0; u32 v1; - if (param0->unk_00->unk_08[param0->unk_04].unk_17 == 0x20) { + if (param0->unk_00->unk_08[param0->unk_04].tileSize == 0x20) { param1 = (param1 << 4) | param1; } v1 = (param1 << 24) | (param1 << 16) | (param1 << 8) | param1; - v0 = param0->unk_00->unk_08[param0->unk_04].unk_17 * param0->unk_07 * param0->unk_08; + v0 = param0->unk_00->unk_08[param0->unk_04].tileSize * param0->unk_07 * param0->unk_08; MI_CpuFillFast(param0->unk_0C, v1, v0); } @@ -1927,7 +1927,7 @@ void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 para v1.width = (u16)(param0->unk_07 * 0x8); v1.height = (u16)(param0->unk_08 * 0x8); - if (param0->unk_00->unk_08[param0->unk_04].unk_16 == GX_BG_COLORMODE_16) { + if (param0->unk_00->unk_08[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { sub_0201A1E4(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); } else { sub_0201A424(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); @@ -1942,7 +1942,7 @@ void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 para v0.width = (u16)(param0->unk_07 * 0x8); v0.height = (u16)(param0->unk_08 * 0x8); - if (param0->unk_00->unk_08[param0->unk_04].unk_16 == GX_BG_COLORMODE_16) { + if (param0->unk_00->unk_08[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { sub_0201A60C((const Bitmap *)&v0, param2, param3, param4, param5, param1); } else { sub_0201A6D0((const Bitmap *)&v0, param2, param3, param4, param5, param1); @@ -2974,7 +2974,7 @@ void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 void sub_0201C04C(Window *param0, u8 param1, u8 param2, u8 param3) { - if (param0->unk_00->unk_08[param0->unk_04].unk_16 == GX_BG_COLORMODE_16) { + if (param0->unk_00->unk_08[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { sub_0201C06C(param0, param1, param2, param3); } else { sub_0201C158(param0, param1, param2, param3); @@ -3180,35 +3180,35 @@ void sub_0201C2B8(BGL *param0) static void sub_0201C2D0(BGL *param0) { if ((param0->unk_06 & 1) != 0) { - sub_020194E0(0, param0->unk_08[0].unk_00, param0->unk_08[0].unk_08 * 0x2, param0->unk_08[0].unk_04); + sub_020194E0(0, param0->unk_08[0].tilemapBuffer, param0->unk_08[0].baseTile * 0x2, param0->unk_08[0].bufferSize); } if ((param0->unk_06 & 2) != 0) { - sub_020194E0(1, param0->unk_08[1].unk_00, param0->unk_08[1].unk_08 * 0x2, param0->unk_08[1].unk_04); + sub_020194E0(1, param0->unk_08[1].tilemapBuffer, param0->unk_08[1].baseTile * 0x2, param0->unk_08[1].bufferSize); } if ((param0->unk_06 & 4) != 0) { - sub_020194E0(2, param0->unk_08[2].unk_00, param0->unk_08[2].unk_08 * 0x2, param0->unk_08[2].unk_04); + sub_020194E0(2, param0->unk_08[2].tilemapBuffer, param0->unk_08[2].baseTile * 0x2, param0->unk_08[2].bufferSize); } if ((param0->unk_06 & 8) != 0) { - sub_020194E0(3, param0->unk_08[3].unk_00, param0->unk_08[3].unk_08 * 0x2, param0->unk_08[3].unk_04); + sub_020194E0(3, param0->unk_08[3].tilemapBuffer, param0->unk_08[3].baseTile * 0x2, param0->unk_08[3].bufferSize); } if ((param0->unk_06 & 16) != 0) { - sub_020194E0(4, param0->unk_08[4].unk_00, param0->unk_08[4].unk_08 * 0x2, param0->unk_08[4].unk_04); + sub_020194E0(4, param0->unk_08[4].tilemapBuffer, param0->unk_08[4].baseTile * 0x2, param0->unk_08[4].bufferSize); } if ((param0->unk_06 & 32) != 0) { - sub_020194E0(5, param0->unk_08[5].unk_00, param0->unk_08[5].unk_08 * 0x2, param0->unk_08[5].unk_04); + sub_020194E0(5, param0->unk_08[5].tilemapBuffer, param0->unk_08[5].baseTile * 0x2, param0->unk_08[5].bufferSize); } if ((param0->unk_06 & 64) != 0) { - sub_020194E0(6, param0->unk_08[6].unk_00, param0->unk_08[6].unk_08 * 0x2, param0->unk_08[6].unk_04); + sub_020194E0(6, param0->unk_08[6].tilemapBuffer, param0->unk_08[6].baseTile * 0x2, param0->unk_08[6].bufferSize); } if ((param0->unk_06 & 128) != 0) { - sub_020194E0(7, param0->unk_08[7].unk_00, param0->unk_08[7].unk_08 * 0x2, param0->unk_08[7].unk_04); + sub_020194E0(7, param0->unk_08[7].tilemapBuffer, param0->unk_08[7].baseTile * 0x2, param0->unk_08[7].bufferSize); } } @@ -3220,62 +3220,62 @@ void sub_0201C3C0(BGL *param0, u8 param1) static void sub_0201C3D0(BGL *param0) { if ((param0->unk_04 & 1) != 0) { - G2_SetBG0Offset(param0->unk_08[0].unk_0C, param0->unk_08[0].unk_10); + G2_SetBG0Offset(param0->unk_08[0].xOffset, param0->unk_08[0].yOffset); } if ((param0->unk_04 & 2) != 0) { - G2_SetBG1Offset(param0->unk_08[1].unk_0C, param0->unk_08[1].unk_10); + G2_SetBG1Offset(param0->unk_08[1].xOffset, param0->unk_08[1].yOffset); } if ((param0->unk_04 & 4) != 0) { - if (param0->unk_08[2].unk_14 == 0) { - G2_SetBG2Offset(param0->unk_08[2].unk_0C, param0->unk_08[2].unk_10); + if (param0->unk_08[2].type == 0) { + G2_SetBG2Offset(param0->unk_08[2].xOffset, param0->unk_08[2].yOffset); } else { MtxFx22 v0; - sub_0201D470(&v0, param0->unk_08[2].unk_18, param0->unk_08[2].unk_1C, param0->unk_08[2].unk_20, 2); - G2_SetBG2Affine(&v0, param0->unk_08[2].unk_24, param0->unk_08[2].unk_28, param0->unk_08[2].unk_0C, param0->unk_08[2].unk_10); + sub_0201D470(&v0, param0->unk_08[2].rotation, param0->unk_08[2].xScale, param0->unk_08[2].yScale, 2); + G2_SetBG2Affine(&v0, param0->unk_08[2].xCenter, param0->unk_08[2].yCenter, param0->unk_08[2].xOffset, param0->unk_08[2].yOffset); } } if ((param0->unk_04 & 8) != 0) { - if (param0->unk_08[3].unk_14 == 0) { - G2_SetBG3Offset(param0->unk_08[3].unk_0C, param0->unk_08[3].unk_10); + if (param0->unk_08[3].type == 0) { + G2_SetBG3Offset(param0->unk_08[3].xOffset, param0->unk_08[3].yOffset); } else { MtxFx22 v1; - sub_0201D470(&v1, param0->unk_08[3].unk_18, param0->unk_08[3].unk_1C, param0->unk_08[3].unk_20, 2); - G2_SetBG3Affine(&v1, param0->unk_08[3].unk_24, param0->unk_08[3].unk_28, param0->unk_08[3].unk_0C, param0->unk_08[3].unk_10); + sub_0201D470(&v1, param0->unk_08[3].rotation, param0->unk_08[3].xScale, param0->unk_08[3].yScale, 2); + G2_SetBG3Affine(&v1, param0->unk_08[3].xCenter, param0->unk_08[3].yCenter, param0->unk_08[3].xOffset, param0->unk_08[3].yOffset); } } if ((param0->unk_04 & 16) != 0) { - G2S_SetBG0Offset(param0->unk_08[4].unk_0C, param0->unk_08[4].unk_10); + G2S_SetBG0Offset(param0->unk_08[4].xOffset, param0->unk_08[4].yOffset); } if ((param0->unk_04 & 32) != 0) { - G2S_SetBG1Offset(param0->unk_08[5].unk_0C, param0->unk_08[5].unk_10); + G2S_SetBG1Offset(param0->unk_08[5].xOffset, param0->unk_08[5].yOffset); } if ((param0->unk_04 & 64) != 0) { - if (param0->unk_08[6].unk_14 == 0) { - G2S_SetBG2Offset(param0->unk_08[6].unk_0C, param0->unk_08[6].unk_10); + if (param0->unk_08[6].type == 0) { + G2S_SetBG2Offset(param0->unk_08[6].xOffset, param0->unk_08[6].yOffset); } else { MtxFx22 v2; - sub_0201D470(&v2, param0->unk_08[6].unk_18, param0->unk_08[6].unk_1C, param0->unk_08[6].unk_20, 2); - G2S_SetBG2Affine(&v2, param0->unk_08[6].unk_24, param0->unk_08[6].unk_28, param0->unk_08[6].unk_0C, param0->unk_08[6].unk_10); + sub_0201D470(&v2, param0->unk_08[6].rotation, param0->unk_08[6].xScale, param0->unk_08[6].yScale, 2); + G2S_SetBG2Affine(&v2, param0->unk_08[6].xCenter, param0->unk_08[6].yCenter, param0->unk_08[6].xOffset, param0->unk_08[6].yOffset); } } if ((param0->unk_04 & 128) != 0) { - if (param0->unk_08[7].unk_14 == 0) { - G2S_SetBG3Offset(param0->unk_08[7].unk_0C, param0->unk_08[7].unk_10); + if (param0->unk_08[7].type == 0) { + G2S_SetBG3Offset(param0->unk_08[7].xOffset, param0->unk_08[7].yOffset); } else { MtxFx22 v3; - sub_0201D470(&v3, param0->unk_08[7].unk_18, param0->unk_08[7].unk_1C, param0->unk_08[7].unk_20, 2); - G2S_SetBG3Affine(&v3, param0->unk_08[7].unk_24, param0->unk_08[7].unk_28, param0->unk_08[7].unk_0C, param0->unk_08[7].unk_10); + sub_0201D470(&v3, param0->unk_08[7].rotation, param0->unk_08[7].xScale, param0->unk_08[7].yScale, 2); + G2S_SetBG3Affine(&v3, param0->unk_08[7].xCenter, param0->unk_08[7].yCenter, param0->unk_08[7].xOffset, param0->unk_08[7].yOffset); } } } @@ -3292,17 +3292,17 @@ void sub_0201C660(BGL *param0, u8 param1, u8 param2, u16 param3) param0->unk_04 |= (1 << param1); } -static void sub_0201C684(UnkStruct_02019304 *param0, u8 param1, u16 param2) +static void sub_0201C684(Background *param0, u8 param1, u16 param2) { switch (param1) { case 0: - param0->unk_18 = param2; + param0->rotation = param2; break; case 1: - param0->unk_18 += param2; + param0->rotation += param2; break; case 2: - param0->unk_18 -= param2; + param0->rotation -= param2; break; } } @@ -3313,26 +3313,26 @@ void sub_0201C6A8(BGL *param0, u8 param1, u8 param2, fx32 param3) param0->unk_04 |= (1 << param1); } -static void sub_0201C6CC(UnkStruct_02019304 *param0, u8 param1, fx32 param2) +static void sub_0201C6CC(Background *param0, u8 param1, fx32 param2) { switch (param1) { case 3: - param0->unk_1C = param2; + param0->xScale = param2; break; case 4: - param0->unk_1C += param2; + param0->xScale += param2; break; case 5: - param0->unk_1C -= param2; + param0->xScale -= param2; break; case 6: - param0->unk_20 = param2; + param0->yScale = param2; break; case 7: - param0->unk_20 += param2; + param0->yScale += param2; break; case 8: - param0->unk_20 -= param2; + param0->yScale -= param2; break; } } @@ -3343,26 +3343,26 @@ void sub_0201C718(BGL *param0, u8 param1, u8 param2, int param3) param0->unk_04 |= (1 << param1); } -static void sub_0201C73C(UnkStruct_02019304 *param0, u8 param1, int param2) +static void sub_0201C73C(Background *param0, u8 param1, int param2) { switch (param1) { case 9: - param0->unk_24 = param2; + param0->xCenter = param2; break; case 10: - param0->unk_24 += param2; + param0->xCenter += param2; break; case 11: - param0->unk_24 -= param2; + param0->xCenter -= param2; break; case 12: - param0->unk_28 = param2; + param0->yCenter = param2; break; case 13: - param0->unk_28 += param2; + param0->yCenter += param2; break; case 14: - param0->unk_28 -= param2; + param0->yCenter -= param2; break; } } @@ -3375,20 +3375,20 @@ u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4) u8 v4; u8 v5; - if (param0->unk_08[param1].unk_00 == NULL) { + if (param0->unk_08[param1].tilemapBuffer == NULL) { return 0; } - v1 = sub_02019774((u8)(param2 >> 3), (u8)(param3 >> 3), param0->unk_08[param1].unk_15); + v1 = sub_02019774((u8)(param2 >> 3), (u8)(param3 >> 3), param0->unk_08[param1].screenSize); v0 = (u8 *)sub_02019F28(param1); v2 = (u8)(param2 & 7); v3 = (u8)(param3 & 7); - if (param0->unk_08[param1].unk_16 == GX_BG_COLORMODE_16) { + if (param0->unk_08[param1].colorMode == GX_BG_COLORMODE_16) { u16 *v6; u8 *v7; - v6 = (u16 *)param0->unk_08[param1].unk_00; + v6 = (u16 *)param0->unk_08[param1].tilemapBuffer; v7 = Heap_AllocFromHeapAtEnd(param0->unk_00, 64); v0 += ((v6[v1] & 0x3ff) << 5); @@ -3406,11 +3406,11 @@ u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4) return 1; } } else { - if (param0->unk_08[param1].unk_14 != 1) { + if (param0->unk_08[param1].type != 1) { u16 *v8; u8 *v9; - v8 = (u16 *)param0->unk_08[param1].unk_00; + v8 = (u16 *)param0->unk_08[param1].tilemapBuffer; v9 = Heap_AllocFromHeapAtEnd(param0->unk_00, 64); memcpy(v9, &v0[(v8[v1] & 0x3ff) << 6], 64); @@ -3419,7 +3419,7 @@ u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4) v4 = v9[v2 + (v3 << 3)]; Heap_FreeToHeap(v9); } else { - u8 *v10 = (u8 *)param0->unk_08[param1].unk_00; + u8 *v10 = (u8 *)param0->unk_08[param1].tilemapBuffer; v4 = v0[(v10[v1] << 6) + v2 + (v3 << 3)]; } From 8f6b317313dbe6d9db2b533607a49bb0ade9fad9 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 20 Oct 2024 01:17:39 -0700 Subject: [PATCH 05/13] Identify UnkStruct_02018340_t -> BgConfig and document fields --- include/battle/ov16_0223DF00.h | 2 +- include/battle/ov16_0226871C.h | 4 +- include/battle/struct_ov16_02264408.h | 2 +- include/bg_window.h | 88 ++-- include/field/field_system.h | 2 +- include/field_system.h | 2 +- include/overlay005/encounter_effect.h | 2 +- include/overlay005/ov5_021D0D80.h | 4 +- include/overlay005/ov5_021DD6FC.h | 2 +- include/overlay005/struct_ov5_021E52A8_sub2.h | 2 +- include/overlay007/ov7_0224BE9C.h | 2 +- include/overlay007/struct_ov7_0224D008.h | 2 +- include/overlay012/ov12_0221FC20.h | 2 +- include/overlay012/struct_ov12_0223595C.h | 2 +- include/overlay013/struct_ov13_022213F0.h | 2 +- include/overlay013/struct_ov13_02227244.h | 2 +- include/overlay017/ov17_0223F118.h | 2 +- include/overlay017/ov17_0223F7E4.h | 4 +- include/overlay017/ov17_022492DC.h | 4 +- include/overlay017/struct_ov17_0223F88C.h | 2 +- include/overlay017/struct_ov17_022476F8.h | 2 +- include/overlay017/struct_ov17_0224A1EC.h | 2 +- include/overlay017/struct_ov17_022507C4.h | 2 +- include/overlay019/ov19_021D79F8.h | 2 +- include/overlay019/ov19_021DA92C.h | 2 +- include/overlay019/ov19_021DB2FC.h | 2 +- include/overlay019/ov19_021DB8E4.h | 2 +- include/overlay019/ov19_021DC5F0.h | 2 +- include/overlay019/ov19_021DCF88.h | 2 +- include/overlay019/ov19_021DE3E8.h | 2 +- include/overlay019/ov19_021DEC04.h | 2 +- include/overlay019/struct_ov19_021D8318.h | 2 +- include/overlay019/struct_ov19_021DA9E0.h | 2 +- include/overlay019/struct_ov19_021DB6F0.h | 2 +- include/overlay019/struct_ov19_021DBA9C.h | 2 +- include/overlay019/struct_ov19_021DC680.h | 2 +- include/overlay020/ov20_021D2098.h | 2 +- include/overlay020/ov20_021D4E38.h | 2 +- include/overlay020/struct_ov20_021D4E8C.h | 2 +- include/overlay021/ov21_021D0D80.h | 2 +- include/overlay021/ov21_021D1FA4.h | 2 +- include/overlay021/struct_ov21_021D13FC.h | 2 +- include/overlay021/struct_ov21_021D157C.h | 2 +- include/overlay021/struct_ov21_021D1FA4.h | 2 +- include/overlay021/struct_ov21_021E8E0C.h | 2 +- include/overlay022/ov22_02255094.h | 2 +- include/overlay022/struct_ov22_02256BAC.h | 2 +- .../overlay022/struct_ov22_02257964_sub2.h | 2 +- .../overlay022/struct_ov22_02257F50_sub2.h | 2 +- include/overlay022/struct_ov22_02258470.h | 2 +- include/overlay022/struct_ov22_022597BC.h | 2 +- include/overlay022/struct_ov22_022599A0.h | 2 +- include/overlay022/struct_ov22_0225A0E4.h | 2 +- include/overlay022/struct_ov22_0225AF8C.h | 2 +- include/overlay022/struct_ov22_0225B388.h | 2 +- include/overlay023/ov23_0224340C.h | 2 +- include/overlay023/ov23_02253598.h | 4 +- include/overlay023/ov23_02253D40.h | 4 +- include/overlay024/ov24_02253CE0.h | 6 +- include/overlay025/ov25_02254560.h | 2 +- include/overlay025/ov25_02255090.h | 2 +- include/overlay025/poketch_system.h | 6 +- include/overlay026/ov26_02256404.h | 2 +- include/overlay027/ov27_0225680C.h | 2 +- include/overlay028/ov28_0225697C.h | 2 +- include/overlay029/ov29_022566C8.h | 2 +- include/overlay030/ov30_022563EC.h | 2 +- include/overlay031/ov31_02256554.h | 2 +- include/overlay032/ov32_02256470.h | 2 +- include/overlay033/ov33_02256474.h | 2 +- include/overlay034/ov34_02256540.h | 2 +- include/overlay035/ov35_02256410.h | 2 +- include/overlay036/poketch_app_pedometer.h | 2 +- include/overlay037/ov37_022563D4.h | 2 +- include/overlay038/ov38_0225632C.h | 2 +- include/overlay039/ov39_022563DC.h | 2 +- include/overlay040/ov40_0225645C.h | 2 +- include/overlay041/ov41_022567B0.h | 2 +- include/overlay042/ov42_022563D4.h | 2 +- include/overlay043/ov43_02256544.h | 2 +- include/overlay044/ov44_022565BC.h | 2 +- include/overlay045/ov45_022566EC.h | 2 +- include/overlay046/ov46_02256BCC.h | 2 +- include/overlay047/ov47_02256634.h | 2 +- include/overlay048/ov48_0225650C.h | 2 +- include/overlay049/ov49_022563D4.h | 2 +- include/overlay050/ov50_02256510.h | 2 +- include/overlay051/ov51_0225632C.h | 2 +- include/overlay052/ov52_02256694.h | 2 +- include/overlay053/ov53_02256420.h | 2 +- include/overlay054/ov54_0225642C.h | 2 +- include/overlay055/ov55_0225632C.h | 2 +- include/overlay062/struct_ov62_0223118C.h | 2 +- .../overlay062/struct_ov62_02246BF4_sub2.h | 2 +- include/overlay063/ov63_0222D1C0.h | 2 +- include/overlay065/ov65_02235060.h | 2 +- include/overlay065/struct_ov65_0222EBE0_t.h | 2 +- include/overlay065/struct_ov65_02235130.h | 2 +- include/overlay071/ov71_0223C69C.h | 2 +- include/overlay071/struct_ov71_0223B620.h | 2 +- include/overlay072/struct_ov72_0223DB98_t.h | 2 +- include/overlay076/ov76_0223B870.h | 8 +- include/overlay076/ov76_0223D338.h | 2 +- include/overlay076/struct_ov76_0223C398.h | 2 +- include/overlay079/struct_ov79_021D0E1C.h | 2 +- include/overlay080/struct_ov80_021D2A08.h | 2 +- include/overlay081/struct_ov81_021D1610.h | 2 +- include/overlay083/ov83_0223D6A8.h | 6 +- include/overlay083/struct_ov83_0223B784.h | 2 +- include/overlay083/struct_ov83_0223E138.h | 2 +- include/overlay083/struct_ov83_0223E824.h | 2 +- include/overlay083/struct_ov83_0223F7A4.h | 2 +- include/overlay084/struct_ov84_0223B5A0.h | 2 +- include/overlay088/ov88_0223E9C4.h | 6 +- include/overlay094/ov94_0223BCB0.h | 2 +- include/overlay094/struct_ov94_0223FD4C.h | 2 +- include/overlay095/ov95_02246C20.h | 4 +- include/overlay096/ov96_0223B6A0.h | 2 +- include/overlay096/struct_ov96_0223BF40_t.h | 2 +- include/overlay097/ov97_02232054.h | 2 +- include/overlay097/ov97_02237694.h | 6 +- include/overlay097/struct_ov97_0222D04C.h | 2 +- include/overlay099/ov99_021D3E78.h | 2 +- include/overlay099/struct_ov99_021D2CB0.h | 2 +- include/overlay100/struct_ov100_021D46C8.h | 2 +- include/overlay101/struct_ov101_021D13C8.h | 2 +- include/overlay104/ov104_0223B6F4.h | 2 +- include/overlay104/ov104_0223C164.h | 2 +- include/overlay104/ov104_0223D9E4.h | 2 +- include/overlay104/struct_ov104_0223C4CC.h | 2 +- include/overlay105/ov105_02246214.h | 4 +- include/overlay106/ov106_022436E0.h | 4 +- include/overlay107/ov107_02249D14.h | 4 +- include/overlay108/ov108_02243630.h | 2 +- include/overlay109/struct_ov109_021D5140.h | 2 +- include/overlay110/ov110_021D2124.h | 2 +- include/overlay111/ov111_021D3548.h | 4 +- include/overlay116/struct_ov116_022649E4.h | 2 +- include/overlay117/ov117_02263AF0.h | 6 +- include/overlay117/struct_ov117_02261280.h | 2 +- include/overlay119/ov119_021D0D80.h | 12 +- include/overlay119/struct_ov119_021D17B8.h | 2 +- include/struct_defs/battle_system.h | 2 +- include/struct_defs/pokemon_summary_app.h | 2 +- include/struct_defs/struct_02015958.h | 2 +- include/struct_defs/struct_0207A778.h | 2 +- include/struct_defs/struct_0207AE68_t.h | 2 +- include/struct_defs/struct_0207F248.h | 2 +- include/struct_defs/struct_02089688_sub1.h | 2 +- include/struct_defs/struct_02095E80_t.h | 2 +- include/struct_defs/struct_02095EAC_t.h | 2 +- include/struct_defs/struct_020961E8_t.h | 2 +- include/unk_02001AF4.h | 4 +- include/unk_02006E3C.h | 8 +- include/unk_0200DA60.h | 14 +- include/unk_020366A0.h | 2 +- include/unk_0205D8CC.h | 4 +- include/unk_0208A3F4.h | 2 +- include/unk_0208C098.h | 2 +- src/battle/battle_display.c | 10 +- src/battle/battle_script.c | 6 +- src/battle/healthbar.c | 6 +- src/battle/ov16_0223B140.c | 8 +- src/battle/ov16_0223DF00.c | 4 +- src/battle/ov16_0226871C.c | 50 +- src/bg_window.c | 476 +++++++++--------- src/choose_starter/choose_starter_app.c | 10 +- src/error_message_reset.c | 2 +- src/field_system.c | 2 +- src/library_tv/library_tv.c | 2 +- src/overlay005/encounter_effect.c | 2 +- src/overlay005/fieldmap.c | 12 +- src/overlay005/ov5_021DD6FC.c | 10 +- src/overlay005/ov5_021E1D20.c | 2 +- src/overlay005/ov5_021F007C.c | 4 +- src/overlay006/ov6_0223E140.c | 14 +- src/overlay006/ov6_02243258.c | 12 +- src/overlay006/ov6_02247A0C.c | 2 +- src/overlay007/ov7_0224BE9C.c | 26 +- src/overlay010/ov10_0221F800.c | 2 +- src/overlay012/ov12_0221FC20.c | 8 +- src/overlay012/ov12_02226B84.c | 2 +- src/overlay012/ov12_0222AC70.c | 4 +- src/overlay013/ov13_0221FC20.c | 4 +- src/overlay013/ov13_022264F4.c | 4 +- src/overlay017/ov17_0223B140.c | 4 +- src/overlay017/ov17_0223CB1C.c | 4 +- src/overlay017/ov17_0223DAD0.c | 4 +- src/overlay017/ov17_0223F118.c | 2 +- src/overlay017/ov17_0223F7E4.c | 20 +- src/overlay017/ov17_022492DC.c | 10 +- src/overlay017/ov17_0224F4D4.c | 4 +- src/overlay019/ov19_021D61B0.c | 2 +- src/overlay019/ov19_021D79F8.c | 2 +- src/overlay019/ov19_021DA92C.c | 2 +- src/overlay019/ov19_021DB2FC.c | 18 +- src/overlay019/ov19_021DB8E4.c | 4 +- src/overlay019/ov19_021DC5F0.c | 2 +- src/overlay019/ov19_021DCF88.c | 4 +- src/overlay019/ov19_021DE3E8.c | 4 +- src/overlay019/ov19_021DEC04.c | 4 +- src/overlay020/ov20_021D2098.c | 4 +- src/overlay020/ov20_021D2EA4.c | 2 +- src/overlay020/ov20_021D3864.c | 6 +- src/overlay020/ov20_021D3A54.c | 16 +- src/overlay020/ov20_021D40E8.c | 4 +- src/overlay020/ov20_021D4728.c | 6 +- src/overlay020/ov20_021D4E38.c | 2 +- src/overlay021/ov21_021D0D80.c | 2 +- src/overlay021/ov21_021D1FA4.c | 10 +- src/overlay021/ov21_021D4C0C.c | 2 +- src/overlay021/ov21_021D76B0.c | 6 +- src/overlay021/ov21_021E8D48.c | 22 +- src/overlay022/ov22_02255094.c | 2 +- src/overlay022/ov22_022597BC.c | 10 +- src/overlay022/ov22_0225A428.c | 16 +- src/overlay022/ov22_0225AF8C.c | 2 +- src/overlay023/ov23_0223E140.c | 46 +- src/overlay023/ov23_0224340C.c | 34 +- src/overlay023/ov23_02248F1C.c | 18 +- src/overlay023/ov23_0224B05C.c | 2 +- src/overlay023/ov23_02253598.c | 4 +- src/overlay023/ov23_02253D40.c | 6 +- src/overlay024/ov24_02253CE0.c | 6 +- src/overlay025/ov25_02254560.c | 4 +- src/overlay025/ov25_02255090.c | 2 +- src/overlay025/poketch_system.c | 2 +- src/overlay026/ov26_022561C0.c | 8 +- src/overlay026/ov26_02256404.c | 4 +- src/overlay027/ov27_022561C0.c | 8 +- src/overlay027/ov27_0225680C.c | 8 +- src/overlay028/ov28_022561C0.c | 8 +- src/overlay028/ov28_0225697C.c | 16 +- src/overlay029/ov29_022561C0.c | 8 +- src/overlay029/ov29_022566C8.c | 4 +- src/overlay030/ov30_022561C0.c | 8 +- src/overlay030/ov30_022563EC.c | 4 +- src/overlay031/ov31_022561C0.c | 8 +- src/overlay031/ov31_02256554.c | 12 +- src/overlay032/ov32_022561C0.c | 8 +- src/overlay032/ov32_02256470.c | 4 +- src/overlay033/ov33_022561C0.c | 8 +- src/overlay033/ov33_02256474.c | 4 +- src/overlay034/ov34_022561C0.c | 8 +- src/overlay034/ov34_02256540.c | 4 +- src/overlay035/ov35_022561C0.c | 8 +- src/overlay035/ov35_02256410.c | 4 +- src/overlay036/ov36_022561C0.c | 8 +- src/overlay036/ov36_02256404.c | 4 +- src/overlay037/ov37_022561C0.c | 8 +- src/overlay037/ov37_022563D4.c | 4 +- src/overlay038/ov38_022561C0.c | 8 +- src/overlay038/ov38_0225632C.c | 4 +- src/overlay039/ov39_022561C0.c | 8 +- src/overlay039/ov39_022563DC.c | 4 +- src/overlay040/ov40_022561C0.c | 8 +- src/overlay040/ov40_0225645C.c | 4 +- src/overlay041/ov41_022561C0.c | 8 +- src/overlay041/ov41_022567B0.c | 4 +- src/overlay042/ov42_022561C0.c | 8 +- src/overlay042/ov42_022563D4.c | 4 +- src/overlay043/ov43_022561C0.c | 8 +- src/overlay043/ov43_02256544.c | 4 +- src/overlay044/ov44_022561C0.c | 8 +- src/overlay044/ov44_022565BC.c | 4 +- src/overlay045/ov45_022561C0.c | 8 +- src/overlay045/ov45_022566EC.c | 4 +- src/overlay046/ov46_022561C0.c | 8 +- src/overlay046/ov46_02256BCC.c | 4 +- src/overlay047/ov47_022561C0.c | 8 +- src/overlay047/ov47_02256634.c | 4 +- src/overlay048/ov48_022561C0.c | 8 +- src/overlay048/ov48_0225650C.c | 4 +- src/overlay049/ov49_022561C0.c | 8 +- src/overlay049/ov49_022563D4.c | 4 +- src/overlay050/ov50_022561C0.c | 8 +- src/overlay050/ov50_02256510.c | 16 +- src/overlay051/ov51_022561C0.c | 8 +- src/overlay051/ov51_0225632C.c | 4 +- src/overlay052/ov52_022561C0.c | 8 +- src/overlay052/ov52_02256694.c | 4 +- src/overlay053/ov53_022561C0.c | 8 +- src/overlay053/ov53_02256420.c | 4 +- src/overlay054/ov54_022561C0.c | 8 +- src/overlay054/ov54_0225642C.c | 4 +- src/overlay055/ov55_022561C0.c | 8 +- src/overlay055/ov55_0225632C.c | 4 +- src/overlay056/ov56_022561C0.c | 22 +- src/overlay058/ov58_021D0D80.c | 12 +- src/overlay059/ov59_021D0D80.c | 12 +- src/overlay061/ov61_0222BF44.c | 16 +- src/overlay062/ov62_0222F2C0.c | 4 +- src/overlay062/ov62_022300D8.c | 16 +- src/overlay062/ov62_02231690.c | 2 +- src/overlay062/ov62_02236CBC.c | 8 +- src/overlay062/ov62_02246B00.c | 2 +- src/overlay063/ov63_0222D1C0.c | 16 +- src/overlay064/ov64_0222DCE0.c | 2 +- src/overlay065/ov65_0222DCE0.c | 22 +- src/overlay065/ov65_02235060.c | 14 +- src/overlay065/ov65_0223648C.c | 2 +- src/overlay067/ov67_0225C700.c | 6 +- src/overlay068/ov68_0225C700.c | 2 +- src/overlay069/ov69_0225C700.c | 2 +- src/overlay070/ov70_0225D9A4.c | 2 +- src/overlay071/ov71_0223B140.c | 20 +- src/overlay071/ov71_0223C69C.c | 2 +- src/overlay072/ov72_0223D7A0.c | 16 +- src/overlay073/ov73_021D0D80.c | 2 +- src/overlay073/ov73_021D3250.c | 2 +- src/overlay074/ov74_021D0D80.c | 2 +- src/overlay075/ov75_021D0D80.c | 2 +- src/overlay076/ov76_0223B870.c | 20 +- src/overlay076/ov76_0223D338.c | 2 +- src/overlay077/ov77_021D0D80.c | 32 +- src/overlay077/ov77_021D25B0.c | 8 +- src/overlay079/ov79_021D2268.c | 2 +- src/overlay080/ov80_021D0D80.c | 4 +- src/overlay081/ov81_021D0D80.c | 8 +- src/overlay083/ov83_0223C958.c | 8 +- src/overlay083/ov83_0223D6A8.c | 6 +- src/overlay084/ov84_0223B5A0.c | 8 +- src/overlay085/ov85_02241440.c | 10 +- src/overlay086/ov86_0223B140.c | 6 +- src/overlay087/ov87_021D106C.c | 2 +- src/overlay088/ov88_0223B140.c | 18 +- src/overlay088/ov88_0223E9C4.c | 6 +- src/overlay090/ov90_021D0D80.c | 2 +- src/overlay091/ov91_021D0D80.c | 10 +- src/overlay092/ov92_021D0D80.c | 2 +- src/overlay094/ov94_0223BCB0.c | 2 +- src/overlay094/ov94_0223C610.c | 12 +- src/overlay094/ov94_0223D0C4.c | 10 +- src/overlay094/ov94_0223DC04.c | 10 +- src/overlay094/ov94_0223E46C.c | 10 +- src/overlay094/ov94_0223FB48.c | 10 +- src/overlay094/ov94_022414B8.c | 10 +- src/overlay094/ov94_02242AD0.c | 10 +- src/overlay094/ov94_02244950.c | 10 +- src/overlay095/ov95_02246C20.c | 8 +- src/overlay095/ov95_02247B6C.c | 2 +- src/overlay095/ov95_02248590.c | 4 +- src/overlay095/ov95_02249740.c | 2 +- src/overlay095/ov95_02249F90.c | 6 +- src/overlay095/ov95_0224A390.c | 2 +- src/overlay095/ov95_0224ABC0.c | 4 +- src/overlay095/ov95_0224B3D8.c | 2 +- src/overlay096/ov96_0223B6A0.c | 2 +- src/overlay096/ov96_0223BCE0.c | 10 +- src/overlay097/ov97_0222AE60.c | 4 +- src/overlay097/ov97_0222C174.c | 4 +- src/overlay097/ov97_0222D30C.c | 10 +- src/overlay097/ov97_02230410.c | 8 +- src/overlay097/ov97_02232054.c | 2 +- src/overlay097/ov97_02233B18.c | 4 +- src/overlay097/ov97_02237694.c | 8 +- src/overlay098/ov98_022471C8.c | 18 +- src/overlay099/ov99_021D0D80.c | 8 +- src/overlay099/ov99_021D1A54.c | 12 +- src/overlay099/ov99_021D3E78.c | 4 +- src/overlay099/ov99_021D4134.c | 2 +- src/overlay100/ov100_021D0D80.c | 4 +- src/overlay100/ov100_021D13E4.c | 4 +- src/overlay100/ov100_021D1C44.c | 4 +- src/overlay100/ov100_021D2F0C.c | 6 +- src/overlay101/ov101_021D0D80.c | 8 +- src/overlay102/ov102_021D0D80.c | 2 +- src/overlay104/ov104_0222FBE4.c | 2 +- src/overlay104/ov104_022361B4.c | 4 +- src/overlay104/ov104_0223B6F4.c | 4 +- src/overlay104/ov104_0223C164.c | 12 +- src/overlay104/ov104_0223C2D4.c | 4 +- src/overlay104/ov104_0223D9E4.c | 10 +- src/overlay104/ov104_0223DC7C.c | 8 +- src/overlay105/ov105_02241AE0.c | 10 +- src/overlay105/ov105_02246214.c | 8 +- src/overlay106/ov106_02241AE0.c | 18 +- src/overlay106/ov106_022436E0.c | 8 +- src/overlay107/ov107_02241AE0.c | 10 +- src/overlay107/ov107_02245EB0.c | 10 +- src/overlay107/ov107_02249D14.c | 8 +- src/overlay108/ov108_02241AE0.c | 10 +- src/overlay108/ov108_02243630.c | 4 +- src/overlay109/ov109_021D0D80.c | 2 +- src/overlay109/ov109_021D3D50.c | 12 +- src/overlay110/ov110_021D0D80.c | 10 +- src/overlay110/ov110_021D2124.c | 4 +- src/overlay111/ov111_021D0D80.c | 10 +- src/overlay111/ov111_021D3548.c | 8 +- src/overlay112/ov112_0225C700.c | 2 +- src/overlay113/ov113_0225C700.c | 14 +- src/overlay114/ov114_0225C700.c | 2 +- src/overlay115/ov115_02260CEC.c | 2 +- src/overlay116/ov116_022604C4.c | 4 +- src/overlay116/ov116_02261870.c | 4 +- src/overlay117/ov117_02260668.c | 4 +- src/overlay117/ov117_02263AF0.c | 14 +- src/overlay119/ov119_021D0D80.c | 12 +- src/pokemon_summary_app.c | 8 +- src/unk_02001AF4.c | 8 +- src/unk_02006E3C.c | 16 +- src/unk_0200DA60.c | 30 +- src/unk_02015920.c | 16 +- src/unk_020366A0.c | 2 +- src/unk_02039814.c | 2 +- src/unk_02039A64.c | 2 +- src/unk_020528D0.c | 4 +- src/unk_0205D8CC.c | 4 +- src/unk_0206F314.c | 2 +- src/unk_020722AC.c | 2 +- src/unk_0207AE68.c | 8 +- src/unk_0207E0B8.c | 10 +- src/unk_020819DC.c | 2 +- src/unk_0208694C.c | 20 +- src/unk_020890F4.c | 4 +- src/unk_0208A3F4.c | 4 +- src/unk_0208C098.c | 2 +- src/unk_02099DFC.c | 2 +- src/unk_0209A2C4.c | 2 +- src/unk_0209A74C.c | 4 +- src/unk_0209AA74.c | 2 +- 421 files changed, 1442 insertions(+), 1442 deletions(-) diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index 78bf2d6baa..b9251e6091 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -40,7 +40,7 @@ #define ENEMY_IN_SLOT_RIGHT 0 #define ENEMY_IN_SLOT_LEFT 2 -BGL *BattleSystem_BGL(BattleSystem *param0); +BgConfig *BattleSystem_BGL(BattleSystem *param0); /** * @brief Get one of the allocated windows for the battle display. diff --git a/include/battle/ov16_0226871C.h b/include/battle/ov16_0226871C.h index 4e617a09a6..50b25c8a07 100644 --- a/include/battle/ov16_0226871C.h +++ b/include/battle/ov16_0226871C.h @@ -10,8 +10,8 @@ #include "bg_window.h" -void ov16_02268744(BGL *param0); -void ov16_022687A0(BGL *param0); +void ov16_02268744(BgConfig *param0); +void ov16_022687A0(BgConfig *param0); void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3, UnkStruct_0209C370 *param4); void ov16_02268A14(UnkStruct_ov16_02268A14 *param0); void ov16_02268A88(UnkStruct_ov16_02268A14 *param0); diff --git a/include/battle/struct_ov16_02264408.h b/include/battle/struct_ov16_02264408.h index 571c84d695..80a7640708 100644 --- a/include/battle/struct_ov16_02264408.h +++ b/include/battle/struct_ov16_02264408.h @@ -13,7 +13,7 @@ typedef struct { SpriteRenderer *unk_00; - BGL *unk_04; + BgConfig *unk_04; PaletteData *unk_08; UnkStruct_ov16_0223E0C8 *unk_0C[4]; u8 unk_1C[4]; diff --git a/include/bg_window.h b/include/bg_window.h index 2e7f0b5330..30bedfad4d 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -67,12 +67,12 @@ typedef struct Background { int yCenter; } Background; -typedef struct UnkStruct_02018340_t { - u32 unk_00; - u16 unk_04; - u16 unk_06; - Background unk_08[8]; -} BGL; +typedef struct BgConfig { + u32 heapID; + u16 scrollScheduled; + u16 bufferTransferScheduled; + Background bgs[8]; +} BgConfig; typedef struct { u8 unk_00; @@ -85,7 +85,7 @@ typedef struct { } UnkStruct_ov61_0222C884; typedef struct { - BGL *unk_00; + BgConfig *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; @@ -104,43 +104,43 @@ typedef struct { GXBG0As unk_0C; } UnkStruct_ov84_0223BA5C; -BGL *sub_02018340(u32 param0); -u32 sub_02018364(BGL *param0); +BgConfig *sub_02018340(u32 param0); +u32 sub_02018364(BgConfig *param0); void sub_02018368(const UnkStruct_ov84_0223BA5C *param0); void sub_020183A0(const UnkStruct_ov84_0223BA5C *param0, u8 param1); -void sub_020183C4(BGL *param0, u8 param1, const BgTemplate *param2, u8 param3); -void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3); -void sub_02019044(BGL *param0, u8 param1); +void sub_020183C4(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3); +void sub_02018898(BgConfig *param0, u8 param1, u8 param2, u8 param3); +void sub_02019044(BgConfig *param0, u8 param1); void BGL_SetPriority(u8 param0, u8 param1); void sub_02019120(u8 param0, u8 param1); -void sub_02019184(BGL *param0, u8 param1, u8 param2, int param3); -int sub_020192EC(BGL *param0, u32 param1); -int sub_020192F8(BGL *param0, u32 param1); -void sub_02019348(BGL *param0, u8 param1, const MtxFx22 *param2, int param3, int param4); +void sub_02019184(BgConfig *param0, u8 param1, u8 param2, int param3); +int sub_020192EC(BgConfig *param0, u32 param1); +int sub_020192F8(BgConfig *param0, u32 param1); +void sub_02019348(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4); void sub_02019410(const void *param0, void *param1, u32 param2); -void sub_02019448(BGL *param0, u8 param1); -void sub_02019460(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4); -void sub_02019574(BGL *param0, u8 param1, const void *param2, u32 param3); -void sub_0201958C(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4); +void sub_02019448(BgConfig *param0, u8 param1); +void sub_02019460(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4); +void sub_02019574(BgConfig *param0, u8 param1, const void *param2, u32 param3); +void sub_0201958C(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4); void sub_02019690(u8 param0, u32 param1, u32 param2, u32 param3); -void sub_020196C0(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void sub_020196C0(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4); void sub_0201972C(u8 param0, void *param1, u16 param2, u16 param3); void sub_0201975C(u8 param0, u16 param1); -void sub_020198C0(BGL *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6); -void sub_020198E8(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); -void sub_02019964(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); -void sub_02019CB8(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7); -void sub_02019E2C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); -void sub_02019EBC(BGL *param0, u8 param1); -void sub_02019EE0(BGL *param0, u8 param1, u16 param2); -void sub_02019F04(BGL *param0, u8 param1, u16 param2); +void sub_020198C0(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6); +void sub_020198E8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); +void sub_02019964(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); +void sub_02019CB8(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7); +void sub_02019E2C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); +void sub_02019EBC(BgConfig *param0, u8 param1); +void sub_02019EE0(BgConfig *param0, u8 param1, u16 param2); +void sub_02019F04(BgConfig *param0, u8 param1, u16 param2); void *sub_02019F28(u8 param0); void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3); void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3); -void *sub_02019FE4(BGL *param0, u8 param1); -int sub_02019FF0(BGL *param0, u8 param1); -u16 sub_02019FFC(BGL *param0, u8 param1); -u8 sub_0201A008(BGL *param0, u8 param1); +void *sub_02019FE4(BgConfig *param0, u8 param1); +int sub_02019FF0(BgConfig *param0, u8 param1); +u16 sub_02019FFC(BgConfig *param0, u8 param1); +u8 sub_0201A008(BgConfig *param0, u8 param1); void sub_0201A1E4(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); void sub_0201A424(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); void sub_0201A60C(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); @@ -148,9 +148,9 @@ void sub_0201A6D0(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 Window *sub_0201A778(u32 param0, u8 param1); void Window_Init(Window *param0); u8 BGL_WindowAdded(Window *param0); -void BGL_AddWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8); -void BGL_AddFramelessWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5); -void sub_0201A8D4(BGL *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2); +void BGL_AddWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8); +void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5); +void sub_0201A8D4(BgConfig *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2); void BGL_DeleteWindow(Window *param0); void sub_0201A928(Window *param0, u8 param1); void sub_0201A954(Window *param0); @@ -167,7 +167,7 @@ void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 para void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5); void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6); void sub_0201C04C(Window *param0, u8 param1, u8 param2, u8 param3); -BGL *sub_0201C28C(Window *param0); +BgConfig *sub_0201C28C(Window *param0); u8 sub_0201C290(Window *param0); u8 sub_0201C294(Window *param0); u8 sub_0201C298(Window *param0); @@ -177,12 +177,12 @@ u16 sub_0201C2A4(Window *param0); void sub_0201C2AC(Window *param0, u8 param1); void sub_0201C2B0(Window *param0, u8 param1); void sub_0201C2B4(Window *param0, u8 param1); -void sub_0201C2B8(BGL *param0); -void sub_0201C3C0(BGL *param0, u8 param1); -void sub_0201C63C(BGL *param0, u8 param1, u8 param2, int param3); -void sub_0201C660(BGL *param0, u8 param1, u8 param2, u16 param3); -void sub_0201C6A8(BGL *param0, u8 param1, u8 param2, fx32 param3); -void sub_0201C718(BGL *param0, u8 param1, u8 param2, int param3); -u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4); +void sub_0201C2B8(BgConfig *param0); +void sub_0201C3C0(BgConfig *param0, u8 param1); +void sub_0201C63C(BgConfig *param0, u8 param1, u8 param2, int param3); +void sub_0201C660(BgConfig *param0, u8 param1, u8 param2, u16 param3); +void sub_0201C6A8(BgConfig *param0, u8 param1, u8 param2, fx32 param3); +void sub_0201C718(BgConfig *param0, u8 param1, u8 param2, int param3); +u8 sub_0201C784(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4); #endif // POKEPLATINUM_BG_WINDOW_H diff --git a/include/field/field_system.h b/include/field/field_system.h index 6a6b6338fa..29dee85ca4 100644 --- a/include/field/field_system.h +++ b/include/field/field_system.h @@ -49,7 +49,7 @@ typedef struct FieldSystem_t { FieldSystem_sub1 *unk_00; FieldSystem_sub2 *unk_04; - BGL *unk_08; + BgConfig *unk_08; SaveData *saveData; TaskManager *unk_10; MapHeaderData *mapHeaderData; diff --git a/include/field_system.h b/include/field_system.h index 40a81954fa..cad0ffc940 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -17,7 +17,7 @@ void sub_0203CD84(FieldSystem *fieldSystem, const OverlayManagerTemplate *param1 void sub_0203D128(void); void sub_0203D140(void); PoketchSystem *FieldSystem_GetPoketchSystem(void); -BGL *sub_0203D170(void *param0); +BgConfig *sub_0203D170(void *param0); SaveData *FieldSystem_SaveData(void *param0); #endif // POKEPLATINUM_UNK_0203CC84_H diff --git a/include/overlay005/encounter_effect.h b/include/overlay005/encounter_effect.h index b1ab853be0..aa9f939e99 100644 --- a/include/overlay005/encounter_effect.h +++ b/include/overlay005/encounter_effect.h @@ -136,7 +136,7 @@ void ScreenSliceEffect_Modify(EncounterEffect *encEffect, ScreenSliceEffect *scr ScreenSplitEffect *ScreenSplitEffect_New(void); void ScreenSplitEffect_Delete(ScreenSplitEffect *screenSplitEfx); void EncounterEffect_ScreenSplit(EncounterEffect *encEffect, ScreenSplitEffect *screenSplitEfx, u32 numSteps, fx32 initialSpeedX, fx32 initialSpeedY); -void ov5_021DE3D0(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, BGL *param6, u32 param7); +void ov5_021DE3D0(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, BgConfig *param6, u32 param7); void ov5_021DE47C(UnkStruct_ov5_021DE47C *param0, int param1, int param2); void ov5_021DE4AC(UnkStruct_ov5_021DE47C *param0); void ov5_021DE4CC(NARC *param0, UnkStruct_ov5_021DE47C *param1, UnkStruct_ov5_021DE5A4 *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); diff --git a/include/overlay005/ov5_021D0D80.h b/include/overlay005/ov5_021D0D80.h index 11d443e961..0fd3afbba8 100644 --- a/include/overlay005/ov5_021D0D80.h +++ b/include/overlay005/ov5_021D0D80.h @@ -6,8 +6,8 @@ #include "bg_window.h" void ov5_021D12D0(FieldSystem *fieldSystem, u32 param1); -void ov5_021D1434(BGL *param0); -void ov5_021D143C(BGL *param0); +void ov5_021D1434(BgConfig *param0); +void ov5_021D143C(BgConfig *param0); void ov5_021D16F4(FieldSystem *fieldSystem, BOOL param1); void ov5_021D1718(FieldSystem *fieldSystem, BOOL param1); void ov5_021D1744(const u8 param0); diff --git a/include/overlay005/ov5_021DD6FC.h b/include/overlay005/ov5_021DD6FC.h index 433bd1333f..d5d4f2986b 100644 --- a/include/overlay005/ov5_021DD6FC.h +++ b/include/overlay005/ov5_021DD6FC.h @@ -6,7 +6,7 @@ #include "bg_window.h" -UnkStruct_ov5_021DD9C8 *ov5_021DD98C(BGL *param0); +UnkStruct_ov5_021DD9C8 *ov5_021DD98C(BgConfig *param0); void ov5_021DD9C8(UnkStruct_ov5_021DD9C8 *param0); void ov5_021DD9E8(UnkStruct_ov5_021DD9C8 *param0, const int param1, const int param2); void ov5_021DDA78(UnkStruct_ov5_021DD9C8 *param0); diff --git a/include/overlay005/struct_ov5_021E52A8_sub2.h b/include/overlay005/struct_ov5_021E52A8_sub2.h index 4f7aa6676d..3c2f6cd25b 100644 --- a/include/overlay005/struct_ov5_021E52A8_sub2.h +++ b/include/overlay005/struct_ov5_021E52A8_sub2.h @@ -6,7 +6,7 @@ #include "bg_window.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; MtxFx22 unk_04; u32 unk_14; int unk_18; diff --git a/include/overlay007/ov7_0224BE9C.h b/include/overlay007/ov7_0224BE9C.h index 0966557f6a..06e88855ef 100644 --- a/include/overlay007/ov7_0224BE9C.h +++ b/include/overlay007/ov7_0224BE9C.h @@ -6,7 +6,7 @@ #include "bg_window.h" #include "savedata.h" -UnkStruct_ov7_0224BEFC *ov7_0224BE9C(u32 param0, SaveData *param1, BGL *param2); +UnkStruct_ov7_0224BEFC *ov7_0224BE9C(u32 param0, SaveData *param1, BgConfig *param2); void ov7_0224BEFC(UnkStruct_ov7_0224BEFC *param0); BOOL ov7_0224BF2C(UnkStruct_ov7_0224BEFC *param0); diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h index e2822cad73..33b2738d7c 100644 --- a/include/overlay007/struct_ov7_0224D008.h +++ b/include/overlay007/struct_ov7_0224D008.h @@ -22,7 +22,7 @@ #include "vars_flags.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; void *unk_04; Window unk_08[6]; Window unk_68; diff --git a/include/overlay012/ov12_0221FC20.h b/include/overlay012/ov12_0221FC20.h index 7bfd4fe18f..ea5821b03f 100644 --- a/include/overlay012/ov12_0221FC20.h +++ b/include/overlay012/ov12_0221FC20.h @@ -42,7 +42,7 @@ u16 ov12_02220248(UnkStruct_ov12_0221FCDC *param0); UnkStruct_02014014 *ov12_02220250(UnkStruct_ov12_0221FCDC *param0); UnkStruct_02014014 *ov12_02220260(UnkStruct_ov12_0221FCDC *param0, int param1); SPLEmitter *ov12_0222026C(UnkStruct_ov12_0221FCDC *param0, int param1); -BGL *ov12_02220278(UnkStruct_ov12_0221FCDC *param0); +BgConfig *ov12_02220278(UnkStruct_ov12_0221FCDC *param0); s32 ov12_02220280(UnkStruct_ov12_0221FCDC *param0, int param1); CellActorData *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1); CellActorData *ov12_022202C0(UnkStruct_ov12_0221FCDC *param0, int param1); diff --git a/include/overlay012/struct_ov12_0223595C.h b/include/overlay012/struct_ov12_0223595C.h index e757e2c5e0..d3b4b418e1 100644 --- a/include/overlay012/struct_ov12_0223595C.h +++ b/include/overlay012/struct_ov12_0223595C.h @@ -18,7 +18,7 @@ typedef struct { SpriteRenderer *unk_08; SpriteGfxHandler *unk_0C; SpriteGfxHandler *unk_10; - BGL *unk_14; + BgConfig *unk_14; PaletteData *unk_18; } UnkStruct_ov12_0223595C; diff --git a/include/overlay013/struct_ov13_022213F0.h b/include/overlay013/struct_ov13_022213F0.h index 8df02e251e..dbe07fa40b 100644 --- a/include/overlay013/struct_ov13_022213F0.h +++ b/include/overlay013/struct_ov13_022213F0.h @@ -18,7 +18,7 @@ typedef struct { UnkStruct_ov13_0221FC20 *unk_00; UnkStruct_ov13_02221ED0 unk_04[6]; - BGL *unk_1E0; + BgConfig *unk_1E0; PaletteData *unk_1E4; u16 unk_1E8[4][96]; u16 unk_4E8[4][96]; diff --git a/include/overlay013/struct_ov13_02227244.h b/include/overlay013/struct_ov13_02227244.h index c22b5a665f..a48e9c6544 100644 --- a/include/overlay013/struct_ov13_02227244.h +++ b/include/overlay013/struct_ov13_02227244.h @@ -18,7 +18,7 @@ typedef struct { UnkStruct_ov13_022264F4 *unk_00; - BGL *unk_04; + BgConfig *unk_04; PaletteData *unk_08; UnkStruct_0200C440 *unk_0C; MessageLoader *unk_10; diff --git a/include/overlay017/ov17_0223F118.h b/include/overlay017/ov17_0223F118.h index 86448cb85d..dd9aa71359 100644 --- a/include/overlay017/ov17_0223F118.h +++ b/include/overlay017/ov17_0223F118.h @@ -18,7 +18,7 @@ GenericPointerData *ov17_0223F140(int param0); void ov17_0223F1E0(GenericPointerData *param0); -void ov17_0223F1E8(int param0, BGL *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); +void ov17_0223F1E8(int param0, BgConfig *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); void ov17_0223F2E4(UnkStruct_ov17_0223F2E4 *param0); void ov17_0223F2F8(UnkStruct_ov17_0223F2E4 *param0, int param1, int param2, int param3); Strbuf *ov17_0223F310(u32 param0, u32 param1); diff --git a/include/overlay017/ov17_0223F7E4.h b/include/overlay017/ov17_0223F7E4.h index 4780265e63..86bf446c47 100644 --- a/include/overlay017/ov17_0223F7E4.h +++ b/include/overlay017/ov17_0223F7E4.h @@ -9,8 +9,8 @@ #include "bg_window.h" -void ov17_0223F80C(BGL *param0); -void ov17_0223F864(BGL *param0); +void ov17_0223F80C(BgConfig *param0); +void ov17_0223F864(BgConfig *param0); void *ov17_0223F88C(UnkStruct_02095C48 *param0, UnkStruct_ov17_0223F88C *param1, UnkStruct_ov17_022472F8 *param2); void ov17_0223F960(UnkStruct_ov17_0223F7E4 *param0); void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void *param3); diff --git a/include/overlay017/ov17_022492DC.h b/include/overlay017/ov17_022492DC.h index 62e50cb8b3..9d2d621e1c 100644 --- a/include/overlay017/ov17_022492DC.h +++ b/include/overlay017/ov17_022492DC.h @@ -8,8 +8,8 @@ #include "bg_window.h" -void ov17_02249300(BGL *param0); -void ov17_02249358(BGL *param0); +void ov17_02249300(BgConfig *param0); +void ov17_02249358(BgConfig *param0); void *ov17_02249380(UnkStruct_02095C48 *param0, UnkStruct_ov17_0224A1EC *param1); void ov17_022493A4(UnkStruct_ov17_022492DC *param0); void ov17_022493C4(UnkStruct_ov17_022492DC *param0); diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h index ddd0b34f75..b9cc1061ba 100644 --- a/include/overlay017/struct_ov17_0223F88C.h +++ b/include/overlay017/struct_ov17_0223F88C.h @@ -26,7 +26,7 @@ typedef struct { SpriteRenderer *unk_18; SpriteGfxHandler *unk_1C; UnkStruct_ov12_0221FCDC *unk_20; - BGL *unk_24; + BgConfig *unk_24; Window unk_28[1]; MessageLoader *unk_38; MessageLoader *unk_3C; diff --git a/include/overlay017/struct_ov17_022476F8.h b/include/overlay017/struct_ov17_022476F8.h index 60439ba41b..b3ca3bb7f4 100644 --- a/include/overlay017/struct_ov17_022476F8.h +++ b/include/overlay017/struct_ov17_022476F8.h @@ -24,7 +24,7 @@ typedef struct { Sprite *unk_18; SpriteRenderer *unk_1C; SpriteGfxHandler *unk_20; - BGL *unk_24; + BgConfig *unk_24; Window unk_28[1]; MessageLoader *unk_38; StringTemplate *unk_3C; diff --git a/include/overlay017/struct_ov17_0224A1EC.h b/include/overlay017/struct_ov17_0224A1EC.h index 48661d5e5d..8611b21032 100644 --- a/include/overlay017/struct_ov17_0224A1EC.h +++ b/include/overlay017/struct_ov17_0224A1EC.h @@ -35,7 +35,7 @@ typedef struct { Sprite *unk_48[4]; SpriteRenderer *unk_58; SpriteGfxHandler *unk_5C; - BGL *unk_60; + BgConfig *unk_60; Window unk_64[2]; MessageLoader *unk_84; StringTemplate *unk_88; diff --git a/include/overlay017/struct_ov17_022507C4.h b/include/overlay017/struct_ov17_022507C4.h index 3ee7e89a34..7cede59620 100644 --- a/include/overlay017/struct_ov17_022507C4.h +++ b/include/overlay017/struct_ov17_022507C4.h @@ -25,7 +25,7 @@ typedef struct { Sprite *unk_08[4]; SpriteRenderer *unk_18; SpriteGfxHandler *unk_1C; - BGL *unk_20; + BgConfig *unk_20; Window unk_24[9]; MessageLoader *unk_B4; StringTemplate *unk_B8; diff --git a/include/overlay019/ov19_021D79F8.h b/include/overlay019/ov19_021D79F8.h index 2e4c41cffb..89b8b10445 100644 --- a/include/overlay019/ov19_021D79F8.h +++ b/include/overlay019/ov19_021D79F8.h @@ -10,7 +10,7 @@ #include "bg_window.h" #include "cell_actor.h" -BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4); +BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4); void ov19_021D7A74(UnkStruct_ov19_021D8318 *param0); void ov19_021D7A9C(UnkStruct_ov19_021D8318 *param0); void ov19_021D7B4C(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2, BOOL param3); diff --git a/include/overlay019/ov19_021DA92C.h b/include/overlay019/ov19_021DA92C.h index 96a44b3c69..db6574e564 100644 --- a/include/overlay019/ov19_021DA92C.h +++ b/include/overlay019/ov19_021DA92C.h @@ -11,7 +11,7 @@ #include "cell_actor.h" #include "message.h" -BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, const MessageLoader *param5, NARC *param6); +BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, const MessageLoader *param5, NARC *param6); void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 *param0); void ov19_021DAA80(UnkStruct_ov19_021DA9E0 *param0); void ov19_021DAA90(UnkStruct_ov19_021DA9E0 *param0); diff --git a/include/overlay019/ov19_021DB2FC.h b/include/overlay019/ov19_021DB2FC.h index 53f37bcdcb..04dfef95b6 100644 --- a/include/overlay019/ov19_021DB2FC.h +++ b/include/overlay019/ov19_021DB2FC.h @@ -12,7 +12,7 @@ #include "cell_actor.h" #include "message.h" -BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, MessageLoader *param5, const StringTemplate *param6, int param7, NARC *param8); +BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, MessageLoader *param5, const StringTemplate *param6, int param7, NARC *param8); void ov19_021DB370(UnkStruct_ov19_021DB6F0 *param0); void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 *param0); void ov19_021DB448(UnkStruct_ov19_021DB6F0 *param0, u32 param1); diff --git a/include/overlay019/ov19_021DB8E4.h b/include/overlay019/ov19_021DB8E4.h index c799603ff3..fdd37fcec8 100644 --- a/include/overlay019/ov19_021DB8E4.h +++ b/include/overlay019/ov19_021DB8E4.h @@ -12,7 +12,7 @@ #include "bg_window.h" #include "cell_actor.h" -BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, NARC *param5); +BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, NARC *param5); void ov19_021DBA9C(UnkStruct_ov19_021DBA9C *param0); void ov19_021DBAD0(UnkStruct_ov19_021DBA9C *param0); void ov19_021DBB48(UnkStruct_ov19_021DBA9C *param0); diff --git a/include/overlay019/ov19_021DC5F0.h b/include/overlay019/ov19_021DC5F0.h index d1479c2e07..d3be527d9d 100644 --- a/include/overlay019/ov19_021DC5F0.h +++ b/include/overlay019/ov19_021DC5F0.h @@ -11,7 +11,7 @@ #include "bg_window.h" #include "cell_actor.h" -BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, NARC *param5); +BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, NARC *param5); void ov19_021DC680(UnkStruct_ov19_021DC680 *param0); void ov19_021DC6A0(UnkStruct_ov19_021DC680 *param0); void ov19_021DC6C8(UnkStruct_ov19_021DC680 *param0); diff --git a/include/overlay019/ov19_021DCF88.h b/include/overlay019/ov19_021DCF88.h index 8887bc8f9e..32b14c07ed 100644 --- a/include/overlay019/ov19_021DCF88.h +++ b/include/overlay019/ov19_021DCF88.h @@ -10,7 +10,7 @@ #include "bg_window.h" #include "cell_actor.h" -BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4); +BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4); void ov19_021DD078(UnkStruct_ov19_021DCF88 *param0); void ov19_021DD114(UnkStruct_ov19_021DCF88 *param0, NARC *param1); void ov19_021DD378(UnkStruct_ov19_021DCF88 *param0); diff --git a/include/overlay019/ov19_021DE3E8.h b/include/overlay019/ov19_021DE3E8.h index 5271cf93eb..cec4fe0d0d 100644 --- a/include/overlay019/ov19_021DE3E8.h +++ b/include/overlay019/ov19_021DE3E8.h @@ -10,7 +10,7 @@ #include "bg_window.h" #include "cell_actor.h" -BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4); +BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4); void ov19_021DE440(UnkStruct_ov19_021DE3E8 *param0); void ov19_021DE584(UnkStruct_ov19_021DE3E8 *param0); void ov19_021DE7A0(UnkStruct_ov19_021DE3E8 *param0); diff --git a/include/overlay019/ov19_021DEC04.h b/include/overlay019/ov19_021DEC04.h index f8ac335dc8..658cdfe026 100644 --- a/include/overlay019/ov19_021DEC04.h +++ b/include/overlay019/ov19_021DEC04.h @@ -11,7 +11,7 @@ #include "cell_actor.h" #include "message.h" -BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, MessageLoader *param5, NARC *param6); +BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, MessageLoader *param5, NARC *param6); void ov19_021DECAC(UnkStruct_ov19_021DEC04 *param0); void ov19_021DECE8(UnkStruct_ov19_021DEC04 *param0, NARC *param1); void ov19_021DEDDC(UnkStruct_ov19_021DEC04 *param0, BOOL param1); diff --git a/include/overlay019/struct_ov19_021D8318.h b/include/overlay019/struct_ov19_021D8318.h index 1e2c98b11f..87efa1659e 100644 --- a/include/overlay019/struct_ov19_021D8318.h +++ b/include/overlay019/struct_ov19_021D8318.h @@ -40,7 +40,7 @@ typedef struct { int unk_585C; u16 unk_5860[9][16]; UnkStruct_ov19_021DA384 *unk_58F0; - BGL *unk_58F4; + BgConfig *unk_58F4; const UnkStruct_ov19_021D4DF0 *unk_58F8; UnkStruct_ov19_021D61B0 *unk_58FC; } UnkStruct_ov19_021D8318; diff --git a/include/overlay019/struct_ov19_021DA9E0.h b/include/overlay019/struct_ov19_021DA9E0.h index 87f680e05c..6ecca6244f 100644 --- a/include/overlay019/struct_ov19_021DA9E0.h +++ b/include/overlay019/struct_ov19_021DA9E0.h @@ -18,7 +18,7 @@ typedef struct { BOOL unk_00; Window *unk_04; - BGL *unk_08; + BgConfig *unk_08; CellActorCollection *unk_0C; const UnkStruct_ov19_021D4DF0 *unk_10; UnkStruct_ov19_021D61B0 *unk_14; diff --git a/include/overlay019/struct_ov19_021DB6F0.h b/include/overlay019/struct_ov19_021DB6F0.h index 358086470d..4cf7ba1f82 100644 --- a/include/overlay019/struct_ov19_021DB6F0.h +++ b/include/overlay019/struct_ov19_021DB6F0.h @@ -12,7 +12,7 @@ #include "string_template.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; u8 padding_04[4]; const UnkStruct_ov19_021D4DF0 *unk_08; UnkStruct_ov19_021D61B0 *unk_0C; diff --git a/include/overlay019/struct_ov19_021DBA9C.h b/include/overlay019/struct_ov19_021DBA9C.h index 57c4ad49dc..dad97893d3 100644 --- a/include/overlay019/struct_ov19_021DBA9C.h +++ b/include/overlay019/struct_ov19_021DBA9C.h @@ -16,7 +16,7 @@ typedef struct { UnkStruct_ov19_021D61B0 *unk_00; - BGL *unk_04; + BgConfig *unk_04; CellActorCollection *unk_08; const UnkStruct_ov19_021D4DF0 *unk_0C; Window *unk_10; diff --git a/include/overlay019/struct_ov19_021DC680.h b/include/overlay019/struct_ov19_021DC680.h index c71e562e1e..838a64d644 100644 --- a/include/overlay019/struct_ov19_021DC680.h +++ b/include/overlay019/struct_ov19_021DC680.h @@ -14,7 +14,7 @@ typedef struct { UnkStruct_ov19_021D61B0 *unk_00; - BGL *unk_04; + BgConfig *unk_04; CellActorCollection *unk_08; const UnkStruct_ov19_021D4DF0 *unk_0C; UnkStruct_ov19_021D8318 *unk_10; diff --git a/include/overlay020/ov20_021D2098.h b/include/overlay020/ov20_021D2098.h index ad70498457..f5295122b7 100644 --- a/include/overlay020/ov20_021D2098.h +++ b/include/overlay020/ov20_021D2098.h @@ -17,7 +17,7 @@ void ov20_021D21A0(UnkStruct_ov20_021D2128 *param0, int param1); BOOL ov20_021D21F8(UnkStruct_ov20_021D2128 *param0); BOOL ov20_021D2210(UnkStruct_ov20_021D2128 *param0, int param1); u32 ov20_021D2DF4(UnkStruct_ov20_021D2128 *param0); -BGL *ov20_021D2E04(UnkStruct_ov20_021D2128 *param0); +BgConfig *ov20_021D2E04(UnkStruct_ov20_021D2128 *param0); CellActorCollection *ov20_021D2E08(UnkStruct_ov20_021D2128 *param0); void ov20_021D2E0C(UnkStruct_ov20_021D2128 *param0, CellActorResourceData *param1, u32 param2, u32 param3); CellActor *ov20_021D2E50(UnkStruct_ov20_021D2128 *param0, CellActorResourceData *param1, u32 param2, u32 param3, u32 param4, int param5); diff --git a/include/overlay020/ov20_021D4E38.h b/include/overlay020/ov20_021D4E38.h index 54082269aa..1e1b369f0c 100644 --- a/include/overlay020/ov20_021D4E38.h +++ b/include/overlay020/ov20_021D4E38.h @@ -6,7 +6,7 @@ #include "bg_window.h" -void ov20_021D4E38(UnkStruct_ov20_021D4E8C *param0, BGL *param1, u32 param2, int param3, int param4, int param5); +void ov20_021D4E38(UnkStruct_ov20_021D4E8C *param0, BgConfig *param1, u32 param2, int param3, int param4, int param5); BOOL ov20_021D4E8C(UnkStruct_ov20_021D4E8C *param0); void ov20_021D4F1C(UnkStruct_ov20_021D4FF0 *param0, int param1, int param2, int param3, int param4, int param5); BOOL ov20_021D4F4C(UnkStruct_ov20_021D4FF0 *param0); diff --git a/include/overlay020/struct_ov20_021D4E8C.h b/include/overlay020/struct_ov20_021D4E8C.h index 675a5e55fb..4e372e63bc 100644 --- a/include/overlay020/struct_ov20_021D4E8C.h +++ b/include/overlay020/struct_ov20_021D4E8C.h @@ -5,7 +5,7 @@ #include "sys_task_manager.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; u32 unk_04; int unk_08; fx32 unk_0C; diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h index 1bf1cda4cf..928bcc693e 100644 --- a/include/overlay021/ov21_021D0D80.h +++ b/include/overlay021/ov21_021D0D80.h @@ -50,7 +50,7 @@ void ov21_021D144C(CellActor *param0, int param1); void ov21_021D1498(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2); void ov21_021D1524(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4); void ov21_021D154C(TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4); -void ov21_021D1558(UnkStruct_ov21_021D157C *param0, BGL *param1, int param2, NNSG2dScreenData *param3, int param4, int param5, int param6, int param7, int param8); +void ov21_021D1558(UnkStruct_ov21_021D157C *param0, BgConfig *param1, int param2, NNSG2dScreenData *param3, int param4, int param5, int param6, int param7, int param8); BOOL ov21_021D157C(UnkStruct_ov21_021D157C *param0); void ov21_021D1650(Window *param0, int param1, int param2, int param3); Window *ov21_021D16D8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3); diff --git a/include/overlay021/ov21_021D1FA4.h b/include/overlay021/ov21_021D1FA4.h index 28c7836679..5875e98e93 100644 --- a/include/overlay021/ov21_021D1FA4.h +++ b/include/overlay021/ov21_021D1FA4.h @@ -57,7 +57,7 @@ void ov21_021D2648(UnkStruct_ov21_021D2648 *param0, int param1, int param2, int BOOL ov21_021D2664(UnkStruct_ov21_021D2648 *param0); NARC *ov21_021D26E0(UnkStruct_ov21_021D13FC *param0); void *ov21_021D26E8(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, u32 param3); -u32 ov21_021D2724(UnkStruct_ov21_021D13FC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +u32 ov21_021D2724(UnkStruct_ov21_021D13FC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); void ov21_021D276C(UnkStruct_ov21_021D13FC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); void *ov21_021D27B8(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4); void *ov21_021D27E0(UnkStruct_ov21_021D13FC *param0, u32 param1, NNSG2dPaletteData **param2, u32 param3); diff --git a/include/overlay021/struct_ov21_021D13FC.h b/include/overlay021/struct_ov21_021D13FC.h index 581905fda8..14d12f007d 100644 --- a/include/overlay021/struct_ov21_021D13FC.h +++ b/include/overlay021/struct_ov21_021D13FC.h @@ -19,7 +19,7 @@ #include "sys_task_manager.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; Window unk_04; UnkStruct_0200C738 unk_14; CellActorCollection *unk_138; diff --git a/include/overlay021/struct_ov21_021D157C.h b/include/overlay021/struct_ov21_021D157C.h index 155a0540a2..a28b8d8af0 100644 --- a/include/overlay021/struct_ov21_021D157C.h +++ b/include/overlay021/struct_ov21_021D157C.h @@ -6,7 +6,7 @@ #include "bg_window.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; NNSG2dScreenData *unk_04; int unk_08; int unk_0C; diff --git a/include/overlay021/struct_ov21_021D1FA4.h b/include/overlay021/struct_ov21_021D1FA4.h index d3efdbebf5..4726993b0e 100644 --- a/include/overlay021/struct_ov21_021D1FA4.h +++ b/include/overlay021/struct_ov21_021D1FA4.h @@ -6,7 +6,7 @@ typedef struct { CellActorCollection *unk_00; - BGL *unk_04; + BgConfig *unk_04; int unk_08; int unk_0C; } UnkStruct_ov21_021D1FA4; diff --git a/include/overlay021/struct_ov21_021E8E0C.h b/include/overlay021/struct_ov21_021E8E0C.h index 30da353bc9..e988b6ac93 100644 --- a/include/overlay021/struct_ov21_021E8E0C.h +++ b/include/overlay021/struct_ov21_021E8E0C.h @@ -8,7 +8,7 @@ #include "pokemon.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; PaletteData *unk_04; UnkStruct_02007768 *unk_08; int unk_0C; diff --git a/include/overlay022/ov22_02255094.h b/include/overlay022/ov22_02255094.h index eddd975f8b..bb5fe89e0c 100644 --- a/include/overlay022/ov22_02255094.h +++ b/include/overlay022/ov22_02255094.h @@ -38,7 +38,7 @@ void ov22_022553F8(UnkStruct_ov22_0225A0E4 *param0); void ov22_02255410(UnkStruct_ov22_02255CB8 *param0, int param1); int ov22_02255420(NNSG2dCharacterData *param0, int param1, int param2, int param3); void ov22_0225547C(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1, int param2); -void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BGL *param1, int param2); +void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BgConfig *param1, int param2); void ov22_022554F8(UnkStruct_ov22_0225A0E4 *param0); void ov22_02255524(UnkStruct_ov22_0225A0E4 *param0); void ov22_02255530(UnkStruct_ov22_0225A0E4 *param0); diff --git a/include/overlay022/struct_ov22_02256BAC.h b/include/overlay022/struct_ov22_02256BAC.h index 33e7ef0fb8..121cb05d36 100644 --- a/include/overlay022/struct_ov22_02256BAC.h +++ b/include/overlay022/struct_ov22_02256BAC.h @@ -10,7 +10,7 @@ #include "sprite_resource.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; CellActorCollection *unk_04; SpriteResourceCollection **unk_08; const Options *unk_0C; diff --git a/include/overlay022/struct_ov22_02257964_sub2.h b/include/overlay022/struct_ov22_02257964_sub2.h index 7bee1af051..5e116c5fdc 100644 --- a/include/overlay022/struct_ov22_02257964_sub2.h +++ b/include/overlay022/struct_ov22_02257964_sub2.h @@ -18,7 +18,7 @@ typedef struct { UnkStruct_020151A4 **unk_08; u8 *unk_0C; UnkStruct_02007768 *unk_10; - BGL *unk_14; + BgConfig *unk_14; UnkStruct_ov22_02254DE0 *unk_18; UnkStruct_ov22_022597BC unk_1C; int unk_48; diff --git a/include/overlay022/struct_ov22_02257F50_sub2.h b/include/overlay022/struct_ov22_02257F50_sub2.h index baa7f781b9..4620018dde 100644 --- a/include/overlay022/struct_ov22_02257F50_sub2.h +++ b/include/overlay022/struct_ov22_02257F50_sub2.h @@ -15,7 +15,7 @@ typedef struct { UnkStruct_02015128 **unk_04; UnkStruct_020151A4 **unk_08; u8 *unk_0C; - BGL *unk_10; + BgConfig *unk_10; UnkStruct_ov22_02254DE0 *unk_14; UnkStruct_ov22_022597BC unk_18; UnkStruct_ov22_02254DE0 *unk_44; diff --git a/include/overlay022/struct_ov22_02258470.h b/include/overlay022/struct_ov22_02258470.h index dfa0e24b86..79f1d497b4 100644 --- a/include/overlay022/struct_ov22_02258470.h +++ b/include/overlay022/struct_ov22_02258470.h @@ -16,7 +16,7 @@ typedef struct { UnkStruct_02015128 **unk_04; UnkStruct_020151A4 **unk_08; u8 *unk_0C; - BGL *unk_10; + BgConfig *unk_10; UnkStruct_ov22_02254DE0 *unk_14; UnkStruct_ov22_02259484 *unk_18; int unk_1C; diff --git a/include/overlay022/struct_ov22_022597BC.h b/include/overlay022/struct_ov22_022597BC.h index efdd9d35cb..85dc6acd5e 100644 --- a/include/overlay022/struct_ov22_022597BC.h +++ b/include/overlay022/struct_ov22_022597BC.h @@ -4,7 +4,7 @@ #include "bg_window.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; int unk_04; int unk_08; int unk_0C; diff --git a/include/overlay022/struct_ov22_022599A0.h b/include/overlay022/struct_ov22_022599A0.h index 5c0d7caf49..7a3727444d 100644 --- a/include/overlay022/struct_ov22_022599A0.h +++ b/include/overlay022/struct_ov22_022599A0.h @@ -4,7 +4,7 @@ #include "bg_window.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; int unk_04; int unk_08; int unk_0C; diff --git a/include/overlay022/struct_ov22_0225A0E4.h b/include/overlay022/struct_ov22_0225A0E4.h index 8f6f7ffc24..17ee7d3f70 100644 --- a/include/overlay022/struct_ov22_0225A0E4.h +++ b/include/overlay022/struct_ov22_0225A0E4.h @@ -32,7 +32,7 @@ typedef struct { ResourceCollection *unk_34; NNSG2dCharacterData **unk_38; int unk_3C; - BGL *unk_40; + BgConfig *unk_40; CellActorCollection *unk_44; SpriteResourceCollection *unk_48[4]; UnkStruct_0200C738 unk_58; diff --git a/include/overlay022/struct_ov22_0225AF8C.h b/include/overlay022/struct_ov22_0225AF8C.h index d87612d092..239b500e2a 100644 --- a/include/overlay022/struct_ov22_0225AF8C.h +++ b/include/overlay022/struct_ov22_0225AF8C.h @@ -4,7 +4,7 @@ #include "bg_window.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; int unk_04; int unk_08; int unk_0C; diff --git a/include/overlay022/struct_ov22_0225B388.h b/include/overlay022/struct_ov22_0225B388.h index 110c0417bd..71e3e807f9 100644 --- a/include/overlay022/struct_ov22_0225B388.h +++ b/include/overlay022/struct_ov22_0225B388.h @@ -17,7 +17,7 @@ typedef struct { UnkStruct_020151A4 **unk_08; u8 *unk_0C; UnkStruct_02007768 *unk_10; - BGL *unk_14; + BgConfig *unk_14; UnkStruct_ov22_02254DE0 *unk_18; UnkStruct_ov22_02259484 *unk_1C; int unk_20; diff --git a/include/overlay023/ov23_0224340C.h b/include/overlay023/ov23_0224340C.h index 6ab9e14a22..8d23d87ab4 100644 --- a/include/overlay023/ov23_0224340C.h +++ b/include/overlay023/ov23_0224340C.h @@ -64,7 +64,7 @@ void ov23_02245784(void); void ov23_022457E4(int param0, int param1, void *param2, void *param3); void ov23_0224589C(int param0, int param1, void *param2, void *param3); int ov23_02245908(void); -void ov23_022468A8(BGL *param0); +void ov23_022468A8(BgConfig *param0); void ov23_022489F8(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, u8 *param5, int param6, u8 *param7, int param8, u8 *param9, int param10); void ov23_02248B98(int param0); diff --git a/include/overlay023/ov23_02253598.h b/include/overlay023/ov23_02253598.h index 7a6d705086..2f3eb8e956 100644 --- a/include/overlay023/ov23_02253598.h +++ b/include/overlay023/ov23_02253598.h @@ -16,7 +16,7 @@ void ov23_022535CC(void); void ov23_022535EC(void); void ov23_02253604(void); int ov23_02253608(void); -void ov23_02253834(BGL *param0, TrainerInfo *param1, UnkFuncPtr_ov23_02253834 param2, void *param3, BOOL param4); +void ov23_02253834(BgConfig *param0, TrainerInfo *param1, UnkFuncPtr_ov23_02253834 param2, void *param3, BOOL param4); void ov23_022538FC(int param0); void ov23_02253968(void); void ov23_02253998(int param0, int param1, void *param2, void *param3); @@ -24,7 +24,7 @@ void ov23_022539A8(int param0, int param1, void *param2, void *param3); BOOL ov23_022539D8(void); void ov23_022539E8(void); void ov23_02253A00(SecretBaseRecord *param0, int param1); -void *ov23_02253C64(BGL *param0, TrainerInfo *param1, UndergroundData *param2, UnkFuncPtr_ov23_02253834 param3, void *param4); +void *ov23_02253C64(BgConfig *param0, TrainerInfo *param1, UndergroundData *param2, UnkFuncPtr_ov23_02253834 param3, void *param4); void ov23_02253D10(void *param0); #endif // POKEPLATINUM_OV23_02253598_H diff --git a/include/overlay023/ov23_02253D40.h b/include/overlay023/ov23_02253D40.h index bd104ca0a0..be8b219834 100644 --- a/include/overlay023/ov23_02253D40.h +++ b/include/overlay023/ov23_02253D40.h @@ -10,10 +10,10 @@ #include "trainer_info.h" const UnkStruct_ov84_02240FA8 *ov23_02253D40(void); -UnkStruct_ov23_02253E2C *ov23_02253D48(int param0, int param1, BGL *param2, int param3, int param4); +UnkStruct_ov23_02253E2C *ov23_02253D48(int param0, int param1, BgConfig *param2, int param3, int param4); void ov23_02253DD8(UnkStruct_ov23_02253E2C *param0); void ov23_02253DFC(UnkStruct_ov23_02253E2C *param0, int param1, int param2); -void ov23_02253E2C(UnkStruct_ov23_02253E2C *param0, BGL *param1, u16 param2, u16 param3); +void ov23_02253E2C(UnkStruct_ov23_02253E2C *param0, BgConfig *param1, u16 param2, u16 param3); MessageLoader *ov23_02253E3C(UnkStruct_ov23_02253E2C *param0); int ov23_02253F40(UnkStruct_ov23_02253E2C *param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3); int ov23_02253F60(UnkStruct_ov23_02253E2C *param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3); diff --git a/include/overlay024/ov24_02253CE0.h b/include/overlay024/ov24_02253CE0.h index 6d37119cb6..f3dc572754 100644 --- a/include/overlay024/ov24_02253CE0.h +++ b/include/overlay024/ov24_02253CE0.h @@ -3,8 +3,8 @@ #include "bg_window.h" -void ov24_02253CE0(BGL *param0); -void ov24_02253DA4(BGL *param0); -BOOL ov24_02253DB4(BGL *param0); +void ov24_02253CE0(BgConfig *param0); +void ov24_02253DA4(BgConfig *param0); +BOOL ov24_02253DB4(BgConfig *param0); #endif // POKEPLATINUM_OV24_02253CE0_H diff --git a/include/overlay025/ov25_02254560.h b/include/overlay025/ov25_02254560.h index 32e10d6231..84679b4484 100644 --- a/include/overlay025/ov25_02254560.h +++ b/include/overlay025/ov25_02254560.h @@ -12,7 +12,7 @@ BOOL ov25_02254560(UnkStruct_ov25_02254560 **param0, const UnkStruct_ov25_02254560_1 *param1, NNSG2dOamManagerInstance *param2, PoketchSystem *poketchSys); UnkStruct_ov25_022555E8 *ov25_02254664(void); -BGL *ov25_02254674(void); +BgConfig *ov25_02254674(void); void ov25_022546B8(u32 param0, u32 param1); void ov25_022546F0(u32 param0, u32 param1); void ov25_02254728(u16 *param0); diff --git a/include/overlay025/ov25_02255090.h b/include/overlay025/ov25_02255090.h index 36fe9909cc..55fed8e4a5 100644 --- a/include/overlay025/ov25_02255090.h +++ b/include/overlay025/ov25_02255090.h @@ -22,6 +22,6 @@ void ov25_02255290(u16 *param0, u32 param1); void ov25_02255308(u32 param0, u32 param1); void ov25_02255360(u32 param0); void ov25_022553A0(u32 param0, const u32 *param1, u32 param2, BOOL param3); -void ov25_02255440(BGL *param0, u32 param1, u32 param2); +void ov25_02255440(BgConfig *param0, u32 param1, u32 param2); #endif // POKEPLATINUM_OV25_02255090_H diff --git a/include/overlay025/poketch_system.h b/include/overlay025/poketch_system.h index 36606195fd..05baa63223 100644 --- a/include/overlay025/poketch_system.h +++ b/include/overlay025/poketch_system.h @@ -74,7 +74,7 @@ enum PoketchEventID { typedef struct PoketchSystem PoketchSystem; -typedef BOOL (*PoketchAppInitFunction)(void **app, PoketchSystem *poketchSys, BGL *bgl, u32 appID); +typedef BOOL (*PoketchAppInitFunction)(void **app, PoketchSystem *poketchSys, BgConfig *bgl, u32 appID); typedef void (*PoketchAppShutdownFunction)(void *app); typedef void (*PoketchAppSaveFunction)(void *app); @@ -106,7 +106,7 @@ struct PoketchSystem { PoketchAppSaveFunction currAppSave; void *appSaveData; - BGL *bgl; + BgConfig *bgl; NNSG2dOamManagerInstance *oamManager; SaveData *saveData; @@ -115,7 +115,7 @@ struct PoketchSystem { enum ButtonDir buttonDir; }; -void PoketchSystem_Create(FieldSystem *fieldSystem, PoketchSystem **poketchSys, SaveData *saveData, BGL *bgl, NNSG2dOamManagerInstance *oamManager); +void PoketchSystem_Create(FieldSystem *fieldSystem, PoketchSystem **poketchSys, SaveData *saveData, BgConfig *bgl, NNSG2dOamManagerInstance *oamManager); void PoketchSystem_StartShutdown(PoketchSystem *poketchSys); BOOL PoketchSystem_IsSystemShutdown(PoketchSystem *poketchSys); void PoketchSystem_SendEvent(PoketchSystem *poketchSys, enum PoketchEventID eventID, u32); diff --git a/include/overlay026/ov26_02256404.h b/include/overlay026/ov26_02256404.h index de90bb3aa9..df7d704f6a 100644 --- a/include/overlay026/ov26_02256404.h +++ b/include/overlay026/ov26_02256404.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_02256404_1 *param1, BGL *param2); +BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_02256404_1 *param1, BgConfig *param2); void ov26_0225649C(UnkStruct_ov26_02256404 *param0); void ov26_022564A8(UnkStruct_ov26_02256404 *param0, u32 param1); BOOL ov26_022564CC(UnkStruct_ov26_02256404 *param0, u32 param1); diff --git a/include/overlay027/ov27_0225680C.h b/include/overlay027/ov27_0225680C.h index 35de17e471..45a5e0c1ab 100644 --- a/include/overlay027/ov27_0225680C.h +++ b/include/overlay027/ov27_0225680C.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov27_0225680C(UnkStruct_ov27_0225680C **param0, const UnkStruct_ov27_0225680C_1 *param1, BGL *param2); +BOOL ov27_0225680C(UnkStruct_ov27_0225680C **param0, const UnkStruct_ov27_0225680C_1 *param1, BgConfig *param2); void ov27_02256890(UnkStruct_ov27_0225680C *param0); void ov27_022569C8(UnkStruct_ov27_0225680C *param0, u32 param1); BOOL ov27_022569EC(UnkStruct_ov27_0225680C *param0, u32 param1); diff --git a/include/overlay028/ov28_0225697C.h b/include/overlay028/ov28_0225697C.h index 6bcaf3118c..ce66552764 100644 --- a/include/overlay028/ov28_0225697C.h +++ b/include/overlay028/ov28_0225697C.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov28_0225697C(UnkStruct_ov28_0225697C **param0, const UnkStruct_ov28_0225697C_1 *param1, BGL *param2); +BOOL ov28_0225697C(UnkStruct_ov28_0225697C **param0, const UnkStruct_ov28_0225697C_1 *param1, BgConfig *param2); void ov28_022569AC(UnkStruct_ov28_0225697C *param0); void ov28_022569B8(UnkStruct_ov28_0225697C *param0, u32 param1); BOOL ov28_022569DC(UnkStruct_ov28_0225697C *param0, u32 param1); diff --git a/include/overlay029/ov29_022566C8.h b/include/overlay029/ov29_022566C8.h index c8bbc774ae..64a69a98e7 100644 --- a/include/overlay029/ov29_022566C8.h +++ b/include/overlay029/ov29_022566C8.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566C8_1 *param1, BGL *param2); +BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566C8_1 *param1, BgConfig *param2); void ov29_02256770(UnkStruct_ov29_022566C8 *param0); void ov29_022567B4(UnkStruct_ov29_022566C8 *param0, u32 param1); BOOL ov29_022567D8(UnkStruct_ov29_022566C8 *param0, u32 param1); diff --git a/include/overlay030/ov30_022563EC.h b/include/overlay030/ov30_022563EC.h index e4cf9b47e0..bc5965a01b 100644 --- a/include/overlay030/ov30_022563EC.h +++ b/include/overlay030/ov30_022563EC.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563EC_1 *param1, BGL *param2); +BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563EC_1 *param1, BgConfig *param2); void ov30_02256444(UnkStruct_ov30_022563EC *param0); void ov30_02256464(UnkStruct_ov30_022563EC *param0, u32 param1); BOOL ov30_02256488(UnkStruct_ov30_022563EC *param0, u32 param1); diff --git a/include/overlay031/ov31_02256554.h b/include/overlay031/ov31_02256554.h index a8fa74711f..b0833f851f 100644 --- a/include/overlay031/ov31_02256554.h +++ b/include/overlay031/ov31_02256554.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_02256554_1 *param1, BGL *param2); +BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_02256554_1 *param1, BgConfig *param2); void ov31_02256584(UnkStruct_ov31_02256554 *param0); void ov31_02256590(UnkStruct_ov31_02256554 *param0, u32 param1); BOOL ov31_022565B4(UnkStruct_ov31_02256554 *param0, u32 param1); diff --git a/include/overlay032/ov32_02256470.h b/include/overlay032/ov32_02256470.h index 0bc31763f1..02fed727ed 100644 --- a/include/overlay032/ov32_02256470.h +++ b/include/overlay032/ov32_02256470.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov32_02256470(UnkStruct_ov32_02256470 **param0, const UnkStruct_ov32_02256470_1 *param1, BGL *param2); +BOOL ov32_02256470(UnkStruct_ov32_02256470 **param0, const UnkStruct_ov32_02256470_1 *param1, BgConfig *param2); void ov32_02256508(UnkStruct_ov32_02256470 *param0); void ov32_02256538(UnkStruct_ov32_02256470 *param0, u32 param1); BOOL ov32_0225655C(UnkStruct_ov32_02256470 *param0, u32 param1); diff --git a/include/overlay033/ov33_02256474.h b/include/overlay033/ov33_02256474.h index 1b711e2f18..de38886623 100644 --- a/include/overlay033/ov33_02256474.h +++ b/include/overlay033/ov33_02256474.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_02256474_1 *param1, BGL *param2); +BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_02256474_1 *param1, BgConfig *param2); void ov33_022564F0(UnkStruct_ov33_02256474 *param0); void ov33_02256548(UnkStruct_ov33_02256474 *param0, u32 param1); BOOL ov33_0225656C(UnkStruct_ov33_02256474 *param0, u32 param1); diff --git a/include/overlay034/ov34_02256540.h b/include/overlay034/ov34_02256540.h index 8aa39d0d94..7a8110c746 100644 --- a/include/overlay034/ov34_02256540.h +++ b/include/overlay034/ov34_02256540.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const UnkStruct_ov34_02256540_1 *param1, BGL *param2); +BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const UnkStruct_ov34_02256540_1 *param1, BgConfig *param2); void ov34_02256604(UnkStruct_ov34_02256540 *param0); void ov34_02256640(UnkStruct_ov34_02256540 *param0, u32 param1); BOOL ov34_02256664(UnkStruct_ov34_02256540 *param0, u32 param1); diff --git a/include/overlay035/ov35_02256410.h b/include/overlay035/ov35_02256410.h index e00c51cd39..8c0ca23881 100644 --- a/include/overlay035/ov35_02256410.h +++ b/include/overlay035/ov35_02256410.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_02256410_1 *param1, BGL *param2); +BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_02256410_1 *param1, BgConfig *param2); void ov35_0225644C(UnkStruct_ov35_02256410 *param0); void ov35_02256548(UnkStruct_ov35_02256410 *param0, u32 param1); BOOL ov35_0225656C(UnkStruct_ov35_02256410 *param0, u32 param1); diff --git a/include/overlay036/poketch_app_pedometer.h b/include/overlay036/poketch_app_pedometer.h index 8509dfdb76..b38067bad5 100644 --- a/include/overlay036/poketch_app_pedometer.h +++ b/include/overlay036/poketch_app_pedometer.h @@ -8,7 +8,7 @@ typedef struct { typedef struct UnkStruct_ov36_02256404_t UnkStruct_ov36_02256404; -BOOL ov36_02256404(UnkStruct_ov36_02256404 **param0, const UnkStruct_ov36_02256404_1 *param1, BGL *param2); +BOOL ov36_02256404(UnkStruct_ov36_02256404 **param0, const UnkStruct_ov36_02256404_1 *param1, BgConfig *param2); void ov36_02256440(UnkStruct_ov36_02256404 *param0); void ov36_0225653C(UnkStruct_ov36_02256404 *param0, u32 param1); BOOL ov36_02256560(UnkStruct_ov36_02256404 *param0, u32 param1); diff --git a/include/overlay037/ov37_022563D4.h b/include/overlay037/ov37_022563D4.h index 244373b4fe..6fd048cb15 100644 --- a/include/overlay037/ov37_022563D4.h +++ b/include/overlay037/ov37_022563D4.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563D4_1 *param1, BGL *param2); +BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563D4_1 *param1, BgConfig *param2); void ov37_02256410(UnkStruct_ov37_022563D4 *param0); void ov37_02256488(UnkStruct_ov37_022563D4 *param0, u32 param1); BOOL ov37_022564AC(UnkStruct_ov37_022563D4 *param0, u32 param1); diff --git a/include/overlay038/ov38_0225632C.h b/include/overlay038/ov38_0225632C.h index 0ca794cb38..eb3cac09ec 100644 --- a/include/overlay038/ov38_0225632C.h +++ b/include/overlay038/ov38_0225632C.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_0225632C_1 *param1, BGL *param2); +BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_0225632C_1 *param1, BgConfig *param2); void ov38_0225635C(UnkStruct_ov38_0225632C *param0); void ov38_02256368(UnkStruct_ov38_0225632C *param0, u32 param1); BOOL ov38_0225638C(UnkStruct_ov38_0225632C *param0, u32 param1); diff --git a/include/overlay039/ov39_022563DC.h b/include/overlay039/ov39_022563DC.h index 36c137e7f9..6079a126c7 100644 --- a/include/overlay039/ov39_022563DC.h +++ b/include/overlay039/ov39_022563DC.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563DC_1 *param1, BGL *param2); +BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563DC_1 *param1, BgConfig *param2); void ov39_0225640C(UnkStruct_ov39_022563DC *param0); void ov39_02256418(UnkStruct_ov39_022563DC *param0, u32 param1); BOOL ov39_0225643C(UnkStruct_ov39_022563DC *param0, u32 param1); diff --git a/include/overlay040/ov40_0225645C.h b/include/overlay040/ov40_0225645C.h index 0f8adff1ac..f13ff76f2b 100644 --- a/include/overlay040/ov40_0225645C.h +++ b/include/overlay040/ov40_0225645C.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_0225645C_1 *param1, BGL *param2); +BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_0225645C_1 *param1, BgConfig *param2); void ov40_022564B8(UnkStruct_ov40_0225645C *param0); void ov40_022565C8(UnkStruct_ov40_0225645C *param0, u32 param1); BOOL ov40_022565EC(UnkStruct_ov40_0225645C *param0, u32 param1); diff --git a/include/overlay041/ov41_022567B0.h b/include/overlay041/ov41_022567B0.h index 0648b5c87b..b370b6f9f1 100644 --- a/include/overlay041/ov41_022567B0.h +++ b/include/overlay041/ov41_022567B0.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567B0_1 *param1, BGL *param2); +BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567B0_1 *param1, BgConfig *param2); void ov41_022567F8(UnkStruct_ov41_022567B0 *param0); void ov41_0225688C(UnkStruct_ov41_022567B0 *param0, u32 param1); BOOL ov41_022568B0(UnkStruct_ov41_022567B0 *param0, u32 param1); diff --git a/include/overlay042/ov42_022563D4.h b/include/overlay042/ov42_022563D4.h index 1f0c653f7e..360583e44b 100644 --- a/include/overlay042/ov42_022563D4.h +++ b/include/overlay042/ov42_022563D4.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563D4_1 *param1, BGL *param2); +BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563D4_1 *param1, BgConfig *param2); void ov42_0225648C(UnkStruct_ov42_022563D4 *param0); void ov42_022564A0(UnkStruct_ov42_022563D4 *param0, u32 param1); BOOL ov42_022564C4(UnkStruct_ov42_022563D4 *param0, u32 param1); diff --git a/include/overlay043/ov43_02256544.h b/include/overlay043/ov43_02256544.h index cf0dc8a27c..f31fa20138 100644 --- a/include/overlay043/ov43_02256544.h +++ b/include/overlay043/ov43_02256544.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_02256544_1 *param1, BGL *param2); +BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_02256544_1 *param1, BgConfig *param2); void ov43_02256680(UnkStruct_ov43_02256544 *param0); void ov43_022566B0(UnkStruct_ov43_02256544 *param0, u32 param1); BOOL ov43_022566D4(UnkStruct_ov43_02256544 *param0, u32 param1); diff --git a/include/overlay044/ov44_022565BC.h b/include/overlay044/ov44_022565BC.h index 06b1ada074..2d843c0eeb 100644 --- a/include/overlay044/ov44_022565BC.h +++ b/include/overlay044/ov44_022565BC.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565BC_1 *param1, BGL *param2); +BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565BC_1 *param1, BgConfig *param2); void ov44_022565F8(UnkStruct_ov44_022565BC *param0); void ov44_02256744(UnkStruct_ov44_022565BC *param0, u32 param1); BOOL ov44_02256768(UnkStruct_ov44_022565BC *param0, u32 param1); diff --git a/include/overlay045/ov45_022566EC.h b/include/overlay045/ov45_022566EC.h index 347072abf4..3ea8c231c7 100644 --- a/include/overlay045/ov45_022566EC.h +++ b/include/overlay045/ov45_022566EC.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566EC_1 *param1, BGL *param2); +BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566EC_1 *param1, BgConfig *param2); void ov45_02256728(UnkStruct_ov45_022566EC *param0); void ov45_02256918(UnkStruct_ov45_022566EC *param0, u32 param1); BOOL ov45_0225693C(UnkStruct_ov45_022566EC *param0, u32 param1); diff --git a/include/overlay046/ov46_02256BCC.h b/include/overlay046/ov46_02256BCC.h index 056c6b6065..b94f55b81a 100644 --- a/include/overlay046/ov46_02256BCC.h +++ b/include/overlay046/ov46_02256BCC.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256BCC_1 *param1, BGL *param2); +BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256BCC_1 *param1, BgConfig *param2); void ov46_02256C0C(UnkStruct_ov46_02256BCC *param0); void ov46_02256D24(UnkStruct_ov46_02256BCC *param0, u32 param1); BOOL ov46_02256D48(UnkStruct_ov46_02256BCC *param0, u32 param1); diff --git a/include/overlay047/ov47_02256634.h b/include/overlay047/ov47_02256634.h index 6533007a55..2bb60bd707 100644 --- a/include/overlay047/ov47_02256634.h +++ b/include/overlay047/ov47_02256634.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_02256634_1 *param1, BGL *param2); +BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_02256634_1 *param1, BgConfig *param2); void ov47_02256670(UnkStruct_ov47_02256634 *param0); void ov47_0225686C(UnkStruct_ov47_02256634 *param0, u32 param1); BOOL ov47_02256890(UnkStruct_ov47_02256634 *param0, u32 param1); diff --git a/include/overlay048/ov48_0225650C.h b/include/overlay048/ov48_0225650C.h index 093a6531fd..0f8481ce06 100644 --- a/include/overlay048/ov48_0225650C.h +++ b/include/overlay048/ov48_0225650C.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov48_0225650C(UnkStruct_ov48_0225650C **param0, const UnkStruct_ov48_0225650C_1 *param1, BGL *param2); +BOOL ov48_0225650C(UnkStruct_ov48_0225650C **param0, const UnkStruct_ov48_0225650C_1 *param1, BgConfig *param2); void ov48_0225654C(UnkStruct_ov48_0225650C *param0); void ov48_02256558(UnkStruct_ov48_0225650C *param0, u32 param1); BOOL ov48_0225657C(UnkStruct_ov48_0225650C *param0, u32 param1); diff --git a/include/overlay049/ov49_022563D4.h b/include/overlay049/ov49_022563D4.h index 06dd9bdfa6..fbbdf3c5a7 100644 --- a/include/overlay049/ov49_022563D4.h +++ b/include/overlay049/ov49_022563D4.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov49_022563D4(UnkStruct_ov49_022563D4 **param0, const UnkStruct_ov49_022563D4_1 *param1, BGL *param2); +BOOL ov49_022563D4(UnkStruct_ov49_022563D4 **param0, const UnkStruct_ov49_022563D4_1 *param1, BgConfig *param2); void ov49_02256480(UnkStruct_ov49_022563D4 *param0); void ov49_02256494(UnkStruct_ov49_022563D4 *param0, u32 param1); BOOL ov49_022564B8(UnkStruct_ov49_022563D4 *param0, u32 param1); diff --git a/include/overlay050/ov50_02256510.h b/include/overlay050/ov50_02256510.h index 81442937d2..6c798b0948 100644 --- a/include/overlay050/ov50_02256510.h +++ b/include/overlay050/ov50_02256510.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov50_02256510(UnkStruct_ov50_02256510 **param0, const UnkStruct_ov50_02256510_1 *param1, BGL *param2); +BOOL ov50_02256510(UnkStruct_ov50_02256510 **param0, const UnkStruct_ov50_02256510_1 *param1, BgConfig *param2); void ov50_0225654C(UnkStruct_ov50_02256510 *param0); void ov50_022565FC(UnkStruct_ov50_02256510 *param0, u32 param1); BOOL ov50_02256620(UnkStruct_ov50_02256510 *param0, u32 param1); diff --git a/include/overlay051/ov51_0225632C.h b/include/overlay051/ov51_0225632C.h index 9ffb3d489d..89d3cdd331 100644 --- a/include/overlay051/ov51_0225632C.h +++ b/include/overlay051/ov51_0225632C.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov51_0225632C(UnkStruct_ov51_0225632C **param0, const UnkStruct_ov51_0225632C_1 *param1, BGL *param2); +BOOL ov51_0225632C(UnkStruct_ov51_0225632C **param0, const UnkStruct_ov51_0225632C_1 *param1, BgConfig *param2); void ov51_0225635C(UnkStruct_ov51_0225632C *param0); void ov51_02256368(UnkStruct_ov51_0225632C *param0, u32 param1); BOOL ov51_0225638C(UnkStruct_ov51_0225632C *param0, u32 param1); diff --git a/include/overlay052/ov52_02256694.h b/include/overlay052/ov52_02256694.h index b43b0699ba..2c7597ae83 100644 --- a/include/overlay052/ov52_02256694.h +++ b/include/overlay052/ov52_02256694.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov52_02256694(UnkStruct_ov52_02256694 **param0, const UnkStruct_ov52_02256694_1 *param1, BGL *param2); +BOOL ov52_02256694(UnkStruct_ov52_02256694 **param0, const UnkStruct_ov52_02256694_1 *param1, BgConfig *param2); void ov52_022566EC(UnkStruct_ov52_02256694 *param0); void ov52_022567A4(UnkStruct_ov52_02256694 *param0, u32 param1); BOOL ov52_022567C8(UnkStruct_ov52_02256694 *param0, u32 param1); diff --git a/include/overlay053/ov53_02256420.h b/include/overlay053/ov53_02256420.h index 7deedd3b7b..1f5f76201b 100644 --- a/include/overlay053/ov53_02256420.h +++ b/include/overlay053/ov53_02256420.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov53_02256420(UnkStruct_ov53_02256420 **param0, const UnkStruct_ov53_02256420_1 *param1, BGL *param2); +BOOL ov53_02256420(UnkStruct_ov53_02256420 **param0, const UnkStruct_ov53_02256420_1 *param1, BgConfig *param2); void ov53_02256454(UnkStruct_ov53_02256420 *param0); void ov53_02256460(UnkStruct_ov53_02256420 *param0, u32 param1); BOOL ov53_02256484(UnkStruct_ov53_02256420 *param0, u32 param1); diff --git a/include/overlay054/ov54_0225642C.h b/include/overlay054/ov54_0225642C.h index 8c1f9bd316..df478a78ec 100644 --- a/include/overlay054/ov54_0225642C.h +++ b/include/overlay054/ov54_0225642C.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov54_0225642C(UnkStruct_ov54_0225642C **param0, const UnkStruct_ov54_0225642C_1 *param1, BGL *param2); +BOOL ov54_0225642C(UnkStruct_ov54_0225642C **param0, const UnkStruct_ov54_0225642C_1 *param1, BgConfig *param2); void ov54_02256460(UnkStruct_ov54_0225642C *param0); void ov54_0225646C(UnkStruct_ov54_0225642C *param0, u32 param1); BOOL ov54_02256490(UnkStruct_ov54_0225642C *param0, u32 param1); diff --git a/include/overlay055/ov55_0225632C.h b/include/overlay055/ov55_0225632C.h index f2e77b78eb..2d7f2d6394 100644 --- a/include/overlay055/ov55_0225632C.h +++ b/include/overlay055/ov55_0225632C.h @@ -6,7 +6,7 @@ #include "bg_window.h" -BOOL ov55_0225632C(UnkStruct_ov55_0225632C **param0, const UnkStruct_ov55_0225632C_1 *param1, BGL *param2); +BOOL ov55_0225632C(UnkStruct_ov55_0225632C **param0, const UnkStruct_ov55_0225632C_1 *param1, BgConfig *param2); void ov55_02256360(UnkStruct_ov55_0225632C *param0); void ov55_02256378(UnkStruct_ov55_0225632C *param0, u32 param1); BOOL ov55_0225639C(UnkStruct_ov55_0225632C *param0, u32 param1); diff --git a/include/overlay062/struct_ov62_0223118C.h b/include/overlay062/struct_ov62_0223118C.h index ee195b77f0..65ad042d32 100644 --- a/include/overlay062/struct_ov62_0223118C.h +++ b/include/overlay062/struct_ov62_0223118C.h @@ -24,7 +24,7 @@ typedef struct { SpriteRenderer *unk_04; SpriteGfxHandler *unk_08; u8 padding_0C[4]; - BGL *unk_10; + BgConfig *unk_10; PaletteData *unk_14; UnkStruct_02023FCC *unk_18; TouchScreenRect unk_1C[5]; diff --git a/include/overlay062/struct_ov62_02246BF4_sub2.h b/include/overlay062/struct_ov62_02246BF4_sub2.h index 582005524c..183e6d83d8 100644 --- a/include/overlay062/struct_ov62_02246BF4_sub2.h +++ b/include/overlay062/struct_ov62_02246BF4_sub2.h @@ -14,7 +14,7 @@ typedef struct { NARC *unk_00; SpriteRenderer *unk_04; SpriteGfxHandler *unk_08; - BGL *unk_0C; + BgConfig *unk_0C; PaletteData *unk_10; UnkStruct_02023FCC *unk_14; TouchScreenRect unk_18[24]; diff --git a/include/overlay063/ov63_0222D1C0.h b/include/overlay063/ov63_0222D1C0.h index ea6da513f5..1888416170 100644 --- a/include/overlay063/ov63_0222D1C0.h +++ b/include/overlay063/ov63_0222D1C0.h @@ -9,7 +9,7 @@ #include "bg_window.h" -UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(UnkStruct_0200C738 *param0, BGL *param1, const UnkStruct_ov65_0223582C *param2, u32 param3); +UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(UnkStruct_0200C738 *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, u32 param3); void ov63_0222D214(UnkStruct_ov63_0222D1C0 *param0); void ov63_0222D228(UnkStruct_ov63_0222D1C0 *param0, const UnkStruct_ov63_0222D160 *param1); diff --git a/include/overlay065/ov65_02235060.h b/include/overlay065/ov65_02235060.h index bef7ba989c..129ff4a72e 100644 --- a/include/overlay065/ov65_02235060.h +++ b/include/overlay065/ov65_02235060.h @@ -8,7 +8,7 @@ #include "bg_window.h" -void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, BGL *param3, u32 param4, u32 param5); +void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, BgConfig *param3, u32 param4, u32 param5); void ov65_02235130(UnkStruct_ov65_02235130 *param0); BOOL ov65_02235194(const UnkStruct_ov65_02235130 *param0); u32 ov65_02235198(UnkStruct_ov65_02235130 *param0); diff --git a/include/overlay065/struct_ov65_0222EBE0_t.h b/include/overlay065/struct_ov65_0222EBE0_t.h index 3d200e28a8..25db2c5f9e 100644 --- a/include/overlay065/struct_ov65_0222EBE0_t.h +++ b/include/overlay065/struct_ov65_0222EBE0_t.h @@ -36,7 +36,7 @@ struct UnkStruct_ov65_0222EBE0_t { BmpList *unk_150; ResourceMetadata *unk_154; BmpList *unk_158; - BGL *unk_15C; + BgConfig *unk_15C; SaveData *unk_160; StringTemplate *unk_164; MessageLoader *unk_168; diff --git a/include/overlay065/struct_ov65_02235130.h b/include/overlay065/struct_ov65_02235130.h index 6134b41677..3f2b01f1df 100644 --- a/include/overlay065/struct_ov65_02235130.h +++ b/include/overlay065/struct_ov65_02235130.h @@ -18,7 +18,7 @@ typedef struct UnkStruct_ov65_02235130_t { u32 unk_04; u32 unk_08; BOOL unk_0C; - BGL *unk_10; + BgConfig *unk_10; UnkStruct_ov65_022358CC unk_14; UnkStruct_ov65_022354D8 unk_1F0[48]; UnkStruct_ov65_022354D8 *unk_730; diff --git a/include/overlay071/ov71_0223C69C.h b/include/overlay071/ov71_0223C69C.h index 5da46e5c9d..d0ba15460e 100644 --- a/include/overlay071/ov71_0223C69C.h +++ b/include/overlay071/ov71_0223C69C.h @@ -6,7 +6,7 @@ #include "bg_window.h" #include "strbuf.h" -void ov71_0223C69C(BGL *param0, Window *param1); +void ov71_0223C69C(BgConfig *param0, Window *param1); void ov71_0223C6D4(Window *param0); void ov71_0223C6F0(Window *param0, const TrainerCard *param1); void ov71_0223CA28(Window *param0, const TrainerCard *param1); diff --git a/include/overlay071/struct_ov71_0223B620.h b/include/overlay071/struct_ov71_0223B620.h index c6ccd22613..bf6a12b318 100644 --- a/include/overlay071/struct_ov71_0223B620.h +++ b/include/overlay071/struct_ov71_0223B620.h @@ -13,7 +13,7 @@ #include "strbuf.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; Window unk_04[11]; TrainerCard *unk_B4; u8 unk_B8[12288]; diff --git a/include/overlay072/struct_ov72_0223DB98_t.h b/include/overlay072/struct_ov72_0223DB98_t.h index 60feb3c888..40ea21fad4 100644 --- a/include/overlay072/struct_ov72_0223DB98_t.h +++ b/include/overlay072/struct_ov72_0223DB98_t.h @@ -18,7 +18,7 @@ #include "string_template.h" struct UnkStruct_ov72_0223DB98_t { - BGL *unk_00; + BgConfig *unk_00; BOOL unk_04; GameRecords *records; Options *unk_0C; diff --git a/include/overlay076/ov76_0223B870.h b/include/overlay076/ov76_0223B870.h index 3aa0872d7f..65ce966112 100644 --- a/include/overlay076/ov76_0223B870.h +++ b/include/overlay076/ov76_0223B870.h @@ -27,7 +27,7 @@ GenericPointerData *ov76_0223BE6C(void); void ov76_0223BE8C(void); void ov76_0223BF10(void); void ov76_0223BF50(void); -void ov76_0223BF74(BGL *param0, Window *param1, int param2, UnkStruct_ov76_0223DE00 *param3, int param4); +void ov76_0223BF74(BgConfig *param0, Window *param1, int param2, UnkStruct_ov76_0223DE00 *param3, int param4); void ov76_0223C0EC(int param0, s16 *param1, s16 *param2); void ov76_0223C110(UnkStruct_ov76_0223DE00 *param0); void ov76_0223C188(UnkStruct_ov76_0223DE00 *param0); @@ -48,10 +48,10 @@ void ov76_0223C7E0(UnkStruct_ov76_0223DE00 *param0); void ov76_0223C80C(UnkStruct_ov76_0223DE00 *param0, int param1, int param2); void ov76_0223C88C(UnkStruct_ov76_0223DE00 *param0); void ov76_0223C8BC(UnkStruct_ov76_0223DE00 *param0); -void ov76_0223C8EC(BGL *param0, PaletteData *param1, int param2); -void ov76_0223C974(BGL *param0, PaletteData *param1, int param2); +void ov76_0223C8EC(BgConfig *param0, PaletteData *param1, int param2); +void ov76_0223C974(BgConfig *param0, PaletteData *param1, int param2); void ov76_0223CA30(Window *param0, int param1); -void ov76_0223CA98(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7); +void ov76_0223CA98(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7); void ov76_0223CB58(UnkStruct_ov76_0223DE00 *param0); void ov76_0223CC8C(UnkStruct_ov76_0223DE00 *param0); void ov76_0223CD20(UnkStruct_ov76_0223DE00 *param0, int param1); diff --git a/include/overlay076/ov76_0223D338.h b/include/overlay076/ov76_0223D338.h index fe087454e6..550a97d65e 100644 --- a/include/overlay076/ov76_0223D338.h +++ b/include/overlay076/ov76_0223D338.h @@ -29,7 +29,7 @@ void ov76_0223DF84(UnkStruct_ov76_0223DE00 *param0); void ov76_0223E91C(UnkStruct_ov76_0223DE00 *param0, int param1); void ov76_0223EB20(int param0); void ov76_0223EB54(int param0); -void ov76_0223EB64(BGL *param0); +void ov76_0223EB64(BgConfig *param0); void ov76_0223ECB0(void *param0); #endif // POKEPLATINUM_OV76_0223D338_H diff --git a/include/overlay076/struct_ov76_0223C398.h b/include/overlay076/struct_ov76_0223C398.h index c76a33a1b0..23dba338eb 100644 --- a/include/overlay076/struct_ov76_0223C398.h +++ b/include/overlay076/struct_ov76_0223C398.h @@ -28,7 +28,7 @@ typedef struct { BOOL unk_04; SpriteRenderer *unk_08; SpriteGfxHandler *unk_0C; - BGL *unk_10; + BgConfig *unk_10; PaletteData *unk_14; Window unk_18[11]; ResourceMetadata *unk_C8; diff --git a/include/overlay079/struct_ov79_021D0E1C.h b/include/overlay079/struct_ov79_021D0E1C.h index 5404c176db..ae03055ca2 100644 --- a/include/overlay079/struct_ov79_021D0E1C.h +++ b/include/overlay079/struct_ov79_021D0E1C.h @@ -36,7 +36,7 @@ typedef struct UnkStruct_ov79_021D0E1C_t { u8 unk_1E; u8 unk_1F; UnkStruct_0203D9B8 *unk_20; - BGL *unk_24; + BgConfig *unk_24; UnkStruct_020158A8 *unk_28; MessageLoader *unk_2C; UnkStruct_ov79_021D0E1C_sub1 unk_30; diff --git a/include/overlay080/struct_ov80_021D2A08.h b/include/overlay080/struct_ov80_021D2A08.h index aa6abda1f6..edf944824e 100644 --- a/include/overlay080/struct_ov80_021D2A08.h +++ b/include/overlay080/struct_ov80_021D2A08.h @@ -31,7 +31,7 @@ typedef struct UnkStruct_ov80_021D2A08_t { int unk_1C; int unk_20; int unk_24; - BGL *unk_28; + BgConfig *unk_28; UnkStruct_0203D8AC *unk_2C; UnkStruct_02039EBC *unk_30; void *unk_34; diff --git a/include/overlay081/struct_ov81_021D1610.h b/include/overlay081/struct_ov81_021D1610.h index 23dcb2b8cb..e9a43b3644 100644 --- a/include/overlay081/struct_ov81_021D1610.h +++ b/include/overlay081/struct_ov81_021D1610.h @@ -10,7 +10,7 @@ #include "trainer_info.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; Window unk_04[4]; Journal *unk_44; TrainerInfo *unk_48; diff --git a/include/overlay083/ov83_0223D6A8.h b/include/overlay083/ov83_0223D6A8.h index 147cd5d5f2..abaac793dc 100644 --- a/include/overlay083/ov83_0223D6A8.h +++ b/include/overlay083/ov83_0223D6A8.h @@ -49,7 +49,7 @@ void ov83_0223DC68(UnkStruct_ov83_0223DB30 *param0); u32 ov83_0223DD30(UnkStruct_ov83_0223DB30 *param0); void ov83_0223DEA0(UnkStruct_ov83_0223E138 *param0, int param1, UnkStruct_ov83_0223DEA0 *param2, UnkStruct_ov83_0223FE50 *param3, int param4, u32 param5); void ov83_0223DEC4(UnkStruct_ov83_0223E138 *param0); -void ov83_0223DEE0(UnkStruct_ov83_0223E138 *param0, BGL *param1, u32 param2, NARC *param3); +void ov83_0223DEE0(UnkStruct_ov83_0223E138 *param0, BgConfig *param1, u32 param2, NARC *param3); void ov83_0223DF10(UnkStruct_ov83_0223E138 *param0); void ov83_0223DF30(UnkStruct_ov83_0223E138 *param0, int param1); void ov83_0223DF70(UnkStruct_ov83_0223E138 *param0); @@ -80,7 +80,7 @@ void ov83_0223E658(UnkStruct_ov83_0223E5C0 *param0); void ov83_0223E69C(UnkStruct_ov83_0223E5C0 *param0, BOOL param1); void ov83_0223E6D4(UnkStruct_ov83_0223E824 *param0, int param1, UnkStruct_ov83_0223DEA0 *param2, UnkStruct_ov83_0223FE50 *param3, int param4, u32 param5); void ov83_0223E6F8(UnkStruct_ov83_0223E824 *param0); -void ov83_0223E720(UnkStruct_ov83_0223E824 *param0, BGL *param1, u32 param2, NARC *param3); +void ov83_0223E720(UnkStruct_ov83_0223E824 *param0, BgConfig *param1, u32 param2, NARC *param3); void ov83_0223E760(UnkStruct_ov83_0223E824 *param0); void ov83_0223E908(UnkStruct_ov83_0223E824 *param0, u32 param1); BOOL ov83_0223E984(const UnkStruct_ov83_0223E824 *param0); @@ -114,7 +114,7 @@ void ov83_0223F544(UnkStruct_ov83_0223F4AC *param0, int param1, int param2); void ov83_0223F730(UnkStruct_ov83_0223F770 *param0, int param1, int param2, int param3, int param4); void ov83_0223F770(UnkStruct_ov83_0223F770 *param0); void ov83_0223F784(UnkStruct_ov83_0223F770 *param0); -void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int param1, BGL *param2); +void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int param1, BgConfig *param2); void ov83_0223F7A4(UnkStruct_ov83_0223F7A4 *param0); void ov83_0223F7B0(UnkStruct_ov83_0223F7A4 *param0); u32 ov83_0223F7DC(UnkStruct_ov83_0223F7A4 *param0); diff --git a/include/overlay083/struct_ov83_0223B784.h b/include/overlay083/struct_ov83_0223B784.h index d688f6f635..2d7129c8b8 100644 --- a/include/overlay083/struct_ov83_0223B784.h +++ b/include/overlay083/struct_ov83_0223B784.h @@ -36,7 +36,7 @@ typedef struct { u8 unk_1A; u8 unk_1B; int unk_1C; - BGL *unk_20; + BgConfig *unk_20; int unk_24; int unk_28; UnkStruct_ov83_0223D784 unk_2C; diff --git a/include/overlay083/struct_ov83_0223E138.h b/include/overlay083/struct_ov83_0223E138.h index 2bf80f5d6f..259cd13d13 100644 --- a/include/overlay083/struct_ov83_0223E138.h +++ b/include/overlay083/struct_ov83_0223E138.h @@ -10,7 +10,7 @@ typedef struct { int unk_00; - BGL *unk_04; + BgConfig *unk_04; Window *unk_08; Window *unk_0C; int unk_10; diff --git a/include/overlay083/struct_ov83_0223E824.h b/include/overlay083/struct_ov83_0223E824.h index 2d82e401d9..d1c18c1f9b 100644 --- a/include/overlay083/struct_ov83_0223E824.h +++ b/include/overlay083/struct_ov83_0223E824.h @@ -9,7 +9,7 @@ typedef struct { int unk_00; - BGL *unk_04; + BgConfig *unk_04; Window *unk_08[4]; int unk_18; UnkStruct_ov83_0223DEA0 *unk_1C; diff --git a/include/overlay083/struct_ov83_0223F7A4.h b/include/overlay083/struct_ov83_0223F7A4.h index bc9d7d1f75..04da70e6a4 100644 --- a/include/overlay083/struct_ov83_0223F7A4.h +++ b/include/overlay083/struct_ov83_0223F7A4.h @@ -7,7 +7,7 @@ typedef struct { UnkStruct_02015920 *unk_00; - BGL *unk_04; + BgConfig *unk_04; } UnkStruct_ov83_0223F7A4; #endif // POKEPLATINUM_STRUCT_OV83_0223F7A4_H diff --git a/include/overlay084/struct_ov84_0223B5A0.h b/include/overlay084/struct_ov84_0223B5A0.h index 0e7ab551e9..5af3d5c54e 100644 --- a/include/overlay084/struct_ov84_0223B5A0.h +++ b/include/overlay084/struct_ov84_0223B5A0.h @@ -23,7 +23,7 @@ #include "trainer_info.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; Window unk_04[11]; Window unk_B4[1]; UnkStruct_0207CB08 *unk_C4; diff --git a/include/overlay088/ov88_0223E9C4.h b/include/overlay088/ov88_0223E9C4.h index 40b613ab63..873e1312d8 100644 --- a/include/overlay088/ov88_0223E9C4.h +++ b/include/overlay088/ov88_0223E9C4.h @@ -11,12 +11,12 @@ #include "strbuf.h" #include "string_template.h" -void ov88_0223E9C4(BGL *param0, Window *param1, Options *param2); +void ov88_0223E9C4(BgConfig *param0, Window *param1, Options *param2); void ov88_0223EC04(Window *param0); void ov88_0223EC78(Window *param0, Strbuf *param1, int param2, u32 param3, int param4, int param5); int ov88_0223ECBC(Window *param0, int param1, int param2, MessageLoader *param3, StringTemplate *param4); -u32 ov88_0223ED2C(BGL *param0, UIControlData **param1, int *param2); +u32 ov88_0223ED2C(BgConfig *param0, UIControlData **param1, int *param2); void ov88_0223ED80(Window *param0); -BmpList *ov88_0223ED94(ResourceMetadata *param0, int param1, Window *param2, BGL *param3); +BmpList *ov88_0223ED94(ResourceMetadata *param0, int param1, Window *param2, BgConfig *param3); #endif // POKEPLATINUM_OV88_0223E9C4_H diff --git a/include/overlay094/ov94_0223BCB0.h b/include/overlay094/ov94_0223BCB0.h index 488a69a349..a3857cd2f5 100644 --- a/include/overlay094/ov94_0223BCB0.h +++ b/include/overlay094/ov94_0223BCB0.h @@ -13,7 +13,7 @@ int ov94_0223BCB0(OverlayManager *param0, int *param1); int ov94_0223BE2C(OverlayManager *param0, int *param1); int ov94_0223BF54(OverlayManager *param0, int *param1); void ov94_0223C300(CellActorInitParamsEx *param0, UnkStruct_ov94_0223FD4C *param1, CellActorResourceData *param2, int param3); -UIControlData *ov94_0223C3C0(BGL *param0, int param1, int param2); +UIControlData *ov94_0223C3C0(BgConfig *param0, int param1, int param2); void ov94_0223C3F4(UnkStruct_ov94_0223FD4C *param0, int param1, int param2); void ov94_0223C3FC(CellActor *param0, int param1, int param2); int ov94_0223C4B4(void); diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h index 383a4e153e..88c4256ebd 100644 --- a/include/overlay094/struct_ov94_0223FD4C.h +++ b/include/overlay094/struct_ov94_0223FD4C.h @@ -38,7 +38,7 @@ typedef struct UnkStruct_ov94_0223FD4C_t { UnkStruct_0203E0FC *unk_00; - BGL *unk_04; + BgConfig *unk_04; UnkStruct_0202B370 *unk_08; int unk_0C; int unk_10; diff --git a/include/overlay095/ov95_02246C20.h b/include/overlay095/ov95_02246C20.h index 6b9abb111b..c55f68b15c 100644 --- a/include/overlay095/ov95_02246C20.h +++ b/include/overlay095/ov95_02246C20.h @@ -21,14 +21,14 @@ int ov95_02246E7C(OverlayManager *param0, int *param1); UnkStruct_ov95_02247004 *ov95_02246F30(BOOL *param0, int param1); void ov95_02247004(UnkStruct_ov95_02247004 *param0); void ov95_02247018(UnkStruct_ov95_02247004 *param0); -UnkStruct_ov95_022472C4 *ov95_022472C4(BGL *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, int param5, volatile BOOL *param6); +UnkStruct_ov95_022472C4 *ov95_022472C4(BgConfig *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, int param5, volatile BOOL *param6); void ov95_022473E8(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 param3, BOOL param4); void ov95_022474D4(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 param3, u32 param4, u32 param5); void ov95_02247568(UnkStruct_ov95_02247568 *param0, u32 param1, u32 param2, u32 param3); void ov95_022475A0(UnkStruct_ov95_02247568 *param0); void ov95_022475C4(CellActorResourceData *param0, UnkStruct_ov95_02247568 *param1, NNSG2dImageProxy *param2, NNSG2dImagePaletteProxy *param3, u32 param4); CellActor *ov95_022475E4(UnkStruct_ov95_02247628 *param0, CellActorResourceData *param1, u32 param2, u32 param3, u32 param4, int param5); -BGL *ov95_02247628(UnkStruct_ov95_02247628 *param0); +BgConfig *ov95_02247628(UnkStruct_ov95_02247628 *param0); StringTemplate *ov95_0224762C(UnkStruct_ov95_02247628 *param0); MessageLoader *ov95_02247630(UnkStruct_ov95_02247628 *param0); const BoxPokemon *ov95_02247634(UnkStruct_ov95_02247628 *param0); diff --git a/include/overlay096/ov96_0223B6A0.h b/include/overlay096/ov96_0223B6A0.h index 005c603e89..0e13ad6279 100644 --- a/include/overlay096/ov96_0223B6A0.h +++ b/include/overlay096/ov96_0223B6A0.h @@ -13,7 +13,7 @@ int ov96_0223B6A0(OverlayManager *param0, int *param1); int ov96_0223B7F8(OverlayManager *param0, int *param1); int ov96_0223B8CC(OverlayManager *param0, int *param1); void ov96_0223BAE0(CellActorInitParamsEx *param0, UnkStruct_ov96_0223BF40 *param1, CellActorResourceData *param2, int param3); -UIControlData *ov96_0223BBC8(BGL *param0, int param1, int param2); +UIControlData *ov96_0223BBC8(BgConfig *param0, int param1, int param2); void ov96_0223BBFC(UnkStruct_ov96_0223BF40 *param0, int param1, int param2); int ov96_0223BC50(void); void ov96_0223BC5C(UnkStruct_ov96_0223BF40 *param0, int param1, int param2); diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h index b2583a096f..aef4b72b93 100644 --- a/include/overlay096/struct_ov96_0223BF40_t.h +++ b/include/overlay096/struct_ov96_0223BF40_t.h @@ -24,7 +24,7 @@ struct UnkStruct_ov96_0223BF40_t { UnkStruct_0206BC70 *unk_00; - BGL *unk_04; + BgConfig *unk_04; int unk_08; int unk_0C; int unk_10; diff --git a/include/overlay097/ov97_02232054.h b/include/overlay097/ov97_02232054.h index d9e5828c72..449e8efadb 100644 --- a/include/overlay097/ov97_02232054.h +++ b/include/overlay097/ov97_02232054.h @@ -7,7 +7,7 @@ #include "savedata.h" void ov97_02232054(void); -void ov97_02232074(BGL *param0); +void ov97_02232074(BgConfig *param0); int ov97_02232148(SaveData *param0, UnkStruct_ov97_0223829C *param1); #endif // POKEPLATINUM_OV97_02232054_H diff --git a/include/overlay097/ov97_02237694.h b/include/overlay097/ov97_02237694.h index 4128a0d3a6..5d4b6c55d8 100644 --- a/include/overlay097/ov97_02237694.h +++ b/include/overlay097/ov97_02237694.h @@ -16,7 +16,7 @@ void ov97_02237694(int param0); void *ov97_022376C4(OverlayManager *param0, int param1, int param2, int param3); -void ov97_022376FC(BGL *param0, int param1, u8 param2, u32 param3, u32 param4); +void ov97_022376FC(BgConfig *param0, int param1, u8 param2, u32 param3, u32 param4); void ov97_02237784(int param0); void ov97_02237790(int param0, int param1, int *param2, int param3); void ov97_022377F0(int *param0); @@ -24,7 +24,7 @@ void ov97_02237808(UnkStruct_ov97_02237808 *param0, Window *param1, int param2, void ov97_02237858(UnkStruct_ov97_02237808 *param0, int param1, int param2, int param3); void ov97_02237860(UnkStruct_ov97_02237808 *param0, int param1, int param2); void ov97_02237868(UnkStruct_ov97_02237808 *param0, int param1, int param2); -int ov97_0223795C(BGL *param0, UnkStruct_ov97_02237808 *param1, int param2, int param3, int param4); +int ov97_0223795C(BgConfig *param0, UnkStruct_ov97_02237808 *param1, int param2, int param3, int param4); int ov97_02237A18(UnkStruct_ov97_02237808 *param0); void ov97_02237A20(void); BOOL ov97_02237A60(void); @@ -37,7 +37,7 @@ void ov97_02237CAC(int param0); CellActor *ov97_02237D14(int param0, CellActor *param1, int param2, int param3, int param4); void ov97_02237DA0(void); u32 ov97_02237E4C(int param0); -void ov97_02238194(BGL *param0, UnkStruct_0202DF40 *param1); +void ov97_02238194(BgConfig *param0, UnkStruct_0202DF40 *param1); void ov97_0223829C(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int param2); void ov97_02238324(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int param2); void ov97_022383C4(BmpList *param0, u32 param1, u8 param2); diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h index 4c3e39012f..1b642394ea 100644 --- a/include/overlay097/struct_ov97_0222D04C.h +++ b/include/overlay097/struct_ov97_0222D04C.h @@ -20,7 +20,7 @@ #include "string_template.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; SaveData *unk_04; Options *unk_08; StringTemplate *unk_0C; diff --git a/include/overlay099/ov99_021D3E78.h b/include/overlay099/ov99_021D3E78.h index ce3b9e9d37..5e2c44246b 100644 --- a/include/overlay099/ov99_021D3E78.h +++ b/include/overlay099/ov99_021D3E78.h @@ -6,7 +6,7 @@ #include "bg_window.h" #include "message.h" -UnkStruct_ov99_021D3E78 *ov99_021D3E78(BGL *param0, int param1, int param2, int param3, MessageLoader *param4); +UnkStruct_ov99_021D3E78 *ov99_021D3E78(BgConfig *param0, int param1, int param2, int param3, MessageLoader *param4); void ov99_021D3F38(UnkStruct_ov99_021D3E78 *param0); BOOL ov99_021D3F6C(UnkStruct_ov99_021D3E78 *param0, int param1); int ov99_021D4130(void); diff --git a/include/overlay099/struct_ov99_021D2CB0.h b/include/overlay099/struct_ov99_021D2CB0.h index 1f04b3613c..5274d36cc0 100644 --- a/include/overlay099/struct_ov99_021D2CB0.h +++ b/include/overlay099/struct_ov99_021D2CB0.h @@ -23,7 +23,7 @@ typedef struct { UnkStruct_0203E274 *unk_00; BOOL unk_04; - BGL *unk_08; + BgConfig *unk_08; PaletteData *unk_0C; GenericPointerData *unk_10; SysTask *unk_14; diff --git a/include/overlay100/struct_ov100_021D46C8.h b/include/overlay100/struct_ov100_021D46C8.h index adfc4e40ec..e278eaea96 100644 --- a/include/overlay100/struct_ov100_021D46C8.h +++ b/include/overlay100/struct_ov100_021D46C8.h @@ -23,7 +23,7 @@ typedef struct { NARC *unk_00; SpriteRenderer *unk_04; SpriteGfxHandler *unk_08; - BGL *unk_0C; + BgConfig *unk_0C; PaletteData *unk_10; GenericPointerData *unk_14; Camera *camera; diff --git a/include/overlay101/struct_ov101_021D13C8.h b/include/overlay101/struct_ov101_021D13C8.h index fff69cf2f3..4b4467beeb 100644 --- a/include/overlay101/struct_ov101_021D13C8.h +++ b/include/overlay101/struct_ov101_021D13C8.h @@ -61,7 +61,7 @@ typedef struct UnkStruct_ov101_021D13C8_t { UnkStruct_ov101_021D148C unk_408; UnkStruct_ov101_021D1894 unk_424; NARC *unk_438; - BGL *unk_43C; + BgConfig *unk_43C; NNSG2dScreenData *unk_440; NNSG2dCharacterData *unk_444; NNSG2dPaletteData *unk_448; diff --git a/include/overlay104/ov104_0223B6F4.h b/include/overlay104/ov104_0223B6F4.h index 3222f4caf1..32c1e118aa 100644 --- a/include/overlay104/ov104_0223B6F4.h +++ b/include/overlay104/ov104_0223B6F4.h @@ -22,7 +22,7 @@ void ov104_0223BA7C(UnkStruct_ov104_0223BA10 *param0, Pokemon *param1); void ov104_0223BAA0(UnkStruct_ov104_0223BA10 *param0, Party *param1, Pokemon *param2); void ov104_0223BAB8(UnkStruct_ov104_0223BA10 *param0); u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 *param0); -void ov104_0223BB84(BGL *param0, UnkStruct_ov104_0223BA10 *param1, u32 param2); +void ov104_0223BB84(BgConfig *param0, UnkStruct_ov104_0223BA10 *param1, u32 param2); u16 ov104_0223BC24(u16 param0); void ov104_0223BC2C(UnkStruct_0203068C *param0, u8 param1, int param2); diff --git a/include/overlay104/ov104_0223C164.h b/include/overlay104/ov104_0223C164.h index 9205529d6e..6f37c9b694 100644 --- a/include/overlay104/ov104_0223C164.h +++ b/include/overlay104/ov104_0223C164.h @@ -5,7 +5,7 @@ #include "bg_window.h" -UnkStruct_ov104_0223C23C *ov104_0223C164(BGL *param0); +UnkStruct_ov104_0223C23C *ov104_0223C164(BgConfig *param0); void ov104_0223C23C(UnkStruct_ov104_0223C23C *param0); u16 ov104_0223C264(u8 param0); u16 ov104_0223C29C(u8 param0); diff --git a/include/overlay104/ov104_0223D9E4.h b/include/overlay104/ov104_0223D9E4.h index 17aa44afd6..345d23e2da 100644 --- a/include/overlay104/ov104_0223D9E4.h +++ b/include/overlay104/ov104_0223D9E4.h @@ -7,7 +7,7 @@ #include "bg_window.h" -UnkStruct_ov104_0223DA28 *ov104_0223D9E4(BGL *param0, PaletteData *param1); +UnkStruct_ov104_0223DA28 *ov104_0223D9E4(BgConfig *param0, PaletteData *param1); void ov104_0223DA28(UnkStruct_ov104_0223DA28 *param0); #endif // POKEPLATINUM_OV104_0223D9E4_H diff --git a/include/overlay104/struct_ov104_0223C4CC.h b/include/overlay104/struct_ov104_0223C4CC.h index de6504ff64..ab38c62d4c 100644 --- a/include/overlay104/struct_ov104_0223C4CC.h +++ b/include/overlay104/struct_ov104_0223C4CC.h @@ -24,7 +24,7 @@ #include "sys_task_manager.h" typedef struct UnkStruct_ov104_0223C4CC_t { - BGL *unk_00; + BgConfig *unk_00; PaletteData *unk_04; UnkStruct_0209B75C *unk_08; GenericPointerData *unk_0C; diff --git a/include/overlay105/ov105_02246214.h b/include/overlay105/ov105_02246214.h index 51c2298e2c..4bc369e6d7 100644 --- a/include/overlay105/ov105_02246214.h +++ b/include/overlay105/ov105_02246214.h @@ -3,9 +3,9 @@ #include "bg_window.h" -void ov105_02246214(BGL *param0, Window *param1); +void ov105_02246214(BgConfig *param0, Window *param1); void ov105_02246244(Window *param0); -void ov105_02246260(BGL *param0, Window *param1); +void ov105_02246260(BgConfig *param0, Window *param1); void ov105_0224628C(Window *param0, int param1); #endif // POKEPLATINUM_OV105_02246214_H diff --git a/include/overlay106/ov106_022436E0.h b/include/overlay106/ov106_022436E0.h index 4b0326749a..31c607bb66 100644 --- a/include/overlay106/ov106_022436E0.h +++ b/include/overlay106/ov106_022436E0.h @@ -3,9 +3,9 @@ #include "bg_window.h" -void ov106_022436E0(BGL *param0, Window *param1); +void ov106_022436E0(BgConfig *param0, Window *param1); void ov106_02243710(Window *param0); -void ov106_0224372C(BGL *param0, Window *param1); +void ov106_0224372C(BgConfig *param0, Window *param1); void ov106_02243758(Window *param0, int param1); #endif // POKEPLATINUM_OV106_022436E0_H diff --git a/include/overlay107/ov107_02249D14.h b/include/overlay107/ov107_02249D14.h index 4bcfdf782f..e5e9cef6a2 100644 --- a/include/overlay107/ov107_02249D14.h +++ b/include/overlay107/ov107_02249D14.h @@ -3,9 +3,9 @@ #include "bg_window.h" -void ov107_02249D14(BGL *param0, Window *param1, u8 param2); +void ov107_02249D14(BgConfig *param0, Window *param1, u8 param2); void ov107_02249D5C(Window *param0, u8 param1); -void ov107_02249D84(BGL *param0, Window *param1); +void ov107_02249D84(BgConfig *param0, Window *param1); void ov107_02249DBC(Window *param0, int param1); #endif // POKEPLATINUM_OV107_02249D14_H diff --git a/include/overlay108/ov108_02243630.h b/include/overlay108/ov108_02243630.h index 8f41f3ec90..06bac501dc 100644 --- a/include/overlay108/ov108_02243630.h +++ b/include/overlay108/ov108_02243630.h @@ -3,7 +3,7 @@ #include "bg_window.h" -void ov108_02243630(BGL *param0, Window *param1); +void ov108_02243630(BgConfig *param0, Window *param1); void ov108_02243660(Window *param0); #endif // POKEPLATINUM_OV108_02243630_H diff --git a/include/overlay109/struct_ov109_021D5140.h b/include/overlay109/struct_ov109_021D5140.h index 2a7777e758..1e794bd49f 100644 --- a/include/overlay109/struct_ov109_021D5140.h +++ b/include/overlay109/struct_ov109_021D5140.h @@ -27,7 +27,7 @@ typedef struct UnkStruct_ov109_021D5140_t { int unk_08; UnkStruct_0209C194 *unk_0C; UnkStruct_0209BDF8 *unk_10; - BGL *unk_14; + BgConfig *unk_14; BOOL unk_18; UnkStruct_ov109_021D5140_sub1 unk_1C; SysTask *unk_30; diff --git a/include/overlay110/ov110_021D2124.h b/include/overlay110/ov110_021D2124.h index 5482bacc52..37f73c069c 100644 --- a/include/overlay110/ov110_021D2124.h +++ b/include/overlay110/ov110_021D2124.h @@ -3,7 +3,7 @@ #include "bg_window.h" -void ov110_021D2124(BGL *param0, Window *param1, u8 param2); +void ov110_021D2124(BgConfig *param0, Window *param1, u8 param2); void ov110_021D216C(Window *param0, u8 param1); #endif // POKEPLATINUM_OV110_021D2124_H diff --git a/include/overlay111/ov111_021D3548.h b/include/overlay111/ov111_021D3548.h index 53da3c9d87..0bb16923fe 100644 --- a/include/overlay111/ov111_021D3548.h +++ b/include/overlay111/ov111_021D3548.h @@ -3,9 +3,9 @@ #include "bg_window.h" -void ov111_021D3548(BGL *param0, Window *param1); +void ov111_021D3548(BgConfig *param0, Window *param1); void ov111_021D3578(Window *param0); -void ov111_021D3594(BGL *param0, Window *param1); +void ov111_021D3594(BgConfig *param0, Window *param1); void ov111_021D35C0(Window *param0, int param1); #endif // POKEPLATINUM_OV111_021D3548_H diff --git a/include/overlay116/struct_ov116_022649E4.h b/include/overlay116/struct_ov116_022649E4.h index 700b6d454c..3aaa679ee2 100644 --- a/include/overlay116/struct_ov116_022649E4.h +++ b/include/overlay116/struct_ov116_022649E4.h @@ -19,7 +19,7 @@ typedef struct { NARC *unk_04; SpriteRenderer *unk_08; SpriteGfxHandler *unk_0C; - BGL *unk_10; + BgConfig *unk_10; PaletteData *unk_14; GenericPointerData *unk_18; Camera *camera; diff --git a/include/overlay117/ov117_02263AF0.h b/include/overlay117/ov117_02263AF0.h index 6487bd9c1c..5ce5b361c9 100644 --- a/include/overlay117/ov117_02263AF0.h +++ b/include/overlay117/ov117_02263AF0.h @@ -20,9 +20,9 @@ #include "strbuf.h" #include "text.h" -void ov117_02263AF0(BGL *param0, int param1, int param2, UnkStruct_ov117_02263DAC *param3); +void ov117_02263AF0(BgConfig *param0, int param1, int param2, UnkStruct_ov117_02263DAC *param3); int ov117_02263CF4(int param0); -void ov117_02263D80(UnkStruct_ov117_02261280 *param0, BGL *param1, UnkStruct_ov117_02263DAC *param2); +void ov117_02263D80(UnkStruct_ov117_02261280 *param0, BgConfig *param1, UnkStruct_ov117_02263DAC *param2); BOOL ov117_02263DC4(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02264E84 *param1); void ov117_02263EF8(UnkStruct_ov117_02261280 *param0); void ov117_022641E4(UnkStruct_ov117_02261280 *param0); @@ -50,7 +50,7 @@ void ov117_02265ABC(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C * void ov117_02265B3C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1); void ov117_02265B58(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1, int param2, int param3, int param4); void ov117_02265C1C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1); -void ov117_02265DB8(BGL *param0, SpriteGfxHandler *param1, UnkStruct_02012744 *param2, UnkStruct_ov117_02265EB0 *param3, const Strbuf *param4, enum Font param5, TextColor param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); +void ov117_02265DB8(BgConfig *param0, SpriteGfxHandler *param1, UnkStruct_02012744 *param2, UnkStruct_ov117_02265EB0 *param3, const Strbuf *param4, enum Font param5, TextColor param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); void ov117_02265EB0(UnkStruct_ov117_02265EB0 *param0); void ov117_02265EC8(UnkStruct_ov117_02265EC8 *param0); void ov117_02265F34(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265EC8 *param1); diff --git a/include/overlay117/struct_ov117_02261280.h b/include/overlay117/struct_ov117_02261280.h index 42a30ead40..aa539247eb 100644 --- a/include/overlay117/struct_ov117_02261280.h +++ b/include/overlay117/struct_ov117_02261280.h @@ -45,7 +45,7 @@ typedef struct UnkStruct_ov117_02261280_t { int unk_20; SpriteRenderer *unk_24; SpriteGfxHandler *unk_28; - BGL *unk_2C; + BgConfig *unk_2C; Window unk_30[5]; MessageLoader *unk_80; StringTemplate *unk_84; diff --git a/include/overlay119/ov119_021D0D80.h b/include/overlay119/ov119_021D0D80.h index 0ed6f8b058..da6d23e7d0 100644 --- a/include/overlay119/ov119_021D0D80.h +++ b/include/overlay119/ov119_021D0D80.h @@ -18,19 +18,19 @@ void ov119_021D0DA8(void); GenericPointerData *ov119_021D0DD4(void); void ov119_021D0DF4(void); void ov119_021D0E78(void); -void ov119_021D0EB8(BGL *param0); +void ov119_021D0EB8(BgConfig *param0); void ov119_021D0FD0(void *param0); void ov119_021D1004(void); void ov119_021D1028(void); void ov119_021D1048(void); -void ov119_021D1068(BGL *param0, PaletteData *param1, int param2); -void ov119_021D10F0(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); +void ov119_021D1068(BgConfig *param0, PaletteData *param1, int param2); +void ov119_021D10F0(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); int ov119_021D1158(Window *param0, int param1, Pokemon *param2, int param3); -void ov119_021D11E4(UnkStruct_ov119_021D0FD0 *param0, BGL *param1, Window *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); +void ov119_021D11E4(UnkStruct_ov119_021D0FD0 *param0, BgConfig *param1, Window *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); void ov119_021D12CC(UnkStruct_ov119_021D0FD0 *param0); void ov119_021D12F8(Window *param0); -void ov119_021D1308(BGL *param0, PaletteData *param1); -void ov119_021D135C(BGL *param0, PaletteData *param1); +void ov119_021D1308(BgConfig *param0, PaletteData *param1); +void ov119_021D135C(BgConfig *param0, PaletteData *param1); void ov119_021D145C(UnkStruct_02014014 *param0); UnkStruct_ov119_021D14DC *ov119_021D14AC(UnkStruct_ov119_021D1930 *param0); void ov119_021D14DC(UnkStruct_ov119_021D14DC *param0, int param1); diff --git a/include/overlay119/struct_ov119_021D17B8.h b/include/overlay119/struct_ov119_021D17B8.h index 76829d3602..83932b4625 100644 --- a/include/overlay119/struct_ov119_021D17B8.h +++ b/include/overlay119/struct_ov119_021D17B8.h @@ -16,7 +16,7 @@ #include "bg_window.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; PaletteData *unk_04; int unk_08; int unk_0C; diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index 43b215808c..5e490a1d8f 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -44,7 +44,7 @@ struct BattleSystem { GenericPointerData *unk_00; - BGL *unk_04; + BgConfig *unk_04; Window *windows; MessageLoader *unk_0C; MessageLoader *unk_10; diff --git a/include/struct_defs/pokemon_summary_app.h b/include/struct_defs/pokemon_summary_app.h index 29005c74a3..b9f417a4d4 100644 --- a/include/struct_defs/pokemon_summary_app.h +++ b/include/struct_defs/pokemon_summary_app.h @@ -86,7 +86,7 @@ typedef struct PokemonSummaryAppSpriteData { } PokemonSummaryAppSpriteData; typedef struct PokemonSummaryApp { - BGL *bgl; + BgConfig *bgl; Window staticWindows[36]; Window *extraWindows; u32 numExtraWindows; diff --git a/include/struct_defs/struct_02015958.h b/include/struct_defs/struct_02015958.h index ea0c6607a2..7c44a13e0b 100644 --- a/include/struct_defs/struct_02015958.h +++ b/include/struct_defs/struct_02015958.h @@ -4,7 +4,7 @@ #include "bg_window.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; u32 unk_04; u32 unk_08; u32 unk_0C; diff --git a/include/struct_defs/struct_0207A778.h b/include/struct_defs/struct_0207A778.h index 2701f589ec..824e5943d4 100644 --- a/include/struct_defs/struct_0207A778.h +++ b/include/struct_defs/struct_0207A778.h @@ -10,7 +10,7 @@ typedef struct { BattleParams *unk_00; - BGL *unk_04; + BgConfig *unk_04; Window *unk_08; PaletteData *unk_0C; UnkStruct_02027F8C *unk_10[4]; diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index c35c7e0bc2..83e511eadc 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -24,7 +24,7 @@ #include "string_template.h" struct UnkStruct_0207AE68_t { - BGL *unk_00; + BgConfig *unk_00; Window *unk_04; MessageLoader *unk_08; StringTemplate *unk_0C; diff --git a/include/struct_defs/struct_0207F248.h b/include/struct_defs/struct_0207F248.h index 0a28f53ad4..1853ad1785 100644 --- a/include/struct_defs/struct_0207F248.h +++ b/include/struct_defs/struct_0207F248.h @@ -25,7 +25,7 @@ #include "string_template.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; Window unk_04[37]; Window unk_254[1]; u16 unk_264[96]; diff --git a/include/struct_defs/struct_02089688_sub1.h b/include/struct_defs/struct_02089688_sub1.h index 020b38c03d..06ee30a1c5 100644 --- a/include/struct_defs/struct_02089688_sub1.h +++ b/include/struct_defs/struct_02089688_sub1.h @@ -17,7 +17,7 @@ typedef struct { NARC *unk_00; SpriteRenderer *unk_04; SpriteGfxHandler *unk_08; - BGL *unk_0C; + BgConfig *unk_0C; PaletteData *unk_10; UnkStruct_02023FCC *unk_14; TouchScreenRect unk_18[28]; diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h index d83d7a82b7..d9b441756b 100644 --- a/include/struct_defs/struct_02095E80_t.h +++ b/include/struct_defs/struct_02095E80_t.h @@ -61,7 +61,7 @@ struct UnkStruct_02095E80_t { u32 unk_154[2][3]; int unk_16C; int unk_170; - BGL *unk_174; + BgConfig *unk_174; StringTemplate *unk_178; StringTemplate *unk_17C; StringTemplate *unk_180; diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h index 9acecd1431..b9a3eae5b7 100644 --- a/include/struct_defs/struct_02095EAC_t.h +++ b/include/struct_defs/struct_02095EAC_t.h @@ -18,7 +18,7 @@ #include "trainer_info.h" struct UnkStruct_02095EAC_t { - BGL *unk_00; + BgConfig *unk_00; BOOL unk_04; UnkStruct_0203DDFC *unk_08; StringTemplate *unk_0C; diff --git a/include/struct_defs/struct_020961E8_t.h b/include/struct_defs/struct_020961E8_t.h index 7f61ee8844..436981c75c 100644 --- a/include/struct_defs/struct_020961E8_t.h +++ b/include/struct_defs/struct_020961E8_t.h @@ -22,7 +22,7 @@ #include "trainer_info.h" struct UnkStruct_020961E8_t { - BGL *unk_00; + BgConfig *unk_00; BOOL unk_04; UnkStruct_0203DE34 *unk_08; UnkStruct_ov59_021D109C unk_0C; diff --git a/include/unk_02001AF4.h b/include/unk_02001AF4.h index 03dc9eeed1..ab2b62a671 100644 --- a/include/unk_02001AF4.h +++ b/include/unk_02001AF4.h @@ -15,8 +15,8 @@ u32 sub_02001C94(UIControlData *param0, u16 param1); u32 sub_02001D44(UIControlData *param0, u8 param1); u8 sub_02001DC4(UIControlData *param0); u8 sub_02001DC8(UIControlData *param0); -UIControlData *sub_02002054(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u8 param4, u32 param5); -UIControlData *sub_02002100(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4); +UIControlData *sub_02002054(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u8 param4, u32 param5); +UIControlData *sub_02002100(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4); u32 sub_02002114(UIControlData *param0, u32 param1); u32 sub_02002134(UIControlData *param0, u8 param1, u32 param2); void sub_02002154(UIControlData *param0, u32 param1); diff --git a/include/unk_02006E3C.h b/include/unk_02006E3C.h index eaeea9d4e3..40f50b0843 100644 --- a/include/unk_02006E3C.h +++ b/include/unk_02006E3C.h @@ -7,8 +7,8 @@ #include "bg_window.h" -u32 sub_02006E3C(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); -void sub_02006E60(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +u32 sub_02006E3C(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +void sub_02006E60(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); void sub_02006E84(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); void sub_02006E9C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6); u32 sub_02006EC0(u32 param0, u32 param1, int param2, u32 param3, u32 param4, BOOL param5, u32 param6); @@ -23,8 +23,8 @@ void *sub_02006FBC(u32 param0, u32 param1, BOOL param2, NNSG2dAnimBankData **par void *sub_02006FD8(u32 param0, u32 param1, u32 param2); void *sub_02006FE8(u32 param0, u32 param1, BOOL param2, u32 param3, int param4); void *sub_02007068(u32 narcIndex, u32 fileIndex, BOOL param2, u32 heapID, int param4, u32 *fileSize); -u32 sub_020070E8(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); -void sub_0200710C(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +u32 sub_020070E8(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +void sub_0200710C(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); void sub_02007130(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); void sub_02007148(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6); void sub_0200716C(NARC *param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5); diff --git a/include/unk_0200DA60.h b/include/unk_0200DA60.h index 43a4868832..39d597a7a3 100644 --- a/include/unk_0200DA60.h +++ b/include/unk_0200DA60.h @@ -6,25 +6,25 @@ #define TEXT_WINDOW_SIZE 30 -void Window_SetFrame(BGL *param0, u8 param1, u16 param2, u8 param3, u32 param4); +void Window_SetFrame(BgConfig *param0, u8 param1, u16 param2, u8 param3, u32 param4); u32 Window_FramePalette(void); -void sub_0200DAA4(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); +void sub_0200DAA4(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); void Window_Show(Window *param0, u8 param1, u16 param2, u8 param3); void Window_Clear(Window *param0, u8 param1); u32 sub_0200DD04(u32 param0); u32 sub_0200DD08(u32 param0); -void sub_0200DD0C(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); +void sub_0200DD0C(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); void sub_0200E010(Window *param0, u32 param1, u32 param2); void sub_0200E060(Window *param0, u8 param1, u16 param2, u8 param3); void sub_0200E084(Window *param0, u8 param1); -void sub_0200E218(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); -void sub_0200E2A4(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u16 param5, u32 param6); +void sub_0200E218(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); +void sub_0200E2A4(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u16 param5, u32 param6); void sub_0200E69C(Window *param0, u8 param1, u16 param2, u8 param3, u8 param4); void sub_0200E744(Window *param0, u8 param1, u8 param2); void *sub_0200E7FC(Window *param0, u32 param1); void DeleteWaitDial(void *param0); void sub_0200EBC8(void *param0); -u8 *sub_0200EBF0(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, u16 param6, u8 param7, int param8); -u8 *sub_0200EC48(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, Pokemon *param6, int param7); +u8 *sub_0200EBF0(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, u16 param6, u8 param7, int param8); +u8 *sub_0200EC48(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, Pokemon *param6, int param7); #endif // POKEPLATINUM_UNK_0200DA60_H diff --git a/include/unk_020366A0.h b/include/unk_020366A0.h index 1efd6f1858..de6ec6380e 100644 --- a/include/unk_020366A0.h +++ b/include/unk_020366A0.h @@ -97,7 +97,7 @@ void sub_020389C4(u8 param0); u8 sub_020389D8(void); void sub_020389FC(int param0); void sub_02038A0C(void); -void sub_02038A1C(int param0, BGL *param1); +void sub_02038A1C(int param0, BgConfig *param1); void sub_02038A20(int param0); BOOL sub_02038AB8(void); BOOL Link_SetErrorState(int param0); diff --git a/include/unk_0205D8CC.h b/include/unk_0205D8CC.h index afeedb3154..b99d892146 100644 --- a/include/unk_0205D8CC.h +++ b/include/unk_0205D8CC.h @@ -6,13 +6,13 @@ #include "strbuf.h" void sub_0205D8CC(u32 param0, u32 param1); -void FieldMessage_AddWindow(BGL *param0, Window *param1, u32 param2); +void FieldMessage_AddWindow(BgConfig *param0, Window *param1, u32 param2); void FieldMessage_DrawWindow(Window *param0, const Options *param1); void sub_0205D988(Window *param0); u8 FieldMessage_Print(Window *param0, Strbuf *param1, const Options *param2, u8 param3); u8 sub_0205D9CC(Window *param0, Strbuf *param1, int param2, int param3, u8 param4, int param5); u8 FieldMessage_FinishedPrinting(u8 param0); -void sub_0205DA1C(BGL *param0, Window *param1, u16 param2, u16 param3); +void sub_0205DA1C(BgConfig *param0, Window *param1, u16 param2, u16 param3); void sub_0205DA80(Window *param0, u16 param1, u16 param2); #endif // POKEPLATINUM_UNK_0205D8CC_H diff --git a/include/unk_0208A3F4.h b/include/unk_0208A3F4.h index 107941eaab..6b6151dbf9 100644 --- a/include/unk_0208A3F4.h +++ b/include/unk_0208A3F4.h @@ -26,7 +26,7 @@ void sub_0208AFE8(UnkStruct_02089688 *param0); void sub_0208B028(UnkStruct_02089688 *param0); void sub_0208B064(UnkStruct_02089688 *param0); void sub_0208B090(UnkStruct_02089688 *param0, int param1, int param2, int param3, int param4); -void sub_0208B1C4(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); +void sub_0208B1C4(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); void sub_0208B230(Window *param0, int param1); #endif // POKEPLATINUM_UNK_0208A3F4_H diff --git a/include/unk_0208C098.h b/include/unk_0208C098.h index ba76de9f39..4020804814 100644 --- a/include/unk_0208C098.h +++ b/include/unk_0208C098.h @@ -50,7 +50,7 @@ u8 App_BarColor(u32 cur, u32 max); u8 HealthBar_Color(u16 curHP, u16 maxHP, u32 barSize); void sub_0208C120(u8 param0, u32 param1); u8 sub_0208C15C(s16 *param0, u16 param1); -void sub_0208C210(BGL *param0, int param1, NARC *param2, int param3, int param4, int param5, int param6, u16 param7, u16 param8); +void sub_0208C210(BgConfig *param0, int param1, NARC *param2, int param3, int param4, int param5, int param6, u16 param7, u16 param8); void *sub_0208C2F4(NARC *param0, int param1, int param2, NNSG2dScreenData **param3, int param4); #endif // POKEPLATINUM_UNK_0208C098_H diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index c69e6a9a81..4ecefff05e 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -2873,7 +2873,7 @@ static void SlideHealthbarOutTask(SysTask *task, void *data) static void ov16_022604C8(SysTask *param0, void *param1) { UnkStruct_ov16_0225D5B8 *v0; - BGL *v1; + BgConfig *v1; UnkStruct_ov16_02268A14 *v2; BattlerData *v3; u32 v4; @@ -3225,7 +3225,7 @@ static void ov16_02260BAC(SysTask *param0, void *param1) static void ov16_02260C00(SysTask *param0, void *param1) { UnkStruct_ov16_0225D698 *v0 = (UnkStruct_ov16_0225D698 *)param1; - BGL *v1 = BattleSystem_BGL(v0->unk_00); + BgConfig *v1 = BattleSystem_BGL(v0->unk_00); UnkStruct_ov16_02268A14 *v2; int v3; Healthbar *v4; @@ -3408,7 +3408,7 @@ static void ov16_02260E98(SysTask *param0, void *param1) static void ov16_02260F14(SysTask *param0, void *param1) { UnkStruct_ov16_0225D708 *v0 = (UnkStruct_ov16_0225D708 *)param1; - BGL *v1 = BattleSystem_BGL(v0->unk_00); + BgConfig *v1 = BattleSystem_BGL(v0->unk_00); UnkStruct_ov16_02268A14 *v2; int v3; Healthbar *v4; @@ -4423,7 +4423,7 @@ static void ov16_0226232C(SysTask *param0, void *param1) static void ov16_022623F0(SysTask *param0, void *param1) { UnkStruct_ov16_0225D8AC *v0 = param1; - BGL *v1 = BattleSystem_BGL(v0->unk_00); + BgConfig *v1 = BattleSystem_BGL(v0->unk_00); UnkStruct_ov16_02268A14 *v2 = ov16_0223E02C(v0->unk_00); int v3; Healthbar *v4; @@ -5108,7 +5108,7 @@ static const int Unk_ov16_0226F1D0[] = { static void ov16_02263014(SysTask *param0, void *param1) { UnkStruct_ov16_0225CBB8 *v0 = (UnkStruct_ov16_0225CBB8 *)param1; - BGL *v1; + BgConfig *v1; PaletteData *v2; int v3; int v4; diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 2f8cfd9cf0..5d4b74b4df 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -10129,7 +10129,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) break; case SEQ_GET_EXP_LEVEL_UP_SUMMARY_INIT: { - BGL *bgl = BattleSystem_BGL(data->battleSys); + BgConfig *bgl = BattleSystem_BGL(data->battleSys); Window *window = BattleSystem_Window(data->battleSys, 1); PaletteData *paletteSys = BattleSystem_PaletteSys(data->battleSys); @@ -10239,7 +10239,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) case SEQ_GET_EXP_CHECK_LEARN_MOVE: { u16 move; - BGL *bgl = BattleSystem_BGL(data->battleSys); // unused, but must be kept to match + BgConfig *bgl = BattleSystem_BGL(data->battleSys); // unused, but must be kept to match switch (Pokemon_LevelUpMove(mon, &data->tmpData[GET_EXP_LEARNSET_INDEX], &move)) { case LEARNSET_MOVE_ALREADY_KNOWN: @@ -12207,7 +12207,7 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScript MessageLoader *v4; StringTemplate *v5; Strbuf *v6, *v7; - BGL *v8; + BgConfig *v8; Window v9; int v10; SpriteManagerAllocation v11; diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index a0f496b56a..dc9654cd5a 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -1076,7 +1076,7 @@ static void ScrollHealthbarTask(SysTask *task, void *data) */ static void Healthbar_DrawBattlerName(Healthbar *healthbar) { - BGL *bgl; + BgConfig *bgl; u8 *buf; NNSG2dImageProxy *imgProxy; Window window; @@ -1296,7 +1296,7 @@ static void Healthbar_DrawStatusIcon(Healthbar *param0, int param1) static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1) { - BGL *v0; + BgConfig *v0; u8 *v1; NNSG2dImageProxy *v2; Window v3; @@ -1339,7 +1339,7 @@ static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1) static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1) { - BGL *v0; + BgConfig *v0; u8 *v1; NNSG2dImageProxy *v2; Window v3; diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 8cacdc1ec7..017b29606f 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -119,9 +119,9 @@ static BOOL ov16_0223DD10(OverlayManager *param0); static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1); static BOOL ov16_0223D354(OverlayManager *param0); static void ov16_0223D7B4(OverlayManager *param0); -static void ov16_0223C004(BattleSystem *param0, BGL *param1); +static void ov16_0223C004(BattleSystem *param0, BgConfig *param1); static void ov16_0223C210(BattleSystem *param0); -static void ov16_0223C288(BGL *param0); +static void ov16_0223C288(BgConfig *param0); static void ov16_0223C2BC(BattleSystem *param0); static void ov16_0223C2C0(BattleSystem *param0, BattleParams *param1); static void ov16_0223CE28(void); @@ -819,7 +819,7 @@ static void ov16_0223BCB4(OverlayManager *param0) } } -static void ov16_0223C004(BattleSystem *param0, BGL *param1) +static void ov16_0223C004(BattleSystem *param0, BgConfig *param1) { GXLayers_DisableEngineALayers(); sub_0200F338(0); @@ -976,7 +976,7 @@ static void ov16_0223C210(BattleSystem *param0) ov16_0223DECC(); } -static void ov16_0223C288(BGL *param0) +static void ov16_0223C288(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 309ca5551e..8db2e18a46 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -73,7 +73,7 @@ #include "unk_0202F1D4.h" #include "unk_0206CCB0.h" -BGL *BattleSystem_BGL(BattleSystem *param0); +BgConfig *BattleSystem_BGL(BattleSystem *param0); u32 BattleSystem_BattleType(BattleSystem *param0); BattleContext *BattleSystem_Context(BattleSystem *param0); BattlerData *BattleSystem_BattlerData(BattleSystem *param0, int param1); @@ -225,7 +225,7 @@ static void BattleMessage_TrainerName(BattleSystem *param0, u32 param1, int para static void BattleMessage_PCBoxName(BattleSystem *param0, u32 param1, int param2); static u8 ov16_0223F6D4(u8 *param0, u8 *param1, u16 *param2); -BGL *BattleSystem_BGL(BattleSystem *param0) +BgConfig *BattleSystem_BGL(BattleSystem *param0) { return param0->unk_04; } diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 77409bac11..cb05d66675 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -1029,7 +1029,7 @@ static void *ov16_0226871C(void) return v0; } -void ov16_02268744(BGL *param0) +void ov16_02268744(BgConfig *param0) { int v0; @@ -1041,7 +1041,7 @@ void ov16_02268744(BGL *param0) } } -void ov16_022687A0(BGL *param0) +void ov16_022687A0(BgConfig *param0) { int v0; @@ -1202,7 +1202,7 @@ void ov16_02268A14(UnkStruct_ov16_02268A14 *param0) void ov16_02268A88(UnkStruct_ov16_02268A14 *param0) { - BGL *v0; + BgConfig *v0; SpriteRenderer *v1; SpriteGfxHandler *v2; PaletteData *v3; @@ -1264,7 +1264,7 @@ void ov16_02268C04(NARC *param0, NARC *param1, UnkStruct_ov16_02268A14 *param2, { const UnkStruct_ov16_02270670 *v0, *v1; int v2; - BGL *v3; + BgConfig *v3; SpriteRenderer *v4; SpriteGfxHandler *v5; @@ -1675,7 +1675,7 @@ static void ov16_022694A8(SysTask *param0, void *param1) { UnkStruct_ov16_02268A14 *v0 = param1; int v1 = 0; - BGL *v2; + BgConfig *v2; v2 = BattleSystem_BGL(v0->unk_00); v0->unk_6AC += v0->unk_6B0; @@ -1829,7 +1829,7 @@ static void ov16_022698BC(UnkStruct_ov16_02268A14 *param0, int param1, int param ov16_02269668(param0, param1, param2); { - BGL *v1; + BgConfig *v1; v1 = BattleSystem_BGL(param0->unk_00); @@ -1861,7 +1861,7 @@ static void ov16_02269938(UnkStruct_ov16_02268A14 *param0, int param1, int param ov16_02269668(param0, param1, param2); { - BGL *v1; + BgConfig *v1; v1 = BattleSystem_BGL(param0->unk_00); @@ -1930,7 +1930,7 @@ static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param } { - BGL *v7; + BgConfig *v7; v7 = BattleSystem_BGL(param0->unk_00); @@ -2031,7 +2031,7 @@ static void ov16_02269E94(UnkStruct_ov16_02268A14 *param0, int param1, int param v1 = MessageLoader_GetNewStrbuf(v0, 1260); { - BGL *v2; + BgConfig *v2; NNSG2dScreenData *v3; void *v4; @@ -2045,7 +2045,7 @@ static void ov16_02269E94(UnkStruct_ov16_02268A14 *param0, int param1, int param } { - BGL *v5 = BattleSystem_BGL(param0->unk_00); + BgConfig *v5 = BattleSystem_BGL(param0->unk_00); MI_CpuClear32(param0->unk_3C[4], 0x800); sub_02019574(v5, 5, param0->unk_3C[4], 0x800); @@ -2389,7 +2389,7 @@ static int ov16_0226A528(UnkStruct_ov16_02268A14 *param0, int param1, int param2 } { - BGL *v2; + BgConfig *v2; v2 = BattleSystem_BGL(param0->unk_00); sub_02019EE0(v2, 5, (0x6000 / 0x20 - 1)); @@ -2610,7 +2610,7 @@ static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A9 SpriteManagerAllocation v2; int v3; FontOAM *v4; - BGL *v5; + BgConfig *v5; SpriteGfxHandler *v6; int v7, v8; @@ -2688,7 +2688,7 @@ static void ov16_0226AAF8(UnkStruct_ov16_02268A14 *param0) u8 v0[4], v1[4]; int v2, v3; u16 *v4, *v5; - BGL *v6; + BgConfig *v6; v6 = BattleSystem_BGL(param0->unk_00); v4 = sub_02019FE4(v6, 5); @@ -2955,7 +2955,7 @@ static void ov16_0226B0DC(UnkStruct_ov16_02268A14 *param0, int param1) PaletteData *v0; int v1; const u8 v2[] = { 6, 0xc, 0xd, 5 }; - BGL *v3; + BgConfig *v3; v3 = BattleSystem_BGL(param0->unk_00); v0 = BattleSystem_PaletteSys(param0->unk_00); @@ -3107,7 +3107,7 @@ static void inline_ov16_0226B318_1(SysTask *param0, void *param1) { UnkStruct_ov16_02268A14 *v0 = param1; UnkStruct_ov16_02268A14_sub4 *v1; - BGL *v2; + BgConfig *v2; PaletteData *v3; int v4, v5; @@ -3149,7 +3149,7 @@ static void inline_ov16_0226B314_1(SysTask *param0, void *param1) { UnkStruct_ov16_02268A14 *v0 = param1; UnkStruct_ov16_02268A14_sub4 *v1; - BGL *v2; + BgConfig *v2; PaletteData *v3; int v4, v5; u8 v6[4]; @@ -3196,7 +3196,7 @@ static void inline_ov16_0226B314_1(SysTask *param0, void *param1) static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, const UnkStruct_ov16_022702F4 *param2, int param3, int param4) { int v0, v1; - BGL *v2; + BgConfig *v2; u16 *v3, *v4; u16 *v5, *v6; int v7; @@ -3221,7 +3221,7 @@ static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, co static void ov16_0226B390(SysTask *param0, void *param1) { UnkStruct_ov16_02268A14 *v0 = param1; - BGL *v1; + BgConfig *v1; int v2, v3; v1 = BattleSystem_BGL(v0->unk_00); @@ -3273,7 +3273,7 @@ static void ov16_0226B390(SysTask *param0, void *param1) static void ov16_0226B4E0(SysTask *param0, void *param1) { UnkStruct_ov16_02268A14 *v0 = param1; - BGL *v1; + BgConfig *v1; int v2, v3; int v4, v5, v6; int v7, v8, v9; @@ -3401,7 +3401,7 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) static void ov16_0226B780(SysTask *param0, void *param1) { UnkStruct_ov16_02268A14 *v0 = param1; - BGL *v1; + BgConfig *v1; int v2, v3; u8 v4[4]; int v5; @@ -3510,7 +3510,7 @@ static TextColor ov16_0226B924(int param0, int param1) static void ov16_0226B988(SysTask *param0, void *param1) { UnkStruct_ov16_0226B988 *v0 = param1; - BGL *v1; + BgConfig *v1; v1 = BattleSystem_BGL(v0->unk_00->unk_00); @@ -3557,7 +3557,7 @@ static void ov16_0226B988(SysTask *param0, void *param1) static void ov16_0226BA88(SysTask *param0, void *param1) { UnkStruct_ov16_0226B988 *v0 = param1; - BGL *v1; + BgConfig *v1; s32 v2, v3, v4; v1 = BattleSystem_BGL(v0->unk_00->unk_00); @@ -3624,14 +3624,14 @@ static void ov16_0226BB94(void *param0) v1 = GX_GetVCount(); if (v1 == (18 * 8)) { - BGL *v3 = BattleSystem_BGL(v0->unk_00->unk_00); + BgConfig *v3 = BattleSystem_BGL(v0->unk_00->unk_00); sub_02019184(v3, 4, 0, 0); sub_02019184(v3, 4, 3, v0->unk_10); sub_02019184(v3, 5, 0, 0); sub_02019184(v3, 5, 3, v0->unk_10); } else if (v1 > 192) { - BGL *v4 = BattleSystem_BGL(v0->unk_00->unk_00); + BgConfig *v4 = BattleSystem_BGL(v0->unk_00->unk_00); if (v0->unk_12 == 4) { v2 = 255 - v0->unk_0C; @@ -4578,7 +4578,7 @@ static int ov16_0226CE34(UnkStruct_ov16_02268A14 *param0) void ov16_0226CEB0(UnkStruct_ov16_02268A14 *param0, int param1) { - BGL *v0 = BattleSystem_BGL(param0->unk_00); + BgConfig *v0 = BattleSystem_BGL(param0->unk_00); PaletteData *v1 = BattleSystem_PaletteSys(param0->unk_00); GF_ASSERT(param0->unk_66B == 18); diff --git a/src/bg_window.c b/src/bg_window.c index 021f96ae2a..b1a67707ce 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -15,9 +15,9 @@ enum { static u8 sub_02018F80(u8 param0, u8 param1); static void sub_02019304(Background *param0, u8 param1, int param2); -static void sub_020193E4(BGL *param0, u8 param1); +static void sub_020193E4(BgConfig *param0, u8 param1); static void sub_020194E0(u8 param0, void *param1, u32 param2, u32 param3); -static void sub_020195B8(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4); +static void sub_020195B8(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4); static void sub_020195FC(u8 param0, void *param1, u32 param2, u32 param3); static void sub_020199E0(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); static void sub_02019B54(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); @@ -33,7 +33,7 @@ static void sub_0201AD68(Window *param0); static void sub_0201AD90(Window *param0); static void sub_0201C06C(Window *param0, u8 param1, u8 param2, u8 param3); static void sub_0201C158(Window *param0, u8 param1, u8 param2, u8 param3); -static void sub_0201C8E0(BGL *param0, u8 param1, u8 *param2); +static void sub_0201C8E0(BgConfig *param0, u8 param1, u8 *param2); static void sub_0201AA58(Window *param0); static void sub_0201AADC(Window *param0); static void sub_0201AB38(Window *param0); @@ -41,25 +41,25 @@ static void sub_0201ABC8(Window *param0); static void sub_0201C684(Background *param0, u8 param1, u16 param2); static void sub_0201C6CC(Background *param0, u8 param1, fx32 param2); static void sub_0201C73C(Background *param0, u8 param1, int param2); -static void sub_0201C3D0(BGL *param0); -static void sub_0201C2D0(BGL *param0); +static void sub_0201C3D0(BgConfig *param0); +static void sub_0201C2D0(BgConfig *param0); -BGL *sub_02018340(u32 param0) +BgConfig *sub_02018340(u32 param0) { - BGL *v0 = Heap_AllocFromHeap(param0, sizeof(BGL)); + BgConfig *v0 = Heap_AllocFromHeap(param0, sizeof(BgConfig)); - memset(v0, 0, sizeof(BGL)); + memset(v0, 0, sizeof(BgConfig)); - v0->unk_00 = param0; - v0->unk_04 = 0; - v0->unk_06 = 0; + v0->heapID = param0; + v0->scrollScheduled = 0; + v0->bufferTransferScheduled = 0; return v0; } -u32 sub_02018364(BGL *param0) +u32 sub_02018364(BgConfig *param0) { - return param0->unk_00; + return param0->heapID; } void sub_02018368(const UnkStruct_ov84_0223BA5C *param0) @@ -85,7 +85,7 @@ void sub_020183A0(const UnkStruct_ov84_0223BA5C *param0, u8 param1) } } -void sub_020183C4(BGL *param0, u8 param1, const BgTemplate *param2, u8 param3) +void sub_020183C4(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3) { u8 v0 = sub_02018F80(param2->screenSize, param3); @@ -192,43 +192,43 @@ void sub_020183C4(BGL *param0, u8 param1, const BgTemplate *param2, u8 param3) break; } - param0->unk_08[param1].rotation = 0; - param0->unk_08[param1].xScale = FX32_ONE; - param0->unk_08[param1].yScale = FX32_ONE; - param0->unk_08[param1].xCenter = 0; - param0->unk_08[param1].yCenter = 0; + param0->bgs[param1].rotation = 0; + param0->bgs[param1].xScale = FX32_ONE; + param0->bgs[param1].yScale = FX32_ONE; + param0->bgs[param1].xCenter = 0; + param0->bgs[param1].yCenter = 0; if (param2->bufferSize) { - param0->unk_08[param1].tilemapBuffer = Heap_AllocFromHeap(param0->unk_00, param2->bufferSize); + param0->bgs[param1].tilemapBuffer = Heap_AllocFromHeap(param0->heapID, param2->bufferSize); - MI_CpuClear16(param0->unk_08[param1].tilemapBuffer, param2->bufferSize); + MI_CpuClear16(param0->bgs[param1].tilemapBuffer, param2->bufferSize); - param0->unk_08[param1].bufferSize = param2->bufferSize; - param0->unk_08[param1].baseTile = param2->baseTile; + param0->bgs[param1].bufferSize = param2->bufferSize; + param0->bgs[param1].baseTile = param2->baseTile; } else { - param0->unk_08[param1].tilemapBuffer = NULL; - param0->unk_08[param1].bufferSize = 0; - param0->unk_08[param1].baseTile = 0; + param0->bgs[param1].tilemapBuffer = NULL; + param0->bgs[param1].bufferSize = 0; + param0->bgs[param1].baseTile = 0; } - param0->unk_08[param1].screenSize = param2->screenSize; - param0->unk_08[param1].type = param3; - param0->unk_08[param1].colorMode = param2->colorMode; + param0->bgs[param1].screenSize = param2->screenSize; + param0->bgs[param1].type = param3; + param0->bgs[param1].colorMode = param2->colorMode; if ((param3 == 0) && (param2->colorMode == GX_BG_COLORMODE_16)) { - param0->unk_08[param1].tileSize = 0x20; + param0->bgs[param1].tileSize = 0x20; } else { - param0->unk_08[param1].tileSize = 0x40; + param0->bgs[param1].tileSize = 0x40; } sub_02019184(param0, param1, 0, param2->x); sub_02019184(param0, param1, 3, param2->y); } -void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) +void sub_02018898(BgConfig *param0, u8 param1, u8 param2, u8 param3) { if (param2 == 0) { - param0->unk_08[param1].colorMode = param3; + param0->bgs[param1].colorMode = param3; } switch (param1) { @@ -241,7 +241,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v0.charBase = param3; } - G2_SetBG0Control((GXBGScrSizeText)v0.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v0.screenBase, (GXBGCharBase)v0.charBase, (GXBGExtPltt)v0.bgExtPltt); + G2_SetBG0Control((GXBGScrSizeText)v0.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v0.screenBase, (GXBGCharBase)v0.charBase, (GXBGExtPltt)v0.bgExtPltt); } break; case 1: { GXBg01Control v1 = G2_GetBG1Control(); @@ -252,10 +252,10 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v1.charBase = param3; } - G2_SetBG1Control((GXBGScrSizeText)v1.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v1.screenBase, (GXBGCharBase)v1.charBase, (GXBGExtPltt)v1.bgExtPltt); + G2_SetBG1Control((GXBGScrSizeText)v1.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v1.screenBase, (GXBGCharBase)v1.charBase, (GXBGExtPltt)v1.bgExtPltt); } break; case 2: - switch (param0->unk_08[param1].type) { + switch (param0->bgs[param1].type) { default: case 0: { GXBg23ControlText v2 = G2_GetBG2ControlText(); @@ -266,7 +266,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v2.charBase = param3; } - G2_SetBG2ControlText((GXBGScrSizeText)v2.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v2.screenBase, (GXBGCharBase)v2.charBase); + G2_SetBG2ControlText((GXBGScrSizeText)v2.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v2.screenBase, (GXBGCharBase)v2.charBase); } break; case 1: { GXBg23ControlAffine v3 = G2_GetBG2ControlAffine(); @@ -294,7 +294,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) break; case 3: - switch (param0->unk_08[param1].type) { + switch (param0->bgs[param1].type) { default: case 0: { GXBg23ControlText v5 = G2_GetBG3ControlText(); @@ -305,7 +305,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v5.charBase = param3; } - G2_SetBG3ControlText((GXBGScrSizeText)v5.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v5.screenBase, (GXBGCharBase)v5.charBase); + G2_SetBG3ControlText((GXBGScrSizeText)v5.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v5.screenBase, (GXBGCharBase)v5.charBase); } break; case 1: { GXBg23ControlAffine v6 = G2_GetBG3ControlAffine(); @@ -341,7 +341,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v8.charBase = param3; } - G2S_SetBG0Control((GXBGScrSizeText)v8.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v8.screenBase, (GXBGCharBase)v8.charBase, (GXBGExtPltt)v8.bgExtPltt); + G2S_SetBG0Control((GXBGScrSizeText)v8.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v8.screenBase, (GXBGCharBase)v8.charBase, (GXBGExtPltt)v8.bgExtPltt); } break; case 5: { GXBg01Control v9 = G2S_GetBG1Control(); @@ -352,10 +352,10 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v9.charBase = param3; } - G2S_SetBG1Control((GXBGScrSizeText)v9.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v9.screenBase, (GXBGCharBase)v9.charBase, (GXBGExtPltt)v9.bgExtPltt); + G2S_SetBG1Control((GXBGScrSizeText)v9.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v9.screenBase, (GXBGCharBase)v9.charBase, (GXBGExtPltt)v9.bgExtPltt); } break; case 6: - switch (param0->unk_08[param1].type) { + switch (param0->bgs[param1].type) { default: case 0: { GXBg23ControlText v10 = G2S_GetBG2ControlText(); @@ -366,7 +366,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v10.charBase = param3; } - G2S_SetBG2ControlText((GXBGScrSizeText)v10.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v10.screenBase, (GXBGCharBase)v10.charBase); + G2S_SetBG2ControlText((GXBGScrSizeText)v10.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v10.screenBase, (GXBGCharBase)v10.charBase); } break; case 1: { GXBg23ControlAffine v11 = G2S_GetBG2ControlAffine(); @@ -394,7 +394,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) break; case 7: - switch (param0->unk_08[param1].type) { + switch (param0->bgs[param1].type) { default: case 0: { GXBg23ControlText v13 = G2S_GetBG3ControlText(); @@ -405,7 +405,7 @@ void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) v13.charBase = param3; } - G2S_SetBG3ControlText((GXBGScrSizeText)v13.screenSize, (GXBGColorMode)param0->unk_08[param1].colorMode, (GXBGScrBase)v13.screenBase, (GXBGCharBase)v13.charBase); + G2S_SetBG3ControlText((GXBGScrSizeText)v13.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v13.screenBase, (GXBGCharBase)v13.charBase); } break; case 1: { GXBg23ControlAffine v14 = G2S_GetBG3ControlAffine(); @@ -523,14 +523,14 @@ static void sub_02018FF4(u8 param0, u8 *param1, u8 *param2) } } -void sub_02019044(BGL *param0, u8 param1) +void sub_02019044(BgConfig *param0, u8 param1) { - if (param0->unk_08[param1].tilemapBuffer == NULL) { + if (param0->bgs[param1].tilemapBuffer == NULL) { return; } - Heap_FreeToHeap(param0->unk_08[param1].tilemapBuffer); - param0->unk_08[param1].tilemapBuffer = NULL; + Heap_FreeToHeap(param0->bgs[param1].tilemapBuffer); + param0->bgs[param1].tilemapBuffer = NULL; } void BGL_SetPriority(u8 param0, u8 param1) @@ -593,14 +593,14 @@ void sub_02019120(u8 param0, u8 param1) } } -void sub_02019184(BGL *param0, u8 param1, u8 param2, int param3) +void sub_02019184(BgConfig *param0, u8 param1, u8 param2, int param3) { int v0, v1; - sub_02019304(¶m0->unk_08[param1], param2, param3); + sub_02019304(¶m0->bgs[param1], param2, param3); - v0 = param0->unk_08[param1].xOffset; - v1 = param0->unk_08[param1].yOffset; + v0 = param0->bgs[param1].xOffset; + v1 = param0->bgs[param1].yOffset; switch (param1) { case 0: @@ -610,14 +610,14 @@ void sub_02019184(BGL *param0, u8 param1, u8 param2, int param3) G2_SetBG1Offset(v0, v1); return; case 2: - if (param0->unk_08[2].type == 0) { + if (param0->bgs[2].type == 0) { G2_SetBG2Offset(v0, v1); } else { sub_020193E4(param0, 2); } return; case 3: - if (param0->unk_08[3].type == 0) { + if (param0->bgs[3].type == 0) { G2_SetBG3Offset(v0, v1); } else { sub_020193E4(param0, 3); @@ -630,14 +630,14 @@ void sub_02019184(BGL *param0, u8 param1, u8 param2, int param3) G2S_SetBG1Offset(v0, v1); return; case 6: - if (param0->unk_08[6].type == 0) { + if (param0->bgs[6].type == 0) { G2S_SetBG2Offset(v0, v1); } else { sub_020193E4(param0, 6); } return; case 7: - if (param0->unk_08[7].type == 0) { + if (param0->bgs[7].type == 0) { G2S_SetBG3Offset(v0, v1); } else { sub_020193E4(param0, 7); @@ -647,14 +647,14 @@ void sub_02019184(BGL *param0, u8 param1, u8 param2, int param3) } } -int sub_020192EC(BGL *param0, u32 param1) +int sub_020192EC(BgConfig *param0, u32 param1) { - return param0->unk_08[param1].xOffset; + return param0->bgs[param1].xOffset; } -int sub_020192F8(BGL *param0, u32 param1) +int sub_020192F8(BgConfig *param0, u32 param1) { - return param0->unk_08[param1].yOffset; + return param0->bgs[param1].yOffset; } static void sub_02019304(Background *param0, u8 param1, int param2) @@ -681,25 +681,25 @@ static void sub_02019304(Background *param0, u8 param1, int param2) } } -void sub_02019348(BGL *param0, u8 param1, const MtxFx22 *param2, int param3, int param4) +void sub_02019348(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4) { switch (param1) { case 2: - G2_SetBG2Affine(param2, param3, param4, param0->unk_08[param1].xOffset, param0->unk_08[param1].yOffset); + G2_SetBG2Affine(param2, param3, param4, param0->bgs[param1].xOffset, param0->bgs[param1].yOffset); return; case 3: - G2_SetBG3Affine(param2, param3, param4, param0->unk_08[param1].xOffset, param0->unk_08[param1].yOffset); + G2_SetBG3Affine(param2, param3, param4, param0->bgs[param1].xOffset, param0->bgs[param1].yOffset); return; case 6: - G2S_SetBG2Affine(param2, param3, param4, param0->unk_08[param1].xOffset, param0->unk_08[param1].yOffset); + G2S_SetBG2Affine(param2, param3, param4, param0->bgs[param1].xOffset, param0->bgs[param1].yOffset); return; case 7: - G2S_SetBG3Affine(param2, param3, param4, param0->unk_08[param1].xOffset, param0->unk_08[param1].yOffset); + G2S_SetBG3Affine(param2, param3, param4, param0->bgs[param1].xOffset, param0->bgs[param1].yOffset); return; } } -static void sub_020193E4(BGL *param0, u8 param1) +static void sub_020193E4(BgConfig *param0, u8 param1) { MtxFx22 v0; @@ -720,25 +720,25 @@ void sub_02019410(const void *param0, void *param1, u32 param2) } } -void sub_02019448(BGL *param0, u8 param1) +void sub_02019448(BgConfig *param0, u8 param1) { - sub_02019460(param0, param1, param0->unk_08[param1].tilemapBuffer, param0->unk_08[param1].bufferSize, param0->unk_08[param1].baseTile); + sub_02019460(param0, param1, param0->bgs[param1].tilemapBuffer, param0->bgs[param1].bufferSize, param0->bgs[param1].baseTile); } -void sub_02019460(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4) +void sub_02019460(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4) { void *v0; if (param3 == 0) { - if (param0->unk_08[param1].tilemapBuffer != NULL) { - v0 = param0->unk_08[param1].tilemapBuffer; + if (param0->bgs[param1].tilemapBuffer != NULL) { + v0 = param0->bgs[param1].tilemapBuffer; sub_02019410(param2, v0, param3); - sub_020194E0(param1, v0, param0->unk_08[param1].baseTile * 0x2, param0->unk_08[param1].bufferSize); + sub_020194E0(param1, v0, param0->bgs[param1].baseTile * 0x2, param0->bgs[param1].bufferSize); } else { u32 v1; v1 = ((*(u32 *)param2) >> 8); - v0 = Heap_AllocFromHeapAtEnd(param0->unk_00, v1); + v0 = Heap_AllocFromHeapAtEnd(param0->heapID, v1); sub_02019410(param2, v0, param3); sub_020194E0(param1, v0, param4 * 0x2, v1); @@ -781,21 +781,21 @@ static void sub_020194E0(u8 param0, void *param1, u32 param2, u32 param3) } } -void sub_02019574(BGL *param0, u8 param1, const void *param2, u32 param3) +void sub_02019574(BgConfig *param0, u8 param1, const void *param2, u32 param3) { - sub_02019410(param2, param0->unk_08[param1].tilemapBuffer, param3); + sub_02019410(param2, param0->bgs[param1].tilemapBuffer, param3); } -void sub_0201958C(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4) +void sub_0201958C(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4) { - if (param0->unk_08[param1].colorMode == GX_BG_COLORMODE_16) { + if (param0->bgs[param1].colorMode == GX_BG_COLORMODE_16) { sub_020195B8(param0, param1, param2, param3, param4 * 0x20); } else { sub_020195B8(param0, param1, param2, param3, param4 * 0x40); } } -static void sub_020195B8(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4) +static void sub_020195B8(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4) { void *v0; @@ -803,7 +803,7 @@ static void sub_020195B8(BGL *param0, u8 param1, const void *param2, u32 param3, u32 v1; v1 = ((*(u32 *)param2) >> 8); - v0 = Heap_AllocFromHeapAtEnd(param0->unk_00, v1); + v0 = Heap_AllocFromHeapAtEnd(param0->heapID, v1); sub_02019410(param2, v0, param3); sub_020195FC(param1, v0, param4, v1); @@ -855,15 +855,15 @@ void sub_02019690(u8 param0, u32 param1, u32 param2, u32 param3) Heap_FreeToHeapExplicit(param3, v0); } -void sub_020196C0(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4) +void sub_020196C0(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4) { u32 *v0; u32 v1; - v1 = param3 * param0->unk_08[param1].tileSize; - v0 = (u32 *)Heap_AllocFromHeapAtEnd(param0->unk_00, v1); + v1 = param3 * param0->bgs[param1].tileSize; + v0 = (u32 *)Heap_AllocFromHeapAtEnd(param0->heapID, v1); - if (param0->unk_08[param1].tileSize == 0x20) { + if (param0->bgs[param1].tileSize == 0x20) { param2 = (param2 << 12) | (param2 << 8) | (param2 << 4) | param2; param2 |= (param2 << 16); } else { @@ -872,7 +872,7 @@ void sub_020196C0(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4) MI_CpuFillFast(v0, param2, v1); - sub_020195FC(param1, (void *)v0, param4 * param0->unk_08[param1].tileSize, v1); + sub_020195FC(param1, (void *)v0, param4 * param0->bgs[param1].tileSize, v1); Heap_FreeToHeap(v0); } @@ -969,26 +969,26 @@ static u16 sub_020197E0(u8 param0, u8 param1, u8 param2, u8 param3) return v1; } -void sub_020198C0(BGL *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6) +void sub_020198C0(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6) { sub_020198E8(param0, param1, param3, param4, param5, param6, param2, 0, 0, param5, param6); } -void sub_020198E8(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) +void sub_020198E8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) { - if (param0->unk_08[param1].type != 1) { - sub_020199E0(¶m0->unk_08[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 0); + if (param0->bgs[param1].type != 1) { + sub_020199E0(¶m0->bgs[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 0); } else { - sub_02019B54(¶m0->unk_08[param1], param2, param3, param4, param5, (u8 *)param6, param7, param8, param9, param10, 0); + sub_02019B54(¶m0->bgs[param1], param2, param3, param4, param5, (u8 *)param6, param7, param8, param9, param10, 0); } } -void sub_02019964(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) +void sub_02019964(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) { - if (param0->unk_08[param1].type != 1) { - sub_020199E0(¶m0->unk_08[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 1); + if (param0->bgs[param1].type != 1) { + sub_020199E0(¶m0->bgs[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 1); } else { - sub_02019B54(¶m0->unk_08[param1], param2, param3, param4, param5, (u8 *)param6, param7, param8, param9, param10, 1); + sub_02019B54(¶m0->bgs[param1], param2, param3, param4, param5, (u8 *)param6, param7, param8, param9, param10, 1); } } @@ -1080,12 +1080,12 @@ static void sub_02019B54(Background *param0, u8 param1, u8 param2, u8 param3, u8 } } -void sub_02019CB8(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7) +void sub_02019CB8(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7) { - if (param0->unk_08[param1].type != 1) { - sub_02019D08(¶m0->unk_08[param1], param2, param3, param4, param5, param6, param7); + if (param0->bgs[param1].type != 1) { + sub_02019D08(¶m0->bgs[param1], param2, param3, param4, param5, param6, param7); } else { - sub_02019DB8(¶m0->unk_08[param1], (u8)param2, param3, param4, param5, param6); + sub_02019DB8(¶m0->bgs[param1], (u8)param2, param3, param4, param5, param6); } } @@ -1155,18 +1155,18 @@ static void sub_02019DB8(Background *param0, u8 param1, u8 param2, u8 param3, u8 } } -void sub_02019E2C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) +void sub_02019E2C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) { u16 *v0; u8 v1, v2; u8 v3, v4; - if (param0->unk_08[param1].tilemapBuffer == NULL) { + if (param0->bgs[param1].tilemapBuffer == NULL) { return; } - v0 = (u16 *)param0->unk_08[param1].tilemapBuffer; - sub_02018FF4(param0->unk_08[param1].screenSize, &v1, &v2); + v0 = (u16 *)param0->bgs[param1].tilemapBuffer; + sub_02018FF4(param0->bgs[param1].screenSize, &v1, &v2); for (v3 = param3; v3 < param3 + param5; v3++) { if (v3 >= v2) { @@ -1179,40 +1179,40 @@ void sub_02019E2C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 pa } { - u16 v5 = sub_02019774(v4, v3, param0->unk_08[param1].screenSize); + u16 v5 = sub_02019774(v4, v3, param0->bgs[param1].screenSize); v0[v5] = (v0[v5] & 0xfff) | (param6 << 12); } } } } -void sub_02019EBC(BGL *param0, u8 param1) +void sub_02019EBC(BgConfig *param0, u8 param1) { - if (param0->unk_08[param1].tilemapBuffer == NULL) { + if (param0->bgs[param1].tilemapBuffer == NULL) { return; } - MI_CpuClear16(param0->unk_08[param1].tilemapBuffer, param0->unk_08[param1].bufferSize); + MI_CpuClear16(param0->bgs[param1].tilemapBuffer, param0->bgs[param1].bufferSize); sub_02019448(param0, param1); } -void sub_02019EE0(BGL *param0, u8 param1, u16 param2) +void sub_02019EE0(BgConfig *param0, u8 param1, u16 param2) { - if (param0->unk_08[param1].tilemapBuffer == NULL) { + if (param0->bgs[param1].tilemapBuffer == NULL) { return; } - MI_CpuFill16(param0->unk_08[param1].tilemapBuffer, param2, param0->unk_08[param1].bufferSize); + MI_CpuFill16(param0->bgs[param1].tilemapBuffer, param2, param0->bgs[param1].bufferSize); sub_02019448(param0, param1); } -void sub_02019F04(BGL *param0, u8 param1, u16 param2) +void sub_02019F04(BgConfig *param0, u8 param1, u16 param2) { - if (param0->unk_08[param1].tilemapBuffer == NULL) { + if (param0->bgs[param1].tilemapBuffer == NULL) { return; } - MI_CpuFill16(param0->unk_08[param1].tilemapBuffer, param2, param0->unk_08[param1].bufferSize); + MI_CpuFill16(param0->bgs[param1].tilemapBuffer, param2, param0->bgs[param1].bufferSize); sub_0201C3C0(param0, param1); } @@ -1271,22 +1271,22 @@ void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3) return v0; } -void *sub_02019FE4(BGL *param0, u8 param1) +void *sub_02019FE4(BgConfig *param0, u8 param1) { - return param0->unk_08[param1].tilemapBuffer; + return param0->bgs[param1].tilemapBuffer; } -int sub_02019FF0(BGL *param0, u8 param1) +int sub_02019FF0(BgConfig *param0, u8 param1) { - return param0->unk_08[param1].xOffset; + return param0->bgs[param1].xOffset; } -u16 sub_02019FFC(BGL *param0, u8 param1) +u16 sub_02019FFC(BgConfig *param0, u8 param1) { - return param0->unk_08[param1].rotation; + return param0->bgs[param1].rotation; } -u8 sub_0201A008(BGL *param0, u8 param1) +u8 sub_0201A008(BgConfig *param0, u8 param1) { switch (param1) { case 0: { @@ -1298,7 +1298,7 @@ u8 sub_0201A008(BGL *param0, u8 param1) return (u8)v1.priority; } case 2: - switch (param0->unk_08[param1].type) { + switch (param0->bgs[param1].type) { default: case 0: { GXBg23ControlText v2 = G2_GetBG2ControlText(); @@ -1315,7 +1315,7 @@ u8 sub_0201A008(BGL *param0, u8 param1) } case 3: - switch (param0->unk_08[param1].type) { + switch (param0->bgs[param1].type) { default: case 0: { GXBg23ControlText v5 = G2_GetBG3ControlText(); @@ -1340,7 +1340,7 @@ u8 sub_0201A008(BGL *param0, u8 param1) return (u8)v9.priority; } case 6: - switch (param0->unk_08[param1].type) { + switch (param0->bgs[param1].type) { default: case 0: { GXBg23ControlText v10 = G2S_GetBG2ControlText(); @@ -1357,7 +1357,7 @@ u8 sub_0201A008(BGL *param0, u8 param1) } case 7: - switch (param0->unk_08[param1].type) { + switch (param0->bgs[param1].type) { default: case 0: { GXBg23ControlText v13 = G2S_GetBG3ControlText(); @@ -1566,17 +1566,17 @@ u8 BGL_WindowAdded(Window *param0) return 1; } -void BGL_AddWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8) +void BGL_AddWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8) { void *v0; u32 v1; - if (param0->unk_08[param2].tilemapBuffer == NULL) { + if (param0->bgs[param2].tilemapBuffer == NULL) { return; } - v1 = param5 * param6 * param0->unk_08[param2].tileSize; - v0 = Heap_AllocFromHeap(param0->unk_00, v1); + v1 = param5 * param6 * param0->bgs[param2].tileSize; + v0 = Heap_AllocFromHeap(param0->heapID, v1); if (v0 == NULL) { return; @@ -1591,16 +1591,16 @@ void BGL_AddWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u8 param4, param1->unk_09 = param7; param1->unk_0A_0 = param8; param1->unk_0C = v0; - param1->unk_0A_15 = (param0->unk_08[param2].colorMode == GX_BG_COLORMODE_16) ? UnkEnum_00 : UnkEnum_01; + param1->unk_0A_15 = (param0->bgs[param2].colorMode == GX_BG_COLORMODE_16) ? UnkEnum_00 : UnkEnum_01; } -void BGL_AddFramelessWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5) +void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5) { void *v0; u32 v1; v1 = (u32)(param2 * param3 * 0x20); - v0 = Heap_AllocFromHeap(param0->unk_00, v1); + v0 = Heap_AllocFromHeap(param0->heapID, v1); param5 |= param5 << 4; memset(v0, param5, v1); @@ -1617,7 +1617,7 @@ void BGL_AddFramelessWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u param1->unk_0A_15 = UnkEnum_00; } -void sub_0201A8D4(BGL *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2) +void sub_0201A8D4(BgConfig *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2) { BGL_AddWindow( param0, param1, param2->unk_00, param2->unk_01, param2->unk_02, param2->unk_03, param2->unk_04, param2->unk_05, param2->unk_06); @@ -1703,9 +1703,9 @@ void sub_0201A954(Window *param0) GF_ASSERT(param0 != NULL); GF_ASSERT(param0->unk_00 != NULL); GF_ASSERT(param0->unk_04 < 8); - GF_ASSERT(param0->unk_00->unk_08[param0->unk_04].type < NELEMS(Unk_020E56CC)); + GF_ASSERT(param0->unk_00->bgs[param0->unk_04].type < NELEMS(Unk_020E56CC)); - Unk_020E56CC[param0->unk_00->unk_08[param0->unk_04].type](param0); + Unk_020E56CC[param0->unk_00->bgs[param0->unk_04].type](param0); } void sub_0201A9A4(Window *param0) @@ -1713,14 +1713,14 @@ void sub_0201A9A4(Window *param0) GF_ASSERT(param0 != NULL); GF_ASSERT(param0->unk_00 != NULL); GF_ASSERT(param0->unk_04 < 8); - GF_ASSERT(param0->unk_00->unk_08[param0->unk_04].type < NELEMS(Unk_020E56C0)); + GF_ASSERT(param0->unk_00->bgs[param0->unk_04].type < NELEMS(Unk_020E56C0)); - Unk_020E56C0[param0->unk_00->unk_08[param0->unk_04].type](param0); + Unk_020E56C0[param0->unk_00->bgs[param0->unk_04].type](param0); } void sub_0201A9F4(Window *param0) { - Unk_020E569C[param0->unk_00->unk_08[param0->unk_04].type](param0); + Unk_020E569C[param0->unk_00->bgs[param0->unk_04].type](param0); } void sub_0201AA10(Window *param0, u32 param1, u32 param2) @@ -1733,7 +1733,7 @@ void sub_0201AA10(Window *param0, u32 param1, u32 param2) param0->unk_07 = param1; param0->unk_08 = param2; - Unk_020E569C[param0->unk_00->unk_08[param0->unk_04].type](param0); + Unk_020E569C[param0->unk_00->bgs[param0->unk_04].type](param0); param0->unk_07 = v0; param0->unk_08 = v1; @@ -1741,17 +1741,17 @@ void sub_0201AA10(Window *param0, u32 param1, u32 param2) void sub_0201AA3C(Window *param0) { - Unk_020E56D8[param0->unk_00->unk_08[param0->unk_04].type](param0); + Unk_020E56D8[param0->unk_00->bgs[param0->unk_04].type](param0); } static void sub_0201AA58(Window *param0) { - if (param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) { + if (param0->unk_00->bgs[param0->unk_04].tilemapBuffer) { u32 v0, v1, v2, v3, v4, v5, v6; u16 *v7; v6 = 32; - v7 = (u16 *)(param0->unk_00->unk_08[param0->unk_04].tilemapBuffer); + v7 = (u16 *)(param0->unk_00->bgs[param0->unk_04].tilemapBuffer); v4 = param0->unk_0A_0; v2 = param0->unk_05 + param0->unk_07; v3 = param0->unk_06 + param0->unk_08; @@ -1768,12 +1768,12 @@ static void sub_0201AA58(Window *param0) static void sub_0201AADC(Window *param0) { - if (param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) { + if (param0->unk_00->bgs[param0->unk_04].tilemapBuffer) { int v0, v1, v2, v3; u8 *v4; - v3 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].screenSize]; - v4 = (u8 *)(param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) + param0->unk_06 * v3 + param0->unk_05; + v3 = Unk_020E5694[param0->unk_00->bgs[param0->unk_04].screenSize]; + v4 = (u8 *)(param0->unk_00->bgs[param0->unk_04].tilemapBuffer) + param0->unk_06 * v3 + param0->unk_05; v2 = param0->unk_0A_0; for (v1 = 0; v1 < param0->unk_08; v1++) { @@ -1788,12 +1788,12 @@ static void sub_0201AADC(Window *param0) static void sub_0201AB38(Window *param0) { - if (param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) { + if (param0->unk_00->bgs[param0->unk_04].tilemapBuffer) { u32 v0, v1, v2, v3, v4, v5; u16 *v6; - v5 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].screenSize]; - v6 = (u16 *)(param0->unk_00->unk_08[param0->unk_04].tilemapBuffer); + v5 = Unk_020E5694[param0->unk_00->bgs[param0->unk_04].screenSize]; + v6 = (u16 *)(param0->unk_00->bgs[param0->unk_04].tilemapBuffer); v2 = param0->unk_05 + param0->unk_07; v3 = param0->unk_06 + param0->unk_08; @@ -1808,12 +1808,12 @@ static void sub_0201AB38(Window *param0) static void sub_0201ABC8(Window *param0) { - if (param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) { + if (param0->unk_00->bgs[param0->unk_04].tilemapBuffer) { int v0, v1, v2; u8 *v3; - v2 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].screenSize]; - v3 = (u8 *)(param0->unk_00->unk_08[param0->unk_04].tilemapBuffer) + param0->unk_06 * v2 + param0->unk_05; + v2 = Unk_020E5694[param0->unk_00->bgs[param0->unk_04].screenSize]; + v3 = (u8 *)(param0->unk_00->bgs[param0->unk_04].tilemapBuffer) + param0->unk_06 * v2 + param0->unk_05; for (v1 = 0; v1 < param0->unk_08; v1++) { for (v0 = 0; v0 < param0->unk_07; v0++) { @@ -1829,7 +1829,7 @@ static void sub_0201AC20(Window *param0) { sub_0201AA58(param0); sub_0201ACCC(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].tilemapBuffer, param0->unk_00->unk_08[param0->unk_04].bufferSize, param0->unk_00->unk_08[param0->unk_04].baseTile); + sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->bgs[param0->unk_04].tilemapBuffer, param0->unk_00->bgs[param0->unk_04].bufferSize, param0->unk_00->bgs[param0->unk_04].baseTile); } static void sub_0201AC4C(Window *param0) @@ -1843,7 +1843,7 @@ static void sub_0201AC64(Window *param0) { sub_0201AADC(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].tilemapBuffer, param0->unk_00->unk_08[param0->unk_04].bufferSize, param0->unk_00->unk_08[param0->unk_04].baseTile); + sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->bgs[param0->unk_04].tilemapBuffer, param0->unk_00->bgs[param0->unk_04].bufferSize, param0->unk_00->bgs[param0->unk_04].baseTile); sub_0201958C(param0->unk_00, param0->unk_04, param0->unk_0C, (u32)(param0->unk_07 * param0->unk_08 * 0x40), (u32)param0->unk_0A_0); } @@ -1857,24 +1857,24 @@ static void sub_0201ACA0(Window *param0) void sub_0201ACCC(Window *param0) { - u32 v0 = param0->unk_07 * param0->unk_08 * param0->unk_00->unk_08[param0->unk_04].tileSize; + u32 v0 = param0->unk_07 * param0->unk_08 * param0->unk_00->bgs[param0->unk_04].tileSize; sub_0201958C(param0->unk_00, param0->unk_04, param0->unk_0C, v0, param0->unk_0A_0); } void sub_0201ACF4(Window *param0) { - Unk_020E56B4[param0->unk_00->unk_08[param0->unk_04].type](param0); + Unk_020E56B4[param0->unk_00->bgs[param0->unk_04].type](param0); } void sub_0201AD10(Window *param0) { - Unk_020E56A8[param0->unk_00->unk_08[param0->unk_04].type](param0); + Unk_020E56A8[param0->unk_00->bgs[param0->unk_04].type](param0); } static void sub_0201AD2C(Window *param0) { sub_0201AB38(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].tilemapBuffer, param0->unk_00->unk_08[param0->unk_04].bufferSize, param0->unk_00->unk_08[param0->unk_04].baseTile); + sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->bgs[param0->unk_04].tilemapBuffer, param0->unk_00->bgs[param0->unk_04].bufferSize, param0->unk_00->bgs[param0->unk_04].baseTile); } static void sub_0201AD54(Window *param0) @@ -1886,7 +1886,7 @@ static void sub_0201AD54(Window *param0) static void sub_0201AD68(Window *param0) { sub_0201ABC8(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].tilemapBuffer, param0->unk_00->unk_08[param0->unk_04].bufferSize, param0->unk_00->unk_08[param0->unk_04].baseTile); + sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->bgs[param0->unk_04].tilemapBuffer, param0->unk_00->bgs[param0->unk_04].bufferSize, param0->unk_00->bgs[param0->unk_04].baseTile); } static void sub_0201AD90(Window *param0) @@ -1900,12 +1900,12 @@ void BGL_FillWindow(Window *param0, u8 param1) u32 v0; u32 v1; - if (param0->unk_00->unk_08[param0->unk_04].tileSize == 0x20) { + if (param0->unk_00->bgs[param0->unk_04].tileSize == 0x20) { param1 = (param1 << 4) | param1; } v1 = (param1 << 24) | (param1 << 16) | (param1 << 8) | param1; - v0 = param0->unk_00->unk_08[param0->unk_04].tileSize * param0->unk_07 * param0->unk_08; + v0 = param0->unk_00->bgs[param0->unk_04].tileSize * param0->unk_07 * param0->unk_08; MI_CpuFillFast(param0->unk_0C, v1, v0); } @@ -1927,7 +1927,7 @@ void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 para v1.width = (u16)(param0->unk_07 * 0x8); v1.height = (u16)(param0->unk_08 * 0x8); - if (param0->unk_00->unk_08[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { + if (param0->unk_00->bgs[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { sub_0201A1E4(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); } else { sub_0201A424(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); @@ -1942,7 +1942,7 @@ void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 para v0.width = (u16)(param0->unk_07 * 0x8); v0.height = (u16)(param0->unk_08 * 0x8); - if (param0->unk_00->unk_08[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { + if (param0->unk_00->bgs[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { sub_0201A60C((const Bitmap *)&v0, param2, param3, param4, param5, param1); } else { sub_0201A6D0((const Bitmap *)&v0, param2, param3, param4, param5, param1); @@ -2484,7 +2484,7 @@ void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 return; } } else { - u8 *v6 = sub_02019FC0(param1, param2 * 4 * param3 * 8, param0->unk_09, param0->unk_00->unk_00); + u8 *v6 = sub_02019FC0(param1, param2 * 4 * param3 * 8, param0->unk_09, param0->unk_00->heapID); switch (v5) { case 0: { @@ -2974,7 +2974,7 @@ void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 void sub_0201C04C(Window *param0, u8 param1, u8 param2, u8 param3) { - if (param0->unk_00->unk_08[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { + if (param0->unk_00->bgs[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { sub_0201C06C(param0, param1, param2, param3); } else { sub_0201C158(param0, param1, param2, param3); @@ -3118,7 +3118,7 @@ static void sub_0201C158(Window *param0, u8 param1, u8 param2, u8 param3) } } -BGL *sub_0201C28C(Window *param0) +BgConfig *sub_0201C28C(Window *param0) { return param0->unk_00; } @@ -3168,128 +3168,128 @@ void sub_0201C2B4(Window *param0, u8 param1) param0->unk_09 = param1; } -void sub_0201C2B8(BGL *param0) +void sub_0201C2B8(BgConfig *param0) { sub_0201C3D0(param0); sub_0201C2D0(param0); - param0->unk_04 = 0; - param0->unk_06 = 0; + param0->scrollScheduled = 0; + param0->bufferTransferScheduled = 0; } -static void sub_0201C2D0(BGL *param0) +static void sub_0201C2D0(BgConfig *param0) { - if ((param0->unk_06 & 1) != 0) { - sub_020194E0(0, param0->unk_08[0].tilemapBuffer, param0->unk_08[0].baseTile * 0x2, param0->unk_08[0].bufferSize); + if ((param0->bufferTransferScheduled & 1) != 0) { + sub_020194E0(0, param0->bgs[0].tilemapBuffer, param0->bgs[0].baseTile * 0x2, param0->bgs[0].bufferSize); } - if ((param0->unk_06 & 2) != 0) { - sub_020194E0(1, param0->unk_08[1].tilemapBuffer, param0->unk_08[1].baseTile * 0x2, param0->unk_08[1].bufferSize); + if ((param0->bufferTransferScheduled & 2) != 0) { + sub_020194E0(1, param0->bgs[1].tilemapBuffer, param0->bgs[1].baseTile * 0x2, param0->bgs[1].bufferSize); } - if ((param0->unk_06 & 4) != 0) { - sub_020194E0(2, param0->unk_08[2].tilemapBuffer, param0->unk_08[2].baseTile * 0x2, param0->unk_08[2].bufferSize); + if ((param0->bufferTransferScheduled & 4) != 0) { + sub_020194E0(2, param0->bgs[2].tilemapBuffer, param0->bgs[2].baseTile * 0x2, param0->bgs[2].bufferSize); } - if ((param0->unk_06 & 8) != 0) { - sub_020194E0(3, param0->unk_08[3].tilemapBuffer, param0->unk_08[3].baseTile * 0x2, param0->unk_08[3].bufferSize); + if ((param0->bufferTransferScheduled & 8) != 0) { + sub_020194E0(3, param0->bgs[3].tilemapBuffer, param0->bgs[3].baseTile * 0x2, param0->bgs[3].bufferSize); } - if ((param0->unk_06 & 16) != 0) { - sub_020194E0(4, param0->unk_08[4].tilemapBuffer, param0->unk_08[4].baseTile * 0x2, param0->unk_08[4].bufferSize); + if ((param0->bufferTransferScheduled & 16) != 0) { + sub_020194E0(4, param0->bgs[4].tilemapBuffer, param0->bgs[4].baseTile * 0x2, param0->bgs[4].bufferSize); } - if ((param0->unk_06 & 32) != 0) { - sub_020194E0(5, param0->unk_08[5].tilemapBuffer, param0->unk_08[5].baseTile * 0x2, param0->unk_08[5].bufferSize); + if ((param0->bufferTransferScheduled & 32) != 0) { + sub_020194E0(5, param0->bgs[5].tilemapBuffer, param0->bgs[5].baseTile * 0x2, param0->bgs[5].bufferSize); } - if ((param0->unk_06 & 64) != 0) { - sub_020194E0(6, param0->unk_08[6].tilemapBuffer, param0->unk_08[6].baseTile * 0x2, param0->unk_08[6].bufferSize); + if ((param0->bufferTransferScheduled & 64) != 0) { + sub_020194E0(6, param0->bgs[6].tilemapBuffer, param0->bgs[6].baseTile * 0x2, param0->bgs[6].bufferSize); } - if ((param0->unk_06 & 128) != 0) { - sub_020194E0(7, param0->unk_08[7].tilemapBuffer, param0->unk_08[7].baseTile * 0x2, param0->unk_08[7].bufferSize); + if ((param0->bufferTransferScheduled & 128) != 0) { + sub_020194E0(7, param0->bgs[7].tilemapBuffer, param0->bgs[7].baseTile * 0x2, param0->bgs[7].bufferSize); } } -void sub_0201C3C0(BGL *param0, u8 param1) +void sub_0201C3C0(BgConfig *param0, u8 param1) { - param0->unk_06 |= (1 << param1); + param0->bufferTransferScheduled |= (1 << param1); } -static void sub_0201C3D0(BGL *param0) +static void sub_0201C3D0(BgConfig *param0) { - if ((param0->unk_04 & 1) != 0) { - G2_SetBG0Offset(param0->unk_08[0].xOffset, param0->unk_08[0].yOffset); + if ((param0->scrollScheduled & 1) != 0) { + G2_SetBG0Offset(param0->bgs[0].xOffset, param0->bgs[0].yOffset); } - if ((param0->unk_04 & 2) != 0) { - G2_SetBG1Offset(param0->unk_08[1].xOffset, param0->unk_08[1].yOffset); + if ((param0->scrollScheduled & 2) != 0) { + G2_SetBG1Offset(param0->bgs[1].xOffset, param0->bgs[1].yOffset); } - if ((param0->unk_04 & 4) != 0) { - if (param0->unk_08[2].type == 0) { - G2_SetBG2Offset(param0->unk_08[2].xOffset, param0->unk_08[2].yOffset); + if ((param0->scrollScheduled & 4) != 0) { + if (param0->bgs[2].type == 0) { + G2_SetBG2Offset(param0->bgs[2].xOffset, param0->bgs[2].yOffset); } else { MtxFx22 v0; - sub_0201D470(&v0, param0->unk_08[2].rotation, param0->unk_08[2].xScale, param0->unk_08[2].yScale, 2); - G2_SetBG2Affine(&v0, param0->unk_08[2].xCenter, param0->unk_08[2].yCenter, param0->unk_08[2].xOffset, param0->unk_08[2].yOffset); + sub_0201D470(&v0, param0->bgs[2].rotation, param0->bgs[2].xScale, param0->bgs[2].yScale, 2); + G2_SetBG2Affine(&v0, param0->bgs[2].xCenter, param0->bgs[2].yCenter, param0->bgs[2].xOffset, param0->bgs[2].yOffset); } } - if ((param0->unk_04 & 8) != 0) { - if (param0->unk_08[3].type == 0) { - G2_SetBG3Offset(param0->unk_08[3].xOffset, param0->unk_08[3].yOffset); + if ((param0->scrollScheduled & 8) != 0) { + if (param0->bgs[3].type == 0) { + G2_SetBG3Offset(param0->bgs[3].xOffset, param0->bgs[3].yOffset); } else { MtxFx22 v1; - sub_0201D470(&v1, param0->unk_08[3].rotation, param0->unk_08[3].xScale, param0->unk_08[3].yScale, 2); - G2_SetBG3Affine(&v1, param0->unk_08[3].xCenter, param0->unk_08[3].yCenter, param0->unk_08[3].xOffset, param0->unk_08[3].yOffset); + sub_0201D470(&v1, param0->bgs[3].rotation, param0->bgs[3].xScale, param0->bgs[3].yScale, 2); + G2_SetBG3Affine(&v1, param0->bgs[3].xCenter, param0->bgs[3].yCenter, param0->bgs[3].xOffset, param0->bgs[3].yOffset); } } - if ((param0->unk_04 & 16) != 0) { - G2S_SetBG0Offset(param0->unk_08[4].xOffset, param0->unk_08[4].yOffset); + if ((param0->scrollScheduled & 16) != 0) { + G2S_SetBG0Offset(param0->bgs[4].xOffset, param0->bgs[4].yOffset); } - if ((param0->unk_04 & 32) != 0) { - G2S_SetBG1Offset(param0->unk_08[5].xOffset, param0->unk_08[5].yOffset); + if ((param0->scrollScheduled & 32) != 0) { + G2S_SetBG1Offset(param0->bgs[5].xOffset, param0->bgs[5].yOffset); } - if ((param0->unk_04 & 64) != 0) { - if (param0->unk_08[6].type == 0) { - G2S_SetBG2Offset(param0->unk_08[6].xOffset, param0->unk_08[6].yOffset); + if ((param0->scrollScheduled & 64) != 0) { + if (param0->bgs[6].type == 0) { + G2S_SetBG2Offset(param0->bgs[6].xOffset, param0->bgs[6].yOffset); } else { MtxFx22 v2; - sub_0201D470(&v2, param0->unk_08[6].rotation, param0->unk_08[6].xScale, param0->unk_08[6].yScale, 2); - G2S_SetBG2Affine(&v2, param0->unk_08[6].xCenter, param0->unk_08[6].yCenter, param0->unk_08[6].xOffset, param0->unk_08[6].yOffset); + sub_0201D470(&v2, param0->bgs[6].rotation, param0->bgs[6].xScale, param0->bgs[6].yScale, 2); + G2S_SetBG2Affine(&v2, param0->bgs[6].xCenter, param0->bgs[6].yCenter, param0->bgs[6].xOffset, param0->bgs[6].yOffset); } } - if ((param0->unk_04 & 128) != 0) { - if (param0->unk_08[7].type == 0) { - G2S_SetBG3Offset(param0->unk_08[7].xOffset, param0->unk_08[7].yOffset); + if ((param0->scrollScheduled & 128) != 0) { + if (param0->bgs[7].type == 0) { + G2S_SetBG3Offset(param0->bgs[7].xOffset, param0->bgs[7].yOffset); } else { MtxFx22 v3; - sub_0201D470(&v3, param0->unk_08[7].rotation, param0->unk_08[7].xScale, param0->unk_08[7].yScale, 2); - G2S_SetBG3Affine(&v3, param0->unk_08[7].xCenter, param0->unk_08[7].yCenter, param0->unk_08[7].xOffset, param0->unk_08[7].yOffset); + sub_0201D470(&v3, param0->bgs[7].rotation, param0->bgs[7].xScale, param0->bgs[7].yScale, 2); + G2S_SetBG3Affine(&v3, param0->bgs[7].xCenter, param0->bgs[7].yCenter, param0->bgs[7].xOffset, param0->bgs[7].yOffset); } } } -void sub_0201C63C(BGL *param0, u8 param1, u8 param2, int param3) +void sub_0201C63C(BgConfig *param0, u8 param1, u8 param2, int param3) { - sub_02019304(¶m0->unk_08[param1], param2, param3); - param0->unk_04 |= (1 << param1); + sub_02019304(¶m0->bgs[param1], param2, param3); + param0->scrollScheduled |= (1 << param1); } -void sub_0201C660(BGL *param0, u8 param1, u8 param2, u16 param3) +void sub_0201C660(BgConfig *param0, u8 param1, u8 param2, u16 param3) { - sub_0201C684(¶m0->unk_08[param1], param2, param3); - param0->unk_04 |= (1 << param1); + sub_0201C684(¶m0->bgs[param1], param2, param3); + param0->scrollScheduled |= (1 << param1); } static void sub_0201C684(Background *param0, u8 param1, u16 param2) @@ -3307,10 +3307,10 @@ static void sub_0201C684(Background *param0, u8 param1, u16 param2) } } -void sub_0201C6A8(BGL *param0, u8 param1, u8 param2, fx32 param3) +void sub_0201C6A8(BgConfig *param0, u8 param1, u8 param2, fx32 param3) { - sub_0201C6CC(¶m0->unk_08[param1], param2, param3); - param0->unk_04 |= (1 << param1); + sub_0201C6CC(¶m0->bgs[param1], param2, param3); + param0->scrollScheduled |= (1 << param1); } static void sub_0201C6CC(Background *param0, u8 param1, fx32 param2) @@ -3337,10 +3337,10 @@ static void sub_0201C6CC(Background *param0, u8 param1, fx32 param2) } } -void sub_0201C718(BGL *param0, u8 param1, u8 param2, int param3) +void sub_0201C718(BgConfig *param0, u8 param1, u8 param2, int param3) { - sub_0201C73C(¶m0->unk_08[param1], param2, param3); - param0->unk_04 |= (1 << param1); + sub_0201C73C(¶m0->bgs[param1], param2, param3); + param0->scrollScheduled |= (1 << param1); } static void sub_0201C73C(Background *param0, u8 param1, int param2) @@ -3367,7 +3367,7 @@ static void sub_0201C73C(Background *param0, u8 param1, int param2) } } -u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4) +u8 sub_0201C784(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4) { u8 *v0; u16 v1; @@ -3375,21 +3375,21 @@ u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4) u8 v4; u8 v5; - if (param0->unk_08[param1].tilemapBuffer == NULL) { + if (param0->bgs[param1].tilemapBuffer == NULL) { return 0; } - v1 = sub_02019774((u8)(param2 >> 3), (u8)(param3 >> 3), param0->unk_08[param1].screenSize); + v1 = sub_02019774((u8)(param2 >> 3), (u8)(param3 >> 3), param0->bgs[param1].screenSize); v0 = (u8 *)sub_02019F28(param1); v2 = (u8)(param2 & 7); v3 = (u8)(param3 & 7); - if (param0->unk_08[param1].colorMode == GX_BG_COLORMODE_16) { + if (param0->bgs[param1].colorMode == GX_BG_COLORMODE_16) { u16 *v6; u8 *v7; - v6 = (u16 *)param0->unk_08[param1].tilemapBuffer; - v7 = Heap_AllocFromHeapAtEnd(param0->unk_00, 64); + v6 = (u16 *)param0->bgs[param1].tilemapBuffer; + v7 = Heap_AllocFromHeapAtEnd(param0->heapID, 64); v0 += ((v6[v1] & 0x3ff) << 5); @@ -3406,12 +3406,12 @@ u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4) return 1; } } else { - if (param0->unk_08[param1].type != 1) { + if (param0->bgs[param1].type != 1) { u16 *v8; u8 *v9; - v8 = (u16 *)param0->unk_08[param1].tilemapBuffer; - v9 = Heap_AllocFromHeapAtEnd(param0->unk_00, 64); + v8 = (u16 *)param0->bgs[param1].tilemapBuffer; + v9 = Heap_AllocFromHeapAtEnd(param0->heapID, 64); memcpy(v9, &v0[(v8[v1] & 0x3ff) << 6], 64); sub_0201C8E0(param0, (u8)((v8[v1] >> 10) & 3), v9); @@ -3419,7 +3419,7 @@ u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4) v4 = v9[v2 + (v3 << 3)]; Heap_FreeToHeap(v9); } else { - u8 *v10 = (u8 *)param0->unk_08[param1].tilemapBuffer; + u8 *v10 = (u8 *)param0->bgs[param1].tilemapBuffer; v4 = v0[(v10[v1] << 6) + v2 + (v3 << 3)]; } @@ -3440,7 +3440,7 @@ u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4) return 0; } -static void sub_0201C8E0(BGL *param0, u8 param1, u8 *param2) +static void sub_0201C8E0(BgConfig *param0, u8 param1, u8 *param2) { u8 *v0; u8 v1, v2; @@ -3449,7 +3449,7 @@ static void sub_0201C8E0(BGL *param0, u8 param1, u8 *param2) return; } - v0 = Heap_AllocFromHeapAtEnd(param0->unk_00, 64); + v0 = Heap_AllocFromHeapAtEnd(param0->heapID, 64); if (param1 & 1) { for (v1 = 0; v1 < 8; v1++) { diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index 25ec6c59ad..e3fc2dfb39 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -202,7 +202,7 @@ typedef struct ChooseStarterApp { enum CursorPosition cursorPosition; int unk_58[3][3]; int unk_7C[3][2]; - BGL *bgl; + BgConfig *bgl; Window *messageWindow; Window *unk_9C[3]; int unk_A8; @@ -243,8 +243,8 @@ static void SetupVRAMBank(void); static void SetupOAM(enum HeapId heapID); static void Setup3D(ChooseStarterApp *app); static void ov78_021D1218(void); -static void SetupBGL(BGL *bgl, enum HeapId heapID); -static void ov78_021D12EC(BGL *param0); +static void SetupBGL(BgConfig *bgl, enum HeapId heapID); +static void ov78_021D12EC(BgConfig *param0); static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID); static void ov78_021D13A0(ChooseStarterApp *param0); static u8 ov78_021D1FB4(Window *param0, int param1, int param2, int param3, TextColor param4, u32 param5); @@ -584,7 +584,7 @@ static void ov78_021D1218(void) NNS_GfdResetFrmPlttVramState(); } -static void SetupBGL(BGL *bgl, enum HeapId heapID) +static void SetupBGL(BgConfig *bgl, enum HeapId heapID) { G2_SetBG0Priority(1); @@ -655,7 +655,7 @@ static void SetupBGL(BGL *bgl, enum HeapId heapID) } } -static void ov78_021D12EC(BGL *param0) +static void ov78_021D12EC(BgConfig *param0) { sub_02019044(param0, 1); sub_02019044(param0, 2); diff --git a/src/error_message_reset.c b/src/error_message_reset.c index d60edc1ee5..7e57dfd650 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -83,7 +83,7 @@ static void VBlankIntr(void) void ErrorMessageReset_PrintErrorAndReset(void) { - BGL *bgConfig; + BgConfig *bgConfig; Window window; MessageLoader *errorMsgData; Strbuf *errorString; diff --git a/src/field_system.c b/src/field_system.c index 60f9d6a2b4..c02b4dd885 100644 --- a/src/field_system.c +++ b/src/field_system.c @@ -376,7 +376,7 @@ struct PoketchSystem *FieldSystem_GetPoketchSystem(void) return sFieldSystem->unk_04->poketchSys; } -BGL *sub_0203D170(void *param0) +BgConfig *sub_0203D170(void *param0) { FieldSystem *fieldSystem = (FieldSystem *)param0; return fieldSystem->unk_08; diff --git a/src/library_tv/library_tv.c b/src/library_tv/library_tv.c index eaaf6cbc0c..bd5ba92641 100644 --- a/src/library_tv/library_tv.c +++ b/src/library_tv/library_tv.c @@ -22,7 +22,7 @@ typedef struct LibraryTV { int heapID; - BGL *bgl; + BgConfig *bgl; MessageLoader *msgLdr; int tvState; Window tvWindow; diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c index 38fd70088b..963c34e0f9 100644 --- a/src/overlay005/encounter_effect.c +++ b/src/overlay005/encounter_effect.c @@ -710,7 +710,7 @@ static void EncounterEffect_UnusedTask(SysTask *dummy1, void *dummy2) } } -void ov5_021DE3D0(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, BGL *param6, u32 param7) +void ov5_021DE3D0(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, BgConfig *param6, u32 param7) { void *v0; NNSG2dScreenData *v1; diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index f5f81bf6a1..71a13e4ef6 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -97,8 +97,8 @@ struct UnkStruct_ov5_021D1A68_t { int unk_02[24]; }; -static void ov5_021D1444(BGL *bgl); -static void ov5_021D1524(BGL *bgl); +static void ov5_021D1444(BgConfig *bgl); +static void ov5_021D1524(BgConfig *bgl); static void ov5_021D154C(void); static void ov5_021D1570(void); static void ov5_021D1578(UnkStruct_ov5_021D5894 *param0); @@ -560,17 +560,17 @@ static void ov5_021D1414(void) GXLayers_SetBanks(&v0); } -void ov5_021D1434(BGL *bgl) +void ov5_021D1434(BgConfig *bgl) { ov5_021D1444(bgl); } -void ov5_021D143C(BGL *bgl) +void ov5_021D143C(BgConfig *bgl) { ov5_021D1524(bgl); } -static void ov5_021D1444(BGL *bgl) +static void ov5_021D1444(BgConfig *bgl) { { UnkStruct_ov84_0223BA5C v0 = { @@ -656,7 +656,7 @@ static void ov5_021D1444(BGL *bgl) } } -static void ov5_021D1524(BGL *bgl) +static void ov5_021D1524(BgConfig *bgl) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 0); sub_02019044(bgl, 1); diff --git a/src/overlay005/ov5_021DD6FC.c b/src/overlay005/ov5_021DD6FC.c index 0c6d91a655..beaa58b18c 100644 --- a/src/overlay005/ov5_021DD6FC.c +++ b/src/overlay005/ov5_021DD6FC.c @@ -25,7 +25,7 @@ typedef struct UnkStruct_ov5_021DD9C8_t { u16 unk_10; BOOL unk_14; int unk_18; - BGL *unk_1C; + BgConfig *unk_1C; Window unk_20; u8 unk_30; u8 unk_31; @@ -38,7 +38,7 @@ typedef struct UnkStruct_ov5_021DD9C8_t { static void ov5_021DD718(UnkStruct_ov5_021DD9C8 *param0); static void ov5_021DD744(UnkStruct_ov5_021DD9C8 *param0, u8 param1, u16 param2, u8 param3, u8 param4); static void ov5_021DD880(UnkStruct_ov5_021DD9C8 *param0); -static void ov5_021DD894(UnkStruct_ov5_021DD9C8 *param0, BGL *param1); +static void ov5_021DD894(UnkStruct_ov5_021DD9C8 *param0, BgConfig *param1); static void ov5_021DD8A4(SysTask *param0, void *param1); static void ov5_021DD7A0(UnkStruct_ov5_021DD9C8 *param0, const int param1); static void ov5_021DD980(UnkStruct_ov5_021DD9C8 *param0); @@ -138,7 +138,7 @@ static void ov5_021DD880(UnkStruct_ov5_021DD9C8 *param0) param0->unk_1C = NULL; } -static void ov5_021DD894(UnkStruct_ov5_021DD9C8 *param0, BGL *param1) +static void ov5_021DD894(UnkStruct_ov5_021DD9C8 *param0, BgConfig *param1) { ov5_021DD880(param0); param0->unk_1C = param1; @@ -220,7 +220,7 @@ static void ov5_021DD980(UnkStruct_ov5_021DD9C8 *param0) param0->unk_10 = 0; } -UnkStruct_ov5_021DD9C8 *ov5_021DD98C(BGL *param0) +UnkStruct_ov5_021DD9C8 *ov5_021DD98C(BgConfig *param0) { UnkStruct_ov5_021DD9C8 *v0; @@ -295,7 +295,7 @@ void ov5_021DDA78(UnkStruct_ov5_021DD9C8 *param0) sub_02019184(param0->unk_1C, 3, 3, 0); { - BGL *v0 = param0->unk_1C; + BgConfig *v0 = param0->unk_1C; ov5_021DD894(param0, v0); } } diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index dc91cb1470..80cfdf9682 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -40,7 +40,7 @@ struct UnkStruct_ov5_021E1FF4_t { FieldSystem *fieldSystem; int unk_04; u8 unk_08; - BGL *unk_0C; + BgConfig *unk_0C; Window *unk_10; StringTemplate *unk_14; MessageLoader *unk_18; diff --git a/src/overlay005/ov5_021F007C.c b/src/overlay005/ov5_021F007C.c index 5e1b0daf10..e032e40ce1 100644 --- a/src/overlay005/ov5_021F007C.c +++ b/src/overlay005/ov5_021F007C.c @@ -54,7 +54,7 @@ typedef struct UnkStruct_ov5_021F0468_t { s16 unk_0E; } UnkStruct_ov5_021F0468; -static void ov5_021F0260(BGL *param0); +static void ov5_021F0260(BgConfig *param0); static void ov5_021F02B8(UnkStruct_ov5_021F02B8 *param0, int param1, int param2, int param3); static BOOL ov5_021F02C8(UnkStruct_ov5_021F02B8 *param0); @@ -246,7 +246,7 @@ BOOL ov5_021F0254(UnkStruct_ov5_021D1BEC *param0) return v0->unk_3C; } -static void ov5_021F0260(BGL *param0) +static void ov5_021F0260(BgConfig *param0) { GXRgb v0 = (GX_RGB(31, 10, 23)); u8 *v1; diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index 60e40f9b4b..32416ba284 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -255,9 +255,9 @@ static void ov6_0223E140(UnkStruct_ov6_0223E140 *param0); static void ov6_0223E198(UnkStruct_ov6_0223E140 *param0); static u32 ov6_0223E1AC(const UnkStruct_ov6_0223E140 *param0); static void ov6_0223E1B0(void); -static void ov6_0223E1D0(BGL *param0); -static void ov6_0223E2AC(BGL *param0); -static void ov6_0223E2A4(BGL *param0); +static void ov6_0223E1D0(BgConfig *param0); +static void ov6_0223E2AC(BgConfig *param0); +static void ov6_0223E2A4(BgConfig *param0); static MotionBlur *ov6_0223E2BC(int param0, int param1); static void ov6_0223E2E8(UnkStruct_ov6_0223E140 *param0); static void ov6_0223E234(UnkStruct_ov6_0223E140 *param0); @@ -365,7 +365,7 @@ static void ov6_0223E1B0(void) GXLayers_SetBanks(&v0); } -static void ov6_0223E1D0(BGL *param0) +static void ov6_0223E1D0(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -435,12 +435,12 @@ static void ov6_0223E280(SysTask *param0, void *param1) SysTask_Done(param0); } -static void ov6_0223E2A4(BGL *param0) +static void ov6_0223E2A4(BgConfig *param0) { ov5_021D143C(param0); } -static void ov6_0223E2AC(BGL *param0) +static void ov6_0223E2AC(BgConfig *param0) { ov5_021D1434(param0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -2059,7 +2059,7 @@ UnkStruct_ov6_022401B8 *ov6_02240104(u32 param0, FieldSystem *fieldSystem) ov6_02240260(&v0->unk_34, v0->unk_11C, &v0->unk_10C); { - BGL *v1 = sub_0203D170(v0->fieldSystem); + BgConfig *v1 = sub_0203D170(v0->fieldSystem); sub_02006E3C(172, 74, v1, 2, 0, 0, 0, param0); sub_02006E60(172, 76, v1, 2, 0, 0, 0, param0); diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c index 30c193bd73..4c10d1ac5c 100644 --- a/src/overlay006/ov6_02243258.c +++ b/src/overlay006/ov6_02243258.c @@ -271,9 +271,9 @@ static void ov6_02244D34(CellActor *param0); static CellActor *ov6_02244D4C(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, int param2, int param3); static void ov6_02244DB4(UnkStruct_ov6_02243FFC *param0); static void ov6_02244E54(NARC *param0, u32 param1, NNSG2dPaletteData **param2); -static void ov6_02244E7C(BGL *param0, NARC *param1, u32 param2, NNSG2dCharacterData **param3); -static void ov6_02244EB4(BGL *param0, NARC *param1, u32 param2, NNSG2dScreenData **param3); -static void ov6_02244F20(BGL *param0); +static void ov6_02244E7C(BgConfig *param0, NARC *param1, u32 param2, NNSG2dCharacterData **param3); +static void ov6_02244EB4(BgConfig *param0, NARC *param1, u32 param2, NNSG2dScreenData **param3); +static void ov6_02244F20(BgConfig *param0); static void ov6_02244F2C(UnkStruct_ov6_02243FFC *param0); static void ov6_02244F50(UnkStruct_ov6_02243FFC *param0); static void ov6_02244F58(UnkStruct_ov6_02243FFC *param0); @@ -1949,7 +1949,7 @@ static void ov6_02244E54(NARC *param0, u32 param1, NNSG2dPaletteData **param2) Heap_FreeToHeap(v0); } -static void ov6_02244E7C(BGL *param0, NARC *param1, u32 param2, NNSG2dCharacterData **param3) +static void ov6_02244E7C(BgConfig *param0, NARC *param1, u32 param2, NNSG2dCharacterData **param3) { void *v0; @@ -1960,7 +1960,7 @@ static void ov6_02244E7C(BGL *param0, NARC *param1, u32 param2, NNSG2dCharacterD Heap_FreeToHeap(v0); } -static void ov6_02244EB4(BGL *param0, NARC *param1, u32 param2, NNSG2dScreenData **param3) +static void ov6_02244EB4(BgConfig *param0, NARC *param1, u32 param2, NNSG2dScreenData **param3) { void *v0; @@ -1976,7 +1976,7 @@ static void ov6_02244EB4(BGL *param0, NARC *param1, u32 param2, NNSG2dScreenData Heap_FreeToHeap(v0); } -static void ov6_02244F20(BGL *param0) +static void ov6_02244F20(BgConfig *param0) { sub_02019EBC(param0, 3); } diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c index 880c8365f6..1825e5e5ef 100644 --- a/src/overlay006/ov6_02247A0C.c +++ b/src/overlay006/ov6_02247A0C.c @@ -127,7 +127,7 @@ static BOOL ov6_02247A34(TaskManager *param0) void *ov6_02247A90(void *param0) { UnkStruct_ov6_02247A90 *v0; - BGL *v1; + BgConfig *v1; Strbuf *v2, *v3; int v4, v5, v6, v7; SaveData *v8; diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index 9d08641353..cf684ad393 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -113,7 +113,7 @@ typedef struct { typedef struct { u32 unk_00; - BGL *unk_04; + BgConfig *unk_04; UnkStruct_ov7_0224C620 *unk_08; const UnkStruct_ov7_0224F1B4 *unk_0C; Bag *unk_10; @@ -125,7 +125,7 @@ typedef struct UnkStruct_ov7_0224BEFC_t { SaveData *unk_08; UnkStruct_02029D04 *unk_0C; Bag *unk_10; - BGL *unk_14; + BgConfig *unk_14; u32 unk_18; CellActorCollection *unk_1C; UnkStruct_0200C738 unk_20; @@ -144,16 +144,16 @@ static void ov7_0224C3B8(UnkStruct_ov7_0224BEFC *param0); static void ov7_0224C3CC(UnkStruct_ov7_0224BEFC *param0); static void ov7_0224C3E0(UnkStruct_ov7_0224BEFC *param0); static void ov7_0224C338(UnkStruct_ov7_0224BEFC *param0); -static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC *param0, BGL *param1, u32 param2, u32 param3); +static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC *param0, BgConfig *param1, u32 param2, u32 param3); static void ov7_0224C444(UnkStruct_ov7_0224C3EC *param0); static void ov7_0224C468(UnkStruct_ov7_0224C3EC *param0, Strbuf *param1, u32 param2); static BOOL ov7_0224C4B8(UnkStruct_ov7_0224C3EC *param0); static void ov7_0224C4E0(UnkStruct_ov7_0224C3EC *param0, MessageLoader *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4); static void ov7_0224C580(UnkStruct_ov7_0224C3EC *param0, MessageLoader *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4); -static void ov7_0224C620(UnkStruct_ov7_0224C620 *param0, BGL *param1, MessageLoader *param2, u32 param3); +static void ov7_0224C620(UnkStruct_ov7_0224C620 *param0, BgConfig *param1, MessageLoader *param2, u32 param3); static void ov7_0224C698(UnkStruct_ov7_0224C620 *param0); static void ov7_0224C6DC(UnkStruct_ov7_0224C620 *param0, u32 param1, u32 param2, u32 param3); -static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BGL *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4, MessageLoader *param5, void *param6, UnkFuncPtr_ov7_0224C768 param7, CellActorCollection *param8); +static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BgConfig *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4, MessageLoader *param5, void *param6, UnkFuncPtr_ov7_0224C768 param7, CellActorCollection *param8); static void ov7_0224C934(UnkStruct_ov7_0224C768 *param0); static u32 ov7_0224C9A4(UnkStruct_ov7_0224C768 *param0); static void ov7_0224CA0C(UnkStruct_ov7_0224C768 *param0); @@ -161,17 +161,17 @@ static void ov7_0224CA34(UnkStruct_ov7_0224C768 *param0); static void ov7_0224CA54(CellActorResourceData *param0, UnkStruct_ov7_0224C768 *param1, u32 param2); static void ov7_0224CB40(UnkStruct_ov7_0224C768 *param0); static void ov7_0224CB70(UnkStruct_ov7_0224C768 *param0); -static void ov7_0224CC44(UnkStruct_ov7_0224CC44 *param0, BGL *param1, u32 param2); +static void ov7_0224CC44(UnkStruct_ov7_0224CC44 *param0, BgConfig *param1, u32 param2); static void ov7_0224CC6C(UnkStruct_ov7_0224CC44 *param0); static u32 ov7_0224CC78(UnkStruct_ov7_0224CC44 *param0); -static void ov7_0224CBD0(UnkStruct_ov7_0224CBE4 *param0, UnkStruct_ov7_0224C620 *param1, const UnkStruct_ov7_0224F1B4 *param2, Bag *param3, u32 param4, BGL *param5); +static void ov7_0224CBD0(UnkStruct_ov7_0224CBE4 *param0, UnkStruct_ov7_0224C620 *param1, const UnkStruct_ov7_0224F1B4 *param2, Bag *param3, u32 param4, BgConfig *param5); static void ov7_0224CBE4(void *param0, u32 param1); static BOOL ov7_0224CC88(const UnkStruct_02029D04 *param0, const UnkStruct_ov7_0224F1B4 *param1, u32 param2); static BOOL ov7_0224CCB8(Bag *param0, const UnkStruct_ov7_0224F1B4 *param1, u32 param2, u32 param3); static BOOL ov7_0224CCE4(const UnkStruct_02029D04 *param0, const UnkStruct_ov7_0224F1B4 *param1, u32 param2); static void ov7_0224CCF4(UnkStruct_02029D04 *param0, Bag *param1, const UnkStruct_ov7_0224F1B4 *param2, u32 param3, u32 param4); -UnkStruct_ov7_0224BEFC *ov7_0224BE9C(u32 param0, SaveData *param1, BGL *param2) +UnkStruct_ov7_0224BEFC *ov7_0224BE9C(u32 param0, SaveData *param1, BgConfig *param2) { UnkStruct_ov7_0224BEFC *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov7_0224BEFC)); @@ -388,7 +388,7 @@ static void ov7_0224C3E0(UnkStruct_ov7_0224BEFC *param0) CellActorCollection_Delete(param0->unk_1C); } -static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC *param0, BGL *param1, u32 param2, u32 param3) +static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC *param0, BgConfig *param1, u32 param2, u32 param3) { if (param0->unk_00 == 1) { return; @@ -497,7 +497,7 @@ static void ov7_0224C580(UnkStruct_ov7_0224C3EC *param0, MessageLoader *param1, Strbuf_Free(v0); } -static void ov7_0224C620(UnkStruct_ov7_0224C620 *param0, BGL *param1, MessageLoader *param2, u32 param3) +static void ov7_0224C620(UnkStruct_ov7_0224C620 *param0, BgConfig *param1, MessageLoader *param2, u32 param3) { int v0; @@ -556,7 +556,7 @@ static void ov7_0224C6DC(UnkStruct_ov7_0224C620 *param0, u32 param1, u32 param2, Window_Show(param0->unk_04, 0, (1 + (18 + 12)), 11); } -static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BGL *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4, MessageLoader *param5, void *param6, UnkFuncPtr_ov7_0224C768 param7, CellActorCollection *param8) +static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BgConfig *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4, MessageLoader *param5, void *param6, UnkFuncPtr_ov7_0224C768 param7, CellActorCollection *param8) { int v0; Strbuf *v1; @@ -763,7 +763,7 @@ static void ov7_0224CB70(UnkStruct_ov7_0224C768 *param0) } } -static void ov7_0224CBD0(UnkStruct_ov7_0224CBE4 *param0, UnkStruct_ov7_0224C620 *param1, const UnkStruct_ov7_0224F1B4 *param2, Bag *param3, u32 param4, BGL *param5) +static void ov7_0224CBD0(UnkStruct_ov7_0224CBE4 *param0, UnkStruct_ov7_0224C620 *param1, const UnkStruct_ov7_0224F1B4 *param2, Bag *param3, u32 param4, BgConfig *param5) { param0->unk_04 = param5; param0->unk_08 = param1; @@ -786,7 +786,7 @@ static void ov7_0224CBE4(void *param0, u32 param1) } } -static void ov7_0224CC44(UnkStruct_ov7_0224CC44 *param0, BGL *param1, u32 param2) +static void ov7_0224CC44(UnkStruct_ov7_0224CC44 *param0, BgConfig *param1, u32 param2) { static const UnkStruct_ov61_0222C884 v0 = { 3, diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 9788cd8ae3..4e7135d5de 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -95,7 +95,7 @@ typedef struct UnkStruct_ov10_0221FB28_t { UnkStruct_ov10_0221F800 *unk_00; const UnkFuncPtr_ov10_02222AD0 *unk_04; PaletteData *unk_08; - BGL *unk_0C; + BgConfig *unk_0C; Window unk_10[24]; SpriteRenderer *unk_190; SpriteGfxHandler *unk_194; diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index da10f5e153..00832d5e66 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -122,7 +122,7 @@ typedef struct UnkStruct_ov12_0221FCDC_t { s32 unk_90[10]; UnkFuncPtr_ov12_02239EEC unk_B8; UnkStruct_ov12_02223178 *unk_BC; - BGL *unk_C0; + BgConfig *unk_C0; PaletteData *unk_C4; SpriteGfxHandler *unk_C8[4]; CellActorData *unk_D8[10]; @@ -195,7 +195,7 @@ typedef struct { } UnkStruct_ov12_022224F8; typedef struct UnkStruct_ov12_022222D4_t { - BGL *unk_00; + BgConfig *unk_00; s16 unk_04; s16 unk_06; s16 unk_08; @@ -220,7 +220,7 @@ typedef struct UnkStruct_ov12_0222118C_t { } UnkStruct_ov12_0222118C; typedef struct UnkStruct_ov12_022211D8_t { - BGL *unk_00; + BgConfig *unk_00; UnkStruct_ov12_0222118C_sub1 unk_04; } UnkStruct_ov12_022211D8; @@ -736,7 +736,7 @@ SPLEmitter *ov12_0222026C(UnkStruct_ov12_0221FCDC *param0, int param1) return v0; } -BGL *ov12_02220278(UnkStruct_ov12_0221FCDC *param0) +BgConfig *ov12_02220278(UnkStruct_ov12_0221FCDC *param0) { return param0->unk_C0; } diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c index 55e611b6ed..39930dcc7f 100644 --- a/src/overlay012/ov12_02226B84.c +++ b/src/overlay012/ov12_02226B84.c @@ -317,7 +317,7 @@ typedef struct { int unk_1C; int unk_20; int unk_24; - BGL *unk_28; + BgConfig *unk_28; UnkStruct_ov12_0221FCDC *unk_2C; SpriteGfxHandler *unk_30; UnkStruct_ov12_02235998 unk_34[4]; diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c index 03e7d17c8b..b451a62f33 100644 --- a/src/overlay012/ov12_0222AC70.c +++ b/src/overlay012/ov12_0222AC70.c @@ -169,7 +169,7 @@ typedef struct { u8 unk_02; u8 unk_03; int unk_04; - BGL *unk_08; + BgConfig *unk_08; UnkStruct_ov12_0221FCDC *unk_0C; SpriteGfxHandler *unk_10; UnkStruct_ov12_02235998 unk_14[4]; @@ -183,7 +183,7 @@ typedef struct { u8 unk_02; u8 unk_03; UnkStruct_ov12_02235350 unk_04; - BGL *unk_08; + BgConfig *unk_08; UnkStruct_ov12_0221FCDC *unk_0C; SpriteGfxHandler *unk_10; Sprite *unk_14; diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index c86d574a50..7f76d1ca7d 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -74,7 +74,7 @@ static u8 ov13_02220BA4(SysTask *param0, UnkStruct_ov13_022213F0 *param1); static u8 ov13_0222029C(UnkStruct_ov13_022213F0 *param0); static u8 ov13_0221FFDC(UnkStruct_ov13_022213F0 *param0); static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0); -static void ov13_02220D1C(BGL *param0); +static void ov13_02220D1C(BgConfig *param0); static void ov13_02220D4C(UnkStruct_ov13_022213F0 *param0); static void ov13_02220F08(UnkStruct_ov13_022213F0 *param0); static void ov13_02220F60(UnkStruct_ov13_022213F0 *param0); @@ -1112,7 +1112,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) sub_0201C3C0(param0->unk_1E0, 4); } -static void ov13_02220D1C(BGL *param0) +static void ov13_02220D1C(BgConfig *param0) { GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); sub_02019044(param0, 4); diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 3c2fffc08b..4e8eebc485 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -61,7 +61,7 @@ static u8 ov13_02226D94(UnkStruct_ov13_02227244 *param0); static u8 ov13_02226CD4(UnkStruct_ov13_02227244 *param0); static u8 ov13_02226CFC(SysTask *param0, UnkStruct_ov13_02227244 *param1); static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0); -static void ov13_02226F9C(BGL *param0); +static void ov13_02226F9C(BgConfig *param0); static void ov13_02226FC4(UnkStruct_ov13_02227244 *param0); static void ov13_022270B8(UnkStruct_ov13_02227244 *param0); static void ov13_022270F8(UnkStruct_ov13_02227244 *param0); @@ -713,7 +713,7 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0) sub_0201C3C0(param0->unk_04, 4); } -static void ov13_02226F9C(BGL *param0) +static void ov13_02226F9C(BgConfig *param0) { GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_OBJ, 0); sub_02019044(param0, 4); diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index e68d633ea4..c616ab3400 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -61,7 +61,7 @@ FS_EXTERN_OVERLAY(overlay11); FS_EXTERN_OVERLAY(overlay12); FS_EXTERN_OVERLAY(overlay22); -static void ov17_0223B728(BGL *param0); +static void ov17_0223B728(BgConfig *param0); static void ov17_0223B858(UnkStruct_ov17_02246F24 *param0); static void ov17_0223B884(void); static void ov17_0223B6F0(SysTask *param0, void *param1); @@ -413,7 +413,7 @@ static void ov17_0223B6F0(SysTask *param0, void *param1) sub_02038A1C(21, v0->unk_0C.unk_24); } -static void ov17_0223B728(BGL *param0) +static void ov17_0223B728(BgConfig *param0) { GXLayers_DisableEngineALayers(); diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index 19b3cf87de..aed255bb24 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -55,7 +55,7 @@ FS_EXTERN_OVERLAY(overlay22); static void ov17_0223D0C8(void *param0); static void ov17_0223D164(SysTask *param0, void *param1); -static void ov17_0223D1B8(BGL *param0); +static void ov17_0223D1B8(BgConfig *param0); static void ov17_0223D324(UnkStruct_ov17_02247A48 *param0); static void ov17_0223D390(UnkStruct_ov17_02247A48 *param0); static void ov17_0223D3B8(UnkStruct_ov17_02247A48 *param0, NARC *param1); @@ -406,7 +406,7 @@ static void ov17_0223D164(SysTask *param0, void *param1) sub_02038A1C(22, v0->unk_0C.unk_24); } -static void ov17_0223D1B8(BGL *param0) +static void ov17_0223D1B8(BgConfig *param0) { GXLayers_DisableEngineALayers(); diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 84764ea192..f9e02dcb07 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -64,7 +64,7 @@ FS_EXTERN_OVERLAY(overlay22); static void ov17_0223E09C(void *param0); static void ov17_0223E1FC(SysTask *param0, void *param1); -static void ov17_0223E250(BGL *param0); +static void ov17_0223E250(BgConfig *param0); static void ov17_0223E380(UnkStruct_ov17_0224DF54 *param0); static void ov17_0223E458(UnkStruct_ov17_0224DF54 *param0); static void ov17_0223E4B0(UnkStruct_ov17_0224DF54 *param0, NARC *param1); @@ -566,7 +566,7 @@ static void ov17_0223E1FC(SysTask *param0, void *param1) sub_02038A1C(23, v0->unk_14.unk_60); } -static void ov17_0223E250(BGL *param0) +static void ov17_0223E250(BgConfig *param0) { GXLayers_DisableEngineALayers(); diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index 24ff30eee0..bd63dfecc9 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -109,7 +109,7 @@ void ov17_0223F1E0(GenericPointerData *param0) sub_020242C4(param0); } -void ov17_0223F1E8(int param0, BGL *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) +void ov17_0223F1E8(int param0, BgConfig *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) { UnkStruct_020127E8 v0; Window v1; diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index b4a1b7b6ca..41fe3cf51e 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -197,8 +197,8 @@ static void ov17_022411E4(SysTask *param0, void *param1); static void ov17_02241220(SysTask *param0, void *param1); static void ov17_02240138(UnkStruct_ov17_0223F7E4 *param0, UnkStruct_ov17_02240138 *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov17_02240BF4 *param10); static void ov17_02240260(UnkStruct_ov17_0223F7E4 *param0); -void ov17_0223F80C(BGL *param0); -void ov17_0223F864(BGL *param0); +void ov17_0223F80C(BgConfig *param0); +void ov17_0223F864(BgConfig *param0); void *ov17_0223F88C(UnkStruct_02095C48 *param0, UnkStruct_ov17_0223F88C *param1, UnkStruct_ov17_022472F8 *param2); void ov17_0223F960(UnkStruct_ov17_0223F7E4 *param0); void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void *param3); @@ -540,7 +540,7 @@ static void *ov17_0223F7E4(void) return v0; } -void ov17_0223F80C(BGL *param0) +void ov17_0223F80C(BgConfig *param0) { int v0; @@ -552,7 +552,7 @@ void ov17_0223F80C(BGL *param0) } } -void ov17_0223F864(BGL *param0) +void ov17_0223F864(BgConfig *param0) { int v0; @@ -634,7 +634,7 @@ void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void { const UnkStruct_ov17_02253558 *v0, *v1; int v2; - BGL *v3; + BgConfig *v3; SpriteRenderer *v4; SpriteGfxHandler *v5; @@ -847,7 +847,7 @@ static void ov17_0223FCAC(UnkStruct_ov17_0223F7E4 *param0, int param1, int param static void ov17_0223FF38(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2) { int v0; - BGL *v1; + BgConfig *v1; Strbuf *v2; UnkStruct_ov17_0223FF38 *v3; @@ -953,7 +953,7 @@ static void ov17_02240138(UnkStruct_ov17_0223F7E4 *param0, UnkStruct_ov17_022401 SpriteManagerAllocation v2; int v3; FontOAM *v4; - BGL *v5; + BgConfig *v5; SpriteGfxHandler *v6; int v7, v8; @@ -1096,7 +1096,7 @@ static void ov17_02240388(UnkStruct_ov17_0223F7E4 *param0) static void ov17_022403B0(UnkStruct_ov17_0223F7E4 *param0, const s16 *param1, const UnkStruct_ov17_02253388 *param2, int param3, int param4) { int v0, v1; - BGL *v2; + BgConfig *v2; u16 *v3, *v4; u16 *v5, *v6; int v7; @@ -1169,7 +1169,7 @@ static void ov17_022404FC(UnkStruct_ov17_0223F7E4 *param0) static void ov17_0224051C(SysTask *param0, void *param1) { UnkStruct_ov17_0223F7E4 *v0 = param1; - BGL *v1; + BgConfig *v1; int v2, v3; int v4; @@ -1227,7 +1227,7 @@ static void ov17_0224051C(SysTask *param0, void *param1) static void ov17_02240658(SysTask *param0, void *param1) { UnkStruct_ov17_0223F7E4 *v0 = param1; - BGL *v1; + BgConfig *v1; int v2, v3; int v4, v5, v6; int v7, v8; diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index 2ad0868d7a..bf64c5019d 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -284,7 +284,7 @@ static void *ov17_022492DC(void) return v0; } -void ov17_02249300(BGL *param0) +void ov17_02249300(BgConfig *param0) { int v0; @@ -296,7 +296,7 @@ void ov17_02249300(BGL *param0) } } -void ov17_02249358(BGL *param0) +void ov17_02249358(BgConfig *param0) { int v0; @@ -409,7 +409,7 @@ void ov17_02249640(UnkStruct_ov17_022492DC *param0, int param1, int param2, void { const UnkStruct_ov17_02254578 *v0, *v1; int v2; - BGL *v3; + BgConfig *v3; SpriteRenderer *v4; SpriteGfxHandler *v5; @@ -680,7 +680,7 @@ static void ov17_02249BC4(UnkStruct_ov17_022492DC *param0, UnkStruct_ov17_02249B SpriteManagerAllocation v2; int v3; FontOAM *v4; - BGL *v5; + BgConfig *v5; SpriteGfxHandler *v6; int v7, v8; @@ -807,7 +807,7 @@ static void ov17_02249D80(UnkStruct_ov17_022492DC *param0) static void ov17_02249DA0(SysTask *param0, void *param1) { UnkStruct_ov17_022492DC *v0 = param1; - BGL *v1; + BgConfig *v1; int v2, v3; int v4; diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index 65f0651a60..cc97e4d4ed 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -52,7 +52,7 @@ FS_EXTERN_OVERLAY(overlay22); static void ov17_0224FA24(void *param0); static void ov17_0224FAAC(void *param0); static void ov17_0224FAFC(SysTask *param0, void *param1); -static void ov17_0224FB34(BGL *param0); +static void ov17_0224FB34(BgConfig *param0); static void ov17_0224FCA0(UnkStruct_ov17_0224FCA0 *param0); static void ov17_0224FE1C(UnkStruct_ov17_0224FCA0 *param0); static void ov17_0224FE48(UnkStruct_ov17_0224FCA0 *param0); @@ -407,7 +407,7 @@ static void ov17_0224FAFC(SysTask *param0, void *param1) sub_02038A1C(24, v0->unk_10.unk_20); } -static void ov17_0224FB34(BGL *param0) +static void ov17_0224FB34(BgConfig *param0) { GXLayers_DisableEngineALayers(); diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index 57d96fc99d..a7ef598510 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -61,7 +61,7 @@ struct UnkStruct_ov19_021D61B0_t { UnkStruct_0200C738 unk_1C; NNSG2dImagePaletteProxy unk_1A8; UnkStruct_02007768 *unk_1BC; - BGL *unk_1C0; + BgConfig *unk_1C0; const UnkStruct_ov19_021D4DF0 *unk_1C4; UnkStruct_ov19_021DA384 unk_1C8; UnkStruct_ov19_021D8318 unk_494; diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c index 6435ed1ee7..b741df8196 100644 --- a/src/overlay019/ov19_021D79F8.c +++ b/src/overlay019/ov19_021D79F8.c @@ -104,7 +104,7 @@ static const u16 Unk_ov19_021E0138[] = { 10, }; -BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4) +BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4) { param0->unk_00 = param2->unk_40.unk_00; param0->unk_01 = 11; diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index 253778f103..564fe05d8d 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -55,7 +55,7 @@ static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 p static void ov19_021DB0E4(UnkStruct_ov19_021DA9E0 *param0); static void ov19_021DB24C(UnkStruct_ov19_021DA9E0 *param0, u8 param1); -BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, const MessageLoader *param5, NARC *param6) +BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, const MessageLoader *param5, NARC *param6) { int v0; diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c index f5558a8ae5..8af50daf84 100644 --- a/src/overlay019/ov19_021DB2FC.c +++ b/src/overlay019/ov19_021DB2FC.c @@ -22,14 +22,14 @@ #include "unk_02006E3C.h" #include "unk_0200DA60.h" -static void ov19_021DB4B4(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); +static void ov19_021DB4B4(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); static void ov19_021DB638(UnkStruct_ov19_021DB6F0 *param0, Window *param1, u8 param2, u32 param3); static void ov19_021DB684(UnkStruct_ov19_021DB6F0 *param0, u32 param1); -static void ov19_021DB7BC(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); -static void ov19_021DB84C(BGL *param0, Window *param1); -static void ov19_021DB898(BGL *param0, Window *param1); +static void ov19_021DB7BC(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); +static void ov19_021DB84C(BgConfig *param0, Window *param1); +static void ov19_021DB898(BgConfig *param0, Window *param1); -BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, MessageLoader *param5, const StringTemplate *param6, int param7, NARC *param8) +BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, MessageLoader *param5, const StringTemplate *param6, int param7, NARC *param8) { param0->unk_0C = param1; param0->unk_00 = param3; @@ -118,7 +118,7 @@ void ov19_021DB448(UnkStruct_ov19_021DB6F0 *param0, u32 param1) param0->unk_1C = 1; } -static void ov19_021DB4B4(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) +static void ov19_021DB4B4(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) { u16 *v0; u32 v1, v2; @@ -274,7 +274,7 @@ void ov19_021DB790(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF96 sub_0201ACCC(v0); } -static void ov19_021DB7BC(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) +static void ov19_021DB7BC(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) { u16 *v0; u32 v1; @@ -305,7 +305,7 @@ static void ov19_021DB7BC(BGL *param0, u32 param1, u32 param2, u32 param3, u32 p v0[param4 + 1] = (7 << 12) | (512 + 8); } -static void ov19_021DB84C(BGL *param0, Window *param1) +static void ov19_021DB84C(BgConfig *param0, Window *param1) { u16 *v0; u32 v1, v2, v3, v4; @@ -322,7 +322,7 @@ static void ov19_021DB84C(BGL *param0, Window *param1) } } -static void ov19_021DB898(BGL *param0, Window *param1) +static void ov19_021DB898(BgConfig *param0, Window *param1) { u16 *v0; u32 v1, v2, v3, v4; diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index 2ba919e805..f3c736390a 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -37,7 +37,7 @@ typedef struct { typedef struct { UnkStruct_ov19_021DBA9C *unk_00; - BGL *unk_04; + BgConfig *unk_04; fx32 unk_08; fx32 unk_0C; fx32 unk_10; @@ -67,7 +67,7 @@ static void ov19_021DC4F8(UnkStruct_ov19_021DBA9C *param0, u32 param1); static void ov19_021DC5B8(UnkStruct_ov19_021DBA9C *param0, fx32 param1); static void ov19_021DC5E0(UnkStruct_ov19_021DBA9C *param0); -BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, NARC *param5) +BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, NARC *param5) { int v0; diff --git a/src/overlay019/ov19_021DC5F0.c b/src/overlay019/ov19_021DC5F0.c index 98e525daf4..4eba0324f4 100644 --- a/src/overlay019/ov19_021DC5F0.c +++ b/src/overlay019/ov19_021DC5F0.c @@ -46,7 +46,7 @@ static void ov19_021DCE50(UnkStruct_ov19_021DC680 *param0, fx32 param1); static void ov19_021DCEB8(UnkStruct_ov19_021DC680 *param0, BOOL param1); static void ov19_021DCF50(UnkStruct_ov19_021DC680 *param0); -BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, NARC *param5) +BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, NARC *param5) { param0->unk_00 = param1; param0->unk_0C = param2; diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c index 0de5a2d921..0e2429aa04 100644 --- a/src/overlay019/ov19_021DCF88.c +++ b/src/overlay019/ov19_021DCF88.c @@ -66,7 +66,7 @@ typedef struct { struct UnkStruct_ov19_021DCF88_t { UnkStruct_ov19_021D61B0 *unk_00; const UnkStruct_ov19_021D4DF0 *unk_04; - BGL *unk_08; + BgConfig *unk_08; CellActorCollection *unk_0C; u32 unk_10; SysTask *unk_14; @@ -300,7 +300,7 @@ static const u16 Unk_ov19_021E0264[] = { 0x0 }; -BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4) +BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4) { if (ov19_021D5E08(param2) == 4) { *param0 = NULL; diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c index 7a7fd2dbf1..fd5f23d543 100644 --- a/src/overlay019/ov19_021DE3E8.c +++ b/src/overlay019/ov19_021DE3E8.c @@ -34,7 +34,7 @@ struct UnkStruct_ov19_021DE3E8_t { BOOL unk_00; UnkStruct_ov19_021D61B0 *unk_04; const UnkStruct_ov19_021D4DF0 *unk_08; - BGL *unk_0C; + BgConfig *unk_0C; CellActorCollection *unk_10; UnkStruct_ov19_021DA384 *unk_14; UnkStruct_ov19_021D8E00 *unk_18; @@ -68,7 +68,7 @@ static void ov19_021DE718(UnkStruct_ov19_021DE3E8 *param0, int param1, int param static void ov19_021DE858(UnkStruct_ov19_021DE3E8 *param0, int param1, const VecFx32 *param2, int param3, int param4); static void ov19_021DE8E0(SysTask *param0, void *param1); -BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4) +BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4) { UnkStruct_ov19_021DE3E8 *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DE3E8)); diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c index fb55b40956..76a37a2146 100644 --- a/src/overlay019/ov19_021DEC04.c +++ b/src/overlay019/ov19_021DEC04.c @@ -32,7 +32,7 @@ struct UnkStruct_ov19_021DEC04_t { BOOL unk_00; UnkStruct_ov19_021D61B0 *unk_04; const UnkStruct_ov19_021D4DF0 *unk_08; - BGL *unk_0C; + BgConfig *unk_0C; CellActorCollection *unk_10; UnkStruct_ov19_021DA384 *unk_14; u32 unk_18[2]; @@ -82,7 +82,7 @@ static void ov19_021DF834(UnkStruct_ov19_021DEC04 *param0); static void ov19_021DF8C8(UnkStruct_ov19_021DEC04 *param0, int param1); static void ov19_021DF930(SysTask *param0, void *param1); -BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, MessageLoader *param5, NARC *param6) +BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, MessageLoader *param5, NARC *param6) { if (ov19_021D5E08(param2) != 4) { *param0 = NULL; diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c index 6841f48700..2bd7001f3c 100644 --- a/src/overlay020/ov20_021D2098.c +++ b/src/overlay020/ov20_021D2098.c @@ -40,7 +40,7 @@ typedef struct UnkStruct_ov20_021D2128_t { SysTask *unk_08[4]; const UnkStruct_ov20_021D16E8 *unk_18; const UnkStruct_020998EC *unk_1C; - BGL *unk_20; + BgConfig *unk_20; CellActorCollection *unk_24; UnkStruct_0200C738 unk_28; NNSG2dImageProxy unk_1B4[2]; @@ -953,7 +953,7 @@ u32 ov20_021D2DF4(UnkStruct_ov20_021D2128 *param0) return ov20_021D3574(param0->unk_244); } -BGL *ov20_021D2E04(UnkStruct_ov20_021D2128 *param0) +BgConfig *ov20_021D2E04(UnkStruct_ov20_021D2128 *param0) { return param0->unk_20; } diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c index 51e5d5cf80..0f57d67b16 100644 --- a/src/overlay020/ov20_021D2EA4.c +++ b/src/overlay020/ov20_021D2EA4.c @@ -121,7 +121,7 @@ void ov20_021D2EF0(UnkStruct_ov20_021D30F8 *param0) void ov20_021D2F50(UnkStruct_ov20_021D30F8 *param0, NARC *param1) { - BGL *v0; + BgConfig *v0; u32 v1; v0 = ov20_021D2E04(param0->unk_00); diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c index e1e2c79539..74437f4a6a 100644 --- a/src/overlay020/ov20_021D3864.c +++ b/src/overlay020/ov20_021D3864.c @@ -26,7 +26,7 @@ typedef struct UnkStruct_ov20_021D3980_t { CellActor *unk_0C; } UnkStruct_ov20_021D3980; -static void ov20_021D390C(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u32 param2); +static void ov20_021D390C(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u32 param2); static void ov20_021D3980(UnkStruct_ov20_021D3980 *param0); UnkStruct_ov20_021D3980 *ov20_021D3864(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2) @@ -58,7 +58,7 @@ void ov20_021D3898(UnkStruct_ov20_021D3980 *param0, NARC *param1) static const UnkStruct_ov61_0222C884 v1 = { 3, 19, 6, 10, 2, 13, 84 }; - BGL *v2; + BgConfig *v2; v2 = ov20_021D2E04(param0->unk_00); @@ -72,7 +72,7 @@ void ov20_021D3898(UnkStruct_ov20_021D3980 *param0, NARC *param1) sub_02019448(v2, 3); } -static void ov20_021D390C(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u32 param2) +static void ov20_021D390C(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u32 param2) { Window v0; Strbuf *v1; diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c index 57e550827a..30033262e3 100644 --- a/src/overlay020/ov20_021D3A54.c +++ b/src/overlay020/ov20_021D3A54.c @@ -31,7 +31,7 @@ typedef struct UnkStruct_ov20_021D3E0C_t { UnkStruct_ov20_021D2128 *unk_00; const UnkStruct_ov20_021D16E8 *unk_04; const UnkStruct_020998EC *unk_08; - BGL *unk_0C; + BgConfig *unk_0C; u32 unk_10; u32 unk_14; SysTask *unk_18; @@ -40,9 +40,9 @@ typedef struct UnkStruct_ov20_021D3E0C_t { CellActor *unk_5C; } UnkStruct_ov20_021D3E0C; -static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2); -static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2); -static u32 ov20_021D3D44(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2); +static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 param2); +static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 param2); +static u32 ov20_021D3D44(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 param2); static void ov20_021D3E0C(UnkStruct_ov20_021D3E0C *param0); UnkStruct_ov20_021D3E0C *ov20_021D3A54(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2) @@ -71,7 +71,7 @@ void ov20_021D3A80(UnkStruct_ov20_021D3E0C *param0) void ov20_021D3A98(UnkStruct_ov20_021D3E0C *param0, NARC *param1) { - BGL *v0; + BgConfig *v0; u32 v1; v0 = ov20_021D2E04(param0->unk_00); @@ -97,7 +97,7 @@ void ov20_021D3A98(UnkStruct_ov20_021D3E0C *param0, NARC *param1) sub_02019448(v0, 1); } -static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2) +static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 param2) { int v0, v1, v2; Window v3; @@ -146,7 +146,7 @@ static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param return param2; } -static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2) +static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 param2) { Window v0; Strbuf *v1; @@ -185,7 +185,7 @@ static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param return param2; } -static u32 ov20_021D3D44(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2) +static u32 ov20_021D3D44(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 param2) { static const struct { u16 unk_00; diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c index f32e556236..92f8d84abc 100644 --- a/src/overlay020/ov20_021D40E8.c +++ b/src/overlay020/ov20_021D40E8.c @@ -24,7 +24,7 @@ typedef struct UnkStruct_ov20_021D4210_t { UnkStruct_ov20_021D2128 *unk_00; const UnkStruct_ov20_021D16E8 *unk_04; const UnkStruct_020998EC *unk_08; - BGL *unk_0C; + BgConfig *unk_0C; Window unk_10; Window unk_20; CellActor *unk_30; @@ -90,7 +90,7 @@ void ov20_021D4164(UnkStruct_ov20_021D4210 *param0) void ov20_021D41A8(UnkStruct_ov20_021D4210 *param0) { - BGL *v0; + BgConfig *v0; u32 v1; v0 = ov20_021D2E04(param0->unk_00); diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c index 9a22be4561..34d298e339 100644 --- a/src/overlay020/ov20_021D4728.c +++ b/src/overlay020/ov20_021D4728.c @@ -35,7 +35,7 @@ typedef struct UnkStruct_ov20_021D4AD4_t { UnkStruct_ov20_021D2128 *unk_00; const UnkStruct_ov20_021D16E8 *unk_04; const UnkStruct_020998EC *unk_08; - BGL *unk_0C; + BgConfig *unk_0C; CellActorCollection *unk_10; CellActor *unk_14; CellActor *unk_18; @@ -59,7 +59,7 @@ typedef struct { static void ov20_021D4874(UnkStruct_ov20_021D4AD4 *param0, NARC *param1); static void ov20_021D48C4(UnkStruct_ov20_021D4AD4 *param0, NARC *param1); -static void ov20_021D498C(Window *param0, BGL *param1, const Strbuf *param2, int param3); +static void ov20_021D498C(Window *param0, BgConfig *param1, const Strbuf *param2, int param3); static void ov20_021D4A24(UnkStruct_ov20_021D4AD4 *param0, NARC *param1); static void ov20_021D4AD4(UnkStruct_ov20_021D4AD4 *param0); static void ov20_021D4AF8(UnkStruct_ov20_021D4B2C *param0, NARC *param1, u32 param2, u32 param3); @@ -175,7 +175,7 @@ static const s16 Unk_ov20_021D52EC[] = { (22 + 56 * 3) - 1, }; -static void ov20_021D498C(Window *param0, BGL *param1, const Strbuf *param2, int param3) +static void ov20_021D498C(Window *param0, BgConfig *param1, const Strbuf *param2, int param3) { int v0, v1, v2, v3; u32 v4; diff --git a/src/overlay020/ov20_021D4E38.c b/src/overlay020/ov20_021D4E38.c index f7f0f93d79..be2f286bdb 100644 --- a/src/overlay020/ov20_021D4E38.c +++ b/src/overlay020/ov20_021D4E38.c @@ -15,7 +15,7 @@ static void ov20_021D4ED8(SysTask *param0, void *param1); static void ov20_021D4F74(SysTask *param0, void *param1); static void ov20_021D5018(SysTask *param0, void *param1); -void ov20_021D4E38(UnkStruct_ov20_021D4E8C *param0, BGL *param1, u32 param2, int param3, int param4, int param5) +void ov20_021D4E38(UnkStruct_ov20_021D4E8C *param0, BgConfig *param1, u32 param2, int param3, int param4, int param5) { param0->unk_00 = param1; param0->unk_04 = param2; diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 1cc772761c..150b6e0053 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -610,7 +610,7 @@ void ov21_021D154C(TouchScreenHitTable *hitTable, int param1, int param2, int pa hitTable->rect.right = param4; } -void ov21_021D1558(UnkStruct_ov21_021D157C *param0, BGL *param1, int param2, NNSG2dScreenData *param3, int param4, int param5, int param6, int param7, int param8) +void ov21_021D1558(UnkStruct_ov21_021D157C *param0, BgConfig *param1, int param2, NNSG2dScreenData *param3, int param4, int param5, int param6, int param7, int param8) { param0->unk_00 = param1; param0->unk_08 = param2; diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c index 2e44b4c37e..438123ef99 100644 --- a/src/overlay021/ov21_021D1FA4.c +++ b/src/overlay021/ov21_021D1FA4.c @@ -36,8 +36,8 @@ #include "unk_02012744.h" #include "unk_02015064.h" -static void ov21_021D2830(BGL *param0, int param1); -static void ov21_021D299C(BGL *param0); +static void ov21_021D2830(BgConfig *param0, int param1); +static void ov21_021D299C(BgConfig *param0); static void ov21_021D29D0(UnkStruct_ov21_021D13FC *param0, int param1); static void ov21_021D2A00(UnkStruct_ov21_021D13FC *param0); static void ov21_021D2A0C(UnkStruct_ov21_021D13FC *param0, int param1); @@ -494,7 +494,7 @@ void *ov21_021D26E8(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, u3 return v0; } -u32 ov21_021D2724(UnkStruct_ov21_021D13FC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +u32 ov21_021D2724(UnkStruct_ov21_021D13FC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { void *v0 = ov21_021D26E8(param0, param1, param6, param7); @@ -588,7 +588,7 @@ void *ov21_021D2808(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, NN return v0; } -static void ov21_021D2830(BGL *param0, int param1) +static void ov21_021D2830(BgConfig *param0, int param1) { { BgTemplate v0 = { @@ -726,7 +726,7 @@ static void ov21_021D2830(BGL *param0, int param1) } } -static void ov21_021D299C(BGL *param0) +static void ov21_021D299C(BgConfig *param0) { sub_02019044(param0, 1); sub_02019044(param0, 2); diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c index 98e2460642..e4aaa0f62b 100644 --- a/src/overlay021/ov21_021D4C0C.c +++ b/src/overlay021/ov21_021D4C0C.c @@ -23,7 +23,7 @@ typedef struct UnkStruct_ov21_021D4C0C_t { UnkStruct_02012744 *unk_00; CellActorCollection *unk_04; - BGL *unk_08; + BgConfig *unk_08; UnkStruct_ov21_021D4CA0 *unk_0C; int unk_10; int unk_14; diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index 34f160494c..5cb1a6b585 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -534,7 +534,7 @@ static void ov21_021D7CD8(UnkStruct_ov21_021D77E8 *param0, const UnkStruct_ov21_ { void *v0; NNSG2dScreenData *v1; - BGL *v2 = param0->unk_00->unk_00; + BgConfig *v2 = param0->unk_00->unk_00; ov21_021D276C(param0->unk_00, 0, 4, 0, 0, param2); @@ -758,7 +758,7 @@ static void ov21_021D820C(UnkStruct_ov21_021D77E8 *param0, int param1) { void *v0; NNSG2dScreenData *v1; - BGL *v2 = param0->unk_00->unk_00; + BgConfig *v2 = param0->unk_00->unk_00; ov21_021D2724(param0->unk_00, 27, v2, 7, 0, 0, 1, param1); @@ -773,7 +773,7 @@ static void ov21_021D820C(UnkStruct_ov21_021D77E8 *param0, int param1) static void ov21_021D828C(UnkStruct_ov21_021D77E8 *param0, int param1) { - BGL *v0 = param0->unk_00->unk_00; + BgConfig *v0 = param0->unk_00->unk_00; sub_02019690(7, 64, 0, param1); sub_02019EBC(v0, 7); diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 6cb1933633..503f593ae8 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -69,7 +69,7 @@ typedef struct { } UnkStruct_ov21_021E9A9C; typedef struct UnkStruct_ov21_021E8D48_t { - BGL *unk_00; + BgConfig *unk_00; Window *unk_04; PaletteData *unk_08; Sprite *unk_0C; @@ -95,9 +95,9 @@ static void ov21_021E98F8(PaletteData *param0, Sprite *param1, int param2, int p static BOOL ov21_021E9948(PaletteData *param0, Sprite *param1); static void ov21_021E8E0C(UnkStruct_ov21_021E8D48 *param0, const UnkStruct_ov21_021E8E0C *param1); static void ov21_021E900C(UnkStruct_ov21_021E8D48 *param0); -static void ov21_021E90B0(BGL *param0, int param1); -static void ov21_021E9194(BGL *param0); -static Window *ov21_021E91B0(BGL *param0, int param1); +static void ov21_021E90B0(BgConfig *param0, int param1); +static void ov21_021E9194(BgConfig *param0); +static Window *ov21_021E91B0(BgConfig *param0, int param1); static void ov21_021E91F0(Window *param0); static void ov21_021E9208(SpriteResourceCollection **param0, int param1); static void ov21_021E9228(SpriteResourceCollection **param0); @@ -120,8 +120,8 @@ static void ov21_021E95BC(UnkStruct_ov21_021E968C *param0, SpriteResourceCollect static void ov21_021E95EC(UnkStruct_ov21_021E968C *param0, SpriteResourceCollection **param1); static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, int param4); static void ov21_021E968C(UnkStruct_ov21_021E968C *param0); -static void ov21_021E96A8(BGL *param0, int param1, NARC *param2); -static void ov21_021E97C4(BGL *param0, int param1, NARC *param2); +static void ov21_021E96A8(BgConfig *param0, int param1, NARC *param2); +static void ov21_021E97C4(BgConfig *param0, int param1, NARC *param2); static void ov21_021E9968(Window *param0, int param1, int param2); static void ov21_021E998C(Window *param0, int param1); static void ov21_021E9A0C(int param0); @@ -274,7 +274,7 @@ static void ov21_021E900C(UnkStruct_ov21_021E8D48 *param0) ov21_021E9A38(); } -static void ov21_021E90B0(BGL *param0, int param1) +static void ov21_021E90B0(BgConfig *param0, int param1) { { BgTemplate v0 = { @@ -350,14 +350,14 @@ static void ov21_021E90B0(BGL *param0, int param1) } } -static void ov21_021E9194(BGL *param0) +static void ov21_021E9194(BgConfig *param0) { sub_02019044(param0, 1); sub_02019044(param0, 2); sub_02019044(param0, 3); } -static Window *ov21_021E91B0(BGL *param0, int param1) +static Window *ov21_021E91B0(BgConfig *param0, int param1) { Window *v0; @@ -632,7 +632,7 @@ static void ov21_021E968C(UnkStruct_ov21_021E968C *param0) } } -static void ov21_021E96A8(BGL *param0, int param1, NARC *param2) +static void ov21_021E96A8(BgConfig *param0, int param1, NARC *param2) { void *v0; NNSG2dScreenData *v1; @@ -662,7 +662,7 @@ static void ov21_021E96A8(BGL *param0, int param1, NARC *param2) sub_0201C3C0(param0, 3); } -static void ov21_021E97C4(BGL *param0, int param1, NARC *param2) +static void ov21_021E97C4(BgConfig *param0, int param1, NARC *param2) { void *v0; NNSG2dScreenData *v1; diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c index 738a653290..655939cf2a 100644 --- a/src/overlay022/ov22_02255094.c +++ b/src/overlay022/ov22_02255094.c @@ -311,7 +311,7 @@ void ov22_0225547C(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D ov22_02255BF4(param0, param2); } -void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BGL *param1, int param2) +void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BgConfig *param1, int param2) { param0->unk_40 = param1; diff --git a/src/overlay022/ov22_022597BC.c b/src/overlay022/ov22_022597BC.c index 385cc19527..ae4e5a937d 100644 --- a/src/overlay022/ov22_022597BC.c +++ b/src/overlay022/ov22_022597BC.c @@ -27,7 +27,7 @@ typedef struct { } UnkStruct_ov22_022598F4; typedef struct { - BGL *unk_00; + BgConfig *unk_00; NNSG2dCharacterData *unk_04; void *unk_08; int unk_0C; @@ -45,8 +45,8 @@ typedef struct { static void ov22_02259980(const NNSG2dScreenData *param0, int param1); static void ov22_022599A0(UnkStruct_ov22_022599A0 *param0, int *param1, int *param2); static void ov22_02259A4C(SysTask *param0, void *param1); -static void ov22_02259ABC(BGL *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4, int param5, int param6, int param7, int param8); -static void ov22_02259B3C(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5); +static void ov22_02259ABC(BgConfig *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4, int param5, int param6, int param7, int param8); +static void ov22_02259B3C(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5); static void ov22_02259B8C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); static void ov22_02259BD4(SysTask *param0, void *param1); static void ov22_02259C10(SysTask *param0, void *param1); @@ -219,7 +219,7 @@ static void ov22_02259A4C(SysTask *param0, void *param1) } } -static void ov22_02259ABC(BGL *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4, int param5, int param6, int param7, int param8) +static void ov22_02259ABC(BgConfig *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4, int param5, int param6, int param7, int param8) { ov22_02259980(param2, param7); sub_020198E8(param0, param1, param5, param6, param3, param4, param2->rawData, 0, 0, param3, param4); @@ -227,7 +227,7 @@ static void ov22_02259ABC(BGL *param0, int param1, const NNSG2dScreenData *param sub_0201C3C0(param0, param1); } -static void ov22_02259B3C(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5) +static void ov22_02259B3C(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5) { UnkStruct_ov22_02259B3C *v0; diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c index 32ed79a3c3..bbfbe5788d 100644 --- a/src/overlay022/ov22_0225A428.c +++ b/src/overlay022/ov22_0225A428.c @@ -31,9 +31,9 @@ #include "unk_0200DA60.h" #include "unk_02095AF0.h" -static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BGL *param1); -static void ov22_0225A718(BGL *param0, const Options *param1); -static void ov22_0225A748(Window **param0, BGL *param1, int param2, int param3, int param4, int param5, int param6, BOOL param7); +static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BgConfig *param1); +static void ov22_0225A718(BgConfig *param0, const Options *param1); +static void ov22_0225A748(Window **param0, BgConfig *param1, int param2, int param3, int param4, int param5, int param6, BOOL param7); static void ov22_0225A7B8(UnkStruct_ov22_022597BC *param0); static void ov22_0225A7C0(Window *param0); static s32 ov22_0225A7CC(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6); @@ -43,7 +43,7 @@ static s32 ov22_0225A8B4(Window *param0, int param1, int param2, int param3, int static void ov22_0225A914(UnkStruct_ov22_0225A914 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, NARC *param4); static void ov22_0225A9C8(UnkStruct_ov22_0225A914 *param0, int param1); static void ov22_0225AA10(UnkStruct_ov22_0225A914 *param0, SpriteResourceCollection **param1); -static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, BGL *param4, UnkStruct_02095C60 *param5, NARC *param6); +static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, BgConfig *param4, UnkStruct_02095C60 *param5, NARC *param6); static void ov22_0225AC58(UnkStruct_ov22_0225AB54 *param0, SpriteResourceCollection **param1); static void ov22_0225AC8C(UnkStruct_ov22_0225AB54 *param0); static void ov22_0225AD5C(UnkStruct_ov22_0225AB54 *param0); @@ -173,7 +173,7 @@ BOOL ov22_0225A6D4(const UnkStruct_ov22_0225A428 *param0) return ov22_0225AF34(¶m0->unk_A0.unk_30); } -static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BGL *param1) +static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BgConfig *param1) { UnkStruct_ov22_022599A0 v0; @@ -193,7 +193,7 @@ static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BGL *param1) ov22_022597BC(param0, &v0); } -static void ov22_0225A718(BGL *param0, const Options *param1) +static void ov22_0225A718(BgConfig *param0, const Options *param1) { int v0 = Options_Frame(param1); @@ -201,7 +201,7 @@ static void ov22_0225A718(BGL *param0, const Options *param1) Font_LoadScreenIndicatorsPalette(4, 2 * 32, 14); } -static void ov22_0225A748(Window **param0, BGL *param1, int param2, int param3, int param4, int param5, int param6, BOOL param7) +static void ov22_0225A748(Window **param0, BgConfig *param1, int param2, int param3, int param4, int param5, int param6, BOOL param7) { *param0 = sub_0201A778(14, 1); @@ -376,7 +376,7 @@ static void ov22_0225AAF4(SpriteResource **param0, SpriteResourceCollection **pa sub_020093B4(param2, SpriteResource_GetID(param0[0]), SpriteResource_GetID(param0[1]), SpriteResource_GetID(param0[2]), SpriteResource_GetID(param0[3]), 0xffffffff, 0xffffffff, 0, param3, param1[0], param1[1], param1[2], param1[3], NULL, NULL); } -static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, BGL *param4, UnkStruct_02095C60 *param5, NARC *param6) +static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, BgConfig *param4, UnkStruct_02095C60 *param5, NARC *param6) { CellActorResourceData v0; CellActorInitParams v1; diff --git a/src/overlay022/ov22_0225AF8C.c b/src/overlay022/ov22_0225AF8C.c index 9d648499e1..4a67cc4c8a 100644 --- a/src/overlay022/ov22_0225AF8C.c +++ b/src/overlay022/ov22_0225AF8C.c @@ -56,7 +56,7 @@ typedef struct { const UnkStruct_0202A138 *unk_00; const UnkStruct_0202A150 *unk_04[20]; int unk_54; - BGL *unk_58; + BgConfig *unk_58; int unk_5C; int unk_60; int unk_64; diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index b1147a1e43..e61beb116c 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -138,7 +138,7 @@ typedef struct { typedef struct { FieldSystem *fieldSystem; - BGL *unk_04; + BgConfig *unk_04; MATHRandContext32 unk_08; CellActorCollection *unk_20; UnkStruct_0200C738 unk_24; @@ -177,7 +177,7 @@ typedef struct { u8 unk_A30; } UnkStruct_ov23_02257740; -static void ov23_02240688(BGL *param0); +static void ov23_02240688(BgConfig *param0); static void ov23_0223E434(MATHRandContext16 *param0, int param1); static UnkStruct_ov23_0223E6F8 *ov23_0223E6F8(void); static UnkStruct_ov23_0223E6F8 *ov23_0223E88C(u16 param0, u16 param1); @@ -185,13 +185,13 @@ static void ov23_0223EA38(SysTask *param0, void *param1); static void ov23_0223EE80(UnkStruct_ov23_0223EE80 *param0); static void ov23_0223EF98(void); static void ov23_0223F70C(FieldSystem *fieldSystem); -static void ov23_0223FA3C(BGL *param0, int param1, UnkStruct_ov23_0223EE80 *param2); -static void ov23_0223FF60(int param0, BGL *param1, int param2, UnkStruct_ov23_0223EE80 *param3); -static void ov23_0223FF8C(BGL *param0); -static void ov23_022401B0(BGL *param0); +static void ov23_0223FA3C(BgConfig *param0, int param1, UnkStruct_ov23_0223EE80 *param2); +static void ov23_0223FF60(int param0, BgConfig *param1, int param2, UnkStruct_ov23_0223EE80 *param3); +static void ov23_0223FF8C(BgConfig *param0); +static void ov23_022401B0(BgConfig *param0); static BOOL ov23_02240CFC(UnkStruct_ov23_0223EE80 *param0); -static void ov23_022404C8(BGL *param0); -static void ov23_022404F8(BGL *param0, int param1, int param2, int param3); +static void ov23_022404C8(BgConfig *param0); +static void ov23_022404F8(BgConfig *param0, int param1, int param2, int param3); static BOOL ov23_02240934(UnkStruct_ov23_0223EE80 *param0); static BOOL ov23_022409F0(UnkStruct_ov23_0223EE80 *param0); static BOOL ov23_02240A90(UnkStruct_ov23_0223EE80 *param0); @@ -202,7 +202,7 @@ static void ov23_022411E8(void *param0); static void ov23_022413B4(void); static UnkStruct_ov23_0223E6F8 *ov23_0223E740(int param0, int param1); static void ov23_0223FDE0(UnkStruct_ov23_0223EE80 *param0); -static void ov23_02240B84(BGL *param0); +static void ov23_02240B84(BgConfig *param0); static void ov23_022414D4(void); static void ov23_0223E834(void); @@ -1131,7 +1131,7 @@ int ov23_0223EC30(void) return 3; } -static void ov23_0223EC34(BGL *param0) +static void ov23_0223EC34(BgConfig *param0) { { UnkStruct_02099F80 v0 = { @@ -1293,7 +1293,7 @@ static void ov23_0223ED68(int param0, int param1, BOOL param2, BOOL param3, BOOL static void ov23_0223EE80(UnkStruct_ov23_0223EE80 *param0) { int v0; - BGL *v1; + BgConfig *v1; void *v2; Camera *camera; void *v4; @@ -1339,7 +1339,7 @@ static void ov23_0223EE80(UnkStruct_ov23_0223EE80 *param0) static void ov23_0223EF98(void) { int v0; - BGL *v1; + BgConfig *v1; void *v2; Camera *camera; void *v4; @@ -1850,7 +1850,7 @@ static int ov23_0223FA20(void) return v1; } -static void ov23_0223FA3C(BGL *param0, int param1, UnkStruct_ov23_0223EE80 *param2) +static void ov23_0223FA3C(BgConfig *param0, int param1, UnkStruct_ov23_0223EE80 *param2) { UndergroundData *v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); int v1, v2, v3 = ov23_0223F9C8(); @@ -1919,7 +1919,7 @@ static void ov23_0223FA3C(BGL *param0, int param1, UnkStruct_ov23_0223EE80 *para ov23_0223FF60(v1, param0, param1, param2); } -static int ov23_0223FC9C(int param0, BGL *param1, int param2, UnkStruct_ov23_0223EE80 *param3) +static int ov23_0223FC9C(int param0, BgConfig *param1, int param2, UnkStruct_ov23_0223EE80 *param3) { UnkStruct_ov23_0223FC9C *v0 = &Unk_ov23_02257740->unk_874[param0]; u16 *v1 = sub_02019FE4(param1, 1); @@ -2030,7 +2030,7 @@ static void ov23_0223FDE0(UnkStruct_ov23_0223EE80 *param0) } } -static void ov23_0223FF60(int param0, BGL *param1, int param2, UnkStruct_ov23_0223EE80 *param3) +static void ov23_0223FF60(int param0, BgConfig *param1, int param2, UnkStruct_ov23_0223EE80 *param3) { int v0, v1 = 512 + 24 * 3 + 32 + 1; u32 v2; @@ -2041,7 +2041,7 @@ static void ov23_0223FF60(int param0, BGL *param1, int param2, UnkStruct_ov23_02 } } -static void ov23_0223FF8C(BGL *param0) +static void ov23_0223FF8C(BgConfig *param0) { static const u8 v0 = 8; static const u8 v1 = 5; @@ -2148,7 +2148,7 @@ static void ov23_0223FF8C(BGL *param0) } } -static void ov23_022401B0(BGL *param0) +static void ov23_022401B0(BgConfig *param0) { static u8 v0[] = { 0xe, 0xf, 0x1e, 0x1f }; static u8 v1[] = { 0xa, 0xb, 0x1a, 0x1b }; @@ -2319,7 +2319,7 @@ static UnkStruct_ov23_02256BF8 endPos[] = { 0x4 }; -static void ov23_022404C8(BGL *param0) +static void ov23_022404C8(BgConfig *param0) { u16 *v0; @@ -2330,7 +2330,7 @@ static void ov23_022404C8(BGL *param0) ov23_02240454(v0, Unk_ov23_02256BF4, 0x30, 54); } -static void ov23_022404F8(BGL *param0, int param1, int param2, int param3) +static void ov23_022404F8(BgConfig *param0, int param1, int param2, int param3) { VecFx32 v0; u8 *v1; @@ -2414,7 +2414,7 @@ static void ov23_02240660(VecFx32 *param0) param0->y = FX32_ONE * 16; } -static void ov23_02240688(BGL *param0) +static void ov23_02240688(BgConfig *param0) { VecFx32 v0; int v1 = Unk_ov23_02257740->unk_A2B; @@ -2631,7 +2631,7 @@ static BOOL ov23_02240A90(UnkStruct_ov23_0223EE80 *param0) return 0; } -static void ov23_02240B84(BGL *param0) +static void ov23_02240B84(BgConfig *param0) { int v0, v1, v2; VecFx32 v3; @@ -2660,7 +2660,7 @@ static void ov23_02240B84(BGL *param0) CellActor_SetPosition(Unk_ov23_02257740->unk_24C[1], &v3); } -static void ov23_02240C94(BGL *param0) +static void ov23_02240C94(BgConfig *param0) { int v0, v1, v2; VecFx32 v3; @@ -2860,7 +2860,7 @@ static void ov23_0224119C(void) static void ov23_022411E8(void *param0) { - BGL *v0 = param0; + BgConfig *v0 = param0; ov23_02240C94(v0); diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index 38e386663b..d8b0990cf2 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -60,7 +60,7 @@ #include "unk_020711EC.h" #include "vars_flags.h" -typedef void (*UnkFuncPtr_ov23_02257764)(BGL *); +typedef void (*UnkFuncPtr_ov23_02257764)(BgConfig *); typedef void (*UnkFuncPtr_ov23_02256670)(int, BOOL); typedef void (*UnkFuncPtr_ov23_02256440)(int, BOOL, int); typedef void (*UnkFuncPtr_ov23_022564CC)(int); @@ -264,7 +264,7 @@ typedef struct { u16 unk_08; u16 unk_0A; int unk_0C; - BGL *unk_10; + BgConfig *unk_10; FieldSystem *fieldSystem; u8 unk_18; u8 unk_19; @@ -343,22 +343,22 @@ static void ov23_02245938(int param0, BOOL param1); static UnkStruct_ov23_02243DA8 *ov23_02244EA0(UnkStruct_ov23_02243DA8 *param0); static void ov23_02244D80(FieldSystem *fieldSystem, int param1, int param2, BOOL param3); static void ov23_02244EA4(FieldSystem *fieldSystem, BOOL param1, int param2); -static BOOL ov23_02245064(UnkStruct_ov23_0224271C *param0, BGL *param1, UnkStruct_ov23_022451BC *param2); +static BOOL ov23_02245064(UnkStruct_ov23_0224271C *param0, BgConfig *param1, UnkStruct_ov23_022451BC *param2); static BOOL ov23_022450D4(int param0, int param1, u8 *param2); static void ov23_022451C8(SysTask *param0, void *param1); static void ov23_022451BC(UnkStruct_ov23_022451BC *param0); static void ov23_02245A58(BOOL param0); static void ov23_022462A8(FieldSystem *fieldSystem, BOOL param1, int param2); -static BOOL ov23_02246640(BGL *param0, UnkStruct_ov23_02245ED4 *param1); +static BOOL ov23_02246640(BgConfig *param0, UnkStruct_ov23_02245ED4 *param1); static void ov23_02246324(void); static void ov23_02246370(int param0); static void ov23_0224644C(int param0); static void ov23_022468DC(UnkStruct_ov23_022468DC *param0); static void ov23_02246A80(SysTask *param0, void *param1); -static void ov23_02246CF0(BGL *param0, BOOL param1, int param2); +static void ov23_02246CF0(BgConfig *param0, BOOL param1, int param2); static void ov23_02246D44(UnkStruct_ov23_022468DC *param0); static void ov23_02246E90(int param0, UnkStruct_ov23_022468DC *param1); -static BOOL ov23_02246F20(BGL *param0, UnkStruct_ov23_022468DC *param1); +static BOOL ov23_02246F20(BgConfig *param0, UnkStruct_ov23_022468DC *param1); static void ov23_0224710C(int param0, BOOL param1, int param2); static void ov23_02247138(int param0); static void ov23_02247144(int param0, BOOL param1); @@ -2244,7 +2244,7 @@ static void ov23_02244FD0(int param0, BOOL param1) } } -static BOOL ov23_02245064(UnkStruct_ov23_0224271C *param0, BGL *param1, UnkStruct_ov23_022451BC *param2) +static BOOL ov23_02245064(UnkStruct_ov23_0224271C *param0, BgConfig *param1, UnkStruct_ov23_022451BC *param2) { int v0, v1 = 0; u8 *v2 = sub_02019FE4(param1, 2); @@ -3381,7 +3381,7 @@ static void ov23_02246624(MICResult param0, void *param1) } } -static BOOL ov23_02246640(BGL *param0, UnkStruct_ov23_02245ED4 *param1) +static BOOL ov23_02246640(BgConfig *param0, UnkStruct_ov23_02245ED4 *param1) { int v0; int v1 = 0, v2, v3, v4, v5; @@ -3474,7 +3474,7 @@ static BOOL ov23_02246640(BGL *param0, UnkStruct_ov23_02245ED4 *param1) return 0; } -void ov23_022468A8(BGL *param0) +void ov23_022468A8(BgConfig *param0) { if (Unk_ov23_02257764->unk_304) { Unk_ov23_02257764->unk_304(param0); @@ -3635,7 +3635,7 @@ static void ov23_02246A80(SysTask *param0, void *param1) } } -static void ov23_02246CF0(BGL *param0, BOOL param1, int param2) +static void ov23_02246CF0(BgConfig *param0, BOOL param1, int param2) { int v0; UnkStruct_ov23_022468DC *v1; @@ -3718,7 +3718,7 @@ static void ov23_02246E90(int param0, UnkStruct_ov23_022468DC *param1) } } -static BOOL ov23_02246F20(BGL *param0, UnkStruct_ov23_022468DC *param1) +static BOOL ov23_02246F20(BgConfig *param0, UnkStruct_ov23_022468DC *param1) { int v0; int v1 = 0, v2, v3, v4, v5, v6, v7; @@ -3930,7 +3930,7 @@ static void ov23_022474D4(UnkStruct_ov23_022471D8 *param0) } } -static BOOL ov23_02247568(BGL *param0, UnkStruct_ov23_022471D8 *param1) +static BOOL ov23_02247568(BgConfig *param0, UnkStruct_ov23_022471D8 *param1) { int v0; int v1 = 0, v2, v3, v4, v5, v6; @@ -4246,7 +4246,7 @@ static void ov23_02247A8C(SysTask *param0, void *param1) } } -static void ov23_02247D28(BGL *param0, BOOL param1, int param2) +static void ov23_02247D28(BgConfig *param0, BOOL param1, int param2) { int v0; UnkStruct_ov23_022471D8 *v1; @@ -4343,7 +4343,7 @@ static void ov23_02247E38(UnkStruct_ov23_02247E38 *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static BOOL ov23_02247F4C(BGL *param0, UnkStruct_ov23_02247E38 *param1) +static BOOL ov23_02247F4C(BgConfig *param0, UnkStruct_ov23_02247E38 *param1) { int v0, v1, v2, v3 = 0; float v4; @@ -4542,7 +4542,7 @@ static void ov23_022480C4(SysTask *param0, void *param1) } } -static void ov23_02248318(BGL *param0, BOOL param1, int param2) +static void ov23_02248318(BgConfig *param0, BOOL param1, int param2) { int v0; UnkStruct_ov23_02247E38 *v1; @@ -4664,7 +4664,7 @@ static void ov23_02248418(SysTask *param0, void *param1) } } -static void ov23_0224852C(BGL *param0, BOOL param1, int param2) +static void ov23_0224852C(BgConfig *param0, BOOL param1, int param2) { int v0; UnkStruct_ov23_02248418 *v1; @@ -4715,7 +4715,7 @@ static void ov23_022485A8(int param0, BOOL param1) } } -static BOOL ov23_02248614(BGL *param0, UnkStruct_ov23_02248748 *param1) +static BOOL ov23_02248614(BgConfig *param0, UnkStruct_ov23_02248748 *param1) { int v0, v1; VecFx32 v2; diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c index e0f86968e0..dd30823515 100644 --- a/src/overlay023/ov23_02248F1C.c +++ b/src/overlay023/ov23_02248F1C.c @@ -46,7 +46,7 @@ struct UnkStruct_ov23_0224942C_t { int unk_44[8][3]; int unk_A4[17][4]; FieldSystem *fieldSystem; - BGL *unk_1B8; + BgConfig *unk_1B8; CellActorCollection *unk_1BC; UnkStruct_0200C738 unk_1C0; SpriteResourceCollection *unk_34C[4]; @@ -63,14 +63,14 @@ struct UnkStruct_ov23_0224942C_t { int Unk_ov23_0225776C[8][2]; -static void ov23_0224944C(BGL *param0, Window *param1); +static void ov23_0224944C(BgConfig *param0, Window *param1); static void ov23_02249584(UnkStruct_ov23_0224942C *param0); static void ov23_02249214(PlayerAvatar *const playerAvatar, int param1[][2], int param2[][3]); static void ov23_022491CC(int param0[][2], int param1[][3]); static void ov23_022492C8(int param0[][3], CellActor *param1[]); -static void ov23_0224944C(BGL *param0, Window *param1); -static void ov23_02249438(BGL *param0); -static void ov23_0224966C(BGL *param0, Window *param1, int *param2, int *param3, int *param4, UnkStruct_ov23_02249724 *param5); +static void ov23_0224944C(BgConfig *param0, Window *param1); +static void ov23_02249438(BgConfig *param0); +static void ov23_0224966C(BgConfig *param0, Window *param1, int *param2, int *param3, int *param4, UnkStruct_ov23_02249724 *param5); static void ov23_02249724(UnkStruct_ov23_02249724 *param0); static void ov23_02249778(UnkStruct_ov23_02249724 *param0); static int ov23_02249844(UnkStruct_ov23_02249724 *param0, Strbuf *param1); @@ -84,7 +84,7 @@ static UnkStruct_ov23_0224942C *Unk_ov23_02257768; static void ov23_02248F1C(SysTask *param0, void *param1) { UnkStruct_ov23_0224942C *v0 = param1; - BGL *v1 = v0->unk_1B8; + BgConfig *v1 = v0->unk_1B8; int v2; Unk_ov23_02257768 = v0; @@ -338,13 +338,13 @@ void ov23_0224942C(UnkStruct_ov23_0224942C *param0) } } -static void ov23_02249438(BGL *param0) +static void ov23_02249438(BgConfig *param0) { sub_02019044(param0, 4); sub_02019044(param0, 5); } -static void ov23_0224944C(BGL *param0, Window *param1) +static void ov23_0224944C(BgConfig *param0, Window *param1) { sub_0200F344(1, 0x0); ov23_02249438(param0); @@ -457,7 +457,7 @@ static void ov23_02249584(UnkStruct_ov23_0224942C *param0) sub_0200A640(param0->unk_35C[1]); } -static void ov23_0224966C(BGL *param0, Window *param1, int *param2, int *param3, int *param4, UnkStruct_ov23_02249724 *param5) +static void ov23_0224966C(BgConfig *param0, Window *param1, int *param2, int *param3, int *param4, UnkStruct_ov23_02249724 *param5) { Strbuf *v0; diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index c467d2259f..3c5304b8f6 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -1013,7 +1013,7 @@ static int ov23_0224BD1C(int param0, BOOL param1) return v1; } -static UIControlData *ov23_0224BD90(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4) +static UIControlData *ov23_0224BD90(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4) { UnkStruct_02081CF4 v0; MessageLoader *v1 = ov23_02253E3C(ov23_0224219C()); diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index 082b88be66..58ffe136c7 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -210,7 +210,7 @@ static void ov23_0225381C(SysTask *param0, void *param1) } } -void ov23_02253834(BGL *param0, TrainerInfo *param1, UnkFuncPtr_ov23_02253834 param2, void *param3, BOOL param4) +void ov23_02253834(BgConfig *param0, TrainerInfo *param1, UnkFuncPtr_ov23_02253834 param2, void *param3, BOOL param4) { SecretBaseRecord *v0; MessageLoader *v1; @@ -393,7 +393,7 @@ static void ov23_02253A78(Window *param0, MessageLoader *param1, TrainerInfo *pa StringTemplate_Free(v0); } -void *ov23_02253C64(BGL *param0, TrainerInfo *param1, UndergroundData *param2, UnkFuncPtr_ov23_02253834 param3, void *param4) +void *ov23_02253C64(BgConfig *param0, TrainerInfo *param1, UndergroundData *param2, UnkFuncPtr_ov23_02253834 param3, void *param4) { SecretBaseRecord *v0; MessageLoader *v1; diff --git a/src/overlay023/ov23_02253D40.c b/src/overlay023/ov23_02253D40.c index d343ba1e61..8de4e29af9 100644 --- a/src/overlay023/ov23_02253D40.c +++ b/src/overlay023/ov23_02253D40.c @@ -23,7 +23,7 @@ typedef struct UnkStruct_ov23_02253E2C_t { Strbuf *unk_00; Strbuf *unk_04; Window unk_08; - BGL *unk_18; + BgConfig *unk_18; UnkStruct_ov23_02253F60 unk_1C; SysTask *unk_20; MessageLoader *unk_24; @@ -70,7 +70,7 @@ const UnkStruct_ov84_02240FA8 *ov23_02253D40(void) return &Unk_ov23_022569E0; } -UnkStruct_ov23_02253E2C *ov23_02253D48(int param0, int param1, BGL *param2, int param3, int param4) +UnkStruct_ov23_02253E2C *ov23_02253D48(int param0, int param1, BgConfig *param2, int param3, int param4) { int v0 = param4; UnkStruct_ov23_02253E2C *v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov23_02253E2C)); @@ -121,7 +121,7 @@ void ov23_02253DFC(UnkStruct_ov23_02253E2C *param0, int param1, int param2) } } -void ov23_02253E2C(UnkStruct_ov23_02253E2C *param0, BGL *param1, u16 param2, u16 param3) +void ov23_02253E2C(UnkStruct_ov23_02253E2C *param0, BgConfig *param1, u16 param2, u16 param3) { param0->unk_18 = param1; param0->unk_42 = param2; diff --git a/src/overlay024/ov24_02253CE0.c b/src/overlay024/ov24_02253CE0.c index 65adb48488..7d2371b3ae 100644 --- a/src/overlay024/ov24_02253CE0.c +++ b/src/overlay024/ov24_02253CE0.c @@ -10,7 +10,7 @@ #include "narc.h" #include "unk_02006E3C.h" -void ov24_02253CE0(BGL *param0) +void ov24_02253CE0(BgConfig *param0) { static const BgTemplate v0 = { 0, @@ -54,13 +54,13 @@ void ov24_02253CE0(BGL *param0) GXS_SetVisiblePlane(GX_PLANEMASK_BG0); } -void ov24_02253DA4(BGL *param0) +void ov24_02253DA4(BgConfig *param0) { sub_02019044(param0, 4); Heap_Destroy(8); } -BOOL ov24_02253DB4(BGL *param0) +BOOL ov24_02253DB4(BgConfig *param0) { return 1; } diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index 05fdb7d17e..3178559c5d 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -45,7 +45,7 @@ struct UnkStruct_ov25_02254560_t { UnkStruct_ov25_022555E8 *unk_1CC; SysTask *unk_1D0; UnkStruct_ov25_02254DD8 unk_1D4; - BGL *unk_1F8; + BgConfig *unk_1F8; PoketchSystem *poketchSys; u16 unk_200[256]; u16 unk_400[16]; @@ -139,7 +139,7 @@ UnkStruct_ov25_022555E8 *ov25_02254664(void) return v0->unk_1CC; } -BGL *ov25_02254674(void) +BgConfig *ov25_02254674(void) { UnkStruct_ov25_02254560 *v0 = ov25_02254418(); return v0->unk_1F8; diff --git a/src/overlay025/ov25_02255090.c b/src/overlay025/ov25_02255090.c index 35885d2476..359821ecb0 100644 --- a/src/overlay025/ov25_02255090.c +++ b/src/overlay025/ov25_02255090.c @@ -294,7 +294,7 @@ void ov25_022553A0(u32 param0, const u32 *param1, u32 param2, BOOL param3) } } -void ov25_02255440(BGL *param0, u32 param1, u32 param2) +void ov25_02255440(BgConfig *param0, u32 param1, u32 param2) { u16 v0[4]; u32 v1; diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c index 44d59702aa..bc205fbc8b 100644 --- a/src/overlay025/poketch_system.c +++ b/src/overlay025/poketch_system.c @@ -117,7 +117,7 @@ static PoketchSystem *PoketchSystem_GetFromFieldSystem(void) return FieldSystem_GetPoketchSystem(); } -void PoketchSystem_Create(FieldSystem *fieldSystem, PoketchSystem **poketchSys, SaveData *saveData, BGL *bgl, NNSG2dOamManagerInstance *oamManager) +void PoketchSystem_Create(FieldSystem *fieldSystem, PoketchSystem **poketchSys, SaveData *saveData, BgConfig *bgl, NNSG2dOamManagerInstance *oamManager) { Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_POKETCH_MAIN, HEAP_SIZE_POKETCH_MAIN); Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_POKETCH_APP, HEAP_SIZE_POKETCH_APP); diff --git a/src/overlay026/ov26_022561C0.c b/src/overlay026/ov26_022561C0.c index 30230085d2..4b242f7747 100644 --- a/src/overlay026/ov26_022561C0.c +++ b/src/overlay026/ov26_022561C0.c @@ -34,8 +34,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov26_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov26_0225621C(UnkStruct_ov26_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov26_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov26_0225621C(UnkStruct_ov26_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov26_022562A4(UnkStruct_ov26_0225621C *param0); static void ov26_022562BC(SysTask *param0, void *param1); static void ov26_022562F8(void *param0); @@ -54,7 +54,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov26_022561D4, ov26_022562F8); } -static BOOL ov26_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov26_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov26_0225621C *v0 = (UnkStruct_ov26_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov26_0225621C)); @@ -72,7 +72,7 @@ static BOOL ov26_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov26_0225621C(UnkStruct_ov26_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov26_0225621C(UnkStruct_ov26_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { if (ov26_02256404(&(param0->unk_24), &(param0->unk_14), param2)) { param0->unk_00 = 0; diff --git a/src/overlay026/ov26_02256404.c b/src/overlay026/ov26_02256404.c index 90c2da2cc4..5031d6d579 100644 --- a/src/overlay026/ov26_02256404.c +++ b/src/overlay026/ov26_02256404.c @@ -17,7 +17,7 @@ struct UnkStruct_ov26_02256404_t { const UnkStruct_ov26_02256404_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; u16 unk_30[360]; }; @@ -30,7 +30,7 @@ static void ov26_022565AC(SysTask *param0, void *param1); static void ov26_022565D8(SysTask *param0, void *param1); static void ov26_022565F4(UnkStruct_ov26_02256404 *param0); -BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_02256404_1 *param1, BGL *param2) +BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_02256404_1 *param1, BgConfig *param2) { UnkStruct_ov26_02256404 *v0 = (UnkStruct_ov26_02256404 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov26_02256404)); diff --git a/src/overlay027/ov27_022561C0.c b/src/overlay027/ov27_022561C0.c index 00cd54e7d5..e4a7377089 100644 --- a/src/overlay027/ov27_022561C0.c +++ b/src/overlay027/ov27_022561C0.c @@ -45,8 +45,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov27_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov27_0225621C(UnkStruct_ov27_0225621C *param0, BGL *param1, u32 param2); +static BOOL ov27_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov27_0225621C(UnkStruct_ov27_0225621C *param0, BgConfig *param1, u32 param2); static void ov27_022562AC(UnkStruct_ov27_0225621C *param0); static void ov27_022562FC(SysTask *param0, void *param1); static void ov27_02256358(void *param0); @@ -70,7 +70,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov27_022561D4, ov27_02256358); } -static BOOL ov27_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov27_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov27_0225621C *v0 = (UnkStruct_ov27_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225621C)); @@ -91,7 +91,7 @@ static BOOL ov27_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov27_0225621C(UnkStruct_ov27_0225621C *param0, BGL *param1, u32 param2) +static BOOL ov27_0225621C(UnkStruct_ov27_0225621C *param0, BgConfig *param1, u32 param2) { param0->unk_08 = param2; diff --git a/src/overlay027/ov27_0225680C.c b/src/overlay027/ov27_0225680C.c index 044bfebb9c..2bc19cd14b 100644 --- a/src/overlay027/ov27_0225680C.c +++ b/src/overlay027/ov27_0225680C.c @@ -30,7 +30,7 @@ typedef struct { struct UnkStruct_ov27_0225680C_t { const UnkStruct_ov27_0225680C_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; NNSG2dOamManagerInstance *unk_30; UnkStruct_ov25_02255958 unk_34; @@ -55,12 +55,12 @@ static void ov27_02256D00(SysTask *param0, void *param1); static void ov27_02256D80(SysTask *param0, void *param1); static void ov27_02256E1C(SysTask *param0, void *param1); static BOOL ov27_02256E90(UnkStruct_ov27_02256E90 *param0, u32 param1); -static void ov27_02256EC4(BGL *param0, u32 param1); +static void ov27_02256EC4(BgConfig *param0, u32 param1); static void ov27_02256F24(SysTask *param0, void *param1); static void ov27_02256F7C(UnkStruct_ov27_0225680C *param0); struct PoketchSystem *FieldSystem_GetPoketchSystem(void); -BOOL ov27_0225680C(UnkStruct_ov27_0225680C **param0, const UnkStruct_ov27_0225680C_1 *param1, BGL *param2) +BOOL ov27_0225680C(UnkStruct_ov27_0225680C **param0, const UnkStruct_ov27_0225680C_1 *param1, BgConfig *param2) { UnkStruct_ov27_0225680C *v0 = (UnkStruct_ov27_0225680C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225680C)); @@ -535,7 +535,7 @@ static BOOL ov27_02256E90(UnkStruct_ov27_02256E90 *param0, u32 param1) return 0; } -static void ov27_02256EC4(BGL *param0, u32 param1) +static void ov27_02256EC4(BgConfig *param0, u32 param1) { u16 *v0; u32 v1, v2; diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index a67e276d6f..d3292057d7 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -39,8 +39,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov28_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov28_02256210(UnkStruct_ov28_02256210 *param0, u32 param1, BGL *param2); +static BOOL ov28_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov28_02256210(UnkStruct_ov28_02256210 *param0, u32 param1, BgConfig *param2); static void ov28_02256298(UnkStruct_ov28_02256210 *param0); static void ov28_022562CC(SysTask *param0, void *param1); static void ov28_02256324(void *param0); @@ -82,7 +82,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov28_022561D4, ov28_02256324); } -static BOOL ov28_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov28_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov28_02256210 *v0 = (UnkStruct_ov28_02256210 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_02256210)); @@ -99,7 +99,7 @@ static BOOL ov28_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov28_02256210(UnkStruct_ov28_02256210 *param0, u32 param1, BGL *param2) +static BOOL ov28_02256210(UnkStruct_ov28_02256210 *param0, u32 param1, BgConfig *param2) { if (ov28_0225697C(&(param0->unk_14), &(param0->unk_18), param2)) { param0->unk_00 = 0; diff --git a/src/overlay028/ov28_0225697C.c b/src/overlay028/ov28_0225697C.c index 6a8a8e9d44..c637a8655e 100644 --- a/src/overlay028/ov28_0225697C.c +++ b/src/overlay028/ov28_0225697C.c @@ -19,7 +19,7 @@ struct UnkStruct_ov28_0225697C_t { const UnkStruct_ov28_0225697C_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; u16 unk_30[14]; u16 unk_4C[17][32]; @@ -37,10 +37,10 @@ static void ov28_02256CA0(SysTask *param0, void *param1); static void ov28_02256CE0(SysTask *param0, void *param1); static void ov28_02256D20(SysTask *param0, void *param1); static void ov28_02256D64(SysTask *param0, void *param1); -static void ov28_02256D90(BGL *param0, const UnkStruct_ov28_0225697C_1 *param1); -static void ov28_02256DCC(BGL *param0); +static void ov28_02256D90(BgConfig *param0, const UnkStruct_ov28_0225697C_1 *param1); +static void ov28_02256DCC(BgConfig *param0); static void ov28_02256DF0(SysTask *param0, void *param1); -static void ov28_02256E0C(BGL *param0, const u16 *param1); +static void ov28_02256E0C(BgConfig *param0, const u16 *param1); struct PoketchSystem *FieldSystem_GetPoketchSystem(void); static const u16 Unk_ov28_022578F8[32] = { @@ -457,7 +457,7 @@ static const struct { { 0x10, 0x6, 0x8, 0x4 } }; -BOOL ov28_0225697C(UnkStruct_ov28_0225697C **param0, const UnkStruct_ov28_0225697C_1 *param1, BGL *param2) +BOOL ov28_0225697C(UnkStruct_ov28_0225697C **param0, const UnkStruct_ov28_0225697C_1 *param1, BgConfig *param2) { UnkStruct_ov28_0225697C *v0 = (UnkStruct_ov28_0225697C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_0225697C)); @@ -713,7 +713,7 @@ static void ov28_02256D64(SysTask *param0, void *param1) ov28_022569F4(param1); } -static void ov28_02256D90(BGL *param0, const UnkStruct_ov28_0225697C_1 *param1) +static void ov28_02256D90(BgConfig *param0, const UnkStruct_ov28_0225697C_1 *param1) { u16 *v0; @@ -727,7 +727,7 @@ static void ov28_02256D90(BGL *param0, const UnkStruct_ov28_0225697C_1 *param1) } } -static void ov28_02256DCC(BGL *param0) +static void ov28_02256DCC(BgConfig *param0) { u16 *v0 = sub_02019FE4(param0, 6); ov25_02255258(v0, 3, 3, 32, 41, 40, 0); @@ -742,7 +742,7 @@ static void ov28_02256DF0(SysTask *param0, void *param1) ov28_022569F4(param1); } -static void ov28_02256E0C(BGL *param0, const u16 *param1) +static void ov28_02256E0C(BgConfig *param0, const u16 *param1) { u32 v0, v1, v2; u16 *v3; diff --git a/src/overlay029/ov29_022561C0.c b/src/overlay029/ov29_022561C0.c index ed7e4d6d4b..be7ac50d00 100644 --- a/src/overlay029/ov29_022561C0.c +++ b/src/overlay029/ov29_022561C0.c @@ -28,8 +28,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov29_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov29_0225621C(UnkStruct_ov29_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov29_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov29_0225621C(UnkStruct_ov29_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov29_02256288(UnkStruct_ov29_0225621C *param0); static void ov29_022562AC(SysTask *param0, void *param1); static void ov29_022562F4(u32 param0, u32 param1, u32 param2, void *param3); @@ -52,7 +52,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov29_022561D4, ov29_02256324); } -static BOOL ov29_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov29_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov29_0225621C *v0 = (UnkStruct_ov29_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_0225621C)); @@ -70,7 +70,7 @@ static BOOL ov29_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov29_0225621C(UnkStruct_ov29_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov29_0225621C(UnkStruct_ov29_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { memset(param0->unk_08.unk_0C, 0, sizeof(u8) * (78 * 75)); diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c index 82ffbe131d..b10ea7dab7 100644 --- a/src/overlay029/ov29_022566C8.c +++ b/src/overlay029/ov29_022566C8.c @@ -24,7 +24,7 @@ struct UnkStruct_ov29_022566C8_t { const UnkStruct_ov29_022566C8_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[18]; UnkStruct_ov25_022555E8 *unk_50; UnkStruct_ov25_02255958 unk_54; @@ -43,7 +43,7 @@ static void ov29_02256A94(SysTask *param0, void *param1); static void ov29_02256ABC(UnkStruct_ov29_022566C8 *param0); static void ov29_02256B18(UnkStruct_ov29_022566C8 *param0); -BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566C8_1 *param1, BGL *param2) +BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566C8_1 *param1, BgConfig *param2) { UnkStruct_ov29_022566C8 *v0 = (UnkStruct_ov29_022566C8 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_022566C8)); diff --git a/src/overlay030/ov30_022561C0.c b/src/overlay030/ov30_022561C0.c index e1410c3bc4..12f44307cd 100644 --- a/src/overlay030/ov30_022561C0.c +++ b/src/overlay030/ov30_022561C0.c @@ -33,8 +33,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov30_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov30_0225621C(UnkStruct_ov30_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov30_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov30_0225621C(UnkStruct_ov30_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov30_02256298(UnkStruct_ov30_0225621C *param0); static void ov30_022562B0(SysTask *param0, void *param1); static void ov30_022562EC(void *param0); @@ -53,7 +53,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov30_022561D4, ov30_022562EC); } -static BOOL ov30_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov30_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov30_0225621C *v0 = (UnkStruct_ov30_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_0225621C)); @@ -71,7 +71,7 @@ static BOOL ov30_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov30_0225621C(UnkStruct_ov30_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov30_0225621C(UnkStruct_ov30_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { if (ov30_022563EC(&(param0->unk_24), &(param0->unk_14), param2)) { param0->unk_00 = 0; diff --git a/src/overlay030/ov30_022563EC.c b/src/overlay030/ov30_022563EC.c index e33c2242e5..5f38f9af97 100644 --- a/src/overlay030/ov30_022563EC.c +++ b/src/overlay030/ov30_022563EC.c @@ -23,7 +23,7 @@ struct UnkStruct_ov30_022563EC_t { const UnkStruct_ov30_022563EC_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; SysTask *unk_30; UnkStruct_ov25_02255958 unk_34; @@ -41,7 +41,7 @@ static void ov30_022565B0(UnkStruct_ov30_022563EC *param0); static BOOL ov30_022565F4(UnkStruct_ov30_022563EC *param0); static void ov30_02256658(UnkStruct_ov30_022563EC *param0); -BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563EC_1 *param1, BGL *param2) +BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563EC_1 *param1, BgConfig *param2) { UnkStruct_ov30_022563EC *v0 = (UnkStruct_ov30_022563EC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_022563EC)); diff --git a/src/overlay031/ov31_022561C0.c b/src/overlay031/ov31_022561C0.c index ce22173bca..6bf8af7f10 100644 --- a/src/overlay031/ov31_022561C0.c +++ b/src/overlay031/ov31_022561C0.c @@ -29,8 +29,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov31_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov31_02256228(UnkStruct_ov31_02256228 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov31_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov31_02256228(UnkStruct_ov31_02256228 *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov31_02256268(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1); static inline u8 inline_ov31_02256298(const u8 *param0, int param1); static inline void inline_ov31_022562EC(u8 *param0, int param1, int param2); @@ -51,7 +51,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov31_022561D4, ov31_02256404); } -static BOOL ov31_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov31_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov31_02256228 *v0 = (UnkStruct_ov31_02256228 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256228)); @@ -70,7 +70,7 @@ static BOOL ov31_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov31_02256228(UnkStruct_ov31_02256228 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov31_02256228(UnkStruct_ov31_02256228 *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { param0->poketchSys = poketchSys; ov31_02256268(param0, &(param0->unk_0C)); diff --git a/src/overlay031/ov31_02256554.c b/src/overlay031/ov31_02256554.c index ab3bd30a9c..c7749dbbb0 100644 --- a/src/overlay031/ov31_02256554.c +++ b/src/overlay031/ov31_02256554.c @@ -16,18 +16,18 @@ struct UnkStruct_ov31_02256554_t { const UnkStruct_ov31_02256554_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; }; static void ov31_022565CC(UnkStruct_ov25_02255224 *param0); static void ov31_022565E0(SysTask *param0, void *param1); -static void ov31_02256644(BGL *param0); +static void ov31_02256644(BgConfig *param0); static void ov31_022566EC(SysTask *param0, void *param1); static void ov31_02256710(SysTask *param0, void *param1); -static void ov31_0225672C(BGL *param0, const UnkStruct_ov31_02256554_1 *param1); +static void ov31_0225672C(BgConfig *param0, const UnkStruct_ov31_02256554_1 *param1); -BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_02256554_1 *param1, BGL *param2) +BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_02256554_1 *param1, BgConfig *param2) { UnkStruct_ov31_02256554 *v0 = (UnkStruct_ov31_02256554 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256554)); @@ -116,7 +116,7 @@ static void ov31_022565E0(SysTask *param0, void *param1) ov31_022565CC(param1); } -static void ov31_02256644(BGL *param0) +static void ov31_02256644(BgConfig *param0) { u8 *v0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20 * 16); @@ -153,7 +153,7 @@ static void ov31_02256710(SysTask *param0, void *param1) ov31_022565CC(param1); } -static void ov31_0225672C(BGL *param0, const UnkStruct_ov31_02256554_1 *param1) +static void ov31_0225672C(BgConfig *param0, const UnkStruct_ov31_02256554_1 *param1) { static const u8 v0[] = { 4, 15, 8, 1 diff --git a/src/overlay032/ov32_022561C0.c b/src/overlay032/ov32_022561C0.c index 1c563c609e..b3c3c08384 100644 --- a/src/overlay032/ov32_022561C0.c +++ b/src/overlay032/ov32_022561C0.c @@ -29,8 +29,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov32_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov32_0225621C(UnkStruct_ov32_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov32_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov32_0225621C(UnkStruct_ov32_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov32_02256264(UnkStruct_ov32_0225621C *param0); static void ov32_02256278(SysTask *param0, void *param1); static void ov32_022562AC(void *param0); @@ -45,7 +45,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov32_022561D4, ov32_022562AC); } -static BOOL ov32_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov32_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov32_0225621C *v0 = (UnkStruct_ov32_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov32_0225621C)); @@ -63,7 +63,7 @@ static BOOL ov32_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov32_0225621C(UnkStruct_ov32_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov32_0225621C(UnkStruct_ov32_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { if (ov32_02256470(&(param0->unk_74), &(param0->unk_04), param2)) { param0->unk_00 = 0; diff --git a/src/overlay032/ov32_02256470.c b/src/overlay032/ov32_02256470.c index c28d4eab86..6afc19cc76 100644 --- a/src/overlay032/ov32_02256470.c +++ b/src/overlay032/ov32_02256470.c @@ -41,7 +41,7 @@ typedef struct { struct UnkStruct_ov32_02256470_t { const UnkStruct_ov32_02256470_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; UnkStruct_ov25_022555E8 *unk_08; u32 unk_0C[10]; u32 unk_34; @@ -82,7 +82,7 @@ static const struct { { 0xA0, 0x84 } }; -BOOL ov32_02256470(UnkStruct_ov32_02256470 **param0, const UnkStruct_ov32_02256470_1 *param1, BGL *param2) +BOOL ov32_02256470(UnkStruct_ov32_02256470 **param0, const UnkStruct_ov32_02256470_1 *param1, BgConfig *param2) { UnkStruct_ov32_02256470 *v0 = (UnkStruct_ov32_02256470 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov32_02256470)); diff --git a/src/overlay033/ov33_022561C0.c b/src/overlay033/ov33_022561C0.c index 8fc7043cf1..e12b6fef32 100644 --- a/src/overlay033/ov33_022561C0.c +++ b/src/overlay033/ov33_022561C0.c @@ -30,8 +30,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov33_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov33_0225621C(UnkStruct_ov33_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov33_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov33_0225621C(UnkStruct_ov33_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static u32 ov33_0225630C(u32 param0); static void ov33_0225632C(UnkStruct_ov33_0225621C *param0); static void ov33_02256340(SysTask *param0, void *param1); @@ -46,7 +46,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov33_022561D4, ov33_02256374); } -static BOOL ov33_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov33_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov33_0225621C *v0 = (UnkStruct_ov33_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_0225621C)); @@ -64,7 +64,7 @@ static BOOL ov33_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov33_0225621C(UnkStruct_ov33_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov33_0225621C(UnkStruct_ov33_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { if (ov33_02256474(&(param0->unk_5C), &(param0->unk_04), param2)) { param0->unk_00 = 0; diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c index b01700feed..2952fd3e7f 100644 --- a/src/overlay033/ov33_02256474.c +++ b/src/overlay033/ov33_02256474.c @@ -52,7 +52,7 @@ typedef struct { struct UnkStruct_ov33_02256474_t { const UnkStruct_ov33_02256474_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; UnkStruct_ov25_022555E8 *unk_30; UnkStruct_ov25_02255958 unk_34; @@ -114,7 +114,7 @@ static void ov33_022570E8(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_ static void ov33_0225718C(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2); static void ov33_022572A0(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1); -BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_02256474_1 *param1, BGL *param2) +BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_02256474_1 *param1, BgConfig *param2) { UnkStruct_ov33_02256474 *v0 = (UnkStruct_ov33_02256474 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_02256474)); diff --git a/src/overlay034/ov34_022561C0.c b/src/overlay034/ov34_022561C0.c index d7d472d0ff..f67d5e2d38 100644 --- a/src/overlay034/ov34_022561C0.c +++ b/src/overlay034/ov34_022561C0.c @@ -28,8 +28,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov34_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov34_0225621C(UnkStruct_ov34_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov34_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov34_0225621C(UnkStruct_ov34_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov34_02256244(UnkStruct_ov34_0225621C *param0); static void ov34_02256260(SysTask *param0, void *param1); static void ov34_02256294(void *param0); @@ -46,7 +46,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov34_022561D4, ov34_02256294); } -static BOOL ov34_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov34_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov34_0225621C *v0 = (UnkStruct_ov34_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_0225621C)); @@ -64,7 +64,7 @@ static BOOL ov34_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov34_0225621C(UnkStruct_ov34_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov34_0225621C(UnkStruct_ov34_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { if (ov34_02256540(&(param0->unk_48), &(param0->unk_04), param2)) { param0->unk_00 = 0; diff --git a/src/overlay034/ov34_02256540.c b/src/overlay034/ov34_02256540.c index 21c8399940..f77f99dd13 100644 --- a/src/overlay034/ov34_02256540.c +++ b/src/overlay034/ov34_02256540.c @@ -22,7 +22,7 @@ struct UnkStruct_ov34_02256540_t { const UnkStruct_ov34_02256540_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; UnkStruct_ov25_022555E8 *unk_30; UnkStruct_ov25_022558C4 *unk_34; @@ -45,7 +45,7 @@ static void ov34_022569A0(UnkStruct_ov34_02256540 *param0, const UnkStruct_ov34_ static BOOL ov34_022569DC(UnkStruct_ov34_02256540 *param0); static void ov34_022569E8(UnkStruct_ov34_02256540 *param0); -BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const UnkStruct_ov34_02256540_1 *param1, BGL *param2) +BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const UnkStruct_ov34_02256540_1 *param1, BgConfig *param2) { UnkStruct_ov34_02256540 *v0 = (UnkStruct_ov34_02256540 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_02256540)); diff --git a/src/overlay035/ov35_022561C0.c b/src/overlay035/ov35_022561C0.c index 2677c54180..ca51dbf9bc 100644 --- a/src/overlay035/ov35_022561C0.c +++ b/src/overlay035/ov35_022561C0.c @@ -29,8 +29,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov35_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov35_0225621C(UnkStruct_ov35_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov35_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov35_0225621C(UnkStruct_ov35_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov35_02256284(u32 param0, u32 param1, u32 param2, void *param3); static void ov35_0225628C(UnkStruct_ov35_0225621C *param0); static void ov35_022562B0(SysTask *param0, void *param1); @@ -45,7 +45,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov35_022561D4, ov35_022562EC); } -static BOOL ov35_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov35_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov35_0225621C *v0 = (UnkStruct_ov35_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_0225621C)); @@ -63,7 +63,7 @@ static BOOL ov35_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov35_0225621C(UnkStruct_ov35_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov35_0225621C(UnkStruct_ov35_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { 128 - (56 / 2), diff --git a/src/overlay035/ov35_02256410.c b/src/overlay035/ov35_02256410.c index 0d936f546f..6ab6f3e1aa 100644 --- a/src/overlay035/ov35_02256410.c +++ b/src/overlay035/ov35_02256410.c @@ -23,7 +23,7 @@ struct UnkStruct_ov35_02256410_t { const UnkStruct_ov35_02256410_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24; @@ -41,7 +41,7 @@ static void ov35_02256644(SysTask *param0, void *param1); static void ov35_02256684(SysTask *param0, void *param1); static void ov35_022566A8(UnkStruct_ov35_02256410 *param0, const UnkStruct_ov35_02256410_1 *param1); -BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_02256410_1 *param1, BGL *param2) +BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_02256410_1 *param1, BgConfig *param2) { UnkStruct_ov35_02256410 *v0 = (UnkStruct_ov35_02256410 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_02256410)); diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index 84f5641405..d6e7a1aefe 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/src/overlay036/ov36_022561C0.c @@ -27,8 +27,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov36_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov36_0225621C(UnkStruct_ov36_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov36_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov36_0225621C(UnkStruct_ov36_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov36_02256278(u32 param0, u32 param1, u32 param2, void *param3); static void ov36_02256280(UnkStruct_ov36_0225621C *param0); static void ov36_02256298(SysTask *param0, void *param1); @@ -43,7 +43,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov36_022561D4, ov36_022562D4); } -static BOOL ov36_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov36_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov36_0225621C *v0 = (UnkStruct_ov36_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_0225621C)); @@ -61,7 +61,7 @@ static BOOL ov36_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov36_0225621C(UnkStruct_ov36_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov36_0225621C(UnkStruct_ov36_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { 128 - (56 / 2), diff --git a/src/overlay036/ov36_02256404.c b/src/overlay036/ov36_02256404.c index 4a6519bb46..1421a80624 100644 --- a/src/overlay036/ov36_02256404.c +++ b/src/overlay036/ov36_02256404.c @@ -20,7 +20,7 @@ struct UnkStruct_ov36_02256404_t { const UnkStruct_ov36_02256404_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24; @@ -38,7 +38,7 @@ static void ov36_02256638(SysTask *param0, void *param1); static void ov36_02256678(SysTask *param0, void *param1); static void ov36_0225669C(UnkStruct_ov36_02256404 *param0, const UnkStruct_ov36_02256404_1 *param1); -BOOL ov36_02256404(UnkStruct_ov36_02256404 **param0, const UnkStruct_ov36_02256404_1 *param1, BGL *param2) +BOOL ov36_02256404(UnkStruct_ov36_02256404 **param0, const UnkStruct_ov36_02256404_1 *param1, BgConfig *param2) { UnkStruct_ov36_02256404 *v0 = (UnkStruct_ov36_02256404 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_02256404)); diff --git a/src/overlay037/ov37_022561C0.c b/src/overlay037/ov37_022561C0.c index 71439553ac..6c22e07d82 100644 --- a/src/overlay037/ov37_022561C0.c +++ b/src/overlay037/ov37_022561C0.c @@ -28,8 +28,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov37_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov37_0225621C(UnkStruct_ov37_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov37_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov37_0225621C(UnkStruct_ov37_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov37_02256280(UnkStruct_ov37_0225621C *param0); static void ov37_02256298(u32 param0, u32 param1, u32 param2, void *param3); static void ov37_022562A0(SysTask *param0, void *param1); @@ -44,7 +44,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov37_022561D4, ov37_022562DC); } -static BOOL ov37_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov37_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov37_0225621C *v0 = (UnkStruct_ov37_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_0225621C)); @@ -62,7 +62,7 @@ static BOOL ov37_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov37_0225621C(UnkStruct_ov37_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov37_0225621C(UnkStruct_ov37_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { 72, 104, 92, 132 }, diff --git a/src/overlay037/ov37_022563D4.c b/src/overlay037/ov37_022563D4.c index 88552cc63b..8a173ce3a0 100644 --- a/src/overlay037/ov37_022563D4.c +++ b/src/overlay037/ov37_022563D4.c @@ -23,7 +23,7 @@ struct UnkStruct_ov37_022563D4_t { const UnkStruct_ov37_022563D4_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24; @@ -37,7 +37,7 @@ static void ov37_022564D8(SysTask *param0, void *param1); static void ov37_02256568(SysTask *param0, void *param1); static void ov37_02256588(SysTask *param0, void *param1); -BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563D4_1 *param1, BGL *param2) +BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563D4_1 *param1, BgConfig *param2) { UnkStruct_ov37_022563D4 *v0 = (UnkStruct_ov37_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_022563D4)); diff --git a/src/overlay038/ov38_022561C0.c b/src/overlay038/ov38_022561C0.c index eaa025b5c0..81f66392ea 100644 --- a/src/overlay038/ov38_022561C0.c +++ b/src/overlay038/ov38_022561C0.c @@ -23,10 +23,10 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov38_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov38_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov38_02256254(SysTask *param0, void *param1); static void ov38_02256288(void *param0); -static BOOL ov38_0225621C(UnkStruct_ov38_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov38_0225621C(UnkStruct_ov38_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov38_02256240(UnkStruct_ov38_0225621C *param0); static void ov38_02256290(UnkStruct_ov38_0225621C *param0, u32 param1); static BOOL ov38_022562A4(UnkStruct_ov38_0225621C *param0); @@ -38,7 +38,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov38_022561D4, ov38_02256288); } -static BOOL ov38_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov38_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov38_0225621C *v0 = (UnkStruct_ov38_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225621C)); @@ -56,7 +56,7 @@ static BOOL ov38_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov38_0225621C(UnkStruct_ov38_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov38_0225621C(UnkStruct_ov38_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { if (ov38_0225632C(&(param0->unk_08), &(param0->unk_04), param2)) { param0->unk_00 = 0; diff --git a/src/overlay038/ov38_0225632C.c b/src/overlay038/ov38_0225632C.c index c66c32b026..4c74924b38 100644 --- a/src/overlay038/ov38_0225632C.c +++ b/src/overlay038/ov38_0225632C.c @@ -17,7 +17,7 @@ struct UnkStruct_ov38_0225632C_t { const UnkStruct_ov38_0225632C_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; }; @@ -25,7 +25,7 @@ static void ov38_022563A4(UnkStruct_ov25_02255224 *param0); static void ov38_022563B8(SysTask *param0, void *param1); static void ov38_02256458(SysTask *param0, void *param1); -BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_0225632C_1 *param1, BGL *param2) +BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_0225632C_1 *param1, BgConfig *param2) { UnkStruct_ov38_0225632C *v0 = (UnkStruct_ov38_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225632C)); diff --git a/src/overlay039/ov39_022561C0.c b/src/overlay039/ov39_022561C0.c index 76c33d524a..81cd8b35d7 100644 --- a/src/overlay039/ov39_022561C0.c +++ b/src/overlay039/ov39_022561C0.c @@ -28,8 +28,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov39_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov39_0225621C(UnkStruct_ov39_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov39_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov39_0225621C(UnkStruct_ov39_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov39_02256268(UnkStruct_ov39_0225621C *param0); static void ov39_02256284(u32 param0, u32 param1, u32 param2, void *param3); static void ov39_0225628C(SysTask *param0, void *param1); @@ -44,7 +44,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov39_022561D4, ov39_022562C8); } -static BOOL ov39_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov39_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov39_0225621C *v0 = (UnkStruct_ov39_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_0225621C)); @@ -62,7 +62,7 @@ static BOOL ov39_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov39_0225621C(UnkStruct_ov39_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov39_0225621C(UnkStruct_ov39_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { if (ov39_022563DC(&(param0->unk_24), &(param0->unk_04), param2)) { static const TouchScreenHitTable v0[] = { diff --git a/src/overlay039/ov39_022563DC.c b/src/overlay039/ov39_022563DC.c index 0a684ffbd5..6281deb8cf 100644 --- a/src/overlay039/ov39_022563DC.c +++ b/src/overlay039/ov39_022563DC.c @@ -17,7 +17,7 @@ struct UnkStruct_ov39_022563DC_t { const UnkStruct_ov39_022563DC_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; }; @@ -28,7 +28,7 @@ static void ov39_02256534(SysTask *param0, void *param1); static void ov39_02256568(SysTask *param0, void *param1); static void ov39_0225659C(UnkStruct_ov39_022563DC *param0, u32 param1, BOOL param2, BOOL param3); -BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563DC_1 *param1, BGL *param2) +BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563DC_1 *param1, BgConfig *param2) { UnkStruct_ov39_022563DC *v0 = (UnkStruct_ov39_022563DC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_022563DC)); diff --git a/src/overlay040/ov40_022561C0.c b/src/overlay040/ov40_022561C0.c index e8ed0f139a..64b142eb47 100644 --- a/src/overlay040/ov40_022561C0.c +++ b/src/overlay040/ov40_022561C0.c @@ -32,8 +32,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov40_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov40_0225621C(UnkStruct_ov40_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov40_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov40_0225621C(UnkStruct_ov40_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov40_0225625C(UnkStruct_ov40_0225621C *param0); static void ov40_02256270(SysTask *param0, void *param1); static void ov40_022562A4(void *param0); @@ -49,7 +49,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov40_022561D4, ov40_022562A4); } -static BOOL ov40_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov40_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov40_0225621C *v0 = (UnkStruct_ov40_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225621C)); @@ -67,7 +67,7 @@ static BOOL ov40_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov40_0225621C(UnkStruct_ov40_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov40_0225621C(UnkStruct_ov40_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { param0->unk_30 = sub_02026310(PoketchSystem_GetSaveData(poketchSys)); diff --git a/src/overlay040/ov40_0225645C.c b/src/overlay040/ov40_0225645C.c index 4cedf921ea..49f8f84324 100644 --- a/src/overlay040/ov40_0225645C.c +++ b/src/overlay040/ov40_0225645C.c @@ -26,7 +26,7 @@ struct UnkStruct_ov40_0225645C_t { const UnkStruct_ov40_0225645C_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24[11]; @@ -53,7 +53,7 @@ static void ov40_02256848(UnkStruct_ov40_0225645C *param0, const UnkStruct_ov40_ static void ov40_02256958(UnkStruct_ov25_022558C4 **param0, u32 param1); static void ov40_02256A14(UnkStruct_ov25_022558C4 *param0, u32 param1); -BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_0225645C_1 *param1, BGL *param2) +BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_0225645C_1 *param1, BgConfig *param2) { UnkStruct_ov40_0225645C *v0 = (UnkStruct_ov40_0225645C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225645C)); diff --git a/src/overlay041/ov41_022561C0.c b/src/overlay041/ov41_022561C0.c index 50d422bdb6..469d62a93e 100644 --- a/src/overlay041/ov41_022561C0.c +++ b/src/overlay041/ov41_022561C0.c @@ -29,8 +29,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov41_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov41_02256220(UnkStruct_ov41_02256220 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov41_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov41_02256220(UnkStruct_ov41_02256220 *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov41_02256294(UnkStruct_ov41_02256220 *param0); static void ov41_022562B8(SysTask *param0, void *param1); static void ov41_02256300(u32 param0, u32 param1, u32 param2, void *param3); @@ -49,7 +49,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov41_022561D4, ov41_02256310); } -static BOOL ov41_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov41_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov41_02256220 *v0 = (UnkStruct_ov41_02256220 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_02256220)); @@ -67,7 +67,7 @@ static BOOL ov41_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov41_02256220(UnkStruct_ov41_02256220 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov41_02256220(UnkStruct_ov41_02256220 *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { 34, 66, 167, 207 }, diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c index 0e8e34c5d0..918a3ee31a 100644 --- a/src/overlay041/ov41_022567B0.c +++ b/src/overlay041/ov41_022567B0.c @@ -25,7 +25,7 @@ struct UnkStruct_ov41_022567B0_t { const UnkStruct_ov41_022567B0_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24[4]; @@ -54,7 +54,7 @@ static void ov41_02256B60(SysTask *param0, void *param1); static void ov41_02256B8C(SysTask *param0, void *param1); static void ov41_02256D1C(SysTask *param0, void *param1); -BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567B0_1 *param1, BGL *param2) +BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567B0_1 *param1, BgConfig *param2) { UnkStruct_ov41_022567B0 *v0 = (UnkStruct_ov41_022567B0 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_022567B0)); diff --git a/src/overlay042/ov42_022561C0.c b/src/overlay042/ov42_022561C0.c index 850ff4683e..7ea2eb7cfd 100644 --- a/src/overlay042/ov42_022561C0.c +++ b/src/overlay042/ov42_022561C0.c @@ -26,8 +26,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov42_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov42_0225621C(UnkStruct_ov42_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov42_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov42_0225621C(UnkStruct_ov42_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov42_02256260(UnkStruct_ov42_0225621C *param0); static void ov42_02256280(SysTask *param0, void *param1); static void ov42_022562B4(void *param0); @@ -42,7 +42,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov42_022561D4, ov42_022562B4); } -static BOOL ov42_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov42_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov42_0225621C *v0 = (UnkStruct_ov42_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_0225621C)); @@ -60,7 +60,7 @@ static BOOL ov42_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov42_0225621C(UnkStruct_ov42_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov42_0225621C(UnkStruct_ov42_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { param0->unk_04 = param3; diff --git a/src/overlay042/ov42_022563D4.c b/src/overlay042/ov42_022563D4.c index e4583ee719..69972d8a90 100644 --- a/src/overlay042/ov42_022563D4.c +++ b/src/overlay042/ov42_022563D4.c @@ -26,7 +26,7 @@ static fx32 Unk_ov42_02256724 = 0; struct UnkStruct_ov42_022563D4_t { const UnkStruct_ov42_022563D4_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24; @@ -43,7 +43,7 @@ static void ov42_022564F0(SysTask *param0, void *param1); static void ov42_02256580(SysTask *param0, void *param1); static void ov42_022565C4(SysTask *param0, void *param1); -BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563D4_1 *param1, BGL *param2) +BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563D4_1 *param1, BgConfig *param2) { UnkStruct_ov42_022563D4 *v0 = (UnkStruct_ov42_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_022563D4)); diff --git a/src/overlay043/ov43_022561C0.c b/src/overlay043/ov43_022561C0.c index 6e2d1d5448..70f589cf0e 100644 --- a/src/overlay043/ov43_022561C0.c +++ b/src/overlay043/ov43_022561C0.c @@ -29,8 +29,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov43_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov43_0225621C(UnkStruct_ov43_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov43_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov43_0225621C(UnkStruct_ov43_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov43_02256288(UnkStruct_ov43_02256544_1 *param0); static void ov43_022562A8(UnkStruct_ov43_0225621C *param0); static void ov43_022562CC(SysTask *param0, void *param1); @@ -48,7 +48,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov43_022561D4, ov43_02256310); } -static BOOL ov43_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov43_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov43_0225621C *v0 = (UnkStruct_ov43_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov43_0225621C)); @@ -66,7 +66,7 @@ static BOOL ov43_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov43_0225621C(UnkStruct_ov43_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov43_0225621C(UnkStruct_ov43_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { 112, 144, 16, 40 }, diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index a4a08ad2f8..d884cc3760 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -27,7 +27,7 @@ struct UnkStruct_ov43_02256544_t { const UnkStruct_ov43_02256544_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; UnkStruct_ov25_022555E8 *unk_30; UnkStruct_ov25_022558C4 *unk_34[6]; @@ -57,7 +57,7 @@ static void ov43_02256988(UnkStruct_ov43_02256544 *param0, Window *param1, u32 p static void ov43_02256A00(UnkStruct_ov43_02256544 *param0, Window *param1, u32 param2); static void ov43_02256A4C(UnkStruct_ov43_02256544 *param0, u32 param1); -BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_02256544_1 *param1, BGL *param2) +BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_02256544_1 *param1, BgConfig *param2) { UnkStruct_ov43_02256544 *v0 = (UnkStruct_ov43_02256544 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov43_02256544)); diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c index c0530951f6..eb6a5b537c 100644 --- a/src/overlay044/ov44_022561C0.c +++ b/src/overlay044/ov44_022561C0.c @@ -36,8 +36,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov44_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov44_0225621C(UnkStruct_ov44_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov44_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov44_0225621C(UnkStruct_ov44_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov44_02256314(UnkStruct_ov44_0225621C *param0); static void ov44_0225632C(u32 param0, u32 param1, u32 param2, void *param3); static void ov44_02256338(SysTask *param0, void *param1); @@ -54,7 +54,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov44_022561D4, ov44_02256374); } -static BOOL ov44_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov44_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov44_0225621C *v0 = (UnkStruct_ov44_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_0225621C)); @@ -72,7 +72,7 @@ static BOOL ov44_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov44_0225621C(UnkStruct_ov44_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov44_0225621C(UnkStruct_ov44_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { Party *v0 = Party_GetFromSavedata(PoketchSystem_GetSaveData(poketchSys)); Pokemon *v1; diff --git a/src/overlay044/ov44_022565BC.c b/src/overlay044/ov44_022565BC.c index c6554b46d6..5aaee4a7bd 100644 --- a/src/overlay044/ov44_022565BC.c +++ b/src/overlay044/ov44_022565BC.c @@ -25,7 +25,7 @@ struct UnkStruct_ov44_022565BC_t { const UnkStruct_ov44_022565BC_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24[6]; @@ -57,7 +57,7 @@ static void ov44_022569E4(SysTask *param0, void *param1); static void ov44_02256A50(UnkStruct_ov44_022565BC *param0, const UnkStruct_ov44_022565BC_1 *param1); static BOOL ov44_02256AC8(UnkStruct_ov44_022565BC *param0, const UnkStruct_ov44_022565BC_1 *param1); -BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565BC_1 *param1, BGL *param2) +BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565BC_1 *param1, BgConfig *param2) { UnkStruct_ov44_022565BC *v0 = (UnkStruct_ov44_022565BC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_022565BC)); diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index e0ad394ec5..d730464e97 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/src/overlay045/ov45_022561C0.c @@ -34,8 +34,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov45_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov45_0225621C(UnkStruct_ov45_022561D4 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov45_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov45_0225621C(UnkStruct_ov45_022561D4 *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov45_022562C0(UnkStruct_ov45_022566EC_1 *param0); static void ov45_022562F8(UnkStruct_ov45_022561D4 *param0); static void ov45_02256310(u32 param0, u32 param1, u32 param2, void *param3); @@ -57,7 +57,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov45_022561D4, ov45_02256354); } -static BOOL ov45_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov45_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov45_022561D4 *v0 = (UnkStruct_ov45_022561D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022561D4)); @@ -75,7 +75,7 @@ static BOOL ov45_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov45_0225621C(UnkStruct_ov45_022561D4 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov45_0225621C(UnkStruct_ov45_022561D4 *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { diff --git a/src/overlay045/ov45_022566EC.c b/src/overlay045/ov45_022566EC.c index 7868b8d0b2..bf1e5014b5 100644 --- a/src/overlay045/ov45_022566EC.c +++ b/src/overlay045/ov45_022566EC.c @@ -24,7 +24,7 @@ struct UnkStruct_ov45_022566EC_t { const UnkStruct_ov45_022566EC_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; UnkStruct_ov25_022555E8 *unk_30; UnkStruct_ov25_022558C4 *unk_34[13]; @@ -46,7 +46,7 @@ static void ov45_02256ABC(SysTask *param0, void *param1); static void ov45_02256B38(SysTask *param0, void *param1); static void ov45_02256B78(SysTask *param0, void *param1); -BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566EC_1 *param1, BGL *param2) +BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566EC_1 *param1, BgConfig *param2) { UnkStruct_ov45_022566EC *v0 = (UnkStruct_ov45_022566EC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022566EC)); diff --git a/src/overlay046/ov46_022561C0.c b/src/overlay046/ov46_022561C0.c index 41010860a9..ad215e860e 100644 --- a/src/overlay046/ov46_022561C0.c +++ b/src/overlay046/ov46_022561C0.c @@ -55,14 +55,14 @@ enum { static void NitroStaticInit(void); -static BOOL ov46_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov46_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov46_0225621C(UnkStruct_ov46_0225621C *param0); static void ov46_0225623C(UnkStruct_ov46_0225621C *param0, u32 param1, BOOL param2); static void ov46_02256258(UnkStruct_ov46_0225621C *param0, u32 param1, u32 param2); static void ov46_02256270(UnkStruct_ov46_0225621C *param0, UnkStruct_ov46_02256270 *param1); static void ov46_0225628C(UnkStruct_ov46_0225621C *param0); static void ov46_022562D4(UnkStruct_ov46_0225621C *param0); -static BOOL ov46_02256310(UnkStruct_ov46_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov46_02256310(UnkStruct_ov46_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov46_022563B8(UnkStruct_ov46_0225621C *param0); static void ov46_022563D8(u32 param0, u32 param1, u32 param2, void *param3); static void ov46_02256408(SysTask *param0, void *param1); @@ -88,7 +88,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov46_022561D4, ov46_02256458); } -static BOOL ov46_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov46_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov46_0225621C *v0 = (UnkStruct_ov46_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_0225621C)); @@ -171,7 +171,7 @@ static void ov46_022562D4(UnkStruct_ov46_0225621C *param0) ov46_0225623C(param0, 1, 0); } -static BOOL ov46_02256310(UnkStruct_ov46_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov46_02256310(UnkStruct_ov46_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { 144, 176, 16, 80 }, diff --git a/src/overlay046/ov46_02256BCC.c b/src/overlay046/ov46_02256BCC.c index 873382f420..28e2532cb5 100644 --- a/src/overlay046/ov46_02256BCC.c +++ b/src/overlay046/ov46_02256BCC.c @@ -23,7 +23,7 @@ struct UnkStruct_ov46_02256BCC_t { const UnkStruct_ov46_02256BCC_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; UnkStruct_ov25_022555E8 *unk_30; UnkStruct_ov25_022558C4 *unk_34[17]; @@ -49,7 +49,7 @@ static void ov46_02257054(UnkStruct_ov46_02256BCC *param0, const UnkStruct_ov46_ static void ov46_02257094(UnkStruct_ov46_02256BCC *param0, const UnkStruct_ov46_02256BCC_1 *param1); static void ov46_022570C4(UnkStruct_ov46_02256BCC *param0, BOOL param1); -BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256BCC_1 *param1, BGL *param2) +BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256BCC_1 *param1, BgConfig *param2) { UnkStruct_ov46_02256BCC *v0 = (UnkStruct_ov46_02256BCC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_02256BCC)); diff --git a/src/overlay047/ov47_022561C0.c b/src/overlay047/ov47_022561C0.c index 76a05b5acb..6ec7029867 100644 --- a/src/overlay047/ov47_022561C0.c +++ b/src/overlay047/ov47_022561C0.c @@ -35,8 +35,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov47_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov47_0225621C(UnkStruct_ov47_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov47_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov47_0225621C(UnkStruct_ov47_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov47_0225634C(UnkStruct_ov47_0225621C *param0); static void ov47_02256384(SysTask *param0, void *param1); static void ov47_022563B8(void *param0); @@ -53,7 +53,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov47_022561D4, ov47_022563B8); } -static BOOL ov47_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov47_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov47_0225621C *v0 = (UnkStruct_ov47_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_0225621C)); @@ -71,7 +71,7 @@ static BOOL ov47_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov47_0225621C(UnkStruct_ov47_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov47_0225621C(UnkStruct_ov47_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { int v0; diff --git a/src/overlay047/ov47_02256634.c b/src/overlay047/ov47_02256634.c index bea04f4890..69280d0220 100644 --- a/src/overlay047/ov47_02256634.c +++ b/src/overlay047/ov47_02256634.c @@ -24,7 +24,7 @@ struct UnkStruct_ov47_02256634_t { const UnkStruct_ov47_02256634_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24[6]; @@ -42,7 +42,7 @@ static void ov47_022568BC(SysTask *param0, void *param1); static void ov47_0225694C(SysTask *param0, void *param1); static void ov47_02256968(SysTask *param0, void *param1); -BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_02256634_1 *param1, BGL *param2) +BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_02256634_1 *param1, BgConfig *param2) { UnkStruct_ov47_02256634 *v0 = (UnkStruct_ov47_02256634 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_02256634)); diff --git a/src/overlay048/ov48_022561C0.c b/src/overlay048/ov48_022561C0.c index e5ecc81f7d..b3c08dca98 100644 --- a/src/overlay048/ov48_022561C0.c +++ b/src/overlay048/ov48_022561C0.c @@ -154,8 +154,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov48_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov48_0225621C(UnkStruct_ov48_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov48_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov48_0225621C(UnkStruct_ov48_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov48_022562A8(UnkStruct_ov48_0225621C *param0); static void ov48_022562BC(SysTask *param0, void *param1); static void ov48_022562F0(void *param0); @@ -172,7 +172,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov48_022561D4, ov48_022562F0); } -static BOOL ov48_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov48_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov48_0225621C *v0 = (UnkStruct_ov48_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225621C)); @@ -190,7 +190,7 @@ static BOOL ov48_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov48_0225621C(UnkStruct_ov48_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov48_0225621C(UnkStruct_ov48_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { param0->poketchSys = poketchSys; param0->unk_04.unk_08 = ov48_02256408(param0); diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c index b4be297bbb..8401bb85f8 100644 --- a/src/overlay048/ov48_0225650C.c +++ b/src/overlay048/ov48_0225650C.c @@ -28,7 +28,7 @@ struct UnkStruct_ov48_0225650C_t { const UnkStruct_ov48_0225650C_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24; @@ -52,7 +52,7 @@ static void ov48_02256920(UnkStruct_ov48_0225650C *param0); static void ov48_02256984(UnkStruct_ov48_0225650C *param0); static void ov48_022569FC(SysTask *param0, void *param1); -BOOL ov48_0225650C(UnkStruct_ov48_0225650C **param0, const UnkStruct_ov48_0225650C_1 *param1, BGL *param2) +BOOL ov48_0225650C(UnkStruct_ov48_0225650C **param0, const UnkStruct_ov48_0225650C_1 *param1, BgConfig *param2) { UnkStruct_ov48_0225650C *v0 = (UnkStruct_ov48_0225650C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225650C)); diff --git a/src/overlay049/ov49_022561C0.c b/src/overlay049/ov49_022561C0.c index 126d4ba693..551acbff97 100644 --- a/src/overlay049/ov49_022561C0.c +++ b/src/overlay049/ov49_022561C0.c @@ -27,8 +27,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov49_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov49_0225621C(UnkStruct_ov49_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov49_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov49_0225621C(UnkStruct_ov49_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov49_02256258(UnkStruct_ov49_0225621C *param0); static void ov49_0225626C(SysTask *param0, void *param1); static void ov49_022562A0(void *param0); @@ -43,7 +43,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov49_022561D4, ov49_022562A0); } -static BOOL ov49_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov49_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov49_0225621C *v0 = (UnkStruct_ov49_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_0225621C)); @@ -61,7 +61,7 @@ static BOOL ov49_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov49_0225621C(UnkStruct_ov49_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov49_0225621C(UnkStruct_ov49_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); param0->unk_04.unk_00 = PoketchData_CurrentScreenColor(param0->poketchData); diff --git a/src/overlay049/ov49_022563D4.c b/src/overlay049/ov49_022563D4.c index 23977c2273..b026bf5356 100644 --- a/src/overlay049/ov49_022563D4.c +++ b/src/overlay049/ov49_022563D4.c @@ -23,7 +23,7 @@ struct UnkStruct_ov49_022563D4_t { const UnkStruct_ov49_022563D4_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24; @@ -37,7 +37,7 @@ static void ov49_022564E4(SysTask *param0, void *param1); static void ov49_02256578(SysTask *param0, void *param1); static void ov49_02256594(SysTask *param0, void *param1); -BOOL ov49_022563D4(UnkStruct_ov49_022563D4 **param0, const UnkStruct_ov49_022563D4_1 *param1, BGL *param2) +BOOL ov49_022563D4(UnkStruct_ov49_022563D4 **param0, const UnkStruct_ov49_022563D4_1 *param1, BgConfig *param2) { UnkStruct_ov49_022563D4 *v0 = (UnkStruct_ov49_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_022563D4)); diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index 4c705c8be4..cb669d7c6c 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/src/overlay050/ov50_022561C0.c @@ -33,8 +33,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov50_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov50_0225621C(UnkStruct_ov50_022561D4 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov50_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov50_0225621C(UnkStruct_ov50_022561D4 *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov50_022562AC(UnkStruct_ov50_02256510_1 *param0, UnkStruct_ov50_022561D4 *param1, const RTCDate *param2); static void ov50_02256340(UnkStruct_ov50_022561D4 *param0); static void ov50_02256360(u32 param0, u32 param1, u32 param2, void *param3); @@ -50,7 +50,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov50_022561D4, ov50_022563B0); } -static BOOL ov50_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov50_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov50_022561D4 *v0 = (UnkStruct_ov50_022561D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_022561D4)); @@ -68,7 +68,7 @@ static BOOL ov50_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov50_0225621C(UnkStruct_ov50_022561D4 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov50_0225621C(UnkStruct_ov50_022561D4 *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { ((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8) }, diff --git a/src/overlay050/ov50_02256510.c b/src/overlay050/ov50_02256510.c index b099375ebf..7db3fecf02 100644 --- a/src/overlay050/ov50_02256510.c +++ b/src/overlay050/ov50_02256510.c @@ -22,7 +22,7 @@ struct UnkStruct_ov50_02256510_t { const UnkStruct_ov50_02256510_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24; @@ -37,12 +37,12 @@ static void ov50_0225664C(SysTask *param0, void *param1); static void ov50_022566F0(SysTask *param0, void *param1); static void ov50_02256714(SysTask *param0, void *param1); static void ov50_0225675C(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_02256510_1 *param1); -static void ov50_022567A8(BGL *param0, u16 param1, u32 param2); +static void ov50_022567A8(BgConfig *param0, u16 param1, u32 param2); static void ov50_022567F4(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_02256510_1 *param1); -static void ov50_0225683C(BGL *param0, u32 param1); -static void ov50_02256894(BGL *param0, u32 param1, u32 param2); +static void ov50_0225683C(BgConfig *param0, u32 param1); +static void ov50_02256894(BgConfig *param0, u32 param1, u32 param2); -BOOL ov50_02256510(UnkStruct_ov50_02256510 **param0, const UnkStruct_ov50_02256510_1 *param1, BGL *param2) +BOOL ov50_02256510(UnkStruct_ov50_02256510 **param0, const UnkStruct_ov50_02256510_1 *param1, BgConfig *param2) { UnkStruct_ov50_02256510 *v0 = (UnkStruct_ov50_02256510 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_02256510)); @@ -224,7 +224,7 @@ static void ov50_0225675C(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_ } } -static void ov50_022567A8(BGL *param0, u16 param1, u32 param2) +static void ov50_022567A8(BgConfig *param0, u16 param1, u32 param2) { u32 v0, v1; @@ -246,7 +246,7 @@ static void ov50_022567F4(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_ } } -static void ov50_0225683C(BGL *param0, u32 param1) +static void ov50_0225683C(BgConfig *param0, u32 param1) { static const u16 v0[12] = { 0x0, 0x4, 0x8, 0x18, 0x1c, 0x20, 0x30, 0x34, 0x38, 0x48, 0x4c, 0x50 @@ -263,7 +263,7 @@ static void ov50_0225683C(BGL *param0, u32 param1) } } -static void ov50_02256894(BGL *param0, u32 param1, u32 param2) +static void ov50_02256894(BgConfig *param0, u32 param1, u32 param2) { static const u16 v0[2][10] = { { 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69 }, diff --git a/src/overlay051/ov51_022561C0.c b/src/overlay051/ov51_022561C0.c index cf500b6d68..728855df18 100644 --- a/src/overlay051/ov51_022561C0.c +++ b/src/overlay051/ov51_022561C0.c @@ -23,10 +23,10 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov51_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov51_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov51_02256254(SysTask *param0, void *param1); static void ov51_02256288(void *param0); -static BOOL ov51_0225621C(UnkStruct_ov51_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov51_0225621C(UnkStruct_ov51_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov51_02256240(UnkStruct_ov51_0225621C *param0); static void ov51_02256290(UnkStruct_ov51_0225621C *param0, u32 param1); static BOOL ov51_022562A4(UnkStruct_ov51_0225621C *param0); @@ -38,7 +38,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov51_022561D4, ov51_02256288); } -static BOOL ov51_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov51_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov51_0225621C *v0 = (UnkStruct_ov51_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225621C)); @@ -56,7 +56,7 @@ static BOOL ov51_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov51_0225621C(UnkStruct_ov51_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov51_0225621C(UnkStruct_ov51_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { if (ov51_0225632C(&(param0->unk_08), &(param0->unk_04), param2)) { param0->unk_00 = 0; diff --git a/src/overlay051/ov51_0225632C.c b/src/overlay051/ov51_0225632C.c index e376db5f59..e90f0b0a7c 100644 --- a/src/overlay051/ov51_0225632C.c +++ b/src/overlay051/ov51_0225632C.c @@ -17,7 +17,7 @@ struct UnkStruct_ov51_0225632C_t { const UnkStruct_ov51_0225632C_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; }; @@ -25,7 +25,7 @@ static void ov51_022563A4(UnkStruct_ov25_02255224 *param0); static void ov51_022563B8(SysTask *param0, void *param1); static void ov51_02256458(SysTask *param0, void *param1); -BOOL ov51_0225632C(UnkStruct_ov51_0225632C **param0, const UnkStruct_ov51_0225632C_1 *param1, BGL *param2) +BOOL ov51_0225632C(UnkStruct_ov51_0225632C **param0, const UnkStruct_ov51_0225632C_1 *param1, BgConfig *param2) { UnkStruct_ov51_0225632C *v0 = (UnkStruct_ov51_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225632C)); diff --git a/src/overlay052/ov52_022561C0.c b/src/overlay052/ov52_022561C0.c index 103fa069fc..e947fe9483 100644 --- a/src/overlay052/ov52_022561C0.c +++ b/src/overlay052/ov52_022561C0.c @@ -32,8 +32,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov52_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov52_0225621C(UnkStruct_ov52_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov52_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov52_0225621C(UnkStruct_ov52_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov52_0225624C(UnkStruct_ov52_0225621C *param0); static void ov52_02256260(SysTask *param0, void *param1); static void ov52_0225629C(void *param0); @@ -58,7 +58,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov52_022561D4, ov52_0225629C); } -static BOOL ov52_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov52_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov52_0225621C *v0 = (UnkStruct_ov52_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_0225621C)); @@ -76,7 +76,7 @@ static BOOL ov52_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov52_0225621C(UnkStruct_ov52_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov52_0225621C(UnkStruct_ov52_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { if (ov52_02256694(&(param0->unk_14), &(param0->unk_04), param2)) { param0->unk_00 = 0; diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c index 3e316f15f6..59396c1577 100644 --- a/src/overlay052/ov52_02256694.c +++ b/src/overlay052/ov52_02256694.c @@ -27,7 +27,7 @@ struct UnkStruct_ov52_02256694_t { const UnkStruct_ov52_02256694_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; Window unk_20; UnkStruct_ov25_022555E8 *unk_30; @@ -54,7 +54,7 @@ static void ov52_02256B64(UnkStruct_ov52_02256694 *param0); static void ov52_02256BDC(UnkStruct_ov52_02256694 *param0); static void ov52_02256C64(UnkStruct_ov52_02256694 *param0, const UnkStruct_ov52_02256694_1 *param1); -BOOL ov52_02256694(UnkStruct_ov52_02256694 **param0, const UnkStruct_ov52_02256694_1 *param1, BGL *param2) +BOOL ov52_02256694(UnkStruct_ov52_02256694 **param0, const UnkStruct_ov52_02256694_1 *param1, BgConfig *param2) { UnkStruct_ov52_02256694 *v0 = (UnkStruct_ov52_02256694 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_02256694)); diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c index a68615ec34..4fd9571e2a 100644 --- a/src/overlay053/ov53_022561C0.c +++ b/src/overlay053/ov53_022561C0.c @@ -30,8 +30,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov53_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov53_0225621C(UnkStruct_ov53_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov53_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov53_0225621C(UnkStruct_ov53_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov53_022562B8(UnkStruct_ov53_0225621C *param0); static void ov53_022562D0(SysTask *param0, void *param1); static void ov53_0225630C(void *param0); @@ -46,7 +46,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov53_022561D4, ov53_0225630C); } -static BOOL ov53_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov53_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov53_0225621C *v0 = (UnkStruct_ov53_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_0225621C)); @@ -64,7 +64,7 @@ static BOOL ov53_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov53_0225621C(UnkStruct_ov53_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov53_0225621C(UnkStruct_ov53_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { (80 - (36 / 2)), diff --git a/src/overlay053/ov53_02256420.c b/src/overlay053/ov53_02256420.c index 7e6d4b23d5..08ff70ca73 100644 --- a/src/overlay053/ov53_02256420.c +++ b/src/overlay053/ov53_02256420.c @@ -25,7 +25,7 @@ struct UnkStruct_ov53_02256420_t { const UnkStruct_ov53_02256420_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24[16]; @@ -48,7 +48,7 @@ static void ov53_022566AC(UnkStruct_ov53_02256420 *param0, const UnkStruct_ov53_ static void ov53_02256840(UnkStruct_ov53_02256420 *param0); static void ov53_02256874(UnkStruct_ov25_022558C4 **param0, u32 param1); -BOOL ov53_02256420(UnkStruct_ov53_02256420 **param0, const UnkStruct_ov53_02256420_1 *param1, BGL *param2) +BOOL ov53_02256420(UnkStruct_ov53_02256420 **param0, const UnkStruct_ov53_02256420_1 *param1, BgConfig *param2) { UnkStruct_ov53_02256420 *v0 = (UnkStruct_ov53_02256420 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_02256420)); diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index ea43f1d1e1..fc053809c7 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/src/overlay054/ov54_022561C0.c @@ -29,8 +29,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov54_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); -static BOOL ov54_0225621C(UnkStruct_ov54_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov54_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); +static BOOL ov54_0225621C(UnkStruct_ov54_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov54_022562D4(UnkStruct_ov54_0225621C *param0); static void ov54_022562F4(SysTask *param0, void *param1); static void ov54_02256338(void *param0); @@ -45,7 +45,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov54_022561D4, ov54_02256338); } -static BOOL ov54_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov54_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov54_0225621C *v0 = (UnkStruct_ov54_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225621C)); @@ -63,7 +63,7 @@ static BOOL ov54_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov54_0225621C(UnkStruct_ov54_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov54_0225621C(UnkStruct_ov54_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { ((48 + 48 * 2) - (36 / 2)), diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c index e26fbefdba..a317514585 100644 --- a/src/overlay054/ov54_0225642C.c +++ b/src/overlay054/ov54_0225642C.c @@ -26,7 +26,7 @@ struct UnkStruct_ov54_0225642C_t { const UnkStruct_ov54_0225642C_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[6]; UnkStruct_ov25_022555E8 *unk_20; UnkStruct_ov25_022558C4 *unk_24[12]; @@ -40,7 +40,7 @@ static void ov54_022565CC(SysTask *param0, void *param1); static void ov54_022565EC(UnkStruct_ov54_0225642C *param0, const UnkStruct_ov54_0225642C_1 *param1); static void ov54_022566A8(UnkStruct_ov54_0225642C *param0); -BOOL ov54_0225642C(UnkStruct_ov54_0225642C **param0, const UnkStruct_ov54_0225642C_1 *param1, BGL *param2) +BOOL ov54_0225642C(UnkStruct_ov54_0225642C **param0, const UnkStruct_ov54_0225642C_1 *param1, BgConfig *param2) { UnkStruct_ov54_0225642C *v0 = (UnkStruct_ov54_0225642C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225642C)); diff --git a/src/overlay055/ov55_022561C0.c b/src/overlay055/ov55_022561C0.c index fdf7aa5600..fea886c560 100644 --- a/src/overlay055/ov55_022561C0.c +++ b/src/overlay055/ov55_022561C0.c @@ -23,10 +23,10 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov55_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov55_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov55_02256254(SysTask *param0, void *param1); static void ov55_02256288(void *param0); -static BOOL ov55_0225621C(UnkStruct_ov55_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov55_0225621C(UnkStruct_ov55_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3); static void ov55_02256240(UnkStruct_ov55_0225621C *param0); static void ov55_02256290(UnkStruct_ov55_0225621C *param0, u32 param1); static BOOL ov55_022562A4(UnkStruct_ov55_0225621C *param0); @@ -38,7 +38,7 @@ static void NitroStaticInit(void) PoketchSystem_SetAppFunctions(ov55_022561D4, ov55_02256288); } -static BOOL ov55_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov55_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { UnkStruct_ov55_0225621C *v0 = (UnkStruct_ov55_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225621C)); @@ -57,7 +57,7 @@ static BOOL ov55_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, return 0; } -static BOOL ov55_0225621C(UnkStruct_ov55_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) +static BOOL ov55_0225621C(UnkStruct_ov55_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { if (ov55_0225632C(&(param0->unk_08), &(param0->unk_04), param2)) { param0->unk_00 = 0; diff --git a/src/overlay055/ov55_0225632C.c b/src/overlay055/ov55_0225632C.c index c9b777386d..ff6b3f0988 100644 --- a/src/overlay055/ov55_0225632C.c +++ b/src/overlay055/ov55_0225632C.c @@ -16,7 +16,7 @@ struct UnkStruct_ov55_0225632C_t { const UnkStruct_ov55_0225632C_1 *unk_00; - BGL *unk_04; + BgConfig *unk_04; u32 unk_08[10]; }; @@ -24,7 +24,7 @@ static void ov55_022563B4(UnkStruct_ov25_02255224 *param0); static void ov55_022563C8(SysTask *param0, void *param1); static void ov55_02256468(SysTask *param0, void *param1); -BOOL ov55_0225632C(UnkStruct_ov55_0225632C **param0, const UnkStruct_ov55_0225632C_1 *param1, BGL *param2) +BOOL ov55_0225632C(UnkStruct_ov55_0225632C **param0, const UnkStruct_ov55_0225632C_1 *param1, BgConfig *param2) { UnkStruct_ov55_0225632C *v0 = (UnkStruct_ov55_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225632C)); diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index 000dda796f..23cdf6755a 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -67,7 +67,7 @@ struct UnkStruct_ov56_02256468_t { UnkStruct_0205B43C *unk_08; FieldSystem *fieldSystem; TrainerInfo *unk_10; - BGL *unk_14; + BgConfig *unk_14; StringTemplate *unk_18; MessageLoader *unk_1C; u16 *unk_20; @@ -98,11 +98,11 @@ struct UnkStruct_ov56_02256468_t { }; static void ov56_02256294(UnkStruct_ov56_02256468 *param0); -static void ov56_022564E4(BGL *param0); -static void ov56_02256508(BGL *param0); +static void ov56_022564E4(BgConfig *param0); +static void ov56_02256508(BgConfig *param0); static void ov56_02256634(UnkStruct_ov56_02256468 *param0); static void ov56_02256704(UnkStruct_ov56_02256468 *param0); -static void ov56_022562EC(BGL *param0, UnkStruct_ov56_022562EC *param1); +static void ov56_022562EC(BgConfig *param0, UnkStruct_ov56_022562EC *param1); static void ov56_022563E8(UnkStruct_ov56_022562EC *param0); static void ov56_022568E0(UnkStruct_ov56_02256468 *param0); static void ov56_022567FC(UnkStruct_ov56_02256468 *param0, int param1, UnkStruct_0205C924 *param2); @@ -119,7 +119,7 @@ static int ov56_02256BC0(UnkStruct_ov56_02256468 *param0); static void ov56_02257100(UnkStruct_ov56_02256468 *param0); static void ov56_02257048(UnkStruct_ov56_02256468 *param0, TrainerInfo *param1, Sentence *param2, u32 param3); static Strbuf *ov56_02256E5C(UnkStruct_02027F8C *param0, u32 param1, StringTemplate *param2, MessageLoader *param3, TrainerInfo *param4); -static void ov56_02256D64(BGL *param0, NNSG2dScreenData *param1, UnkStruct_ov56_022562EC *param2, int param3, int param4, int *param5); +static void ov56_02256D64(BgConfig *param0, NNSG2dScreenData *param1, UnkStruct_ov56_022562EC *param2, int param3, int param4, int *param5); static void ov56_0225710C(UnkStruct_ov56_02256468 *param0); static void ov56_0225712C(UnkStruct_ov56_02256468 *param0); static BOOL ov56_02257174(const UnkStruct_ov56_02256468 *param0); @@ -131,7 +131,7 @@ static void ov56_022571D0(UnkStruct_ov56_02256468 *param0); static void ov56_022561C0(SysTask *param0, void *param1) { UnkStruct_ov56_02256468 *v0 = param1; - BGL *v1 = v0->unk_14; + BgConfig *v1 = v0->unk_14; int v2; if (v0->fieldSystem->unk_80 == NULL) { @@ -188,7 +188,7 @@ static void ov56_02256294(UnkStruct_ov56_02256468 *param0) param0->unk_20 = sub_02006F6C(74, 3, 1, &(param0->unk_24), 4); } -static void ov56_022562EC(BGL *param0, UnkStruct_ov56_022562EC *param1) +static void ov56_022562EC(BgConfig *param0, UnkStruct_ov56_022562EC *param1) { int v0; @@ -242,7 +242,7 @@ UnkStruct_ov56_02256468 *ov56_02256410(FieldSystem *fieldSystem) void ov56_02256468(UnkStruct_ov56_02256468 *param0) { if (param0->unk_00 == 2) { - BGL *v0 = param0->unk_14; + BgConfig *v0 = param0->unk_14; int v1; param0->unk_00 = 3; @@ -269,7 +269,7 @@ void ov56_02256468(UnkStruct_ov56_02256468 *param0) } } -static void ov56_022564E4(BGL *param0) +static void ov56_022564E4(BgConfig *param0) { sub_02019044(param0, 4); sub_02019044(param0, 5); @@ -277,7 +277,7 @@ static void ov56_022564E4(BGL *param0) sub_02019044(param0, 7); } -static void ov56_02256508(BGL *param0) +static void ov56_02256508(BgConfig *param0) { ov56_022564E4(param0); @@ -723,7 +723,7 @@ static const int Unk_ov56_02257244[] = { 0x5 }; -static void ov56_02256D64(BGL *param0, NNSG2dScreenData *param1, UnkStruct_ov56_022562EC *param2, int param3, int param4, int *param5) +static void ov56_02256D64(BgConfig *param0, NNSG2dScreenData *param1, UnkStruct_ov56_022562EC *param2, int param3, int param4, int *param5) { int v0, v1 = 0; diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 1ab46ce488..36ba6b8d24 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -66,10 +66,10 @@ typedef struct { static void ov58_021D115C(void *param0); static void ov58_021D1184(void); -static void ov58_021D11A4(BGL *param0); +static void ov58_021D11A4(BgConfig *param0); static void ov58_021D12C4(UnkStruct_02095EAC *param0); static void ov58_021D13B4(UnkStruct_02095EAC *param0); -static void ov58_021D13F0(BGL *param0); +static void ov58_021D13F0(BgConfig *param0); static void ov58_021D142C(UnkStruct_02095EAC *param0, NARC *param1); static void ov58_021D1524(void); static void ov58_021D1554(UnkStruct_02095EAC *param0, NARC *param1); @@ -373,7 +373,7 @@ static void ov58_021D115C(void *param0) { sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8((BGL *)param0); + sub_0201C2B8((BgConfig *)param0); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -396,7 +396,7 @@ static void ov58_021D1184(void) GXLayers_SetBanks(&v0); } -static void ov58_021D11A4(BGL *param0) +static void ov58_021D11A4(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -572,7 +572,7 @@ static void ov58_021D13B4(UnkStruct_02095EAC *param0) Strbuf_Free(param0->unk_28); } -static void ov58_021D13F0(BGL *param0) +static void ov58_021D13F0(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -585,7 +585,7 @@ static void ov58_021D13F0(BGL *param0) static void ov58_021D142C(UnkStruct_02095EAC *param0, NARC *param1) { - BGL *v0 = param0->unk_00; + BgConfig *v0 = param0->unk_00; sub_02007130(param1, 0, 0, 0, 16 * 2 * 2, 39); sub_02007130(param1, 1, 4, 0, 16 * 2 * 2, 39); diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index db4b66bc8b..72563b3f66 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -64,10 +64,10 @@ static void ov59_021D1100(void *param0); static void ov59_021D1128(void); -static void ov59_021D1148(BGL *param0); +static void ov59_021D1148(BgConfig *param0); static void ov59_021D1250(UnkStruct_020961E8 *param0, NARC *param1); static void ov59_021D131C(UnkStruct_020961E8 *param0); -static void ov59_021D1354(BGL *param0); +static void ov59_021D1354(BgConfig *param0); static void ov59_021D1388(UnkStruct_020961E8 *param0, NARC *param1); static void ov59_021D1474(void); static void ov59_021D14A4(UnkStruct_020961E8 *param0, NARC *param1); @@ -367,7 +367,7 @@ static void ov59_021D1100(void *param0) { sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8((BGL *)param0); + sub_0201C2B8((BgConfig *)param0); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -390,7 +390,7 @@ static void ov59_021D1128(void) GXLayers_SetBanks(&v0); } -static void ov59_021D1148(BGL *param0) +static void ov59_021D1148(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -557,7 +557,7 @@ static void ov59_021D131C(UnkStruct_020961E8 *param0) Strbuf_Free(param0->unk_44); } -static void ov59_021D1354(BGL *param0) +static void ov59_021D1354(BgConfig *param0) { sub_02019044(param0, 6); sub_02019044(param0, 5); @@ -569,7 +569,7 @@ static void ov59_021D1354(BGL *param0) static void ov59_021D1388(UnkStruct_020961E8 *param0, NARC *param1) { - BGL *v0 = param0->unk_00; + BgConfig *v0 = param0->unk_00; sub_02007130(param1, 0, 0, 0, 16 * 16 * 2, 51); sub_02006E84(12, 12, 4, 0, 16 * 2, 51); diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index fe6a1a042e..45323f8d27 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -48,7 +48,7 @@ typedef struct { UnkStruct_02017498 *unk_00; - BGL *unk_04; + BgConfig *unk_04; int unk_08; int unk_0C; int unk_10; @@ -83,8 +83,8 @@ int ov61_0222BF44(OverlayManager *param0, int *param1); int ov61_0222C0F8(OverlayManager *param0, int *param1); int ov61_0222C160(OverlayManager *param0, int *param1); static void ov61_0222C1FC(void *param0); -static void ov61_0222C224(BGL *param0); -static void ov61_0222C38C(BGL *param0); +static void ov61_0222C224(BgConfig *param0); +static void ov61_0222C38C(BgConfig *param0); static void ov61_0222C3B0(UnkStruct_ov61_0222C664 *param0); static void ov61_0222C664(UnkStruct_ov61_0222C664 *param0); static void ov61_0222C70C(UnkStruct_ov61_0222C664 *param0); @@ -95,7 +95,7 @@ static void ov61_0222C7F8(UnkStruct_ov61_0222C664 *param0, int param1, int param static int ov61_0222C834(int param0); static void ov61_0222C850(UnkStruct_ov61_0222C664 *param0); static void ov61_0222C86C(UnkStruct_ov61_0222C664 *param0); -static UIControlData *ov61_0222C884(BGL *param0, int param1, int param2); +static UIControlData *ov61_0222C884(BgConfig *param0, int param1, int param2); static void ov61_0222C8B8(UnkStruct_ov61_0222C664 *param0, MessageLoader *param1, int param2, int param3, u16 param4); static void ov61_0222C920(UnkStruct_ov61_0222C664 *param0, int param1, int param2); static BOOL ov61_0222C928(int param0, int param1); @@ -289,7 +289,7 @@ static void ov61_0222C1FC(void *param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov61_0222C224(BGL *param0) +static void ov61_0222C224(BgConfig *param0) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -419,7 +419,7 @@ static void ov61_0222C224(BGL *param0) sub_02019690(4, 32, 0, 117); } -static void ov61_0222C38C(BGL *param0) +static void ov61_0222C38C(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -429,7 +429,7 @@ static void ov61_0222C38C(BGL *param0) static void ov61_0222C3B0(UnkStruct_ov61_0222C664 *param0) { - BGL *v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; NARC *v1; v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 117); @@ -551,7 +551,7 @@ static void ov61_0222C86C(UnkStruct_ov61_0222C664 *param0) } } -static UIControlData *ov61_0222C884(BGL *param0, int param1, int param2) +static UIControlData *ov61_0222C884(BgConfig *param0, int param1, int param2) { UnkStruct_ov61_0222C884 v0; diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index a89074ead9..a7d6636bb0 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -43,7 +43,7 @@ #include "unk_0208BA78.h" #include "unk_0208C010.h" -static void ov62_0222F670(BGL *param0); +static void ov62_0222F670(BgConfig *param0); static void ov62_0222F848(UnkStruct_0208C06C *param0); void ov62_0222F2C0(UnkStruct_0208C06C *param0) @@ -226,7 +226,7 @@ static const BgTemplate Unk_ov62_02248820[] = { { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xd800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0 } }; -static void ov62_0222F670(BGL *param0) +static void ov62_0222F670(BgConfig *param0) { GXLayers_DisableEngineALayers(); diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index 70e31fd426..5ac017d6eb 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -45,7 +45,7 @@ static const u8 Unk_ov62_022488A8[][5] = { void ov62_022300D8(UnkStruct_0208C06C *param0) { NARC *v0 = param0->unk_14.unk_00; - BGL *v1 = param0->unk_14.unk_10; + BgConfig *v1 = param0->unk_14.unk_10; SpriteRenderer *v2 = param0->unk_14.unk_04; SpriteGfxHandler *v3 = param0->unk_14.unk_08; PaletteData *v4 = param0->unk_14.unk_14; @@ -76,7 +76,7 @@ void ov62_022300D8(UnkStruct_0208C06C *param0) void ov62_022302A8(UnkStruct_0208C06C *param0, int param1, BOOL param2) { NARC *v0 = param0->unk_14.unk_00; - BGL *v1 = param0->unk_14.unk_10; + BgConfig *v1 = param0->unk_14.unk_10; SpriteRenderer *v2 = param0->unk_14.unk_04; SpriteGfxHandler *v3 = param0->unk_14.unk_08; PaletteData *v4 = param0->unk_14.unk_14; @@ -93,7 +93,7 @@ void ov62_022302A8(UnkStruct_0208C06C *param0, int param1, BOOL param2) void ov62_022302F0(UnkStruct_0208C06C *param0, int param1) { NARC *v0 = param0->unk_14.unk_00; - BGL *v1 = param0->unk_14.unk_10; + BgConfig *v1 = param0->unk_14.unk_10; SpriteRenderer *v2 = param0->unk_14.unk_04; SpriteGfxHandler *v3 = param0->unk_14.unk_08; PaletteData *v4 = param0->unk_14.unk_14; @@ -106,7 +106,7 @@ void ov62_022302F0(UnkStruct_0208C06C *param0, int param1) void ov62_02230330(UnkStruct_0208C06C *param0) { NARC *v0 = param0->unk_14.unk_00; - BGL *v1 = param0->unk_14.unk_10; + BgConfig *v1 = param0->unk_14.unk_10; SpriteRenderer *v2 = param0->unk_14.unk_04; SpriteGfxHandler *v3 = param0->unk_14.unk_08; PaletteData *v4 = param0->unk_14.unk_14; @@ -266,7 +266,7 @@ void ov62_0223069C(UnkStruct_0208C06C *param0) void ov62_022306B8(UnkStruct_0208C06C *param0) { NARC *v0 = param0->unk_14.unk_00; - BGL *v1 = param0->unk_14.unk_10; + BgConfig *v1 = param0->unk_14.unk_10; SpriteRenderer *v2 = param0->unk_14.unk_04; SpriteGfxHandler *v3 = param0->unk_14.unk_08; PaletteData *v4 = param0->unk_14.unk_14; @@ -832,7 +832,7 @@ void ov62_022312B0(UnkStruct_ov62_022312B0 *param0) void ov62_022312CC(UnkStruct_0208C06C *param0, int param1) { NARC *v0 = param0->unk_14.unk_00; - BGL *v1 = param0->unk_14.unk_10; + BgConfig *v1 = param0->unk_14.unk_10; SpriteRenderer *v2 = param0->unk_14.unk_04; SpriteGfxHandler *v3 = param0->unk_14.unk_08; PaletteData *v4 = param0->unk_14.unk_14; @@ -845,7 +845,7 @@ void ov62_022312CC(UnkStruct_0208C06C *param0, int param1) void ov62_0223131C(UnkStruct_0208C06C *param0, int param1) { NARC *v0 = param0->unk_14.unk_00; - BGL *v1 = param0->unk_14.unk_10; + BgConfig *v1 = param0->unk_14.unk_10; SpriteRenderer *v2 = param0->unk_14.unk_04; SpriteGfxHandler *v3 = param0->unk_14.unk_08; PaletteData *v4 = param0->unk_14.unk_14; @@ -858,7 +858,7 @@ void ov62_0223131C(UnkStruct_0208C06C *param0, int param1) void ov62_0223136C(UnkStruct_0208C06C *param0, int param1) { NARC *v0 = param0->unk_14.unk_00; - BGL *v1 = param0->unk_14.unk_10; + BgConfig *v1 = param0->unk_14.unk_10; SpriteRenderer *v2 = param0->unk_14.unk_04; SpriteGfxHandler *v3 = param0->unk_14.unk_08; PaletteData *v4 = param0->unk_14.unk_14; diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index aec1915317..fe25d58c6c 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -1715,7 +1715,7 @@ void ov62_0223331C(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, CellActorData *v0; SpriteTemplate v1; NARC *v2 = param1->unk_14.unk_00; - BGL *v3 = param1->unk_14.unk_10; + BgConfig *v3 = param1->unk_14.unk_10; SpriteRenderer *v4 = param1->unk_14.unk_04; SpriteGfxHandler *v5 = param1->unk_14.unk_08; PaletteData *v6 = param1->unk_14.unk_14; diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c index ac68d44e73..7e06ee7bef 100644 --- a/src/overlay062/ov62_02236CBC.c +++ b/src/overlay062/ov62_02236CBC.c @@ -87,7 +87,7 @@ static void ov62_02236CBC(UnkStruct_0208C06C *param0, int param1) static void ov62_02236CF8(UnkStruct_0208C06C *param0, int param1) { NARC *v0 = param0->unk_14.unk_00; - BGL *v1 = param0->unk_14.unk_10; + BgConfig *v1 = param0->unk_14.unk_10; SpriteRenderer *v2 = param0->unk_14.unk_04; SpriteGfxHandler *v3 = param0->unk_14.unk_08; PaletteData *v4 = param0->unk_14.unk_14; @@ -135,7 +135,7 @@ static void ov62_02236E14(UnkStruct_0208C06C *param0) { UnkStruct_ov62_02236CBC *v0 = param0->unk_860; NARC *v1 = param0->unk_14.unk_00; - BGL *v2 = param0->unk_14.unk_10; + BgConfig *v2 = param0->unk_14.unk_10; SpriteRenderer *v3 = param0->unk_14.unk_04; SpriteGfxHandler *v4 = param0->unk_14.unk_08; PaletteData *v5 = param0->unk_14.unk_14; @@ -221,7 +221,7 @@ static void ov62_022370D4(u16 *param0, u16 param1, u16 param2) static void ov62_0223712C(UnkStruct_0208C06C *param0) { UnkStruct_ov62_02236CBC *v0 = param0->unk_860; - BGL *v1 = param0->unk_14.unk_10; + BgConfig *v1 = param0->unk_14.unk_10; SpriteRenderer *v2 = param0->unk_14.unk_04; SpriteGfxHandler *v3 = param0->unk_14.unk_08; PaletteData *v4 = param0->unk_14.unk_14; @@ -262,7 +262,7 @@ static void ov62_022371CC(UnkStruct_0208C06C *param0) int v2[4 + 1]; int v3[5]; UnkStruct_ov62_02236CBC *v4 = param0->unk_860; - BGL *v5 = param0->unk_14.unk_10; + BgConfig *v5 = param0->unk_14.unk_10; SpriteRenderer *v6 = param0->unk_14.unk_04; SpriteGfxHandler *v7 = param0->unk_14.unk_08; PaletteData *v8 = param0->unk_14.unk_14; diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c index 483bbb13bc..f8e0dacc1f 100644 --- a/src/overlay062/ov62_02246B00.c +++ b/src/overlay062/ov62_02246B00.c @@ -583,7 +583,7 @@ int ov62_02247540(UnkStruct_ov62_02246BF4 *param0, int param1) void ov62_02247574(UnkStruct_ov62_02246BF4 *param0) { NARC *v0; - BGL *v1; + BgConfig *v1; SpriteRenderer *v2; SpriteGfxHandler *v3; PaletteData *v4; diff --git a/src/overlay063/ov63_0222D1C0.c b/src/overlay063/ov63_0222D1C0.c index dc7c495454..a108794e5c 100644 --- a/src/overlay063/ov63_0222D1C0.c +++ b/src/overlay063/ov63_0222D1C0.c @@ -17,7 +17,7 @@ typedef struct UnkStruct_ov63_0222D1C0_t { UnkStruct_0200C738 *unk_00; - BGL *unk_04; + BgConfig *unk_04; void *unk_08; NNSG2dScreenData *unk_0C; u32 unk_10; @@ -26,14 +26,14 @@ typedef struct UnkStruct_ov63_0222D1C0_t { u16 unk_1A; } UnkStruct_ov63_0222D1C0; -static void ov63_0222D31C(BGL *param0, int param1, const UnkStruct_ov65_0223582C *param2); +static void ov63_0222D31C(BgConfig *param0, int param1, const UnkStruct_ov65_0223582C *param2); static void ov63_0222D378(UnkStruct_ov63_0222D1C0 *param0, s16 param1, s16 param2); -static void ov63_0222D408(BGL *param0, int param1, const NNSG2dScreenData *param2, s16 param3, s16 param4); -static void ov63_0222D4F8(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); +static void ov63_0222D408(BgConfig *param0, int param1, const NNSG2dScreenData *param2, s16 param3, s16 param4); +static void ov63_0222D4F8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); static u8 ov63_0222D688(u8 param0, u8 param1); static const void *ov63_0222D6BC(const u8 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, UnkStruct_ov63_0222CC3C *param6); -UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(UnkStruct_0200C738 *param0, BGL *param1, const UnkStruct_ov65_0223582C *param2, u32 param3) +UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(UnkStruct_0200C738 *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, u32 param3) { UnkStruct_ov63_0222D1C0 *v0; @@ -75,7 +75,7 @@ void ov63_0222D228(UnkStruct_ov63_0222D1C0 *param0, const UnkStruct_ov63_0222D16 ov63_0222D378(param0, v0, v1); } -static void ov63_0222D31C(BGL *param0, int param1, const UnkStruct_ov65_0223582C *param2) +static void ov63_0222D31C(BgConfig *param0, int param1, const UnkStruct_ov65_0223582C *param2) { BgTemplate v0 = { 0, @@ -121,7 +121,7 @@ static void ov63_0222D378(UnkStruct_ov63_0222D1C0 *param0, s16 param1, s16 param sub_0201C63C(param0->unk_04, param0->unk_14, 3, v3); } -static void ov63_0222D408(BGL *param0, int param1, const NNSG2dScreenData *param2, s16 param3, s16 param4) +static void ov63_0222D408(BgConfig *param0, int param1, const NNSG2dScreenData *param2, s16 param3, s16 param4) { s16 v0, v1; s16 v2, v3; @@ -170,7 +170,7 @@ static void ov63_0222D408(BGL *param0, int param1, const NNSG2dScreenData *param ov63_0222D4F8(param0, param1, v4, v5, v0, v1, param2->rawData, v2, v3, v6, v7); } -static void ov63_0222D4F8(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) +static void ov63_0222D4F8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) { s8 v0, v1; s8 v2, v3; diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index b9f1ee2018..50abf31500 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -122,7 +122,7 @@ typedef struct { } UnkStruct_ov64_0222E060; typedef struct { - BGL * unk_00; + BgConfig *unk_00; CellActorCollection * unk_04; NNSG2dRenderSurface unk_08; UnkStruct_0200C738 unk_78; diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 62c34e805d..abaec74855 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -107,10 +107,10 @@ static u8 ov65_02234FC4(int param0); static BOOL ov65_02234FCC(UnkStruct_ov65_0222EBE0 * param0, int param1, int param2); static void ov65_0222E5E0(void * param0); static void ov65_0222E618(void); -static void ov65_0222E638(BGL * param0); +static void ov65_0222E638(BgConfig *param0); static void ov65_0222EBE0(UnkStruct_ov65_0222EBE0 * param0); static void ov65_0222EC2C(UnkStruct_ov65_0222EBE0 * param0); -static void ov65_0222EC5C(BGL * param0); +static void ov65_0222EC5C(BgConfig *param0); static void ov65_0222ECA8(UnkStruct_ov65_0222EBE0 * param0, NARC * param1); static void ov65_0222EDD0(void); static void ov65_0222EE18(UnkStruct_ov65_0222EBE0 * param0, NARC * param1); @@ -122,10 +122,10 @@ static void ov65_022302B0(UnkStruct_ov65_0222EBE0 * param0, u32 param1); static int ov65_02230164(UnkStruct_ov65_0222EBE0 * param0); static void ov65_02230298(UnkStruct_ov65_0222EBE0 * param0, u32 param1); static UnkStruct_ov65_022354D8 * ov65_0222E8D4(UnkStruct_ov65_0222EBE0 * param0, u32 param1); -static void ov65_0222E90C(BGL * param0, UnkStruct_ov65_0222E99C * param1, NARC * param2, u32 param3); +static void ov65_0222E90C(BgConfig *param0, UnkStruct_ov65_0222E99C *param1, NARC *param2, u32 param3); static void ov65_0222E99C(UnkStruct_ov65_0222E99C * param0); -static void ov65_0222E9C0(BGL * param0, UnkStruct_ov65_0222E99C * param1, u32 param2, u8 param3, u8 param4, u32 param5, u32 param6); -static void ov65_0222EA38(BGL * param0, UnkStruct_ov65_0222E99C * param1, u32 param2, u8 param3, u8 param4, u32 param5); +static void ov65_0222E9C0(BgConfig *param0, UnkStruct_ov65_0222E99C *param1, u32 param2, u8 param3, u8 param4, u32 param5, u32 param6); +static void ov65_0222EA38(BgConfig *param0, UnkStruct_ov65_0222E99C *param1, u32 param2, u8 param3, u8 param4, u32 param5); static void ov65_0222EAD0(Window * param0, UnkStruct_ov65_0222E99C * param1, u16 param2, u16 param3, u32 param4, u32 param5); static void ov65_0222EB1C(Window * param0, UnkStruct_ov65_0222E99C * param1, u16 param2, u16 param3, u32 param4); static int ov65_0222EBAC(u32 param0); @@ -964,7 +964,7 @@ static void ov65_0222E618 (void) GXLayers_SetBanks(&v0); } -static void ov65_0222E638 (BGL * param0) +static void ov65_0222E638(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1210,7 +1210,7 @@ static UnkStruct_ov65_022354D8 * ov65_0222E8D4 (UnkStruct_ov65_0222EBE0 * param0 return NULL; } -static void ov65_0222E90C (BGL * param0, UnkStruct_ov65_0222E99C * param1, NARC * param2, u32 param3) +static void ov65_0222E90C(BgConfig *param0, UnkStruct_ov65_0222E99C *param1, NARC *param2, u32 param3) { sub_02007130(param2, 13, 0, 8 * 32, 2 * 32, param3); sub_02007130(param2, 13, 4, 13 * 32, 2 * 32, param3); @@ -1239,7 +1239,7 @@ static void ov65_0222E99C (UnkStruct_ov65_0222E99C * param0) } } -static void ov65_0222E9C0 (BGL * param0, UnkStruct_ov65_0222E99C * param1, u32 param2, u8 param3, u8 param4, u32 param5, u32 param6) +static void ov65_0222E9C0(BgConfig *param0, UnkStruct_ov65_0222E99C *param1, u32 param2, u8 param3, u8 param4, u32 param5, u32 param6) { int v0; @@ -1251,7 +1251,7 @@ static void ov65_0222E9C0 (BGL * param0, UnkStruct_ov65_0222E99C * param1, u32 p sub_0201C3C0(param0, param2); } -static void ov65_0222EA38 (BGL * param0, UnkStruct_ov65_0222E99C * param1, u32 param2, u8 param3, u8 param4, u32 param5) +static void ov65_0222EA38(BgConfig *param0, UnkStruct_ov65_0222E99C *param1, u32 param2, u8 param3, u8 param4, u32 param5) { u8 v0 = 0; u8 v1 = 0; @@ -1431,7 +1431,7 @@ static void ov65_0222EC2C (UnkStruct_ov65_0222EBE0 * param0) Strbuf_Free(param0->unk_170); } -static void ov65_0222EC5C (BGL * param0) +static void ov65_0222EC5C(BgConfig *param0) { sub_02019044(param0, 7); sub_02019044(param0, 6); @@ -1446,7 +1446,7 @@ static void ov65_0222EC5C (BGL * param0) static void ov65_0222ECA8 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1) { - BGL * v0 = param0->unk_15C; + BgConfig *v0 = param0->unk_15C; GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c index e2829aa70e..e04c3f1717 100644 --- a/src/overlay065/ov65_02235060.c +++ b/src/overlay065/ov65_02235060.c @@ -66,9 +66,9 @@ static void ov65_022358F8(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *par static void ov65_02235900(UnkStruct_ov65_022358CC *param0); static void ov65_02235908(UnkStruct_ov65_022358CC *param0, u32 param1); static void ov65_02235910(UnkStruct_ov65_022358CC *param0); -static void ov65_02235918(BGL *param0, u32 param1); -static void ov65_0223591C(BGL *param0); -static void ov65_02235920(BGL *param0, u32 param1, NARC *param2); +static void ov65_02235918(BgConfig *param0, u32 param1); +static void ov65_0223591C(BgConfig *param0); +static void ov65_02235920(BgConfig *param0, u32 param1, NARC *param2); static BOOL ov65_02235BE8(UnkStruct_ov65_02235130 *param0); static void ov65_02235960(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2); static void ov65_02235A60(UnkStruct_ov65_022358CC *param0); @@ -128,7 +128,7 @@ static const u16 Unk_ov65_02238BC8[2] = { 0x2 }; -void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, BGL *param3, u32 param4, u32 param5) +void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, BgConfig *param3, u32 param4, u32 param5) { UnkStruct_ov63_0222CC3C v0; u32 v1; @@ -626,17 +626,17 @@ static void ov65_02235910(UnkStruct_ov65_022358CC *param0) ov65_02235B14(param0); } -static void ov65_02235918(BGL *param0, u32 param1) +static void ov65_02235918(BgConfig *param0, u32 param1) { return; } -static void ov65_0223591C(BGL *param0) +static void ov65_0223591C(BgConfig *param0) { return; } -static void ov65_02235920(BGL *param0, u32 param1, NARC *param2) +static void ov65_02235920(BgConfig *param0, u32 param1, NARC *param2) { sub_02007130(param2, 30, 0, 0, 8 * 32, param1); sub_0201975C(0, 0); diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index b833024d65..16ef7993e4 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -97,7 +97,7 @@ typedef struct { } UnkStruct_ov65_02237908; typedef struct { - BGL *unk_00; + BgConfig *unk_00; StringTemplate *unk_04; MessageLoader *unk_08; Strbuf *unk_0C; diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index b0f37968d2..8fa7418dc6 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -60,7 +60,7 @@ typedef struct { SaveData *unk_00; u32 unk_04; u32 unk_08; - BGL *unk_0C; + BgConfig *unk_0C; UnkStruct_ov67_0225D210 unk_10; UnkStruct_ov67_0225D210 unk_40; UnkStruct_ov67_0225D210 unk_70; @@ -73,7 +73,7 @@ static void ov67_0225CE28(void *param0); static void ov67_0225CE30(UnkStruct_ov67_0225D154 *param0, u32 param1); static void ov67_0225D154(UnkStruct_ov67_0225D154 *param0); static void ov67_0225D17C(UnkStruct_ov67_0225D154 *param0); -static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BGL *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *param9, u32 param10); +static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *param9, u32 param10); static void ov67_0225D210(UnkStruct_ov67_0225D210 *param0, u32 param1); static void ov67_0225D294(UnkStruct_ov67_0225D210 *param0); static void ov67_0225D2EC(UnkStruct_ov67_0225D210 *param0); @@ -627,7 +627,7 @@ static void ov67_0225D17C(UnkStruct_ov67_0225D154 *param0) sub_0201C2B8(param0->unk_0C); } -static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BGL *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *param9, u32 param10) +static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *param9, u32 param10) { param0->unk_00 = StringTemplate_Default(param10); param0->unk_04 = MessageLoader_Init(0, 26, param3, param10); diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index fabc14b782..e1e9015807 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -110,7 +110,7 @@ typedef struct { } UnkStruct_ov68_0225CB70; typedef struct { - BGL *unk_00; + BgConfig *unk_00; CellActorCollection *unk_04; UnkStruct_0200C738 unk_08; SpriteResourceCollection *unk_194[4]; diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index 62561b98a8..20df7d6116 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -107,7 +107,7 @@ typedef struct { } UnkStruct_ov69_0225DA74; typedef struct { - BGL *unk_00; + BgConfig *unk_00; CellActorCollection *unk_04; UnkStruct_0200C738 unk_08; SpriteResourceCollection *unk_194[4]; diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index e15da27d9a..298dd2a218 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -101,7 +101,7 @@ typedef struct { } UnkStruct_ov70_0226D844; typedef struct { - BGL *unk_00; + BgConfig *unk_00; CellActorCollection *unk_04; UnkStruct_0200C738 unk_08; SpriteResourceCollection *unk_194[4]; diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index f207ab969e..7b3d04ee63 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -39,9 +39,9 @@ typedef struct { static void ov71_0223B620(UnkStruct_ov71_0223B620 *param0); static void ov71_0223B668(UnkStruct_ov71_0223B620 *param0); static void ov71_0223B688(void); -static void ov71_0223B858(BGL *param0); +static void ov71_0223B858(BgConfig *param0); static void ov71_0223B968(UnkStruct_ov71_0223B620 *param0, NARC *param1); -static void ov71_0223BBDC(BGL *param0); +static void ov71_0223BBDC(BgConfig *param0); static BOOL ov71_0223BC20(UnkStruct_ov71_0223B620 *param0); static BOOL ov71_0223BDF8(UnkStruct_ov71_0223B620 *param0); static BOOL ov71_0223C334(UnkStruct_ov71_0223B620 *param0, const u8 *param1); @@ -63,11 +63,11 @@ static void ov71_0223C444(UnkStruct_ov71_0223C444 *param0); static void ov71_0223C44C(UnkStruct_ov71_0223C444 *param0); static void ov71_0223C45C(UnkStruct_ov71_0223C444 *param0); static void ov71_0223C4DC(const u8 *param0, u8 *param1); -static void ov71_0223C530(BGL *param0, const int param1, const u8 *param2); +static void ov71_0223C530(BgConfig *param0, const int param1, const u8 *param2); static void ov71_0223C594(const int param0); static void ov71_0223C5A4(UnkStruct_ov71_0223B620 *param0, const u8 param1); -static int ov71_0223C60C(BGL *param0, const TouchScreenRect *rect); -static int ov71_0223C654(BGL *param0, const TouchScreenRect *rect); +static int ov71_0223C60C(BgConfig *param0, const TouchScreenRect *rect); +static int ov71_0223C654(BgConfig *param0, const TouchScreenRect *rect); static const u8 Unk_ov71_0223D4B0[5] = { 0x1, @@ -533,7 +533,7 @@ static void ov71_0223B820(const u8 param0, NARC *param1) Heap_FreeToHeap(v0); } -static void ov71_0223B858(BGL *param0) +static void ov71_0223B858(BgConfig *param0) { GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN); @@ -751,7 +751,7 @@ static void ov71_0223B968(UnkStruct_ov71_0223B620 *param0, NARC *param1) ov71_0223C4DC(param0->unk_B4->unk_68, param0->unk_B8); } -static void ov71_0223BBDC(BGL *param0) +static void ov71_0223BBDC(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_OBJ, 0); @@ -1268,7 +1268,7 @@ static void ov71_0223C4DC(const u8 *param0, u8 *param1) } } -static void ov71_0223C530(BGL *param0, const int param1, const u8 *param2) +static void ov71_0223C530(BgConfig *param0, const int param1, const u8 *param2) { u16 *v0; u8 v1, v2; @@ -1317,7 +1317,7 @@ static void ov71_0223C5A4(UnkStruct_ov71_0223B620 *param0, const u8 param1) param0->unk_3382 = (param0->unk_3382 + 1) % 30; } -static int ov71_0223C60C(BGL *param0, const TouchScreenRect *rect) +static int ov71_0223C60C(BgConfig *param0, const TouchScreenRect *rect) { int v0 = sub_02022664(rect); @@ -1336,7 +1336,7 @@ static int ov71_0223C60C(BGL *param0, const TouchScreenRect *rect) return v0; } -static int ov71_0223C654(BGL *param0, const TouchScreenRect *rect) +static int ov71_0223C654(BgConfig *param0, const TouchScreenRect *rect) { int v0 = sub_02022644(rect); diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index 48632d1141..5f582c40a1 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -30,7 +30,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov71_0223D670[] = { {0x7, 0x2, 0xB, 0x1C, 0x2, 0xF, 0x1A1} }; -void ov71_0223C69C (BGL * param0, Window * param1) +void ov71_0223C69C(BgConfig *param0, Window *param1) { u8 v0; const UnkStruct_ov61_0222C884 * v1 = Unk_ov71_0223D670; diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 55c85f64c1..98ca5756d2 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -59,10 +59,10 @@ static void inline_ov72_0223E2A4(UnkStruct_ov72_0223DB98 *param0, int param1); static void ov72_0223DA48(void *param0); static void ov72_0223DA70(void); -static void ov72_0223DA90(BGL *param0); +static void ov72_0223DA90(BgConfig *param0); static void ov72_0223DB98(UnkStruct_ov72_0223DB98 *param0); static void ov72_0223DC34(UnkStruct_ov72_0223DB98 *param0); -static void ov72_0223DC6C(BGL *param0); +static void ov72_0223DC6C(BgConfig *param0); static void ov72_0223DCA8(UnkStruct_ov72_0223DB98 *param0, NARC *param1); static void ov72_0223DDA8(void); static void ov72_0223DDD8(UnkStruct_ov72_0223DB98 *param0, NARC *param1); @@ -89,7 +89,7 @@ static int ov72_0223E99C(int param0); static void ov72_0223E388(CellActor **param0, int param1); static void ov72_0223E3A8(CellActor **param0, BOOL param1); static int ov72_0223E528(UnkStruct_ov72_0223DB98 *param0, int param1); -static void ov72_0223E430(BGL *param0, UnkStruct_02015920 *param1); +static void ov72_0223E430(BgConfig *param0, UnkStruct_02015920 *param1); static void ov72_0223E9B4(u8 *param0, u8 *param1); static void *ov72_0223E060(Window *param0, Strbuf *param1, int param2, u8 param3, const u32 param4); static void ov72_0223EA18(UnkStruct_ov72_0223DB98 *param0); @@ -246,7 +246,7 @@ static void ov72_0223DA48(void *param0) { sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8((BGL *)param0); + sub_0201C2B8((BgConfig *)param0); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -269,7 +269,7 @@ static void ov72_0223DA70(void) GXLayers_SetBanks(&v0); } -static void ov72_0223DA90(BGL *param0) +static void ov72_0223DA90(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -428,7 +428,7 @@ static void ov72_0223DC34(UnkStruct_ov72_0223DB98 *param0) Strbuf_Free(param0->unk_2C); } -static void ov72_0223DC6C(BGL *param0) +static void ov72_0223DC6C(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -441,7 +441,7 @@ static void ov72_0223DC6C(BGL *param0) static void ov72_0223DCA8(UnkStruct_ov72_0223DB98 *param0, NARC *param1) { - BGL *v0 = param0->unk_00; + BgConfig *v0 = param0->unk_00; sub_02007130(param1, 0, 0, 0, 16 * 2 * 3, 39); sub_02007130(param1, 2, 4, 0, 16 * 2 * 2, 39); @@ -728,7 +728,7 @@ static void ov72_0223E408(UnkStruct_ov72_0223DB98 *param0) ov72_0223E80C(¶m0->unk_328, param0->unk_4391, param0->unk_43E6, 0); } -static void ov72_0223E430(BGL *param0, UnkStruct_02015920 *param1) +static void ov72_0223E430(BgConfig *param0, UnkStruct_02015920 *param1) { UnkStruct_02015958 v0; diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 96a61a01b6..0efffeee44 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -59,7 +59,7 @@ typedef struct { int unk_0C; int unk_10; OverlayManager *unk_14; - BGL *unk_18; + BgConfig *unk_18; Window unk_1C; int unk_2C; Window unk_30; diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c index d7e6c3667b..cde99ad64c 100644 --- a/src/overlay073/ov73_021D3250.c +++ b/src/overlay073/ov73_021D3250.c @@ -21,7 +21,7 @@ typedef struct { int unk_00; - BGL * unk_04; + BgConfig *unk_04; MessageLoader * unk_08; int unk_0C; Window unk_10; diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index 2801f2ae29..cf70642b3a 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -51,7 +51,7 @@ typedef struct UnkStruct_ov74_021D0D80_t { u32 unk_10_5 : 16; u32 unk_10_21 : 1; u32 unk_10_22 : 10; - BGL *unk_14; + BgConfig *unk_14; UnkStruct_0203D8EC unk_18; Options *unk_1C; MessageLoader *unk_20; diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 535def6957..bf42874169 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -80,7 +80,7 @@ typedef struct { u8 unk_15; u8 unk_16; u8 unk_17; - BGL *unk_18; + BgConfig *unk_18; UnkStruct_020978D8 *unk_1C; MessageLoader *unk_20; Strbuf *unk_24[3]; diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index d12118e088..4a70d082a3 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -56,12 +56,12 @@ typedef struct { UnkStruct_ov12_02225F6C unk_00[9]; CellActorData *unk_144[8]; - BGL *unk_164; + BgConfig *unk_164; int unk_168; BOOL *unk_16C; } UnkStruct_ov76_0223BCA0; -void ov76_0223BF74(BGL *param0, Window *param1, int param2, UnkStruct_ov76_0223DE00 *param3, int param4); +void ov76_0223BF74(BgConfig *param0, Window *param1, int param2, UnkStruct_ov76_0223DE00 *param3, int param4); void ov76_0223C0EC(int param0, s16 *param1, s16 *param2); void ov76_0223C110(UnkStruct_ov76_0223DE00 *param0); void ov76_0223C188(UnkStruct_ov76_0223DE00 *param0); @@ -77,10 +77,10 @@ void ov76_0223C7E0(UnkStruct_ov76_0223DE00 *param0); void ov76_0223C80C(UnkStruct_ov76_0223DE00 *param0, int param1, int param2); void ov76_0223C88C(UnkStruct_ov76_0223DE00 *param0); void ov76_0223C8BC(UnkStruct_ov76_0223DE00 *param0); -void ov76_0223C8EC(BGL *param0, PaletteData *param1, int param2); -void ov76_0223C974(BGL *param0, PaletteData *param1, int param2); +void ov76_0223C8EC(BgConfig *param0, PaletteData *param1, int param2); +void ov76_0223C974(BgConfig *param0, PaletteData *param1, int param2); void ov76_0223CA30(Window *param0, int param1); -void ov76_0223CA98(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7); +void ov76_0223CA98(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7); void ov76_0223CB58(UnkStruct_ov76_0223DE00 *param0); void ov76_0223CDA4(UnkStruct_ov76_0223DE00 *param0); void ov76_0223CDC4(Window *param0, int param1); @@ -443,7 +443,7 @@ void ov76_0223BF50(void) G3_RequestSwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); } -void ov76_0223BF74(BGL *param0, Window *param1, int param2, UnkStruct_ov76_0223DE00 *param3, int param4) +void ov76_0223BF74(BgConfig *param0, Window *param1, int param2, UnkStruct_ov76_0223DE00 *param3, int param4) { UnkStruct_02081CF4 v0; int v1; @@ -922,7 +922,7 @@ void ov76_0223C8BC(UnkStruct_ov76_0223DE00 *param0) sub_0200D0F4(param0->unk_2F4[1]); } -void ov76_0223C8EC(BGL *param0, PaletteData *param1, int param2) +void ov76_0223C8EC(BgConfig *param0, PaletteData *param1, int param2) { sub_0200DD0C(param0, 1, 1, 15, param2, 53); PaletteSys_LoadPalette(param1, 38, sub_0200DD08(param2), 53, 0, 0x20, 12 * 16); @@ -931,7 +931,7 @@ void ov76_0223C8EC(BGL *param0, PaletteData *param1, int param2) PaletteSys_LoadPalette(param1, 14, 7, 53, 0, 0x20, 14 * 16); } -void ov76_0223C974(BGL *param0, PaletteData *param1, int param2) +void ov76_0223C974(BgConfig *param0, PaletteData *param1, int param2) { sub_0200DD0C(param0, 4, 1, 15, param2, 53); PaletteSys_LoadPalette(param1, 38, sub_0200DD08(param2), 53, 1, 0x20, 12 * 16); @@ -963,7 +963,7 @@ void ov76_0223CA30(Window *param0, int param1) MessageLoader_Free(v0); } -void ov76_0223CA98(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7) +void ov76_0223CA98(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7) { Window_Init(param1); BGL_AddWindow(param0, param1, param2, param3, param4, param5, param6, 14, param7); @@ -972,7 +972,7 @@ void ov76_0223CA98(BGL *param0, Window *param1, int param2, int param3, int para sub_0201A954(param1); } -static void ov76_0223CAFC(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) +static void ov76_0223CAFC(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { Window_Init(param1); BGL_AddWindow(param0, param1, param2, param3, param4, param5, param6, param8, param7); diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index a8e5ae0aea..7dfa9e9564 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -1325,7 +1325,7 @@ void ov76_0223EB54(int param0) DisableHBlank(); } -void ov76_0223EB64(BGL *param0) +void ov76_0223EB64(BgConfig *param0) { GXLayers_DisableEngineALayers(); diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index 6d5a9e0d78..e8a713d6bb 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -102,7 +102,7 @@ typedef struct { typedef struct { int unk_00; - BGL *unk_04; + BgConfig *unk_04; GenericPointerData *unk_08; UnkStruct_ov77_021D17B4_sub1 unk_0C; UnkStruct_ov77_021D1568 unk_238; @@ -118,7 +118,7 @@ extern const OverlayManagerTemplate Unk_020F8A48; extern const OverlayManagerTemplate Unk_020F8AB4; extern const OverlayManagerTemplate Unk_ov77_021D788C; -static void ov77_021D1D48(BGL *param0, int param1); +static void ov77_021D1D48(BgConfig *param0, int param1); void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1); static int ov77_021D0D80(OverlayManager *param0, int *param1); static int ov77_021D0E3C(OverlayManager *param0, int *param1); @@ -133,17 +133,17 @@ static void ov77_021D1208(UnkStruct_ov77_021D1208 *param0, int param1, int param static void ov77_021D14E4(UnkStruct_ov77_021D1208 *param0); static void ov77_021D1568(UnkStruct_ov77_021D1568 *param0, UnkStruct_ov77_021D1208 *param1); static BOOL ov77_021D11A4(void); -static BOOL ov77_021D1A60(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2); -static BOOL ov77_021D1DF0(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2); -static BOOL ov77_021D20E4(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2); -static BOOL ov77_021D21C0(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2); +static BOOL ov77_021D1A60(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int param2); +static BOOL ov77_021D1DF0(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int param2); +static BOOL ov77_021D20E4(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int param2); +static BOOL ov77_021D21C0(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int param2); static void ov77_021D1300(UnkStruct_ov77_021D1208 *param0, int param1); static void ov77_021D1514(UnkStruct_ov77_021D1208 *param0); static void ov77_021D1704(UnkStruct_ov77_021D1208 *param0); static void ov77_021D1984(UnkStruct_ov77_021D1568 *param0, UnkStruct_ov77_021D1208 *param1); static void ov77_021D25AC(Camera *camera); -static void ov77_021D2214(BGL *param0, int param1, UnkStruct_ov77_021D1568 *param2); -static void ov77_021D2428(BGL *param0, int param1, UnkStruct_ov77_021D1568 *param2); +static void ov77_021D2214(BgConfig *param0, int param1, UnkStruct_ov77_021D1568 *param2); +static void ov77_021D2428(BgConfig *param0, int param1, UnkStruct_ov77_021D1568 *param2); static void ov77_021D24C8(UnkStruct_ov77_021D1568 *param0); static void ov77_021D2438(UnkStruct_ov77_021D1568 *param0); @@ -841,7 +841,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov77_021D72D0 = { 0x1 }; -static BOOL ov77_021D1A60(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2) +static BOOL ov77_021D1A60(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int param2) { ov77_021D24C8(param0); ov77_021D2214(param1, param2, param0); @@ -926,7 +926,7 @@ static void ov77_021D1C10(UnkStruct_ov77_021D1568 *param0) param0->unk_248.z += (v1); } -static void ov77_021D1CC0(BGL *param0, int param1) +static void ov77_021D1CC0(BgConfig *param0, int param1) { sub_02019044(param0, 5); { @@ -958,7 +958,7 @@ static void ov77_021D1CC0(BGL *param0, int param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1); } -static void ov77_021D1D48(BGL *param0, int param1) +static void ov77_021D1D48(BgConfig *param0, int param1) { sub_02019044(param0, 4); @@ -997,7 +997,7 @@ static void ov77_021D1D48(BGL *param0, int param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); } -static BOOL ov77_021D1DF0(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2) +static BOOL ov77_021D1DF0(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int param2) { BOOL v0 = 0; @@ -1135,7 +1135,7 @@ static BOOL ov77_021D1DF0(UnkStruct_ov77_021D1568 *param0, BGL *param1, int para return v0; } -static BOOL ov77_021D20E4(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2) +static BOOL ov77_021D20E4(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int param2) { BOOL v0 = 0; @@ -1195,7 +1195,7 @@ static BOOL ov77_021D20E4(UnkStruct_ov77_021D1568 *param0, BGL *param1, int para return v0; } -static BOOL ov77_021D21C0(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2) +static BOOL ov77_021D21C0(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int param2) { Camera_Delete(param0->unk_04.camera1); Camera_Delete(param0->unk_04.camera2); @@ -1212,7 +1212,7 @@ static BOOL ov77_021D21C0(UnkStruct_ov77_021D1568 *param0, BGL *param1, int para return 1; } -static void ov77_021D2214(BGL *param0, int param1, UnkStruct_ov77_021D1568 *param2) +static void ov77_021D2214(BgConfig *param0, int param1, UnkStruct_ov77_021D1568 *param2) { { int v0, v1; @@ -1282,7 +1282,7 @@ static void ov77_021D2214(BGL *param0, int param1, UnkStruct_ov77_021D1568 *para } } -static void ov77_021D2428(BGL *param0, int param1, UnkStruct_ov77_021D1568 *param2) +static void ov77_021D2428(BgConfig *param0, int param1, UnkStruct_ov77_021D1568 *param2) { BGL_DeleteWindow(¶m2->unk_22C); } diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c index 1bc09e2c3b..f41510ffb5 100644 --- a/src/overlay077/ov77_021D25B0.c +++ b/src/overlay077/ov77_021D25B0.c @@ -69,7 +69,7 @@ typedef struct { u8 unk_06; u8 unk_07; u8 unk_08; - BGL *unk_0C; + BgConfig *unk_0C; SysTask *unk_10; UnkStruct_ov77_021D670C *unk_14; u8 *unk_18; @@ -87,7 +87,7 @@ typedef struct { u8 unk_08; u8 unk_09; int unk_0C; - BGL *unk_10; + BgConfig *unk_10; UnkStruct_ov77_021D5564 *unk_14; UnkStruct_ov77_021D6734 *unk_18; UnkStruct_ov77_021D6CFC *unk_1C; @@ -120,7 +120,7 @@ typedef struct { u8 unk_02; u8 unk_03; fx32 unk_04; - BGL *unk_08; + BgConfig *unk_08; UnkStruct_ov77_021D5308_sub1 unk_0C; } UnkStruct_ov77_021D5308; @@ -128,7 +128,7 @@ typedef struct { int unk_00; int unk_04; BOOL unk_08; - BGL *unk_0C; + BgConfig *unk_0C; GenericPointerData *unk_10; u32 unk_14; UnkStruct_ov77_021D2F38 unk_18; diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index 69a56fb4e8..9c6750ac10 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -107,7 +107,7 @@ typedef struct { UnkStruct_ov79_021D3820 unk_40; UnkStruct_0209903C *unk_5C; UnkStruct_0209916C *unk_60[2]; - BGL *unk_68; + BgConfig *unk_68; Window unk_6C; SpriteRenderer *unk_7C; UnkStruct_ov79_021D29B4 unk_80; diff --git a/src/overlay080/ov80_021D0D80.c b/src/overlay080/ov80_021D0D80.c index 33602dd24a..4814cb64c6 100644 --- a/src/overlay080/ov80_021D0D80.c +++ b/src/overlay080/ov80_021D0D80.c @@ -33,7 +33,7 @@ int ov80_021D0E50(OverlayManager *param0, int *param1); static void ov80_021D0E68(void *param0); static void ov80_021D0EA8(void); static int ov80_021D0EC8(UnkStruct_ov80_021D2A08 *param0); -static void ov80_021D1088(UnkStruct_ov80_021D2A08 *param0, BGL *param1); +static void ov80_021D1088(UnkStruct_ov80_021D2A08 *param0, BgConfig *param1); static void ov80_021D1158(UnkStruct_ov80_021D2A08 *param0); static void ov80_021D12D8(UnkStruct_ov80_021D2A08 *param0); static void ov80_021D0FF4(UnkStruct_ov80_021D2A08 *param0); @@ -276,7 +276,7 @@ static void ov80_021D1068(UnkStruct_ov80_021D2A08 *param0) ov80_021D2AE0(param0); } -static void ov80_021D1088(UnkStruct_ov80_021D2A08 *param0, BGL *param1) +static void ov80_021D1088(UnkStruct_ov80_021D2A08 *param0, BgConfig *param1) { int v0, v1; diff --git a/src/overlay081/ov81_021D0D80.c b/src/overlay081/ov81_021D0D80.c index 652c18ce04..fd638b8fe0 100644 --- a/src/overlay081/ov81_021D0D80.c +++ b/src/overlay081/ov81_021D0D80.c @@ -34,8 +34,8 @@ static void ov81_021D0F00(void *param0); static void ov81_021D0F20(void); -static void ov81_021D0F40(BGL *param0); -static void ov81_021D101C(BGL *param0); +static void ov81_021D0F40(BgConfig *param0); +static void ov81_021D101C(BgConfig *param0); static void ov81_021D1050(UnkStruct_ov81_021D1610 *param0); static void ov81_021D1130(UnkStruct_ov81_021D1610 *param0); static void ov81_021D115C(UnkStruct_ov81_021D1610 *param0); @@ -179,7 +179,7 @@ static void ov81_021D0F20(void) GXLayers_SetBanks(&v0); } -static void ov81_021D0F40(BGL *param0) +static void ov81_021D0F40(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -275,7 +275,7 @@ static void ov81_021D0F40(BGL *param0) sub_02019690(1, 32, 0, 42); } -static void ov81_021D101C(BGL *param0) +static void ov81_021D101C(BgConfig *param0) { GXLayers_DisableEngineALayers(); sub_02019044(param0, 3); diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index 3fbd8626d2..07a227057e 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -26,8 +26,8 @@ #include "unk_0201F834.h" #include "unk_0202419C.h" -static void ov83_0223CC30(BGL **param0, int param1); -static void ov83_0223CCCC(BGL **param0); +static void ov83_0223CC30(BgConfig **param0, int param1); +static void ov83_0223CCCC(BgConfig **param0); static void ov83_0223CCF8(UnkStruct_ov83_0223B784 *param0); static void ov83_0223CD1C(UnkStruct_ov83_0223B784 *param0); static void ov83_0223CD28(UnkStruct_ov83_0223B784 *param0); @@ -163,7 +163,7 @@ static void ov83_0223CC10(void) GXLayers_SetBanks(&v0); } -static void ov83_0223CC30(BGL **param0, int param1) +static void ov83_0223CC30(BgConfig **param0, int param1) { int v0 = 0, v1; @@ -259,7 +259,7 @@ static void ov83_0223CC30(BGL **param0, int param1) } } -static void ov83_0223CCCC(BGL **param0) +static void ov83_0223CCCC(BgConfig **param0) { sub_02019044(*param0, 5); sub_02019044(*param0, 4); diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c index b1a8b11dde..41787f40d6 100644 --- a/src/overlay083/ov83_0223D6A8.c +++ b/src/overlay083/ov83_0223D6A8.c @@ -541,7 +541,7 @@ void ov83_0223DEC4(UnkStruct_ov83_0223E138 *param0) memset(param0, 0, sizeof(UnkStruct_ov83_0223E138)); } -void ov83_0223DEE0(UnkStruct_ov83_0223E138 *param0, BGL *param1, u32 param2, NARC *param3) +void ov83_0223DEE0(UnkStruct_ov83_0223E138 *param0, BgConfig *param1, u32 param2, NARC *param3) { GF_ASSERT(param0->unk_30 == 0); @@ -1025,7 +1025,7 @@ void ov83_0223E6F8(UnkStruct_ov83_0223E824 *param0) memset(param0, 0, sizeof(UnkStruct_ov83_0223E824)); } -void ov83_0223E720(UnkStruct_ov83_0223E824 *param0, BGL *param1, u32 param2, NARC *param3) +void ov83_0223E720(UnkStruct_ov83_0223E824 *param0, BgConfig *param1, u32 param2, NARC *param3) { GF_ASSERT(param0->unk_28 == 0); @@ -1841,7 +1841,7 @@ void ov83_0223F784(UnkStruct_ov83_0223F770 *param0) sub_02099160(param0->unk_00); } -void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int param1, BGL *param2) +void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int param1, BgConfig *param2) { param0->unk_00 = sub_02015920(param1); param0->unk_04 = param2; diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index f00bad7549..3518c794e8 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -68,8 +68,8 @@ typedef int (*UnkFuncPtr_ov84_0223DA04)(UnkStruct_ov84_0223B5A0 *); static void ov84_0223B9AC(UnkStruct_ov84_0223B5A0 *param0); static void ov84_0223BA14(void *param0); static void ov84_0223BA3C(void); -static void ov84_0223BA5C(BGL *param0); -static void ov84_0223BBC4(BGL *param0); +static void ov84_0223BA5C(BgConfig *param0); +static void ov84_0223BBC4(BgConfig *param0); static void ov84_0223BC1C(UnkStruct_ov84_0223B5A0 *param0); static u8 ov84_0223C5B8(UnkStruct_ov84_0223B5A0 *param0); static u8 ov84_0223C750(UnkStruct_ov84_0223B5A0 *param0); @@ -650,7 +650,7 @@ static void ov84_0223BA3C(void) GXLayers_SetBanks(&v0); } -static void ov84_0223BA5C(BGL *param0) +static void ov84_0223BA5C(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -798,7 +798,7 @@ static void ov84_0223BA5C(BGL *param0) sub_02019690(4, 32, 0, 6); } -static void ov84_0223BBC4(BGL *param0) +static void ov84_0223BBC4(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index 0ef1e4ed46..62540eb57e 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -42,7 +42,7 @@ typedef struct { } UnkStruct_ov85_022420A8; typedef struct { - BGL *unk_00; + BgConfig *unk_00; Window unk_04[12]; MessageLoader *unk_C4; StringTemplate *unk_C8; @@ -68,8 +68,8 @@ typedef struct { static void ov85_022415F4(void *param0); static void ov85_02241614(void); -static void ov85_02241634(BGL *param0); -static void ov85_022416E8(BGL *param0); +static void ov85_02241634(BgConfig *param0); +static void ov85_022416E8(BgConfig *param0); static void ov85_02241718(UnkStruct_ov85_022417E4 *param0, NARC *param1); static void ov85_022417CC(void); static void ov85_022417E4(UnkStruct_ov85_022417E4 *param0); @@ -329,7 +329,7 @@ static void ov85_02241614(void) GXLayers_SetBanks(&v0); } -static void ov85_02241634(BGL *param0) +static void ov85_02241634(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -409,7 +409,7 @@ static void ov85_02241634(BGL *param0) sub_02019690(1, 32, 0, 36); } -static void ov85_022416E8(BGL *param0) +static void ov85_022416E8(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 0); sub_02019044(param0, 3); diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index ca7615ec38..017d0a9688 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -60,7 +60,7 @@ typedef struct { int unk_04; int unk_08; UnkStruct_0203E234 *unk_0C; - BGL *unk_10; + BgConfig *unk_10; Window unk_14; CellActorCollection *unk_24; UnkStruct_0200C738 unk_28; @@ -170,7 +170,7 @@ typedef struct { typedef struct { UnkStruct_ov86_0223BDAC unk_00; UnkStruct_ov86_0223B3C8 *unk_08; - BGL *unk_0C; + BgConfig *unk_0C; Window *unk_10; StringTemplate *unk_14; Strbuf *unk_18; @@ -186,7 +186,7 @@ typedef struct { typedef struct { UnkStruct_ov86_0223BDAC unk_00; UnkStruct_ov86_0223B3C8 *unk_08; - BGL *unk_0C; + BgConfig *unk_0C; Window *unk_10; UnkStruct_ov86_0223D264 unk_14; int unk_28; diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index e065260fa2..a296462564 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -38,7 +38,7 @@ typedef struct UnkStruct_ov87_021D106C_t { const UnkStruct_ov87_021D12C0 *unk_04; int unk_08; int unk_0C; - BGL *unk_10; + BgConfig *unk_10; Window unk_14[2]; CellActorCollection *unk_34; UnkStruct_0200C738 unk_38; diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 784d3614d3..70cd32ec46 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -95,11 +95,11 @@ static void ov88_0223B2F0(NNSG2dCharacterData *param0, int param1, int param2, i static void ov88_0223B320(UnkStruct_02095E80 *param0); static void ov88_0223C0E0(void *param0); static void ov88_0223C15C(void); -static void ov88_0223C17C(BGL *param0); +static void ov88_0223C17C(BgConfig *param0); static void ov88_0223C63C(void); static void ov88_0223C370(UnkStruct_02095E80 *param0, OverlayManager *param1); -static void ov88_0223C44C(BGL *param0); -static void ov88_0223C4E0(BGL *param0, int param1, int param2); +static void ov88_0223C44C(BgConfig *param0); +static void ov88_0223C4E0(BgConfig *param0, int param1, int param2); static void ov88_0223C504(UnkStruct_02095E80 *param0, NARC *param1); static void ov88_0223C66C(UnkStruct_02095E80 *param0, NARC *param1); static void ov88_0223CBA0(UnkStruct_02095E80 *param0); @@ -168,7 +168,7 @@ static int ov88_0223D854(UnkStruct_02095E80 *param0); static int ov88_0223D69C(UnkStruct_02095E80 *param0); static void ov88_0223D1EC(UnkStruct_02095E80 *param0, int param1); static void ov88_0223D0D4(TrainerInfo *param0, UnkStruct_02027F8C *param1, UnkStruct_02027F8C *param2); -static void ov88_0223C488(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +static void ov88_0223C488(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); static const int Unk_ov88_0223EF9C[][2] = { { 0x0, 0x20 }, @@ -939,7 +939,7 @@ static void ov88_0223C15C(void) GXLayers_SetBanks(&v0); } -static void ov88_0223C17C(BGL *param0) +static void ov88_0223C17C(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1161,7 +1161,7 @@ static void ov88_0223C370(UnkStruct_02095E80 *param0, OverlayManager *param1) sub_02038F8C(v0->unk_14); } -static void ov88_0223C44C(BGL *param0) +static void ov88_0223C44C(BgConfig *param0) { sub_02019044(param0, 6); sub_02019044(param0, 5); @@ -1173,7 +1173,7 @@ static void ov88_0223C44C(BGL *param0) sub_02019044(param0, 0); } -static void ov88_0223C488(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +static void ov88_0223C488(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { void *v0 = sub_0200723C(param0, param1, param6, param7, 1); @@ -1194,7 +1194,7 @@ static void ov88_0223C488(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 } } -static void ov88_0223C4E0(BGL *param0, int param1, int param2) +static void ov88_0223C4E0(BgConfig *param0, int param1, int param2) { int v0; sub_02019460(param0, 2, sub_02019FE4(param0, 2), 32 * 24 * 2, 0); @@ -1202,7 +1202,7 @@ static void ov88_0223C4E0(BGL *param0, int param1, int param2) static void ov88_0223C504(UnkStruct_02095E80 *param0, NARC *param1) { - BGL *v0 = param0->unk_174; + BgConfig *v0 = param0->unk_174; sub_02007130(param1, 0, 4, 0, 16 * 9 * 2, 26); sub_02007130(param1, 0, 0, 0, 16 * 9 * 2, 26); diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c index 8d503acc63..4aafc074d2 100644 --- a/src/overlay088/ov88_0223E9C4.c +++ b/src/overlay088/ov88_0223E9C4.c @@ -52,7 +52,7 @@ static const u16 Unk_ov88_0223F170[][2] = { { 0x14, 0xA } }; -void ov88_0223E9C4(BGL *param0, Window *param1, Options *param2) +void ov88_0223E9C4(BgConfig *param0, Window *param1, Options *param2) { int v0; @@ -160,7 +160,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov88_0223F148 = { 0x112 }; -u32 ov88_0223ED2C(BGL *param0, UIControlData **param1, int *param2) +u32 ov88_0223ED2C(BgConfig *param0, UIControlData **param1, int *param2) { u32 v0 = 0xffffffff; @@ -207,7 +207,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov88_0223F150 = { NULL }; -BmpList *ov88_0223ED94(ResourceMetadata *param0, int param1, Window *param2, BGL *param3) +BmpList *ov88_0223ED94(ResourceMetadata *param0, int param1, Window *param2, BgConfig *param3) { BmpList *v0; UnkStruct_ov84_02240FA8 v1; diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 40598096bb..43f26785e3 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -79,7 +79,7 @@ typedef struct { u8 unk_0D; u8 unk_0E; u8 unk_0F; - BGL *unk_10; + BgConfig *unk_10; UnkStruct_ov90_021D0D80 *unk_14; Options *unk_18; UnkStruct_0203068C *unk_1C; diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 8b86a5438b..e1beb76231 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -56,7 +56,7 @@ typedef struct { UnkStruct_020997B8 *unk_00; - BGL *unk_04; + BgConfig *unk_04; Window unk_08[15]; MessageLoader *unk_F8; StringTemplate *unk_FC; @@ -86,8 +86,8 @@ static void ov91_021D0ED8(UnkStruct_ov91_021D0ED8 *param0); static void ov91_021D0F6C(UnkStruct_ov91_021D0ED8 *param0); static void ov91_021D0F9C(void *param0); static void ov91_021D0FC4(void); -static void ov91_021D0FE4(BGL *param0); -static void ov91_021D1098(BGL *param0); +static void ov91_021D0FE4(BgConfig *param0); +static void ov91_021D1098(BgConfig *param0); static void ov91_021D10C8(UnkStruct_ov91_021D0ED8 *param0, NARC *param1); static void ov91_021D1154(UnkStruct_ov91_021D0ED8 *param0); static void ov91_021D11A0(UnkStruct_ov91_021D0ED8 *param0); @@ -514,7 +514,7 @@ static void ov91_021D0FC4(void) GXLayers_SetBanks(&v0); } -static void ov91_021D0FE4(BGL *param0) +static void ov91_021D0FE4(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -593,7 +593,7 @@ static void ov91_021D0FE4(BGL *param0) sub_02019690(0, 32, 0, 67); } -static void ov91_021D1098(BGL *param0) +static void ov91_021D1098(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_OBJ, 0); sub_02019044(param0, 2); diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index f28ca4f688..b7c1662228 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -75,7 +75,7 @@ typedef struct { UnkStruct_0202C878 *unk_04; Options *unk_08; UnkStruct_ov92_021D1B24_sub1 unk_0C; - BGL *unk_B810; + BgConfig *unk_B810; Window unk_B814; Window unk_B824; Window unk_B834; diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index 153263a8c4..bf1957d9fb 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -408,7 +408,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov94_022459F8 = { 0x0 }; -UIControlData *ov94_0223C3C0(BGL *param0, int param1, int param2) +UIControlData *ov94_0223C3C0(BgConfig *param0, int param1, int param2) { UnkStruct_ov61_0222C884 v0; diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index a878969f2f..265b39a5cf 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -30,8 +30,8 @@ #include "unk_0200F174.h" #include "unk_020393C8.h" -static void ov94_0223C720(BGL *param0); -static void ov94_0223C830(BGL *param0); +static void ov94_0223C720(BgConfig *param0); +static void ov94_0223C830(BgConfig *param0); static void ov94_0223C888(UnkStruct_ov94_0223FD4C *param0); static void ov94_0223C950(UnkStruct_ov94_0223FD4C *param0); static void ov94_0223C9B0(UnkStruct_ov94_0223FD4C *param0); @@ -132,7 +132,7 @@ int ov94_0223C6F4(UnkStruct_ov94_0223FD4C *param0, int param1) return 1; } -static void ov94_0223C720(BGL *param0) +static void ov94_0223C720(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -254,7 +254,7 @@ static void ov94_0223C720(BGL *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov94_0223C830(BGL *param0) +static void ov94_0223C830(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -273,7 +273,7 @@ static void ov94_0223C85C(UnkStruct_ov94_0223FD4C *param0) static void ov94_0223C888(UnkStruct_ov94_0223FD4C *param0) { - BGL *v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; NARC *v1; v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); @@ -615,7 +615,7 @@ void ov94_0223D030(Window *param0, MessageLoader *param1, int param2, u16 param3 void ov94_0223D068(UnkStruct_ov94_0223FD4C *param0) { - BGL *v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; sub_02006E84(104, 5, 4, 0, 16 * 16 * 2, 62); sub_02006E3C(104, 15, v0, 5, 0, 32 * 21 * 0x40, 1, 62); diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index 37a9fb290b..0f011f6fb6 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -40,8 +40,8 @@ #include "unk_02013A04.h" #include "unk_020393C8.h" -static void ov94_0223D1D4(BGL *param0); -static void ov94_0223D2BC(BGL *param0); +static void ov94_0223D1D4(BgConfig *param0); +static void ov94_0223D2BC(BgConfig *param0); static void ov94_0223D2E8(UnkStruct_ov94_0223FD4C *param0); static void ov94_0223D438(UnkStruct_ov94_0223FD4C *param0); static void ov94_0223D504(UnkStruct_ov94_0223FD4C *param0); @@ -116,7 +116,7 @@ int ov94_0223D1B0(UnkStruct_ov94_0223FD4C *param0, int param1) return 1; } -static void ov94_0223D1D4(BGL *param0) +static void ov94_0223D1D4(BgConfig *param0) { { BgTemplate v0 = { @@ -224,7 +224,7 @@ static void ov94_0223D1D4(BGL *param0) sub_02019690(4, 32, 0, 62); } -static void ov94_0223D2BC(BGL *param0) +static void ov94_0223D2BC(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -235,7 +235,7 @@ static void ov94_0223D2BC(BGL *param0) static void ov94_0223D2E8(UnkStruct_ov94_0223FD4C *param0) { - BGL *v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; NARC *v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); sub_02007130(v1, 7, 0, 0, 16 * 3 * 2, 62); diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index 41f923eb72..067fee0da6 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -31,8 +31,8 @@ #include "unk_0200F174.h" #include "unk_020393C8.h" -static void ov94_0223DD1C(BGL *param0); -static void ov94_0223DDE0(BGL *param0); +static void ov94_0223DD1C(BgConfig *param0); +static void ov94_0223DDE0(BgConfig *param0); static void ov94_0223DE04(UnkStruct_ov94_0223FD4C *param0); static void ov94_0223DED8(UnkStruct_ov94_0223FD4C *param0); static void ov94_0223DFA4(UnkStruct_ov94_0223FD4C *param0); @@ -106,7 +106,7 @@ int ov94_0223DCF8(UnkStruct_ov94_0223FD4C *param0, int param1) return 1; } -static void ov94_0223DD1C(BGL *param0) +static void ov94_0223DD1C(BgConfig *param0) { { BgTemplate v0 = { @@ -194,7 +194,7 @@ static void ov94_0223DD1C(BGL *param0) sub_02019690(4, 32, 0, 62); } -static void ov94_0223DDE0(BGL *param0) +static void ov94_0223DDE0(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -204,7 +204,7 @@ static void ov94_0223DDE0(BGL *param0) static void ov94_0223DE04(UnkStruct_ov94_0223FD4C *param0) { - BGL *v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 62); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 62b739424b..6b8a8ed7e6 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -40,8 +40,8 @@ #include "unk_020366A0.h" #include "unk_020393C8.h" -static void ov94_0223E598(BGL *param0); -static void ov94_0223E684(BGL *param0); +static void ov94_0223E598(BgConfig *param0); +static void ov94_0223E684(BgConfig *param0); static void ov94_0223E6B8(UnkStruct_ov94_0223FD4C *param0); static void ov94_0223E770(UnkStruct_ov94_0223FD4C *param0); static void ov94_0223E7C4(UnkStruct_ov94_0223FD4C *param0); @@ -168,7 +168,7 @@ int ov94_0223E574(UnkStruct_ov94_0223FD4C *param0, int param1) return 1; } -static void ov94_0223E598(BGL *param0) +static void ov94_0223E598(BgConfig *param0) { { BgTemplate v0 = { @@ -260,7 +260,7 @@ static void ov94_0223E598(BGL *param0) sub_02019690(4, 32, 0, 62); } -static void ov94_0223E684(BGL *param0) +static void ov94_0223E684(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -272,7 +272,7 @@ static void ov94_0223E684(BGL *param0) static void ov94_0223E6B8(UnkStruct_ov94_0223FD4C *param0) { - BGL *v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; NARC *v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); sub_02007130(v1, 3, 0, 0, 16 * 3 * 2, 62); diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 3058fa6acd..d0a8f105a9 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -50,8 +50,8 @@ typedef struct { u8 unk_0C[512]; } UnkStruct_ov94_02240FA0; -static void ov94_0223FC08(BGL *param0); -static void ov94_0223FD20(BGL *param0); +static void ov94_0223FC08(BgConfig *param0); +static void ov94_0223FD20(BgConfig *param0); static void ov94_0223FD4C(UnkStruct_ov94_0223FD4C *param0); static void ov94_0223FE24(UnkStruct_ov94_0223FD4C *param0); static void ov94_0223FFC8(UnkStruct_ov94_0223FD4C *param0); @@ -160,7 +160,7 @@ int ov94_0223FBDC(UnkStruct_ov94_0223FD4C *param0, int param1) return 1; } -static void ov94_0223FC08(BGL *param0) +static void ov94_0223FC08(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -282,7 +282,7 @@ static void ov94_0223FC08(BGL *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov94_0223FD20(BGL *param0) +static void ov94_0223FD20(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -293,7 +293,7 @@ static void ov94_0223FD20(BGL *param0) static void ov94_0223FD4C(UnkStruct_ov94_0223FD4C *param0) { - BGL *v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; NARC *v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); sub_02007130(v1, 2, 0, 0, 16 * 3 * 2, 62); diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 08cae888c8..865c97b16f 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -56,8 +56,8 @@ typedef struct { } UnkStruct_ov94_022460AC; static void ov94_0224158C(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4); -static void ov94_022415F8(BGL *param0); -static void ov94_022416E0(BGL *param0); +static void ov94_022415F8(BgConfig *param0); +static void ov94_022416E0(BgConfig *param0); static void ov94_0224170C(UnkStruct_ov94_0223FD4C *param0); static void ov94_022417A0(UnkStruct_ov94_0223FD4C *param0); static void ov94_02241880(UnkStruct_ov94_0223FD4C *param0); @@ -335,7 +335,7 @@ static void ov94_0224158C(UnkStruct_ov94_0223FD4C *param0, int param1, int param Strbuf_Free(v0); } -static void ov94_022415F8(BGL *param0) +static void ov94_022415F8(BgConfig *param0) { { BgTemplate v0 = { @@ -443,7 +443,7 @@ static void ov94_022415F8(BGL *param0) sub_02019690(4, 32, 0, 62); } -static void ov94_022416E0(BGL *param0) +static void ov94_022416E0(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -454,7 +454,7 @@ static void ov94_022416E0(BGL *param0) static void ov94_0224170C(UnkStruct_ov94_0223FD4C *param0) { - BGL *v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; sub_02006E84(104, 1, 0, 0, 16 * 3 * 2, 62); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 62); diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index c1f7014aba..c3f0a847b0 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -51,8 +51,8 @@ #include "unk_020797C8.h" #include "vars_flags.h" -static void ov94_02242B54(BGL *param0); -static void ov94_02242C80(BGL *param0); +static void ov94_02242B54(BgConfig *param0); +static void ov94_02242C80(BgConfig *param0); static void ov94_02242CAC(UnkStruct_ov94_0223FD4C *param0); static void ov94_02242D38(UnkStruct_ov94_0223FD4C *param0); static void ov94_02242D74(UnkStruct_ov94_0223FD4C *param0); @@ -188,7 +188,7 @@ int ov94_02242B34(UnkStruct_ov94_0223FD4C *param0, int param1) return 1; } -static void ov94_02242B54(BGL *param0) +static void ov94_02242B54(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -313,7 +313,7 @@ static void ov94_02242B54(BGL *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov94_02242C80(BGL *param0) +static void ov94_02242C80(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -324,7 +324,7 @@ static void ov94_02242C80(BGL *param0) static void ov94_02242CAC(UnkStruct_ov94_0223FD4C *param0) { - BGL *v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; sub_02006E84(104, 0, 0, 0, 16 * 3 * 2, 62); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 62); diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index 00a4d71ba7..ac2fb363ef 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -32,8 +32,8 @@ #include "unk_020366A0.h" #include "unk_020393C8.h" -static void ov94_02244A7C(BGL *param0); -static void ov94_02244B68(BGL *param0); +static void ov94_02244A7C(BgConfig *param0); +static void ov94_02244B68(BgConfig *param0); static void ov94_02244B8C(UnkStruct_ov94_0223FD4C *param0); static void ov94_02244E48(UnkStruct_ov94_0223FD4C *param0); static void ov94_02244F00(UnkStruct_ov94_0223FD4C *param0); @@ -166,7 +166,7 @@ int ov94_02244A2C(UnkStruct_ov94_0223FD4C *param0, int param1) return 1; } -static void ov94_02244A7C(BGL *param0) +static void ov94_02244A7C(BgConfig *param0) { { BgTemplate v0 = { @@ -259,7 +259,7 @@ static void ov94_02244A7C(BGL *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 0); } -static void ov94_02244B68(BGL *param0) +static void ov94_02244B68(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -269,7 +269,7 @@ static void ov94_02244B68(BGL *param0) static void ov94_02244B8C(UnkStruct_ov94_0223FD4C *param0) { - BGL *v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; NARC *v1; v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 62); diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index d87ccbeb9f..589a2b6fbd 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -45,7 +45,7 @@ struct UnkStruct_ov95_02247628_t { const UnkStruct_ov6_02246254 *unk_00; int unk_04; - BGL *unk_08; + BgConfig *unk_08; StringTemplate *unk_0C; MessageLoader *unk_10; Strbuf *unk_14; @@ -83,7 +83,7 @@ typedef struct { } UnkStruct_ov95_02247170; struct UnkStruct_ov95_022472C4_t { - BGL *unk_00; + BgConfig *unk_00; volatile BOOL *unk_04; fx32 unk_08; fx32 unk_0C; @@ -462,7 +462,7 @@ static void ov95_02247254(SysTask *param0, void *param1) } } -UnkStruct_ov95_022472C4 *ov95_022472C4(BGL *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, int param5, volatile BOOL *param6) +UnkStruct_ov95_022472C4 *ov95_022472C4(BgConfig *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, int param5, volatile BOOL *param6) { UnkStruct_ov95_022472C4 *v0 = Heap_AllocFromHeap(57, sizeof(UnkStruct_ov95_022472C4)); @@ -668,7 +668,7 @@ CellActor *ov95_022475E4(UnkStruct_ov95_02247628 *param0, CellActorResourceData return v0; } -BGL *ov95_02247628(UnkStruct_ov95_02247628 *param0) +BgConfig *ov95_02247628(UnkStruct_ov95_02247628 *param0) { return param0->unk_08; } diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index c74c9575da..7786f7a692 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -46,7 +46,7 @@ typedef struct { SpriteAnimationFrame unk_14[10]; CellActor *unk_3C[2]; UnkStruct_ov95_02247568 unk_44; - BGL *unk_54; + BgConfig *unk_54; Window unk_58; Strbuf *unk_68; Strbuf *unk_6C; diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c index f87a771da7..fbc74a047d 100644 --- a/src/overlay095/ov95_02248590.c +++ b/src/overlay095/ov95_02248590.c @@ -127,7 +127,7 @@ typedef struct { UnkStruct_ov95_02247568 unk_0C; CellActor *unk_1C[20][2]; u32 unk_BC; - BGL *unk_C0; + BgConfig *unk_C0; UnkStruct_ov95_02247004 *unk_C4; BOOL unk_C8; UnkStruct_ov95_022472C4 *unk_CC; @@ -152,7 +152,7 @@ typedef struct { typedef struct { UnkStruct_ov95_02248688 *unk_00; UnkStruct_ov95_02248E5C unk_04; - BGL *unk_154; + BgConfig *unk_154; fx32 unk_158; fx32 unk_15C; fx32 unk_160; diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c index 50ed940d79..7c6793506b 100644 --- a/src/overlay095/ov95_02249740.c +++ b/src/overlay095/ov95_02249740.c @@ -89,7 +89,7 @@ typedef struct { BOOL unk_0C; UnkStruct_ov95_02247568 unk_10; CellActor *unk_20[1]; - BGL *unk_24; + BgConfig *unk_24; UnkStruct_ov95_0224773C *unk_28; UnkStruct_ov95_02247958 *unk_2C; SysTask *unk_30; diff --git a/src/overlay095/ov95_02249F90.c b/src/overlay095/ov95_02249F90.c index 300254ad5c..f024a7f568 100644 --- a/src/overlay095/ov95_02249F90.c +++ b/src/overlay095/ov95_02249F90.c @@ -30,7 +30,7 @@ typedef struct { UnkStruct_ov95_02247628 *unk_00; int unk_04; int unk_08; - BGL *unk_0C; + BgConfig *unk_0C; fx32 unk_10; fx32 unk_14; fx32 unk_18; @@ -43,7 +43,7 @@ static int ov95_0224A020(UnkStruct_ov95_02249FF8 *param0, int *param1); static void ov95_0224A0C4(SysTask *param0, void *param1); static void ov95_0224A10C(UnkStruct_ov95_02249FF8 *param0); static void ov95_0224A320(UnkStruct_ov95_02249FF8 *param0); -static void ov95_0224A358(BGL *param0, int param1, int param2); +static void ov95_0224A358(BgConfig *param0, int param1, int param2); void *ov95_02249F90(UnkStruct_ov95_02247628 *param0) { @@ -270,7 +270,7 @@ static void ov95_0224A320(UnkStruct_ov95_02249FF8 *param0) sub_02019044(param0->unk_0C, 5); } -static void ov95_0224A358(BGL *param0, int param1, int param2) +static void ov95_0224A358(BgConfig *param0, int param1, int param2) { param2 &= 0x1ff; param1 &= 0x1ff; diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c index a96a7e004a..ea31baa095 100644 --- a/src/overlay095/ov95_0224A390.c +++ b/src/overlay095/ov95_0224A390.c @@ -85,7 +85,7 @@ typedef struct { BOOL unk_0C; UnkStruct_ov95_02247568 unk_10; CellActor *unk_20[1]; - BGL *unk_24; + BgConfig *unk_24; UnkStruct_ov95_0224773C *unk_28; UnkStruct_ov95_02247958 *unk_2C; SysTask *unk_30; diff --git a/src/overlay095/ov95_0224ABC0.c b/src/overlay095/ov95_0224ABC0.c index aa974d2157..43f6c6fd35 100644 --- a/src/overlay095/ov95_0224ABC0.c +++ b/src/overlay095/ov95_0224ABC0.c @@ -60,7 +60,7 @@ typedef struct { UnkStruct_ov95_02247628 *unk_00; int unk_04; int unk_08; - BGL *unk_0C; + BgConfig *unk_0C; UnkStruct_ov95_02247004 *unk_10; BOOL unk_14; UnkStruct_ov95_022472C4 *unk_18; @@ -75,7 +75,7 @@ typedef struct { typedef struct { UnkStruct_ov95_0224AC64 *unk_00; - BGL *unk_04; + BgConfig *unk_04; int unk_08; fx32 unk_0C; fx32 unk_10; diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index a4bdf07ca1..dc8e1e957b 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -62,7 +62,7 @@ typedef struct { SpriteAnimationFrame unk_18[10]; CellActor *unk_40[2]; UnkStruct_ov95_02247568 unk_48; - BGL *unk_58; + BgConfig *unk_58; Window unk_5C; Strbuf *unk_6C; Strbuf *unk_70; diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c index 371e8994d4..4fe81f75b5 100644 --- a/src/overlay096/ov96_0223B6A0.c +++ b/src/overlay096/ov96_0223B6A0.c @@ -332,7 +332,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov96_0223DA78 = { 0x0 }; -UIControlData *ov96_0223BBC8(BGL *param0, int param1, int param2) +UIControlData *ov96_0223BBC8(BgConfig *param0, int param1, int param2) { UnkStruct_ov61_0222C884 v0; diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index ac0c8e03c3..ac62c6ec84 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -41,8 +41,8 @@ #include "unk_020393C8.h" #include "unk_02073700.h" -static void ov96_0223BE38(BGL *param0); -static void ov96_0223BF1C(BGL *param0); +static void ov96_0223BE38(BgConfig *param0); +static void ov96_0223BF1C(BgConfig *param0); static void ov96_0223BF40(UnkStruct_ov96_0223BF40 *param0); static void ov96_0223C1FC(UnkStruct_ov96_0223BF40 *param0); static void ov96_0223C314(UnkStruct_ov96_0223BF40 *param0); @@ -247,7 +247,7 @@ int ov96_0223BDEC(UnkStruct_ov96_0223BF40 *param0, int param1) return 1; } -static void ov96_0223BE38(BGL *param0) +static void ov96_0223BE38(BgConfig *param0) { { BgTemplate v0 = { @@ -339,7 +339,7 @@ static void ov96_0223BE38(BGL *param0) sub_02019690(4, 32, 0, 68); } -static void ov96_0223BF1C(BGL *param0) +static void ov96_0223BF1C(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -349,7 +349,7 @@ static void ov96_0223BF1C(BGL *param0) static void ov96_0223BF40(UnkStruct_ov96_0223BF40 *param0) { - BGL *v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; NARC *v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 68); sub_02007130(v1, 3, 0, 0, 0, 68); diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 80e78fecd0..a94f6780f9 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -84,7 +84,7 @@ typedef struct { } UnkStruct_ov97_0223DFB0; typedef struct { - BGL *unk_00; + BgConfig *unk_00; SaveData *unk_04; PokedexData *unk_08; TrainerInfo *unk_0C; @@ -968,7 +968,7 @@ static void ov97_0222BD48(void *param0) { sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8((BGL *)param0); + sub_0201C2B8((BgConfig *)param0); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index d42228e173..ff476676c9 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -348,7 +348,7 @@ UnkStruct_ov97_0223E0B0 Unk_ov97_0223E0B0[] = { typedef struct { int unk_00; - BGL *unk_04; + BgConfig *unk_04; SaveData *unk_08; PokedexData *unk_0C; TrainerInfo *unk_10; @@ -435,7 +435,7 @@ enum { static void ov97_0222C388(UnkStruct_ov97_0222C388 *param0); int ov97_0222CB10(UnkStruct_ov97_0222C388 *param0); MysteryGift *SaveData_MysteryGift(SaveData *param0); -void ov97_02231FFC(BGL *param0, void *, int param2); +void ov97_02231FFC(BgConfig *param0, void *, int param2); static u16 ov97_0222C174(u16 param0) { diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index b93791c219..f293fab355 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -112,7 +112,7 @@ typedef struct { void Strbuf_ToChars(const Strbuf *param0, u16 *param1, u32 param2); void Strbuf_CopyNumChars(Strbuf *param0, const u16 *param1, u32 param2); MysteryGift *SaveData_MysteryGift(SaveData *param0); -void ov97_02231FFC(BGL *param0, void *, int param2); +void ov97_02231FFC(BgConfig *param0, void *, int param2); static int ov97_0222D474(OverlayManager *param0); static int ov97_0222D4D8(OverlayManager *param0); static int ov97_0222DA18(OverlayManager *param0); @@ -714,7 +714,7 @@ static int ov97_0222DB40(OverlayManager *param0) return -1; } -static void ov97_0222DB78(BGL *param0, int param1, u32 param2, u32 param3) +static void ov97_0222DB78(BgConfig *param0, int param1, u32 param2, u32 param3) { BgTemplate v0 = { 0, @@ -739,7 +739,7 @@ static void ov97_0222DB78(BGL *param0, int param1, u32 param2, u32 param3) sub_02019EBC(param0, param1); } -static void ov97_0222DBC4(BGL *param0) +static void ov97_0222DBC4(BgConfig *param0) { UnkStruct_ov84_0223BA5C v0 = { GX_DISPMODE_GRAPHICS, @@ -756,7 +756,7 @@ static void ov97_0222DBC4(BGL *param0) ov97_0222DB78(param0, 5, 0x7800, 0x4000); } -static void ov97_0222DC20(BGL *param0) +static void ov97_0222DC20(BgConfig *param0) { sub_02006E84(116, 0, 4, 16 * 2 * 8, 16 * 2, 86); sub_02006E3C(116, 1, param0, 5, 0, 10 * 16 * 0x20, 1, 86); @@ -765,7 +765,7 @@ static void ov97_0222DC20(BGL *param0) sub_02019448(param0, 5); } -static void ov97_0222DC9C(BGL *param0) +static void ov97_0222DC9C(BgConfig *param0) { sub_02006E84(116, 0, 0, 16 * 2 * 8, 16 * 2, 86); sub_02006E3C(116, 1, param0, 1, 0, 10 * 16 * 0x20, 1, 86); diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index 2e5ee0da51..be86a7bbb8 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -69,7 +69,7 @@ typedef struct { typedef struct { int unk_00; UnkStruct_ov97_0222D04C unk_04; - BGL *unk_2A5C; + BgConfig *unk_2A5C; StringTemplate *unk_2A60; MessageLoader *unk_2A64; Window unk_2A68[20]; @@ -138,7 +138,7 @@ typedef struct { void Strbuf_CopyNumChars(Strbuf *param0, const u16 *param1, u32 param2); MysteryGift *SaveData_MysteryGift(SaveData *param0); -void ov97_02231FFC(BGL *param0, void *, int param2); +void ov97_02231FFC(BgConfig *param0, void *, int param2); static int ov97_02230728(OverlayManager *param0); static int ov97_022306F4(OverlayManager *param0); static int ov97_02230834(OverlayManager *param0); @@ -339,7 +339,7 @@ static void ov97_022305EC(Window *param0, int param1) StringTemplate_Free(v2); } -static void ov97_02230664(BGL *param0) +static void ov97_02230664(BgConfig *param0) { sub_02006E84(116, 11, 0, 16 * 2 * 15, 16 * 2, 87); sub_02006E84(116, 16, 0, 16 * 2 * 12, 16 * 2, 87); @@ -1481,7 +1481,7 @@ const OverlayManagerTemplate Unk_ov97_0223D7AC = { 0xffffffff }; -void ov97_02231FFC(BGL *param0, void *param1, int param2) +void ov97_02231FFC(BgConfig *param0, void *param1, int param2) { UnkStruct_ov97_02230868 *v0; diff --git a/src/overlay097/ov97_02232054.c b/src/overlay097/ov97_02232054.c index 73af486f79..f541b9edd6 100644 --- a/src/overlay097/ov97_02232054.c +++ b/src/overlay097/ov97_02232054.c @@ -32,7 +32,7 @@ void ov97_02232054(void) GXLayers_SetBanks(&v0); } -void ov97_02232074(BGL *param0) +void ov97_02232074(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 4164859e66..73ecf9a373 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -120,7 +120,7 @@ typedef struct { TrainerInfo *unk_14; Options *unk_18; int unk_1C; - BGL *unk_20; + BgConfig *unk_20; int unk_24; CellActorCollection *unk_28; UnkStruct_0200C738 unk_2C; @@ -1282,7 +1282,7 @@ static void ov97_02234CF4(UnkStruct_ov97_02234A2C *param0, int param1, int param param0->unk_24 = param2; } -static void ov97_02234D28(BGL *param0) +static void ov97_02234D28(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index 901c9319ff..864cfc4d31 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -48,7 +48,7 @@ #include "unk_02033200.h" typedef struct { - BGL *unk_00; + BgConfig *unk_00; BOOL unk_04; int unk_08; int unk_0C; @@ -96,7 +96,7 @@ void *ov97_022376C4(OverlayManager *param0, int param1, int param2, int param3) return v0; } -void ov97_022376FC(BGL *param0, int param1, u8 param2, u32 param3, u32 param4) +void ov97_022376FC(BgConfig *param0, int param1, u8 param2, u32 param3, u32 param4) { BgTemplate v0 = { 0, @@ -263,7 +263,7 @@ static int ov97_02237870(UnkStruct_ov97_02237808 *param0, int param1) return v0; } -int ov97_0223795C(BGL *param0, UnkStruct_ov97_02237808 *param1, int param2, int param3, int param4) +int ov97_0223795C(BgConfig *param0, UnkStruct_ov97_02237808 *param1, int param2, int param3, int param4) { int v0; @@ -664,7 +664,7 @@ static void ov97_02238174(void *param0) sub_02006E84(116, 29, 4, 16 * 2 * 8, 16 * 2 * 6, v0->unk_08); } -void ov97_02238194(BGL *param0, UnkStruct_0202DF40 *param1) +void ov97_02238194(BgConfig *param0, UnkStruct_0202DF40 *param1) { int v0, v1; UnkStruct_ov97_0223F550 *v2 = &Unk_ov97_0223F550; diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index d8685c8fd9..2ddaef0e09 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -58,7 +58,7 @@ typedef struct { UnkStruct_ov98_02246E88 * unk_00; - BGL * unk_04; + BgConfig *unk_04; int unk_08; int unk_0C; int unk_10; @@ -110,15 +110,15 @@ int ov98_022471C8(OverlayManager * param0, int * param1); int ov98_022473D8(OverlayManager * param0, int * param1); int ov98_02247440(OverlayManager * param0, int * param1); static void ov98_022474E8(void * param0); -static void ov98_02247510(BGL * param0); -static void ov98_022476D0(BGL * param0); +static void ov98_02247510(BgConfig *param0); +static void ov98_022476D0(BgConfig *param0); static void ov98_02247704(UnkStruct_ov98_02247704 * param0); static void ov98_02247A24(UnkStruct_ov98_02247704 * param0); static void ov98_02247ACC(UnkStruct_ov98_02247704 * param0); static void ov98_02247AE8(UnkStruct_ov98_02247704 * param0, int param1, int param2); static void ov98_02247AF0(UnkStruct_ov98_02247704 * param0); static void ov98_02247B0C(UnkStruct_ov98_02247704 * param0); -static UIControlData * ov98_02247B24(BGL * param0, int param1, int param2); +static UIControlData *ov98_02247B24(BgConfig *param0, int param1, int param2); static int ov98_02247B98(UnkStruct_ov98_02247704 * param0); static int ov98_02247D30(UnkStruct_ov98_02247704 * param0); static int ov98_02247D50(UnkStruct_ov98_02247704 * param0); @@ -451,7 +451,7 @@ static void ov98_022474E8 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov98_02247510 (BGL * param0) +static void ov98_02247510(BgConfig *param0) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -611,7 +611,7 @@ static void ov98_02247510 (BGL * param0) sub_02019690(4, 32, 0, 109); } -static void ov98_022476D0 (BGL * param0) +static void ov98_022476D0(BgConfig *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -623,7 +623,7 @@ static void ov98_022476D0 (BGL * param0) static void ov98_02247704 (UnkStruct_ov98_02247704 * param0) { - BGL * v0 = param0->unk_04; + BgConfig *v0 = param0->unk_04; NARC * v1; v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 109); @@ -700,7 +700,7 @@ static void ov98_02247B0C (UnkStruct_ov98_02247704 * param0) } } -static UIControlData * ov98_02247B24 (BGL * param0, int param1, int param2) +static UIControlData *ov98_02247B24(BgConfig *param0, int param1, int param2) { UnkStruct_ov61_0222C884 v0; @@ -711,7 +711,7 @@ static UIControlData * ov98_02247B24 (BGL * param0, int param1, int param2) return sub_02002100(param0, &v0, (1 + (18 + 12)), 11, 109); } -static UIControlData * ov98_02247B58 (BGL * param0, int param1, int param2, int param3) +static UIControlData *ov98_02247B58(BgConfig *param0, int param1, int param2, int param3) { UnkStruct_ov61_0222C884 v0; diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index 9d89580404..6cbc05a3f4 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -75,7 +75,7 @@ static const UnkStruct_ov104_02241308 Unk_ov99_021D472C = { static void ov99_021D1244(SysTask *param0, void *param1); static void ov99_021D1350(void *param0); -static void ov99_021D1380(BGL *param0); +static void ov99_021D1380(BgConfig *param0); static void ov99_021D1720(UnkStruct_ov99_021D2CB0 *param0); static void ov99_021D1918(UnkStruct_ov99_021D2CB0 *param0); static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 *param0); @@ -85,7 +85,7 @@ static void ov99_021D1A4C(GenericPointerData *param0); static void ov99_021D16E4(UnkStruct_ov99_021D2CB0 *param0); static void ov99_021D1270(UnkStruct_ov99_021D2CB0 *param0); static void ov99_021D1314(UnkStruct_ov99_021D2CB0 *param0); -static void ov99_021D1580(BGL *param0); +static void ov99_021D1580(BgConfig *param0); int ov99_021D0D80(OverlayManager *param0, int *param1) { @@ -361,7 +361,7 @@ static void ov99_021D1350(void *param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov99_021D1380(BGL *param0) +static void ov99_021D1380(BgConfig *param0) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -540,7 +540,7 @@ static void ov99_021D1380(BGL *param0) sub_02019120(6, 0); } -static void ov99_021D1580(BGL *param0) +static void ov99_021D1580(BgConfig *param0) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c index 5c4846c9b5..6045d40cea 100644 --- a/src/overlay099/ov99_021D1A54.c +++ b/src/overlay099/ov99_021D1A54.c @@ -451,7 +451,7 @@ BOOL ov99_021D1D30(UnkStruct_ov99_021D2CB0 *param0, int param1) static void ov99_021D1D68(UnkStruct_ov99_021D2CB0 *param0) { - BGL *v0 = param0->unk_08; + BgConfig *v0 = param0->unk_08; PaletteSys_LoadPalette(param0->unk_0C, 127, 18, 75, 0, 0, 0); sub_020070E8(param0->unk_10F8, 9, param0->unk_08, 2, 0, 0, 0, 75); @@ -594,7 +594,7 @@ static void ov99_021D20F8(UnkStruct_ov99_021D2CB0 *param0) static void ov99_021D211C(UnkStruct_ov99_021D2CB0 *param0) { - BGL *v0 = param0->unk_08; + BgConfig *v0 = param0->unk_08; ov99_021D439C(param0, param0->unk_1105, 3, 0); param0->unk_1105++; @@ -660,7 +660,7 @@ static void ov99_021D217C(UnkStruct_ov99_021D2CB0 *param0) static void ov99_021D2180(UnkStruct_ov99_021D2CB0 *param0) { - BGL *v0 = param0->unk_08; + BgConfig *v0 = param0->unk_08; PaletteSys_LoadPalette(param0->unk_0C, 127, 19, 75, 0, 0, 0); sub_020070E8(param0->unk_10F8, 10, param0->unk_08, 2, 0, 0, 0, 75); @@ -800,7 +800,7 @@ static void ov99_021D24CC(UnkStruct_ov99_021D2CB0 *param0) static void ov99_021D24F0(UnkStruct_ov99_021D2CB0 *param0) { - BGL *v0 = param0->unk_08; + BgConfig *v0 = param0->unk_08; PaletteSys_LoadPalette(param0->unk_0C, 127, 20, 75, 0, 0, 0); sub_020070E8(param0->unk_10F8, 11, param0->unk_08, 2, 0, 0, 0, 75); @@ -989,7 +989,7 @@ static void ov99_021D2A14(UnkStruct_ov99_021D2CB0 *param0) static void ov99_021D2A38(UnkStruct_ov99_021D2CB0 *param0) { - BGL *v0 = param0->unk_08; + BgConfig *v0 = param0->unk_08; ov99_021D12F0(param0); @@ -1059,7 +1059,7 @@ static void ov99_021D2AA8(UnkStruct_ov99_021D2CB0 *param0) static void ov99_021D2AAC(UnkStruct_ov99_021D2CB0 *param0) { - BGL *v0 = param0->unk_08; + BgConfig *v0 = param0->unk_08; gCoreSys.unk_65 = 0; diff --git a/src/overlay099/ov99_021D3E78.c b/src/overlay099/ov99_021D3E78.c index ddc76d16c1..7995a77bc4 100644 --- a/src/overlay099/ov99_021D3E78.c +++ b/src/overlay099/ov99_021D3E78.c @@ -267,7 +267,7 @@ struct UnkStruct_ov99_021D3E78_t { BOOL unk_14; BOOL unk_18; int unk_1C; - BGL *unk_20; + BgConfig *unk_20; Window *unk_24; Window *unk_28; MessageLoader *unk_2C; @@ -277,7 +277,7 @@ struct UnkStruct_ov99_021D3E78_t { static void ov99_021D4104(SysTask *param0, void *param1); -UnkStruct_ov99_021D3E78 *ov99_021D3E78(BGL *param0, int param1, int param2, int param3, MessageLoader *param4) +UnkStruct_ov99_021D3E78 *ov99_021D3E78(BgConfig *param0, int param1, int param2, int param3, MessageLoader *param4) { UnkStruct_ov99_021D3E78 *v0 = Heap_AllocFromHeap(75, sizeof(UnkStruct_ov99_021D3E78)); diff --git a/src/overlay099/ov99_021D4134.c b/src/overlay099/ov99_021D4134.c index 846f895535..07a20d95b5 100644 --- a/src/overlay099/ov99_021D4134.c +++ b/src/overlay099/ov99_021D4134.c @@ -153,7 +153,7 @@ BOOL ov99_021D425C(UnkStruct_ov99_021D2CB0 *param0, s32 param1) void ov99_021D439C(UnkStruct_ov99_021D2CB0 *param0, int param1, int param2, int param3) { - BGL *v0 = param0->unk_08; + BgConfig *v0 = param0->unk_08; NNSG2dPaletteData *v1; void *v2; const UnkStruct_ov99_021D5394 *v3; diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index 8c15aec458..f0e1015398 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -42,7 +42,7 @@ typedef BOOL (*UnkFuncPtr_ov100_021D5130_2)(void *); static void ov100_021D0FA0(UnkStruct_ov100_021D46C8 *param0); static void ov100_021D1034(UnkStruct_ov100_021D46C8 *param0); static void ov100_021D111C(UnkStruct_ov100_021D46C8 *param0); -static void ov100_021D1208(BGL *param0); +static void ov100_021D1208(BgConfig *param0); static void ov100_021D13B4(void *param0); int ov100_021D0D80(OverlayManager *param0, int *param1) @@ -272,7 +272,7 @@ static void ov100_021D111C(UnkStruct_ov100_021D46C8 *param0) G3X_AlphaBlend(0); } -static void ov100_021D1208(BGL *param0) +static void ov100_021D1208(BgConfig *param0) { GXLayers_DisableEngineALayers(); diff --git a/src/overlay100/ov100_021D13E4.c b/src/overlay100/ov100_021D13E4.c index 0676c02bd6..4e680b6ea0 100644 --- a/src/overlay100/ov100_021D13E4.c +++ b/src/overlay100/ov100_021D13E4.c @@ -240,7 +240,7 @@ static void ov100_021D17B4(UnkStruct_ov100_021D1808 *param0) static void ov100_021D1808(UnkStruct_ov100_021D1808 *param0) { NARC *v0 = param0->unk_7C4->unk_00; - BGL *v1 = param0->unk_7C4->unk_0C; + BgConfig *v1 = param0->unk_7C4->unk_0C; SpriteRenderer *v2 = param0->unk_7C4->unk_04; SpriteGfxHandler *v3 = param0->unk_7C4->unk_08; PaletteData *v4 = param0->unk_7C4->unk_10; @@ -296,7 +296,7 @@ static void ov100_021D1A54(UnkStruct_ov100_021D1808 *param0) { int v0; NARC *v1 = param0->unk_7C4->unk_00; - BGL *v2 = param0->unk_7C4->unk_0C; + BgConfig *v2 = param0->unk_7C4->unk_0C; SpriteRenderer *v3 = param0->unk_7C4->unk_04; SpriteGfxHandler *v4 = param0->unk_7C4->unk_08; PaletteData *v5 = param0->unk_7C4->unk_10; diff --git a/src/overlay100/ov100_021D1C44.c b/src/overlay100/ov100_021D1C44.c index 17609f5e44..93925ceef2 100644 --- a/src/overlay100/ov100_021D1C44.c +++ b/src/overlay100/ov100_021D1C44.c @@ -73,7 +73,7 @@ static void ov100_021D1C44(Camera *camera, VecFx32 *param1) static void ov100_021D1C98(UnkStruct_ov100_021D1C98 *param0) { NARC *v0 = param0->unk_1EBC->unk_00; - BGL *v1 = param0->unk_1EBC->unk_0C; + BgConfig *v1 = param0->unk_1EBC->unk_0C; SpriteRenderer *v2 = param0->unk_1EBC->unk_04; SpriteGfxHandler *v3 = param0->unk_1EBC->unk_08; PaletteData *v4 = param0->unk_1EBC->unk_10; @@ -197,7 +197,7 @@ static void ov100_021D2250(UnkStruct_ov100_021D1C98 *param0) { int v0; NARC *v1 = param0->unk_1EBC->unk_00; - BGL *v2 = param0->unk_1EBC->unk_0C; + BgConfig *v2 = param0->unk_1EBC->unk_0C; SpriteRenderer *v3 = param0->unk_1EBC->unk_04; SpriteGfxHandler *v4 = param0->unk_1EBC->unk_08; PaletteData *v5 = param0->unk_1EBC->unk_10; diff --git a/src/overlay100/ov100_021D2F0C.c b/src/overlay100/ov100_021D2F0C.c index 2fcc878b5e..ad6d0d7670 100644 --- a/src/overlay100/ov100_021D2F0C.c +++ b/src/overlay100/ov100_021D2F0C.c @@ -41,7 +41,7 @@ void *ov100_021D3620(UnkStruct_ov100_021D4DD8 *param0); BOOL ov100_021D39E4(void *param0); BOOL ov100_021D3FD4(void *param0); -static void ov100_021D2F0C(BGL *param0, PaletteData *param1) +static void ov100_021D2F0C(BgConfig *param0, PaletteData *param1) { int v0 = 12; int v1 = 10; @@ -58,7 +58,7 @@ static void ov100_021D2F0C(BGL *param0, PaletteData *param1) static void ov100_021D2F64(UnkStruct_ov100_021D3084 *param0) { NARC *v0 = param0->unk_1D28->unk_00; - BGL *v1 = param0->unk_1D28->unk_0C; + BgConfig *v1 = param0->unk_1D28->unk_0C; SpriteRenderer *v2 = param0->unk_1D28->unk_04; SpriteGfxHandler *v3 = param0->unk_1D28->unk_08; PaletteData *v4 = param0->unk_1D28->unk_10; @@ -86,7 +86,7 @@ static void ov100_021D2F64(UnkStruct_ov100_021D3084 *param0) static void ov100_021D3084(UnkStruct_ov100_021D3084 *param0) { NARC *v0 = param0->unk_1D28->unk_00; - BGL *v1 = param0->unk_1D28->unk_0C; + BgConfig *v1 = param0->unk_1D28->unk_0C; SpriteRenderer *v2 = param0->unk_1D28->unk_04; SpriteGfxHandler *v3 = param0->unk_1D28->unk_08; PaletteData *v4 = param0->unk_1D28->unk_10; diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index c096cf3128..9ea1d393fc 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -52,8 +52,8 @@ static void ov101_021D0F94(UnkStruct_ov101_021D13C8 *param0); static void ov101_021D0F9C(UnkStruct_ov101_021D13C8 *param0); static void ov101_021D107C(UnkStruct_ov101_021D13C8 *param0); static void ov101_021D1098(void); -static void ov101_021D10B8(BGL *param0); -static void ov101_021D11A4(BGL *param0); +static void ov101_021D10B8(BgConfig *param0); +static void ov101_021D11A4(BgConfig *param0); static void ov101_021D11D0(void); static void ov101_021D121C(UnkStruct_ov101_021D13C8 *param0); static void ov101_021D150C(void); @@ -260,7 +260,7 @@ static void ov101_021D1098(void) GXLayers_SetBanks(&v0); } -static void ov101_021D10B8(BGL *param0) +static void ov101_021D10B8(BgConfig *param0) { GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); @@ -361,7 +361,7 @@ static void ov101_021D10B8(BGL *param0) } } -static void ov101_021D11A4(BGL *param0) +static void ov101_021D11A4(BgConfig *param0) { sub_02019044(param0, 0); sub_02019044(param0, 1); diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index 75eb8fa87c..5276cc9ede 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -28,7 +28,7 @@ typedef struct { int unk_04; SaveData *unk_08; TrainerInfo *unk_0C; - BGL *unk_10; + BgConfig *unk_10; Window unk_14; Window unk_24; MessageLoader *unk_34; diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index 31bf781acd..b298f7a2da 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -136,7 +136,7 @@ typedef struct { UnkStruct_ov104_0223EBD0 *unk_2C; } UnkStruct_ov104_02231148; -void ov104_0223DC7C(int param0, BGL *param1, SpriteRenderer *param2, SpriteGfxHandler *param3, PaletteData *param4, u16 *param5, s16 param6, s16 param7); +void ov104_0223DC7C(int param0, BgConfig *param1, SpriteRenderer *param2, SpriteGfxHandler *param3, PaletteData *param4, u16 *param5, s16 param6, s16 param7); u16 ov104_0222FC8C(UnkStruct_ov104_0222E930 *param0, u16 param1); u16 *ov104_0222FC14(UnkStruct_ov104_0222E930 *param0, u16 param1); static BOOL ov104_0222FCA0(UnkStruct_ov104_0222E930 *param0); diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index beab5b1642..d3e37282c6 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -60,7 +60,7 @@ BOOL ov104_02236F70(UnkStruct_ov104_0223BA10 *param0, u16 param1, u16 param2); void ov104_02236FC0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1); void ov104_022370E0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1); void ov104_02237180(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1); -static void ov104_022370C0(BGL *param0, Window *param1); +static void ov104_022370C0(BgConfig *param0, Window *param1); static void ov104_02237284(UnkStruct_ov104_022320B4 *param0, Window *param1, TrainerInfo *param2, u16 param3); u16 ov104_02237338(UnkStruct_ov104_0223BA10 *param0); @@ -727,7 +727,7 @@ void ov104_02236FC0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 * return; } -static void ov104_022370C0(BGL *param0, Window *param1) +static void ov104_022370C0(BgConfig *param0, Window *param1) { Window_Show(param1, 1, ((1024 - (18 + 12)) - 9), 12); BGL_FillWindow(param1, 15); diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c index 4c561dbd68..a0ecb8ab53 100644 --- a/src/overlay104/ov104_0223B6F4.c +++ b/src/overlay104/ov104_0223B6F4.c @@ -45,7 +45,7 @@ static u16 ov104_0223BB10(UnkStruct_ov104_0223BA10 *param0); u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 *param0); u16 ov104_0223BC24(u16 param0); void sub_02052894(BattleParams *param0); -void ov104_0223BB84(BGL *param0, UnkStruct_ov104_0223BA10 *param1, u32 param2); +void ov104_0223BB84(BgConfig *param0, UnkStruct_ov104_0223BA10 *param1, u32 param2); static void ov104_0223BBC4(u16 *param0, u16 param1); static const struct { @@ -380,7 +380,7 @@ u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 *param0) return v0; } -void ov104_0223BB84(BGL *param0, UnkStruct_ov104_0223BA10 *param1, u32 param2) +void ov104_0223BB84(BgConfig *param0, UnkStruct_ov104_0223BA10 *param1, u32 param2) { int v0; u16 v1[30]; diff --git a/src/overlay104/ov104_0223C164.c b/src/overlay104/ov104_0223C164.c index 84e0b01b60..eb4b5c665b 100644 --- a/src/overlay104/ov104_0223C164.c +++ b/src/overlay104/ov104_0223C164.c @@ -12,22 +12,22 @@ typedef struct { SysTask *unk_00; - BGL *unk_04; + BgConfig *unk_04; u16 unk_08; u16 unk_0A; } UnkStruct_ov104_0223C188; struct UnkStruct_ov104_0223C23C_t { - BGL *unk_00; + BgConfig *unk_00; UnkStruct_ov104_0223C188 *unk_04; }; -UnkStruct_ov104_0223C23C *ov104_0223C164(BGL *param0); -static UnkStruct_ov104_0223C188 *ov104_0223C188(BGL *param0); +UnkStruct_ov104_0223C23C *ov104_0223C164(BgConfig *param0); +static UnkStruct_ov104_0223C188 *ov104_0223C188(BgConfig *param0); static void ov104_0223C1BC(SysTask *param0, void *param1); static void ov104_0223C208(u16 *param0, u8 param1); -UnkStruct_ov104_0223C23C *ov104_0223C164(BGL *param0) +UnkStruct_ov104_0223C23C *ov104_0223C164(BgConfig *param0) { UnkStruct_ov104_0223C23C *v0; @@ -38,7 +38,7 @@ UnkStruct_ov104_0223C23C *ov104_0223C164(BGL *param0) return v0; } -static UnkStruct_ov104_0223C188 *ov104_0223C188(BGL *param0) +static UnkStruct_ov104_0223C188 *ov104_0223C188(BgConfig *param0) { UnkStruct_ov104_0223C188 *v0; diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index be7ed10fd9..6d3370f69a 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -67,7 +67,7 @@ static void ov104_0223C71C(SysTask *param0, void *param1); static void ov104_0223C738(SysTask *param0, void *param1); static void ov104_0223C720(SysTask *param0, void *param1); static void ov104_0223C72C(SysTask *param0, void *param1); -static void ov104_0223C948(BGL *param0, int param1); +static void ov104_0223C948(BgConfig *param0, int param1); static void ov104_0223CC74(UnkStruct_ov104_0223C4CC *param0, int param1, const TrainerInfo *param2); static void ov104_0223CEEC(UnkStruct_ov104_0223C4CC *param0); static void ov104_0223CB80(UnkStruct_ov104_0223C4CC *param0); @@ -449,7 +449,7 @@ static void ov104_0223C8E8(UnkStruct_ov104_0223C4CC *param0) } } -static void ov104_0223C948(BGL *param0, int param1) +static void ov104_0223C948(BgConfig *param0, int param1) { int v0; diff --git a/src/overlay104/ov104_0223D9E4.c b/src/overlay104/ov104_0223D9E4.c index 59ea3cb5c3..87fc4379d7 100644 --- a/src/overlay104/ov104_0223D9E4.c +++ b/src/overlay104/ov104_0223D9E4.c @@ -17,7 +17,7 @@ typedef struct { SysTask *unk_00; - BGL *unk_04; + BgConfig *unk_04; u16 unk_08[2][2048]; u8 unk_2008[2][65536]; u8 unk_22008; @@ -35,7 +35,7 @@ typedef struct { typedef struct { SysTask *unk_00; SysTask *unk_04; - BGL *unk_08; + BgConfig *unk_08; int unk_0C; int unk_10; int unk_14; @@ -50,7 +50,7 @@ typedef struct UnkStruct_ov104_0223DA28_t { UnkStruct_ov104_0223DA28_sub1 *unk_08; } UnkStruct_ov104_0223DA28; -static UnkStruct_ov104_0223DB34 *ov104_0223DA40(BGL *param0); +static UnkStruct_ov104_0223DB34 *ov104_0223DA40(BgConfig *param0); static void ov104_0223DB34(UnkStruct_ov104_0223DB34 *param0); static void ov104_0223DB48(SysTask *param0, void *param1); static UnkStruct_ov104_0223DC04 *ov104_0223DBB8(PaletteData *param0); @@ -62,7 +62,7 @@ static const u16 Unk_ov104_022418B0[] = { 0x15 }; -UnkStruct_ov104_0223DA28 *ov104_0223D9E4(BGL *param0, PaletteData *param1) +UnkStruct_ov104_0223DA28 *ov104_0223D9E4(BgConfig *param0, PaletteData *param1) { UnkStruct_ov104_0223DA28 *v0; @@ -84,7 +84,7 @@ void ov104_0223DA28(UnkStruct_ov104_0223DA28 *param0) Heap_FreeToHeap(param0); } -static UnkStruct_ov104_0223DB34 *ov104_0223DA40(BGL *param0) +static UnkStruct_ov104_0223DB34 *ov104_0223DA40(BgConfig *param0) { UnkStruct_ov104_0223DB34 *v0; diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c index 4d2d219d56..7315f79011 100644 --- a/src/overlay104/ov104_0223DC7C.c +++ b/src/overlay104/ov104_0223DC7C.c @@ -68,7 +68,7 @@ typedef struct { int unk_04; int unk_08; void *unk_0C; - BGL *unk_10; + BgConfig *unk_10; SpriteRenderer *unk_14; SpriteGfxHandler *unk_18; PaletteData *unk_1C; @@ -124,7 +124,7 @@ typedef struct { u8 unk_0B; } UnkStruct_ov104_0224191C; -void ov104_0223DC7C(int param0, BGL *param1, SpriteRenderer *param2, SpriteGfxHandler *param3, PaletteData *param4, u16 *param5, s16 param6, s16 param7); +void ov104_0223DC7C(int param0, BgConfig *param1, SpriteRenderer *param2, SpriteGfxHandler *param3, PaletteData *param4, u16 *param5, s16 param6, s16 param7); static void ov104_0223DD30(UnkStruct_ov104_0223DD30 *param0, SysTask *param1); static void ov104_0223DD5C(SysTask *param0, void *param1); static void ov104_0223DDB4(SysTask *param0, void *param1); @@ -180,7 +180,7 @@ static const SpriteTemplate Unk_ov104_022418E8 = { 0x0 }; -void ov104_0223DC7C(int param0, BGL *param1, SpriteRenderer *param2, SpriteGfxHandler *param3, PaletteData *param4, u16 *param5, s16 param6, s16 param7) +void ov104_0223DC7C(int param0, BgConfig *param1, SpriteRenderer *param2, SpriteGfxHandler *param3, PaletteData *param4, u16 *param5, s16 param6, s16 param7) { SysTask *v0; UnkStruct_ov104_0223DD30 *v1; @@ -428,7 +428,7 @@ static void ov104_0223E29C(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_022 SpriteManagerAllocation v2; int v3; FontOAM *v4; - BGL *v5; + BgConfig *v5; SpriteGfxHandler *v6; int v7, v8; diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 0fb71f6702..e3a71d7b78 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -104,7 +104,7 @@ struct UnkStruct_ov105_02241FF4_t { Strbuf *unk_28; Strbuf *unk_2C[4]; u16 unk_3C[8]; - BGL *unk_4C; + BgConfig *unk_4C; Window unk_50[10]; UnkStruct_02081CF4 unk_F0; UIControlData *unk_FC; @@ -177,10 +177,10 @@ static void ov105_0224531C(UnkStruct_ov105_02241FF4 *param0); static void ov105_022453F8(UnkStruct_ov105_02241FF4 *param0, u8 param1, u8 param2, int param3, const Party *param4); static void ov105_0224472C(UnkStruct_ov105_02241FF4 *param0); static void ov105_02244678(UnkStruct_ov105_02241FF4 *param0); -static void ov105_0224473C(BGL *param0); +static void ov105_0224473C(BgConfig *param0); static void ov105_0224451C(void *param0); static void ov105_02244564(void); -static void ov105_02244584(BGL *param0); +static void ov105_02244584(BgConfig *param0); static void ov105_02244778(UnkStruct_ov105_02241FF4 *param0, int *param1, int param2); static BOOL ov105_02244780(UnkStruct_ov105_02241FF4 *param0); static BOOL ov105_02244830(UnkStruct_ov105_02241FF4 *param0); @@ -2164,7 +2164,7 @@ static void ov105_02244564(void) return; } -static void ov105_02244584(BGL *param0) +static void ov105_02244584(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -2308,7 +2308,7 @@ static void ov105_0224472C(UnkStruct_ov105_02241FF4 *param0) return; } -static void ov105_0224473C(BGL *param0) +static void ov105_0224473C(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); diff --git a/src/overlay105/ov105_02246214.c b/src/overlay105/ov105_02246214.c index 73dc2a3993..f8690c6a2d 100644 --- a/src/overlay105/ov105_02246214.c +++ b/src/overlay105/ov105_02246214.c @@ -6,9 +6,9 @@ #include "bg_window.h" #include "unk_0200DA60.h" -void ov105_02246214(BGL *param0, Window *param1); +void ov105_02246214(BgConfig *param0, Window *param1); void ov105_02246244(Window *param0); -void ov105_02246260(BGL *param0, Window *param1); +void ov105_02246260(BgConfig *param0, Window *param1); void ov105_0224628C(Window *param0, int param1); static const UnkStruct_ov61_0222C884 Unk_ov105_02246458[] = { @@ -24,7 +24,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov105_02246458[] = { { 0x1, 0x16, 0x6, 0x9, 0x2, 0xD, 0x105 } }; -void ov105_02246214(BGL *param0, Window *param1) +void ov105_02246214(BgConfig *param0, Window *param1) { u8 v0; const UnkStruct_ov61_0222C884 *v1 = Unk_ov105_02246458; @@ -48,7 +48,7 @@ void ov105_02246244(Window *param0) return; } -void ov105_02246260(BGL *param0, Window *param1) +void ov105_02246260(BgConfig *param0, Window *param1) { sub_0200DAA4(param0, 1, (1024 - 9), 11, 0, 93); Window_Show(param1, 1, (1024 - 9), 11); diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index c3338b7a20..322b30a3c5 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -95,7 +95,7 @@ struct UnkStruct_ov106_02243118_t { Strbuf *unk_2C; Strbuf *unk_30[2]; u16 unk_38[8]; - BGL *unk_48; + BgConfig *unk_48; Window unk_4C[4]; UnkStruct_02081CF4 unk_8C; UIControlData *unk_98; @@ -138,10 +138,10 @@ static void ov106_022424C8(void); static void ov106_02242500(UnkStruct_ov106_02243118 *param0); static void ov106_02242688(UnkStruct_ov106_02243118 *param0); static void ov106_0224262C(UnkStruct_ov106_02243118 *param0); -static void ov106_022426A4(BGL *param0); +static void ov106_022426A4(BgConfig *param0); static void ov106_022426E0(void *param0); static void ov106_0224271C(void); -static void ov106_0224273C(BGL *param0); +static void ov106_0224273C(BgConfig *param0); static void ov106_0224283C(UnkStruct_ov106_02243118 *param0, u32 param1); static void ov106_02242884(void); static void ov106_022428B8(UnkStruct_ov106_02243118 *param0, u32 param1); @@ -160,8 +160,8 @@ static void ov106_02242D5C(UnkStruct_ov106_02243118 *param0, int *param1, int pa static void ov106_02242D64(UnkStruct_ov106_02243118 *param0, int param1); static u16 ov106_02242F24(UnkStruct_ov106_02243118 *param0); static u16 ov106_02242F3C(UnkStruct_ov106_02243118 *param0); -static void ov106_02242FAC(BGL *param0, u8 param1, u8 param2); -static void ov106_02242F4C(UnkStruct_ov106_02243118 *param0, BGL *param1); +static void ov106_02242FAC(BgConfig *param0, u8 param1, u8 param2); +static void ov106_02242F4C(UnkStruct_ov106_02243118 *param0, BgConfig *param1); static u8 ov106_02243090(u8 param0); static BOOL ov106_02243098(UnkStruct_ov106_02243118 *param0); static BOOL ov106_022430B0(UnkStruct_ov106_02243118 *param0); @@ -869,7 +869,7 @@ static void ov106_02242688(UnkStruct_ov106_02243118 *param0) return; } -static void ov106_022426A4(BGL *param0) +static void ov106_022426A4(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); @@ -921,7 +921,7 @@ static void ov106_0224271C(void) return; } -static void ov106_0224273C(BGL *param0) +static void ov106_0224273C(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1362,7 +1362,7 @@ static u16 ov106_02242F3C(UnkStruct_ov106_02243118 *param0) return (param0->unk_0D / 4) * 36 + 16; } -static void ov106_02242F4C(UnkStruct_ov106_02243118 *param0, BGL *param1) +static void ov106_02242F4C(UnkStruct_ov106_02243118 *param0, BgConfig *param1) { int v0; @@ -1384,7 +1384,7 @@ static void ov106_02242F4C(UnkStruct_ov106_02243118 *param0, BGL *param1) return; } -static void ov106_02242FAC(BGL *param0, u8 param1, u8 param2) +static void ov106_02242FAC(BgConfig *param0, u8 param1, u8 param2) { u8 v0, v1, v2, v3, v4; diff --git a/src/overlay106/ov106_022436E0.c b/src/overlay106/ov106_022436E0.c index 4341dd1182..3f45a11869 100644 --- a/src/overlay106/ov106_022436E0.c +++ b/src/overlay106/ov106_022436E0.c @@ -6,9 +6,9 @@ #include "bg_window.h" #include "unk_0200DA60.h" -void ov106_022436E0(BGL *param0, Window *param1); +void ov106_022436E0(BgConfig *param0, Window *param1); void ov106_02243710(Window *param0); -void ov106_0224372C(BGL *param0, Window *param1); +void ov106_0224372C(BgConfig *param0, Window *param1); void ov106_02243758(Window *param0, int param1); static const UnkStruct_ov61_0222C884 Unk_ov106_02243860[] = { @@ -18,7 +18,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov106_02243860[] = { { 0x1, 0x1, 0x0, 0x1F, 0x16, 0xD, 0x1 } }; -void ov106_022436E0(BGL *param0, Window *param1) +void ov106_022436E0(BgConfig *param0, Window *param1) { u8 v0; const UnkStruct_ov61_0222C884 *v1 = Unk_ov106_02243860; @@ -42,7 +42,7 @@ void ov106_02243710(Window *param0) return; } -void ov106_0224372C(BGL *param0, Window *param1) +void ov106_0224372C(BgConfig *param0, Window *param1) { sub_0200DAA4(param0, 0, (1024 - 9), 11, 0, 98); Window_Show(param1, 1, (1024 - 9), 11); diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index 3e20d588ac..c2451cff92 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -249,7 +249,7 @@ struct UnkStruct_ov107_02241D6C_t { Strbuf* unk_2C; Strbuf* unk_30[3]; u16 unk_3C[8]; - BGL * unk_4C; + BgConfig *unk_4C; Window unk_50[18]; UnkStruct_02081CF4 unk_170; UIControlData * unk_17C; @@ -301,10 +301,10 @@ static void ov107_02242F24(void); static void ov107_02242F5C(UnkStruct_ov107_02241D6C * param0); static void ov107_02243384(UnkStruct_ov107_02241D6C * param0); static void ov107_02243324(UnkStruct_ov107_02241D6C * param0); -static void ov107_022433A8(BGL * param0); +static void ov107_022433A8(BgConfig *param0); static void ov107_022433EC(void * param0); static void ov107_02243424(void); -static void ov107_02243444(BGL * param0); +static void ov107_02243444(BgConfig *param0); static void ov107_02243588(UnkStruct_ov107_02241D6C * param0, u32 param1); static void ov107_022435FC(void); static void ov107_02243630(UnkStruct_ov107_02241D6C * param0, u32 param1); @@ -1559,7 +1559,7 @@ static void ov107_02243384 (UnkStruct_ov107_02241D6C * param0) return; } -static void ov107_022433A8 (BGL * param0) +static void ov107_022433A8(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); @@ -1608,7 +1608,7 @@ static void ov107_02243424 (void) return; } -static void ov107_02243444 (BGL * param0) +static void ov107_02243444(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index 80ff4e0141..d0e6cc5418 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -104,7 +104,7 @@ struct UnkStruct_ov107_02246170_t { Strbuf* unk_2C; Strbuf* unk_30[3]; u16 unk_3C[8]; - BGL * unk_4C; + BgConfig *unk_4C; Window unk_50[12]; UnkStruct_02081CF4 unk_110; UIControlData * unk_11C; @@ -156,10 +156,10 @@ static void ov107_02246EAC(void); static void ov107_02246EE4(UnkStruct_ov107_02246170 * param0); static void ov107_02247280(UnkStruct_ov107_02246170 * param0); static void ov107_02247220(UnkStruct_ov107_02246170 * param0); -static void ov107_022472A4(BGL * param0); +static void ov107_022472A4(BgConfig *param0); static void ov107_022472E8(void * param0); static void ov107_02247320(void); -static void ov107_02247340(BGL * param0); +static void ov107_02247340(BgConfig *param0); static void ov107_02247484(UnkStruct_ov107_02246170 * param0, u32 param1); static void ov107_022474F8(void); static void ov107_0224752C(UnkStruct_ov107_02246170 * param0, u32 param1); @@ -1226,7 +1226,7 @@ static void ov107_02247280 (UnkStruct_ov107_02246170 * param0) return; } -static void ov107_022472A4 (BGL * param0) +static void ov107_022472A4(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); @@ -1275,7 +1275,7 @@ static void ov107_02247320 (void) return; } -static void ov107_02247340 (BGL * param0) +static void ov107_02247340(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { diff --git a/src/overlay107/ov107_02249D14.c b/src/overlay107/ov107_02249D14.c index 4bc3cba0ab..d9813abdfd 100644 --- a/src/overlay107/ov107_02249D14.c +++ b/src/overlay107/ov107_02249D14.c @@ -11,9 +11,9 @@ typedef struct { u32 unk_04; } UnkStruct_ov107_0224A218; -void ov107_02249D14(BGL *param0, Window *param1, u8 param2); +void ov107_02249D14(BgConfig *param0, Window *param1, u8 param2); void ov107_02249D5C(Window *param0, u8 param1); -void ov107_02249D84(BGL *param0, Window *param1); +void ov107_02249D84(BgConfig *param0, Window *param1); void ov107_02249DBC(Window *param0, int param1); static const UnkStruct_ov61_0222C884 Unk_ov107_0224A288[] = { @@ -57,7 +57,7 @@ static const UnkStruct_ov107_0224A218 Unk_ov107_0224A218[2] = { { Unk_ov107_0224A228, 0xC } }; -void ov107_02249D14(BGL *param0, Window *param1, u8 param2) +void ov107_02249D14(BgConfig *param0, Window *param1, u8 param2) { u8 v0; const UnkStruct_ov61_0222C884 *v1 = Unk_ov107_0224A218[param2].unk_00; @@ -83,7 +83,7 @@ void ov107_02249D5C(Window *param0, u8 param1) return; } -void ov107_02249D84(BGL *param0, Window *param1) +void ov107_02249D84(BgConfig *param0, Window *param1) { sub_0200DAA4(param0, sub_0201C290(param1), (1024 - 9), 11, 0, 100); Window_Show(param1, 1, (1024 - 9), 11); diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 154a05ef5a..67d7ba7ec3 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -194,7 +194,7 @@ struct UnkStruct_ov108_02241DB0_t { Strbuf *unk_74; Strbuf *unk_78[2]; u16 unk_80[8]; - BGL *unk_90; + BgConfig *unk_90; Window unk_94[2]; UnkStruct_02081CF4 unk_B4; UIControlData *unk_C0; @@ -238,10 +238,10 @@ static void ov108_02242344(void); static void ov108_0224237C(UnkStruct_ov108_02241DB0 *param0); static void ov108_022426B0(UnkStruct_ov108_02241DB0 *param0); static void ov108_02242658(UnkStruct_ov108_02241DB0 *param0); -static void ov108_022426D4(BGL *param0); +static void ov108_022426D4(BgConfig *param0); static void ov108_02242708(void *param0); static void ov108_02242740(void); -static void ov108_02242760(BGL *param0); +static void ov108_02242760(BgConfig *param0); static void ov108_02242828(UnkStruct_ov108_02241DB0 *param0, u32 param1); static void ov108_02242884(UnkStruct_ov108_02241DB0 *param0, u32 param1); static void ov108_022428C0(void); @@ -895,7 +895,7 @@ static void ov108_022426B0(UnkStruct_ov108_02241DB0 *param0) return; } -static void ov108_022426D4(BGL *param0) +static void ov108_022426D4(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); @@ -942,7 +942,7 @@ static void ov108_02242740(void) return; } -static void ov108_02242760(BGL *param0) +static void ov108_02242760(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { diff --git a/src/overlay108/ov108_02243630.c b/src/overlay108/ov108_02243630.c index 44a402db5c..715e839169 100644 --- a/src/overlay108/ov108_02243630.c +++ b/src/overlay108/ov108_02243630.c @@ -5,7 +5,7 @@ #include "bg_window.h" -void ov108_02243630(BGL *param0, Window *param1); +void ov108_02243630(BgConfig *param0, Window *param1); void ov108_02243660(Window *param0); static const UnkStruct_ov61_0222C884 Unk_ov108_02243774[] = { @@ -13,7 +13,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov108_02243774[] = { { 0x1, 0x18, 0xD, 0x7, 0x4, 0xD, 0x6D } }; -void ov108_02243630(BGL *param0, Window *param1) +void ov108_02243630(BgConfig *param0, Window *param1) { u8 v0; const UnkStruct_ov61_0222C884 *v1 = Unk_ov108_02243774; diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index 3dce3a4013..63311b96e3 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -297,7 +297,7 @@ typedef struct UnkStruct_ov109_021D0F70_t { UnkStruct_ov109_021D28C4 unk_D0C; UnkStruct_ov109_021D294C unk_D2C; NARC *unk_D80; - BGL *unk_D84; + BgConfig *unk_D84; NNSG2dScreenData *unk_D88; NNSG2dCharacterData *unk_D8C; NNSG2dPaletteData *unk_D90; diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index e567df328e..5b000a7c1a 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -63,10 +63,10 @@ static void ov109_021D40A8(void *param0); static void ov109_021D40D0(void); -static void ov109_021D40F0(BGL *param0); +static void ov109_021D40F0(BgConfig *param0); static void ov109_021D41F8(UnkStruct_ov109_021D5140 *param0, NARC *param1); static void ov109_021D4294(UnkStruct_ov109_021D5140 *param0); -static void ov109_021D42CC(BGL *param0); +static void ov109_021D42CC(BgConfig *param0); static void ov109_021D4300(UnkStruct_ov109_021D5140 *param0, NARC *param1); static void ov109_021D43EC(void); static void ov109_021D441C(UnkStruct_ov109_021D5140 *param0, NARC *param1); @@ -366,7 +366,7 @@ static void ov109_021D40A8(void *param0) { sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8((BGL *)param0); + sub_0201C2B8((BgConfig *)param0); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -389,7 +389,7 @@ static void ov109_021D40D0(void) GXLayers_SetBanks(&v0); } -static void ov109_021D40F0(BGL *param0) +static void ov109_021D40F0(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -553,7 +553,7 @@ static void ov109_021D4294(UnkStruct_ov109_021D5140 *param0) Strbuf_Free(param0->unk_54); } -static void ov109_021D42CC(BGL *param0) +static void ov109_021D42CC(BgConfig *param0) { sub_02019044(param0, 6); sub_02019044(param0, 5); @@ -565,7 +565,7 @@ static void ov109_021D42CC(BGL *param0) static void ov109_021D4300(UnkStruct_ov109_021D5140 *param0, NARC *param1) { - BGL *v0 = param0->unk_14; + BgConfig *v0 = param0->unk_14; sub_02007130(param1, 0, 0, 0, 16 * 16 * 2, 95); sub_02006E84(12, 12, 4, 0, 16 * 2, 95); diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 8b63f2caaf..68af87737f 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -47,7 +47,7 @@ typedef struct { u8 unk_07; u16 unk_08; u16 unk_0A; - BGL * unk_0C; + BgConfig *unk_0C; Window unk_10[16]; MessageLoader * unk_110; StringTemplate * unk_114; @@ -67,9 +67,9 @@ static BOOL ov110_021D0FD0(UnkStruct_ov110_021D0F78 * param0); static BOOL ov110_021D1000(UnkStruct_ov110_021D0F78 * param0); static void ov110_021D1048(void * param0); static void ov110_021D1078(void); -static void ov110_021D1098(BGL * param0); +static void ov110_021D1098(BgConfig *param0); static void ov110_021D1180(UnkStruct_ov110_021D0F78 * param0); -static void ov110_021D11CC(BGL * param0); +static void ov110_021D11CC(BgConfig *param0); static void ov110_021D1200(UnkStruct_ov110_021D0F78 * param0, int * param1, int param2); static u8 ov110_021D1208(u8 param0); static void ov110_021D123C(UnkStruct_ov110_021D0F78 * param0, u32 param1); @@ -281,7 +281,7 @@ static void ov110_021D1078 (void) return; } -static void ov110_021D1098 (BGL * param0) +static void ov110_021D1098(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -385,7 +385,7 @@ static void ov110_021D1180 (UnkStruct_ov110_021D0F78 * param0) return; } -static void ov110_021D11CC (BGL * param0) +static void ov110_021D11CC(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); diff --git a/src/overlay110/ov110_021D2124.c b/src/overlay110/ov110_021D2124.c index 95f46f41e5..281fc55ac1 100644 --- a/src/overlay110/ov110_021D2124.c +++ b/src/overlay110/ov110_021D2124.c @@ -10,7 +10,7 @@ typedef struct { u32 unk_04; } UnkStruct_ov110_021D2278; -void ov110_021D2124(BGL *param0, Window *param1, u8 param2); +void ov110_021D2124(BgConfig *param0, Window *param1, u8 param2); void ov110_021D216C(Window *param0, u8 param1); static const UnkStruct_ov61_0222C884 Unk_ov110_021D22A0[] = { @@ -63,7 +63,7 @@ static const UnkStruct_ov110_021D2278 Unk_ov110_021D2278[5] = { { Unk_ov110_021D22D8, 0x9 } }; -void ov110_021D2124(BGL *param0, Window *param1, u8 param2) +void ov110_021D2124(BgConfig *param0, Window *param1, u8 param2) { u8 v0; const UnkStruct_ov61_0222C884 *v1 = Unk_ov110_021D2278[param2].unk_00; diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index 518d70afa8..0e4811185e 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -81,7 +81,7 @@ struct UnkStruct_ov111_021D0F7C_t { Strbuf *unk_40; Strbuf *unk_44; u16 unk_48[8]; - BGL *unk_58; + BgConfig *unk_58; Window unk_5C[16]; PaletteData *unk_15C; UnkStruct_0200C440 *unk_160; @@ -145,10 +145,10 @@ static void ov111_021D1F84(UnkStruct_ov111_021D0F7C *param0); static void ov111_021D1FB4(UnkStruct_ov111_021D0F7C *param0); static void ov111_021D2034(UnkStruct_ov111_021D0F7C *param0); static void ov111_021D1FC4(UnkStruct_ov111_021D0F7C *param0); -static void ov111_021D2044(BGL *param0); +static void ov111_021D2044(BgConfig *param0); static void ov111_021D2090(void *param0); static void ov111_021D20CC(void); -static void ov111_021D20EC(BGL *param0); +static void ov111_021D20EC(BgConfig *param0); static void ov111_021D2248(UnkStruct_ov111_021D0F7C *param0, u32 param1); static void ov111_021D22D0(void); static void ov111_021D228C(UnkStruct_ov111_021D0F7C *param0, u32 param1); @@ -1259,7 +1259,7 @@ static void ov111_021D2034(UnkStruct_ov111_021D0F7C *param0) return; } -static void ov111_021D2044(BGL *param0) +static void ov111_021D2044(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); @@ -1312,7 +1312,7 @@ static void ov111_021D20CC(void) return; } -static void ov111_021D20EC(BGL *param0) +static void ov111_021D20EC(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { diff --git a/src/overlay111/ov111_021D3548.c b/src/overlay111/ov111_021D3548.c index 9b4d7eff4d..0f0b63af35 100644 --- a/src/overlay111/ov111_021D3548.c +++ b/src/overlay111/ov111_021D3548.c @@ -25,12 +25,12 @@ static const UnkStruct_ov61_0222C884 Unk_ov111_021D38B8[] = { { 0x4, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x1 } }; -void ov111_021D3548(BGL *param0, Window *param1); +void ov111_021D3548(BgConfig *param0, Window *param1); void ov111_021D3578(Window *param0); -void ov111_021D3594(BGL *param0, Window *param1); +void ov111_021D3594(BgConfig *param0, Window *param1); void ov111_021D35C0(Window *param0, int param1); -void ov111_021D3548(BGL *param0, Window *param1) +void ov111_021D3548(BgConfig *param0, Window *param1) { u8 v0; const UnkStruct_ov61_0222C884 *v1 = Unk_ov111_021D38B8; @@ -54,7 +54,7 @@ void ov111_021D3578(Window *param0) return; } -void ov111_021D3594(BGL *param0, Window *param1) +void ov111_021D3594(BgConfig *param0, Window *param1) { sub_0200DAA4(param0, 2, (1024 - 9), 11, 0, 115); Window_Show(param1, 1, (1024 - 9), 11); diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index 84c6a0e4e2..c1ab12360f 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -114,7 +114,7 @@ typedef struct { } UnkStruct_ov112_0225D6DC; typedef struct { - BGL *unk_00; + BgConfig *unk_00; CellActorCollection *unk_04; UnkStruct_0200C738 unk_08; SpriteResourceCollection *unk_194[4]; diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index ade65935dc..9a1dfc762d 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -94,7 +94,7 @@ typedef struct { typedef struct UnkStruct_ov113_0225DBCC_t { UnkStruct_ov66_0223127C *unk_00; SaveData *unk_04; - BGL *unk_08; + BgConfig *unk_08; PaletteData *unk_0C; UnkStruct_02012744 *unk_10; GenericPointerData *unk_14; @@ -142,8 +142,8 @@ typedef struct UnkStruct_ov113_0225DBCC_t { static void ov113_0225CEF0(SysTask *param0, void *param1); static void ov113_0225CF18(void *param0); -static void ov113_0225CF58(BGL *param0); -static void ov113_0225D12C(BGL *param0); +static void ov113_0225CF58(BgConfig *param0); +static void ov113_0225D12C(BgConfig *param0); static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1); static void ov113_0225DBCC(UnkStruct_ov113_0225DBCC *param0); static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0); @@ -701,7 +701,7 @@ static void ov113_0225CF18(void *param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov113_0225CF58(BGL *param0) +static void ov113_0225CF58(BgConfig *param0) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -875,7 +875,7 @@ static void ov113_0225CF58(BGL *param0) sub_02019690(5, 32, 0, 118); } -static void ov113_0225D12C(BGL *param0) +static void ov113_0225D12C(BgConfig *param0) { sub_02019044(param0, 6); sub_02019044(param0, 5); @@ -887,7 +887,7 @@ static void ov113_0225D12C(BGL *param0) static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1) { - BGL *v0 = param0->unk_08; + BgConfig *v0 = param0->unk_08; u16 *v1; PaletteSys_LoadPalette(param0->unk_0C, 187, 19, 118, 0, 0x200 - 0x40, 0); @@ -1510,7 +1510,7 @@ static void ov113_0225E15C(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_022 SpriteManagerAllocation v2; int v3; FontOAM *v4; - BGL *v5; + BgConfig *v5; SpriteGfxHandler *v6; int v7, v8; diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index 361525f34c..d59dd38dea 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -92,7 +92,7 @@ typedef struct { } UnkStruct_ov114_02260284; typedef struct { - BGL *unk_00; + BgConfig *unk_00; const UnkStruct_ov114_02260284 *unk_04; u32 unk_08; } UnkStruct_ov114_0225CEF0; diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index 4c407b7192..e94f85d42c 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -273,7 +273,7 @@ typedef struct { } UnkStruct_ov115_022658E0; typedef struct { - BGL *unk_00; + BgConfig *unk_00; StringTemplate *unk_04; MessageLoader *unk_08; Strbuf *unk_0C; diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c index 983f881e34..1e01d46479 100644 --- a/src/overlay116/ov116_022604C4.c +++ b/src/overlay116/ov116_022604C4.c @@ -48,7 +48,7 @@ #include "unk_020393C8.h" static void ov116_022612CC(UnkStruct_ov116_0226139C *param0); -static void ov116_02261494(BGL *param0); +static void ov116_02261494(BgConfig *param0); static void ov116_022616CC(UnkStruct_ov116_0226139C *param0); static BOOL ov116_02261768(int param0); static void ov116_0226178C(UnkStruct_ov116_0226139C *param0, BOOL param1, int param2, int *param3); @@ -836,7 +836,7 @@ void ov116_0226139C(UnkStruct_ov116_0226139C *param0) G3X_AlphaBlend(0); } -static void ov116_02261494(BGL *param0) +static void ov116_02261494(BgConfig *param0) { GXLayers_DisableEngineALayers(); { diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c index fe3b58082e..ecb658bf89 100644 --- a/src/overlay116/ov116_02261870.c +++ b/src/overlay116/ov116_02261870.c @@ -579,7 +579,7 @@ void ov116_022622C8(UnkStruct_ov116_0226139C *param0) { NARC *v0 = param0->unk_48.unk_00; NARC *v1 = param0->unk_48.unk_04; - BGL *v2 = param0->unk_48.unk_10; + BgConfig *v2 = param0->unk_48.unk_10; SpriteRenderer *v3 = param0->unk_48.unk_08; SpriteGfxHandler *v4 = param0->unk_48.unk_0C; PaletteData *v5 = param0->unk_48.unk_14; @@ -817,7 +817,7 @@ void ov116_022628B8(UnkStruct_ov116_0226139C *param0) { NARC *v0 = param0->unk_48.unk_00; NARC *v1 = param0->unk_48.unk_04; - BGL *v2 = param0->unk_48.unk_10; + BgConfig *v2 = param0->unk_48.unk_10; SpriteRenderer *v3 = param0->unk_48.unk_08; SpriteGfxHandler *v4 = param0->unk_48.unk_0C; PaletteData *v5 = param0->unk_48.unk_14; diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index 5927d62130..5452a035b9 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -66,7 +66,7 @@ static GenericPointerData *ov117_02260E14(int param0); static void ov117_02260E34(void); static void ov117_02260EB8(GenericPointerData *param0); static void ov117_02260F7C(SysTask *param0, void *param1); -static void ov117_022610D8(BGL *param0); +static void ov117_022610D8(BgConfig *param0); static void ov117_02261280(UnkStruct_ov117_02261280 *param0); static void ov117_02261574(UnkStruct_ov117_02261280 *param0); static void ov117_022615E0(UnkStruct_ov117_02261280 *param0); @@ -634,7 +634,7 @@ static void ov117_02260F7C(SysTask *param0, void *param1) sub_02038A1C(110, v0->unk_2C); } -static void ov117_022610D8(BGL *param0) +static void ov117_022610D8(BgConfig *param0) { GXLayers_DisableEngineALayers(); diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c index f5f8cbfeaf..53e3d67904 100644 --- a/src/overlay117/ov117_02263AF0.c +++ b/src/overlay117/ov117_02263AF0.c @@ -65,7 +65,7 @@ typedef struct { u8 unk_03; } UnkStruct_ov117_02266BC4; -static void ov117_02263BA4(BGL *param0, UnkStruct_ov117_02263DAC *param1, int param2); +static void ov117_02263BA4(BgConfig *param0, UnkStruct_ov117_02263DAC *param1, int param2); int ov117_02263DAC(UnkStruct_ov117_02261280 *param0); static void ov117_02263C8C(int param0, int param1, int param2, fx32 *param3, fx32 *param4); static int ov117_02263D08(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02263DAC *param1, int param2, int param3, int param4); @@ -73,7 +73,7 @@ static int ov117_02263E1C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov11 static BOOL ov117_02263F80(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02263EF8 *param1); static CellActorData *ov117_0226417C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02266F10 *param1); static void ov117_02264214(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264808 *param1, UnkStruct_ov117_02263DAC *param2); -static void ov117_02263B8C(BGL *param0, UnkStruct_ov117_02263DAC *param1); +static void ov117_02263B8C(BgConfig *param0, UnkStruct_ov117_02263DAC *param1); static CellActorData *ov117_02264884(UnkStruct_ov117_02261280 *param0, int param1, int param2); void ov117_022648E0(UnkStruct_ov117_02261280 *param0); BOOL ov117_02264930(UnkStruct_ov117_02261280 *param0); @@ -386,7 +386,7 @@ static int (*const Unk_ov117_02266B94[])(UnkStruct_ov117_02261280 *, UnkStruct_o ov117_022657C4, }; -void ov117_02263AF0(BGL *param0, int param1, int param2, UnkStruct_ov117_02263DAC *param3) +void ov117_02263AF0(BgConfig *param0, int param1, int param2, UnkStruct_ov117_02263DAC *param3) { NARC *v0; @@ -407,14 +407,14 @@ void ov117_02263AF0(BGL *param0, int param1, int param2, UnkStruct_ov117_02263DA Sound_PlayEffect(1515); } -static void ov117_02263B8C(BGL *param0, UnkStruct_ov117_02263DAC *param1) +static void ov117_02263B8C(BgConfig *param0, UnkStruct_ov117_02263DAC *param1) { sub_02019EBC(param0, 7); param1->unk_00 = 0; param1->unk_2D = 1; } -static void ov117_02263BA4(BGL *param0, UnkStruct_ov117_02263DAC *param1, int param2) +static void ov117_02263BA4(BgConfig *param0, UnkStruct_ov117_02263DAC *param1, int param2) { fx32 v0, v1; int v2, v3; @@ -531,7 +531,7 @@ static int ov117_02263D5C(UnkStruct_ov117_02263DAC *param0) return 1; } -void ov117_02263D80(UnkStruct_ov117_02261280 *param0, BGL *param1, UnkStruct_ov117_02263DAC *param2) +void ov117_02263D80(UnkStruct_ov117_02261280 *param0, BgConfig *param1, UnkStruct_ov117_02263DAC *param2) { if (param0->unk_2FCC == 0) { return; @@ -2010,7 +2010,7 @@ static BOOL ov117_02265C3C(UnkStruct_ov117_02265C3C *param0, UnkStruct_ov117_022 return 1; } -void ov117_02265DB8(BGL *param0, SpriteGfxHandler *param1, UnkStruct_02012744 *param2, UnkStruct_ov117_02265EB0 *param3, const Strbuf *param4, enum Font param5, TextColor param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) +void ov117_02265DB8(BgConfig *param0, SpriteGfxHandler *param1, UnkStruct_02012744 *param2, UnkStruct_ov117_02265EB0 *param3, const Strbuf *param4, enum Font param5, TextColor param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) { UnkStruct_020127E8 v0; Window v1; diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index 1e178b1cce..9c71f49eef 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -113,7 +113,7 @@ void ov119_021D0E78(void) sub_02014000(); } -void ov119_021D0EB8(BGL *param0) +void ov119_021D0EB8(BgConfig *param0) { GXLayers_DisableEngineALayers(); @@ -278,7 +278,7 @@ void ov119_021D1048(void) sub_0200F174(0, 0, 0, 0x0, 6, 1, 71); } -void ov119_021D1068(BGL *param0, PaletteData *param1, int param2) +void ov119_021D1068(BgConfig *param0, PaletteData *param1, int param2) { int v0 = 71; @@ -289,7 +289,7 @@ void ov119_021D1068(BGL *param0, PaletteData *param1, int param2) PaletteSys_LoadPalette(param1, 14, 7, v0, 0, 0x20, 14 * 16); } -void ov119_021D10F0(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) +void ov119_021D10F0(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { Window_Init(param1); BGL_AddWindow(param0, param1, param2, param3, param4, param5, param6, param8, param7); @@ -328,7 +328,7 @@ int ov119_021D1158(Window *param0, int param1, Pokemon *param2, int param3) return v0; } -void ov119_021D11E4(UnkStruct_ov119_021D0FD0 *param0, BGL *param1, Window *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) +void ov119_021D11E4(UnkStruct_ov119_021D0FD0 *param0, BgConfig *param1, Window *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) { UnkStruct_02081CF4 v0; @@ -379,7 +379,7 @@ void ov119_021D12F8(Window *param0) BGL_DeleteWindow(param0); } -void ov119_021D1308(BGL *param0, PaletteData *param1) +void ov119_021D1308(BgConfig *param0, PaletteData *param1) { int v0 = 118; int v1 = 0; @@ -393,7 +393,7 @@ void ov119_021D1308(BGL *param0, PaletteData *param1) PaletteSys_LoadPalette(param1, v0, v3, v5, 0, 0x20 * 2, 0); } -void ov119_021D135C(BGL *param0, PaletteData *param1) +void ov119_021D135C(BgConfig *param0, PaletteData *param1) { int v0 = 12; int v1 = 10; diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c index 00b9245c2b..0bdc8c2db0 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_app.c @@ -78,8 +78,8 @@ static int sub_0208D164(PokemonSummaryApp *param0); static u8 sub_0208D17C(PokemonSummaryApp *param0); static u8 sub_0208D18C(PokemonSummaryApp *param0); static void sub_0208C638(void); -static void sub_0208C658(BGL *param0); -static void sub_0208C76C(BGL *param0); +static void sub_0208C658(BgConfig *param0); +static void sub_0208C76C(BgConfig *param0); static void sub_0208C7AC(PokemonSummaryApp *param0, NARC *param1); static void sub_0208C86C(void); static void sub_0208C604(void *param0); @@ -325,7 +325,7 @@ static void sub_0208C638(void) GXLayers_SetBanks(&v0); } -static void sub_0208C658(BGL *param0) +static void sub_0208C658(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -445,7 +445,7 @@ static void sub_0208C658(BGL *param0) sub_02019690(4, 32, 0, 19); } -static void sub_0208C76C(BGL *param0) +static void sub_0208C76C(BgConfig *param0) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); diff --git a/src/unk_02001AF4.c b/src/unk_02001AF4.c index fdc0bb99f5..6a6bad81f7 100644 --- a/src/unk_02001AF4.c +++ b/src/unk_02001AF4.c @@ -33,8 +33,8 @@ typedef struct UIControlData_t { u8 unk_1C; } UIControlData; -static void sub_0200DB10(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7); -static void sub_0200DD7C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7); +static void sub_0200DB10(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7); +static void sub_0200DD7C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7); static BOOL sub_02001DCC(UIControlData *param0, u8 param1, u16 param2); static u8 sub_02001E24(UIControlData *param0, u8 param1); static u8 sub_02001F1C(UIControlData *param0); @@ -371,7 +371,7 @@ static void sub_02002018(UIControlData *param0, u8 *param1, u8 *param2, u8 param *param2 = (param3 % param0->unk_00.unk_0A) * (param0->unk_1A + param0->unk_00.unk_0B_0) + param0->unk_18; } -UIControlData *sub_02002054(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u8 param4, u32 param5) +UIControlData *sub_02002054(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u8 param4, u32 param5) { UnkStruct_02081CF4 v0; MessageLoader *v1; @@ -399,7 +399,7 @@ UIControlData *sub_02002054(BGL *param0, const UnkStruct_ov61_0222C884 *param1, return sub_02001B7C(&v0, 8, 0, param4, param5, PAD_BUTTON_B); } -UIControlData *sub_02002100(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4) +UIControlData *sub_02002100(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4) { return sub_02002054(param0, param1, param2, param3, 0, param4); } diff --git a/src/unk_02006E3C.c b/src/unk_02006E3C.c index dea785ef95..01988443ec 100644 --- a/src/unk_02006E3C.c +++ b/src/unk_02006E3C.c @@ -9,8 +9,8 @@ #include "heap.h" #include "narc.h" -static u32 sub_020072D0(void *param0, BGL *param1, u32 param2, u32 param3, u32 param4); -static void sub_02007314(void *param0, BGL *param1, u32 param2, u32 param3, u32 param4); +static u32 sub_020072D0(void *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4); +static void sub_02007314(void *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4); static u32 sub_02007374(void *param0, int param1, u32 param2, u32 param3); static void sub_020073BC(void *param0, int param1, u32 param2, u32 param3, u32 param4); static void sub_0200749C(void *param0, NNS_G2D_VRAM_TYPE param1, u32 param2, NNSG2dImagePaletteProxy *param3); @@ -22,13 +22,13 @@ static void *sub_020075D8(void *param0, NNSG2dPaletteData **param1); static void *sub_020075F4(void *param0, NNSG2dCellDataBank **param1); static void *sub_02007610(void *param0, NNSG2dAnimBankData **param1); -u32 sub_02006E3C(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +u32 sub_02006E3C(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { void *v0 = sub_02006FE8(param0, param1, param6, param7, 0); return sub_020072D0(v0, param2, param3, param4, param5); } -void sub_02006E60(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +void sub_02006E60(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { void *v0 = sub_02006FE8(param0, param1, param6, param7, 1); sub_02007314(v0, param2, param3, param4, param5); @@ -179,13 +179,13 @@ void *sub_02007068(u32 narcIndex, u32 fileIndex, BOOL param2, u32 heapID, int pa return v0; } -u32 sub_020070E8(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +u32 sub_020070E8(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { void *v0 = sub_0200723C(param0, param1, param6, param7, 0); return sub_020072D0(v0, param2, param3, param4, param5); } -void sub_0200710C(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +void sub_0200710C(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { void *v0 = sub_0200723C(param0, param1, param6, param7, 1); sub_02007314(v0, param2, param3, param4, param5); @@ -291,7 +291,7 @@ void *sub_02007250(NARC *narc, u32 NarcFileIndex, BOOL param2, u32 param3, int p return v0; } -static u32 sub_020072D0(void *param0, BGL *param1, u32 param2, u32 param3, u32 param4) +static u32 sub_020072D0(void *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4) { if (param0 != NULL) { NNSG2dCharacterData *v0; @@ -310,7 +310,7 @@ static u32 sub_020072D0(void *param0, BGL *param1, u32 param2, u32 param3, u32 p return param4; } -static void sub_02007314(void *param0, BGL *param1, u32 param2, u32 param3, u32 param4) +static void sub_02007314(void *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4) { if (param0 != NULL) { NNSG2dScreenData *v0; diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c index d074973710..fb12478cfd 100644 --- a/src/unk_0200DA60.c +++ b/src/unk_0200DA60.c @@ -44,7 +44,7 @@ typedef struct { typedef struct { UnkStruct_ov5_021D30A8 unk_00; CellActorData *unk_1C8; - BGL *unk_1CC; + BgConfig *unk_1CC; u8 unk_1D0; u8 unk_1D1; u8 unk_1D2; @@ -52,10 +52,10 @@ typedef struct { } UnkStruct_0200ED50; static void sub_0200E130(Window *param0, u16 param1); -static void sub_0200E31C(BGL *param0, u8 param1, u16 param2, u8 param3, u16 param4, u32 param5); +static void sub_0200E31C(BgConfig *param0, u8 param1, u16 param2, u8 param3, u16 param4, u32 param5); static void sub_0200E924(UnkStruct_0200E924 *param0, u32 param1); static void sub_0200EB20(SysTask *param0, void *param1); -static UnkStruct_0200ED50 *sub_0200ED14(BGL *param0, u8 param1, u8 param2, u8 param3, u32 param4); +static UnkStruct_0200ED50 *sub_0200ED14(BgConfig *param0, u8 param1, u8 param2, u8 param3, u32 param4); static void sub_0200ED50(UnkStruct_0200ED50 *param0, u32 param1); static void sub_0200ED7C(UnkStruct_0200ED50 *param0); static void sub_0200EDD4(UnkStruct_0200ED50 *param0, u8 param1, u8 param2); @@ -79,7 +79,7 @@ static const SpriteTemplate Unk_020E5040 = { 0x0 }; -void Window_SetFrame(BGL *param0, u8 param1, u16 param2, u8 param3, u32 param4) +void Window_SetFrame(BgConfig *param0, u8 param1, u16 param2, u8 param3, u32 param4) { if (param3 == 0) { sub_02006E3C(38, 0, param0, param1, param2, 0, 0, param4); @@ -93,7 +93,7 @@ u32 Window_FramePalette(void) return 24; } -void sub_0200DAA4(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) +void sub_0200DAA4(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) { u32 v0; @@ -118,7 +118,7 @@ void sub_0200DAA4(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 } } -static void sub_0200DB10(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) +static void sub_0200DB10(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) { sub_02019CB8(param0, param1, param7, param2 - 1, param3 - 1, 1, 1, param6); sub_02019CB8(param0, param1, param7 + 1, param2, param3 - 1, param4, 1, param6); @@ -162,7 +162,7 @@ u32 sub_0200DD08(u32 param0) return 25 + param0; } -void sub_0200DD0C(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) +void sub_0200DD0C(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) { sub_02006E3C(38, sub_0200DD04(param4), param0, param1, param2, 0, 0, param5); @@ -173,7 +173,7 @@ void sub_0200DD0C(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 } } -static void sub_0200DD7C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) +static void sub_0200DD7C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) { sub_02019CB8(param0, param1, param7, param2 - 2, param3 - 1, 1, 1, param6); sub_02019CB8(param0, param1, param7 + 1, param2 - 1, param3 - 1, 1, 1, param6); @@ -273,7 +273,7 @@ static void sub_0200E130(Window *param0, u16 param1) Heap_FreeToHeap(v1); } -void sub_0200E218(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) +void sub_0200E218(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) { void *v0; NNSG2dCharacterData *v1; @@ -306,7 +306,7 @@ void sub_0200E218(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 Heap_FreeToHeap(v2); } -void sub_0200E2A4(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u16 param5, u32 param6) +void sub_0200E2A4(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u16 param5, u32 param6) { sub_02006E3C( 36, 0, param0, param1, param2, (18 + 12) * 0x20, 0, param6); @@ -329,7 +329,7 @@ void sub_0200E2A4(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u16 } } -static void sub_0200E31C(BGL *param0, u8 param1, u16 param2, u8 param3, u16 param4, u32 param5) +static void sub_0200E31C(BgConfig *param0, u8 param1, u16 param2, u8 param3, u16 param4, u32 param5) { if (param3 == 0) { param4 += 33; @@ -340,7 +340,7 @@ static void sub_0200E31C(BGL *param0, u8 param1, u16 param2, u8 param3, u16 para sub_02006E3C(36, param4, param0, param1, param2, 24 * 0x20, 0, param5); } -static void sub_0200E354(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) +static void sub_0200E354(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) { sub_02019CB8(param0, param1, param7, param2 - 9, param3 - 1, 1, 1, param6); sub_02019CB8(param0, param1, param7 + 1, param2 - 8, param3 - 1, 1, 1, param6); @@ -543,7 +543,7 @@ void sub_0200EBC8(void *param0) v0->unk_488_0 = 2; } -u8 *sub_0200EBF0(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, u16 param6, u8 param7, int param8) +u8 *sub_0200EBF0(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, u16 param6, u8 param7, int param8) { UnkStruct_0200ED50 *v0 = sub_0200ED14(param0, param1, param2, param3, param8); @@ -557,7 +557,7 @@ u8 *sub_0200EBF0(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 pa return &v0->unk_1D3; } -u8 *sub_0200EC48(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, Pokemon *param6, int param7) +u8 *sub_0200EC48(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, Pokemon *param6, int param7) { UnkStruct_0200ED50 *v0 = sub_0200ED14(param0, param1, param2, param3, param7); @@ -596,7 +596,7 @@ static void sub_0200EC9C(SysTask *param0, void *param1) CellActorCollection_Update(v0->unk_00.unk_00); } -static UnkStruct_0200ED50 *sub_0200ED14(BGL *param0, u8 param1, u8 param2, u8 param3, u32 param4) +static UnkStruct_0200ED50 *sub_0200ED14(BgConfig *param0, u8 param1, u8 param2, u8 param3, u32 param4) { UnkStruct_0200ED50 *v0 = SysTask_GetParam(SysTask_StartAndAllocateParam(sub_0200EC9C, sizeof(UnkStruct_0200ED50), 0, param4)); diff --git a/src/unk_02015920.c b/src/unk_02015920.c index 028db91ee1..10fb18f955 100644 --- a/src/unk_02015920.c +++ b/src/unk_02015920.c @@ -22,7 +22,7 @@ typedef struct { } UnkStruct_02015D8C; typedef struct { - BGL *unk_00; + BgConfig *unk_00; u32 unk_04; u32 unk_08; u32 unk_0C[4]; @@ -35,7 +35,7 @@ typedef struct { } UnkStruct_02015B14; typedef struct { - BGL *unk_00; + BgConfig *unk_00; u32 unk_04; void *unk_08[4]; NNSG2dScreenData *unk_18[4]; @@ -47,7 +47,7 @@ typedef struct { } UnkStruct_02015C38; typedef struct { - BGL *unk_00; + BgConfig *unk_00; NNSG2dCharacterData *unk_04; void *unk_08; int unk_0C; @@ -66,7 +66,7 @@ typedef struct UnkStruct_02015920_t { UnkStruct_02023FCC *unk_00; TouchScreenHitTable unk_04[2]; UnkStruct_02015C38 unk_0C[2]; - BGL *unk_7C; + BgConfig *unk_7C; u32 unk_80; u32 unk_84; fx32 unk_88[4]; @@ -90,11 +90,11 @@ static void sub_02015D60(UnkStruct_02015C38 *param0); static void sub_02015D8C(UnkStruct_02015D8C *param0, const fx32 *param1, u32 param2); static void sub_02015D98(UnkStruct_02015D8C *param0, fx32 param1); static u32 sub_02015DA0(const UnkStruct_02015D8C *param0); -static void sub_02015DCC(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5); +static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5); static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); static void sub_02015E64(SysTask *param0, void *param1); static void sub_02015EA0(SysTask *param0, void *param1); -static void sub_02015EE8(BGL *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4); +static void sub_02015EE8(BgConfig *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4); static void sub_02015F34(const NNSG2dScreenData *param0, int param1); static void sub_02015F54(const NNSG2dScreenData *param0, int param1); @@ -364,7 +364,7 @@ static u32 sub_02015DA0(const UnkStruct_02015D8C *param0) return param0->unk_04 - 1; } -static void sub_02015DCC(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5) +static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5) { UnkStruct_02015DCC *v0; @@ -423,7 +423,7 @@ static void sub_02015EA0(SysTask *param0, void *param1) Heap_FreeToHeap(v0); } -static void sub_02015EE8(BGL *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4) +static void sub_02015EE8(BgConfig *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4) { sub_020198E8(param0, param1, param3, param4, param2->screenWidth / 8, param2->screenHeight / 8, param2->rawData, 0, 0, param2->screenWidth / 8, param2->screenHeight / 8); sub_0201C3C0(param0, param1); diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c index 7c83fa24f9..0f59e5d449 100644 --- a/src/unk_020366A0.c +++ b/src/unk_020366A0.c @@ -2450,7 +2450,7 @@ void sub_02038A0C(void) } } -void sub_02038A1C(int param0, BGL *param1) +void sub_02038A1C(int param0, BgConfig *param1) { return; } diff --git a/src/unk_02039814.c b/src/unk_02039814.c index 561d0ca2d8..1bb6512149 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -75,7 +75,7 @@ static void sub_02039814(void) void sub_02039834(int param0, int param1, int param2) { - BGL *v0; + BgConfig *v0; Window v1; MessageLoader *v2; Strbuf *v3; diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index 07182b61d0..be8a7b7d45 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -69,7 +69,7 @@ static const UnkStruct_ov61_0222C884 Unk_020E5F48 = { void sub_02039A64(int param0, int param1) { - BGL *v0; + BgConfig *v0; Window v1; MessageLoader *v2; Strbuf *v3; diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index c4726fe8f7..eb5c9f36bf 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -40,7 +40,7 @@ typedef struct { int unk_00; FieldSystem *fieldSystem; - BGL *unk_08; + BgConfig *unk_08; Window unk_0C; MessageLoader *unk_1C; StringTemplate *unk_20; @@ -60,7 +60,7 @@ static const UnkStruct_ov61_0222C884 Unk_020EC2F0 = { 0x1 }; -static void sub_020528D0(BGL *param0) +static void sub_020528D0(BgConfig *param0) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c index 7ed2304f86..8a4b99e210 100644 --- a/src/unk_0205D8CC.c +++ b/src/unk_0205D8CC.c @@ -21,7 +21,7 @@ void sub_0205D8CC(u32 param0, u32 param1) Font_LoadScreenIndicatorsPalette(param0, 12 * 32, 4); } -void FieldMessage_AddWindow(BGL *param0, Window *param1, u32 param2) +void FieldMessage_AddWindow(BgConfig *param0, Window *param1, u32 param2) { if (param2 == 3) { BGL_AddWindow(param0, param1, 3, 2, 19, 27, 4, 12, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4))); @@ -72,7 +72,7 @@ u8 FieldMessage_FinishedPrinting(u8 param0) return 0; } -void sub_0205DA1C(BGL *param0, Window *param1, u16 param2, u16 param3) +void sub_0205DA1C(BgConfig *param0, Window *param1, u16 param2, u16 param3) { u16 v0, v1; diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index b52029a950..bdef375f30 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -102,7 +102,7 @@ typedef struct { ResourceMetadata *unk_C4; UIControlData *unk_C8; FieldSystem *fieldSystem; - BGL *unk_D0; + BgConfig *unk_D0; Window unk_D4; Window unk_E4; Window unk_F4; diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index f9b0a62b11..b351c2decf 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -106,7 +106,7 @@ typedef struct { ResourceMetadata *unk_164; UIControlData *unk_168; FieldSystem *fieldSystem; - BGL *unk_170; + BgConfig *unk_170; Window unk_174; Window unk_184; Window unk_194; diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 8bc475f769..3cc7ed5afc 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -64,8 +64,8 @@ BOOL sub_0207B0D0(UnkStruct_0207AE68 *param0); void sub_0207B0E0(UnkStruct_0207AE68 *param0); static void sub_0207B180(UnkStruct_0207AE68 *param0); static void sub_0207C028(UnkStruct_0207AE68 *param0); -static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BGL *param1); -static void sub_0207C460(BGL *param0); +static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1); +static void sub_0207C460(BgConfig *param0); static void sub_0207C498(UnkStruct_0207AE68 *param0); static void sub_0207C520(void *param0); static u8 sub_0207C584(UnkStruct_0207AE68 *param0, int param1); @@ -755,7 +755,7 @@ static void sub_0207C028(UnkStruct_0207AE68 *param0) } } -static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BGL *param1) +static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1) { GXLayers_DisableEngineALayers(); @@ -922,7 +922,7 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BGL *param1) SetMainCallback(sub_0207C520, param0); } -static void sub_0207C460(BGL *param0) +static void sub_0207C460(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index f083bc4984..bd49f2cbc4 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -88,8 +88,8 @@ static int sub_0207E750(GameWindowLayout *param0); static int ProcessWindowInput(GameWindowLayout *param0); static void sub_0207E898(void *param0); static void sub_0207E8C0(void); -static void sub_0207E918(BGL *param0); -static void sub_0207EA24(BGL *param0); +static void sub_0207E918(BgConfig *param0); +static void sub_0207EA24(BgConfig *param0); static void sub_0207EB6C(GameWindowLayout *param0, NARC *param1); static GameWindowLayout *sub_0207ECC0(OverlayManager *param0); static void sub_0207EE14(GameWindowLayout *param0); @@ -704,7 +704,7 @@ static void sub_0207E8C0(void) GXLayers_SetBanks(&v0); } -static void sub_0207E8E0(BGL *param0) +static void sub_0207E8E0(BgConfig *param0) { BgTemplate v0 = { 0, @@ -726,7 +726,7 @@ static void sub_0207E8E0(BGL *param0) sub_02019EBC(param0, 0); } -static void sub_0207E918(BGL *param0) +static void sub_0207E918(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -850,7 +850,7 @@ static void sub_0207E918(BGL *param0) sub_02019690(4, 32, 0, 12); } -static void sub_0207EA24(BGL *param0) +static void sub_0207EA24(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_OBJ, 0); diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index 3dff2c4d7f..44af3b1929 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -100,7 +100,7 @@ static const UnkStruct_ov61_0222C884 Unk_020F1E98 = { 0x240 }; -static void sub_020819DC(BGL *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2) +static void sub_020819DC(BgConfig *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2) { sub_0201A8D4(param0, ¶m1[0], ¶m2[0]); sub_0201A8D4(param0, ¶m1[1], ¶m2[1]); diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index 5024841a21..1bc97051df 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -76,7 +76,7 @@ struct UnkStruct_02087A10_t { u16 unk_118[32]; u16 unk_158; u16 unk_15A[3]; - BGL *unk_160; + BgConfig *unk_160; BOOL unk_164; StringTemplate *unk_168; MessageLoader *unk_16C; @@ -149,12 +149,12 @@ static int sub_02086B64(OverlayManager *param0, int *param1); static int sub_02086F3C(OverlayManager *param0, int *param1); static void sub_02087190(void *param0); static void sub_020871CC(void); -static void sub_020871EC(BGL *param0); -static void sub_0208765C(BGL *param0, Window *param1); +static void sub_020871EC(BgConfig *param0); +static void sub_0208765C(BgConfig *param0, Window *param1); static void sub_0208769C(UnkStruct_02087A10 *param0, NARC *param1); -static void sub_02087D64(BGL *param0, Window *param1, int *param2, int param3, int *param4, VecFx32 param5[], CellActor **param6, void *param7); +static void sub_02087D64(BgConfig *param0, Window *param1, int *param2, int param3, int *param4, VecFx32 param5[], CellActor **param6, void *param7); static void sub_0208737C(UnkStruct_02087A10 *param0, OverlayManager *param1); -static void sub_02088240(BGL *param0, int param1, VecFx32 param2[]); +static void sub_02088240(BgConfig *param0, int param1, VecFx32 param2[]); static void sub_02088260(VecFx32 param0[], int param1); static void sub_020877F4(UnkStruct_02087A10 *param0, NARC *param1); static void sub_02087A10(UnkStruct_02087A10 *param0); @@ -1258,7 +1258,7 @@ static void sub_020871CC(void) GXLayers_SetBanks(&v0); } -static void sub_020871EC(BGL *param0) +static void sub_020871EC(BgConfig *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1485,7 +1485,7 @@ static void sub_02087544(UnkStruct_02087A10 *param0, OverlayManager *param1) } } -static void sub_0208765C(BGL *param0, Window *param1) +static void sub_0208765C(BgConfig *param0, Window *param1) { int v0; @@ -1502,7 +1502,7 @@ static void sub_0208765C(BGL *param0, Window *param1) static void sub_0208769C(UnkStruct_02087A10 *param0, NARC *param1) { - BGL *v0 = param0->unk_160; + BgConfig *v0 = param0->unk_160; sub_02007130(param1, 0, 0, 0, 16 * 3 * 2, 18); sub_02006E84(12, 12, 4, 0, 16 * 2, 18); @@ -1734,7 +1734,7 @@ static void sub_02087CDC(SysTask *param0, void *param1) v0->unk_04++; } -static void sub_02087D64(BGL *param0, Window *param1, int *param2, int param3, int *param4, VecFx32 param5[], CellActor **param6, void *param7) +static void sub_02087D64(BgConfig *param0, Window *param1, int *param2, int param3, int *param4, VecFx32 param5[], CellActor **param6, void *param7) { int v0 = *param4; int v1 = v0 ^ 1; @@ -1882,7 +1882,7 @@ static void sub_02087FC0(UnkStruct_02087A10 *param0, OverlayManager *param1, NAR } } -static void sub_02088240(BGL *param0, int param1, VecFx32 param2[]) +static void sub_02088240(BgConfig *param0, int param1, VecFx32 param2[]) { BGL_SetPriority(0 + param1, 1); BGL_SetPriority(0 + param1 ^ 1, 2); diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index e71f1c5851..d37f23a036 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -28,7 +28,7 @@ #include "constdata/const_020F2DBC.h" -static void sub_0208945C(BGL *param0); +static void sub_0208945C(BgConfig *param0); static void sub_020895CC(void *param0); static int sub_020890F4(OverlayManager *param0, int *param1); static int sub_0208924C(OverlayManager *param0, int *param1); @@ -203,7 +203,7 @@ void sub_02089438(UnkStruct_02089438 *param0) Heap_FreeToHeap(param0); } -static void sub_0208945C(BGL *param0) +static void sub_0208945C(BgConfig *param0) { GXLayers_DisableEngineALayers(); diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index 6ababafe45..f2ea192fc2 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -65,7 +65,7 @@ void sub_0208A3F4 (UnkStruct_02089688 * param0) void sub_0208A490 (UnkStruct_02089688 * param0) { NARC * v0; - BGL * v1; + BgConfig *v1; SpriteRenderer * v2; SpriteGfxHandler * v3; PaletteData * v4; @@ -745,7 +745,7 @@ void sub_0208B090 (UnkStruct_02089688 * param0, int param1, int param2, int para BGL_DeleteWindow(&v7); } -void sub_0208B1C4 (BGL * param0, Window * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) +void sub_0208B1C4(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { Window_Init(param1); BGL_AddWindow(param0, param1, param2, param3, param4, param5, param6, 12, param7); diff --git a/src/unk_0208C098.c b/src/unk_0208C098.c index 3214f38bbd..964488d51a 100644 --- a/src/unk_0208C098.c +++ b/src/unk_0208C098.c @@ -155,7 +155,7 @@ u8 sub_0208C15C(s16 *param0, u16 param1) return 0; } -void sub_0208C210(BGL *param0, int param1, NARC *param2, int param3, int param4, int param5, int param6, u16 param7, u16 param8) +void sub_0208C210(BgConfig *param0, int param1, NARC *param2, int param3, int param4, int param5, int param6, u16 param7, u16 param8) { u32 v0; void *v1; diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index 04e58c1b33..e150754bd0 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -31,7 +31,7 @@ typedef struct { int unk_08; int unk_0C; Strbuf *unk_10; - BGL *unk_14; + BgConfig *unk_14; MessageLoader *unk_18; Window unk_1C; UIControlData *unk_2C; diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index 143e7b31e4..80e3447e95 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -29,7 +29,7 @@ typedef struct { int unk_0C; int unk_10; Strbuf *unk_14; - BGL *unk_18; + BgConfig *unk_18; MessageLoader *unk_1C; Window unk_20; UIControlData *unk_30; diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index b628086906..54ea143d5d 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -67,7 +67,7 @@ static const UnkStruct_ov61_0222C884 Unk_020F8AC4 = { void sub_0209A74C(int param0) { - BGL *v0; + BgConfig *v0; Window v1; MessageLoader *v2; Strbuf *v3; @@ -142,7 +142,7 @@ void sub_0209A74C(int param0) void sub_0209A8E0(int param0) { - BGL *v0; + BgConfig *v0; Window v1; MessageLoader *v2; Strbuf *v3; diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index c6d3b88964..111df8a8d5 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -69,7 +69,7 @@ static const UnkStruct_ov61_0222C884 Unk_020F8B20 = { void sub_0209AA74(int param0, int param1) { - BGL *v0; + BgConfig *v0; Window v1; MessageLoader *v2; Strbuf *v3; From 738b2edd3d6542d73fe11a07d332d336a45c88d8 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 20 Oct 2024 01:27:06 -0700 Subject: [PATCH 06/13] Identify UnkStruct_ov61_0222C884 -> WindowTemplate and document fields --- include/bg_window.h | 20 +++++++++--------- include/unk_02001AF4.h | 4 ++-- src/bg_window.c | 4 ++-- src/choose_starter/choose_starter_app.c | 16 +++++++------- src/error_message_reset.c | 2 +- src/field_map_change.c | 2 +- src/overlay005/ov5_021EA874.c | 2 +- src/overlay007/communication_club.c | 2 +- src/overlay007/ov7_0224BE9C.c | 2 +- src/overlay007/ov7_0224CD28.c | 8 +++---- src/overlay010/ov10_0221F800.c | 4 ++-- src/overlay013/ov13_02221A88.c | 22 +++++++++---------- src/overlay013/ov13_02227288.c | 10 ++++----- src/overlay019/ov19_021DA92C.c | 2 +- src/overlay019/ov19_021DB2FC.c | 2 +- src/overlay019/ov19_021DB8E4.c | 2 +- src/overlay019/ov19_021DEC04.c | 6 +++--- src/overlay020/ov20_021D3864.c | 10 ++++----- src/overlay023/ov23_0223E140.c | 2 +- src/overlay023/ov23_0224B05C.c | 6 +++--- src/overlay023/ov23_0224DC40.c | 2 +- src/overlay023/ov23_0224F294.c | 2 +- src/overlay023/ov23_0225128C.c | 2 +- src/overlay023/ov23_022521F0.c | 2 +- src/overlay029/ov29_022566C8.c | 2 +- src/overlay041/ov41_022567B0.c | 4 ++-- src/overlay059/ov59_021D0D80.c | 2 +- src/overlay061/ov61_0222BF44.c | 8 +++---- src/overlay064/ov64_0222DCE0.c | 2 +- src/overlay065/ov65_0222DCE0.c | 6 +++--- src/overlay065/ov65_0223648C.c | 2 +- src/overlay067/ov67_0225C700.c | 2 +- src/overlay068/ov68_0225C700.c | 6 +++--- src/overlay070/ov70_0225D9A4.c | 4 ++-- src/overlay071/ov71_0223C69C.c | 26 +++++++++++------------ src/overlay073/ov73_021D0D80.c | 28 ++++++++++++------------- src/overlay073/ov73_021D3250.c | 2 +- src/overlay074/ov74_021D0D80.c | 2 +- src/overlay075/ov75_021D0D80.c | 2 +- src/overlay077/ov77_021D0D80.c | 2 +- src/overlay079/ov79_021D183C.c | 2 +- src/overlay079/ov79_021D2268.c | 2 +- src/overlay081/ov81_021D1610.c | 2 +- src/overlay084/ov84_0223F040.c | 2 +- src/overlay085/ov85_02241440.c | 2 +- src/overlay088/ov88_0223E9C4.c | 2 +- src/overlay090/ov90_021D0D80.c | 4 ++-- src/overlay091/ov91_021D0D80.c | 2 +- src/overlay092/ov92_021D0D80.c | 20 +++++++++--------- src/overlay094/ov94_0223BCB0.c | 8 +++---- src/overlay096/ov96_0223B6A0.c | 8 +++---- src/overlay098/ov98_022471C8.c | 14 ++++++------- src/overlay101/ov101_021D0D80.c | 4 ++-- src/overlay102/ov102_021D0D80.c | 6 +++--- src/overlay104/ov104_0222FBE4.c | 2 +- src/overlay105/ov105_02246214.c | 4 ++-- src/overlay106/ov106_022436E0.c | 4 ++-- src/overlay107/ov107_02249D14.c | 8 +++---- src/overlay108/ov108_02243630.c | 4 ++-- src/overlay109/ov109_021D0D80.c | 18 ++++++++-------- src/overlay109/ov109_021D3D50.c | 2 +- src/overlay110/ov110_021D2124.c | 14 ++++++------- src/overlay111/ov111_021D3548.c | 4 ++-- src/scrcmd.c | 2 +- src/unk_02001AF4.c | 4 ++-- src/unk_02039814.c | 2 +- src/unk_02039A64.c | 2 +- src/unk_020528D0.c | 2 +- src/unk_0206F314.c | 2 +- src/unk_020722AC.c | 6 +++--- src/unk_0207AE68.c | 2 +- src/unk_020819DC.c | 14 ++++++------- src/unk_0208FCF8.c | 18 ++++++++-------- src/unk_02099DFC.c | 4 ++-- src/unk_0209A2C4.c | 2 +- src/unk_0209A74C.c | 2 +- src/unk_0209AA74.c | 2 +- 77 files changed, 219 insertions(+), 219 deletions(-) diff --git a/include/bg_window.h b/include/bg_window.h index 30bedfad4d..8587e9312b 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -74,15 +74,15 @@ typedef struct BgConfig { Background bgs[8]; } BgConfig; -typedef struct { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u8 unk_04; - u8 unk_05; - u16 unk_06; -} UnkStruct_ov61_0222C884; +typedef struct WindowTemplate { + u8 bgLayer; + u8 tilemapLeft; + u8 tilemapTop; + u8 width; + u8 height; + u8 palette; + u16 baseTile; +} WindowTemplate; typedef struct { BgConfig *unk_00; @@ -150,7 +150,7 @@ void Window_Init(Window *param0); u8 BGL_WindowAdded(Window *param0); void BGL_AddWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8); void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5); -void sub_0201A8D4(BgConfig *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2); +void sub_0201A8D4(BgConfig *param0, Window *param1, const WindowTemplate *param2); void BGL_DeleteWindow(Window *param0); void sub_0201A928(Window *param0, u8 param1); void sub_0201A954(Window *param0); diff --git a/include/unk_02001AF4.h b/include/unk_02001AF4.h index ab2b62a671..b693a6e2d3 100644 --- a/include/unk_02001AF4.h +++ b/include/unk_02001AF4.h @@ -15,8 +15,8 @@ u32 sub_02001C94(UIControlData *param0, u16 param1); u32 sub_02001D44(UIControlData *param0, u8 param1); u8 sub_02001DC4(UIControlData *param0); u8 sub_02001DC8(UIControlData *param0); -UIControlData *sub_02002054(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u8 param4, u32 param5); -UIControlData *sub_02002100(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4); +UIControlData *sub_02002054(BgConfig *param0, const WindowTemplate *param1, u16 param2, u8 param3, u8 param4, u32 param5); +UIControlData *sub_02002100(BgConfig *param0, const WindowTemplate *param1, u16 param2, u8 param3, u32 param4); u32 sub_02002114(UIControlData *param0, u32 param1); u32 sub_02002134(UIControlData *param0, u8 param1, u32 param2); void sub_02002154(UIControlData *param0, u32 param1); diff --git a/src/bg_window.c b/src/bg_window.c index b1a67707ce..3ec1ea8db3 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -1617,10 +1617,10 @@ void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 para param1->unk_0A_15 = UnkEnum_00; } -void sub_0201A8D4(BgConfig *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2) +void sub_0201A8D4(BgConfig *param0, Window *param1, const WindowTemplate *param2) { BGL_AddWindow( - param0, param1, param2->unk_00, param2->unk_01, param2->unk_02, param2->unk_03, param2->unk_04, param2->unk_05, param2->unk_06); + param0, param1, param2->bgLayer, param2->tilemapLeft, param2->tilemapTop, param2->width, param2->height, param2->palette, param2->baseTile); } void BGL_DeleteWindow(Window *param0) diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index e3fc2dfb39..ab2e234360 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -207,7 +207,7 @@ typedef struct ChooseStarterApp { Window *unk_9C[3]; int unk_A8; Strbuf *unk_AC; - UnkStruct_ov61_0222C884 unk_B0; + WindowTemplate unk_B0; UIControlData *unk_B8; UnkStruct_0200C738 unk_BC; CellActorCollection *unk_248; @@ -1333,13 +1333,13 @@ static void ov78_021D2090(ChooseStarterApp *param0) static void MakeConfirmationWindow(ChooseStarterApp *param0, int param1) { - param0->unk_B0.unk_00 = 1; - param0->unk_B0.unk_01 = 23; - param0->unk_B0.unk_02 = 12; - param0->unk_B0.unk_03 = 5; - param0->unk_B0.unk_04 = 4; - param0->unk_B0.unk_05 = 3; - param0->unk_B0.unk_06 = ((18 + 12) + 9 + 128); + param0->unk_B0.bgLayer = 1; + param0->unk_B0.tilemapLeft = 23; + param0->unk_B0.tilemapTop = 12; + param0->unk_B0.width = 5; + param0->unk_B0.height = 4; + param0->unk_B0.palette = 3; + param0->unk_B0.baseTile = ((18 + 12) + 9 + 128); sub_0200DAA4(param0->bgl, 1, (512 + (18 + 12) + 128), 1, 0, param1); Font_LoadTextPalette(0, 3 * 32, param1); diff --git a/src/error_message_reset.c b/src/error_message_reset.c index 7e57dfd650..af4331cb12 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -58,7 +58,7 @@ static const BgTemplate sErrorMessageBgTemplate = { 0x0 }; -static const UnkStruct_ov61_0222C884 sErrorMessageWindowTemplate = { +static const WindowTemplate sErrorMessageWindowTemplate = { 0x0, 0x3, 0x3, diff --git a/src/field_map_change.c b/src/field_map_change.c index 7b714331f2..fb6679340e 100644 --- a/src/field_map_change.c +++ b/src/field_map_change.c @@ -166,7 +166,7 @@ static const MapLoadMode sMapLoadMode[] = { { 0x1, 0x1, 0x1, 0x0, 0x1, 0x1, 0x1, 0xA0000 } }; -static const UnkStruct_ov61_0222C884 Unk_020EC3A0 = { +static const WindowTemplate Unk_020EC3A0 = { 0x3, 0x19, 0xD, diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c index e909b8936c..b66388ff02 100644 --- a/src/overlay005/ov5_021EA874.c +++ b/src/overlay005/ov5_021EA874.c @@ -122,7 +122,7 @@ static BOOL ov5_021EA8F0(UnkStruct_ov5_021EAE78 *param0) return 0; } -static const UnkStruct_ov61_0222C884 Unk_ov5_021FAF00 = { +static const WindowTemplate Unk_ov5_021FAF00 = { 0x3, 0x19, 0xD, diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c index 96f5c034c0..85a90f93b0 100644 --- a/src/overlay007/communication_club.c +++ b/src/overlay007/communication_club.c @@ -142,7 +142,7 @@ static int CommClubMan_Regulation(void); static CommClubManager *sCommClubMan = NULL; -static const UnkStruct_ov61_0222C884 Unk_ov7_0224ED0C = { +static const WindowTemplate Unk_ov7_0224ED0C = { 0x3, 0x19, 0xD, diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index cf684ad393..1f9480f99c 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -788,7 +788,7 @@ static void ov7_0224CBE4(void *param0, u32 param1) static void ov7_0224CC44(UnkStruct_ov7_0224CC44 *param0, BgConfig *param1, u32 param2) { - static const UnkStruct_ov61_0222C884 v0 = { + static const WindowTemplate v0 = { 3, 24, 13, diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index e359b0a784..715a524515 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -108,7 +108,7 @@ static u16 ov7_0224E8CC(UnkStruct_ov7_0224D008 *param0, u16 param1); static u32 ov7_0224E8F4(UnkStruct_ov7_0224D008 *param0); static void ov7_0224E920(UnkStruct_ov7_0224D008 *param0, u32 param1); -static const UnkStruct_ov61_0222C884 Unk_ov7_0224F328[] = { +static const WindowTemplate Unk_ov7_0224F328[] = { { 0x2, 0xC, 0x2, 0x13, 0xE, 0xD, 0x1 }, { 0x2, 0x5, 0x12, 0x1B, 0x6, 0xD, 0x10B }, { 0x3, 0x1, 0x1, 0x9, 0x4, 0xD, 0x28 }, @@ -117,7 +117,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov7_0224F328[] = { { 0x3, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x98 } }; -static const UnkStruct_ov61_0222C884 Unk_ov7_0224F2BC = { +static const WindowTemplate Unk_ov7_0224F2BC = { 0x2, 0x1, 0x12, @@ -127,7 +127,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov7_0224F2BC = { 0x10B }; -static const UnkStruct_ov61_0222C884 Unk_ov7_0224F2CC = { +static const WindowTemplate Unk_ov7_0224F2CC = { 0x3, 0x17, 0xD, @@ -149,7 +149,7 @@ static const u8 Unk_ov7_0224F49C[] = { 0xff }; -static const UnkStruct_ov61_0222C884 Unk_ov7_0224F2C4 = { +static const WindowTemplate Unk_ov7_0224F2C4 = { 0x3, 0x1, 0x1, diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 4e7135d5de..ca37e6dacd 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -300,7 +300,7 @@ static const u8 Unk_ov10_02222A7C[][2] = { { 0x0, 0xA } }; -static const UnkStruct_ov61_0222C884 Unk_ov10_02222CF4[] = { +static const WindowTemplate Unk_ov10_02222CF4[] = { { 0x1, 0x6, 0x1, 0x9, 0x2, 0x0, 0x1 }, { 0x1, 0x1, 0x4, 0x5, 0x2, 0x0, 0x13 }, { 0x1, 0x7, 0x4, 0x8, 0x2, 0x0, 0x1D }, @@ -378,7 +378,7 @@ static const u32 Unk_ov10_02222F3C[][7] = { { 0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0 } }; -static const UnkStruct_ov61_0222C884 Unk_ov10_02222A68 = { +static const WindowTemplate Unk_ov10_02222A68 = { 0x0, 0x19, 0xD, diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c index 28539bc8d2..fa2dfb6f58 100644 --- a/src/overlay013/ov13_02221A88.c +++ b/src/overlay013/ov13_02221A88.c @@ -38,12 +38,12 @@ static void ov13_02223C9C(UnkStruct_ov13_022213F0 *param0); static void ov13_02223F7C(UnkStruct_ov13_022213F0 *param0); static void ov13_02223550(UnkStruct_ov13_022213F0 *param0, u32 param1); -static const UnkStruct_ov61_0222C884 Unk_ov13_02228EA0[] = { +static const WindowTemplate Unk_ov13_02228EA0[] = { { 0x4, 0x2, 0x15, 0x16, 0x2, 0xF, 0x1F }, { 0x4, 0x2, 0x13, 0x1B, 0x4, 0xF, 0x1F } }; -static const UnkStruct_ov61_0222C884 Unk_ov13_02228F54[] = { +static const WindowTemplate Unk_ov13_02228F54[] = { { 0x5, 0x0, 0x0, 0xF, 0x5, 0x9, 0x85 }, { 0x5, 0x10, 0x1, 0xF, 0x5, 0x9, 0xD0 }, { 0x5, 0x0, 0x6, 0xF, 0x5, 0x9, 0x11B }, @@ -52,14 +52,14 @@ static const UnkStruct_ov61_0222C884 Unk_ov13_02228F54[] = { { 0x5, 0x10, 0xD, 0xF, 0x5, 0x9, 0x1FC } }; -static const UnkStruct_ov61_0222C884 Unk_ov13_02228EDC[] = { +static const WindowTemplate Unk_ov13_02228EDC[] = { { 0x5, 0xA, 0x4, 0xC, 0x3, 0x9, 0x1 }, { 0x5, 0xB, 0xC, 0xA, 0x3, 0x9, 0x25 }, { 0x5, 0x1, 0x14, 0xB, 0x3, 0x9, 0x43 }, { 0x5, 0xE, 0x14, 0xB, 0x3, 0x9, 0x64 } }; -static const UnkStruct_ov61_0222C884 Unk_ov13_02228FBC[] = { +static const WindowTemplate Unk_ov13_02228FBC[] = { { 0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x125 }, { 0x5, 0x1, 0x6, 0xE, 0x5, 0x9, 0x149 }, { 0x5, 0x11, 0x6, 0xE, 0x5, 0x9, 0x18F }, @@ -73,7 +73,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov13_02228FBC[] = { { 0x5, 0x11, 0xC, 0xE, 0x5, 0x9, 0x333 } }; -static const UnkStruct_ov61_0222C884 Unk_ov13_022290FC[] = { +static const WindowTemplate Unk_ov13_022290FC[] = { { 0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x125 }, { 0x5, 0x1, 0x9, 0xB, 0x2, 0xD, 0x149 }, { 0x5, 0x1, 0xB, 0x12, 0x4, 0xD, 0x15F }, @@ -111,7 +111,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov13_022290FC[] = { { 0x5, 0xD, 0x6, 0x6, 0x2, 0xD, 0x30F } }; -static const UnkStruct_ov61_0222C884 Unk_ov13_02229074[] = { +static const WindowTemplate Unk_ov13_02229074[] = { { 0x4, 0x4, 0x5, 0xB, 0x2, 0xD, 0x9D }, { 0x4, 0x17, 0x5, 0x5, 0x2, 0xD, 0xB7 }, { 0x4, 0xA, 0x10, 0x3, 0x2, 0xD, 0xE1 }, @@ -131,7 +131,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov13_02229074[] = { { 0x4, 0x6, 0xA, 0x8, 0x2, 0xD, 0x26D } }; -static const UnkStruct_ov61_0222C884 Unk_ov13_02228F24[] = { +static const WindowTemplate Unk_ov13_02228F24[] = { { 0x4, 0x5, 0x1, 0x9, 0x2, 0xD, 0x85 }, { 0x4, 0x1, 0x6, 0xE, 0x5, 0x9, 0x97 }, { 0x4, 0x11, 0x6, 0xE, 0x5, 0x9, 0xDD }, @@ -140,7 +140,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov13_02228F24[] = { { 0x4, 0x9, 0x12, 0xE, 0x5, 0x9, 0x1AF } }; -static const UnkStruct_ov61_0222C884 Unk_ov13_02229014[] = { +static const WindowTemplate Unk_ov13_02229014[] = { { 0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x1 }, { 0x5, 0x4, 0x5, 0xB, 0x2, 0xD, 0x13 }, { 0x5, 0x14, 0x5, 0x2, 0x2, 0xD, 0x29 }, @@ -155,7 +155,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov13_02229014[] = { { 0x5, 0x7, 0x14, 0xC, 0x3, 0x9, 0x37 } }; -static const UnkStruct_ov61_0222C884 Unk_ov13_02228EFC[] = { +static const WindowTemplate Unk_ov13_02228EFC[] = { { 0x4, 0x5, 0x1, 0x9, 0x2, 0xD, 0x8B }, { 0x4, 0x1, 0x6, 0xE, 0x5, 0x9, 0x9D }, { 0x4, 0x11, 0x6, 0xE, 0x5, 0x9, 0xE3 }, @@ -163,7 +163,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov13_02228EFC[] = { { 0x4, 0x11, 0xC, 0xE, 0x5, 0x9, 0x16F } }; -static const UnkStruct_ov61_0222C884 Unk_ov13_02228F84[] = { +static const WindowTemplate Unk_ov13_02228F84[] = { { 0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x1 }, { 0x5, 0x4, 0x8, 0xB, 0x2, 0xD, 0x13 }, { 0x5, 0x14, 0x8, 0x2, 0x2, 0xD, 0x29 }, @@ -203,7 +203,7 @@ void ov13_02221A88(UnkStruct_ov13_022213F0 *param0) void ov13_02221AC4(UnkStruct_ov13_022213F0 *param0, u32 param1) { - const UnkStruct_ov61_0222C884 *v0; + const WindowTemplate *v0; u8 v1; switch (param1) { diff --git a/src/overlay013/ov13_02227288.c b/src/overlay013/ov13_02227288.c index 47ce6f0c0a..640f517657 100644 --- a/src/overlay013/ov13_02227288.c +++ b/src/overlay013/ov13_02227288.c @@ -20,7 +20,7 @@ static void ov13_022273CC(UnkStruct_ov13_02227244 *param0); static void ov13_02227888(UnkStruct_ov13_02227244 *param0); static void ov13_02227974(UnkStruct_ov13_02227244 *param0); -static const UnkStruct_ov61_0222C884 Unk_ov13_02229A60 = { +static const WindowTemplate Unk_ov13_02229A60 = { 0x4, 0x2, 0x13, @@ -30,7 +30,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov13_02229A60 = { 0x376 }; -static const UnkStruct_ov61_0222C884 Unk_ov13_02229A88[] = { +static const WindowTemplate Unk_ov13_02229A88[] = { { 0x4, 0x2, 0x4, 0xC, 0x5, 0x0, 0x2CE }, { 0x4, 0x2, 0xD, 0xC, 0x5, 0x0, 0x30A }, { 0x4, 0x12, 0x5, 0xC, 0x3, 0x0, 0x286 }, @@ -38,7 +38,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov13_02229A88[] = { { 0x4, 0x5, 0x14, 0x14, 0x3, 0x0, 0x24A } }; -static const UnkStruct_ov61_0222C884 Unk_ov13_02229AE0[] = { +static const WindowTemplate Unk_ov13_02229AE0[] = { { 0x5, 0x1, 0x1, 0xE, 0x3, 0x0, 0x1 }, { 0x5, 0x8, 0x4, 0x4, 0x3, 0x4, 0x2B }, { 0x5, 0x11, 0x1, 0xE, 0x3, 0x0, 0x37 }, @@ -67,7 +67,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov13_02229AE0[] = { { 0x5, 0x16, 0x14, 0x4, 0x3, 0x4, 0x2BB } }; -static const UnkStruct_ov61_0222C884 Unk_ov13_02229A68[] = { +static const WindowTemplate Unk_ov13_02229A68[] = { { 0x5, 0x7, 0x4, 0xC, 0x2, 0x4, 0x2C7 }, { 0x5, 0x14, 0x4, 0x4, 0x2, 0x4, 0x2DF }, { 0x5, 0x2, 0x9, 0x1C, 0x6, 0x4, 0x2E7 }, @@ -82,7 +82,7 @@ void ov13_02227288(UnkStruct_ov13_02227244 *param0) void ov13_022272AC(UnkStruct_ov13_02227244 *param0, u32 param1) { - const UnkStruct_ov61_0222C884 *v0; + const WindowTemplate *v0; u8 v1; switch (param1) { diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index 564fe05d8d..a5a04d3fd1 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -176,7 +176,7 @@ BOOL ov19_021DAAC4(UnkStruct_ov19_021DA9E0 *param0) void ov19_021DAADC(UnkStruct_ov19_021DA9E0 *param0) { - static const UnkStruct_ov61_0222C884 v0[] = { + static const WindowTemplate v0[] = { { 2, 0, 1, 10, 2, 1, 288 }, { 2, 5, 3, 5, 1, 1, 308 }, { 2, 0, 16, 10, 3, 3, 313 }, diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c index 8af50daf84..302f578b9a 100644 --- a/src/overlay019/ov19_021DB2FC.c +++ b/src/overlay019/ov19_021DB2FC.c @@ -84,7 +84,7 @@ void ov19_021DB370(UnkStruct_ov19_021DB6F0 *param0) void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 *param0) { - static const UnkStruct_ov61_0222C884 v0[] = { + static const WindowTemplate v0[] = { { 1, 2, 21, 27, 2, 4, 539 }, { 1, 19, 3, 12, 16, 4, 593 } }; diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index f3c736390a..02932b4cea 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -134,7 +134,7 @@ BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *par void ov19_021DBA9C(UnkStruct_ov19_021DBA9C *param0) { - static const UnkStruct_ov61_0222C884 v0[] = { + static const WindowTemplate v0[] = { { 1, 10, 6, 12, 2, 2, 128 }, { 1, 3, 13, 26, 1, 2, 152 }, { 1, 5, 25, 27, 6, 2, 178 } diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c index 76a37a2146..e18162f819 100644 --- a/src/overlay019/ov19_021DEC04.c +++ b/src/overlay019/ov19_021DEC04.c @@ -256,7 +256,7 @@ static void ov19_021DEF64(UnkStruct_ov19_021DEC04 *param0) static void ov19_021DEFC8(UnkStruct_ov19_021DEC04 *param0) { - static const UnkStruct_ov61_0222C884 v0[] = { + static const WindowTemplate v0[] = { { 4, 3, 1, 9, 2, 0, 1 }, { 4, 20, 1, 9, 2, 1, 19 }, { 4, 13, 4, 6, 16, 0, 37 } @@ -338,7 +338,7 @@ static void ov19_021DF0CC(UnkStruct_ov19_021DEC04 *param0, int param1) static void ov19_021DF108(UnkStruct_ov19_021DEC04 *param0) { - static const UnkStruct_ov61_0222C884 v0[] = { + static const WindowTemplate v0[] = { { 4, 3, 4, 9, 16, 0, 133 }, { 4, 20, 4, 9, 16, 1, 277 } }; @@ -425,7 +425,7 @@ static void ov19_021DF250(UnkStruct_ov19_021DEC04 *param0, int param1) static void ov19_021DF270(UnkStruct_ov19_021DEC04 *param0) { - static const UnkStruct_ov61_0222C884 v0[] = { + static const WindowTemplate v0[] = { { 4, 1, 4, 11, 12, 0, 133 }, { 4, 20, 4, 11, 12, 1, 265 } }; diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c index 74437f4a6a..6cfee71ef8 100644 --- a/src/overlay020/ov20_021D3864.c +++ b/src/overlay020/ov20_021D3864.c @@ -26,7 +26,7 @@ typedef struct UnkStruct_ov20_021D3980_t { CellActor *unk_0C; } UnkStruct_ov20_021D3980; -static void ov20_021D390C(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u32 param2); +static void ov20_021D390C(BgConfig *param0, const WindowTemplate *param1, u32 param2); static void ov20_021D3980(UnkStruct_ov20_021D3980 *param0); UnkStruct_ov20_021D3980 *ov20_021D3864(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2) @@ -52,10 +52,10 @@ void ov20_021D3880(UnkStruct_ov20_021D3980 *param0) void ov20_021D3898(UnkStruct_ov20_021D3980 *param0, NARC *param1) { - static const UnkStruct_ov61_0222C884 v0 = { + static const WindowTemplate v0 = { 3, 3, 6, 10, 2, 13, 64 }; - static const UnkStruct_ov61_0222C884 v1 = { + static const WindowTemplate v1 = { 3, 19, 6, 10, 2, 13, 84 }; BgConfig *v2; @@ -72,7 +72,7 @@ void ov20_021D3898(UnkStruct_ov20_021D3980 *param0, NARC *param1) sub_02019448(v2, 3); } -static void ov20_021D390C(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u32 param2) +static void ov20_021D390C(BgConfig *param0, const WindowTemplate *param1, u32 param2) { Window v0; Strbuf *v1; @@ -83,7 +83,7 @@ static void ov20_021D390C(BgConfig *param0, const UnkStruct_ov61_0222C884 *param BGL_FillWindow(&v0, 14); v1 = MessageBank_GetNewStrbufFromNARC(26, 438, param2, 35); - v2 = ((param1->unk_03 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0)) / 2; + v2 = ((param1->width * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0)) / 2; Text_AddPrinterWithParamsAndColor(&v0, FONT_SYSTEM, v1, v2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 14), NULL); sub_0201ACCC(&v0); diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index e61beb116c..bf9771ccb2 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -574,7 +574,7 @@ static UnkStruct_ov23_02256EB0 Unk_ov23_02256EB0[] = { { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x4, 0x42, 0x28, 0x1A } }; -static const UnkStruct_ov61_0222C884 Unk_ov23_0225630E = { +static const WindowTemplate Unk_ov23_0225630E = { 0x3, 0x19, 0xD, diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index 3c5304b8f6..dedf4844c3 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -197,7 +197,7 @@ static void ov23_0224DC24(void); static UnkStruct_ov23_022577AC *Unk_ov23_022577AC = NULL; -static const UnkStruct_ov61_0222C884 Unk_ov23_02256864 = { +static const WindowTemplate Unk_ov23_02256864 = { 0x3, 0x19, 0xD, @@ -207,7 +207,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov23_02256864 = { 0x21F }; -static const UnkStruct_ov61_0222C884 Unk_ov23_0225686C = { +static const WindowTemplate Unk_ov23_0225686C = { 0x3, 0x10, 0xD, @@ -1013,7 +1013,7 @@ static int ov23_0224BD1C(int param0, BOOL param1) return v1; } -static UIControlData *ov23_0224BD90(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4) +static UIControlData *ov23_0224BD90(BgConfig *param0, const WindowTemplate *param1, u16 param2, u8 param3, u32 param4) { UnkStruct_02081CF4 v0; MessageLoader *v1 = ov23_02253E3C(ov23_0224219C()); diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c index c17e1785c1..fda80a8e35 100644 --- a/src/overlay023/ov23_0224DC40.c +++ b/src/overlay023/ov23_0224DC40.c @@ -148,7 +148,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov23_02256894 = { NULL }; -static const UnkStruct_ov61_0222C884 Unk_ov23_0225688C = { +static const WindowTemplate Unk_ov23_0225688C = { 0x3, 0x19, 0xD, diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c index 80fe44cdee..ae9e0b6833 100644 --- a/src/overlay023/ov23_0224F294.c +++ b/src/overlay023/ov23_0224F294.c @@ -106,7 +106,7 @@ static void ov23_02250B34(SysTask *param0, UnkStruct_ov23_02250CD4 *param1, BOOL static UnkStruct_ov23_022577B8 *Unk_ov23_022577B8 = NULL; -static const UnkStruct_ov61_0222C884 Unk_ov23_022568D8 = { +static const WindowTemplate Unk_ov23_022568D8 = { 0x3, 0x19, 0xD, diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c index 10531295f7..ebec344c17 100644 --- a/src/overlay023/ov23_0225128C.c +++ b/src/overlay023/ov23_0225128C.c @@ -80,7 +80,7 @@ static void ov23_022520E8(FieldSystem *fieldSystem, UnkStruct_ov23_022513B0 *par static void ov23_02251F94(FieldSystem *fieldSystem); static void ov23_022521C8(UnkStruct_ov23_02250CD4 *param0); -static const UnkStruct_ov61_0222C884 Unk_ov23_022569C8 = { +static const WindowTemplate Unk_ov23_022569C8 = { 0x3, 0x19, 0xD, diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index a6f6aca419..9016a07b16 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -74,7 +74,7 @@ UnkStruct_ov23_02257674 Unk_ov23_02257674[] = { { 0x2, 0x28, 0x48 } }; -static const UnkStruct_ov61_0222C884 Unk_ov23_022569D8 = { +static const WindowTemplate Unk_ov23_022569D8 = { 0x3, 0x19, 0xD, diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c index b10ea7dab7..db67465c1e 100644 --- a/src/overlay029/ov29_022566C8.c +++ b/src/overlay029/ov29_022566C8.c @@ -66,7 +66,7 @@ BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566 static BOOL ov29_02256728(UnkStruct_ov29_022566C8 *param0) { - static const UnkStruct_ov61_0222C884 v0 = { + static const WindowTemplate v0 = { 7, 2, 2, 20, 19, 0, 12 }; diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c index 918a3ee31a..8226221adb 100644 --- a/src/overlay041/ov41_022567B0.c +++ b/src/overlay041/ov41_022567B0.c @@ -242,12 +242,12 @@ static void ov41_022568DC(SysTask *param0, void *param1) static void ov41_022569BC(UnkStruct_ov41_022567B0 *param0, u32 param1) { - UnkStruct_ov61_0222C884 v0 = { + WindowTemplate v0 = { 7, 2, 2, 20, 19, 0, 0 }; param0->unk_58 = param1; - v0.unk_06 = param1; + v0.baseTile = param1; sub_0201A8D4(param0->unk_04, ¶m0->unk_48, &v0); diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index 72563b3f66..64bf6f0ca9 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -842,7 +842,7 @@ static int ov59_021D19E4(UnkStruct_020961E8 *param0, int param1) return param1; } -static const UnkStruct_ov61_0222C884 Unk_ov59_021D3288 = { +static const WindowTemplate Unk_ov59_021D3288 = { 0x0, 0x17, 0xD, diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index 45323f8d27..5dddcaac4f 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -130,7 +130,7 @@ static int (*Unk_ov61_0222E600[])(UnkStruct_ov61_0222C664 *) = { ov61_0222CE2C, }; -static const UnkStruct_ov61_0222C884 Unk_ov61_0222E4A0 = { +static const WindowTemplate Unk_ov61_0222E4A0 = { 0x0, 0x17, 0xD, @@ -553,11 +553,11 @@ static void ov61_0222C86C(UnkStruct_ov61_0222C664 *param0) static UIControlData *ov61_0222C884(BgConfig *param0, int param1, int param2) { - UnkStruct_ov61_0222C884 v0; + WindowTemplate v0; v0 = Unk_ov61_0222E4A0; - v0.unk_02 = param1; - v0.unk_06 = param2; + v0.tilemapTop = param1; + v0.baseTile = param2; return sub_02002100(param0, &v0, (1 + (18 + 12)), 11, 117); } diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index 50abf31500..72673545fd 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -468,7 +468,7 @@ static NNSG2dViewRect Unk_ov64_02232460 = { {(255 << FX32_SHIFT), (192 << FX32_SHIFT)} }; -static const UnkStruct_ov61_0222C884 Unk_ov64_022321CA = { +static const WindowTemplate Unk_ov64_022321CA = { 0x1, 0x19, 0xD, diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index abaec74855..0d960ad02a 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -378,7 +378,7 @@ static const u8 Unk_ov65_02238934[4] = { 0x7 }; -static const UnkStruct_ov61_0222C884 Unk_ov65_0223894C = { +static const WindowTemplate Unk_ov65_0223894C = { 0x2, 0x19, 0xD, @@ -1576,7 +1576,7 @@ static void ov65_0222EF4C (UnkStruct_ov65_0222EBE0 * param0) } } -static const UnkStruct_ov61_0222C884 Unk_ov65_02238944 = { +static const WindowTemplate Unk_ov65_02238944 = { 0x2, 0x19, 0xD, @@ -1586,7 +1586,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov65_02238944 = { 0x51 }; -static const UnkStruct_ov61_0222C884 Unk_ov65_02238954 = { +static const WindowTemplate Unk_ov65_02238954 = { 0x1, 0x19, 0x13, diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 16ef7993e4..571ff9ee43 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -288,7 +288,7 @@ static const u8 Unk_ov65_02239C04[18] = { 0x5 }; -static const UnkStruct_ov61_0222C884 Unk_ov65_02239A24 = { +static const WindowTemplate Unk_ov65_02239A24 = { 0x2, 0x19, 0xD, diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 8fa7418dc6..56d98b53fa 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -156,7 +156,7 @@ static const BgTemplate Unk_ov67_0225D438[3] = { }, }; -static const UnkStruct_ov61_0222C884 Unk_ov67_0225D3EC = { +static const WindowTemplate Unk_ov67_0225D3EC = { 0x1, 0x19, 0xD, diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index e1e9015807..5137abab64 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -185,7 +185,7 @@ static const UnkStruct_ov22_022559F8 Unk_ov68_0225DD58 = { 0x7A }; -static const UnkStruct_ov61_0222C884 Unk_ov68_0225DD38 = { +static const WindowTemplate Unk_ov68_0225DD38 = { 0x1, 0x19, 0xD, @@ -195,7 +195,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov68_0225DD38 = { 0x94 }; -static const UnkStruct_ov61_0222C884 Unk_ov68_0225DD40[1] = { +static const WindowTemplate Unk_ov68_0225DD40[1] = { { 0x2, 0xB, 0x7, 0xF, 0x8, 0x3, 0x1 } }; @@ -205,7 +205,7 @@ static const VecFx32 Unk_ov68_0225DD78[] = { { FX32_CONST(72), FX32_CONST(112), 0x0 } }; -static const UnkStruct_ov61_0222C884 Unk_ov68_0225DDE8[6] = { +static const WindowTemplate Unk_ov68_0225DDE8[6] = { { 0x2, 0x7, 0x1, 0x12, 0x3, 0x3, 0x1 }, { 0x2, 0x5, 0x5, 0xC, 0x9, 0x3, 0x37 }, { 0x2, 0x11, 0x5, 0xB, 0x2, 0x4, 0xA3 }, diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 298dd2a218..0d717e4ccf 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -373,7 +373,7 @@ static const u16 Unk_ov70_0226D624[2][2][4] = { }, }; -static const UnkStruct_ov61_0222C884 Unk_ov70_0226D68C[5] = { +static const WindowTemplate Unk_ov70_0226D68C[5] = { { 0x6, 0x8, 0x2, 0x10, 0x4, 0x5, 0x140 }, { 0x6, 0x1, 0x7, 0x1E, 0x6, 0x5, 0x180 }, { 0x6, 0x1, 0xE, 0x13, 0x4, 0x5, 0x234 }, @@ -449,7 +449,7 @@ static const VecFx32 Unk_ov70_0226D7B4[12] = { { FX32_CONST(152), FX32_CONST(176) + (256 * FX32_ONE), 0x0 } }; -static const UnkStruct_ov61_0222C884 Unk_ov70_0226D5A4 = { +static const WindowTemplate Unk_ov70_0226D5A4 = { 0x5, 0x1, 0x0, diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index 5f582c40a1..4fe1808cbd 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -16,24 +16,24 @@ static void ov71_0223CD64(Window * param0, const u32 param1, const u32 param2, const u32 param3, Strbuf *param4, const u32 param5, const u8 param6, const int param7); static void ov71_0223CDB0(Window * param0, const u32 param1, const u32 param2, const u32 param3, const Strbuf *param4); -static const UnkStruct_ov61_0222C884 Unk_ov71_0223D670[] = { - {0x7, 0x2, 0x4, 0x11, 0x2, 0xF, 0x6F}, - {0x7, 0x2, 0x6, 0x11, 0x2, 0xF, 0x91}, - {0x7, 0x2, 0x9, 0x11, 0x2, 0xF, 0xB3}, - {0x7, 0x2, 0xC, 0x11, 0x2, 0xF, 0xD5}, - {0x7, 0x2, 0xF, 0x11, 0x2, 0xF, 0xF7}, - {0x7, 0x2, 0x12, 0x1C, 0x2, 0xF, 0x119}, - {0x7, 0x2, 0x14, 0x1C, 0x2, 0xF, 0x151}, - {0x7, 0x2, 0x2, 0x1C, 0x4, 0xF, 0xC1}, - {0x7, 0x2, 0x7, 0x1C, 0x2, 0xF, 0x131}, - {0x7, 0x2, 0x9, 0x1C, 0x2, 0xF, 0x169}, - {0x7, 0x2, 0xB, 0x1C, 0x2, 0xF, 0x1A1} +static const WindowTemplate Unk_ov71_0223D670[] = { + { 0x7, 0x2, 0x4, 0x11, 0x2, 0xF, 0x6F }, + { 0x7, 0x2, 0x6, 0x11, 0x2, 0xF, 0x91 }, + { 0x7, 0x2, 0x9, 0x11, 0x2, 0xF, 0xB3 }, + { 0x7, 0x2, 0xC, 0x11, 0x2, 0xF, 0xD5 }, + { 0x7, 0x2, 0xF, 0x11, 0x2, 0xF, 0xF7 }, + { 0x7, 0x2, 0x12, 0x1C, 0x2, 0xF, 0x119 }, + { 0x7, 0x2, 0x14, 0x1C, 0x2, 0xF, 0x151 }, + { 0x7, 0x2, 0x2, 0x1C, 0x4, 0xF, 0xC1 }, + { 0x7, 0x2, 0x7, 0x1C, 0x2, 0xF, 0x131 }, + { 0x7, 0x2, 0x9, 0x1C, 0x2, 0xF, 0x169 }, + { 0x7, 0x2, 0xB, 0x1C, 0x2, 0xF, 0x1A1 } }; void ov71_0223C69C(BgConfig *param0, Window *param1) { u8 v0; - const UnkStruct_ov61_0222C884 * v1 = Unk_ov71_0223D670; + const WindowTemplate *v1 = Unk_ov71_0223D670; for (v0 = 0; v0 < 11; v0++) { sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 0efffeee44..4888eecdea 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -591,7 +591,7 @@ typedef struct UnkStruct_ov72_021D3840_t { u32 unk_04; } UnkStruct_ov72_021D3840; -static const UnkStruct_ov61_0222C884 Unk_ov72_021D37EC = { +static const WindowTemplate Unk_ov72_021D37EC = { 0x0, 0x2, 0x13, @@ -600,7 +600,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov72_021D37EC = { 0x6, 0x36D }; -static const UnkStruct_ov61_0222C884 Unk_ov72_021D37C4 = { +static const WindowTemplate Unk_ov72_021D37C4 = { 0x0, 0x2, 0x3, @@ -609,7 +609,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov72_021D37C4 = { 0x5, 0x355 }; -static const UnkStruct_ov61_0222C884 Unk_ov72_021D37DC = { +static const WindowTemplate Unk_ov72_021D37DC = { 0x0, 0x1, 0x3, @@ -618,7 +618,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov72_021D37DC = { 0x5, 0x30D }; -static const UnkStruct_ov61_0222C884 Unk_ov72_021D37CC = { +static const WindowTemplate Unk_ov72_021D37CC = { 0x0, 0x2, 0x3, @@ -627,7 +627,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov72_021D37CC = { 0x5, 0x2E1 }; -const UnkStruct_ov61_0222C884 Unk_ov72_021D37E4 = { +const WindowTemplate Unk_ov72_021D37E4 = { 0x0, 0x8, 0x0, @@ -636,7 +636,7 @@ const UnkStruct_ov61_0222C884 Unk_ov72_021D37E4 = { 0x5, 0x12D }; -const UnkStruct_ov61_0222C884 Unk_ov72_021D37D4 = { +const WindowTemplate Unk_ov72_021D37D4 = { 0x0, 0x4, 0x0, @@ -749,7 +749,7 @@ static BOOL ov73_021D1648(UnkStruct_ov73_021D1058 *param0, int param1, int param { BOOL v0 = 0; UnkStruct_ov84_02240FA8 v1; - const UnkStruct_ov61_0222C884 *v2; + const WindowTemplate *v2; const UnkStruct_ov72_021D3840 *v3; int v4, v5; @@ -830,7 +830,7 @@ static BOOL ov73_021D1648(UnkStruct_ov73_021D1058 *param0, int param1, int param static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param2, int param3, int param4) { BOOL v0 = 0; - UnkStruct_ov61_0222C884 v1; + WindowTemplate v1; switch (param0->unk_54) { case 0: @@ -844,8 +844,8 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param { u32 v2 = Strbuf_NumLines(param0->unk_5C); - v1.unk_02 = 12 - v2; - v1.unk_04 = v2 * 2; + v1.tilemapTop = 12 - v2; + v1.height = v2 * 2; } sub_0201A8D4(param0->unk_18, ¶m0->unk_1C, &v1); @@ -857,11 +857,11 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param if (param2 == 2) { u32 v3 = Strbuf_NumLines(param0->unk_5C); - v1.unk_02 = param3 + param4 / 2 - v3; - v1.unk_04 = v3 * 2; + v1.tilemapTop = param3 + param4 / 2 - v3; + v1.height = v3 * 2; } else { - v1.unk_02 = param3; - v1.unk_04 = param4; + v1.tilemapTop = param3; + v1.height = param4; } sub_0201A8D4(param0->unk_18, ¶m0->unk_1C, &v1); diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c index cde99ad64c..ef560de132 100644 --- a/src/overlay073/ov73_021D3250.c +++ b/src/overlay073/ov73_021D3250.c @@ -335,7 +335,7 @@ static void ov73_021D368C (UnkStruct_ov73_021D342C * param0) MessageLoader_Free(param0->unk_08); } -static const UnkStruct_ov61_0222C884 Unk_ov72_021D3A38 = { +static const WindowTemplate Unk_ov72_021D3A38 = { 0x2, 0x0, 0x0, diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index cf70642b3a..940d512a79 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -748,7 +748,7 @@ static BOOL ov74_021D1B44(UnkStruct_ov74_021D0D80 *param0) static void ov74_021D1BA8(UnkStruct_ov74_021D0D80 *param0) { - static const UnkStruct_ov61_0222C884 v0 = { + static const WindowTemplate v0 = { 3, 25, 13, 6, 4, 13, (((((10 + 12 * 2) + 30 * 14) + 27 * 4) + 9) + (18 + 12)) }; diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index bf42874169..1b7c5718a5 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -298,7 +298,7 @@ static int ov75_021D0FA0(UnkStruct_ov75_021D1184 *param0) static void ov75_021D1040(UnkStruct_ov75_021D1184 *param0) { - static const UnkStruct_ov61_0222C884 v0 = { + static const WindowTemplate v0 = { 0, 25, 13, 6, 4, UnkEnum_ov75_021D1598_03, 555 }; diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index e8a713d6bb..ebbf9d1226 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -831,7 +831,7 @@ static void ov77_021D1984(UnkStruct_ov77_021D1568 *param0, UnkStruct_ov77_021D12 param1->unk_210++; } -static const UnkStruct_ov61_0222C884 Unk_ov77_021D72D0 = { +static const WindowTemplate Unk_ov77_021D72D0 = { 0x4, 0x2, 0x13, diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c index 911130249a..f45d77a26a 100644 --- a/src/overlay079/ov79_021D183C.c +++ b/src/overlay079/ov79_021D183C.c @@ -428,7 +428,7 @@ void ov79_021D2008(UnkStruct_ov79_021D0E1C *param0) void ov79_021D2054(UnkStruct_ov79_021D0E1C *param0) { - static const UnkStruct_ov61_0222C884 v0 = { + static const WindowTemplate v0 = { 1, 26, 13, 5, 4, 13, 463 }; diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index 9c6750ac10..2f51bcc42e 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -470,7 +470,7 @@ static void ov79_021D2634(UnkStruct_ov79_021D2928 *param0) static void ov79_021D270C(UnkStruct_ov79_021D2928 *param0) { - static const UnkStruct_ov61_0222C884 v0 = { + static const WindowTemplate v0 = { 1, 2, 19, 27, 4, 15, (1 + (18 + 12)) }; diff --git a/src/overlay081/ov81_021D1610.c b/src/overlay081/ov81_021D1610.c index 708ed230cc..e1ec4a57e0 100644 --- a/src/overlay081/ov81_021D1610.c +++ b/src/overlay081/ov81_021D1610.c @@ -89,7 +89,7 @@ static void ov81_021D3248(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkSt static void ov81_021D32A0(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3, int param4); static void ov81_021D3304(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); -static const UnkStruct_ov61_0222C884 Unk_ov81_021D3508[] = { +static const WindowTemplate Unk_ov81_021D3508[] = { { 0x0, 0x2, 0x2, 0x18, 0x2, 0xF, 0x1 }, { 0x0, 0x4, 0x4, 0x1B, 0x12, 0xF, 0x31 }, { 0x1, 0x2, 0x2, 0x18, 0x2, 0xF, 0x1 }, diff --git a/src/overlay084/ov84_0223F040.c b/src/overlay084/ov84_0223F040.c index 80f0851aec..642d00bd56 100644 --- a/src/overlay084/ov84_0223F040.c +++ b/src/overlay084/ov84_0223F040.c @@ -36,7 +36,7 @@ static void ov84_0223F9B0(UnkStruct_ov84_0223B5A0 *param0, u32 param1); static BOOL ov84_022400E0(TextPrinterTemplate *param0, u16 param1); -static const UnkStruct_ov61_0222C884 Unk_ov84_02241150 = { +static const WindowTemplate Unk_ov84_02241150 = { 0x0, 0x17, 0xD, diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index 62540eb57e..ee147f0dce 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -97,7 +97,7 @@ static void ov85_02242124(VecFx16 *param0, VecFx16 *param1); static void ov85_022423FC(VecFx16 *param0, VecFx16 *param1, VecFx16 *param2); static void ov85_022423A0(const UnkStruct_ov85_022423A0 *param0, VecFx16 *param1, u8 param2); -static const UnkStruct_ov61_0222C884 Unk_ov85_022428D8[] = { +static const WindowTemplate Unk_ov85_022428D8[] = { { 0x3, 0x1, 0x0, 0xC, 0x2, 0x2, 0x3E8 }, { 0x1, 0x1, 0x3, 0xA, 0x2, 0xF, 0x41 }, { 0x3, 0x12, 0x1, 0x7, 0x2, 0xF, 0x200 }, diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c index 4aafc074d2..0ea665b35b 100644 --- a/src/overlay088/ov88_0223E9C4.c +++ b/src/overlay088/ov88_0223E9C4.c @@ -150,7 +150,7 @@ int ov88_0223ECBC(Window *param0, int param1, int param2, MessageLoader *param3, return v1; } -static const UnkStruct_ov61_0222C884 Unk_ov88_0223F148 = { +static const WindowTemplate Unk_ov88_0223F148 = { 0x0, 0x19, 0xD, diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 43f26785e3..159036aecb 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -563,7 +563,7 @@ static void ov90_021D12B0(UnkStruct_ov90_021D0ECC *param0) static void ov90_021D1340(UnkStruct_ov90_021D0ECC *param0) { int v0; - static const UnkStruct_ov61_0222C884 v1[] = { + static const WindowTemplate v1[] = { { 0, 4, 1, 24, 5, 2, 192 }, { 0, 1, 9, 8, 5, 1, 312 }, { 0, 1, 17, 8, 5, 1, 352 }, @@ -571,7 +571,7 @@ static void ov90_021D1340(UnkStruct_ov90_021D0ECC *param0) { 0, 10, 17, 21, 6, 1, 497 }, { 0, 3, 18, 26, 5, 2, 312 }, }; - static const UnkStruct_ov61_0222C884 v2[] = { + static const WindowTemplate v2[] = { { 0, 4, 1, 24, 5, 2, 192 }, { 2, 3, 7, 26, 9, 1, 1 }, { 0, 3, 18, 26, 5, 2, 312 }, diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index e1beb76231..3f54a1d85c 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -142,7 +142,7 @@ static void ov91_021D2574(UnkStruct_ov91_021D0ED8 *param0, u8 param1); static void ov91_021D2594(UnkStruct_ov91_021D0ED8 *param0); static void ov91_021D25E4(UnkStruct_ov91_021D0ED8 *param0); -static const UnkStruct_ov61_0222C884 Unk_ov91_021D2884[] = { +static const WindowTemplate Unk_ov91_021D2884[] = { { 0x1, 0x13, 0x0, 0xB, 0x2, 0xF, 0x28 }, { 0x1, 0x13, 0x0, 0xB, 0x2, 0xF, 0x3E }, { 0x1, 0x1, 0x0, 0x6, 0x2, 0xF, 0x54 }, diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index b7c1662228..3e768f6817 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -143,8 +143,8 @@ static int ov92_021D16F8(int param0); static void ov92_021D1700(UnkStruct_ov92_021D1B24 *param0); static void ov92_021D1818(int param0, int param1, int *param2, int *param3, int *param4, int *param5); static BOOL ov92_021D1B70(UnkStruct_ov92_021D1B24 *param0, u32 param1, int param2); -static void ov92_021D1C4C(UnkStruct_ov92_021D1B24 *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2, const UnkStruct_ov84_02240FA8 *param3, const UnkStruct_ov92_021D2958 *param4); -static void ov92_021D1CF4(UnkStruct_ov92_021D1B24 *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2, const UnkStruct_ov84_02240FA8 *param3, u32 param4, const u8 *param5, u32 param6); +static void ov92_021D1C4C(UnkStruct_ov92_021D1B24 *param0, Window *param1, const WindowTemplate *param2, const UnkStruct_ov84_02240FA8 *param3, const UnkStruct_ov92_021D2958 *param4); +static void ov92_021D1CF4(UnkStruct_ov92_021D1B24 *param0, Window *param1, const WindowTemplate *param2, const UnkStruct_ov84_02240FA8 *param3, u32 param4, const u8 *param5, u32 param6); static void ov92_021D1DB4(UnkStruct_ov92_021D1B24 *param0); static void ov92_021D1DEC(UnkStruct_ov92_021D1B24 *param0); static void ov92_021D1EBC(UnkStruct_ov92_021D1B24 *param0, int param1, int param2); @@ -196,7 +196,7 @@ static const BgTemplate Unk_ov92_021D298C = { 0x0 }; -static const UnkStruct_ov61_0222C884 Unk_ov92_021D2934 = { +static const WindowTemplate Unk_ov92_021D2934 = { 0x6, 0x2, 0x13, @@ -206,7 +206,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov92_021D2934 = { 0x16D }; -static const UnkStruct_ov61_0222C884 Unk_ov92_021D292C = { +static const WindowTemplate Unk_ov92_021D292C = { 0x6, 0x19, 0xD, @@ -216,7 +216,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov92_021D292C = { 0x155 }; -static const UnkStruct_ov61_0222C884 Unk_ov92_021D290C = { +static const WindowTemplate Unk_ov92_021D290C = { 0x6, 0x13, 0xB, @@ -226,7 +226,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov92_021D290C = { 0x125 }; -static const UnkStruct_ov61_0222C884 Unk_ov92_021D2914 = { +static const WindowTemplate Unk_ov92_021D2914 = { 0x6, 0x3, 0x2, @@ -236,7 +236,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov92_021D2914 = { 0x1 }; -static const UnkStruct_ov61_0222C884 Unk_ov92_021D291C = { +static const WindowTemplate Unk_ov92_021D291C = { 0x6, 0x2, 0x1, @@ -246,7 +246,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov92_021D291C = { 0xB3 }; -static const UnkStruct_ov61_0222C884 Unk_ov92_021D2924 = { +static const WindowTemplate Unk_ov92_021D2924 = { 0x2, 0x19, 0x15, @@ -1022,7 +1022,7 @@ static void ov92_021D1C38(BmpList *param0, u32 param1, u8 param2) } } -static void ov92_021D1C4C(UnkStruct_ov92_021D1B24 *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2, const UnkStruct_ov84_02240FA8 *param3, const UnkStruct_ov92_021D2958 *param4) +static void ov92_021D1C4C(UnkStruct_ov92_021D1B24 *param0, Window *param1, const WindowTemplate *param2, const UnkStruct_ov84_02240FA8 *param3, const UnkStruct_ov92_021D2958 *param4) { UnkStruct_ov84_02240FA8 v0; int v1; @@ -1044,7 +1044,7 @@ static void ov92_021D1C4C(UnkStruct_ov92_021D1B24 *param0, Window *param1, const sub_0201A954(param1); } -static void ov92_021D1CF4(UnkStruct_ov92_021D1B24 *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2, const UnkStruct_ov84_02240FA8 *param3, u32 param4, const u8 *param5, u32 param6) +static void ov92_021D1CF4(UnkStruct_ov92_021D1B24 *param0, Window *param1, const WindowTemplate *param2, const UnkStruct_ov84_02240FA8 *param3, u32 param4, const u8 *param5, u32 param6) { UnkStruct_ov84_02240FA8 v0; MessageLoader *v1; diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index bf1957d9fb..75651d1eb7 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -398,7 +398,7 @@ static void ov94_0223C32C(UnkStruct_ov94_0223FD4C *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static const UnkStruct_ov61_0222C884 Unk_ov94_022459F8 = { +static const WindowTemplate Unk_ov94_022459F8 = { 0x0, 0x17, 0xD, @@ -410,11 +410,11 @@ static const UnkStruct_ov61_0222C884 Unk_ov94_022459F8 = { UIControlData *ov94_0223C3C0(BgConfig *param0, int param1, int param2) { - UnkStruct_ov61_0222C884 v0; + WindowTemplate v0; v0 = Unk_ov94_022459F8; - v0.unk_02 = param1; - v0.unk_06 = param2; + v0.tilemapTop = param1; + v0.baseTile = param2; return sub_02002100(param0, &v0, (1 + (18 + 12)), 11, 62); } diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c index 4fe81f75b5..49d72d077b 100644 --- a/src/overlay096/ov96_0223B6A0.c +++ b/src/overlay096/ov96_0223B6A0.c @@ -322,7 +322,7 @@ static void ov96_0223BB0C(UnkStruct_ov96_0223BF40 *param0) sub_02039734(); } -static const UnkStruct_ov61_0222C884 Unk_ov96_0223DA78 = { +static const WindowTemplate Unk_ov96_0223DA78 = { 0x0, 0x17, 0xD, @@ -334,11 +334,11 @@ static const UnkStruct_ov61_0222C884 Unk_ov96_0223DA78 = { UIControlData *ov96_0223BBC8(BgConfig *param0, int param1, int param2) { - UnkStruct_ov61_0222C884 v0; + WindowTemplate v0; v0 = Unk_ov96_0223DA78; - v0.unk_02 = param1; - v0.unk_06 = param2; + v0.tilemapTop = param1; + v0.baseTile = param2; return sub_02002100(param0, &v0, (1 + (18 + 12)), 11, 68); } diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index 2ddaef0e09..195316cdd2 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -276,7 +276,7 @@ static const u8 Unk_ov98_02249BBC[4] = { 0x4 }; -static const UnkStruct_ov61_0222C884 Unk_ov98_02249BC4 = { +static const WindowTemplate Unk_ov98_02249BC4 = { 0x0, 0x17, 0xD, @@ -702,22 +702,22 @@ static void ov98_02247B0C (UnkStruct_ov98_02247704 * param0) static UIControlData *ov98_02247B24(BgConfig *param0, int param1, int param2) { - UnkStruct_ov61_0222C884 v0; + WindowTemplate v0; v0 = Unk_ov98_02249BC4; - v0.unk_02 = param1; - v0.unk_06 = param2; + v0.tilemapTop = param1; + v0.baseTile = param2; return sub_02002100(param0, &v0, (1 + (18 + 12)), 11, 109); } static UIControlData *ov98_02247B58(BgConfig *param0, int param1, int param2, int param3) { - UnkStruct_ov61_0222C884 v0; + WindowTemplate v0; v0 = Unk_ov98_02249BC4; - v0.unk_02 = param1; - v0.unk_06 = param2; + v0.tilemapTop = param1; + v0.baseTile = param2; return sub_02002054(param0, &v0, (1 + (18 + 12)), 11, param3, 109); } diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index 9ea1d393fc..d3662098d1 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -71,7 +71,7 @@ static void ov101_021D18F4(SysTask *param0, void *param1); static void ov101_021D197C(void *param0); static void ov101_021D19BC(UnkStruct_ov101_021D13C8 *param0); static void ov101_021D19D4(UnkStruct_ov101_021D13C8 *param0); -static const UnkStruct_ov61_0222C884 Unk_ov101_021D8588[1]; +static const WindowTemplate Unk_ov101_021D8588[1]; static void ov101_021D1458(UnkStruct_ov101_021D13C8 *param0); int ov101_021D0D80(OverlayManager *param0, int *param1) @@ -701,6 +701,6 @@ void *ov101_021D19E4(UnkStruct_ov101_021D13C8 *param0, u32 param1, int param2) return v0; } -static const UnkStruct_ov61_0222C884 Unk_ov101_021D8588[1] = { +static const WindowTemplate Unk_ov101_021D8588[1] = { { 0x0, 0x2, 0x13, 0x1A, 0x4, 0xF, 0x3D } }; diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index 5276cc9ede..7cb188f0de 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -307,19 +307,19 @@ static void ov102_021D10F8(UnkStruct_ov102_021D0F8C *param0) static void ov102_021D1174(UnkStruct_ov102_021D0F8C *param0) { - UnkStruct_ov61_0222C884 v0 = { 0, 0, 0, 32, 24, 2, 1 }; + WindowTemplate v0 = { 0, 0, 0, 32, 24, 2, 1 }; Text_ResetAllPrinters(); param0->unk_34 = MessageLoader_Init(1, 26, 1, param0->unk_00); param0->unk_38 = StringTemplate_Default(param0->unk_00); - v0.unk_00 = 0; + v0.bgLayer = 0; sub_0201A8D4(param0->unk_10, ¶m0->unk_14, &v0); BGL_WindowColor(¶m0->unk_14, 0, 0, 0, 32 * 8, 24 * 8); - v0.unk_00 = 4; + v0.bgLayer = 4; sub_0201A8D4(param0->unk_10, ¶m0->unk_24, &v0); BGL_WindowColor(¶m0->unk_24, 0, 0, 0, 32 * 8, 24 * 8); diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index b298f7a2da..1a6252e5d4 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -287,7 +287,7 @@ static BOOL ov104_02231720(UnkStruct_ov104_02231148 *param0); static BOOL ov104_02231864(UnkStruct_ov104_02231148 *param0); static BOOL ov104_022319CC(UnkStruct_ov104_02231148 *param0); -static const UnkStruct_ov61_0222C884 Unk_ov104_0223F640 = { +static const WindowTemplate Unk_ov104_0223F640 = { 0x1, 0x19, 0xD, diff --git a/src/overlay105/ov105_02246214.c b/src/overlay105/ov105_02246214.c index f8690c6a2d..1cb804dcb8 100644 --- a/src/overlay105/ov105_02246214.c +++ b/src/overlay105/ov105_02246214.c @@ -11,7 +11,7 @@ void ov105_02246244(Window *param0); void ov105_02246260(BgConfig *param0, Window *param1); void ov105_0224628C(Window *param0, int param1); -static const UnkStruct_ov61_0222C884 Unk_ov105_02246458[] = { +static const WindowTemplate Unk_ov105_02246458[] = { { 0x1, 0x1, 0x1, 0xA, 0x2, 0xD, 0x1 }, { 0x1, 0x16, 0x1, 0xA, 0x2, 0xD, 0x15 }, { 0x1, 0x1, 0x4, 0x9, 0x2, 0xD, 0x29 }, @@ -27,7 +27,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov105_02246458[] = { void ov105_02246214(BgConfig *param0, Window *param1) { u8 v0; - const UnkStruct_ov61_0222C884 *v1 = Unk_ov105_02246458; + const WindowTemplate *v1 = Unk_ov105_02246458; for (v0 = 0; v0 < 10; v0++) { sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); diff --git a/src/overlay106/ov106_022436E0.c b/src/overlay106/ov106_022436E0.c index 3f45a11869..a06fed2757 100644 --- a/src/overlay106/ov106_022436E0.c +++ b/src/overlay106/ov106_022436E0.c @@ -11,7 +11,7 @@ void ov106_02243710(Window *param0); void ov106_0224372C(BgConfig *param0, Window *param1); void ov106_02243758(Window *param0, int param1); -static const UnkStruct_ov61_0222C884 Unk_ov106_02243860[] = { +static const WindowTemplate Unk_ov106_02243860[] = { { 0x0, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x1 }, { 0x0, 0x18, 0xD, 0x7, 0x4, 0xD, 0x6D }, { 0x0, 0xA, 0x14, 0x9, 0x2, 0xD, 0x89 }, @@ -21,7 +21,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov106_02243860[] = { void ov106_022436E0(BgConfig *param0, Window *param1) { u8 v0; - const UnkStruct_ov61_0222C884 *v1 = Unk_ov106_02243860; + const WindowTemplate *v1 = Unk_ov106_02243860; for (v0 = 0; v0 < 4; v0++) { sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); diff --git a/src/overlay107/ov107_02249D14.c b/src/overlay107/ov107_02249D14.c index d9813abdfd..70c61e0653 100644 --- a/src/overlay107/ov107_02249D14.c +++ b/src/overlay107/ov107_02249D14.c @@ -7,7 +7,7 @@ #include "unk_0200DA60.h" typedef struct { - const UnkStruct_ov61_0222C884 *unk_00; + const WindowTemplate *unk_00; u32 unk_04; } UnkStruct_ov107_0224A218; @@ -16,7 +16,7 @@ void ov107_02249D5C(Window *param0, u8 param1); void ov107_02249D84(BgConfig *param0, Window *param1); void ov107_02249DBC(Window *param0, int param1); -static const UnkStruct_ov61_0222C884 Unk_ov107_0224A288[] = { +static const WindowTemplate Unk_ov107_0224A288[] = { { 0x1, 0x2, 0x1, 0x1D, 0x2, 0xD, 0x1 }, { 0x1, 0x1A, 0x13, 0x4, 0x3, 0xD, 0x3B }, { 0x1, 0x0, 0x4, 0x20, 0x2, 0xD, 0x47 }, @@ -37,7 +37,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov107_0224A288[] = { { 0x0, 0x1, 0xD, 0xB, 0x2, 0xD, 0x2F4 } }; -static const UnkStruct_ov61_0222C884 Unk_ov107_0224A228[] = { +static const WindowTemplate Unk_ov107_0224A228[] = { { 0x1, 0x2, 0x1, 0x1D, 0x2, 0xD, 0x1 }, { 0x1, 0x1A, 0x13, 0x4, 0x3, 0xD, 0x3B }, { 0x1, 0x0, 0x4, 0x20, 0x2, 0xD, 0x47 }, @@ -60,7 +60,7 @@ static const UnkStruct_ov107_0224A218 Unk_ov107_0224A218[2] = { void ov107_02249D14(BgConfig *param0, Window *param1, u8 param2) { u8 v0; - const UnkStruct_ov61_0222C884 *v1 = Unk_ov107_0224A218[param2].unk_00; + const WindowTemplate *v1 = Unk_ov107_0224A218[param2].unk_00; u32 v2 = Unk_ov107_0224A218[param2].unk_04; for (v0 = 0; v0 < v2; v0++) { diff --git a/src/overlay108/ov108_02243630.c b/src/overlay108/ov108_02243630.c index 715e839169..35dab0943b 100644 --- a/src/overlay108/ov108_02243630.c +++ b/src/overlay108/ov108_02243630.c @@ -8,7 +8,7 @@ void ov108_02243630(BgConfig *param0, Window *param1); void ov108_02243660(Window *param0); -static const UnkStruct_ov61_0222C884 Unk_ov108_02243774[] = { +static const WindowTemplate Unk_ov108_02243774[] = { { 0x1, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x1 }, { 0x1, 0x18, 0xD, 0x7, 0x4, 0xD, 0x6D } }; @@ -16,7 +16,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov108_02243774[] = { void ov108_02243630(BgConfig *param0, Window *param1) { u8 v0; - const UnkStruct_ov61_0222C884 *v1 = Unk_ov108_02243774; + const WindowTemplate *v1 = Unk_ov108_02243774; for (v0 = 0; v0 < 2; v0++) { sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index 63311b96e3..a3415805c1 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -424,8 +424,8 @@ static BOOL ov109_021D3CD8(UnkStruct_ov109_021D0F70 *param0); static int ov109_021D3D1C(UnkStruct_ov109_021D0F70 *param0); static BOOL ov109_021D3D3C(UnkStruct_ov109_021D0F70 *param0); -static const UnkStruct_ov61_0222C884 Unk_ov109_021D59B8[1]; -static const UnkStruct_ov61_0222C884 *const Unk_ov109_021D5A68[5 + 1]; +static const WindowTemplate Unk_ov109_021D59B8[1]; +static const WindowTemplate *const Unk_ov109_021D5A68[5 + 1]; static const u16 Unk_ov109_021D5C44[5 + 1][5]; static const u16 Unk_ov109_021D5C80[5 + 1][5]; static const UnkStruct_ov109_021D5C14 Unk_ov109_021D5C14[5 + 1]; @@ -2129,7 +2129,7 @@ static void ov109_021D27AC(UnkStruct_ov109_021D0F70 *param0, int param1) { int v0; UnkStruct_ov109_021D24F8 *v1 = ¶m0->unk_C9C; - const UnkStruct_ov61_0222C884 *v2 = Unk_ov109_021D5A68[param1]; + const WindowTemplate *v2 = Unk_ov109_021D5A68[param1]; v1->unk_00 = param1; @@ -3639,7 +3639,7 @@ static BOOL ov109_021D3D3C(UnkStruct_ov109_021D0F70 *param0) return 0; } -static const UnkStruct_ov61_0222C884 Unk_ov109_021D59B8[1] = { +static const WindowTemplate Unk_ov109_021D59B8[1] = { 0x1, 0x2, 0x13, @@ -3649,25 +3649,25 @@ static const UnkStruct_ov61_0222C884 Unk_ov109_021D59B8[1] = { 0x28 }; -static const UnkStruct_ov61_0222C884 Unk_ov109_021D5A04[2] = { +static const WindowTemplate Unk_ov109_021D5A04[2] = { { 0x1, 0xC, 0x12, 0x8, 0x2, 0xF, 0x94 }, { 0x1, 0xC, 0x6, 0x8, 0x2, 0xF, 0xBC } }; -static const UnkStruct_ov61_0222C884 Unk_ov109_021D5AB0[3] = { +static const WindowTemplate Unk_ov109_021D5AB0[3] = { { 0x1, 0xC, 0x12, 0x8, 0x2, 0xF, 0x94 }, { 0x1, 0x5, 0xA, 0x8, 0x2, 0xF, 0xBC }, { 0x1, 0x13, 0xA, 0x8, 0x2, 0xF, 0xE4 } }; -static const UnkStruct_ov61_0222C884 Unk_ov109_021D5B54[4] = { +static const WindowTemplate Unk_ov109_021D5B54[4] = { { 0x1, 0xC, 0x12, 0x8, 0x2, 0xF, 0x94 }, { 0x1, 0x4, 0xD, 0x8, 0x2, 0xF, 0xBC }, { 0x1, 0xC, 0x6, 0x8, 0x2, 0xF, 0xE4 }, { 0x1, 0x14, 0xD, 0x8, 0x2, 0xF, 0x10C } }; -static const UnkStruct_ov61_0222C884 Unk_ov109_021D5B94[5] = { +static const WindowTemplate Unk_ov109_021D5B94[5] = { { 0x1, 0xC, 0x13, 0x8, 0x2, 0xF, 0x94 }, { 0x1, 0x4, 0xE, 0x8, 0x2, 0xF, 0xBC }, { 0x1, 0x6, 0x9, 0x8, 0x2, 0xF, 0xE4 }, @@ -3675,7 +3675,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov109_021D5B94[5] = { { 0x1, 0x14, 0xE, 0x8, 0x2, 0xF, 0X134 } }; -static const UnkStruct_ov61_0222C884 *const Unk_ov109_021D5A68[5 + 1] = { +static const WindowTemplate *const Unk_ov109_021D5A68[5 + 1] = { NULL, NULL, Unk_ov109_021D5A04, diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 5b000a7c1a..1885588a15 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -827,7 +827,7 @@ static int ov109_021D4920(UnkStruct_ov109_021D5140 *param0, int param1) return param1; } -static const UnkStruct_ov61_0222C884 Unk_ov109_021D5D94 = { +static const WindowTemplate Unk_ov109_021D5D94 = { 0x0, 0x17, 0xD, diff --git a/src/overlay110/ov110_021D2124.c b/src/overlay110/ov110_021D2124.c index 281fc55ac1..99b4a61594 100644 --- a/src/overlay110/ov110_021D2124.c +++ b/src/overlay110/ov110_021D2124.c @@ -6,14 +6,14 @@ #include "bg_window.h" typedef struct { - const UnkStruct_ov61_0222C884 *unk_00; + const WindowTemplate *unk_00; u32 unk_04; } UnkStruct_ov110_021D2278; void ov110_021D2124(BgConfig *param0, Window *param1, u8 param2); void ov110_021D216C(Window *param0, u8 param1); -static const UnkStruct_ov61_0222C884 Unk_ov110_021D22A0[] = { +static const WindowTemplate Unk_ov110_021D22A0[] = { { 0x0, 0x2, 0x2, 0x1E, 0x2, 0xD, 0x1 }, { 0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x3D }, { 0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0x75 }, @@ -23,27 +23,27 @@ static const UnkStruct_ov61_0222C884 Unk_ov110_021D22A0[] = { { 0x0, 0x2, 0x14, 0x1C, 0x2, 0xD, 0x13D } }; -static const UnkStruct_ov61_0222C884 Unk_ov110_021D2238[] = { +static const WindowTemplate Unk_ov110_021D2238[] = { { 0x0, 0x2, 0x2, 0x1C, 0x2, 0xD, 0x1 }, { 0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x39 }, { 0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0x71 }, { 0x0, 0x2, 0xD, 0x1C, 0x2, 0xD, 0xA9 } }; -static const UnkStruct_ov61_0222C884 Unk_ov110_021D2258[] = { +static const WindowTemplate Unk_ov110_021D2258[] = { { 0x0, 0x2, 0x2, 0x1C, 0x2, 0xD, 0x1 }, { 0x0, 0x12, 0x7, 0xC, 0x2, 0xD, 0x39 }, { 0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0x51 }, { 0x0, 0x2, 0xD, 0x1C, 0x2, 0xD, 0x89 } }; -static const UnkStruct_ov61_0222C884 Unk_ov110_021D2220[] = { +static const WindowTemplate Unk_ov110_021D2220[] = { { 0x0, 0x2, 0x2, 0x1C, 0x2, 0xD, 0x1 }, { 0x0, 0x2, 0x8, 0x1C, 0x2, 0xD, 0x39 }, { 0x0, 0x2, 0xB, 0x1C, 0x2, 0xD, 0x71 } }; -static const UnkStruct_ov61_0222C884 Unk_ov110_021D22D8[] = { +static const WindowTemplate Unk_ov110_021D22D8[] = { { 0x0, 0x2, 0x2, 0x1E, 0x2, 0xD, 0x1 }, { 0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x3D }, { 0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x75 }, @@ -66,7 +66,7 @@ static const UnkStruct_ov110_021D2278 Unk_ov110_021D2278[5] = { void ov110_021D2124(BgConfig *param0, Window *param1, u8 param2) { u8 v0; - const UnkStruct_ov61_0222C884 *v1 = Unk_ov110_021D2278[param2].unk_00; + const WindowTemplate *v1 = Unk_ov110_021D2278[param2].unk_00; u32 v2 = Unk_ov110_021D2278[param2].unk_04; for (v0 = 0; v0 < v2; v0++) { diff --git a/src/overlay111/ov111_021D3548.c b/src/overlay111/ov111_021D3548.c index 0f0b63af35..fd8e0ced25 100644 --- a/src/overlay111/ov111_021D3548.c +++ b/src/overlay111/ov111_021D3548.c @@ -6,7 +6,7 @@ #include "bg_window.h" #include "unk_0200DA60.h" -static const UnkStruct_ov61_0222C884 Unk_ov111_021D38B8[] = { +static const WindowTemplate Unk_ov111_021D38B8[] = { { 0x2, 0x2, 0x1, 0x1B, 0x4, 0xC, 0x1 }, { 0x4, 0x18, 0xD, 0x7, 0x4, 0xD, 0x6D }, { 0x4, 0x11, 0x3, 0xB, 0x5, 0xD, 0x89 }, @@ -33,7 +33,7 @@ void ov111_021D35C0(Window *param0, int param1); void ov111_021D3548(BgConfig *param0, Window *param1) { u8 v0; - const UnkStruct_ov61_0222C884 *v1 = Unk_ov111_021D38B8; + const WindowTemplate *v1 = Unk_ov111_021D38B8; for (v0 = 0; v0 < 16; v0++) { sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); diff --git a/src/scrcmd.c b/src/scrcmd.c index 89503640f5..47ca620fc8 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -755,7 +755,7 @@ static const u8 sConditionTable[6][3] = { { TRUE, FALSE, TRUE }, // != }; -static const UnkStruct_ov61_0222C884 Unk_020EAB84 = { +static const WindowTemplate Unk_020EAB84 = { 0x3, 0x19, 0xD, diff --git a/src/unk_02001AF4.c b/src/unk_02001AF4.c index 6a6bad81f7..11246f9244 100644 --- a/src/unk_02001AF4.c +++ b/src/unk_02001AF4.c @@ -371,7 +371,7 @@ static void sub_02002018(UIControlData *param0, u8 *param1, u8 *param2, u8 param *param2 = (param3 % param0->unk_00.unk_0A) * (param0->unk_1A + param0->unk_00.unk_0B_0) + param0->unk_18; } -UIControlData *sub_02002054(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u8 param4, u32 param5) +UIControlData *sub_02002054(BgConfig *param0, const WindowTemplate *param1, u16 param2, u8 param3, u8 param4, u32 param5) { UnkStruct_02081CF4 v0; MessageLoader *v1; @@ -399,7 +399,7 @@ UIControlData *sub_02002054(BgConfig *param0, const UnkStruct_ov61_0222C884 *par return sub_02001B7C(&v0, 8, 0, param4, param5, PAD_BUTTON_B); } -UIControlData *sub_02002100(BgConfig *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4) +UIControlData *sub_02002100(BgConfig *param0, const WindowTemplate *param1, u16 param2, u8 param3, u32 param4) { return sub_02002054(param0, param1, param2, param3, 0, param4); } diff --git a/src/unk_02039814.c b/src/unk_02039814.c index 1bb6512149..4fd2cda6c3 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -57,7 +57,7 @@ static const BgTemplate Unk_020E5EE0 = { 0x0 }; -static const UnkStruct_ov61_0222C884 Unk_020E5EC8 = { +static const WindowTemplate Unk_020E5EC8 = { 0x0, 0x3, 0x3, diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index be8a7b7d45..3b523e4959 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -57,7 +57,7 @@ static const BgTemplate Unk_020E5F60 = { 0x0 }; -static const UnkStruct_ov61_0222C884 Unk_020E5F48 = { +static const WindowTemplate Unk_020E5F48 = { 0x0, 0x3, 0x3, diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index eb5c9f36bf..30eb85be25 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -50,7 +50,7 @@ static void sub_02052914(FieldSystem *fieldSystem, TaskManager *param1); static BOOL sub_020529C4(TaskManager *param0); static void sub_02052AA4(UnkStruct_02052AA4 *param0, u16 param1, u8 param2, u8 param3); -static const UnkStruct_ov61_0222C884 Unk_020EC2F0 = { +static const WindowTemplate Unk_020EC2F0 = { 0x3, 0x4, 0x5, diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index bdef375f30..0fd7c47d7b 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -372,7 +372,7 @@ static int sub_0206F554(UnkStruct_0206F7F8 *param0) static void sub_0206F62C(UnkStruct_0206F7F8 *param0) { - static const UnkStruct_ov61_0222C884 v0 = { + static const WindowTemplate v0 = { 0x3, 0x19, 0xD, diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index b351c2decf..86d78a0ccb 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -674,7 +674,7 @@ static void sub_020729B4(UnkStruct_02072334 *param0) { u8 v0 = 0, v1 = 0; UnkStruct_02072EB8 *v2; - static const UnkStruct_ov61_0222C884 v3[2] = { + static const WindowTemplate v3[2] = { { 0x3, 0x13, 0x1, 0xC, 0x10, 0xD, 0x295 }, { 0x3, 0x1, 0x1, 0x9, 0x2, 0xD, 0x283 } }; @@ -782,7 +782,7 @@ static void sub_02072C0C(BmpList *param0, u32 param1, u8 param2) static void sub_02072C98(UnkStruct_02072334 *param0, u8 param1, u8 param2) { u8 v0 = 0, v1 = 0; - static const UnkStruct_ov61_0222C884 v2 = { + static const WindowTemplate v2 = { 0x3, 0x1, 0x1, @@ -1120,7 +1120,7 @@ static BOOL sub_020733B4(UnkStruct_02072334 *param0) static void sub_020733E0(UnkStruct_02072334 *param0) { - static const UnkStruct_ov61_0222C884 v0 = { + static const WindowTemplate v0 = { 0x3, 0x19, 0xD, diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 3cc7ed5afc..ff5577046f 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -72,7 +72,7 @@ static u8 sub_0207C584(UnkStruct_0207AE68 *param0, int param1); static BOOL sub_0207C5CC(TextPrinterTemplate *param0, u16 param1); static void sub_0207C624(UnkStruct_0207AE68 *param0); -static const UnkStruct_ov61_0222C884 Unk_020F0A30 = { +static const WindowTemplate Unk_020F0A30 = { 0x2, 0x17, 0xD, diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index 44af3b1929..08b29f5eb0 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -32,7 +32,7 @@ static void sub_02082900(GameWindowLayout *param0, u8 param1, u8 param2); static void sub_02082964(GameWindowLayout *param0, u8 param1, u8 param2); static BOOL sub_0208279C(TextPrinterTemplate *param0, u16 param1); -static const UnkStruct_ov61_0222C884 Unk_020F1F08[] = { +static const WindowTemplate Unk_020F1F08[] = { { 0x1, 0x6, 0x1, 0x9, 0x2, 0x0, 0x28 }, { 0x1, 0x0, 0x4, 0x6, 0x2, 0x0, 0x3A }, { 0x1, 0x7, 0x4, 0x8, 0x2, 0x0, 0x46 }, @@ -80,7 +80,7 @@ static const UnkStruct_ov61_0222C884 Unk_020F1F08[] = { { 0x1, 0x18, 0x4, 0x6, 0x1, 0x4, 0x8A } }; -static const UnkStruct_ov61_0222C884 Unk_020F1ED0[] = { +static const WindowTemplate Unk_020F1ED0[] = { { 0x1, 0x1A, 0x15, 0x5, 0x2, 0x0, 0x160 }, { 0x1, 0x19, 0x14, 0x7, 0x2, 0x0, 0x16A }, { 0x0, 0x2, 0x15, 0x14, 0x2, 0xD, 0x178 }, @@ -90,7 +90,7 @@ static const UnkStruct_ov61_0222C884 Unk_020F1ED0[] = { { 0x0, 0x13, 0xF, 0xC, 0x8, 0x0, 0x240 } }; -static const UnkStruct_ov61_0222C884 Unk_020F1E98 = { +static const WindowTemplate Unk_020F1E98 = { 0x0, 0x17, 0xD, @@ -100,7 +100,7 @@ static const UnkStruct_ov61_0222C884 Unk_020F1E98 = { 0x240 }; -static void sub_020819DC(BgConfig *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2) +static void sub_020819DC(BgConfig *param0, Window *param1, const WindowTemplate *param2) { sub_0201A8D4(param0, ¶m1[0], ¶m2[0]); sub_0201A8D4(param0, ¶m1[1], ¶m2[1]); @@ -111,7 +111,7 @@ static void sub_020819DC(BgConfig *param0, Window *param1, const UnkStruct_ov61_ void sub_02081A24(GameWindowLayout *param0) { - const UnkStruct_ov61_0222C884 *v0 = Unk_020F1F08; + const WindowTemplate *v0 = Unk_020F1F08; u16 v1; sub_020819DC(param0->unk_00, ¶m0->unk_04[0], &v0[0]); @@ -129,10 +129,10 @@ void sub_02081A24(GameWindowLayout *param0) } if ((param0->unk_5A4->unk_20 == 2) || (param0->unk_5A4->unk_20 == 17) || (param0->unk_5A4->unk_20 == 23) || (param0->unk_5A4->unk_20 == 22)) { - UnkStruct_ov61_0222C884 v2; + WindowTemplate v2; v2 = Unk_020F1ED0[0]; - v2.unk_02 = 22; + v2.tilemapTop = 22; sub_0201A8D4(param0->unk_00, ¶m0->unk_04[31], &v2); } else { sub_0201A8D4(param0->unk_00, ¶m0->unk_04[31], &Unk_020F1ED0[0]); diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index 7b81575e48..70b5095c5e 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -37,7 +37,7 @@ static void sub_02090D90(PokemonSummaryApp *param0); static void sub_02090E4C(PokemonSummaryApp *param0); static void sub_02090EC8(PokemonSummaryApp *param0); -static const UnkStruct_ov61_0222C884 Unk_020F4ED0[] = { +static const WindowTemplate Unk_020F4ED0[] = { { 0x1, 0x1, 0x0, 0xD, 0x2, 0xF, 0x1 }, { 0x1, 0x1, 0x0, 0xB, 0x2, 0xF, 0x1B }, { 0x1, 0x1, 0x0, 0xE, 0x2, 0xF, 0x31 }, @@ -76,7 +76,7 @@ static const UnkStruct_ov61_0222C884 Unk_020F4ED0[] = { { 0x1, 0x1A, 0x0, 0x6, 0x2, 0xF, 0x22F } }; -static const UnkStruct_ov61_0222C884 Unk_020F4E20[] = { +static const WindowTemplate Unk_020F4E20[] = { { 0x1, 0x18, 0x5, 0x6, 0x2, 0xF, 0x23B }, { 0x1, 0x17, 0x7, 0x8, 0x2, 0xF, 0x247 }, { 0x1, 0x17, 0xB, 0x8, 0x2, 0xF, 0x257 }, @@ -85,11 +85,11 @@ static const UnkStruct_ov61_0222C884 Unk_020F4E20[] = { { 0x1, 0x18, 0x15, 0x6, 0x2, 0xF, 0x27F } }; -static const UnkStruct_ov61_0222C884 Unk_020F4DB0[] = { +static const WindowTemplate Unk_020F4DB0[] = { { 0x1, 0xE, 0x5, 0x11, 0x12, 0xF, 0x23B } }; -static const UnkStruct_ov61_0222C884 Unk_020F4E50[] = { +static const WindowTemplate Unk_020F4E50[] = { { 0x1, 0x17, 0x4, 0x7, 0x2, 0xF, 0x23B }, { 0x1, 0x19, 0x7, 0x3, 0x2, 0xF, 0x249 }, { 0x1, 0x19, 0x9, 0x3, 0x2, 0xF, 0x24F }, @@ -100,7 +100,7 @@ static const UnkStruct_ov61_0222C884 Unk_020F4E50[] = { { 0x1, 0xE, 0x14, 0x12, 0x4, 0xF, 0x27D } }; -static const UnkStruct_ov61_0222C884 Unk_020F4E90[] = { +static const WindowTemplate Unk_020F4E90[] = { { 0x1, 0x15, 0x4, 0xB, 0x4, 0xF, 0x23B }, { 0x1, 0x15, 0x8, 0xB, 0x4, 0xF, 0x267 }, { 0x1, 0x15, 0xC, 0xB, 0x4, 0xF, 0x293 }, @@ -111,7 +111,7 @@ static const UnkStruct_ov61_0222C884 Unk_020F4E90[] = { { 0x1, 0x1, 0xE, 0xF, 0xA, 0xF, 0x323 } }; -static const UnkStruct_ov61_0222C884 Unk_020F4DF0[] = { +static const WindowTemplate Unk_020F4DF0[] = { { 0x1, 0x15, 0x4, 0xB, 0x4, 0xF, 0x23B }, { 0x1, 0x15, 0x8, 0xB, 0x4, 0xF, 0x267 }, { 0x1, 0x15, 0xC, 0xB, 0x4, 0xF, 0x293 }, @@ -120,14 +120,14 @@ static const UnkStruct_ov61_0222C884 Unk_020F4DF0[] = { { 0x1, 0x1, 0x12, 0xF, 0x6, 0xF, 0x317 } }; -static const UnkStruct_ov61_0222C884 Unk_020F4DD0[] = { +static const WindowTemplate Unk_020F4DD0[] = { { 0x1, 0x1A, 0x15, 0x5, 0x2, 0xF, 0x23B }, { 0x1, 0x18, 0xF, 0x7, 0x2, 0xF, 0x245 }, { 0x1, 0x1, 0x12, 0x15, 0x2, 0xF, 0x253 }, { 0x1, 0x1, 0x14, 0x1E, 0x4, 0xF, 0x27D } }; -static const UnkStruct_ov61_0222C884 Unk_020F4DB8[] = { +static const WindowTemplate Unk_020F4DB8[] = { { 0x1, 0x1A, 0x0, 0x5, 0x2, 0xF, 0x23B }, { 0x1, 0x1, 0x14, 0xC, 0x4, 0xF, 0x24D }, { 0x1, 0x2, 0x15, 0x1B, 0x2, 0xE, 0x27D } @@ -150,7 +150,7 @@ void sub_0208FCF8(PokemonSummaryApp *param0) void sub_0208FD40(PokemonSummaryApp *param0) { - const UnkStruct_ov61_0222C884 *v0; + const WindowTemplate *v0; u32 v1; switch (param0->page) { diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index e150754bd0..159265b099 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -60,7 +60,7 @@ const OverlayManagerTemplate Unk_020F8A48 = { 0xFFFFFFFF }; -static const UnkStruct_ov61_0222C884 Unk_020F89E4 = { +static const WindowTemplate Unk_020F89E4 = { 0x0, 0x2, 0x13, @@ -70,7 +70,7 @@ static const UnkStruct_ov61_0222C884 Unk_020F89E4 = { 0x16D }; -static const UnkStruct_ov61_0222C884 Unk_020F89EC = { +static const WindowTemplate Unk_020F89EC = { 0x0, 0x19, 0xD, diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index 80e3447e95..0decb3111d 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -51,7 +51,7 @@ static BOOL sub_0209A688(UnkStruct_0209A3D0 *param0, u32 param1, int param2, int extern const OverlayManagerTemplate Unk_ov97_0223D674; -static const UnkStruct_ov61_0222C884 Unk_020F8A58 = { +static const WindowTemplate Unk_020F8A58 = { 0x0, 0x2, 0x13, diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index 54ea143d5d..70d722a7ef 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -55,7 +55,7 @@ static const BgTemplate Unk_020F8ADC = { 0x0 }; -static const UnkStruct_ov61_0222C884 Unk_020F8AC4 = { +static const WindowTemplate Unk_020F8AC4 = { 0x0, 0x3, 0x3, diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index 111df8a8d5..09e8a98661 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -57,7 +57,7 @@ static const BgTemplate Unk_020F8B38 = { 0x0 }; -static const UnkStruct_ov61_0222C884 Unk_020F8B20 = { +static const WindowTemplate Unk_020F8B20 = { 0x0, 0x3, 0x3, From 8f70ed0d4459cb4a75e7f961361de262cc5fafd6 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 20 Oct 2024 11:43:25 -0700 Subject: [PATCH 07/13] Document Window fields --- include/bg_window.h | 22 +-- src/battle/healthbar.c | 6 +- src/battle/ov16_0226871C.c | 16 +- src/bg_window.c | 258 ++++++++++++++-------------- src/field_menu.c | 4 +- src/overlay007/communication_club.c | 2 +- src/overlay007/ov7_0224B4E8.c | 6 +- src/overlay010/ov10_0221F800.c | 10 +- src/overlay017/ov17_0223F7E4.c | 10 +- src/overlay019/ov19_021D79F8.c | 8 +- src/overlay019/ov19_021DB2FC.c | 18 +- src/overlay019/ov19_021DEC04.c | 14 +- src/overlay020/ov20_021D40E8.c | 4 +- src/overlay020/ov20_021D4728.c | 12 +- src/overlay023/ov23_0224F294.c | 4 +- src/overlay023/ov23_022542CC.c | 4 +- src/overlay029/ov29_022566C8.c | 8 +- src/overlay032/ov32_02256470.c | 16 +- src/overlay041/ov41_022567B0.c | 6 +- src/overlay061/ov61_0222BF44.c | 4 +- src/overlay065/ov65_0222DCE0.c | 2 +- src/overlay069/ov69_0225C700.c | 4 +- src/overlay072/ov72_0223D7A0.c | 6 +- src/overlay077/ov77_021D0D80.c | 2 +- src/overlay088/ov88_0223E9C4.c | 2 +- src/overlay094/ov94_0223E46C.c | 4 +- src/overlay094/ov94_02244950.c | 4 +- src/overlay096/ov96_0223BCE0.c | 4 +- src/overlay097/ov97_0222AE60.c | 2 +- src/overlay097/ov97_0222D30C.c | 16 +- src/overlay097/ov97_02230410.c | 12 +- src/overlay097/ov97_02233B18.c | 4 +- src/overlay097/ov97_02237694.c | 2 +- src/overlay098/ov98_022471C8.c | 4 +- src/overlay099/ov99_021D3E78.c | 2 +- src/overlay105/ov105_02246214.c | 2 +- src/overlay106/ov106_022436E0.c | 2 +- src/overlay107/ov107_02249D14.c | 2 +- src/overlay111/ov111_021D3548.c | 2 +- src/overlay112/ov112_0225C700.c | 2 +- src/overlay115/ov115_02260CEC.c | 2 +- src/render_text.c | 16 +- src/unk_0200DA60.c | 48 +++--- src/unk_02012744.c | 14 +- src/unk_020528D0.c | 2 +- src/unk_0205A0D8.c | 6 +- src/unk_0205D8CC.c | 4 +- src/unk_020819DC.c | 10 +- src/unk_0208694C.c | 2 +- src/unk_0208FCF8.c | 4 +- src/unk_02095E98.c | 4 +- src/unk_0209ACF4.c | 2 +- 52 files changed, 313 insertions(+), 313 deletions(-) diff --git a/include/bg_window.h b/include/bg_window.h index 8587e9312b..61a5cf940c 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -84,17 +84,17 @@ typedef struct WindowTemplate { u16 baseTile; } WindowTemplate; -typedef struct { - BgConfig *unk_00; - u8 unk_04; - u8 unk_05; - u8 unk_06; - u8 unk_07; - u8 unk_08; - u8 unk_09; - u16 unk_0A_0 : 15; - u16 unk_0A_15 : 1; - void *unk_0C; +typedef struct Window { + BgConfig *bgConfig; + u8 bgLayer; + u8 tilemapLeft; + u8 tilemapTop; + u8 width; + u8 height; + u8 palette; + u16 baseTile : 15; + u16 colorMode : 1; + void *pixels; } Window; typedef struct { diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index dc9654cd5a..f283e02171 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -1101,7 +1101,7 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar) BGL_AddFramelessWindow(bgl, &window, HEALTHBAR_NAME_BLOCK_COUNT_X, HEALTHBAR_NAME_BLOCK_COUNT_Y, HEALTHBAR_NAME_WINDOW_OFFSET, HEALTHBAR_NAME_BACKGROUND_COLOR); Text_AddPrinterWithParamsColorAndSpacing(&window, FONT_SYSTEM, nickname, 0, 0, TEXT_SPEED_NO_TRANSFER, HEALTHBAR_NAME_TEXT_COLOR, 0, 0, NULL); - buf = window.unk_0C; + buf = window.pixels; // copy the window's data into VRAM over the painted healthbar { @@ -1315,7 +1315,7 @@ static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1) BGL_AddFramelessWindow(v0, &v3, 13, 2, 0, 0xf); Text_AddPrinterWithParamsColorAndSpacing(&v3, FONT_SYSTEM, v5, 0, 0, TEXT_SPEED_NO_TRANSFER, HEALTHBAR_NAME_TEXT_COLOR, 0, 0, NULL); - v1 = v3.unk_0C; + v1 = v3.pixels; { void *v6; @@ -1363,7 +1363,7 @@ static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1) BGL_AddFramelessWindow(v0, &v3, 13, 2, 0, 0xf); Text_AddPrinterWithParamsColorAndSpacing(&v3, FONT_SYSTEM, v5, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 2, 15), 0, 0, NULL); - v1 = v3.unk_0C; + v1 = v3.pixels; { void *v8; diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index cb05d66675..283971fe36 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -2761,15 +2761,15 @@ static void ov16_0226ABE8(UnkStruct_ov16_02268A14 *param0) for (v0 = 0; v0 < 4; v0++) { Heap_FreeToHeap(param0->unk_68[v1].unk_18[v0]); - if (param0->unk_68[v1].unk_28[v0].unk_00.unk_0C != NULL) { + if (param0->unk_68[v1].unk_28[v0].unk_00.pixels != NULL) { BGL_DeleteWindow(¶m0->unk_68[v1].unk_28[v0].unk_00); } - if (param0->unk_68[v1].unk_78[v0].unk_00.unk_0C != NULL) { + if (param0->unk_68[v1].unk_78[v0].unk_00.pixels != NULL) { BGL_DeleteWindow(¶m0->unk_68[v1].unk_78[v0].unk_00); } - if (param0->unk_68[v1].unk_C8[v0].unk_00.unk_0C != NULL) { + if (param0->unk_68[v1].unk_C8[v0].unk_00.pixels != NULL) { BGL_DeleteWindow(¶m0->unk_68[v1].unk_C8[v0].unk_00); } } @@ -2806,24 +2806,24 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_ Heap_FreeToHeap(v1); } - if ((v0->unk_28[v4].unk_00.unk_0C == NULL) || ((param2->unk_00[v4] != v0->unk_00.unk_00[v4]) && (param2->unk_00[v4] != 0))) { + if ((v0->unk_28[v4].unk_00.pixels == NULL) || ((param2->unk_00[v4] != v0->unk_00.unk_00[v4]) && (param2->unk_00[v4] != 0))) { v6 = MessageUtil_MoveName(param2->unk_00[v4], 5); ov16_0226AEA0(param0, v6, FONT_SUBSCREEN, &v0->unk_28[v4], TEXT_COLOR(7, 8, 9)); Strbuf_Free(v6); } - if ((v0->unk_78[v4].unk_00.unk_0C == NULL) || (v0->unk_C8[v4].unk_00.unk_0C == NULL) || (param2->unk_00[v4] != 0) || (param2->unk_00[v4] != v0->unk_00.unk_00[v4]) || (param2->unk_08[v4] != v0->unk_00.unk_08[v4]) || (param2->unk_10[v4] != v0->unk_00.unk_10[v4])) { + if ((v0->unk_78[v4].unk_00.pixels == NULL) || (v0->unk_C8[v4].unk_00.pixels == NULL) || (param2->unk_00[v4] != 0) || (param2->unk_00[v4] != v0->unk_00.unk_00[v4]) || (param2->unk_08[v4] != v0->unk_00.unk_08[v4]) || (param2->unk_10[v4] != v0->unk_00.unk_10[v4])) { StringTemplate_SetNumber(v10, 0, param2->unk_08[v4], 2, 1, 0); StringTemplate_SetNumber(v10, 1, param2->unk_10[v4], 2, 1, 0); StringTemplate_Format(v10, v7, v8); v11 = ov16_0226B924(param2->unk_08[v4], param2->unk_10[v4]); - if ((v0->unk_78[v4].unk_00.unk_0C == NULL) || (param2->unk_00[v4] != v0->unk_00.unk_00[v4]) || (param2->unk_08[v4] != v0->unk_00.unk_08[v4])) { + if ((v0->unk_78[v4].unk_00.pixels == NULL) || (param2->unk_00[v4] != v0->unk_00.unk_00[v4]) || (param2->unk_08[v4] != v0->unk_00.unk_08[v4])) { ov16_0226AEA0(param0, v7, FONT_SYSTEM, &v0->unk_78[v4], v11); } - if ((v0->unk_C8[v4].unk_00.unk_0C == NULL) || (param2->unk_00[v4] != v0->unk_00.unk_00[v4]) || (param2->unk_08[v4] != v0->unk_00.unk_08[v4])) { + if ((v0->unk_C8[v4].unk_00.pixels == NULL) || (param2->unk_00[v4] != v0->unk_00.unk_00[v4]) || (param2->unk_08[v4] != v0->unk_00.unk_08[v4])) { ov16_0226AEA0(param0, v9, FONT_SYSTEM, &v0->unk_C8[v4], v11); } } @@ -2845,7 +2845,7 @@ static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1, param3->unk_12 = v0; param3->unk_10 = v1; - if (param3->unk_00.unk_0C != NULL) { + if (param3->unk_00.pixels != NULL) { BGL_DeleteWindow(¶m3->unk_00); } diff --git a/src/bg_window.c b/src/bg_window.c index 3ec1ea8db3..a4870d671d 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -1545,21 +1545,21 @@ Window *sub_0201A778(u32 param0, u8 param1) void Window_Init(Window *param0) { - param0->unk_00 = NULL; - param0->unk_04 = 0xff; - param0->unk_05 = 0; - param0->unk_06 = 0; - param0->unk_07 = 0; - param0->unk_08 = 0; - param0->unk_09 = 0; - param0->unk_0A_0 = 0; - param0->unk_0C = NULL; - param0->unk_0A_15 = UnkEnum_00; + param0->bgConfig = NULL; + param0->bgLayer = 0xff; + param0->tilemapLeft = 0; + param0->tilemapTop = 0; + param0->width = 0; + param0->height = 0; + param0->palette = 0; + param0->baseTile = 0; + param0->pixels = NULL; + param0->colorMode = UnkEnum_00; } u8 BGL_WindowAdded(Window *param0) { - if ((param0->unk_00 == NULL) || (param0->unk_04 == 0xff) || (param0->unk_0C == NULL)) { + if ((param0->bgConfig == NULL) || (param0->bgLayer == 0xff) || (param0->pixels == NULL)) { return 0; } @@ -1582,16 +1582,16 @@ void BGL_AddWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 pa return; } - param1->unk_00 = param0; - param1->unk_04 = param2; - param1->unk_05 = param3; - param1->unk_06 = param4; - param1->unk_07 = param5; - param1->unk_08 = param6; - param1->unk_09 = param7; - param1->unk_0A_0 = param8; - param1->unk_0C = v0; - param1->unk_0A_15 = (param0->bgs[param2].colorMode == GX_BG_COLORMODE_16) ? UnkEnum_00 : UnkEnum_01; + param1->bgConfig = param0; + param1->bgLayer = param2; + param1->tilemapLeft = param3; + param1->tilemapTop = param4; + param1->width = param5; + param1->height = param6; + param1->palette = param7; + param1->baseTile = param8; + param1->pixels = v0; + param1->colorMode = (param0->bgs[param2].colorMode == GX_BG_COLORMODE_16) ? UnkEnum_00 : UnkEnum_01; } void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5) @@ -1609,12 +1609,12 @@ void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 para return; } - param1->unk_00 = param0; - param1->unk_07 = param2; - param1->unk_08 = param3; - param1->unk_0A_0 = param4; - param1->unk_0C = v0; - param1->unk_0A_15 = UnkEnum_00; + param1->bgConfig = param0; + param1->width = param2; + param1->height = param3; + param1->baseTile = param4; + param1->pixels = v0; + param1->colorMode = UnkEnum_00; } void sub_0201A8D4(BgConfig *param0, Window *param1, const WindowTemplate *param2) @@ -1625,17 +1625,17 @@ void sub_0201A8D4(BgConfig *param0, Window *param1, const WindowTemplate *param2 void BGL_DeleteWindow(Window *param0) { - Heap_FreeToHeap(param0->unk_0C); + Heap_FreeToHeap(param0->pixels); - param0->unk_00 = NULL; - param0->unk_04 = 0xff; - param0->unk_05 = 0; - param0->unk_06 = 0; - param0->unk_07 = 0; - param0->unk_08 = 0; - param0->unk_09 = 0; - param0->unk_0A_0 = 0; - param0->unk_0C = NULL; + param0->bgConfig = NULL; + param0->bgLayer = 0xff; + param0->tilemapLeft = 0; + param0->tilemapTop = 0; + param0->width = 0; + param0->height = 0; + param0->palette = 0; + param0->baseTile = 0; + param0->pixels = NULL; } void sub_0201A928(Window *param0, u8 param1) @@ -1643,11 +1643,11 @@ void sub_0201A928(Window *param0, u8 param1) u16 v0; for (v0 = 0; v0 < param1; v0++) { - if (param0[v0].unk_0C == NULL) { + if (param0[v0].pixels == NULL) { continue; } - Heap_FreeToHeap(param0[v0].unk_0C); + Heap_FreeToHeap(param0[v0].pixels); } Heap_FreeToHeap(param0); @@ -1701,65 +1701,65 @@ static const u8 Unk_020E5694[] = { void sub_0201A954(Window *param0) { GF_ASSERT(param0 != NULL); - GF_ASSERT(param0->unk_00 != NULL); - GF_ASSERT(param0->unk_04 < 8); - GF_ASSERT(param0->unk_00->bgs[param0->unk_04].type < NELEMS(Unk_020E56CC)); + GF_ASSERT(param0->bgConfig != NULL); + GF_ASSERT(param0->bgLayer < 8); + GF_ASSERT(param0->bgConfig->bgs[param0->bgLayer].type < NELEMS(Unk_020E56CC)); - Unk_020E56CC[param0->unk_00->bgs[param0->unk_04].type](param0); + Unk_020E56CC[param0->bgConfig->bgs[param0->bgLayer].type](param0); } void sub_0201A9A4(Window *param0) { GF_ASSERT(param0 != NULL); - GF_ASSERT(param0->unk_00 != NULL); - GF_ASSERT(param0->unk_04 < 8); - GF_ASSERT(param0->unk_00->bgs[param0->unk_04].type < NELEMS(Unk_020E56C0)); + GF_ASSERT(param0->bgConfig != NULL); + GF_ASSERT(param0->bgLayer < 8); + GF_ASSERT(param0->bgConfig->bgs[param0->bgLayer].type < NELEMS(Unk_020E56C0)); - Unk_020E56C0[param0->unk_00->bgs[param0->unk_04].type](param0); + Unk_020E56C0[param0->bgConfig->bgs[param0->bgLayer].type](param0); } void sub_0201A9F4(Window *param0) { - Unk_020E569C[param0->unk_00->bgs[param0->unk_04].type](param0); + Unk_020E569C[param0->bgConfig->bgs[param0->bgLayer].type](param0); } void sub_0201AA10(Window *param0, u32 param1, u32 param2) { u32 v0, v1; - v0 = param0->unk_07; - v1 = param0->unk_08; + v0 = param0->width; + v1 = param0->height; - param0->unk_07 = param1; - param0->unk_08 = param2; + param0->width = param1; + param0->height = param2; - Unk_020E569C[param0->unk_00->bgs[param0->unk_04].type](param0); + Unk_020E569C[param0->bgConfig->bgs[param0->bgLayer].type](param0); - param0->unk_07 = v0; - param0->unk_08 = v1; + param0->width = v0; + param0->height = v1; } void sub_0201AA3C(Window *param0) { - Unk_020E56D8[param0->unk_00->bgs[param0->unk_04].type](param0); + Unk_020E56D8[param0->bgConfig->bgs[param0->bgLayer].type](param0); } static void sub_0201AA58(Window *param0) { - if (param0->unk_00->bgs[param0->unk_04].tilemapBuffer) { + if (param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) { u32 v0, v1, v2, v3, v4, v5, v6; u16 *v7; v6 = 32; - v7 = (u16 *)(param0->unk_00->bgs[param0->unk_04].tilemapBuffer); - v4 = param0->unk_0A_0; - v2 = param0->unk_05 + param0->unk_07; - v3 = param0->unk_06 + param0->unk_08; + v7 = (u16 *)(param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer); + v4 = param0->baseTile; + v2 = param0->tilemapLeft + param0->width; + v3 = param0->tilemapTop + param0->height; - for (v1 = param0->unk_06; v1 < v3; v1++) { - for (v0 = param0->unk_05; v0 < v2; v0++) { + for (v1 = param0->tilemapTop; v1 < v3; v1++) { + for (v0 = param0->tilemapLeft; v0 < v2; v0++) { v5 = ((v1 & 0x20) * 32) + ((v0 & 0x20) * 32) + ((v1 & 0x1f) * v6) + (v0 & 0x1f); - v7[v5] = v4 | (param0->unk_09 << 12); + v7[v5] = v4 | (param0->palette << 12); v4++; } } @@ -1768,16 +1768,16 @@ static void sub_0201AA58(Window *param0) static void sub_0201AADC(Window *param0) { - if (param0->unk_00->bgs[param0->unk_04].tilemapBuffer) { + if (param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) { int v0, v1, v2, v3; u8 *v4; - v3 = Unk_020E5694[param0->unk_00->bgs[param0->unk_04].screenSize]; - v4 = (u8 *)(param0->unk_00->bgs[param0->unk_04].tilemapBuffer) + param0->unk_06 * v3 + param0->unk_05; - v2 = param0->unk_0A_0; + v3 = Unk_020E5694[param0->bgConfig->bgs[param0->bgLayer].screenSize]; + v4 = (u8 *)(param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) + param0->tilemapTop * v3 + param0->tilemapLeft; + v2 = param0->baseTile; - for (v1 = 0; v1 < param0->unk_08; v1++) { - for (v0 = 0; v0 < param0->unk_07; v0++) { + for (v1 = 0; v1 < param0->height; v1++) { + for (v0 = 0; v0 < param0->width; v0++) { v4[v0] = v2++; } @@ -1788,17 +1788,17 @@ static void sub_0201AADC(Window *param0) static void sub_0201AB38(Window *param0) { - if (param0->unk_00->bgs[param0->unk_04].tilemapBuffer) { + if (param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) { u32 v0, v1, v2, v3, v4, v5; u16 *v6; - v5 = Unk_020E5694[param0->unk_00->bgs[param0->unk_04].screenSize]; - v6 = (u16 *)(param0->unk_00->bgs[param0->unk_04].tilemapBuffer); - v2 = param0->unk_05 + param0->unk_07; - v3 = param0->unk_06 + param0->unk_08; + v5 = Unk_020E5694[param0->bgConfig->bgs[param0->bgLayer].screenSize]; + v6 = (u16 *)(param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer); + v2 = param0->tilemapLeft + param0->width; + v3 = param0->tilemapTop + param0->height; - for (v1 = param0->unk_06; v1 < v3; v1++) { - for (v0 = param0->unk_05; v0 < v2; v0++) { + for (v1 = param0->tilemapTop; v1 < v3; v1++) { + for (v0 = param0->tilemapLeft; v0 < v2; v0++) { v4 = ((v1 & 0x20) * 32) + ((v0 & 0x20) * 32) + ((v1 & 0x1f) * v5) + (v0 & 0x1f); v6[v4] = 0x0; } @@ -1808,15 +1808,15 @@ static void sub_0201AB38(Window *param0) static void sub_0201ABC8(Window *param0) { - if (param0->unk_00->bgs[param0->unk_04].tilemapBuffer) { + if (param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) { int v0, v1, v2; u8 *v3; - v2 = Unk_020E5694[param0->unk_00->bgs[param0->unk_04].screenSize]; - v3 = (u8 *)(param0->unk_00->bgs[param0->unk_04].tilemapBuffer) + param0->unk_06 * v2 + param0->unk_05; + v2 = Unk_020E5694[param0->bgConfig->bgs[param0->bgLayer].screenSize]; + v3 = (u8 *)(param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) + param0->tilemapTop * v2 + param0->tilemapLeft; - for (v1 = 0; v1 < param0->unk_08; v1++) { - for (v0 = 0; v0 < param0->unk_07; v0++) { + for (v1 = 0; v1 < param0->height; v1++) { + for (v0 = 0; v0 < param0->width; v0++) { v3[v0] = 0; } @@ -1829,13 +1829,13 @@ static void sub_0201AC20(Window *param0) { sub_0201AA58(param0); sub_0201ACCC(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->bgs[param0->unk_04].tilemapBuffer, param0->unk_00->bgs[param0->unk_04].bufferSize, param0->unk_00->bgs[param0->unk_04].baseTile); + sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); } static void sub_0201AC4C(Window *param0) { sub_0201AA58(param0); - sub_0201C3C0(param0->unk_00, param0->unk_04); + sub_0201C3C0(param0->bgConfig, param0->bgLayer); sub_0201ACCC(param0); } @@ -1843,56 +1843,56 @@ static void sub_0201AC64(Window *param0) { sub_0201AADC(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->bgs[param0->unk_04].tilemapBuffer, param0->unk_00->bgs[param0->unk_04].bufferSize, param0->unk_00->bgs[param0->unk_04].baseTile); - sub_0201958C(param0->unk_00, param0->unk_04, param0->unk_0C, (u32)(param0->unk_07 * param0->unk_08 * 0x40), (u32)param0->unk_0A_0); + sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); + sub_0201958C(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile); } static void sub_0201ACA0(Window *param0) { sub_0201AADC(param0); - sub_0201C3C0(param0->unk_00, param0->unk_04); - sub_0201958C(param0->unk_00, param0->unk_04, param0->unk_0C, (u32)(param0->unk_07 * param0->unk_08 * 0x40), (u32)param0->unk_0A_0); + sub_0201C3C0(param0->bgConfig, param0->bgLayer); + sub_0201958C(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile); } void sub_0201ACCC(Window *param0) { - u32 v0 = param0->unk_07 * param0->unk_08 * param0->unk_00->bgs[param0->unk_04].tileSize; - sub_0201958C(param0->unk_00, param0->unk_04, param0->unk_0C, v0, param0->unk_0A_0); + u32 v0 = param0->width * param0->height * param0->bgConfig->bgs[param0->bgLayer].tileSize; + sub_0201958C(param0->bgConfig, param0->bgLayer, param0->pixels, v0, param0->baseTile); } void sub_0201ACF4(Window *param0) { - Unk_020E56B4[param0->unk_00->bgs[param0->unk_04].type](param0); + Unk_020E56B4[param0->bgConfig->bgs[param0->bgLayer].type](param0); } void sub_0201AD10(Window *param0) { - Unk_020E56A8[param0->unk_00->bgs[param0->unk_04].type](param0); + Unk_020E56A8[param0->bgConfig->bgs[param0->bgLayer].type](param0); } static void sub_0201AD2C(Window *param0) { sub_0201AB38(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->bgs[param0->unk_04].tilemapBuffer, param0->unk_00->bgs[param0->unk_04].bufferSize, param0->unk_00->bgs[param0->unk_04].baseTile); + sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); } static void sub_0201AD54(Window *param0) { sub_0201AB38(param0); - sub_0201C3C0(param0->unk_00, param0->unk_04); + sub_0201C3C0(param0->bgConfig, param0->bgLayer); } static void sub_0201AD68(Window *param0) { sub_0201ABC8(param0); - sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->bgs[param0->unk_04].tilemapBuffer, param0->unk_00->bgs[param0->unk_04].bufferSize, param0->unk_00->bgs[param0->unk_04].baseTile); + sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); } static void sub_0201AD90(Window *param0) { sub_0201ABC8(param0); - sub_0201C3C0(param0->unk_00, param0->unk_04); + sub_0201C3C0(param0->bgConfig, param0->bgLayer); } void BGL_FillWindow(Window *param0, u8 param1) @@ -1900,14 +1900,14 @@ void BGL_FillWindow(Window *param0, u8 param1) u32 v0; u32 v1; - if (param0->unk_00->bgs[param0->unk_04].tileSize == 0x20) { + if (param0->bgConfig->bgs[param0->bgLayer].tileSize == 0x20) { param1 = (param1 << 4) | param1; } v1 = (param1 << 24) | (param1 << 16) | (param1 << 8) | param1; - v0 = param0->unk_00->bgs[param0->unk_04].tileSize * param0->unk_07 * param0->unk_08; + v0 = param0->bgConfig->bgs[param0->bgLayer].tileSize * param0->width * param0->height; - MI_CpuFillFast(param0->unk_0C, v1, v0); + MI_CpuFillFast(param0->pixels, v1, v0); } void sub_0201ADDC(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9) @@ -1923,11 +1923,11 @@ void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 para v0.pixels = (u8 *)param1; v0.width = param4; v0.height = param5; - v1.pixels = (u8 *)param0->unk_0C; - v1.width = (u16)(param0->unk_07 * 0x8); - v1.height = (u16)(param0->unk_08 * 0x8); + v1.pixels = (u8 *)param0->pixels; + v1.width = (u16)(param0->width * 0x8); + v1.height = (u16)(param0->height * 0x8); - if (param0->unk_00->bgs[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { + if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) { sub_0201A1E4(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); } else { sub_0201A424(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); @@ -1938,11 +1938,11 @@ void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 para { Bitmap v0; - v0.pixels = (u8 *)param0->unk_0C; - v0.width = (u16)(param0->unk_07 * 0x8); - v0.height = (u16)(param0->unk_08 * 0x8); + v0.pixels = (u8 *)param0->pixels; + v0.width = (u16)(param0->width * 0x8); + v0.height = (u16)(param0->height * 0x8); - if (param0->unk_00->bgs[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { + if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) { sub_0201A60C((const Bitmap *)&v0, param2, param3, param4, param5, param1); } else { sub_0201A6D0((const Bitmap *)&v0, param2, param3, param4, param5, param1); @@ -1956,9 +1956,9 @@ void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 int v3, v4; u8 v5; - v0 = (u8 *)param0->unk_0C; - v1 = (u16)(param0->unk_07 * 0x8); - v2 = (u16)(param0->unk_08 * 0x8); + v0 = (u8 *)param0->pixels; + v1 = (u16)(param0->width * 0x8); + v2 = (u16)(param0->height * 0x8); if (((v1) - (param4)) < (param2)) { v3 = (v1) - (param4); @@ -1982,7 +1982,7 @@ void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 v5 |= 2; } - if (param0->unk_0A_15 == UnkEnum_00) { + if (param0->colorMode == UnkEnum_00) { switch (v5) { case 0: { int v7, v8, v9, v10, v17; @@ -2484,7 +2484,7 @@ void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 return; } } else { - u8 *v6 = sub_02019FC0(param1, param2 * 4 * param3 * 8, param0->unk_09, param0->unk_00->heapID); + u8 *v6 = sub_02019FC0(param1, param2 * 4 * param3 * 8, param0->palette, param0->bgConfig->heapID); switch (v5) { case 0: { @@ -2974,7 +2974,7 @@ void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 void sub_0201C04C(Window *param0, u8 param1, u8 param2, u8 param3) { - if (param0->unk_00->bgs[param0->unk_04].colorMode == GX_BG_COLORMODE_16) { + if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) { sub_0201C06C(param0, param1, param2, param3); } else { sub_0201C158(param0, param1, param2, param3); @@ -2989,10 +2989,10 @@ static void sub_0201C06C(Window *param0, u8 param1, u8 param2, u8 param3) int v6, v7; int v8; - v0 = (u8 *)param0->unk_0C; + v0 = (u8 *)param0->pixels; v4 = (param3 << 24) | (param3 << 16) | (param3 << 8) | (param3 << 0); - v5 = param0->unk_08 * param0->unk_07 * 0x20; - v6 = param0->unk_07; + v5 = param0->height * param0->width * 0x20; + v6 = param0->width; switch (param1) { case 0: @@ -3049,10 +3049,10 @@ static void sub_0201C158(Window *param0, u8 param1, u8 param2, u8 param3) int v6, v7; int v8; - v0 = (u8 *)param0->unk_0C; + v0 = (u8 *)param0->pixels; v4 = (param3 << 24) | (param3 << 16) | (param3 << 8) | param3; - v5 = param0->unk_08 * param0->unk_07 * 0x40; - v6 = param0->unk_07; + v5 = param0->height * param0->width * 0x40; + v6 = param0->width; switch (param1) { case 0: @@ -3120,52 +3120,52 @@ static void sub_0201C158(Window *param0, u8 param1, u8 param2, u8 param3) BgConfig *sub_0201C28C(Window *param0) { - return param0->unk_00; + return param0->bgConfig; } u8 sub_0201C290(Window *param0) { - return param0->unk_04; + return param0->bgLayer; } u8 sub_0201C294(Window *param0) { - return param0->unk_07; + return param0->width; } u8 sub_0201C298(Window *param0) { - return param0->unk_08; + return param0->height; } u8 sub_0201C29C(Window *param0) { - return param0->unk_05; + return param0->tilemapLeft; } u8 sub_0201C2A0(Window *param0) { - return param0->unk_06; + return param0->tilemapTop; } u16 sub_0201C2A4(Window *param0) { - return param0->unk_0A_0; + return param0->baseTile; } void sub_0201C2AC(Window *param0, u8 param1) { - param0->unk_05 = param1; + param0->tilemapLeft = param1; } void sub_0201C2B0(Window *param0, u8 param1) { - param0->unk_06 = param1; + param0->tilemapTop = param1; } void sub_0201C2B4(Window *param0, u8 param1) { - param0->unk_09 = param1; + param0->palette = param1; } void sub_0201C2B8(BgConfig *param0) diff --git a/src/field_menu.c b/src/field_menu.c index e77a5ac2c4..6984d58526 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -1429,7 +1429,7 @@ static BOOL FieldMenu_SelectSave(TaskManager *taskMan) FieldMenu_Close(menu); Window_Clear(&menu->unk_00, 1); - sub_0201C3C0(menu->unk_00.unk_00, menu->unk_00.unk_04); + sub_0201C3C0(menu->unk_00.bgConfig, menu->unk_00.bgLayer); BGL_DeleteWindow(&menu->unk_00); sub_0203B200(taskMan); @@ -1593,7 +1593,7 @@ static BOOL FieldMenu_SelectRetire(TaskManager *taskMan) FieldMenu_Close(menu); Window_Clear(&menu->unk_00, 1); - sub_0201C3C0(menu->unk_00.unk_00, menu->unk_00.unk_04); + sub_0201C3C0(menu->unk_00.bgConfig, menu->unk_00.bgLayer); BGL_DeleteWindow(&menu->unk_00); sub_0203B200(taskMan); diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c index 85a90f93b0..0907f89d47 100644 --- a/src/overlay007/communication_club.c +++ b/src/overlay007/communication_club.c @@ -272,7 +272,7 @@ static void CommClubMan_Delete(void) MessageLoader_Free(sCommClubMan->msgLoader); - if (sCommClubMan->msgWindow.unk_0C != NULL) { + if (sCommClubMan->msgWindow.pixels != NULL) { BGL_DeleteWindow(&sCommClubMan->msgWindow); } diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c index 8f8ba547c3..82e83df151 100644 --- a/src/overlay007/ov7_0224B4E8.c +++ b/src/overlay007/ov7_0224B4E8.c @@ -166,7 +166,7 @@ static void ov7_0224B6AC(UnkStruct_ov7_0224B4E8 *param0) if (param0->unk_00) { sub_02001384(param0->unk_00, NULL, NULL); Window_Clear(¶m0->unk_34, 1); - sub_0201C3C0(param0->unk_34.unk_00, param0->unk_34.unk_04); + sub_0201C3C0(param0->unk_34.bgConfig, param0->unk_34.bgLayer); BGL_DeleteWindow(¶m0->unk_34); sub_02013A3C(param0->unk_08); @@ -282,7 +282,7 @@ static int ov7_0224B83C(UnkStruct_ov7_0224B4E8 *param0) if (param0->unk_04) { sub_02001384(param0->unk_04, NULL, NULL); Window_Clear(¶m0->unk_44, 1); - sub_0201C3C0(param0->unk_44.unk_00, param0->unk_44.unk_04); + sub_0201C3C0(param0->unk_44.bgConfig, param0->unk_44.bgLayer); BGL_DeleteWindow(¶m0->unk_44); sub_02013A3C(param0->unk_0C); @@ -421,7 +421,7 @@ static void ov7_0224B8DC(UnkStruct_ov7_0224B4E8 *param0) static void ov7_0224BBA0(UnkStruct_ov7_0224B4E8 *param0) { Window_Clear(¶m0->unk_24, 1); - sub_0201C3C0(param0->unk_24.unk_00, param0->unk_24.unk_04); + sub_0201C3C0(param0->unk_24.bgConfig, param0->unk_24.bgLayer); BGL_DeleteWindow(¶m0->unk_24); } diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index ca37e6dacd..3b201685f0 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -1390,11 +1390,11 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p static void ov10_02220DCC(UnkStruct_ov10_0221FB28 *param0) { - if (param0->unk_B7C.unk_0C != NULL) { + if (param0->unk_B7C.pixels != NULL) { BGL_DeleteWindow(¶m0->unk_B7C); } - if (param0->unk_B8C.unk_0C != NULL) { + if (param0->unk_B8C.pixels != NULL) { BGL_DeleteWindow(¶m0->unk_B8C); } } @@ -2321,15 +2321,15 @@ static void ov10_02222594(UnkStruct_ov10_0221FB28 *param0, u32 param1) case 4: case 3: sub_0201972C( - 1, ¶m0->unk_4D8[9], 2 * 2, (v0->unk_09 * 16 + 9) * 2); + 1, ¶m0->unk_4D8[9], 2 * 2, (v0->palette * 16 + 9) * 2); break; case 2: sub_0201972C( - 1, ¶m0->unk_4D8[(9 + 16)], 2 * 2, (v0->unk_09 * 16 + 9) * 2); + 1, ¶m0->unk_4D8[(9 + 16)], 2 * 2, (v0->palette * 16 + 9) * 2); break; case 1: sub_0201972C( - 1, ¶m0->unk_4D8[(9 + 32)], 2 * 2, (v0->unk_09 * 16 + 9) * 2); + 1, ¶m0->unk_4D8[(9 + 32)], 2 * 2, (v0->palette * 16 + 9) * 2); break; } diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index 41fe3cf51e..be8c0a9852 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -1426,21 +1426,21 @@ static void ov17_022409F4(UnkStruct_ov17_0223F7E4 *param0) int v0, v1; for (v0 = 0; v0 < 4; v0++) { - if (param0->unk_18C.unk_00[v0].unk_00.unk_0C != NULL) { + if (param0->unk_18C.unk_00[v0].unk_00.pixels != NULL) { BGL_DeleteWindow(¶m0->unk_18C.unk_00[v0].unk_00); } - if (param0->unk_18C.unk_50[v0].unk_00.unk_0C != NULL) { + if (param0->unk_18C.unk_50[v0].unk_00.pixels != NULL) { BGL_DeleteWindow(¶m0->unk_18C.unk_50[v0].unk_00); } - if (param0->unk_18C.unk_A0[v0].unk_00.unk_0C != NULL) { + if (param0->unk_18C.unk_A0[v0].unk_00.pixels != NULL) { BGL_DeleteWindow(¶m0->unk_18C.unk_A0[v0].unk_00); } } for (v0 = 0; v0 < (1 + 2); v0++) { - if (param0->unk_18C.unk_F0[v0].unk_00.unk_0C != NULL) { + if (param0->unk_18C.unk_F0[v0].unk_00.pixels != NULL) { BGL_DeleteWindow(¶m0->unk_18C.unk_F0[v0].unk_00); } } @@ -1502,7 +1502,7 @@ static void ov17_02240BF4(UnkStruct_ov17_0223F7E4 *param0, const Strbuf *param1, param3->unk_12 = v0; param3->unk_10 = v1; - if (param3->unk_00.unk_0C != NULL) { + if (param3->unk_00.pixels != NULL) { BGL_DeleteWindow(¶m3->unk_00); } diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c index b741df8196..96444e7665 100644 --- a/src/overlay019/ov19_021D79F8.c +++ b/src/overlay019/ov19_021D79F8.c @@ -213,10 +213,10 @@ static void ov19_021D7C58(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_ if (v2) { u32 v3, v4; - v2->unk_00 = param0->unk_58F4; - v2->unk_07 = 21; - v2->unk_08 = 4; - v2->unk_0C = v1->pRawData; + v2->bgConfig = param0->unk_58F4; + v2->width = 21; + v2->height = 4; + v2->pixels = v1->pRawData; v4 = Font_CalcStrbufWidth(FONT_SYSTEM, param1->unk_04, 0); v3 = 84 - (v4 / 2); diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c index 302f578b9a..03f7602a1a 100644 --- a/src/overlay019/ov19_021DB2FC.c +++ b/src/overlay019/ov19_021DB2FC.c @@ -107,7 +107,7 @@ void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 *param0) void ov19_021DB448(UnkStruct_ov19_021DB6F0 *param0, u32 param1) { sub_0201A9F4(¶m0->unk_18[0]); - ov19_021DB4B4(param0->unk_00, param0->unk_18[0].unk_04, param0->unk_18[0].unk_05, param0->unk_18[0].unk_06, param0->unk_18[0].unk_07, param0->unk_18[0].unk_08); + ov19_021DB4B4(param0->unk_00, param0->unk_18[0].bgLayer, param0->unk_18[0].tilemapLeft, param0->unk_18[0].tilemapTop, param0->unk_18[0].width, param0->unk_18[0].height); BGL_FillWindow(¶m0->unk_18[0], 15); MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_30); StringTemplate_Format(param0->unk_2C, param0->unk_34, param0->unk_30); @@ -310,11 +310,11 @@ static void ov19_021DB84C(BgConfig *param0, Window *param1) u16 *v0; u32 v1, v2, v3, v4; - v0 = sub_02019FE4(param0, param1->unk_04); - v0 += (((param1->unk_06 - 1) * 32) + (param1->unk_05 - 1)); + v0 = sub_02019FE4(param0, param1->bgLayer); + v0 += (((param1->tilemapTop - 1) * 32) + (param1->tilemapLeft - 1)); - for (v2 = 0; v2 < (param1->unk_08 + 2); v2++) { - for (v1 = 0; v1 < (param1->unk_07 + 2); v1++) { + for (v2 = 0; v2 < (param1->height + 2); v2++) { + for (v1 = 0; v1 < (param1->width + 2); v1++) { v0[v1] = 0x0; } @@ -327,11 +327,11 @@ static void ov19_021DB898(BgConfig *param0, Window *param1) u16 *v0; u32 v1, v2, v3, v4; - v0 = sub_02019FE4(param0, param1->unk_04); - v0 += (((param1->unk_06 - 1) * 32) + (param1->unk_05 - 2)); + v0 = sub_02019FE4(param0, param1->bgLayer); + v0 += (((param1->tilemapTop - 1) * 32) + (param1->tilemapLeft - 2)); - for (v2 = 0; v2 < (param1->unk_08 + 2); v2++) { - for (v1 = 0; v1 < (param1->unk_07 + 5); v1++) { + for (v2 = 0; v2 < (param1->height + 2); v2++) { + for (v1 = 0; v1 < (param1->width + 5); v1++) { v0[v1] = 0x0; } diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c index e18162f819..cd8d5ce2b6 100644 --- a/src/overlay019/ov19_021DEC04.c +++ b/src/overlay019/ov19_021DEC04.c @@ -264,7 +264,7 @@ static void ov19_021DEFC8(UnkStruct_ov19_021DEC04 *param0) int v1; for (v1 = 0; v1 < 7; v1++) { - param0->unk_78[v1].unk_0C = NULL; + param0->unk_78[v1].pixels = NULL; } for (v1 = 0; v1 < NELEMS(v0); v1++) { @@ -288,7 +288,7 @@ static void ov19_021DF03C(UnkStruct_ov19_021DEC04 *param0) int v0; for (v0 = 0; v0 < 7; v0++) { - if (param0->unk_78[v0].unk_0C) { + if (param0->unk_78[v0].pixels) { BGL_DeleteWindow(&(param0->unk_78[v0])); } } @@ -356,10 +356,10 @@ static void ov19_021DF140(UnkStruct_ov19_021DEC04 *param0) int v0; for (v0 = 3; v0 <= 4; v0++) { - if (param0->unk_78[v0].unk_0C) { + if (param0->unk_78[v0].pixels) { sub_0201AA3C(&(param0->unk_78[v0])); BGL_DeleteWindow(&(param0->unk_78[v0])); - param0->unk_78[v0].unk_0C = NULL; + param0->unk_78[v0].pixels = NULL; } } } @@ -443,17 +443,17 @@ static void ov19_021DF2A8(UnkStruct_ov19_021DEC04 *param0) int v0; for (v0 = 5; v0 <= 6; v0++) { - if (param0->unk_78[v0].unk_0C) { + if (param0->unk_78[v0].pixels) { sub_0201AA3C(&(param0->unk_78[v0])); BGL_DeleteWindow(&(param0->unk_78[v0])); - param0->unk_78[v0].unk_0C = NULL; + param0->unk_78[v0].pixels = NULL; } } } static inline u32 inline_ov19_021DF3AC(Window *param0, u32 param1, const Strbuf *param2) { - return ((param0->unk_07 * 8) - Font_CalcStrbufWidth(param1, param2, 0)) / 2; + return ((param0->width * 8) - Font_CalcStrbufWidth(param1, param2, 0)) / 2; } static void ov19_021DF2E0(UnkStruct_ov19_021DEC04 *param0) diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c index 92f8d84abc..e9981b34b2 100644 --- a/src/overlay020/ov20_021D40E8.c +++ b/src/overlay020/ov20_021D40E8.c @@ -329,7 +329,7 @@ static void ov20_021D4658(UnkStruct_ov20_021D4210 *param0, u32 param1, u32 param BGL_FillWindow(¶m0->unk_20, 0); Text_AddPrinterWithParamsAndColor(¶m0->unk_20, FONT_SYSTEM, param0->unk_3C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201ADDC(¶m0->unk_10, param0->unk_20.unk_0C, 0, 0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, param2, 12 * 8, v0); - sub_0201ADDC(¶m0->unk_10, param0->unk_20.unk_0C, 0, v0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, 0, 12 * 8, (2 * 8) - v0); + sub_0201ADDC(¶m0->unk_10, param0->unk_20.pixels, 0, 0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, param2, 12 * 8, v0); + sub_0201ADDC(¶m0->unk_10, param0->unk_20.pixels, 0, v0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, 0, 12 * 8, (2 * 8) - v0); } } diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c index 34d298e339..7f99dbddf7 100644 --- a/src/overlay020/ov20_021D4728.c +++ b/src/overlay020/ov20_021D4728.c @@ -150,13 +150,13 @@ static void ov20_021D48C4(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) Window v4; Window_Init(&v4); - v4.unk_00 = param0->unk_0C; - v4.unk_07 = 11; - v4.unk_08 = 57; - v4.unk_0A_15 = 0; - v4.unk_0C = v3->pRawData; + v4.bgConfig = param0->unk_0C; + v4.width = 11; + v4.height = 57; + v4.colorMode = 0; + v4.pixels = v3->pRawData; ov20_021D498C(&v4, param0->unk_0C, v0, 0); - v4.unk_0C = (u8 *)(v3->pRawData) + (11 * 7 * 4 * 0x20); + v4.pixels = (u8 *)(v3->pRawData) + (11 * 7 * 4 * 0x20); ov20_021D498C(&v4, param0->unk_0C, v1, 0); DC_FlushRange(v3->pRawData, v3->szByte); sub_0201958C(param0->unk_0C, 4, v3->pRawData, v3->szByte, 0); diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c index ae9e0b6833..01957dbe3f 100644 --- a/src/overlay023/ov23_0224F294.c +++ b/src/overlay023/ov23_0224F294.c @@ -685,7 +685,7 @@ void ov23_0224FB7C(UnkStruct_ov23_02250CD4 *param0) if (BGL_WindowAdded(¶m0->unk_10)) { Window_Clear(¶m0->unk_10, 1); - sub_0201C3C0(param0->unk_10.unk_00, param0->unk_10.unk_04); + sub_0201C3C0(param0->unk_10.bgConfig, param0->unk_10.bgLayer); BGL_DeleteWindow(¶m0->unk_10); sub_02013A3C(param0->unk_40); ov23_02252DF4(param0); @@ -767,7 +767,7 @@ static void ov23_0224FCF4(UnkStruct_ov23_02250CD4 *param0) { if (param0->unk_50) { sub_02001384(param0->unk_50, NULL, NULL); - sub_0201C3C0(param0->unk_20.unk_00, param0->unk_20.unk_04); + sub_0201C3C0(param0->unk_20.bgConfig, param0->unk_20.bgLayer); sub_02013A3C(param0->unk_44); param0->unk_50 = NULL; diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c index a36294cb6d..da8aa5faf8 100644 --- a/src/overlay023/ov23_022542CC.c +++ b/src/overlay023/ov23_022542CC.c @@ -252,7 +252,7 @@ static void ov23_0225451C(UnkStruct_ov23_022542D8 *param0) Window_Clear(¶m0->unk_14, 1); sub_02001384(param0->unk_28, param0->unk_30, param0->unk_34); Window_Clear(¶m0->unk_04, 1); - sub_0201C3C0(param0->unk_04.unk_00, param0->unk_04.unk_04); + sub_0201C3C0(param0->unk_04.bgConfig, param0->unk_04.bgLayer); BGL_DeleteWindow(¶m0->unk_04); BGL_DeleteWindow(¶m0->unk_14); sub_02013A3C(param0->unk_24); @@ -505,7 +505,7 @@ static void ov23_02254958(UnkStruct_ov23_02254594 *param0) ov23_02248EF8(param0->unk_2C, param0->unk_38, param0->unk_3C); Window_Clear(¶m0->unk_08, 1); - sub_0201C3C0(param0->unk_08.unk_00, param0->unk_08.unk_04); + sub_0201C3C0(param0->unk_08.bgConfig, param0->unk_08.bgLayer); BGL_DeleteWindow(¶m0->unk_08); BGL_DeleteWindow(¶m0->unk_18); sub_02013A3C(param0->unk_28); diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c index db67465c1e..b135c1fd33 100644 --- a/src/overlay029/ov29_022566C8.c +++ b/src/overlay029/ov29_022566C8.c @@ -75,7 +75,7 @@ static BOOL ov29_02256728(UnkStruct_ov29_022566C8 *param0) if (param0->unk_70) { sub_0201A8D4(param0->unk_04, param0->unk_70, &v0); - if (sub_02099DD0(param0->unk_00->unk_16E8, param0->unk_70->unk_0C, (20 * 19 * 0x20)) == 0) { + if (sub_02099DD0(param0->unk_00->unk_16E8, param0->unk_70->pixels, (20 * 19 * 0x20)) == 0) { BGL_FillWindow(param0->unk_70, 0x4); } @@ -91,7 +91,7 @@ void ov29_02256770(UnkStruct_ov29_022566C8 *param0) GF_ASSERT(GF_heap_c_dummy_return_true(7)); if (param0->unk_70) { - sub_02099DA8(param0->unk_00->unk_16E8, param0->unk_70->unk_0C, (20 * 19 * 0x20)); + sub_02099DA8(param0->unk_00->unk_16E8, param0->unk_70->pixels, (20 * 19 * 0x20)); BGL_DeleteWindow(param0->unk_70); Heap_FreeToHeap(param0->unk_70); } @@ -271,13 +271,13 @@ static void ov29_022569DC(SysTask *param0, void *param1) } BGL_WindowColor(v2->unk_70, 0x4, v0, v1, v3, v4); - ov29_02256968((u8 *)v2->unk_70->unk_0C, v0, v1, v3, v4); + ov29_02256968((u8 *)v2->unk_70->pixels, v0, v1, v3, v4); } else { v0 = v2->unk_00->unk_04 * 2; v1 = v2->unk_00->unk_08 * 2; BGL_WindowColor(v2->unk_70, 0x1, v0, v1, 2, 2); - ov29_02256968((u8 *)v2->unk_70->unk_0C, v0, v1, 2, 2); + ov29_02256968((u8 *)v2->unk_70->pixels, v0, v1, 2, 2); } ov29_022567F0(param1); diff --git a/src/overlay032/ov32_02256470.c b/src/overlay032/ov32_02256470.c index 6afc19cc76..e250b83220 100644 --- a/src/overlay032/ov32_02256470.c +++ b/src/overlay032/ov32_02256470.c @@ -229,16 +229,16 @@ static void ov32_02256648(UnkStruct_ov32_02256470 *param0, const UnkStruct_ov32_ static void ov32_022566E0(Window *param0, UnkStruct_ov32_02256470 *param1) { - sub_02019CB8(param1->unk_04, 6, 1, param0->unk_05 - 1, param0->unk_06 - 1, 1, 1, 0); - sub_02019CB8(param1->unk_04, 6, 2, param0->unk_05, param0->unk_06 - 1, param0->unk_07, 1, 0); - sub_02019CB8(param1->unk_04, 6, 1025, param0->unk_05 + param0->unk_07, param0->unk_06 - 1, 1, 1, 0); + sub_02019CB8(param1->unk_04, 6, 1, param0->tilemapLeft - 1, param0->tilemapTop - 1, 1, 1, 0); + sub_02019CB8(param1->unk_04, 6, 2, param0->tilemapLeft, param0->tilemapTop - 1, param0->width, 1, 0); + sub_02019CB8(param1->unk_04, 6, 1025, param0->tilemapLeft + param0->width, param0->tilemapTop - 1, 1, 1, 0); - sub_02019CB8(param1->unk_04, 6, 6, param0->unk_05 - 1, param0->unk_06, 1, param0->unk_08, 0); - sub_02019CB8(param1->unk_04, 6, 1030, param0->unk_05 + param0->unk_07, param0->unk_06, 1, param0->unk_08, 0); + sub_02019CB8(param1->unk_04, 6, 6, param0->tilemapLeft - 1, param0->tilemapTop, 1, param0->height, 0); + sub_02019CB8(param1->unk_04, 6, 1030, param0->tilemapLeft + param0->width, param0->tilemapTop, 1, param0->height, 0); - sub_02019CB8(param1->unk_04, 6, 2049, param0->unk_05 - 1, param0->unk_06 + param0->unk_08, 1, 1, 0); - sub_02019CB8(param1->unk_04, 6, 2050, param0->unk_05, param0->unk_06 + param0->unk_08, param0->unk_07, 1, 0); - sub_02019CB8(param1->unk_04, 6, 3073, param0->unk_05 + param0->unk_07, param0->unk_06 + param0->unk_08, 1, 1, 0); + sub_02019CB8(param1->unk_04, 6, 2049, param0->tilemapLeft - 1, param0->tilemapTop + param0->height, 1, 1, 0); + sub_02019CB8(param1->unk_04, 6, 2050, param0->tilemapLeft, param0->tilemapTop + param0->height, param0->width, 1, 0); + sub_02019CB8(param1->unk_04, 6, 3073, param0->tilemapLeft + param0->width, param0->tilemapTop + param0->height, 1, 1, 0); } static void ov32_0225682C(Window *param0, u32 param1) diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c index 8226221adb..c023869efc 100644 --- a/src/overlay041/ov41_022567B0.c +++ b/src/overlay041/ov41_022567B0.c @@ -251,7 +251,7 @@ static void ov41_022569BC(UnkStruct_ov41_022567B0 *param0, u32 param1) sub_0201A8D4(param0->unk_04, ¶m0->unk_48, &v0); - if (sub_02099DD0(param0->unk_00->unk_08, param0->unk_48.unk_0C, (20 * 19 * 0x20)) == 0) { + if (sub_02099DD0(param0->unk_00->unk_08, param0->unk_48.pixels, (20 * 19 * 0x20)) == 0) { BGL_FillWindow(¶m0->unk_48, 0x4); } @@ -269,7 +269,7 @@ static void ov41_02256A1C(SysTask *param0, void *param1) ov25_0225524C(param1); break; case 1: - sub_02099DA8(v0->unk_00->unk_08, v0->unk_48.unk_0C, (20 * 19 * 0x20)); + sub_02099DA8(v0->unk_00->unk_08, v0->unk_48.pixels, (20 * 19 * 0x20)); BGL_DeleteWindow(&v0->unk_48); sub_02019044(v0->unk_04, 6); sub_02019044(v0->unk_04, 7); @@ -297,7 +297,7 @@ static void ov41_02256A8C(SysTask *param0, void *param1) v3 = ((v1 >> 3) * 20) + (v0 >> 3); BGL_WindowColor(&v4->unk_48, 0x1, v0, v1, 2, 2); - GXS_LoadBG3Char((u8 *)(v4->unk_48.unk_0C) + (v3 * 0x20), (v4->unk_58 + v3) * 0x20, 0x20); + GXS_LoadBG3Char((u8 *)(v4->unk_48.pixels) + (v3 * 0x20), (v4->unk_58 + v3) * 0x20, 0x20); ov41_022568C8(param1); } diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index 5dddcaac4f..729a62cc17 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -479,11 +479,11 @@ static int ov61_0222C728(Window *param0, Strbuf *param1, int param2, int param3, switch (param3) { case 1: v0 = Font_CalcStrbufWidth(param5, param1, 0); - param2 = ((param0->unk_07 * 8) - v0) / 2; + param2 = ((param0->width * 8) - v0) / 2; break; case 2: v0 = Font_CalcStrbufWidth(param5, param1, 0); - param2 = (param0->unk_07 * 8) - v0; + param2 = (param0->width * 8) - v0; break; } diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 0d960ad02a..607d41155b 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -1322,7 +1322,7 @@ static void ov65_0222EAD0 (Window * param0, UnkStruct_ov65_0222E99C * param1, u1 int v0; sub_0201ADDC(param0, param1->unk_0C->pRawData, (2 * 8) * param4, 0, param1->unk_0C->W * 8, param1->unk_0C->H * 8, param2, param3, 2 * 8, 2 * 8); - v0 = ov65_0222EBAC(param0->unk_04); + v0 = ov65_0222EBAC(param0->bgLayer); sub_0201C2B4(param0, v0 + param5); } diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index 20df7d6116..c275c7a8ae 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -2506,7 +2506,7 @@ static u8 *ov69_0225E6E8(UnkStruct_ov69_0225E084 *param0, u32 param1, u32 param2 u8 *v0; GF_ASSERT(param1 < 3); - v0 = param0->unk_168[param1].unk_0C; + v0 = param0->unk_168[param1].pixels; return &v0[((27 * param2) * 32)]; } @@ -2515,7 +2515,7 @@ static u8 *ov69_0225E70C(UnkStruct_ov69_0225E084 *param0, u32 param1) { u8 *v0; - v0 = param0->unk_198.unk_0C; + v0 = param0->unk_198.pixels; return &v0[((27 * param1) * 32)]; } diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 98ca5756d2..d6a45aa1ba 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -208,7 +208,7 @@ int ov72_0223D984(OverlayManager *param0, int *param1) UnkStruct_ov72_0223DB98 *v0 = OverlayManager_Data(param0); int v1; - ov72_0223E9B4(v0->unk_5BFC, v0->unk_328.unk_0C); + ov72_0223E9B4(v0->unk_5BFC, v0->unk_328.pixels); SetMainCallback(NULL, NULL); sub_0200A4E4(v0->unk_1DC[0][0]); @@ -552,11 +552,11 @@ static void *ov72_0223E060(Window *param0, Strbuf *param1, int param2, u8 param3 int v0, v1; v1 = Font_CalcStrbufWidth(FONT_SUBSCREEN, param1, 0); - v0 = ((param0->unk_07 * 8) - v1) / 2; + v0 = ((param0->width * 8) - v1) / 2; Text_AddPrinterWithParamsAndColor(param0, param3, param1, v0, param2, TEXT_SPEED_NO_TRANSFER, param4, NULL); - return param0->unk_0C; + return param0->pixels; } static void ov72_0223E0A0(UnkStruct_ov72_0223DB98 *param0, OverlayManager *param1) diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index ebbf9d1226..2cb3fda9c7 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -1266,7 +1266,7 @@ static void ov77_021D2214(BgConfig *param0, int param1, UnkStruct_ov77_021D1568 BGL_WindowColor(¶m2->unk_22C, 0, 0, 0, 28 * 8, 2 * 8); MessageLoader_GetStrbuf(v4, 0, v5); - v6 = Font_CalcCenterAlignment(FONT_SYSTEM, v5, 1, param2->unk_22C.unk_07 * 8); + v6 = Font_CalcCenterAlignment(FONT_SYSTEM, v5, 1, param2->unk_22C.width * 8); Text_AddPrinterWithParamsColorAndSpacing(¶m2->unk_22C, FONT_SYSTEM, v5, v6, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 1, 0), 1, 0, NULL); Strbuf_Free(v5); diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c index 0ea665b35b..95bc61dcb5 100644 --- a/src/overlay088/ov88_0223E9C4.c +++ b/src/overlay088/ov88_0223E9C4.c @@ -122,7 +122,7 @@ void ov88_0223EC78(Window *param0, Strbuf *param1, int param2, u32 param3, int p int v1; v1 = Font_CalcStrbufWidth(FONT_SYSTEM, param1, 0); - v0 = ((param0->unk_07 * 8) - v1) / 2; + v0 = ((param0->width * 8) - v1) / 2; } else { v0 = param4; } diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 6b8a8ed7e6..6236157702 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -1107,7 +1107,7 @@ static void ov94_0223F9FC(Window *param0, Window *param1, MessageLoader *param2) v0 = MessageLoader_GetNewStrbuf(param2, 65); { - int v3 = Font_CalcCenterAlignment(FONT_SYSTEM, v0, 0, param0[6].unk_07 * 8); + int v3 = Font_CalcCenterAlignment(FONT_SYSTEM, v0, 0, param0[6].width * 8); ov94_02245900(¶m0[6], v0, v3, 0, 0, TEXT_COLOR(1, 2, 0)); } @@ -1116,7 +1116,7 @@ static void ov94_0223F9FC(Window *param0, Window *param1, MessageLoader *param2) v0 = MessageLoader_GetNewStrbuf(param2, 66); { - int v4 = Font_CalcCenterAlignment(FONT_SYSTEM, v0, 0, param0[7].unk_07 * 8); + int v4 = Font_CalcCenterAlignment(FONT_SYSTEM, v0, 0, param0[7].width * 8); ov94_02245900(¶m0[7], v0, v4, 0, 0, TEXT_COLOR(1, 2, 0)); } diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index ac2fb363ef..c25982a821 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -919,11 +919,11 @@ static int ov94_02245894(Window *param0, Strbuf *param1, int param2, int param3, switch (param3) { case 1: v0 = Font_CalcStrbufWidth(param5, param1, 0); - param2 = ((param0->unk_07 * 8) - v0) / 2; + param2 = ((param0->width * 8) - v0) / 2; break; case 2: v0 = Font_CalcStrbufWidth(param5, param1, 0); - param2 = (param0->unk_07 * 8) - v0; + param2 = (param0->width * 8) - v0; break; } diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index ac62c6ec84..62686fa8b5 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -1605,11 +1605,11 @@ static int ov96_0223D86C(Window *param0, Strbuf *param1, int param2, int param3, switch (param3) { case 1: v0 = Font_CalcStrbufWidth(param5, param1, 0); - param2 = ((param0->unk_07 * 8) - v0) / 2; + param2 = ((param0->width * 8) - v0) / 2; break; case 2: v0 = Font_CalcStrbufWidth(param5, param1, 0); - param2 = (param0->unk_07 * 8) - v0; + param2 = (param0->width * 8) - v0; break; } diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index a94f6780f9..4bbecf6ccf 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -906,7 +906,7 @@ static void ov97_0222BC9C(OverlayManager *param0) } for (v0 = 0; v0 < (sizeof(Unk_ov97_0223E014) / sizeof(UnkStruct_ov97_0223E014)); v0++) { - if (v1->unk_5C[v0].unk_00) { + if (v1->unk_5C[v0].bgConfig) { sub_0201ACF4(&v1->unk_5C[v0]); BGL_DeleteWindow(&v1->unk_5C[v0]); } diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index f293fab355..89ce9cf4d5 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -252,7 +252,7 @@ static void ov97_0222D34C(OverlayManager *param0) } for (v0 = 0; v0 < 3; v0++) { - if (v1->unk_28[v0].unk_00) { + if (v1->unk_28[v0].bgConfig) { sub_0201ACF4(&v1->unk_28[v0]); BGL_DeleteWindow(&v1->unk_28[v0]); } @@ -478,7 +478,7 @@ static void ov97_0222D6F8(OverlayManager *param0, int param1) v1 = &v2->unk_28[2]; - if (v1->unk_00 == NULL) { + if (v1->bgConfig == NULL) { BGL_AddWindow(v2->unk_00, v1, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); } @@ -517,7 +517,7 @@ static int ov97_0222D798(OverlayManager *param0) v0 = &v1->unk_28[2]; - if (v0->unk_00 == NULL) { + if (v0->bgConfig == NULL) { BGL_AddWindow(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); } @@ -538,7 +538,7 @@ static int ov97_0222D814(OverlayManager *param0) v0 = &v1->unk_28[2]; - if (v0->unk_00 == NULL) { + if (v0->bgConfig == NULL) { BGL_AddWindow(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); } @@ -559,7 +559,7 @@ static int ov97_0222D884(OverlayManager *param0) v0 = &v1->unk_28[2]; - if (v0->unk_00 == NULL) { + if (v0->bgConfig == NULL) { BGL_AddWindow(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); } @@ -576,7 +576,7 @@ static void ov97_0222D8F4(OverlayManager *param0) v0 = &v1->unk_28[2]; - if (v0->unk_00 == NULL) { + if (v0->bgConfig == NULL) { BGL_AddWindow(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); } @@ -677,7 +677,7 @@ static int ov97_0222DA84(OverlayManager *param0) ov97_0222D444(&v2->unk_28[0], 0); v0 = &v2->unk_28[1]; - if (v0->unk_00 == NULL) { + if (v0->bgConfig == NULL) { BGL_AddWindow(v2->unk_00, v0, 0, 15, 9, 16, 8, 0, ((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6)); } @@ -829,7 +829,7 @@ static void ov97_0222DDD0(OverlayManager *param0, int param1, u32 param2) v2[v4++] = Unk_ov97_0223E5B8[2]; - if (v1->unk_00 == NULL) { + if (v1->bgConfig == NULL) { BGL_AddWindow(v0->unk_00, v1, 0, 8, 7, 16, v4 * 2, 0, param1); } diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index be86a7bbb8..6e9b249863 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -591,7 +591,7 @@ static void ov97_02230C44(UnkStruct_ov97_02230868 *param0, int param1, int param for (v0 = 0; v0 < sizeof(Unk_ov97_0223E680) / sizeof(UnkStruct_ov97_0223E680); v0++) { if ((v4[v0].unk_00 != param2) && (v4[v0].unk_00 != 2)) { - if (param0->unk_2A68[v0].unk_00) { + if (param0->unk_2A68[v0].bgConfig) { sub_0201ACF4(¶m0->unk_2A68[v0]); BGL_DeleteWindow(¶m0->unk_2A68[v0]); } @@ -602,7 +602,7 @@ static void ov97_02230C44(UnkStruct_ov97_02230868 *param0, int param1, int param for (v0 = 0; v0 < sizeof(Unk_ov97_0223E680) / sizeof(UnkStruct_ov97_0223E680); v0++) { if (v4[v0].unk_00 == param2) { - if (param0->unk_2A68[v0].unk_00 == NULL) { + if (param0->unk_2A68[v0].bgConfig == NULL) { param0->unk_2BA8[v0] = v1; BGL_AddWindow(param0->unk_2A5C, ¶m0->unk_2A68[v0], 0, v4[v0].unk_04, v4[v0].unk_08, v4[v0].unk_0C, v4[v0].unk_10, 15, v1); } @@ -642,7 +642,7 @@ static int ov97_02230E04(UnkStruct_ov97_02230868 *param0, Window *param1, int pa u32 v1; UnkStruct_ov97_0223E680 *v2 = Unk_ov97_0223E680 + param2; - if (param1->unk_00 == NULL) { + if (param1->bgConfig == NULL) { BGL_AddWindow(param0->unk_2A5C, param1, 2, v2->unk_04, v2->unk_08, v2->unk_0C, v2->unk_10, 15, param3); } @@ -1445,18 +1445,18 @@ static int ov97_02231F38(OverlayManager *param0, int *param1) UnkStruct_ov97_02230868 *v1 = OverlayManager_Data(param0); for (v0 = 0; v0 < sizeof(Unk_ov97_0223E680) / sizeof(UnkStruct_ov97_0223E680); v0++) { - if (v1->unk_2A68[v0].unk_00) { + if (v1->unk_2A68[v0].bgConfig) { sub_0201ACF4(&v1->unk_2A68[v0]); BGL_DeleteWindow(&v1->unk_2A68[v0]); } } - if (v1->unk_2C30.unk_00) { + if (v1->unk_2C30.bgConfig) { sub_0201ACF4(&v1->unk_2C30); BGL_DeleteWindow(&v1->unk_2C30); } - if (v1->unk_2C40.unk_00) { + if (v1->unk_2C40.bgConfig) { sub_0201ACF4(&v1->unk_2C40); BGL_DeleteWindow(&v1->unk_2C40); } diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 73ecf9a373..4a74428ae5 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -426,7 +426,7 @@ static void ov97_02233DD0(UnkStruct_ov97_02234A2C *param0, UnkStruct_ov97_02233D v5 = param1->unk_44; } - if (param1->unk_00->unk_00 == NULL) { + if (param1->unk_00->bgConfig == NULL) { BGL_AddWindow(param0->unk_20, param1->unk_00, param1->unk_24, param1->unk_08, param1->unk_0C, param1->unk_10, param1->unk_14, 15, param1->unk_20); } @@ -1493,7 +1493,7 @@ static void ov97_02234F88(UnkStruct_ov97_02234A2C *param0) static void ov97_02235158(Window *param0) { - if (param0->unk_00) { + if (param0->bgConfig) { sub_0200E084(param0, 0); sub_0201ACF4(param0); BGL_DeleteWindow(param0); diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index 864cfc4d31..67fd6e73b3 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -267,7 +267,7 @@ int ov97_0223795C(BgConfig *param0, UnkStruct_ov97_02237808 *param1, int param2, { int v0; - if (param1->unk_10->unk_00 == NULL) { + if (param1->unk_10->bgConfig == NULL) { BGL_AddWindow(param0, param1->unk_10, param1->unk_2C, param2, param3, param1->unk_18, param1->unk_1C, param1->unk_30, param1->unk_28); v0 = ov97_02237870(param1, param4); } else { diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index 195316cdd2..f5066de923 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -2465,12 +2465,12 @@ static int ov98_02249894 (Window * param0, Strbuf *param1, int param2, int param switch (param3) { case 1: v0 = Font_CalcStrbufWidth(param5, param1, 0); - param2 = ((param0->unk_07 * 8) - v0) / 2; + param2 = ((param0->width * 8) - v0) / 2; break; case 2: v0 = Font_CalcStrbufWidth(param5, param1, 0); - param2 = (param0->unk_07 * 8) - v0; + param2 = (param0->width * 8) - v0; break; } diff --git a/src/overlay099/ov99_021D3E78.c b/src/overlay099/ov99_021D3E78.c index 7995a77bc4..2719c3972a 100644 --- a/src/overlay099/ov99_021D3E78.c +++ b/src/overlay099/ov99_021D3E78.c @@ -349,7 +349,7 @@ BOOL ov99_021D3F6C(UnkStruct_ov99_021D3E78 *param0, int param1) Text_AddPrinterWithParamsAndColor(param0->unk_28, FONT_SYSTEM, param0->unk_30, v1, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); v2 = 16 - (v2 - (256 - 16)); - sub_0201ADDC(param0->unk_24, param0->unk_28->unk_0C, 0, v2, param0->unk_28->unk_07 * 8, param0->unk_28->unk_08 * 8, 0, 0, 32 * 8, (16 - v2)); + sub_0201ADDC(param0->unk_24, param0->unk_28->pixels, 0, v2, param0->unk_28->width * 8, param0->unk_28->height * 8, 0, 0, 32 * 8, (16 - v2)); } param0->unk_18 = 1; diff --git a/src/overlay105/ov105_02246214.c b/src/overlay105/ov105_02246214.c index 1cb804dcb8..3f4131c001 100644 --- a/src/overlay105/ov105_02246214.c +++ b/src/overlay105/ov105_02246214.c @@ -58,7 +58,7 @@ void ov105_02246260(BgConfig *param0, Window *param1) void ov105_0224628C(Window *param0, int param1) { - sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 93); + sub_0200DD0C(param0->bgConfig, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 93); BGL_FillWindow(param0, 15); sub_0200E060(param0, 1, ((1024 - 9) - (18 + 12)), 10); diff --git a/src/overlay106/ov106_022436E0.c b/src/overlay106/ov106_022436E0.c index a06fed2757..667fa4859c 100644 --- a/src/overlay106/ov106_022436E0.c +++ b/src/overlay106/ov106_022436E0.c @@ -52,7 +52,7 @@ void ov106_0224372C(BgConfig *param0, Window *param1) void ov106_02243758(Window *param0, int param1) { - sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 98); + sub_0200DD0C(param0->bgConfig, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 98); BGL_FillWindow(param0, 15); sub_0200E060(param0, 0, ((1024 - 9) - (18 + 12)), 10); diff --git a/src/overlay107/ov107_02249D14.c b/src/overlay107/ov107_02249D14.c index 70c61e0653..3e0e1ab67b 100644 --- a/src/overlay107/ov107_02249D14.c +++ b/src/overlay107/ov107_02249D14.c @@ -93,7 +93,7 @@ void ov107_02249D84(BgConfig *param0, Window *param1) void ov107_02249DBC(Window *param0, int param1) { - sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 100); + sub_0200DD0C(param0->bgConfig, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 100); BGL_FillWindow(param0, 15); sub_0200E060(param0, 1, ((1024 - 9) - (18 + 12)), 10); sub_0201A9A4(param0); diff --git a/src/overlay111/ov111_021D3548.c b/src/overlay111/ov111_021D3548.c index fd8e0ced25..7da96912fe 100644 --- a/src/overlay111/ov111_021D3548.c +++ b/src/overlay111/ov111_021D3548.c @@ -64,7 +64,7 @@ void ov111_021D3594(BgConfig *param0, Window *param1) void ov111_021D35C0(Window *param0, int param1) { - sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 115); + sub_0200DD0C(param0->bgConfig, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 115); BGL_FillWindow(param0, 15); sub_0200E060(param0, 0, ((1024 - 9) - (18 + 12)), 10); diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index c1ab12360f..fb6660b741 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -1109,7 +1109,7 @@ static void ov112_0225D4F8(const UnkStruct_ov112_0225D44C *param0, Window *param } BGL_WindowColor(param1, 0, 0, 0, 255, 2 * 8); - sub_0201AE08(param1, param0->unk_0C.unk_0C, v2, 0, 180 * 8, 2 * 8, v1, 0, v3, 2 * 8, 15); + sub_0201AE08(param1, param0->unk_0C.pixels, v2, 0, 180 * 8, 2 * 8, v1, 0, v3, 2 * 8, 15); sub_0201A9A4(param1); } diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index e94f85d42c..8773d83fcc 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -1469,7 +1469,7 @@ static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_022 sub_0201C2AC(&v5, v3); sub_0201C2B0(&v5, v4); - v5.unk_0A_0 = v6; + v5.baseTile = v6; v9 = Font_CalcStrbufWidth(FONT_SYSTEM, v7, 0); v10 = ((8 * 8) - v9) / 2; Text_AddPrinterWithParamsAndColor(&v5, FONT_SYSTEM, v7, v10, 0, TEXT_SPEED_INSTANT, v8, NULL); diff --git a/src/render_text.c b/src/render_text.c index c8fa6b72e4..682649ffaa 100644 --- a/src/render_text.c +++ b/src/render_text.c @@ -313,7 +313,7 @@ void TextPrinter_DrawScrollArrow(TextPrinter *printer) u8 width = sub_0201C294(printer->template.window); u16 baseTile = sScrollArrowBaseTile; - sub_02019CB8(printer->template.window->unk_00, + sub_02019CB8(printer->template.window->bgConfig, bgID, baseTile + 18 + (sScrollArrowTileOffsets[substruct->scrollArrowYPosIdx] * 4), x + width + 1, @@ -321,7 +321,7 @@ void TextPrinter_DrawScrollArrow(TextPrinter *printer) 1, 1, 16); - sub_02019CB8(printer->template.window->unk_00, + sub_02019CB8(printer->template.window->bgConfig, bgID, baseTile + 19 + (sScrollArrowTileOffsets[substruct->scrollArrowYPosIdx] * 4), x + width + 2, @@ -329,7 +329,7 @@ void TextPrinter_DrawScrollArrow(TextPrinter *printer) 1, 1, 16); - sub_02019CB8(printer->template.window->unk_00, + sub_02019CB8(printer->template.window->bgConfig, bgID, baseTile + 20 + (sScrollArrowTileOffsets[substruct->scrollArrowYPosIdx] * 4), x + width + 1, @@ -337,7 +337,7 @@ void TextPrinter_DrawScrollArrow(TextPrinter *printer) 1, 1, 16); - sub_02019CB8(printer->template.window->unk_00, + sub_02019CB8(printer->template.window->bgConfig, bgID, baseTile + 21 + (sScrollArrowTileOffsets[substruct->scrollArrowYPosIdx] * 4), x + width + 2, @@ -346,7 +346,7 @@ void TextPrinter_DrawScrollArrow(TextPrinter *printer) 1, 16); - sub_02019448(printer->template.window->unk_00, bgID); + sub_02019448(printer->template.window->bgConfig, bgID); substruct->scrollArrowDelay = 8; substruct->scrollArrowYPosIdx++; } @@ -359,7 +359,7 @@ void TextPrinter_ClearScrollArrow(TextPrinter *printer) u8 width = sub_0201C294(printer->template.window); u16 baseTile = sScrollArrowBaseTile; - sub_02019CB8(printer->template.window->unk_00, + sub_02019CB8(printer->template.window->bgConfig, bgID, baseTile + 10, x + width + 1, @@ -367,7 +367,7 @@ void TextPrinter_ClearScrollArrow(TextPrinter *printer) 1, 2, 16); - sub_02019CB8(printer->template.window->unk_00, + sub_02019CB8(printer->template.window->bgConfig, bgID, baseTile + 11, x + width + 2, @@ -375,7 +375,7 @@ void TextPrinter_ClearScrollArrow(TextPrinter *printer) 1, 2, 16); - sub_02019448(printer->template.window->unk_00, bgID); + sub_02019448(printer->template.window->bgConfig, bgID); } static BOOL TextPrinter_Continue(TextPrinter *printer) diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c index fb12478cfd..7faf0d4d68 100644 --- a/src/unk_0200DA60.c +++ b/src/unk_0200DA60.c @@ -134,7 +134,7 @@ void Window_Show(Window *param0, u8 param1, u16 param2, u8 param3) { u8 v0 = sub_0201C290(param0); - sub_0200DB10(param0->unk_00, v0, sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param3, param2); + sub_0200DB10(param0->bgConfig, v0, sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param3, param2); if (param1 == 0) { sub_0201A954(param0); @@ -145,7 +145,7 @@ void Window_Clear(Window *param0, u8 param1) { u8 v0 = sub_0201C290(param0); - sub_02019CB8(param0->unk_00, v0, 0, sub_0201C29C(param0) - 1, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 2, sub_0201C298(param0) + 2, 0); + sub_02019CB8(param0->bgConfig, v0, 0, sub_0201C29C(param0) - 1, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 2, sub_0201C298(param0) + 2, 0); if (param1 == 0) { sub_0201ACF4(param0); @@ -196,7 +196,7 @@ static void sub_0200DD7C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 p void sub_0200E010(Window *param0, u32 param1, u32 param2) { - sub_0200DD7C(param0->unk_00, sub_0201C290(param0), sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param2, param1); + sub_0200DD7C(param0->bgConfig, sub_0201C290(param0), sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param2, param1); } void sub_0200E060(Window *param0, u8 param1, u16 param2, u8 param3) @@ -214,7 +214,7 @@ void sub_0200E084(Window *param0, u8 param1) { u8 v0 = sub_0201C290(param0); - sub_02019CB8(param0->unk_00, v0, 0, sub_0201C29C(param0) - 2, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 5, sub_0201C298(param0) + 2, 0); + sub_02019CB8(param0->bgConfig, v0, 0, sub_0201C29C(param0) - 2, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 5, sub_0201C298(param0) + 2, 0); if (param1 == 0) { sub_0201ACF4(param0); @@ -247,7 +247,7 @@ static void sub_0200E130(Window *param0, u16 param1) u8 v5; u8 v6; - v0 = sub_02018364(param0->unk_00); + v0 = sub_02018364(param0->bgConfig); v5 = sub_0201C290(param0); v1 = Heap_AllocFromHeap(v0, (0x20 * 4 * 3)); v2 = sub_02019F28(v5); @@ -267,7 +267,7 @@ static void sub_0200E130(Window *param0, u16 param1) } sub_0200E0EC(v3, 4, 0, 12, 16 * 3, v1, 12, 16 * 3, 1, 0, 12, 16 * 3); - sub_0201958C(param0->unk_00, v5, v1, (0x20 * 4 * 3), param1 + 18); + sub_0201958C(param0->bgConfig, v5, v1, (0x20 * 4 * 3), param1 + 18); TextPrinter_SetScrollArrowBaseTile(param1); Heap_FreeToHeap(v4); Heap_FreeToHeap(v1); @@ -374,7 +374,7 @@ static void sub_0200E61C(Window *param0, u16 param1, u8 param2) for (v0 = 0; v0 < 4; v0++) { for (v1 = 0; v1 < 6; v1++) { - sub_02019CB8(param0->unk_00, v4, param1 + v0 * 6 + v1, v2 + v1, v3 + v0, 1, 1, param2); + sub_02019CB8(param0->bgConfig, v4, param1 + v0 * 6 + v1, v2 + v1, v3 + v0, 1, 1, param2); } } } @@ -384,10 +384,10 @@ void sub_0200E69C(Window *param0, u8 param1, u16 param2, u8 param3, u8 param4) u8 v0 = sub_0201C290(param0); if ((param4 == 0) || (param4 == 1)) { - sub_0200E354(param0->unk_00, v0, sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param3, param2); + sub_0200E354(param0->bgConfig, v0, sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param3, param2); sub_0200E61C(param0, param2 + (18 + 12), param3); } else { - sub_0200DD7C(param0->unk_00, v0, sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param3, param2); + sub_0200DD7C(param0->bgConfig, v0, sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param3, param2); } if (param1 == 0) { @@ -402,9 +402,9 @@ void sub_0200E744(Window *param0, u8 param1, u8 param2) u8 v0 = sub_0201C290(param0); if ((param1 == 0) || (param1 == 1)) { - sub_02019CB8(param0->unk_00, v0, 0, sub_0201C29C(param0) - 9, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 11, sub_0201C298(param0) + 2, 0); + sub_02019CB8(param0->bgConfig, v0, 0, sub_0201C29C(param0) - 9, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 11, sub_0201C298(param0) + 2, 0); } else { - sub_02019CB8(param0->unk_00, v0, 0, sub_0201C29C(param0) - 2, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 5, sub_0201C298(param0) + 2, 0); + sub_02019CB8(param0->bgConfig, v0, 0, sub_0201C29C(param0) - 2, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 5, sub_0201C298(param0) + 2, 0); } if (param2 == 0) { @@ -423,7 +423,7 @@ void *sub_0200E7FC(Window *param0, u32 param1) u8 v6; u8 v7; - v1 = sub_02018364(param0->unk_00); + v1 = sub_02018364(param0->bgConfig); v6 = sub_0201C290(param0); v2 = sub_02019F28(v6); v0 = Heap_AllocFromHeap(v1, sizeof(UnkStruct_0200E924)); @@ -475,28 +475,28 @@ static void sub_0200E924(UnkStruct_0200E924 *param0, u32 param1) v3 = sub_0201C294(param0->unk_00); if (param1 == 2) { - sub_0201958C(param0->unk_00->unk_00, v0, param0->unk_404, 0x20 * 4, param0->unk_484 + 18); - sub_02019CB8(param0->unk_00->unk_00, v0, param0->unk_484 + 10, v1 + v3 + 1, v2 + 2, 1, 1, 16); - sub_02019CB8(param0->unk_00->unk_00, v0, param0->unk_484 + 11, v1 + v3 + 2, v2 + 2, 1, 1, 16); - sub_02019CB8(param0->unk_00->unk_00, v0, param0->unk_484 + 10, v1 + v3 + 1, v2 + 3, 1, 1, 16); - sub_02019CB8(param0->unk_00->unk_00, v0, param0->unk_484 + 11, v1 + v3 + 2, v2 + 3, 1, 1, 16); - sub_02019448(param0->unk_00->unk_00, v0); + sub_0201958C(param0->unk_00->bgConfig, v0, param0->unk_404, 0x20 * 4, param0->unk_484 + 18); + sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 10, v1 + v3 + 1, v2 + 2, 1, 1, 16); + sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 11, v1 + v3 + 2, v2 + 2, 1, 1, 16); + sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 10, v1 + v3 + 1, v2 + 3, 1, 1, 16); + sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 11, v1 + v3 + 2, v2 + 3, 1, 1, 16); + sub_02019448(param0->unk_00->bgConfig, v0); return; } sub_0201958C( - param0->unk_00->unk_00, v0, ¶m0->unk_04[0x20 * 4 * param0->unk_487_0], 0x20 * 4, param0->unk_484 + 18); + param0->unk_00->bgConfig, v0, ¶m0->unk_04[0x20 * 4 * param0->unk_487_0], 0x20 * 4, param0->unk_484 + 18); if (param1 == 0) { return; } - sub_02019CB8(param0->unk_00->unk_00, v0, param0->unk_484 + 18, v1 + v3 + 1, v2 + 2, 1, 1, 16); - sub_02019CB8(param0->unk_00->unk_00, v0, param0->unk_484 + 19, v1 + v3 + 2, v2 + 2, 1, 1, 16); - sub_02019CB8(param0->unk_00->unk_00, v0, param0->unk_484 + 20, v1 + v3 + 1, v2 + 3, 1, 1, 16); - sub_02019CB8(param0->unk_00->unk_00, v0, param0->unk_484 + 21, v1 + v3 + 2, v2 + 3, 1, 1, 16); - sub_02019448(param0->unk_00->unk_00, v0); + sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 18, v1 + v3 + 1, v2 + 2, 1, 1, 16); + sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 19, v1 + v3 + 2, v2 + 2, 1, 1, 16); + sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 20, v1 + v3 + 1, v2 + 3, 1, 1, 16); + sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 21, v1 + v3 + 2, v2 + 3, 1, 1, 16); + sub_02019448(param0->unk_00->bgConfig, v0); } static void sub_0200EB20(SysTask *param0, void *param1) diff --git a/src/unk_02012744.c b/src/unk_02012744.c index 2ac1b85b24..4a40a4062b 100644 --- a/src/unk_02012744.c +++ b/src/unk_02012744.c @@ -148,7 +148,7 @@ FontOAM *sub_020127E8(const UnkStruct_020127E8 *param0) v1.unk_0C = &v1; v1.unk_10 = &v1; - v2 = sub_02012DE4(param0->unk_04->unk_07, param0->unk_04->unk_08, param0->unk_2C, &v1); + v2 = sub_02012DE4(param0->unk_04->width, param0->unk_04->height, param0->unk_2C, &v1); v3 = Heap_AllocFromHeapAtEnd(param0->unk_2C, sizeof(NNSG2dImageProxy) * v2); v0->unk_00 = Heap_AllocFromHeap(param0->unk_2C, sizeof(UnkStruct_02012CE0_sub1) * v2); @@ -180,7 +180,7 @@ int sub_02012898(const Window *param0, int param1, int param2) v0.unk_0C = &v0; v0.unk_10 = &v0; - sub_02012DE4(param0->unk_07, param0->unk_08, param2, &v0); + sub_02012DE4(param0->width, param0->height, param2, &v0); v1 = sub_02013034(&v0, param1); sub_020131B8(&v0); @@ -341,7 +341,7 @@ UnkStruct_02012B20 *sub_02012B20(const Window *param0, int param1) v0->unk_00.unk_0C = &v0->unk_00; v0->unk_00.unk_10 = &v0->unk_00; - v0->unk_14 = sub_02012DE4(param0->unk_07, param0->unk_08, param1, &v0->unk_00); + v0->unk_14 = sub_02012DE4(param0->width, param0->height, param1, &v0->unk_00); return v0; } @@ -422,17 +422,17 @@ void sub_02012C60(const Window *param0, int param1, int param2, int param3, int int v1; int v2; - GF_ASSERT(param0->unk_07 >= (param1 + param3)); - GF_ASSERT(param0->unk_08 >= (param2 + param4)); + GF_ASSERT(param0->width >= (param1 + param3)); + GF_ASSERT(param0->height >= (param2 + param4)); for (v0 = 0; v0 < param2; v0++) { v1 = v0 * param1; v1 *= 32; - v2 = ((v0 + param4) * param0->unk_07); + v2 = ((v0 + param4) * param0->width); v2 += param3; v2 *= 32; - memcpy(param5 + v1, (char *)(param0->unk_0C) + v2, 32 * param1); + memcpy(param5 + v1, (char *)(param0->pixels) + v2, 32 * param1); } } diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index 30eb85be25..b9c3c357bb 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -190,7 +190,7 @@ static void sub_02052AA4(UnkStruct_02052AA4 *param0, u16 param1, u8 param2, u8 p { u32 v2 = Font_CalcMaxLineWidth(FONT_SYSTEM, v1, 0); - param2 = (u8)(param0->unk_0C.unk_07 * 8 - v2) / 2 - 4; + param2 = (u8)(param0->unk_0C.width * 8 - v2) / 2 - 4; } Text_AddPrinterWithParamsAndColor(¶m0->unk_0C, FONT_SYSTEM, v1, param2, param3, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 2, 0), NULL); diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 66a0645833..e372605bc4 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -890,7 +890,7 @@ static void sub_0205ADF8(UnkStruct_0205A0D8 *param0, int param1) MessageLoader_Free(v4); } - BGL_WindowColor(v0, 15, 0, 0, 16, v0->unk_08 * 8); + BGL_WindowColor(v0, 15, 0, 0, 16, v0->height * 8); ColoredArrow_Print(param0->unk_78, ¶m0->unk_54, 0, param1 * 16); Window_Show(¶m0->unk_54, 0, 1, 11); @@ -920,7 +920,7 @@ static void sub_0205AF18(UnkStruct_0205A0D8 *param0, int param1) param0->unk_7C = v0; param0->unk_81 = param1; - BGL_WindowColor(v0, 15, 0, 0, 16, v0->unk_08 * 8); + BGL_WindowColor(v0, 15, 0, 0, 16, v0->height * 8); ColoredArrow_Print(param0->unk_78, param0->unk_7C, 0, param1 * 16); Window_Show(param0->unk_7C, 0, 1, 11); } @@ -957,7 +957,7 @@ static int sub_0205AFE4(UnkStruct_0205A0D8 *param0) } while (0); Sound_PlayEffect(1500); - BGL_WindowColor(param0->unk_7C, 15, 0, 0, 16, param0->unk_7C->unk_08 * 8); + BGL_WindowColor(param0->unk_7C, 15, 0, 0, 16, param0->unk_7C->height * 8); ColoredArrow_Print(param0->unk_78, param0->unk_7C, 0, param0->unk_81 * 16); sub_0201ACCC(param0->unk_7C); diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c index 8a4b99e210..9a8921b596 100644 --- a/src/unk_0205D8CC.c +++ b/src/unk_0205D8CC.c @@ -32,7 +32,7 @@ void FieldMessage_AddWindow(BgConfig *param0, Window *param1, u32 param2) void FieldMessage_DrawWindow(Window *param0, const Options *param1) { - sub_0200DD0C(param0->unk_00, sub_0201C290(param0), 1024 - (18 + 12), 10, Options_Frame(param1), 4); + sub_0200DD0C(param0->bgConfig, sub_0201C290(param0), 1024 - (18 + 12), 10, Options_Frame(param1), 4); sub_0205D988(param0); sub_0200E060(param0, 0, 1024 - (18 + 12), 10); } @@ -93,7 +93,7 @@ void sub_0205DA1C(BgConfig *param0, Window *param1, u16 param2, u16 param3) void sub_0205DA80(Window *param0, u16 param1, u16 param2) { - sub_0200E2A4(param0->unk_00, sub_0201C290(param0), ((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)), 9, param1, param2, 4); + sub_0200E2A4(param0->bgConfig, sub_0201C290(param0), ((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)), 9, param1, param2, 4); BGL_FillWindow(param0, 15); sub_0200E69C(param0, 0, ((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)), 9, param1); } diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index 08b29f5eb0..c96cccac18 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -367,13 +367,13 @@ void sub_02082104(GameWindowLayout *param0, u8 param1) return; case 4: case 3: - sub_0201972C(1, ¶m0->unk_4A4[9], 2 * 2, (v0->unk_09 * 16 + 9) * 2); + sub_0201972C(1, ¶m0->unk_4A4[9], 2 * 2, (v0->palette * 16 + 9) * 2); break; case 2: - sub_0201972C(1, ¶m0->unk_4A4[(16 + 9)], 2 * 2, (v0->unk_09 * 16 + 9) * 2); + sub_0201972C(1, ¶m0->unk_4A4[(16 + 9)], 2 * 2, (v0->palette * 16 + 9) * 2); break; case 1: - sub_0201972C(1, ¶m0->unk_4A4[(32 + 9)], 2 * 2, (v0->unk_09 * 16 + 9) * 2); + sub_0201972C(1, ¶m0->unk_4A4[(32 + 9)], 2 * 2, (v0->palette * 16 + 9) * 2); break; } @@ -553,14 +553,14 @@ void sub_020825B4(GameWindowLayout *param0, u8 param1) if (param1 & 1) { MessageLoader_GetStrbuf(param0->unk_69C, 0, param0->unk_6A8); - v0 = sub_020825A4(0, param0->unk_6A8, param0->unk_04[30].unk_07 * 8); + v0 = sub_020825A4(0, param0->unk_6A8, param0->unk_04[30].width * 8); Text_AddPrinterWithParamsAndColor(¶m0->unk_04[30], FONT_SYSTEM, param0->unk_6A8, v0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); sub_0201A9A4(¶m0->unk_04[30]); } if (param1 & 2) { MessageLoader_GetStrbuf(param0->unk_69C, 1, param0->unk_6A8); - v0 = sub_020825A4(0, param0->unk_6A8, param0->unk_04[31].unk_07 * 8); + v0 = sub_020825A4(0, param0->unk_6A8, param0->unk_04[31].width * 8); Text_AddPrinterWithParamsAndColor(¶m0->unk_04[31], FONT_SYSTEM, param0->unk_6A8, v0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); sub_0201A9A4(¶m0->unk_04[31]); } diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index 1bc97051df..6103a7568d 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -2108,7 +2108,7 @@ static const u8 Unk_020F24D8[] = { static void *sub_02088654(Window *param0, Strbuf *param1, u8 param2, const TextColor param3) { Text_AddPrinterWithParamsAndColor(param0, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, param3, NULL); - return param0->unk_0C; + return param0->pixels; } static void sub_02088678(Window *param0, const u16 *param1, u8 *param2, Strbuf *param3) diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index 70b5095c5e..d318b98a9f 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -492,14 +492,14 @@ static void sub_02090578(PokemonSummaryApp *param0) { u32 v1 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->monData.speciesName, 0); - u32 v2 = (param0->extraWindows[1].unk_07 * 8 - v1) / 2; + u32 v2 = (param0->extraWindows[1].width * 8 - v1) / 2; Text_AddPrinterWithParamsAndColor(¶m0->extraWindows[1], FONT_SYSTEM, param0->monData.speciesName, v2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); } { u32 v3 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->monData.OTName, 0); - u32 v4 = (param0->extraWindows[2].unk_07 * 8 - v3) / 2; + u32 v4 = (param0->extraWindows[2].width * 8 - v3) / 2; if (param0->monData.OTGender == 0) { Text_AddPrinterWithParamsAndColor( diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c index 2f2f8a9a82..86481da9c5 100644 --- a/src/unk_02095E98.c +++ b/src/unk_02095E98.c @@ -158,7 +158,7 @@ void sub_02095EAC(int param0, int param1, void *param2, void *param3) MI_CpuCopyFast(v1->unk_00, &v0->unk_4434[v1->unk_3EC * 1000], 1000); } - MI_CpuCopyFast(v0->unk_4434, v0->unk_32C.unk_0C, 30 * 15 * 32); + MI_CpuCopyFast(v0->unk_4434, v0->unk_32C.pixels, 30 * 15 * 32); sub_0201A954(&v0->unk_32C); } else { UnkStruct_02095EAC_sub1 *v2 = (UnkStruct_02095EAC_sub1 *)param2; @@ -333,7 +333,7 @@ static void sub_02096170(int param0, int param1, void *param2, void *param3) static void sub_0209617C(UnkStruct_02095EAC *param0, int param1) { - u8 *v0 = (u8 *)param0->unk_32C.unk_0C; + u8 *v0 = (u8 *)param0->unk_32C.pixels; MI_CpuCopyFast(&v0[param1 * 1000], param0->unk_7C74.unk_00, 1000); diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c index db206366d3..5c897114e0 100644 --- a/src/unk_0209ACF4.c +++ b/src/unk_0209ACF4.c @@ -397,7 +397,7 @@ static int sub_0209B288(UnkStruct_0209AD84 *param0) } while (0); { - BGL_WindowColor(param0->unk_68, 15, 0, 0, 12, param0->unk_68->unk_08 * 8); + BGL_WindowColor(param0->unk_68, 15, 0, 0, 12, param0->unk_68->height * 8); ColoredArrow_Print(param0->unk_14, param0->unk_68, 0, param0->unk_5C * 16); sub_0201ACCC(param0->unk_68); Sound_PlayEffect(1500); From df3ee014986567aa49195f1b463ca6613c878b42 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 20 Oct 2024 11:57:55 -0700 Subject: [PATCH 08/13] Identify UnkStruct_ov84_0223BA5C -> GraphicsModes and document fields --- include/bg_window.h | 16 ++++++++-------- src/battle/ov16_0223B140.c | 4 ++-- src/bg_window.c | 12 ++++++------ src/choose_starter/choose_starter_app.c | 10 +++++----- src/error_message_reset.c | 2 +- src/library_tv/library_tv.c | 2 +- src/overlay005/encounter_effect.c | 4 ++-- src/overlay005/fieldmap.c | 2 +- src/overlay006/ov6_0223E140.c | 2 +- src/overlay010/ov10_0221F800.c | 6 +++--- src/overlay013/ov13_0221FC20.c | 2 +- src/overlay013/ov13_022264F4.c | 2 +- src/overlay017/ov17_0223B140.c | 2 +- src/overlay017/ov17_0223CB1C.c | 2 +- src/overlay017/ov17_0223DAD0.c | 2 +- src/overlay017/ov17_0224F4D4.c | 2 +- src/overlay019/ov19_021D61B0.c | 2 +- src/overlay020/ov20_021D2098.c | 2 +- src/overlay021/ov21_021D1FA4.c | 10 +++++----- src/overlay022/ov22_02255094.c | 2 +- src/overlay023/ov23_0223E140.c | 2 +- src/overlay058/ov58_021D0D80.c | 2 +- src/overlay059/ov59_021D0D80.c | 2 +- src/overlay061/ov61_0222BF44.c | 2 +- src/overlay062/ov62_0222F2C0.c | 2 +- src/overlay064/ov64_0222DCE0.c | 2 +- src/overlay065/ov65_0222DCE0.c | 2 +- src/overlay065/ov65_0223648C.c | 2 +- src/overlay067/ov67_0225C700.c | 2 +- src/overlay068/ov68_0225C700.c | 2 +- src/overlay069/ov69_0225C700.c | 2 +- src/overlay070/ov70_0225D9A4.c | 2 +- src/overlay071/ov71_0223B140.c | 2 +- src/overlay072/ov72_0223D7A0.c | 2 +- src/overlay073/ov73_021D0D80.c | 2 +- src/overlay073/ov73_021D3250.c | 2 +- src/overlay074/ov74_021D0D80.c | 2 +- src/overlay075/ov75_021D0D80.c | 2 +- src/overlay076/ov76_0223D338.c | 2 +- src/overlay077/ov77_021D0D80.c | 2 +- src/overlay077/ov77_021D25B0.c | 8 ++++---- src/overlay079/ov79_021D0D80.c | 2 +- src/overlay079/ov79_021D2268.c | 2 +- src/overlay080/ov80_021D0D80.c | 2 +- src/overlay081/ov81_021D0D80.c | 2 +- src/overlay083/ov83_0223C958.c | 2 +- src/overlay084/ov84_0223B5A0.c | 2 +- src/overlay085/ov85_02241440.c | 2 +- src/overlay086/ov86_0223B140.c | 2 +- src/overlay087/ov87_021D106C.c | 2 +- src/overlay088/ov88_0223B140.c | 2 +- src/overlay090/ov90_021D0D80.c | 2 +- src/overlay091/ov91_021D0D80.c | 2 +- src/overlay092/ov92_021D0D80.c | 2 +- src/overlay094/ov94_0223BCB0.c | 2 +- src/overlay094/ov94_0223C610.c | 2 +- src/overlay094/ov94_0223FB48.c | 2 +- src/overlay094/ov94_02242AD0.c | 2 +- src/overlay095/ov95_02247B6C.c | 2 +- src/overlay095/ov95_02248590.c | 2 +- src/overlay095/ov95_02249740.c | 2 +- src/overlay095/ov95_02249F90.c | 2 +- src/overlay095/ov95_0224A390.c | 2 +- src/overlay095/ov95_0224ABC0.c | 2 +- src/overlay095/ov95_0224B3D8.c | 2 +- src/overlay096/ov96_0223B6A0.c | 2 +- src/overlay097/ov97_0222AE60.c | 2 +- src/overlay097/ov97_0222C174.c | 2 +- src/overlay097/ov97_0222D30C.c | 2 +- src/overlay097/ov97_02232054.c | 2 +- src/overlay097/ov97_02233B18.c | 2 +- src/overlay098/ov98_022471C8.c | 2 +- src/overlay099/ov99_021D0D80.c | 4 ++-- src/overlay100/ov100_021D0D80.c | 2 +- src/overlay101/ov101_021D0D80.c | 2 +- src/overlay102/ov102_021D0D80.c | 2 +- src/overlay104/ov104_0223C2D4.c | 4 ++-- src/overlay105/ov105_02241AE0.c | 2 +- src/overlay106/ov106_02241AE0.c | 2 +- src/overlay107/ov107_02241AE0.c | 2 +- src/overlay107/ov107_02245EB0.c | 2 +- src/overlay108/ov108_02241AE0.c | 2 +- src/overlay109/ov109_021D0D80.c | 2 +- src/overlay109/ov109_021D3D50.c | 2 +- src/overlay110/ov110_021D0D80.c | 2 +- src/overlay111/ov111_021D0D80.c | 2 +- src/overlay112/ov112_0225C700.c | 2 +- src/overlay113/ov113_0225C700.c | 2 +- src/overlay114/ov114_0225C700.c | 8 ++++---- src/overlay115/ov115_02260CEC.c | 2 +- src/overlay116/ov116_022604C4.c | 2 +- src/overlay117/ov117_02260668.c | 2 +- src/overlay119/ov119_021D0D80.c | 2 +- src/pokemon_summary_app.c | 2 +- src/unk_02039814.c | 2 +- src/unk_02039A64.c | 2 +- src/unk_020528D0.c | 2 +- src/unk_02052C6C.c | 2 +- src/unk_0207AE68.c | 2 +- src/unk_0207E0B8.c | 2 +- src/unk_0208694C.c | 2 +- src/unk_02099DFC.c | 2 +- src/unk_0209A2C4.c | 2 +- src/unk_0209A74C.c | 2 +- src/unk_0209AA74.c | 2 +- 105 files changed, 137 insertions(+), 137 deletions(-) diff --git a/include/bg_window.h b/include/bg_window.h index 61a5cf940c..c4e7eb711b 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -97,17 +97,17 @@ typedef struct Window { void *pixels; } Window; -typedef struct { - GXDispMode unk_00; - GXBGMode unk_04; - GXBGMode unk_08; - GXBG0As unk_0C; -} UnkStruct_ov84_0223BA5C; +typedef struct GraphicsModes { + GXDispMode displayMode; + GXBGMode mainBgMode; + GXBGMode subBgMode; + GXBG0As bg0As2DOr3D; +} GraphicsModes; BgConfig *sub_02018340(u32 param0); u32 sub_02018364(BgConfig *param0); -void sub_02018368(const UnkStruct_ov84_0223BA5C *param0); -void sub_020183A0(const UnkStruct_ov84_0223BA5C *param0, u8 param1); +void sub_02018368(const GraphicsModes *param0); +void sub_020183A0(const GraphicsModes *param0, u8 param1); void sub_020183C4(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3); void sub_02018898(BgConfig *param0, u8 param1, u8 param2, u8 param3); void sub_02019044(BgConfig *param0, u8 param1); diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 017b29606f..f563eef16d 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -848,7 +848,7 @@ static void ov16_0223C004(BattleSystem *param0, BgConfig *param1) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, @@ -1687,7 +1687,7 @@ static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1) } { - UnkStruct_ov84_0223BA5C v2 = { + GraphicsModes v2 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/bg_window.c b/src/bg_window.c index a4870d671d..75ec3d7394 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -62,10 +62,10 @@ u32 sub_02018364(BgConfig *param0) return param0->heapID; } -void sub_02018368(const UnkStruct_ov84_0223BA5C *param0) +void sub_02018368(const GraphicsModes *param0) { - GX_SetGraphicsMode(param0->unk_00, param0->unk_04, param0->unk_0C); - GXS_SetGraphicsMode(param0->unk_08); + GX_SetGraphicsMode(param0->displayMode, param0->mainBgMode, param0->bg0As2DOr3D); + GXS_SetGraphicsMode(param0->subBgMode); GX_SetBGScrOffset(GX_BGSCROFFSET_0x00000); GX_SetBGCharOffset(GX_BGCHAROFFSET_0x00000); @@ -74,13 +74,13 @@ void sub_02018368(const UnkStruct_ov84_0223BA5C *param0) GXLayers_DisableEngineBLayers(); } -void sub_020183A0(const UnkStruct_ov84_0223BA5C *param0, u8 param1) +void sub_020183A0(const GraphicsModes *param0, u8 param1) { if (param1 == 0) { - GX_SetGraphicsMode(param0->unk_00, param0->unk_04, param0->unk_0C); + GX_SetGraphicsMode(param0->displayMode, param0->mainBgMode, param0->bg0As2DOr3D); GXLayers_DisableEngineALayers(); } else { - GXS_SetGraphicsMode(param0->unk_08); + GXS_SetGraphicsMode(param0->subBgMode); GXLayers_DisableEngineBLayers(); } } diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index ab2e234360..f561c38963 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -347,12 +347,12 @@ BOOL ChooseStarter_Init(OverlayManager *param0, int *param1) SetupDrawing(app, HEAP_ID_CHOOSE_STARTER_APP); - UnkStruct_ov84_0223BA5C bglHeader; + GraphicsModes bglHeader; app->bgl = sub_02018340(HEAP_ID_CHOOSE_STARTER_APP); - bglHeader.unk_00 = GX_DISPMODE_GRAPHICS; - bglHeader.unk_04 = GX_BGMODE_0; - bglHeader.unk_08 = GX_BGMODE_1; - bglHeader.unk_0C = GX_BG0_AS_3D; + bglHeader.displayMode = GX_DISPMODE_GRAPHICS; + bglHeader.mainBgMode = GX_BGMODE_0; + bglHeader.subBgMode = GX_BGMODE_1; + bglHeader.bg0As2DOr3D = GX_BG0_AS_3D; sub_02018368(&bglHeader); SetupBGL(app->bgl, HEAP_ID_CHOOSE_STARTER_APP); diff --git a/src/error_message_reset.c b/src/error_message_reset.c index af4331cb12..3b1ac4a3da 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -35,7 +35,7 @@ static const UnkStruct_02099F80 sErrorMessageBanksConfig = { GX_VRAM_TEXPLTT_NONE }; -static const UnkStruct_ov84_0223BA5C sErrorMessageBgModeSet = { +static const GraphicsModes sErrorMessageBgModeSet = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/library_tv/library_tv.c b/src/library_tv/library_tv.c index bd5ba92641..dde55fc45a 100644 --- a/src/library_tv/library_tv.c +++ b/src/library_tv/library_tv.c @@ -182,7 +182,7 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv) ltv->bgl = sub_02018340(ltv->heapID); - UnkStruct_ov84_0223BA5C bgData = { + GraphicsModes bgData = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c index 963c34e0f9..cff6bafb51 100644 --- a/src/overlay005/encounter_effect.c +++ b/src/overlay005/encounter_effect.c @@ -647,7 +647,7 @@ void EncounterEffect_Unused(void) static void EncounterEffect_UnusedTask(SysTask *dummy1, void *dummy2) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_1, GX_BGMODE_0, @@ -1573,7 +1573,7 @@ static void ov5_021DF30C(FieldSystem *fieldSystem) GX_PLANEMASK_BG0, 0); { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_3, GX_BGMODE_0, diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index 71a13e4ef6..9a5172976c 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -573,7 +573,7 @@ void ov5_021D143C(BgConfig *bgl) static void ov5_021D1444(BgConfig *bgl) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index 32416ba284..1c21834675 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -368,7 +368,7 @@ static void ov6_0223E1B0(void) static void ov6_0223E1D0(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 3b201685f0..a05471038d 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -1279,14 +1279,14 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p param0->unk_B9C = param1; { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, GX_BG0_AS_3D, }; - v0.unk_0C = param1; + v0.bg0As2DOr3D = param1; sub_02018368(&v0); } @@ -1835,7 +1835,7 @@ static u32 ov10_0222194C(u32 param0, BOOL param1) static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index 7f76d1ca7d..aa8d6f16e6 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -1014,7 +1014,7 @@ static u8 ov13_02220BA4(SysTask *param0, UnkStruct_ov13_022213F0 *param1) static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 4e8eebc485..20275e5377 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -635,7 +635,7 @@ static u8 ov13_02226D94(UnkStruct_ov13_02227244 *param0) static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index c616ab3400..62c80e79da 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -440,7 +440,7 @@ static void ov17_0223B728(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index aed255bb24..3978941256 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -433,7 +433,7 @@ static void ov17_0223D1B8(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index f9e02dcb07..b992f1bfb8 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -593,7 +593,7 @@ static void ov17_0223E250(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index cc97e4d4ed..d3e88ce136 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -434,7 +434,7 @@ static void ov17_0224FB34(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index a7ef598510..06a2ad122e 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -1602,7 +1602,7 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ GX_VRAM_TEXPLTT_01_FG }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c index 2bd7001f3c..310879a208 100644 --- a/src/overlay020/ov20_021D2098.c +++ b/src/overlay020/ov20_021D2098.c @@ -386,7 +386,7 @@ static void ov20_021D24EC(UnkStruct_ov20_021D2238 *param0) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_01_FG }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c index 438123ef99..4a30840c74 100644 --- a/src/overlay021/ov21_021D1FA4.c +++ b/src/overlay021/ov21_021D1FA4.c @@ -61,16 +61,16 @@ static void ov21_021D3194(SysTask *param0, void *param1); void ov21_021D1FA4(UnkStruct_ov21_021D13FC *param0, int param1) { - UnkStruct_ov84_0223BA5C v0; + GraphicsModes v0; UnkStruct_ov21_021D1FA4 v1; param0->unk_278 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1); param0->unk_00 = sub_02018340(param1); - v0.unk_00 = GX_DISPMODE_GRAPHICS; - v0.unk_04 = GX_BGMODE_0; - v0.unk_08 = GX_BGMODE_1; - v0.unk_0C = GX_BG0_AS_3D; + v0.displayMode = GX_DISPMODE_GRAPHICS; + v0.mainBgMode = GX_BGMODE_0; + v0.subBgMode = GX_BGMODE_1; + v0.bg0As2DOr3D = GX_BG0_AS_3D; sub_02018368(&v0); diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c index 655939cf2a..ca98cb4887 100644 --- a/src/overlay022/ov22_02255094.c +++ b/src/overlay022/ov22_02255094.c @@ -461,7 +461,7 @@ static void ov22_02255654(void) static void ov22_022556DC(void) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index bf9771ccb2..d438aef5a6 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -1150,7 +1150,7 @@ static void ov23_0223EC34(BgConfig *param0) GXLayers_SetBanks(&v0); } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 36ba6b8d24..6ab7f3f1cf 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -399,7 +399,7 @@ static void ov58_021D1184(void) static void ov58_021D11A4(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index 64bf6f0ca9..6e511d27d2 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -393,7 +393,7 @@ static void ov59_021D1128(void) static void ov59_021D1148(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index 729a62cc17..9a8dd01c28 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -317,7 +317,7 @@ static void ov61_0222C224(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index a7d6636bb0..8291acf8d5 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -231,7 +231,7 @@ static void ov62_0222F670(BgConfig *param0) GXLayers_DisableEngineALayers(); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index 72673545fd..06c3cc0dcf 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -926,7 +926,7 @@ static void ov64_0222E290 (UnkStruct_ov64_0222E21C * param0, u32 param1) param0->unk_00 = sub_02018340(param1); { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 607d41155b..e7ed07ecef 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -967,7 +967,7 @@ static void ov65_0222E618 (void) static void ov65_0222E638(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 571ff9ee43..20ee23c10c 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -626,7 +626,7 @@ static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1) param0->unk_00 = sub_02018340(param1); { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 56d98b53fa..8d5afbbe31 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -95,7 +95,7 @@ static const UnkStruct_02099F80 Unk_ov67_0225D410 = { GX_VRAM_TEXPLTT_NONE }; -static const UnkStruct_ov84_0223BA5C Unk_ov67_0225D400 = { +static const GraphicsModes Unk_ov67_0225D400 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index 5137abab64..2992d67039 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -227,7 +227,7 @@ static const UnkStruct_02099F80 Unk_ov68_0225DDC0 = { GX_VRAM_TEXPLTT_NONE }; -static const UnkStruct_ov84_0223BA5C Unk_ov68_0225DD48 = { +static const GraphicsModes Unk_ov68_0225DD48 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index c275c7a8ae..29cdee0246 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -413,7 +413,7 @@ static const UnkStruct_02099F80 Unk_ov69_0225F0C0 = { GX_VRAM_TEXPLTT_0123_E }; -static const UnkStruct_ov84_0223BA5C Unk_ov69_0225F040 = { +static const GraphicsModes Unk_ov69_0225F040 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 0d717e4ccf..e3d8fddd26 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -483,7 +483,7 @@ static const UnkStruct_02099F80 Unk_ov70_0226D664 = { GX_VRAM_TEXPLTT_0123_E }; -static const UnkStruct_ov84_0223BA5C Unk_ov70_0226D5BC = { +static const GraphicsModes Unk_ov70_0226D5BC = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index 7b3d04ee63..49d584ad20 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -538,7 +538,7 @@ static void ov71_0223B858(BgConfig *param0) GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_1, GX_BGMODE_4, diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index d6a45aa1ba..707dcbaa41 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -272,7 +272,7 @@ static void ov72_0223DA70(void) static void ov72_0223DA90(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 4888eecdea..53e8d318b6 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -317,7 +317,7 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c index ef560de132..077dd61bd7 100644 --- a/src/overlay073/ov73_021D3250.c +++ b/src/overlay073/ov73_021D3250.c @@ -183,7 +183,7 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) param0->unk_04 = sub_02018340(param0->unk_00); } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index 940d512a79..5eac69f734 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -335,7 +335,7 @@ static void ov74_021D12D4(UnkStruct_ov74_021D0D80 *param0) param0->unk_14 = sub_02018340(param0->unk_00); { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 1b7c5718a5..74983e1348 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -575,7 +575,7 @@ static void ov75_021D1480(UnkStruct_ov75_021D1184 *param0) param0->unk_18 = sub_02018340(param0->unk_00); { - UnkStruct_ov84_0223BA5C v2 = { + GraphicsModes v2 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index 7dfa9e9564..d7834cdcda 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -1352,7 +1352,7 @@ void ov76_0223EB64(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index 2cb3fda9c7..a267e6a9c6 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -627,7 +627,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) param0->unk_04 = sub_02018340(param0->unk_00); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c index f41510ffb5..a9b35b6d51 100644 --- a/src/overlay077/ov77_021D25B0.c +++ b/src/overlay077/ov77_021D25B0.c @@ -292,7 +292,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) param0->unk_0C = sub_02018340(param0->unk_00); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, @@ -431,7 +431,7 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) param0->unk_0C = sub_02018340(param0->unk_00); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, @@ -710,7 +710,7 @@ static void ov77_021D2900(UnkStruct_ov77_021D2E9C *param0) ov77_021D2828(param0); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, @@ -784,7 +784,7 @@ static void ov77_021D2A00(UnkStruct_ov77_021D2E9C *param0) param0->unk_0C = sub_02018340(param0->unk_00); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index 4fae3db012..1c34fefd29 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -486,7 +486,7 @@ static void ov79_021D132C(UnkStruct_ov79_021D0E1C *param0) param0->unk_24 = sub_02018340(param0->unk_00); { - UnkStruct_ov84_0223BA5C v2 = { + GraphicsModes v2 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index 2f51bcc42e..21c6a49114 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -366,7 +366,7 @@ static void ov79_021D257C(UnkStruct_ov79_021D2928 *param0) param0->unk_68 = sub_02018340(param0->unk_00); { - UnkStruct_ov84_0223BA5C v2 = { + GraphicsModes v2 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay080/ov80_021D0D80.c b/src/overlay080/ov80_021D0D80.c index 4814cb64c6..fd25a9e564 100644 --- a/src/overlay080/ov80_021D0D80.c +++ b/src/overlay080/ov80_021D0D80.c @@ -281,7 +281,7 @@ static void ov80_021D1088(UnkStruct_ov80_021D2A08 *param0, BgConfig *param1) int v0, v1; { - UnkStruct_ov84_0223BA5C v2 = { + GraphicsModes v2 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay081/ov81_021D0D80.c b/src/overlay081/ov81_021D0D80.c index fd638b8fe0..835b0e2097 100644 --- a/src/overlay081/ov81_021D0D80.c +++ b/src/overlay081/ov81_021D0D80.c @@ -182,7 +182,7 @@ static void ov81_021D0F20(void) static void ov81_021D0F40(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index 07a227057e..f0f5700c60 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -172,7 +172,7 @@ static void ov83_0223CC30(BgConfig **param0, int param1) *param0 = sub_02018340(param1); { - UnkStruct_ov84_0223BA5C v2 = { + GraphicsModes v2 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index 3518c794e8..2f28113a5b 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -653,7 +653,7 @@ static void ov84_0223BA3C(void) static void ov84_0223BA5C(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_1, diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index ee147f0dce..03f4b17e80 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -332,7 +332,7 @@ static void ov85_02241614(void) static void ov85_02241634(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 017d0a9688..ae18ecbc59 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -621,7 +621,7 @@ static void ov86_0223B74C(UnkStruct_ov86_0223B3C8 *param0) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_01_FG }; - static const UnkStruct_ov84_0223BA5C v2 = { + static const GraphicsModes v2 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index a296462564..37796b1f8d 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -259,7 +259,7 @@ static void ov87_021D139C(UnkStruct_ov87_021D106C *param0) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_01_FG }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 70cd32ec46..d883bea8dc 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -942,7 +942,7 @@ static void ov88_0223C15C(void) static void ov88_0223C17C(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 159036aecb..be65587837 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -448,7 +448,7 @@ static void ov90_021D11EC(UnkStruct_ov90_021D0ECC *param0) param0->unk_10 = sub_02018340(param0->unk_00); { - UnkStruct_ov84_0223BA5C v2 = { + GraphicsModes v2 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 3f54a1d85c..7fc8a6a38b 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -517,7 +517,7 @@ static void ov91_021D0FC4(void) static void ov91_021D0FE4(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 3e768f6817..947101da7f 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -714,7 +714,7 @@ static void ov92_021D14F0(void) static void ov92_021D1510(void) { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index 75651d1eb7..3576c6d48f 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -106,7 +106,7 @@ int ov94_0223BCB0(OverlayManager *param0, int *param1) Unk_ov94_02246C08 = v0; { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index 265b39a5cf..9527463b83 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -135,7 +135,7 @@ int ov94_0223C6F4(UnkStruct_ov94_0223FD4C *param0, int param1) static void ov94_0223C720(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index d0a8f105a9..8bcf1cc5d4 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -163,7 +163,7 @@ int ov94_0223FBDC(UnkStruct_ov94_0223FD4C *param0, int param1) static void ov94_0223FC08(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index c3f0a847b0..0bb70a2cf7 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -191,7 +191,7 @@ int ov94_02242B34(UnkStruct_ov94_0223FD4C *param0, int param1) static void ov94_02242B54(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 7786f7a692..06184758bd 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -207,7 +207,7 @@ static int ov95_02247CB4(UnkStruct_ov95_02247C6C *param0, int *param1) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_0123_E }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c index fbc74a047d..c60d8baf46 100644 --- a/src/overlay095/ov95_02248590.c +++ b/src/overlay095/ov95_02248590.c @@ -421,7 +421,7 @@ static void ov95_022488A4(UnkStruct_ov95_02248688 *param0) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_0123_E }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_4, GX_BGMODE_4, diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c index 7c6793506b..16403d8304 100644 --- a/src/overlay095/ov95_02249740.c +++ b/src/overlay095/ov95_02249740.c @@ -250,7 +250,7 @@ static void ov95_02249910(UnkStruct_ov95_022497D8 *param0) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_0123_E }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay095/ov95_02249F90.c b/src/overlay095/ov95_02249F90.c index f024a7f568..8050e17833 100644 --- a/src/overlay095/ov95_02249F90.c +++ b/src/overlay095/ov95_02249F90.c @@ -164,7 +164,7 @@ static void ov95_0224A10C(UnkStruct_ov95_02249FF8 *param0) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_0123_E }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c index ea31baa095..2097208d65 100644 --- a/src/overlay095/ov95_0224A390.c +++ b/src/overlay095/ov95_0224A390.c @@ -230,7 +230,7 @@ static void ov95_0224A518(UnkStruct_ov95_0224A42C *param0) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_0123_E }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay095/ov95_0224ABC0.c b/src/overlay095/ov95_0224ABC0.c index 43f6c6fd35..43af0821c4 100644 --- a/src/overlay095/ov95_0224ABC0.c +++ b/src/overlay095/ov95_0224ABC0.c @@ -299,7 +299,7 @@ static void ov95_0224AE1C(UnkStruct_ov95_0224AC64 *param0) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_0123_E }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_4, GX_BGMODE_4, diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index dc8e1e957b..911be9a514 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -236,7 +236,7 @@ static int ov95_0224B520(UnkStruct_ov95_0224B4D4 *param0, int *param1) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_0123_E }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c index 49d72d077b..69c6c15d1a 100644 --- a/src/overlay096/ov96_0223B6A0.c +++ b/src/overlay096/ov96_0223B6A0.c @@ -81,7 +81,7 @@ int ov96_0223B6A0(OverlayManager *param0, int *param1) Unk_ov96_0223DEEC = v0; { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 4bbecf6ccf..9a6e3755f5 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -441,7 +441,7 @@ static void ov97_0222B2EC(UnkStruct_0222AE60 *param0) GX_VRAM_TEX_0_B, GX_VRAM_TEXPLTT_01_FG }; - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index ff476676c9..4c8f8ffbd9 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -525,7 +525,7 @@ static void ov97_0222C254(UnkStruct_ov97_0222C388 *param0) GX_VRAM_TEX_0_B, GX_VRAM_TEXPLTT_01_FG }; - UnkStruct_ov84_0223BA5C v2 = { + GraphicsModes v2 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index 89ce9cf4d5..b4acd7f474 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -741,7 +741,7 @@ static void ov97_0222DB78(BgConfig *param0, int param1, u32 param2, u32 param3) static void ov97_0222DBC4(BgConfig *param0) { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay097/ov97_02232054.c b/src/overlay097/ov97_02232054.c index f541b9edd6..6990cae836 100644 --- a/src/overlay097/ov97_02232054.c +++ b/src/overlay097/ov97_02232054.c @@ -35,7 +35,7 @@ void ov97_02232054(void) void ov97_02232074(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 4a74428ae5..25e6456ba5 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -1285,7 +1285,7 @@ static void ov97_02234CF4(UnkStruct_ov97_02234A2C *param0, int param1, int param static void ov97_02234D28(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index f5066de923..a604227c02 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -479,7 +479,7 @@ static void ov98_02247510(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index 6cbc05a3f4..938743e3af 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -389,7 +389,7 @@ static void ov99_021D1380(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_3, GX_BGMODE_0, @@ -568,7 +568,7 @@ static void ov99_021D1580(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_5, GX_BGMODE_0, diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index f0e1015398..c6afa1ce4b 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -277,7 +277,7 @@ static void ov100_021D1208(BgConfig *param0) GXLayers_DisableEngineALayers(); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index d3662098d1..31aa62d9bd 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -265,7 +265,7 @@ static void ov101_021D10B8(BgConfig *param0) GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index 7cb188f0de..f1dc952adc 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -203,7 +203,7 @@ static void ov102_021D0F8C(UnkStruct_ov102_021D0F8C *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, GX_BG0_AS_2D }; diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index 6d3370f69a..c0e6bf7387 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -479,14 +479,14 @@ static void ov104_0223C948(BgConfig *param0, int param1) } { - UnkStruct_ov84_0223BA5C v2 = { + GraphicsModes v2 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_5, GX_BGMODE_0, GX_BG0_AS_3D }; - v2.unk_04 = v0; + v2.mainBgMode = v0; sub_02018368(&v2); } diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index e3a71d7b78..3fb2a16f19 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -2167,7 +2167,7 @@ static void ov105_02244564(void) static void ov105_02244584(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index 322b30a3c5..fb9c3f6d84 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -924,7 +924,7 @@ static void ov106_0224271C(void) static void ov106_0224273C(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index c2451cff92..fccd8b2e81 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -1611,7 +1611,7 @@ static void ov107_02243424 (void) static void ov107_02243444(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index d0e6cc5418..1bcb658333 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -1278,7 +1278,7 @@ static void ov107_02247320 (void) static void ov107_02247340(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 67d7ba7ec3..31dac45343 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -945,7 +945,7 @@ static void ov108_02242740(void) static void ov108_02242760(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index a3415805c1..c8c17ee3eb 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -1692,7 +1692,7 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 1885588a15..528ebad1e0 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -392,7 +392,7 @@ static void ov109_021D40D0(void) static void ov109_021D40F0(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 68af87737f..bdff5c8094 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -284,7 +284,7 @@ static void ov110_021D1078 (void) static void ov110_021D1098(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index 0e4811185e..caa1b13c70 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -1315,7 +1315,7 @@ static void ov111_021D20CC(void) static void ov111_021D20EC(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index fb6660b741..48524596b7 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -200,7 +200,7 @@ static const UnkStruct_02099F80 Unk_ov112_0225D858 = { GX_VRAM_TEXPLTT_NONE }; -static const UnkStruct_ov84_0223BA5C Unk_ov112_0225D834 = { +static const GraphicsModes Unk_ov112_0225D834 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 9a1dfc762d..4e3d7de94c 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -729,7 +729,7 @@ static void ov113_0225CF58(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index d59dd38dea..c6282f1c21 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -274,7 +274,7 @@ static UnkStruct_ov114_0225CDB4 *ov114_0225CD54(UnkStruct_ov114_0225CCD0 *param0 static CellActor *ov114_0225CDB4(UnkStruct_ov114_0225CDB4 *param0, CellActorCollection *param1, s16 param2, s16 param3, u16 param4, u32 param5); static void ov114_0225CDE0(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_0225CDB4 *param1, NARC *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9); static void ov114_0225CEB8(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_0225CDB4 *param1); -static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const UnkStruct_ov84_0223BA5C *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 param4); +static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 param4); static void ov114_0225CF84(UnkStruct_ov114_0225CEF0 *param0); static void ov114_0225CFC0(UnkStruct_ov114_0225CEF0 *param0); static void ov114_0225CFCC(UnkStruct_ov114_0225CFCC *param0, u32 param1, u32 param2, u32 param3, u32 param4); @@ -494,7 +494,7 @@ static const UnkStruct_02099F80 Unk_ov114_022601B4 = { GX_VRAM_TEXPLTT_NONE }; -static const UnkStruct_ov84_0223BA5C Unk_ov114_0226018C = { +static const GraphicsModes Unk_ov114_0226018C = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, @@ -637,7 +637,7 @@ static const UnkStruct_02099F80 Unk_ov114_022601DC = { GX_VRAM_TEXPLTT_NONE }; -static const UnkStruct_ov84_0223BA5C Unk_ov114_0226014C = { +static const GraphicsModes Unk_ov114_0226014C = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, @@ -1325,7 +1325,7 @@ static void ov114_0225CEB8(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_022 } } -static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const UnkStruct_ov84_0223BA5C *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 param4) +static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 param4) { sub_02018368(param1); diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index 8773d83fcc..85af69916d 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -2992,7 +2992,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) param0->unk_00 = sub_02018340(param1); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c index 1e01d46479..c231dcba12 100644 --- a/src/overlay116/ov116_022604C4.c +++ b/src/overlay116/ov116_022604C4.c @@ -840,7 +840,7 @@ static void ov116_02261494(BgConfig *param0) { GXLayers_DisableEngineALayers(); { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index 5452a035b9..563cc8ec74 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -661,7 +661,7 @@ static void ov117_022610D8(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_1, diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index 9c71f49eef..2e1aa67464 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -140,7 +140,7 @@ void ov119_021D0EB8(BgConfig *param0) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c index 0bdc8c2db0..e80c7da2a8 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_app.c @@ -328,7 +328,7 @@ static void sub_0208C638(void) static void sub_0208C658(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/unk_02039814.c b/src/unk_02039814.c index 4fd2cda6c3..09dc76f016 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -34,7 +34,7 @@ static const UnkStruct_02099F80 Unk_020E5EFC = { GX_VRAM_TEXPLTT_NONE }; -static const UnkStruct_ov84_0223BA5C Unk_020E5ED0 = { +static const GraphicsModes Unk_020E5ED0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index 3b523e4959..a34b7cfe9f 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -34,7 +34,7 @@ static const UnkStruct_02099F80 Unk_020E5F7C = { GX_VRAM_TEXPLTT_NONE }; -static const UnkStruct_ov84_0223BA5C Unk_020E5F50 = { +static const GraphicsModes Unk_020E5F50 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index b9c3c357bb..75ded8d36f 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -74,7 +74,7 @@ static void sub_020528D0(BgConfig *param0) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_01_FG }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index 885b6d6200..c593aa2549 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -229,7 +229,7 @@ static void sub_02052F28(FieldSystem *fieldSystem, UnkStruct_0205300C *param1) GX_VRAM_TEX_0_A, GX_VRAM_TEXPLTT_01_FG }; - static const UnkStruct_ov84_0223BA5C v1 = { + static const GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index ff5577046f..e2ef92d0dc 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -782,7 +782,7 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1) } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index bd49f2cbc4..d8542763f1 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -729,7 +729,7 @@ static void sub_0207E8E0(BgConfig *param0) static void sub_0207E918(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index 6103a7568d..a156384106 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -1261,7 +1261,7 @@ static void sub_020871CC(void) static void sub_020871EC(BgConfig *param0) { { - UnkStruct_ov84_0223BA5C v0 = { + GraphicsModes v0 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index 159265b099..518a623daf 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -188,7 +188,7 @@ static void sub_02099F80(UnkStruct_02099DFC *param0) param0->unk_14 = sub_02018340(param0->unk_00); } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index 0decb3111d..0b3143cf6b 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -155,7 +155,7 @@ static void sub_0209A3D0(UnkStruct_0209A3D0 *param0) param0->unk_18 = sub_02018340(param0->unk_00); } { - UnkStruct_ov84_0223BA5C v1 = { + GraphicsModes v1 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index 70d722a7ef..cbac0733fe 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -32,7 +32,7 @@ static const UnkStruct_02099F80 Unk_020F8AF8 = { GX_VRAM_TEXPLTT_NONE }; -static const UnkStruct_ov84_0223BA5C Unk_020F8ACC = { +static const GraphicsModes Unk_020F8ACC = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index 09e8a98661..8bf42e9b16 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -34,7 +34,7 @@ static const UnkStruct_02099F80 Unk_020F8B54 = { GX_VRAM_TEXPLTT_NONE }; -static const UnkStruct_ov84_0223BA5C Unk_020F8B28 = { +static const GraphicsModes Unk_020F8B28 = { GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, From d07cc27eca56dfe0d169215fa74bc9bb1246ade7 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 20 Oct 2024 14:52:32 -0700 Subject: [PATCH 09/13] Identify extern functions in bg_window.h --- include/bg_window.h | 155 +++++----- src/battle/battle_display.c | 8 +- src/battle/battle_io_command.c | 4 +- src/battle/battle_script.c | 20 +- src/battle/healthbar.c | 12 +- src/battle/ov16_0223B140.c | 80 ++--- src/battle/ov16_0223DF00.c | 12 +- src/battle/ov16_0226871C.c | 142 ++++----- src/bg_window.c | 216 ++++++------- src/choose_starter/choose_starter_app.c | 52 ++-- src/colored_arrow.c | 2 +- src/error_message_reset.c | 20 +- src/field_map_change.c | 4 +- src/field_menu.c | 26 +- src/library_tv/library_tv.c | 48 +-- src/overlay005/encounter_effect.c | 22 +- src/overlay005/encounter_effect_core.c | 88 +++--- src/overlay005/fieldmap.c | 30 +- src/overlay005/ov5_021D5EB8.c | 16 +- src/overlay005/ov5_021DC018.c | 64 ++-- src/overlay005/ov5_021DD42C.c | 2 +- src/overlay005/ov5_021DD6FC.c | 22 +- src/overlay005/ov5_021E1B08.c | 30 +- src/overlay005/ov5_021E1D20.c | 6 +- src/overlay005/ov5_021EA874.c | 14 +- src/overlay005/ov5_021F007C.c | 36 +-- src/overlay005/ov5_021F08CC.c | 2 +- src/overlay005/ov5_021F6454.c | 6 +- src/overlay005/ov5_021F77A8.c | 6 +- src/overlay006/ov6_0223E140.c | 10 +- src/overlay006/ov6_02243258.c | 20 +- src/overlay006/ov6_02247A0C.c | 10 +- src/overlay007/communication_club.c | 46 +-- src/overlay007/ov7_0224B4E8.c | 34 +- src/overlay007/ov7_0224BE9C.c | 50 +-- src/overlay007/ov7_0224CD28.c | 94 +++--- src/overlay008/ov8_02249960.c | 2 +- src/overlay009/ov9_02249960.c | 12 +- src/overlay010/ov10_0221F800.c | 190 ++++++------ src/overlay012/ov12_0221FC20.c | 116 +++---- src/overlay012/ov12_02226B84.c | 42 +-- src/overlay012/ov12_0222AC70.c | 6 +- src/overlay012/ov12_0222D6B0.c | 2 +- src/overlay012/ov12_0222E91C.c | 2 +- src/overlay012/ov12_0222F700.c | 40 +-- src/overlay012/ov12_02234E44.c | 14 +- src/overlay013/ov13_0221FC20.c | 60 ++-- src/overlay013/ov13_02221A88.c | 330 ++++++++++---------- src/overlay013/ov13_02225710.c | 12 +- src/overlay013/ov13_022264F4.c | 46 +-- src/overlay013/ov13_02227288.c | 50 +-- src/overlay013/ov13_02228128.c | 8 +- src/overlay017/ov17_0223B140.c | 52 ++-- src/overlay017/ov17_0223CB1C.c | 54 ++-- src/overlay017/ov17_0223DAD0.c | 42 +-- src/overlay017/ov17_0223F118.c | 4 +- src/overlay017/ov17_0223F7E4.c | 44 +-- src/overlay017/ov17_022413D8.c | 14 +- src/overlay017/ov17_022476F8.c | 2 +- src/overlay017/ov17_02247A48.c | 16 +- src/overlay017/ov17_022492DC.c | 30 +- src/overlay017/ov17_0224A0FC.c | 12 +- src/overlay017/ov17_0224CFB8.c | 12 +- src/overlay017/ov17_0224F4D4.c | 74 ++--- src/overlay017/ov17_02250744.c | 12 +- src/overlay017/ov17_02251D6C.c | 16 +- src/overlay019/ov19_021D61B0.c | 38 +-- src/overlay019/ov19_021D79F8.c | 20 +- src/overlay019/ov19_021DA92C.c | 76 ++--- src/overlay019/ov19_021DB2FC.c | 42 +-- src/overlay019/ov19_021DB8E4.c | 70 ++--- src/overlay019/ov19_021DC5F0.c | 10 +- src/overlay019/ov19_021DCF88.c | 46 +-- src/overlay019/ov19_021DEC04.c | 86 +++--- src/overlay020/ov20_021D2098.c | 24 +- src/overlay020/ov20_021D2EA4.c | 36 +-- src/overlay020/ov20_021D3864.c | 16 +- src/overlay020/ov20_021D3A54.c | 44 +-- src/overlay020/ov20_021D40E8.c | 46 +-- src/overlay020/ov20_021D4728.c | 26 +- src/overlay020/ov20_021D4E38.c | 8 +- src/overlay021/ov21_021D0D80.c | 8 +- src/overlay021/ov21_021D1FA4.c | 66 ++-- src/overlay021/ov21_021D4C0C.c | 8 +- src/overlay021/ov21_021D517C.c | 2 +- src/overlay021/ov21_021D5AEC.c | 24 +- src/overlay021/ov21_021D76B0.c | 32 +- src/overlay021/ov21_021D85B0.c | 54 ++-- src/overlay021/ov21_021D94BC.c | 4 +- src/overlay021/ov21_021DC9BC.c | 26 +- src/overlay021/ov21_021DDD2C.c | 4 +- src/overlay021/ov21_021DE668.c | 14 +- src/overlay021/ov21_021DF734.c | 4 +- src/overlay021/ov21_021E0C68.c | 14 +- src/overlay021/ov21_021E1924.c | 8 +- src/overlay021/ov21_021E29DC.c | 12 +- src/overlay021/ov21_021E3FFC.c | 26 +- src/overlay021/ov21_021E4CA4.c | 26 +- src/overlay021/ov21_021E6014.c | 8 +- src/overlay021/ov21_021E68F4.c | 4 +- src/overlay021/ov21_021E737C.c | 8 +- src/overlay021/ov21_021E8484.c | 4 +- src/overlay021/ov21_021E8D48.c | 62 ++-- src/overlay022/ov22_02255094.c | 60 ++-- src/overlay022/ov22_02255D44.c | 56 ++-- src/overlay022/ov22_022597BC.c | 22 +- src/overlay022/ov22_02259C58.c | 6 +- src/overlay022/ov22_0225A428.c | 20 +- src/overlay022/ov22_0225AF8C.c | 4 +- src/overlay022/ov22_0225B660.c | 28 +- src/overlay023/ov23_0223E140.c | 78 ++--- src/overlay023/ov23_0224340C.c | 16 +- src/overlay023/ov23_02248F1C.c | 26 +- src/overlay023/ov23_0224B05C.c | 4 +- src/overlay023/ov23_0224DC40.c | 24 +- src/overlay023/ov23_0224F294.c | 26 +- src/overlay023/ov23_0225128C.c | 4 +- src/overlay023/ov23_022521F0.c | 44 +-- src/overlay023/ov23_02253598.c | 20 +- src/overlay023/ov23_02253D40.c | 14 +- src/overlay023/ov23_022542CC.c | 32 +- src/overlay024/ov24_02253CE0.c | 4 +- src/overlay025/ov25_02254560.c | 56 ++-- src/overlay025/ov25_02255090.c | 10 +- src/overlay026/ov26_02256404.c | 16 +- src/overlay027/ov27_0225680C.c | 26 +- src/overlay028/ov28_0225697C.c | 36 +-- src/overlay029/ov29_022566C8.c | 28 +- src/overlay030/ov30_022563EC.c | 8 +- src/overlay031/ov31_02256554.c | 12 +- src/overlay032/ov32_02256470.c | 40 +-- src/overlay033/ov33_02256474.c | 8 +- src/overlay034/ov34_02256540.c | 6 +- src/overlay035/ov35_02256410.c | 6 +- src/overlay036/ov36_02256404.c | 6 +- src/overlay037/ov37_022563D4.c | 6 +- src/overlay038/ov38_0225632C.c | 8 +- src/overlay039/ov39_022563DC.c | 12 +- src/overlay040/ov40_0225645C.c | 6 +- src/overlay041/ov41_022567B0.c | 30 +- src/overlay042/ov42_022563D4.c | 6 +- src/overlay043/ov43_02256544.c | 38 +-- src/overlay044/ov44_022565BC.c | 6 +- src/overlay045/ov45_022566EC.c | 6 +- src/overlay046/ov46_02256BCC.c | 6 +- src/overlay047/ov47_02256634.c | 6 +- src/overlay048/ov48_0225650C.c | 16 +- src/overlay049/ov49_022563D4.c | 6 +- src/overlay050/ov50_02256510.c | 28 +- src/overlay051/ov51_0225632C.c | 8 +- src/overlay052/ov52_02256694.c | 32 +- src/overlay053/ov53_02256420.c | 4 +- src/overlay054/ov54_0225642C.c | 20 +- src/overlay055/ov55_0225632C.c | 10 +- src/overlay056/ov56_022561C0.c | 72 ++--- src/overlay058/ov58_021D0D80.c | 82 ++--- src/overlay059/ov59_021D0D80.c | 66 ++-- src/overlay061/ov61_0222BF44.c | 76 ++--- src/overlay062/ov62_0222F2C0.c | 56 ++-- src/overlay062/ov62_022300D8.c | 16 +- src/overlay062/ov62_02231690.c | 178 +++++------ src/overlay062/ov62_02234A10.c | 10 +- src/overlay062/ov62_02235E64.c | 62 ++-- src/overlay062/ov62_02236CBC.c | 18 +- src/overlay062/ov62_02237D24.c | 204 ++++++------ src/overlay062/ov62_02239D60.c | 114 +++---- src/overlay062/ov62_0223CAEC.c | 72 ++--- src/overlay062/ov62_0223DFA8.c | 146 ++++----- src/overlay062/ov62_02241204.c | 248 +++++++-------- src/overlay062/ov62_02247D74.c | 62 ++-- src/overlay063/ov63_0222D1C0.c | 16 +- src/overlay064/ov64_0222DCE0.c | 266 ++++++++-------- src/overlay065/ov65_0222DCE0.c | 376 +++++++++++------------ src/overlay065/ov65_02235060.c | 2 +- src/overlay065/ov65_0223648C.c | 100 +++--- src/overlay067/ov67_0225C700.c | 30 +- src/overlay068/ov68_0225C700.c | 64 ++-- src/overlay069/ov69_0225C700.c | 80 ++--- src/overlay070/ov70_0225D9A4.c | 122 ++++---- src/overlay071/ov71_0223B140.c | 66 ++-- src/overlay071/ov71_0223C69C.c | 36 +-- src/overlay072/ov72_0223D7A0.c | 84 ++--- src/overlay073/ov73_021D0D80.c | 300 +++++++++--------- src/overlay073/ov73_021D3250.c | 62 ++-- src/overlay074/ov74_021D0D80.c | 90 +++--- src/overlay075/ov75_021D0D80.c | 98 +++--- src/overlay076/ov76_0223B870.c | 62 ++-- src/overlay076/ov76_0223D338.c | 52 ++-- src/overlay077/ov77_021D0D80.c | 62 ++-- src/overlay077/ov77_021D25B0.c | 392 ++++++++++++------------ src/overlay079/ov79_021D0D80.c | 28 +- src/overlay079/ov79_021D183C.c | 28 +- src/overlay079/ov79_021D2268.c | 32 +- src/overlay080/ov80_021D0D80.c | 28 +- src/overlay080/ov80_021D1458.c | 176 +++++------ src/overlay081/ov81_021D0D80.c | 72 ++--- src/overlay081/ov81_021D1610.c | 12 +- src/overlay083/ov83_0223C958.c | 22 +- src/overlay083/ov83_0223D6A8.c | 86 +++--- src/overlay084/ov84_0223B5A0.c | 154 +++++----- src/overlay084/ov84_0223F040.c | 106 +++---- src/overlay085/ov85_02241440.c | 74 ++--- src/overlay086/ov86_0223B140.c | 48 +-- src/overlay087/ov87_021D106C.c | 44 +-- src/overlay088/ov88_0223B140.c | 180 +++++------ src/overlay088/ov88_0223E9C4.c | 64 ++-- src/overlay090/ov90_021D0D80.c | 46 +-- src/overlay091/ov91_021D0D80.c | 136 ++++---- src/overlay092/ov92_021D0D80.c | 86 +++--- src/overlay094/ov94_0223BCB0.c | 4 +- src/overlay094/ov94_0223C610.c | 66 ++-- src/overlay094/ov94_0223D0C4.c | 48 +-- src/overlay094/ov94_0223DC04.c | 46 +-- src/overlay094/ov94_0223E46C.c | 116 +++---- src/overlay094/ov94_0223FB48.c | 74 ++--- src/overlay094/ov94_022414B8.c | 94 +++--- src/overlay094/ov94_02242AD0.c | 46 +-- src/overlay094/ov94_02244950.c | 50 +-- src/overlay095/ov95_02246C20.c | 12 +- src/overlay095/ov95_02247B6C.c | 32 +- src/overlay095/ov95_02248590.c | 40 +-- src/overlay095/ov95_02249740.c | 18 +- src/overlay095/ov95_02249F90.c | 48 +-- src/overlay095/ov95_0224A390.c | 18 +- src/overlay095/ov95_0224ABC0.c | 34 +- src/overlay095/ov95_0224B3D8.c | 26 +- src/overlay096/ov96_0223B6A0.c | 4 +- src/overlay096/ov96_0223BCE0.c | 72 ++--- src/overlay097/ov97_0222AE60.c | 68 ++-- src/overlay097/ov97_0222C174.c | 38 +-- src/overlay097/ov97_0222D30C.c | 90 +++--- src/overlay097/ov97_02230410.c | 84 ++--- src/overlay097/ov97_02232054.c | 18 +- src/overlay097/ov97_02233B18.c | 54 ++-- src/overlay097/ov97_02237694.c | 22 +- src/overlay098/ov98_022471C8.c | 182 +++++------ src/overlay099/ov99_021D0D80.c | 130 ++++---- src/overlay099/ov99_021D1A54.c | 96 +++--- src/overlay099/ov99_021D2C08.c | 4 +- src/overlay099/ov99_021D2E28.c | 4 +- src/overlay099/ov99_021D3C18.c | 16 +- src/overlay099/ov99_021D3E78.c | 32 +- src/overlay099/ov99_021D4134.c | 4 +- src/overlay100/ov100_021D0D80.c | 68 ++-- src/overlay100/ov100_021D46C8.c | 6 +- src/overlay101/ov101_021D0D80.c | 68 ++-- src/overlay101/ov101_021D1A28.c | 10 +- src/overlay102/ov102_021D0D80.c | 134 ++++---- src/overlay104/ov104_0222EA90.c | 24 +- src/overlay104/ov104_0222FBE4.c | 60 ++-- src/overlay104/ov104_02231F74.c | 20 +- src/overlay104/ov104_022332B4.c | 10 +- src/overlay104/ov104_022361B4.c | 22 +- src/overlay104/ov104_02237DD8.c | 4 +- src/overlay104/ov104_0223B6F4.c | 4 +- src/overlay104/ov104_0223C164.c | 4 +- src/overlay104/ov104_0223C2D4.c | 82 ++--- src/overlay104/ov104_0223D9E4.c | 6 +- src/overlay104/ov104_0223DC7C.c | 14 +- src/overlay104/ov104_0223E894.c | 2 +- src/overlay105/ov105_02241AE0.c | 176 +++++------ src/overlay105/ov105_02246214.c | 10 +- src/overlay106/ov106_02241AE0.c | 70 ++--- src/overlay106/ov106_022436E0.c | 10 +- src/overlay107/ov107_02241AE0.c | 172 ++++++----- src/overlay107/ov107_02245EB0.c | 118 +++---- src/overlay107/ov107_02249D14.c | 14 +- src/overlay108/ov108_02241AE0.c | 26 +- src/overlay108/ov108_02243630.c | 6 +- src/overlay109/ov109_021D0D80.c | 102 +++--- src/overlay109/ov109_021D3D50.c | 66 ++-- src/overlay110/ov110_021D0D80.c | 112 ++++--- src/overlay110/ov110_021D2124.c | 6 +- src/overlay111/ov111_021D0D80.c | 118 +++---- src/overlay111/ov111_021D3548.c | 10 +- src/overlay112/ov112_0225C700.c | 66 ++-- src/overlay113/ov113_0225C700.c | 104 +++---- src/overlay113/ov113_02260620.c | 6 +- src/overlay114/ov114_0225C700.c | 104 +++---- src/overlay115/ov115_02260CEC.c | 110 +++---- src/overlay116/ov116_022604C4.c | 74 ++--- src/overlay116/ov116_02261870.c | 26 +- src/overlay116/ov116_0226432C.c | 20 +- src/overlay117/ov117_02260668.c | 102 +++--- src/overlay117/ov117_02263AF0.c | 18 +- src/overlay119/ov119_021D0D80.c | 38 +-- src/pokemon_summary_app.c | 186 +++++------ src/render_text.c | 44 +-- src/scrcmd.c | 14 +- src/text.c | 8 +- src/unk_0200112C.c | 24 +- src/unk_02001AF4.c | 14 +- src/unk_02006E3C.c | 8 +- src/unk_0200C440.c | 6 +- src/unk_0200DA60.c | 212 ++++++------- src/unk_0201567C.c | 4 +- src/unk_02015920.c | 10 +- src/unk_02039814.c | 20 +- src/unk_02039A64.c | 38 +-- src/unk_020528D0.c | 18 +- src/unk_02052C6C.c | 18 +- src/unk_0205A0D8.c | 38 +-- src/unk_0205CA94.c | 2 +- src/unk_0205D8CC.c | 16 +- src/unk_020683F4.c | 2 +- src/unk_0206F314.c | 78 ++--- src/unk_020722AC.c | 46 +-- src/unk_0207AE68.c | 40 +-- src/unk_0207E0B8.c | 92 +++--- src/unk_020819DC.c | 156 +++++----- src/unk_02083370.c | 30 +- src/unk_02084B70.c | 4 +- src/unk_0208694C.c | 132 ++++---- src/unk_020890F4.c | 46 +-- src/unk_0208A3F4.c | 18 +- src/unk_0208C098.c | 10 +- src/unk_0208EA44.c | 2 +- src/unk_0208FCF8.c | 282 ++++++++--------- src/unk_020920C0.c | 12 +- src/unk_02095E98.c | 2 +- src/unk_02097B18.c | 16 +- src/unk_02098218.c | 10 +- src/unk_02099DFC.c | 44 +-- src/unk_0209A2C4.c | 48 +-- src/unk_0209A74C.c | 76 ++--- src/unk_0209AA74.c | 38 +-- src/unk_0209ACF4.c | 32 +- 327 files changed, 7912 insertions(+), 7891 deletions(-) diff --git a/include/bg_window.h b/include/bg_window.h index c4e7eb711b..95b4725c98 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -104,85 +104,82 @@ typedef struct GraphicsModes { GXBG0As bg0As2DOr3D; } GraphicsModes; -BgConfig *sub_02018340(u32 param0); -u32 sub_02018364(BgConfig *param0); -void sub_02018368(const GraphicsModes *param0); -void sub_020183A0(const GraphicsModes *param0, u8 param1); -void sub_020183C4(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3); -void sub_02018898(BgConfig *param0, u8 param1, u8 param2, u8 param3); -void sub_02019044(BgConfig *param0, u8 param1); -void BGL_SetPriority(u8 param0, u8 param1); -void sub_02019120(u8 param0, u8 param1); -void sub_02019184(BgConfig *param0, u8 param1, u8 param2, int param3); -int sub_020192EC(BgConfig *param0, u32 param1); -int sub_020192F8(BgConfig *param0, u32 param1); -void sub_02019348(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4); -void sub_02019410(const void *param0, void *param1, u32 param2); -void sub_02019448(BgConfig *param0, u8 param1); -void sub_02019460(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4); -void sub_02019574(BgConfig *param0, u8 param1, const void *param2, u32 param3); -void sub_0201958C(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4); -void sub_02019690(u8 param0, u32 param1, u32 param2, u32 param3); -void sub_020196C0(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4); -void sub_0201972C(u8 param0, void *param1, u16 param2, u16 param3); -void sub_0201975C(u8 param0, u16 param1); -void sub_020198C0(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6); -void sub_020198E8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); -void sub_02019964(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); -void sub_02019CB8(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7); -void sub_02019E2C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); -void sub_02019EBC(BgConfig *param0, u8 param1); -void sub_02019EE0(BgConfig *param0, u8 param1, u16 param2); -void sub_02019F04(BgConfig *param0, u8 param1, u16 param2); -void *sub_02019F28(u8 param0); -void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3); -void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3); -void *sub_02019FE4(BgConfig *param0, u8 param1); -int sub_02019FF0(BgConfig *param0, u8 param1); -u16 sub_02019FFC(BgConfig *param0, u8 param1); -u8 sub_0201A008(BgConfig *param0, u8 param1); -void sub_0201A1E4(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); -void sub_0201A424(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); -void sub_0201A60C(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); -void sub_0201A6D0(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); -Window *sub_0201A778(u32 param0, u8 param1); +BgConfig *BgConfig_New(u32 param0); +u32 BgConfig_GetHeapID(BgConfig *param0); +void SetAllGraphicsModes(const GraphicsModes *param0); +void SetScreenGraphicsModes(const GraphicsModes *param0, u8 param1); +void Bg_InitFromTemplate(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3); +void Bg_SetControlParam(BgConfig *param0, u8 param1, u8 param2, u8 param3); +void Bg_FreeTilemapBuffer(BgConfig *param0, u8 param1); +void Bg_SetPriority(u8 param0, u8 param1); +void Bg_ToggleLayer(u8 param0, u8 param1); +void Bg_SetOffset(BgConfig *param0, u8 param1, u8 param2, int param3); +int Bg_GetXOffset(BgConfig *param0, u32 param1); +int Bg_GetYOffset(BgConfig *param0, u32 param1); +void Bg_SetAffineParams(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4); +void Bg_CopyTilemapBufferToVRAM(BgConfig *param0, u8 param1); +void Bg_CopyTilemapBufferRangeToVRAM(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4); +void Bg_LoadTilemapBuffer(BgConfig *param0, u8 param1, const void *param2, u32 param3); +void Bg_LoadTiles(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4); +void Bg_ClearTilesRange(u8 param0, u32 param1, u32 param2, u32 param3); +void Bg_FillTilesRange(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void Bg_LoadPalette(u8 param0, void *param1, u16 param2, u16 param3); +void Bg_MaskPalette(u8 param0, u16 param1); +void Bg_LoadToTilemapRect(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6); +void Bg_CopyToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); +void Bg_CopyRectToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); +void Bg_FillTilemapRect(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7); +void Bg_ChangeTilemapRectPalette(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); +void Bg_ClearTilemap(BgConfig *param0, u8 param1); +void Bg_FillTilemap(BgConfig *param0, u8 param1, u16 param2); +void Bg_ScheduleFillTilemap(BgConfig *param0, u8 param1, u16 param2); +void *Bg_GetCharPtr(u8 param0); +void *Bg_GetTilemapBuffer(BgConfig *param0, u8 param1); +int Bg_GetXOffset2(BgConfig *param0, u8 param1); +u16 Bg_GetRotation(BgConfig *param0, u8 param1); +u8 Bg_GetPriority(BgConfig *param0, u8 param1); +void Bitmap_BlitRect4bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); +void Bitmap_BlitRect8bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); +void Bitmap_FillRect4bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); +void Bitmap_FillRect8bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); +Window *Window_New(u32 param0, u8 param1); void Window_Init(Window *param0); -u8 BGL_WindowAdded(Window *param0); -void BGL_AddWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8); -void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5); -void sub_0201A8D4(BgConfig *param0, Window *param1, const WindowTemplate *param2); -void BGL_DeleteWindow(Window *param0); -void sub_0201A928(Window *param0, u8 param1); -void sub_0201A954(Window *param0); -void sub_0201A9A4(Window *param0); -void sub_0201A9F4(Window *param0); -void sub_0201AA10(Window *param0, u32 param1, u32 param2); -void sub_0201AA3C(Window *param0); -void sub_0201ACCC(Window *param0); -void sub_0201ACF4(Window *param0); -void sub_0201AD10(Window *param0); -void BGL_FillWindow(Window *param0, u8 param1); -void sub_0201ADDC(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9); -void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10); -void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5); -void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6); -void sub_0201C04C(Window *param0, u8 param1, u8 param2, u8 param3); -BgConfig *sub_0201C28C(Window *param0); -u8 sub_0201C290(Window *param0); -u8 sub_0201C294(Window *param0); -u8 sub_0201C298(Window *param0); -u8 sub_0201C29C(Window *param0); -u8 sub_0201C2A0(Window *param0); -u16 sub_0201C2A4(Window *param0); -void sub_0201C2AC(Window *param0, u8 param1); -void sub_0201C2B0(Window *param0, u8 param1); -void sub_0201C2B4(Window *param0, u8 param1); -void sub_0201C2B8(BgConfig *param0); -void sub_0201C3C0(BgConfig *param0, u8 param1); -void sub_0201C63C(BgConfig *param0, u8 param1, u8 param2, int param3); -void sub_0201C660(BgConfig *param0, u8 param1, u8 param2, u16 param3); -void sub_0201C6A8(BgConfig *param0, u8 param1, u8 param2, fx32 param3); -void sub_0201C718(BgConfig *param0, u8 param1, u8 param2, int param3); -u8 sub_0201C784(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4); +u8 Window_IsInUse(Window *param0); +void Window_Add(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8); +void Window_AddToTopLeftCorner(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5); +void Window_AddFromTemplate(BgConfig *param0, Window *param1, const WindowTemplate *param2); +void Window_Remove(Window *param0); +void Windows_Delete(Window *param0, u8 param1); +void Window_CopyToVRAM(Window *param0); +void Window_ScheduleCopyToVRAM(Window *param0); +void Window_PutToTilemap(Window *param0); +void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2); +void Window_ClearTilemap(Window *param0); +void Window_LoadTiles(Window *param0); +void Window_ClearAndCopyToVRAM(Window *param0); +void Window_ClearAndScheduleCopyToVRAM(Window *param0); +void Window_FillTilemap(Window *param0, u8 param1); +void Window_BlitBitmapRect(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9); +void Window_BlitBitmapRectWithTransparency(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10); +void Window_FillRectWithColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5); +void Window_CopyGlyph(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6); +void Window_Scroll(Window *param0, u8 param1, u8 param2, u8 param3); +BgConfig *Window_GetBgConfig(Window *param0); +u8 Window_GetBgLayer(Window *param0); +u8 Window_GetWidth(Window *param0); +u8 Window_GetHeight(Window *param0); +u8 Window_GetXPos(Window *param0); +u8 Window_GetYPos(Window *param0); +u16 Window_GetBaseTile(Window *param0); +void Window_SetXPos(Window *param0, u8 param1); +void Window_SetYPos(Window *param0, u8 param1); +void Window_SetPalette(Window *param0, u8 param1); +void Bg_RunScheduledUpdates(BgConfig *param0); +void Bg_ScheduleTilemapTransfer(BgConfig *param0, u8 param1); +void Bg_ScheduleScroll(BgConfig *param0, u8 param1, u8 param2, int param3); +void Bg_ScheduleAffineRotation(BgConfig *param0, u8 param1, u8 param2, u16 param3); +void Bg_ScheduleAffineScale(BgConfig *param0, u8 param1, u8 param2, fx32 param3); +void Bg_ScheduleAffineRotationCenter(BgConfig *param0, u8 param1, u8 param2, int param3); +u8 Bg_DoesPixelAtXYMatchVal(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4); #endif // POKEPLATINUM_BG_WINDOW_H diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index 4ecefff05e..6c39381d8f 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -531,7 +531,7 @@ void ov16_0225D228(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 v1->unk_1C = 0; if ((v1->unk_14 == 0) || (v1->unk_14 == 2)) { - sub_02019184(BattleSystem_BGL(param0), 3, 2, 4 * 33); + Bg_SetOffset(BattleSystem_BGL(param0), 3, 2, 4 * 33); } SysTask_Start(ov16_0225FA70, v1, 0); @@ -2315,7 +2315,7 @@ static void ov16_0225FA70(SysTask *param0, void *param1) v5 = BattleSystem_BattleType(v0->unk_00); if ((v0->unk_1C < 33) && (v0->unk_0E >= 2) && ((v0->unk_14 == 0) || (v0->unk_14 == 2))) { - sub_02019184(BattleSystem_BGL(v0->unk_00), 3, 1, 4); + Bg_SetOffset(BattleSystem_BGL(v0->unk_00), 3, 1, 4); v0->unk_1C++; } @@ -4182,8 +4182,8 @@ static void ov16_02261E8C(SysTask *param0, void *param1) { Window *v2 = BattleSystem_Window(v0->unk_00, 0); - BGL_FillWindow(v2, 0xff); - sub_0201ACCC(v2); + Window_FillTilemap(v2, 0xff); + Window_LoadTiles(v2); } v0->unk_17 = ov16_0226CD08(ov16_0223E02C(v0->unk_00)); diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c index 292ef6172d..6435ad10cf 100644 --- a/src/battle/battle_io_command.c +++ b/src/battle/battle_io_command.c @@ -1018,8 +1018,8 @@ static void ov16_0225CB80(BattleSystem *param0, BattlerData *param1) { Window *v0 = BattleSystem_Window(param0, 0); - BGL_FillWindow(v0, 0xff); - sub_0201ACCC(v0); + Window_FillTilemap(v0, 0xff); + Window_LoadTiles(v0); ClearCommand(param0, param1->battler, 66); ZeroDataBuffer(param1); diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 5d4b74b4df..b8d1659d7e 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -10134,15 +10134,15 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) PaletteData *paletteSys = BattleSystem_PaletteSys(data->battleSys); G2_SetBG0Priority(1 + 1); // this is the background + 1; could do with a constant - BGL_SetPriority(1, 1); - BGL_SetPriority(2, 0); + Bg_SetPriority(1, 1); + Bg_SetPriority(2, 0); BattleSystem_SetGaugePriority(data->battleSys, 0 + 2); // gauge's default is 0 Window_SetFrame(bgl, 2, 1, 0, HEAP_ID_BATTLE); PaletteSys_LoadPalette(paletteSys, NARC_INDEX_GRAPHIC__PL_WINFRAME, Window_FramePalette(), HEAP_ID_BATTLE, 0, 0x20, 8 * 0x10); - BGL_AddWindow(bgl, window, 2, 0x11, 0x7, 14, 12, 11, (9 + 1)); - BGL_FillWindow(window, 0xFF); + Window_Add(bgl, window, 2, 0x11, 0x7, 14, 12, 11, (9 + 1)); + Window_FillTilemap(window, 0xFF); Window_Show(window, 0, 1, 8); data->seqNum = SEQ_GET_EXP_LEVEL_UP_SUMMARY_PRINT_DIFF; @@ -10193,7 +10193,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) }; Window *window = BattleSystem_Window(data->battleSys, 1); - BGL_WindowColor(window, 0xF, 80, 0, 36, 96); // clear out the diff section (keep the printed stat names) + Window_FillRectWithColor(window, 0xF, 80, 0, 36, 96); // clear out the diff section (keep the printed stat names) for (i = 0; i < STAT_MAX; i++) { msg.id = 949; // just a number @@ -10220,11 +10220,11 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) Window *window = BattleSystem_Window(data->battleSys, 1); Window_Clear(window, 0); - BGL_DeleteWindow(window); + Window_Remove(window); G2_SetBG0Priority(1); - BGL_SetPriority(1, 0); - BGL_SetPriority(2, 1); + Bg_SetPriority(1, 0); + Bg_SetPriority(2, 1); BattleSystem_SetGaugePriority(data->battleSys, 0); @@ -12261,7 +12261,7 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScript StringTemplate_Format(v5, v7, v6); Strbuf_Free(v6); Window_Init(&v9); - BGL_AddFramelessWindow(v8, &v9, 12, 4, 0, 0); + Window_AddToTopLeftCorner(v8, &v9, 12, 4, 0, 0); Text_AddPrinterWithParamsAndColor(&v9, FONT_SYSTEM, v7, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); v10 = sub_02012898(&v9, NNS_G2D_VRAM_TYPE_2DMAIN, 5); @@ -12284,7 +12284,7 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScript param1->spriteMgrAlloc = v11; sub_02012AC0(param1->fontOAM, 1); - BGL_DeleteWindow(&v9); + Window_Remove(&v9); } static void BattleScript_FreePartyLevelUpIcon(BattleSystem *param0, BattleScriptTaskData *param1) diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index f283e02171..2b9e2664b0 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -1099,7 +1099,7 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar) StringTemplate_SetNickname(strFormatter, 0, boxMon); StringTemplate_Format(strFormatter, nickname, template); - BGL_AddFramelessWindow(bgl, &window, HEALTHBAR_NAME_BLOCK_COUNT_X, HEALTHBAR_NAME_BLOCK_COUNT_Y, HEALTHBAR_NAME_WINDOW_OFFSET, HEALTHBAR_NAME_BACKGROUND_COLOR); + Window_AddToTopLeftCorner(bgl, &window, HEALTHBAR_NAME_BLOCK_COUNT_X, HEALTHBAR_NAME_BLOCK_COUNT_Y, HEALTHBAR_NAME_WINDOW_OFFSET, HEALTHBAR_NAME_BACKGROUND_COLOR); Text_AddPrinterWithParamsColorAndSpacing(&window, FONT_SYSTEM, nickname, 0, 0, TEXT_SPEED_NO_TRANSFER, HEALTHBAR_NAME_TEXT_COLOR, 0, 0, NULL); buf = window.pixels; @@ -1124,7 +1124,7 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar) sBattlerNameVRAMTransfer[healthbar->type][3].size); } - BGL_DeleteWindow(&window); + Window_Remove(&window); Strbuf_Free(nickname); Strbuf_Free(template); } @@ -1312,7 +1312,7 @@ static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1) v5 = MessageLoader_GetNewStrbuf(v4, 1220); } - BGL_AddFramelessWindow(v0, &v3, 13, 2, 0, 0xf); + Window_AddToTopLeftCorner(v0, &v3, 13, 2, 0, 0xf); Text_AddPrinterWithParamsColorAndSpacing(&v3, FONT_SYSTEM, v5, 0, 0, TEXT_SPEED_NO_TRANSFER, HEALTHBAR_NAME_TEXT_COLOR, 0, 0, NULL); v1 = v3.pixels; @@ -1333,7 +1333,7 @@ static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1) MI_CpuCopy16(&v8[Unk_ov16_0226F33C[1].size], (void *)((u32)v6 + Unk_ov16_0226F33C[3].pos + v2->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), Unk_ov16_0226F33C[3].size); } - BGL_DeleteWindow(&v3); + Window_Remove(&v3); Strbuf_Free(v5); } @@ -1360,7 +1360,7 @@ static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1) StringTemplate_SetNumber(v7, 0, param0->unk_27, 2, 1, 1); StringTemplate_Format(v7, v5, v6); - BGL_AddFramelessWindow(v0, &v3, 13, 2, 0, 0xf); + Window_AddToTopLeftCorner(v0, &v3, 13, 2, 0, 0xf); Text_AddPrinterWithParamsColorAndSpacing(&v3, FONT_SYSTEM, v5, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 2, 15), 0, 0, NULL); v1 = v3.pixels; @@ -1380,7 +1380,7 @@ static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1) MI_CpuCopy16(&v10[Unk_ov16_0226F34C[1].size], (void *)((u32)v8 + Unk_ov16_0226F34C[3].pos + v2->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), Unk_ov16_0226F34C[3].size); } - BGL_DeleteWindow(&v3); + Window_Remove(&v3); Strbuf_Free(v5); Strbuf_Free(v6); } diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index f563eef16d..ce981eb0b6 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -314,7 +314,7 @@ void ov16_0223B3E4(BattleSystem *param0) { SetMainCallback(NULL, NULL); ov16_02268A14(param0->unk_198); - BGL_DeleteWindow(¶m0->windows[0]); + Window_Remove(¶m0->windows[0]); ov16_0223C288(param0->unk_04); ov16_0223C2BC(param0); @@ -366,12 +366,12 @@ void ov16_0223B430(BattleSystem *param0) void ov16_0223B53C(BattleSystem *param0) { - BGL_DeleteWindow(¶m0->windows[0]); + Window_Remove(¶m0->windows[0]); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); - sub_02019044(param0->unk_04, 1); - sub_02019044(param0->unk_04, 2); - sub_02019044(param0->unk_04, 3); + Bg_FreeTilemapBuffer(param0->unk_04, 1); + Bg_FreeTilemapBuffer(param0->unk_04, 2); + Bg_FreeTilemapBuffer(param0->unk_04, 3); ov16_0223F3EC(param0); } @@ -430,12 +430,12 @@ void ov16_0223B578(BattleSystem *param0) }, }; - sub_020183C4(param0->unk_04, 1, &v0[0], 0); - sub_02019EBC(param0->unk_04, 1); - sub_020183C4(param0->unk_04, 2, &v0[1], 0); - sub_02019EBC(param0->unk_04, 2); - sub_020183C4(param0->unk_04, 3, &v0[2], 0); - sub_02019EBC(param0->unk_04, 3); + Bg_InitFromTemplate(param0->unk_04, 1, &v0[0], 0); + Bg_ClearTilemap(param0->unk_04, 1); + Bg_InitFromTemplate(param0->unk_04, 2, &v0[1], 0); + Bg_ClearTilemap(param0->unk_04, 2); + Bg_InitFromTemplate(param0->unk_04, 3, &v0[2], 0); + Bg_ClearTilemap(param0->unk_04, 3); G2_SetBG0Priority(1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -469,8 +469,8 @@ void ov16_0223B578(BattleSystem *param0) param0->unk_23FB_1 = 1; - BGL_AddWindow(param0->unk_04, param0->windows, 1, 0x2, 0x13, 27, 4, 0xb, (18 + 12) + 1); - BGL_FillWindow(param0->windows, 0xff); + Window_Add(param0->unk_04, param0->windows, 1, 0x2, 0x13, 27, 4, 0xb, (18 + 12) + 1); + Window_FillTilemap(param0->windows, 0xff); sub_0200E060(¶m0->windows[0], 0, 1, 10); ov16_0223DD4C(param0); @@ -549,8 +549,8 @@ static void ov16_0223B790(OverlayManager *param0) sub_02002F70(v0->unk_28, 2, (((16 - 2) * 16) * sizeof(u16)), 5); sub_02002F70(v0->unk_28, 3, 0x200, 5); - v0->unk_04 = sub_02018340(5); - v0->windows = sub_0201A778(5, 3); + v0->unk_04 = BgConfig_New(5); + v0->windows = Window_New(5, 3); for (v3 = 0; v3 < 4; v3++) { v0->unk_1CC[v3].unk_00 = Heap_AllocFromHeap(5, (32 * 10 * 10)); @@ -570,8 +570,8 @@ static void ov16_0223B790(OverlayManager *param0) ov16_0223C004(v0, v0->unk_04); - BGL_AddWindow(v0->unk_04, &v0->windows[0], 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1)); - BGL_FillWindow(&v0->windows[0], 0xff); + Window_Add(v0->unk_04, &v0->windows[0], 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1)); + Window_FillTilemap(&v0->windows[0], 0xff); sub_0200E060(&v0->windows[0], 0, 1, 10); v0->unk_90 = sub_0200C6E4(5); @@ -782,7 +782,7 @@ static void ov16_0223BCB4(OverlayManager *param0) RenderControlFlags_SetCanABSpeedUpPrint(0); RenderControlFlags_SetAutoScrollFlags(0); RenderControlFlags_SetSpeedUpOnTouch(0); - sub_0201A928(v0->windows, 3); + Windows_Delete(v0->windows, 3); Heap_FreeToHeap(v0->unk_04); Heap_FreeToHeap(v0->unk_21C); Heap_FreeToHeap(v0->unk_220); @@ -855,7 +855,7 @@ static void ov16_0223C004(BattleSystem *param0, BgConfig *param1) GX_BG0_AS_3D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -911,12 +911,12 @@ static void ov16_0223C004(BattleSystem *param0, BgConfig *param1) }, }; - sub_020183C4(param1, 1, &v2[0], 0); - sub_02019EBC(param1, 1); - sub_020183C4(param1, 2, &v2[1], 0); - sub_02019EBC(param1, 2); - sub_020183C4(param1, 3, &v2[2], 0); - sub_02019EBC(param1, 3); + Bg_InitFromTemplate(param1, 1, &v2[0], 0); + Bg_ClearTilemap(param1, 1); + Bg_InitFromTemplate(param1, 2, &v2[1], 0); + Bg_ClearTilemap(param1, 2); + Bg_InitFromTemplate(param1, 3, &v2[2], 0); + Bg_ClearTilemap(param1, 3); G2_SetBG0Priority(1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -980,9 +980,9 @@ static void ov16_0223C288(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); - sub_02019044(param0, 1); - sub_02019044(param0, 2); - sub_02019044(param0, 3); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 3); ov16_022687A0(param0); } @@ -1525,7 +1525,7 @@ static void ov16_0223CE68(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_28); - sub_0201C2B8(v0->unk_04); + Bg_RunScheduledUpdates(v0->unk_04); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -1536,7 +1536,7 @@ static void ov16_0223CF1C(void *param0) sub_02003694(v0->unk_0C); sub_0201DCAC(); - sub_0201C2B8(v0->unk_04); + Bg_RunScheduledUpdates(v0->unk_04); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -1629,7 +1629,7 @@ static void ov16_0223D0C4(SysTask *param0, void *param1) BattleSystem *v0 = param1; v0->unk_2434 += 3; - sub_02019184(v0->unk_04, 1, 3, v0->unk_2434); + Bg_SetOffset(v0->unk_04, 1, 3, v0->unk_2434); if (v0->unk_2434 == 0) { SysTask_Done(param0); @@ -1657,8 +1657,8 @@ static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1) sub_02002F70(v0->unk_0C, 0, 0x200, 5); sub_020038B0(v0->unk_0C, 0, 2, 0x0, 0, 256); - v0->unk_04 = sub_02018340(5); - v0->unk_08 = sub_0201A778(5, 1); + v0->unk_04 = BgConfig_New(5); + v0->unk_08 = Window_New(5, 1); sub_0207A744(v0); GXLayers_DisableEngineALayers(); @@ -1694,7 +1694,7 @@ static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1) GX_BG0_AS_3D, }; - sub_02018368(&v2); + SetAllGraphicsModes(&v2); } { @@ -1714,8 +1714,8 @@ static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1) 0 }; - sub_020183C4(v0->unk_04, 1, &v3, 0); - sub_02019EBC(v0->unk_04, 1); + Bg_InitFromTemplate(v0->unk_04, 1, &v3, 0); + Bg_ClearTilemap(v0->unk_04, 1); } { @@ -1731,8 +1731,8 @@ static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1) GXLayers_TurnBothDispOn(); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); - BGL_AddWindow(v0->unk_04, v0->unk_08, 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1)); - BGL_FillWindow(v0->unk_08, 0xff); + Window_Add(v0->unk_04, v0->unk_08, 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1)); + Window_FillTilemap(v0->unk_08, 0xff); sub_0200E060(v0->unk_08, 0, 1, 10); { @@ -1992,9 +1992,9 @@ static void ov16_0223D7B4(OverlayManager *param0) sub_0200F344(0, 0x0); sub_02002FA0(v0->unk_0C, 0); sub_02002F54(v0->unk_0C); - sub_0201A928(v0->unk_08, 1); + Windows_Delete(v0->unk_08, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); - sub_02019044(v0->unk_04, 1); + Bg_FreeTilemapBuffer(v0->unk_04, 1); Heap_FreeToHeap(v0->unk_04); Heap_FreeToHeap(v0); } diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 8db2e18a46..4e5c51703d 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -1203,7 +1203,7 @@ void ov16_0223EF8C(BattleSystem *param0) } } - sub_0201958C(param0->unk_04, 3, param0->unk_21C, 0x10000, 0); + Bg_LoadTiles(param0->unk_04, 3, param0->unk_21C, 0x10000, 0); ov16_02268700(¶m0->unk_17C[0]); ov16_02268700(¶m0->unk_17C[1]); @@ -1746,7 +1746,7 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p v2 = sub_02014B34(¶m0->trainers[param2].loseMsg, 5); } - BGL_FillWindow(v0, 0xff); + Window_FillTilemap(v0, 0xff); v1 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, v2, 0, 0, param4, BattleMessage_Callback); Strbuf_Free(v2); } @@ -1779,7 +1779,7 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p v3 = MessageLoader_Init(0, 26, v6, 5); v4 = MessageLoader_GetNewStrbuf(v3, v5); - BGL_FillWindow(v0, 0xff); + Window_FillTilemap(v0, 0xff); v1 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, v4, 0, 0, param4, BattleMessage_Callback); Strbuf_Free(v4); @@ -1788,7 +1788,7 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p } } else { TrainerData_LoadMessage(param1, param3, param0->msgBuffer, 5); - BGL_FillWindow(v0, 0xff); + Window_FillTilemap(v0, 0xff); v1 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, param0->msgBuffer, 0, 0, param4, BattleMessage_Callback); } @@ -1803,7 +1803,7 @@ u8 BattleMessage_Print(BattleSystem *battleSys, MessageLoader *msgLoader, Battle BattleMessage_FillFormatBuffers(battleSys, battleMsg); BattleMessage_Format(battleSys, msgLoader, battleMsg); - BGL_FillWindow(textWindow, 0xFF); + Window_FillTilemap(textWindow, 0xFF); return Text_AddPrinterWithParams(textWindow, FONT_MESSAGE, battleSys->msgBuffer, 0, 0, renderDelay, BattleMessage_Callback); } @@ -1817,7 +1817,7 @@ u8 BattleMessage_PrintToWindow(BattleSystem *param0, Window *param1, MessageLoad BattleMessage_Format(param0, param2, param3); if (param6 & 0x1) { - BGL_FillWindow(param1, 0xff); + Window_FillTilemap(param1, 0xff); } if (param6 & 0x2) { diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 283971fe36..da520c5818 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -1034,10 +1034,10 @@ void ov16_02268744(BgConfig *param0) int v0; for (v0 = 0; v0 < NELEMS(Unk_ov16_02270540); v0++) { - sub_020183C4(param0, 4 + v0, &Unk_ov16_02270540[v0], 0); - sub_02019EE0(param0, 4 + v0, (0x6000 / 0x20 - 1)); - sub_02019184(param0, 4 + v0, 0, 0); - sub_02019184(param0, 4 + v0, 3, 0); + Bg_InitFromTemplate(param0, 4 + v0, &Unk_ov16_02270540[v0], 0); + Bg_FillTilemap(param0, 4 + v0, (0x6000 / 0x20 - 1)); + Bg_SetOffset(param0, 4 + v0, 0, 0); + Bg_SetOffset(param0, 4 + v0, 3, 0); } } @@ -1046,8 +1046,8 @@ void ov16_022687A0(BgConfig *param0) int v0; for (v0 = 0; v0 < NELEMS(Unk_ov16_02270540); v0++) { - sub_02019120(4 + v0, 0); - sub_02019044(param0, 4 + v0); + Bg_ToggleLayer(4 + v0, 0); + Bg_FreeTilemapBuffer(param0, 4 + v0); } } @@ -1311,8 +1311,8 @@ void ov16_02268C04(NARC *param0, NARC *param1, UnkStruct_ov16_02268A14 *param2, for (v2 = 0; v2 < 4; v2++) { if ((v0->unk_04_val2[v2] != 0xffff) && ((param4 == 1) || (v0->unk_04_val2[v2] != v1->unk_04_val2[v2]))) { - sub_02019574(v3, 4 + v2, param2->unk_3C[v0->unk_04_val2[v2]], 0x800); - sub_0201C3C0(v3, 4 + v2); + Bg_LoadTilemapBuffer(v3, 4 + v2, param2->unk_3C[v0->unk_04_val2[v2]], 0x800); + Bg_ScheduleTilemapTransfer(v3, 4 + v2); } } @@ -1685,13 +1685,13 @@ static void ov16_022694A8(SysTask *param0, void *param1) v1 = 1; } - sub_02019184(v2, 6, 0, v0->unk_6AC / 0x100); + Bg_SetOffset(v2, 6, 0, v0->unk_6AC / 0x100); ov16_0226940C(v0); if (v1 == 1) { - sub_02019EE0(v2, 7, (0x6000 / 0x20 - 1)); - sub_02019120(7, 0); - BGL_SetPriority(7, 0); + Bg_FillTilemap(v2, 7, (0x6000 / 0x20 - 1)); + Bg_ToggleLayer(7, 0); + Bg_SetPriority(7, 0); GXS_SetVisibleWnd(GX_WNDMASK_NONE); SysTask_Done(param0); return; @@ -1833,8 +1833,8 @@ static void ov16_022698BC(UnkStruct_ov16_02268A14 *param0, int param1, int param v1 = BattleSystem_BGL(param0->unk_00); - sub_02019CB8(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 32, 8, 17); - sub_0201C3C0(v1, 5); + Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 32, 8, 17); + Bg_ScheduleTilemapTransfer(v1, 5); } sub_020129D0(param0->unk_4CC[1].unk_00, 0); @@ -1865,9 +1865,9 @@ static void ov16_02269938(UnkStruct_ov16_02268A14 *param0, int param1, int param v1 = BattleSystem_BGL(param0->unk_00); - sub_02019CB8(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 10, 8, 17); - sub_02019CB8(v1, 4, (0x6000 / 0x20 - 1), 0x16, 0x10, 10, 8, 17); - sub_0201C3C0(v1, 5); + Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 10, 8, 17); + Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0x16, 0x10, 10, 8, 17); + Bg_ScheduleTilemapTransfer(v1, 5); } sub_020129D0(param0->unk_4CC[1].unk_00, 0); @@ -2040,16 +2040,16 @@ static void ov16_02269E94(UnkStruct_ov16_02268A14 *param0, int param1, int param Heap_FreeToHeap(v4); v2 = BattleSystem_BGL(param0->unk_00); - sub_02019574(v2, 4, param0->unk_3C[6], 0x800); - sub_0201C3C0(v2, 4); + Bg_LoadTilemapBuffer(v2, 4, param0->unk_3C[6], 0x800); + Bg_ScheduleTilemapTransfer(v2, 4); } { BgConfig *v5 = BattleSystem_BGL(param0->unk_00); MI_CpuClear32(param0->unk_3C[4], 0x800); - sub_02019574(v5, 5, param0->unk_3C[4], 0x800); - sub_0201C3C0(v5, 5); + Bg_LoadTilemapBuffer(v5, 5, param0->unk_3C[4], 0x800); + Bg_ScheduleTilemapTransfer(v5, 5); } ov16_0226A98C(param0, ¶m0->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 178, 1, NULL); @@ -2392,8 +2392,8 @@ static int ov16_0226A528(UnkStruct_ov16_02268A14 *param0, int param1, int param2 BgConfig *v2; v2 = BattleSystem_BGL(param0->unk_00); - sub_02019EE0(v2, 5, (0x6000 / 0x20 - 1)); - sub_0201C3C0(v2, 5); + Bg_FillTilemap(v2, 5, (0x6000 / 0x20 - 1)); + Bg_ScheduleTilemapTransfer(v2, 5); } ov16_0226B314(param0, param1); @@ -2628,7 +2628,7 @@ static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A9 if (param10 == NULL) { Window_Init(&v1); - BGL_AddFramelessWindow(v5, &v1, v8, 16 / 8, 0, 0); + Window_AddToTopLeftCorner(v5, &v1, v8, 16 / 8, 0, 0); Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); } else { v1 = param10->unk_00; @@ -2662,7 +2662,7 @@ static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A9 sub_020128C4(v4, param7, param8); if (param10 == NULL) { - BGL_DeleteWindow(&v1); + Window_Remove(&v1); } param1->unk_00 = v4; @@ -2691,7 +2691,7 @@ static void ov16_0226AAF8(UnkStruct_ov16_02268A14 *param0) BgConfig *v6; v6 = BattleSystem_BGL(param0->unk_00); - v4 = sub_02019FE4(v6, 5); + v4 = Bg_GetTilemapBuffer(v6, 5); ov16_0226B20C(param0, v0, 0); @@ -2762,15 +2762,15 @@ static void ov16_0226ABE8(UnkStruct_ov16_02268A14 *param0) Heap_FreeToHeap(param0->unk_68[v1].unk_18[v0]); if (param0->unk_68[v1].unk_28[v0].unk_00.pixels != NULL) { - BGL_DeleteWindow(¶m0->unk_68[v1].unk_28[v0].unk_00); + Window_Remove(¶m0->unk_68[v1].unk_28[v0].unk_00); } if (param0->unk_68[v1].unk_78[v0].unk_00.pixels != NULL) { - BGL_DeleteWindow(¶m0->unk_68[v1].unk_78[v0].unk_00); + Window_Remove(¶m0->unk_68[v1].unk_78[v0].unk_00); } if (param0->unk_68[v1].unk_C8[v0].unk_00.pixels != NULL) { - BGL_DeleteWindow(¶m0->unk_68[v1].unk_C8[v0].unk_00); + Window_Remove(¶m0->unk_68[v1].unk_C8[v0].unk_00); } } } @@ -2846,11 +2846,11 @@ static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1, param3->unk_10 = v1; if (param3->unk_00.pixels != NULL) { - BGL_DeleteWindow(¶m3->unk_00); + Window_Remove(¶m3->unk_00); } Window_Init(¶m3->unk_00); - BGL_AddFramelessWindow(BattleSystem_BGL(param0->unk_00), ¶m3->unk_00, v1, 16 / 8, 0, 0); + Window_AddToTopLeftCorner(BattleSystem_BGL(param0->unk_00), ¶m3->unk_00, v1, 16 / 8, 0, 0); Text_AddPrinterWithParamsColorAndSpacing(¶m3->unk_00, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); } @@ -2963,9 +2963,9 @@ static void ov16_0226B0DC(UnkStruct_ov16_02268A14 *param0, int param1) ov16_0226B31C(param0, &Unk_ov16_022701FC[param1], &Unk_ov16_022702C4[param1], 4, 0); sub_02002FBC(v0, ¶m0->unk_58[0xe * 16], 1, v2[param1] * 16, 0x20); - sub_0201C3C0(v3, 4); - sub_02019CB8(v3, 5, (0x6000 / 0x20 - 1), Unk_ov16_022702C4[param1].unk_02, Unk_ov16_022702C4[param1].unk_00, Unk_ov16_022702C4[param1].unk_03 - Unk_ov16_022702C4[param1].unk_02 + 1, Unk_ov16_022702C4[param1].unk_01 - Unk_ov16_022702C4[param1].unk_00 + 1, 17); - sub_0201C3C0(v3, 5); + Bg_ScheduleTilemapTransfer(v3, 4); + Bg_FillTilemapRect(v3, 5, (0x6000 / 0x20 - 1), Unk_ov16_022702C4[param1].unk_02, Unk_ov16_022702C4[param1].unk_00, Unk_ov16_022702C4[param1].unk_03 - Unk_ov16_022702C4[param1].unk_02 + 1, Unk_ov16_022702C4[param1].unk_01 - Unk_ov16_022702C4[param1].unk_00 + 1, 17); + Bg_ScheduleTilemapTransfer(v3, 5); } static void ov16_0226B198(void) @@ -2974,9 +2974,9 @@ static void ov16_0226B198(void) for (i = 0; i < 4; i++) { if (4 + i != 6) { - sub_02019120(4 + i, 0); + Bg_ToggleLayer(4 + i, 0); } else { - sub_02019120(4 + i, 1); + Bg_ToggleLayer(4 + i, 1); } } } @@ -3202,7 +3202,7 @@ static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, co int v7; v2 = BattleSystem_BGL(param0->unk_00); - v3 = sub_02019FE4(v2, 4); + v3 = Bg_GetTilemapBuffer(v2, 4); v5 = param0->unk_3C[param3]; v7 = param1[param4]; @@ -3215,7 +3215,7 @@ static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, co } } - sub_0201C3C0(v2, 4); + Bg_ScheduleTilemapTransfer(v2, 4); } static void ov16_0226B390(SysTask *param0, void *param1) @@ -3542,10 +3542,10 @@ static void ov16_0226B988(SysTask *param0, void *param1) break; } - sub_02019184(v1, 4, 0, 0); - sub_02019184(v1, 4, 3, 0); - sub_02019184(v1, 5, 0, 0); - sub_02019184(v1, 5, 3, 0); + Bg_SetOffset(v1, 4, 0, 0); + Bg_SetOffset(v1, 4, 3, 0); + Bg_SetOffset(v1, 5, 0, 0); + Bg_SetOffset(v1, 5, 3, 0); BattleSystem_SetCommandSelectionFlags(v0->unk_00->unk_00, 1); Heap_FreeToHeap(param1); SysTask_Done(param0); @@ -3569,8 +3569,8 @@ static void ov16_0226BA88(SysTask *param0, void *param1) v4 = 0; } - sub_02019184(v1, 4, 0, v4); - sub_02019184(v1, 5, 0, 255 - v0->unk_0C); + Bg_SetOffset(v1, 4, 0, v4); + Bg_SetOffset(v1, 5, 0, 255 - v0->unk_0C); v2 = -v0->unk_08 / 100; } else { v4 = v0->unk_0C; @@ -3579,14 +3579,14 @@ static void ov16_0226BA88(SysTask *param0, void *param1) v4 = 0; } - sub_02019184(v1, 4, 0, v4); - sub_02019184(v1, 5, 0, v0->unk_0C); + Bg_SetOffset(v1, 4, 0, v4); + Bg_SetOffset(v1, 5, 0, v0->unk_0C); v2 = 255 + v0->unk_08 / 100; } - sub_02019184(v1, 4, 3, 0); - sub_02019184(v1, 5, 3, 0); + Bg_SetOffset(v1, 4, 3, 0); + Bg_SetOffset(v1, 5, 3, 0); v3 = (18 * 8) + (v0->unk_0A) / 100; @@ -3626,10 +3626,10 @@ static void ov16_0226BB94(void *param0) if (v1 == (18 * 8)) { BgConfig *v3 = BattleSystem_BGL(v0->unk_00->unk_00); - sub_02019184(v3, 4, 0, 0); - sub_02019184(v3, 4, 3, v0->unk_10); - sub_02019184(v3, 5, 0, 0); - sub_02019184(v3, 5, 3, v0->unk_10); + Bg_SetOffset(v3, 4, 0, 0); + Bg_SetOffset(v3, 4, 3, v0->unk_10); + Bg_SetOffset(v3, 5, 0, 0); + Bg_SetOffset(v3, 5, 3, v0->unk_10); } else if (v1 > 192) { BgConfig *v4 = BattleSystem_BGL(v0->unk_00->unk_00); @@ -3640,8 +3640,8 @@ static void ov16_0226BB94(void *param0) v2 = 0; } - sub_02019184(v4, 4, 0, 255 - v0->unk_0C); - sub_02019184(v4, 5, 0, 255 - v0->unk_0C); + Bg_SetOffset(v4, 4, 0, 255 - v0->unk_0C); + Bg_SetOffset(v4, 5, 0, 255 - v0->unk_0C); } else { v2 = v0->unk_0C; @@ -3649,12 +3649,12 @@ static void ov16_0226BB94(void *param0) v2 = 0; } - sub_02019184(v4, 4, 0, v0->unk_0C); - sub_02019184(v4, 5, 0, v0->unk_0C); + Bg_SetOffset(v4, 4, 0, v0->unk_0C); + Bg_SetOffset(v4, 5, 0, v0->unk_0C); } - sub_02019184(v4, 4, 3, 0); - sub_02019184(v4, 5, 3, 0); + Bg_SetOffset(v4, 4, 3, 0); + Bg_SetOffset(v4, 5, 3, 0); } } @@ -3668,14 +3668,14 @@ static void ov16_0226BC50(SysTask *param0, void *param1) for (v2 = 0; v2 < 4; v2++) { if (v1->unk_04_val2[v2] == 0xffff) { - sub_02019120(4 + v2, 0); + Bg_ToggleLayer(4 + v2, 0); } else { - sub_02019120(4 + v2, 1); + Bg_ToggleLayer(4 + v2, 1); } } for (v2 = 0; v2 < 4; v2++) { - BGL_SetPriority(4 + v2, v1->unk_0C_val2[v2]); + Bg_SetPriority(4 + v2, v1->unk_0C_val2[v2]); } SysTask_Done(param0); @@ -4595,16 +4595,16 @@ void ov16_0226CEB0(UnkStruct_ov16_02268A14 *param0, int param1) v6 = 30; v7 = 6; - sub_02019CB8(v0, 5, v2, v4, v5, 1, 1, v3); - sub_02019CB8(v0, 5, v2 + 1, v4 + 1, v5, v6 - 2, 1, v3); - sub_02019CB8(v0, 5, v2 + 2, v4 + v6 - 1, v5, 1, 1, v3); - sub_02019CB8(v0, 5, v2 + 3, v4, v5 + 1, 1, v7 - 2, v3); - sub_02019CB8(v0, 5, v2 + 5, v4 + v6 - 1, v5 + 1, 1, v7 - 2, v3); - sub_02019CB8(v0, 5, v2 + 6, v4, v5 + v7 - 1, 1, 1, v3); - sub_02019CB8(v0, 5, v2 + 7, v4 + 1, v5 + v7 - 1, v6 - 2, 1, v3); - sub_02019CB8(v0, 5, v2 + 8, v4 + v6 - 1, v5 + v7 - 1, 1, 1, v3); - sub_02019CB8(v0, 5, v2 + 4, v4 + 1, v5 + 1, v6 - 2, v7 - 2, v3); - sub_0201C3C0(v0, 5); + Bg_FillTilemapRect(v0, 5, v2, v4, v5, 1, 1, v3); + Bg_FillTilemapRect(v0, 5, v2 + 1, v4 + 1, v5, v6 - 2, 1, v3); + Bg_FillTilemapRect(v0, 5, v2 + 2, v4 + v6 - 1, v5, 1, 1, v3); + Bg_FillTilemapRect(v0, 5, v2 + 3, v4, v5 + 1, 1, v7 - 2, v3); + Bg_FillTilemapRect(v0, 5, v2 + 5, v4 + v6 - 1, v5 + 1, 1, v7 - 2, v3); + Bg_FillTilemapRect(v0, 5, v2 + 6, v4, v5 + v7 - 1, 1, 1, v3); + Bg_FillTilemapRect(v0, 5, v2 + 7, v4 + 1, v5 + v7 - 1, v6 - 2, 1, v3); + Bg_FillTilemapRect(v0, 5, v2 + 8, v4 + v6 - 1, v5 + v7 - 1, 1, 1, v3); + Bg_FillTilemapRect(v0, 5, v2 + 4, v4 + 1, v5 + 1, v6 - 2, v7 - 2, v3); + Bg_ScheduleTilemapTransfer(v0, 5); } { diff --git a/src/bg_window.c b/src/bg_window.c index 75ec3d7394..199298e0f8 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -44,7 +44,7 @@ static void sub_0201C73C(Background *param0, u8 param1, int param2); static void sub_0201C3D0(BgConfig *param0); static void sub_0201C2D0(BgConfig *param0); -BgConfig *sub_02018340(u32 param0) +BgConfig *BgConfig_New(u32 param0) { BgConfig *v0 = Heap_AllocFromHeap(param0, sizeof(BgConfig)); @@ -57,12 +57,12 @@ BgConfig *sub_02018340(u32 param0) return v0; } -u32 sub_02018364(BgConfig *param0) +u32 BgConfig_GetHeapID(BgConfig *param0) { return param0->heapID; } -void sub_02018368(const GraphicsModes *param0) +void SetAllGraphicsModes(const GraphicsModes *param0) { GX_SetGraphicsMode(param0->displayMode, param0->mainBgMode, param0->bg0As2DOr3D); GXS_SetGraphicsMode(param0->subBgMode); @@ -74,7 +74,7 @@ void sub_02018368(const GraphicsModes *param0) GXLayers_DisableEngineBLayers(); } -void sub_020183A0(const GraphicsModes *param0, u8 param1) +void SetScreenGraphicsModes(const GraphicsModes *param0, u8 param1) { if (param1 == 0) { GX_SetGraphicsMode(param0->displayMode, param0->mainBgMode, param0->bg0As2DOr3D); @@ -85,7 +85,7 @@ void sub_020183A0(const GraphicsModes *param0, u8 param1) } } -void sub_020183C4(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3) +void Bg_InitFromTemplate(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3) { u8 v0 = sub_02018F80(param2->screenSize, param3); @@ -221,11 +221,11 @@ void sub_020183C4(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 para param0->bgs[param1].tileSize = 0x40; } - sub_02019184(param0, param1, 0, param2->x); - sub_02019184(param0, param1, 3, param2->y); + Bg_SetOffset(param0, param1, 0, param2->x); + Bg_SetOffset(param0, param1, 3, param2->y); } -void sub_02018898(BgConfig *param0, u8 param1, u8 param2, u8 param3) +void Bg_SetControlParam(BgConfig *param0, u8 param1, u8 param2, u8 param3) { if (param2 == 0) { param0->bgs[param1].colorMode = param3; @@ -523,7 +523,7 @@ static void sub_02018FF4(u8 param0, u8 *param1, u8 *param2) } } -void sub_02019044(BgConfig *param0, u8 param1) +void Bg_FreeTilemapBuffer(BgConfig *param0, u8 param1) { if (param0->bgs[param1].tilemapBuffer == NULL) { return; @@ -533,7 +533,7 @@ void sub_02019044(BgConfig *param0, u8 param1) param0->bgs[param1].tilemapBuffer = NULL; } -void BGL_SetPriority(u8 param0, u8 param1) +void Bg_SetPriority(u8 param0, u8 param1) { switch (param0) { case 0: @@ -563,7 +563,7 @@ void BGL_SetPriority(u8 param0, u8 param1) } } -void sub_02019120(u8 param0, u8 param1) +void Bg_ToggleLayer(u8 param0, u8 param1) { switch (param0) { case 0: @@ -593,7 +593,7 @@ void sub_02019120(u8 param0, u8 param1) } } -void sub_02019184(BgConfig *param0, u8 param1, u8 param2, int param3) +void Bg_SetOffset(BgConfig *param0, u8 param1, u8 param2, int param3) { int v0, v1; @@ -647,12 +647,12 @@ void sub_02019184(BgConfig *param0, u8 param1, u8 param2, int param3) } } -int sub_020192EC(BgConfig *param0, u32 param1) +int Bg_GetXOffset(BgConfig *param0, u32 param1) { return param0->bgs[param1].xOffset; } -int sub_020192F8(BgConfig *param0, u32 param1) +int Bg_GetYOffset(BgConfig *param0, u32 param1) { return param0->bgs[param1].yOffset; } @@ -681,7 +681,7 @@ static void sub_02019304(Background *param0, u8 param1, int param2) } } -void sub_02019348(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4) +void Bg_SetAffineParams(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4) { switch (param1) { case 2: @@ -704,10 +704,10 @@ static void sub_020193E4(BgConfig *param0, u8 param1) MtxFx22 v0; sub_0201D470(&v0, 0, FX32_ONE, FX32_ONE, 0); - sub_02019348(param0, param1, &v0, 0, 0); + Bg_SetAffineParams(param0, param1, &v0, 0, 0); } -void sub_02019410(const void *param0, void *param1, u32 param2) +static void sub_02019410(const void *param0, void *param1, u32 param2) { if (param2 == 0) { MI_UncompressLZ8(param0, param1); @@ -720,12 +720,12 @@ void sub_02019410(const void *param0, void *param1, u32 param2) } } -void sub_02019448(BgConfig *param0, u8 param1) +void Bg_CopyTilemapBufferToVRAM(BgConfig *param0, u8 param1) { - sub_02019460(param0, param1, param0->bgs[param1].tilemapBuffer, param0->bgs[param1].bufferSize, param0->bgs[param1].baseTile); + Bg_CopyTilemapBufferRangeToVRAM(param0, param1, param0->bgs[param1].tilemapBuffer, param0->bgs[param1].bufferSize, param0->bgs[param1].baseTile); } -void sub_02019460(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4) +void Bg_CopyTilemapBufferRangeToVRAM(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4) { void *v0; @@ -781,12 +781,12 @@ static void sub_020194E0(u8 param0, void *param1, u32 param2, u32 param3) } } -void sub_02019574(BgConfig *param0, u8 param1, const void *param2, u32 param3) +void Bg_LoadTilemapBuffer(BgConfig *param0, u8 param1, const void *param2, u32 param3) { sub_02019410(param2, param0->bgs[param1].tilemapBuffer, param3); } -void sub_0201958C(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4) +void Bg_LoadTiles(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4) { if (param0->bgs[param1].colorMode == GX_BG_COLORMODE_16) { sub_020195B8(param0, param1, param2, param3, param4 * 0x20); @@ -845,7 +845,7 @@ static void sub_020195FC(u8 param0, void *param1, u32 param2, u32 param3) } } -void sub_02019690(u8 param0, u32 param1, u32 param2, u32 param3) +void Bg_ClearTilesRange(u8 param0, u32 param1, u32 param2, u32 param3) { u32 *v0 = (u32 *)Heap_AllocFromHeapAtEnd(param3, param1); @@ -855,7 +855,7 @@ void sub_02019690(u8 param0, u32 param1, u32 param2, u32 param3) Heap_FreeToHeapExplicit(param3, v0); } -void sub_020196C0(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4) +void Bg_FillTilesRange(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4) { u32 *v0; u32 v1; @@ -876,7 +876,7 @@ void sub_020196C0(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 para Heap_FreeToHeap(v0); } -void sub_0201972C(u8 param0, void *param1, u16 param2, u16 param3) +void Bg_LoadPalette(u8 param0, void *param1, u16 param2, u16 param3) { DC_FlushRange((void *)param1, param2); @@ -887,9 +887,9 @@ void sub_0201972C(u8 param0, void *param1, u16 param2, u16 param3) } } -void sub_0201975C(u8 param0, u16 param1) +void Bg_MaskPalette(u8 param0, u16 param1) { - sub_0201972C(param0, ¶m1, 2, 0); + Bg_LoadPalette(param0, ¶m1, 2, 0); } static u16 sub_02019774(u8 param0, u8 param1, u8 param2) @@ -969,12 +969,12 @@ static u16 sub_020197E0(u8 param0, u8 param1, u8 param2, u8 param3) return v1; } -void sub_020198C0(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6) +void Bg_LoadToTilemapRect(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6) { - sub_020198E8(param0, param1, param3, param4, param5, param6, param2, 0, 0, param5, param6); + Bg_CopyToTilemapRect(param0, param1, param3, param4, param5, param6, param2, 0, 0, param5, param6); } -void sub_020198E8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) +void Bg_CopyToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) { if (param0->bgs[param1].type != 1) { sub_020199E0(¶m0->bgs[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 0); @@ -983,7 +983,7 @@ void sub_020198E8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, } } -void sub_02019964(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) +void Bg_CopyRectToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) { if (param0->bgs[param1].type != 1) { sub_020199E0(¶m0->bgs[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 1); @@ -1080,7 +1080,7 @@ static void sub_02019B54(Background *param0, u8 param1, u8 param2, u8 param3, u8 } } -void sub_02019CB8(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7) +void Bg_FillTilemapRect(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7) { if (param0->bgs[param1].type != 1) { sub_02019D08(¶m0->bgs[param1], param2, param3, param4, param5, param6, param7); @@ -1155,7 +1155,7 @@ static void sub_02019DB8(Background *param0, u8 param1, u8 param2, u8 param3, u8 } } -void sub_02019E2C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) +void Bg_ChangeTilemapRectPalette(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) { u16 *v0; u8 v1, v2; @@ -1186,37 +1186,37 @@ void sub_02019E2C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, } } -void sub_02019EBC(BgConfig *param0, u8 param1) +void Bg_ClearTilemap(BgConfig *param0, u8 param1) { if (param0->bgs[param1].tilemapBuffer == NULL) { return; } MI_CpuClear16(param0->bgs[param1].tilemapBuffer, param0->bgs[param1].bufferSize); - sub_02019448(param0, param1); + Bg_CopyTilemapBufferToVRAM(param0, param1); } -void sub_02019EE0(BgConfig *param0, u8 param1, u16 param2) +void Bg_FillTilemap(BgConfig *param0, u8 param1, u16 param2) { if (param0->bgs[param1].tilemapBuffer == NULL) { return; } MI_CpuFill16(param0->bgs[param1].tilemapBuffer, param2, param0->bgs[param1].bufferSize); - sub_02019448(param0, param1); + Bg_CopyTilemapBufferToVRAM(param0, param1); } -void sub_02019F04(BgConfig *param0, u8 param1, u16 param2) +void Bg_ScheduleFillTilemap(BgConfig *param0, u8 param1, u16 param2) { if (param0->bgs[param1].tilemapBuffer == NULL) { return; } MI_CpuFill16(param0->bgs[param1].tilemapBuffer, param2, param0->bgs[param1].bufferSize); - sub_0201C3C0(param0, param1); + Bg_ScheduleTilemapTransfer(param0, param1); } -void *sub_02019F28(u8 param0) +void *Bg_GetCharPtr(u8 param0) { switch (param0) { case 0: @@ -1240,7 +1240,7 @@ void *sub_02019F28(u8 param0) return NULL; } -void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3) +static void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3) { u32 v0; @@ -1261,7 +1261,7 @@ void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3) } } -void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3) +static void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3) { void *v0; @@ -1271,22 +1271,22 @@ void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3) return v0; } -void *sub_02019FE4(BgConfig *param0, u8 param1) +void *Bg_GetTilemapBuffer(BgConfig *param0, u8 param1) { return param0->bgs[param1].tilemapBuffer; } -int sub_02019FF0(BgConfig *param0, u8 param1) +int Bg_GetXOffset2(BgConfig *param0, u8 param1) { return param0->bgs[param1].xOffset; } -u16 sub_02019FFC(BgConfig *param0, u8 param1) +u16 Bg_GetRotation(BgConfig *param0, u8 param1) { return param0->bgs[param1].rotation; } -u8 sub_0201A008(BgConfig *param0, u8 param1) +u8 Bg_GetPriority(BgConfig *param0, u8 param1) { switch (param1) { case 0: { @@ -1377,7 +1377,7 @@ u8 sub_0201A008(BgConfig *param0, u8 param1) return 0; } -void sub_0201A1E4(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) +void Bitmap_BlitRect4bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) { int v0, v1, v2, v3, v4, v5, v6, v7, v8, v9; u8 *v10, *v11; @@ -1425,7 +1425,7 @@ void sub_0201A1E4(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 pa } } -void sub_0201A424(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) +void Bitmap_BlitRect8bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) { int v0, v1, v2, v3, v4, v5, v6, v7; u8 *v8; @@ -1468,7 +1468,7 @@ void sub_0201A424(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 pa } } -void sub_0201A60C(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) +void Bitmap_FillRect4bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) { int v0, v1, v2, v3, v4; u8 *v5; @@ -1502,7 +1502,7 @@ void sub_0201A60C(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 } } -void sub_0201A6D0(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) +void Bitmap_FillRect8bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) { int v0, v1, v2, v3, v4; u8 *v5; @@ -1529,7 +1529,7 @@ void sub_0201A6D0(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 } } -Window *sub_0201A778(u32 param0, u8 param1) +Window *Window_New(u32 param0, u8 param1) { Window *v0; u16 v1; @@ -1557,7 +1557,7 @@ void Window_Init(Window *param0) param0->colorMode = UnkEnum_00; } -u8 BGL_WindowAdded(Window *param0) +u8 Window_IsInUse(Window *param0) { if ((param0->bgConfig == NULL) || (param0->bgLayer == 0xff) || (param0->pixels == NULL)) { return 0; @@ -1566,7 +1566,7 @@ u8 BGL_WindowAdded(Window *param0) return 1; } -void BGL_AddWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8) +void Window_Add(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8) { void *v0; u32 v1; @@ -1594,7 +1594,7 @@ void BGL_AddWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 pa param1->colorMode = (param0->bgs[param2].colorMode == GX_BG_COLORMODE_16) ? UnkEnum_00 : UnkEnum_01; } -void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5) +void Window_AddToTopLeftCorner(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5) { void *v0; u32 v1; @@ -1617,13 +1617,13 @@ void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 para param1->colorMode = UnkEnum_00; } -void sub_0201A8D4(BgConfig *param0, Window *param1, const WindowTemplate *param2) +void Window_AddFromTemplate(BgConfig *param0, Window *param1, const WindowTemplate *param2) { - BGL_AddWindow( + Window_Add( param0, param1, param2->bgLayer, param2->tilemapLeft, param2->tilemapTop, param2->width, param2->height, param2->palette, param2->baseTile); } -void BGL_DeleteWindow(Window *param0) +void Window_Remove(Window *param0) { Heap_FreeToHeap(param0->pixels); @@ -1638,7 +1638,7 @@ void BGL_DeleteWindow(Window *param0) param0->pixels = NULL; } -void sub_0201A928(Window *param0, u8 param1) +void Windows_Delete(Window *param0, u8 param1) { u16 v0; @@ -1698,7 +1698,7 @@ static const u8 Unk_020E5694[] = { 0x20 }; -void sub_0201A954(Window *param0) +void Window_CopyToVRAM(Window *param0) { GF_ASSERT(param0 != NULL); GF_ASSERT(param0->bgConfig != NULL); @@ -1708,7 +1708,7 @@ void sub_0201A954(Window *param0) Unk_020E56CC[param0->bgConfig->bgs[param0->bgLayer].type](param0); } -void sub_0201A9A4(Window *param0) +void Window_ScheduleCopyToVRAM(Window *param0) { GF_ASSERT(param0 != NULL); GF_ASSERT(param0->bgConfig != NULL); @@ -1718,12 +1718,12 @@ void sub_0201A9A4(Window *param0) Unk_020E56C0[param0->bgConfig->bgs[param0->bgLayer].type](param0); } -void sub_0201A9F4(Window *param0) +void Window_PutToTilemap(Window *param0) { Unk_020E569C[param0->bgConfig->bgs[param0->bgLayer].type](param0); } -void sub_0201AA10(Window *param0, u32 param1, u32 param2) +void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2) { u32 v0, v1; @@ -1739,7 +1739,7 @@ void sub_0201AA10(Window *param0, u32 param1, u32 param2) param0->height = v1; } -void sub_0201AA3C(Window *param0) +void Window_ClearTilemap(Window *param0) { Unk_020E56D8[param0->bgConfig->bgs[param0->bgLayer].type](param0); } @@ -1828,45 +1828,45 @@ static void sub_0201ABC8(Window *param0) static void sub_0201AC20(Window *param0) { sub_0201AA58(param0); - sub_0201ACCC(param0); - sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); + Window_LoadTiles(param0); + Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); } static void sub_0201AC4C(Window *param0) { sub_0201AA58(param0); - sub_0201C3C0(param0->bgConfig, param0->bgLayer); - sub_0201ACCC(param0); + Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer); + Window_LoadTiles(param0); } static void sub_0201AC64(Window *param0) { sub_0201AADC(param0); - sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); - sub_0201958C(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile); + Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); + Bg_LoadTiles(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile); } static void sub_0201ACA0(Window *param0) { sub_0201AADC(param0); - sub_0201C3C0(param0->bgConfig, param0->bgLayer); - sub_0201958C(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile); + Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer); + Bg_LoadTiles(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile); } -void sub_0201ACCC(Window *param0) +void Window_LoadTiles(Window *param0) { u32 v0 = param0->width * param0->height * param0->bgConfig->bgs[param0->bgLayer].tileSize; - sub_0201958C(param0->bgConfig, param0->bgLayer, param0->pixels, v0, param0->baseTile); + Bg_LoadTiles(param0->bgConfig, param0->bgLayer, param0->pixels, v0, param0->baseTile); } -void sub_0201ACF4(Window *param0) +void Window_ClearAndCopyToVRAM(Window *param0) { Unk_020E56B4[param0->bgConfig->bgs[param0->bgLayer].type](param0); } -void sub_0201AD10(Window *param0) +void Window_ClearAndScheduleCopyToVRAM(Window *param0) { Unk_020E56A8[param0->bgConfig->bgs[param0->bgLayer].type](param0); } @@ -1874,28 +1874,28 @@ void sub_0201AD10(Window *param0) static void sub_0201AD2C(Window *param0) { sub_0201AB38(param0); - sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); + Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); } static void sub_0201AD54(Window *param0) { sub_0201AB38(param0); - sub_0201C3C0(param0->bgConfig, param0->bgLayer); + Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer); } static void sub_0201AD68(Window *param0) { sub_0201ABC8(param0); - sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); + Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); } static void sub_0201AD90(Window *param0) { sub_0201ABC8(param0); - sub_0201C3C0(param0->bgConfig, param0->bgLayer); + Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer); } -void BGL_FillWindow(Window *param0, u8 param1) +void Window_FillTilemap(Window *param0, u8 param1) { u32 v0; u32 v1; @@ -1910,12 +1910,12 @@ void BGL_FillWindow(Window *param0, u8 param1) MI_CpuFillFast(param0->pixels, v1, v0); } -void sub_0201ADDC(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9) +void Window_BlitBitmapRect(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9) { - sub_0201AE08(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9, 0); + Window_BlitBitmapRectWithTransparency(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9, 0); } -void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10) +void Window_BlitBitmapRectWithTransparency(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10) { Bitmap v0; Bitmap v1; @@ -1928,13 +1928,13 @@ void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 para v1.height = (u16)(param0->height * 0x8); if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) { - sub_0201A1E4(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); + Bitmap_BlitRect4bpp(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); } else { - sub_0201A424(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); + Bitmap_BlitRect8bpp(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); } } -void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5) +void Window_FillRectWithColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5) { Bitmap v0; @@ -1943,13 +1943,13 @@ void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 para v0.height = (u16)(param0->height * 0x8); if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) { - sub_0201A60C((const Bitmap *)&v0, param2, param3, param4, param5, param1); + Bitmap_FillRect4bpp((const Bitmap *)&v0, param2, param3, param4, param5, param1); } else { - sub_0201A6D0((const Bitmap *)&v0, param2, param3, param4, param5, param1); + Bitmap_FillRect8bpp((const Bitmap *)&v0, param2, param3, param4, param5, param1); } } -void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6) +void Window_CopyGlyph(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6) { u8 *v0; u16 v1, v2; @@ -2972,7 +2972,7 @@ void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 } } -void sub_0201C04C(Window *param0, u8 param1, u8 param2, u8 param3) +void Window_Scroll(Window *param0, u8 param1, u8 param2, u8 param3) { if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) { sub_0201C06C(param0, param1, param2, param3); @@ -3118,57 +3118,57 @@ static void sub_0201C158(Window *param0, u8 param1, u8 param2, u8 param3) } } -BgConfig *sub_0201C28C(Window *param0) +BgConfig *Window_GetBgConfig(Window *param0) { return param0->bgConfig; } -u8 sub_0201C290(Window *param0) +u8 Window_GetBgLayer(Window *param0) { return param0->bgLayer; } -u8 sub_0201C294(Window *param0) +u8 Window_GetWidth(Window *param0) { return param0->width; } -u8 sub_0201C298(Window *param0) +u8 Window_GetHeight(Window *param0) { return param0->height; } -u8 sub_0201C29C(Window *param0) +u8 Window_GetXPos(Window *param0) { return param0->tilemapLeft; } -u8 sub_0201C2A0(Window *param0) +u8 Window_GetYPos(Window *param0) { return param0->tilemapTop; } -u16 sub_0201C2A4(Window *param0) +u16 Window_GetBaseTile(Window *param0) { return param0->baseTile; } -void sub_0201C2AC(Window *param0, u8 param1) +void Window_SetXPos(Window *param0, u8 param1) { param0->tilemapLeft = param1; } -void sub_0201C2B0(Window *param0, u8 param1) +void Window_SetYPos(Window *param0, u8 param1) { param0->tilemapTop = param1; } -void sub_0201C2B4(Window *param0, u8 param1) +void Window_SetPalette(Window *param0, u8 param1) { param0->palette = param1; } -void sub_0201C2B8(BgConfig *param0) +void Bg_RunScheduledUpdates(BgConfig *param0) { sub_0201C3D0(param0); sub_0201C2D0(param0); @@ -3212,7 +3212,7 @@ static void sub_0201C2D0(BgConfig *param0) } } -void sub_0201C3C0(BgConfig *param0, u8 param1) +void Bg_ScheduleTilemapTransfer(BgConfig *param0, u8 param1) { param0->bufferTransferScheduled |= (1 << param1); } @@ -3280,13 +3280,13 @@ static void sub_0201C3D0(BgConfig *param0) } } -void sub_0201C63C(BgConfig *param0, u8 param1, u8 param2, int param3) +void Bg_ScheduleScroll(BgConfig *param0, u8 param1, u8 param2, int param3) { sub_02019304(¶m0->bgs[param1], param2, param3); param0->scrollScheduled |= (1 << param1); } -void sub_0201C660(BgConfig *param0, u8 param1, u8 param2, u16 param3) +void Bg_ScheduleAffineRotation(BgConfig *param0, u8 param1, u8 param2, u16 param3) { sub_0201C684(¶m0->bgs[param1], param2, param3); param0->scrollScheduled |= (1 << param1); @@ -3307,7 +3307,7 @@ static void sub_0201C684(Background *param0, u8 param1, u16 param2) } } -void sub_0201C6A8(BgConfig *param0, u8 param1, u8 param2, fx32 param3) +void Bg_ScheduleAffineScale(BgConfig *param0, u8 param1, u8 param2, fx32 param3) { sub_0201C6CC(¶m0->bgs[param1], param2, param3); param0->scrollScheduled |= (1 << param1); @@ -3337,7 +3337,7 @@ static void sub_0201C6CC(Background *param0, u8 param1, fx32 param2) } } -void sub_0201C718(BgConfig *param0, u8 param1, u8 param2, int param3) +void Bg_ScheduleAffineRotationCenter(BgConfig *param0, u8 param1, u8 param2, int param3) { sub_0201C73C(¶m0->bgs[param1], param2, param3); param0->scrollScheduled |= (1 << param1); @@ -3367,7 +3367,7 @@ static void sub_0201C73C(Background *param0, u8 param1, int param2) } } -u8 sub_0201C784(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4) +u8 Bg_DoesPixelAtXYMatchVal(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4) { u8 *v0; u16 v1; @@ -3380,7 +3380,7 @@ u8 sub_0201C784(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4 } v1 = sub_02019774((u8)(param2 >> 3), (u8)(param3 >> 3), param0->bgs[param1].screenSize); - v0 = (u8 *)sub_02019F28(param1); + v0 = (u8 *)Bg_GetCharPtr(param1); v2 = (u8)(param2 & 7); v3 = (u8)(param3 & 7); diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index f561c38963..88558678d1 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -348,12 +348,12 @@ BOOL ChooseStarter_Init(OverlayManager *param0, int *param1) SetupDrawing(app, HEAP_ID_CHOOSE_STARTER_APP); GraphicsModes bglHeader; - app->bgl = sub_02018340(HEAP_ID_CHOOSE_STARTER_APP); + app->bgl = BgConfig_New(HEAP_ID_CHOOSE_STARTER_APP); bglHeader.displayMode = GX_DISPMODE_GRAPHICS; bglHeader.mainBgMode = GX_BGMODE_0; bglHeader.subBgMode = GX_BGMODE_1; bglHeader.bg0As2DOr3D = GX_BG0_AS_3D; - sub_02018368(&bglHeader); + SetAllGraphicsModes(&bglHeader); SetupBGL(app->bgl, HEAP_ID_CHOOSE_STARTER_APP); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -479,7 +479,7 @@ static void ChooseStarterAppMainCallback(void *data) ChooseStarterApp *app = data; sub_0200A858(); - sub_0201C2B8(app->bgl); + Bg_RunScheduledUpdates(app->bgl); sub_02008A94(app->spriteManager); sub_0201DCAC(); } @@ -605,9 +605,9 @@ static void SetupBGL(BgConfig *bgl, enum HeapId heapID) 0 }; - sub_020183C4(bgl, 1, &header, 0); - sub_02019690(1, 32, 0, heapID); - sub_02019EBC(bgl, 1); + Bg_InitFromTemplate(bgl, 1, &header, 0); + Bg_ClearTilesRange(1, 32, 0, heapID); + Bg_ClearTilemap(bgl, 1); } { @@ -627,9 +627,9 @@ static void SetupBGL(BgConfig *bgl, enum HeapId heapID) 0 }; - sub_020183C4(bgl, 2, &header, 0); - sub_02019690(2, 32, 0, heapID); - sub_02019EBC(bgl, 2); + Bg_InitFromTemplate(bgl, 2, &header, 0); + Bg_ClearTilesRange(2, 32, 0, heapID); + Bg_ClearTilemap(bgl, 2); } { @@ -649,27 +649,27 @@ static void SetupBGL(BgConfig *bgl, enum HeapId heapID) 0 }; - sub_020183C4(bgl, 3, &header, 0); - sub_02019690(3, 32, 0, heapID); - sub_02019EBC(bgl, 3); + Bg_InitFromTemplate(bgl, 3, &header, 0); + Bg_ClearTilesRange(3, 32, 0, heapID); + Bg_ClearTilemap(bgl, 3); } } static void ov78_021D12EC(BgConfig *param0) { - sub_02019044(param0, 1); - sub_02019044(param0, 2); - sub_02019044(param0, 3); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 3); } static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID) { - app->messageWindow = sub_0201A778(heapID, 1); + app->messageWindow = Window_New(heapID, 1); Window_Init(app->messageWindow); - BGL_AddWindow(app->bgl, app->messageWindow, BGL_FRAME_MAIN_1, TEXT_POS_X, TEXT_POS_Y, TEXT_COLUMNS, TEXT_ROWS, FRAME_PALETTE_INDEX, TEXT_WINDOW_SIZE + 1); + Window_Add(app->bgl, app->messageWindow, BGL_FRAME_MAIN_1, TEXT_POS_X, TEXT_POS_Y, TEXT_COLUMNS, TEXT_ROWS, FRAME_PALETTE_INDEX, TEXT_WINDOW_SIZE + 1); - BGL_FillWindow(app->messageWindow, 15); + Window_FillTilemap(app->messageWindow, 15); sub_0200DD0C(app->bgl, BGL_FRAME_MAIN_1, FRAME_TEXT_START, FRAME_TEXT_PALETTE_INDEX, app->messageFrame, heapID); sub_02006E84(NARC_INDEX_GRAPHIC__EV_POKESELECT, 16, 0, FRAME_PALETTE_INDEX * 32, 32, heapID); sub_0200E060(app->messageWindow, 0, FRAME_TEXT_START, FRAME_TEXT_PALETTE_INDEX); @@ -677,7 +677,7 @@ static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID) static void ov78_021D13A0(ChooseStarterApp *param0) { - BGL_DeleteWindow(param0->messageWindow); + Window_Remove(param0->messageWindow); Heap_FreeToHeap(param0->messageWindow); } @@ -1295,7 +1295,7 @@ static u8 ov78_021D1FB4(Window *param0, int param1, int param2, int param3, Text GF_ASSERT(v0); v1 = MessageLoader_GetNewStrbuf(v0, param3); - BGL_FillWindow(param0, 15); + Window_FillTilemap(param0, 15); v2 = Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, v1, 0, 0, param5, param4, NULL); sub_0200E060(param0, 0, 512, 0); @@ -1316,7 +1316,7 @@ static u8 ov78_021D201C(Window *param0, int param1, int param2, int param3, u32 GF_ASSERT(v0); *param6 = MessageLoader_GetNewStrbuf(v0, param3); - BGL_FillWindow(param0, 15); + Window_FillTilemap(param0, 15); v1 = Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, *param6, 0, 0, param5, param4, NULL); sub_0200E060(param0, 0, 512, 0); @@ -1733,7 +1733,7 @@ static void MakeSubplaneWindow(ChooseStarterApp *param0, int param1) sub_02006E84(82, 17, 0, 5 * 32, 32, param1); for (v0 = 0; v0 < 3; v0++) { - param0->unk_9C[v0] = sub_0201A778(param1, 1); + param0->unk_9C[v0] = Window_New(param1, 1); Window_Init(param0->unk_9C[v0]); switch (v0) { @@ -1751,7 +1751,7 @@ static void MakeSubplaneWindow(ChooseStarterApp *param0, int param1) break; } - BGL_AddWindow(param0->bgl, param0->unk_9C[v0], 3, v1, v2, 11, 4, 5, 1 + (64 * v0)); + Window_Add(param0->bgl, param0->unk_9C[v0], 3, v1, v2, 11, 4, 5, 1 + (64 * v0)); ov78_021D28A8(param0->unk_9C[v0], param1, 360, 4 + v0, TEXT_COLOR(1, 2, 10)); } } @@ -1761,7 +1761,7 @@ static void ov78_021D2884(ChooseStarterApp *param0) int v0; for (v0 = 0; v0 < 3; v0++) { - BGL_DeleteWindow(param0->unk_9C[v0]); + Window_Remove(param0->unk_9C[v0]); Heap_FreeToHeap(param0->unk_9C[v0]); } } @@ -1775,7 +1775,7 @@ static void ov78_021D28A8(Window *param0, int param1, int param2, int param3, Te GF_ASSERT(v0); v1 = MessageLoader_GetNewStrbuf(v0, param3); - BGL_FillWindow(param0, (((param4) >> 0) & 0xff)); + Window_FillTilemap(param0, (((param4) >> 0) & 0xff)); Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v1, 1, 0, TEXT_SPEED_NO_TRANSFER, param4, NULL); Strbuf_Free(v1); MessageLoader_Free(v0); @@ -1783,7 +1783,7 @@ static void ov78_021D28A8(Window *param0, int param1, int param2, int param3, Te static void ov78_021D2904(ChooseStarterApp *param0) { - sub_0201ACF4(param0->unk_9C[param0->unk_A8]); + Window_ClearAndCopyToVRAM(param0->unk_9C[param0->unk_A8]); } static u16 GetSelectedSpecies(u16 cursorPosition) diff --git a/src/colored_arrow.c b/src/colored_arrow.c index 1caec969a6..1804a6fa9b 100644 --- a/src/colored_arrow.c +++ b/src/colored_arrow.c @@ -53,5 +53,5 @@ void ColoredArrow_SetColor(ColoredArrow *arrow, TextColor color) void ColoredArrow_Print(const ColoredArrow *arrow, Window *window, u32 xOffset, u32 yOffset) { Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, arrow->strbuf, xOffset, yOffset, TEXT_SPEED_NO_TRANSFER, arrow->color, NULL); - sub_0201ACCC(window); + Window_LoadTiles(window); } diff --git a/src/error_message_reset.c b/src/error_message_reset.c index 3b1ac4a3da..351ee606ae 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -127,24 +127,24 @@ void ErrorMessageReset_PrintErrorAndReset(void) GXS_SetVisibleWnd(GX_WNDMASK_NONE); GXLayers_SetBanks(&sErrorMessageBanksConfig); - bgConfig = sub_02018340(v5); + bgConfig = BgConfig_New(v5); - sub_02018368(&sErrorMessageBgModeSet); - sub_020183C4(bgConfig, 0, &sErrorMessageBgTemplate, 0); - sub_02019EBC(bgConfig, 0); + SetAllGraphicsModes(&sErrorMessageBgModeSet); + Bg_InitFromTemplate(bgConfig, 0, &sErrorMessageBgTemplate, 0); + Bg_ClearTilemap(bgConfig, 0); sub_0200DAA4(bgConfig, 0, (512 - 9), 2, 0, v5); Font_LoadTextPalette(0, 1 * (2 * 16), v5); - sub_02019690(0, 32, 0, v5); - sub_0201975C(0, 0x6c21); - sub_0201975C(4, 0x6c21); + Bg_ClearTilesRange(0, 32, 0, v5); + Bg_MaskPalette(0, 0x6c21); + Bg_MaskPalette(4, 0x6c21); errorMsgData = MessageLoader_Init(1, 26, 214, v5); errorString = Strbuf_Init(0x180, v5); Text_ResetAllPrinters(); - sub_0201A8D4(bgConfig, &window, &sErrorMessageWindowTemplate); - BGL_WindowColor(&window, 15, 0, 0, 26 * 8, 18 * 8); + Window_AddFromTemplate(bgConfig, &window, &sErrorMessageWindowTemplate); + Window_FillRectWithColor(&window, 15, 0, 0, 26 * 8, 18 * 8); Window_Show(&window, 0, (512 - 9), 2); MessageLoader_GetStrbuf(errorMsgData, v4, errorString); Text_AddPrinterWithParams(&window, FONT_SYSTEM, errorString, 0, 0, TEXT_SPEED_INSTANT, NULL); @@ -180,7 +180,7 @@ void ErrorMessageReset_PrintErrorAndReset(void) sub_0200F344(0, 0x7fff); sub_0200F344(1, 0x7fff); - BGL_DeleteWindow(&window); + Window_Remove(&window); MessageLoader_Free(errorMsgData); Heap_FreeToHeap(bgConfig); diff --git a/src/field_map_change.c b/src/field_map_change.c index fb6679340e..7f4db48cc1 100644 --- a/src/field_map_change.c +++ b/src/field_map_change.c @@ -1161,12 +1161,12 @@ BOOL FieldTask_MapChangeToUnderground(TaskManager *taskMan) switch (sub_02002114(mapChangeUndergroundData->unk_3C, 11)) { case 0: sub_0200E084(&mapChangeUndergroundData->unk_24, 0); - BGL_DeleteWindow(&mapChangeUndergroundData->unk_24); + Window_Remove(&mapChangeUndergroundData->unk_24); mapChangeUndergroundData->state = 3; break; case 0xfffffffe: sub_0200E084(&mapChangeUndergroundData->unk_24, 0); - BGL_DeleteWindow(&mapChangeUndergroundData->unk_24); + Window_Remove(&mapChangeUndergroundData->unk_24); mapChangeUndergroundData->state = 5; } break; diff --git a/src/field_menu.c b/src/field_menu.c index 6984d58526..b2f0392a31 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -495,9 +495,9 @@ static BOOL sub_0203AC44(TaskManager *taskMan) sub_0203B2EC(menu, fieldSystem); FieldMenu_Close(menu); Window_Clear(&menu->unk_00, 1); - BGL_DeleteWindow(&menu->unk_00); + Window_Remove(&menu->unk_00); sub_0203B200(taskMan); - sub_0201C3C0(fieldSystem->unk_08, 3); + Bg_ScheduleTilemapTransfer(fieldSystem->unk_08, 3); Heap_FreeToHeap(menu); MapObjectMan_UnpauseAllMovement(fieldSystem->mapObjMan); return TRUE; @@ -528,7 +528,7 @@ static void sub_0203ADFC(TaskManager *taskMan) menu = TaskManager_Environment(taskMan); v5 = FieldMenu_MakeList(menu, menu->unk_30); - BGL_AddWindow(fieldSystem->unk_08, &menu->unk_00, 3, 20, 1, 11, v5 * 3, 12, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (11 * 22))); + Window_Add(fieldSystem->unk_08, &menu->unk_00, 3, 20, 1, 11, v5 * 3, 12, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (11 * 22))); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 1, 11); Window_Show(&menu->unk_00, 1, 1024 - (18 + 12) - 9, 11); @@ -583,7 +583,7 @@ static void sub_0203ADFC(TaskManager *taskMan) menu->unk_20 = sub_02001AF4(&v3, 28, 4, menu->unk_28, 11, PAD_BUTTON_B | PAD_BUTTON_X); - sub_0201A9A4(&menu->unk_00); + Window_ScheduleCopyToVRAM(&menu->unk_00); sub_0203B318(menu, menu->unk_30, v5, TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData))); } @@ -669,10 +669,10 @@ static void sub_0203B094(TaskManager *taskMan) return; } - BGL_AddWindow(fieldSystem->unk_08, &menu->unk_10, 3, 1, 1, 12, 4, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4))); + Window_Add(fieldSystem->unk_08, &menu->unk_10, 3, 1, 1, 12, 4, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4))); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 1, 11); Window_Show(&menu->unk_10, 1, 1024 - (18 + 12) - 9, 11); - BGL_FillWindow(&menu->unk_10, 15); + Window_FillTilemap(&menu->unk_10, 15); v2 = MessageLoader_Init(0, 26, 367, 11); @@ -706,7 +706,7 @@ static void sub_0203B094(TaskManager *taskMan) Strbuf_Free(v5); StringTemplate_Free(v3); MessageLoader_Free(v2); - sub_0201A9A4(&menu->unk_10); + Window_ScheduleCopyToVRAM(&menu->unk_10); } static void sub_0203B200(TaskManager *taskMan) @@ -722,7 +722,7 @@ static void sub_0203B200(TaskManager *taskMan) } Window_Clear(&menu->unk_10, 1); - BGL_DeleteWindow(&menu->unk_10); + Window_Remove(&menu->unk_10); } static BOOL FieldMenu_Select(TaskManager *taskMan) @@ -898,7 +898,7 @@ static void FieldMenu_ApplicationStart(TaskManager *taskMan) menu = TaskManager_Environment(taskMan); FieldMenu_Close(menu); - BGL_DeleteWindow(&menu->unk_00); + Window_Remove(&menu->unk_00); sub_0203B200(taskMan); menu->unk_22C(taskMan); @@ -1429,8 +1429,8 @@ static BOOL FieldMenu_SelectSave(TaskManager *taskMan) FieldMenu_Close(menu); Window_Clear(&menu->unk_00, 1); - sub_0201C3C0(menu->unk_00.bgConfig, menu->unk_00.bgLayer); - BGL_DeleteWindow(&menu->unk_00); + Bg_ScheduleTilemapTransfer(menu->unk_00.bgConfig, menu->unk_00.bgLayer); + Window_Remove(&menu->unk_00); sub_0203B200(taskMan); menu->state = FIELD_MENU_STATE_SAVE; @@ -1593,8 +1593,8 @@ static BOOL FieldMenu_SelectRetire(TaskManager *taskMan) FieldMenu_Close(menu); Window_Clear(&menu->unk_00, 1); - sub_0201C3C0(menu->unk_00.bgConfig, menu->unk_00.bgLayer); - BGL_DeleteWindow(&menu->unk_00); + Bg_ScheduleTilemapTransfer(menu->unk_00.bgConfig, menu->unk_00.bgLayer); + Window_Remove(&menu->unk_00); sub_0203B200(taskMan); if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { diff --git a/src/library_tv/library_tv.c b/src/library_tv/library_tv.c index dde55fc45a..d8cf98e0a7 100644 --- a/src/library_tv/library_tv.c +++ b/src/library_tv/library_tv.c @@ -160,7 +160,7 @@ static void LibraryTV_VBlank(void *data) { LibraryTV *ltv = data; - sub_0201C2B8(ltv->bgl); + Bg_RunScheduledUpdates(ltv->bgl); } static void LibraryTV_SetVramBank(LibraryTV *ltv) @@ -180,7 +180,7 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv) GXLayers_SetBanks(&vramBank); - ltv->bgl = sub_02018340(ltv->heapID); + ltv->bgl = BgConfig_New(ltv->heapID); GraphicsModes bgData = { GX_DISPMODE_GRAPHICS, @@ -189,20 +189,20 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv) GX_BG0_AS_2D }; - sub_02018368(&bgData); + SetAllGraphicsModes(&bgData); int frame, charSetID, screenID; BgTemplate bgHeader0 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0000, GX_BG_CHARBASE_0x18000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; frame = 2; - sub_020183C4(ltv->bgl, frame, &bgHeader0, 0); - sub_02019690(frame, 32, 0, ltv->heapID); - sub_02019EBC(ltv->bgl, frame); + Bg_InitFromTemplate(ltv->bgl, frame, &bgHeader0, 0); + Bg_ClearTilesRange(frame, 32, 0, ltv->heapID); + Bg_ClearTilemap(ltv->bgl, frame); BgTemplate bgHeader1 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0800, GX_BG_CHARBASE_0x14000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; frame = 0; charSetID = 1; screenID = 4; - sub_020183C4(ltv->bgl, frame, &bgHeader1, 0); + Bg_InitFromTemplate(ltv->bgl, frame, &bgHeader1, 0); sub_02006E3C(NARC_INDEX_DEMO__INTRO__INTRO_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); sub_02006E60(NARC_INDEX_DEMO__INTRO__INTRO_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); @@ -210,7 +210,7 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv) frame = 1; charSetID = 2; screenID = 5; - sub_020183C4(ltv->bgl, frame, &bgHeader2, 0); + Bg_InitFromTemplate(ltv->bgl, frame, &bgHeader2, 0); sub_02006E3C(NARC_INDEX_DEMO__INTRO__INTRO_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); sub_02006E60(NARC_INDEX_DEMO__INTRO__INTRO_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); @@ -218,35 +218,35 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv) frame = 3; charSetID = 2; screenID = 4; - sub_020183C4(ltv->bgl, frame, &bgHeader3, 0); + Bg_InitFromTemplate(ltv->bgl, frame, &bgHeader3, 0); sub_02006E3C(NARC_INDEX_GRAPHIC__LIBRARY_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); sub_02006E60(NARC_INDEX_GRAPHIC__LIBRARY_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); sub_02006E84(NARC_INDEX_GRAPHIC__LIBRARY_TV, 3, 0, 0, 0, ltv->heapID); Font_LoadTextPalette(0, 1 * (2 * 16), ltv->heapID); - sub_0201975C(0, 0x0); - sub_0201975C(4, 0x0); + Bg_MaskPalette(0, 0x0); + Bg_MaskPalette(4, 0x0); G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, (GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3), 0x4, 0xc); } static void LibraryTV_ReleaseVramBank(LibraryTV *ltv) { - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); G2_BlendNone(); - sub_02019044(ltv->bgl, 3); - sub_02019044(ltv->bgl, 1); - sub_02019044(ltv->bgl, 0); - sub_02019044(ltv->bgl, 2); + Bg_FreeTilemapBuffer(ltv->bgl, 3); + Bg_FreeTilemapBuffer(ltv->bgl, 1); + Bg_FreeTilemapBuffer(ltv->bgl, 0); + Bg_FreeTilemapBuffer(ltv->bgl, 2); Heap_FreeToHeap(ltv->bgl); } @@ -266,5 +266,5 @@ static void LibraryTV_ReleaseMsgLdr(LibraryTV *ltv) static void LibraryTV_UpdateScanLines(LibraryTV *ltv) { ltv->scanLinePos += 0x4; - sub_02019184(ltv->bgl, 1, 3, ltv->scanLinePos >> 4); + Bg_SetOffset(ltv->bgl, 1, 3, ltv->scanLinePos >> 4); } diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c index cff6bafb51..212778f151 100644 --- a/src/overlay005/encounter_effect.c +++ b/src/overlay005/encounter_effect.c @@ -720,10 +720,10 @@ void ov5_021DE3D0(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4, v0 = sub_020071D0(param0, param1, 0, &v1, 4); - sub_020198C0(param6, param7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); - sub_02019E2C(param6, param7, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8, param4); + Bg_LoadToTilemapRect(param6, param7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_ChangeTilemapRectPalette(param6, param7, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8, param4); Heap_FreeToHeap(v0); - sub_0201C3C0(param6, param7); + Bg_ScheduleTilemapTransfer(param6, param7); } void ov5_021DE47C(UnkStruct_ov5_021DE47C *param0, int param1, int param2) @@ -959,7 +959,7 @@ static void ov5_021DE89C(Window *param0, s32 param1, s32 param2, s32 param3, s32 param2 = 256; } - BGL_WindowColor(param0, param5, param3, param1, param4 - param3, param2 - param1); + Window_FillRectWithColor(param0, param5, param3, param1, param4 - param3, param2 - param1); } UnkStruct_ov5_021DE928 *ov5_021DE8F8(u32 param0) @@ -1540,7 +1540,7 @@ static void ov5_021DF28C(SysTask *param0, void *param1) ov5_021D16F4(v0->fieldSystem, 0); ov5_021D1718(v0->fieldSystem, 0); - BGL_SetPriority(0, 0); + Bg_SetPriority(0, 0); v0->unk_02 = 1; SysTask_Done(param0); @@ -1580,7 +1580,7 @@ static void ov5_021DF30C(FieldSystem *fieldSystem) GX_BG0_AS_3D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -1589,7 +1589,7 @@ static void ov5_021DF30C(FieldSystem *fieldSystem) { G2_SetBG3ControlDCBmp(GX_BG_SCRSIZE_DCBMP_256x256, GX_BG_AREAOVER_XLU, GX_BG_BMPSCRBASE_0x20000); - BGL_SetPriority(3, 3); + Bg_SetPriority(3, 3); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); { @@ -1617,9 +1617,9 @@ static void ov5_021DF30C(FieldSystem *fieldSystem) 0 }; - sub_020183C4(fieldSystem->unk_08, 2, &v3, 0); - sub_02019690(2, 32, 0, 4); - sub_02019EBC(fieldSystem->unk_08, 2); + Bg_InitFromTemplate(fieldSystem->unk_08, 2, &v3, 0); + Bg_ClearTilesRange(2, 32, 0, 4); + Bg_ClearTilemap(fieldSystem->unk_08, 2); } } @@ -1628,7 +1628,7 @@ static void ov5_021DF30C(FieldSystem *fieldSystem) static void ov5_021DF3D4(FieldSystem *fieldSystem) { - sub_02019044(fieldSystem->unk_08, 2); + Bg_FreeTilemapBuffer(fieldSystem->unk_08, 2); ov5_021D1434(fieldSystem->unk_08); } diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c index 0b50388ca4..4031dd196d 100644 --- a/src/overlay005/encounter_effect_core.c +++ b/src/overlay005/encounter_effect_core.c @@ -1174,17 +1174,17 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); - v1->unk_270 = sub_0201A778(4, 1); - BGL_AddWindow(v0->fieldSystem->unk_08, v1->unk_270, 3, 0, 0, 32, 32, 0, 0); + v1->unk_270 = Window_New(4, 1); + Window_Add(v0->fieldSystem->unk_08, v1->unk_270, 3, 0, 0, 32, 32, 0, 0); { GXRgb v6 = 0; - sub_0201972C(3, &v6, sizeof(short), 2 * 15); + Bg_LoadPalette(3, &v6, sizeof(short), 2 * 15); } - BGL_FillWindow(v1->unk_270, 0); - sub_0201A9A4(v1->unk_270); + Window_FillTilemap(v1->unk_270, 0); + Window_ScheduleCopyToVRAM(v1->unk_270); v0->state++; break; @@ -1306,12 +1306,12 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1) ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0); ov5_021DE4AC(&v1->unk_00); - sub_0201ACF4(v1->unk_270); - BGL_DeleteWindow(v1->unk_270); - sub_0201A928(v1->unk_270, 1); + Window_ClearAndCopyToVRAM(v1->unk_270); + Window_Remove(v1->unk_270); + Windows_Delete(v1->unk_270, 1); - sub_02019690(3, 32, 0, 4); - sub_02019EBC(v0->fieldSystem->unk_08, 3); + Bg_ClearTilesRange(3, 32, 0, 4); + Bg_ClearTilemap(v0->fieldSystem->unk_08, 3); EncounterEffect_Finish(v0, param0); return; @@ -1344,7 +1344,7 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1) } } - sub_0201A9A4(v1->unk_270); + Window_ScheduleCopyToVRAM(v1->unk_270); if (v0->state != 7) { CellActorCollection_Update(v1->unk_00.unk_00); @@ -1506,17 +1506,17 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); - v1->unk_264 = sub_0201A778(4, 1); - BGL_AddWindow(v0->fieldSystem->unk_08, v1->unk_264, 3, 0, 0, 32, 32, 0, 0); + v1->unk_264 = Window_New(4, 1); + Window_Add(v0->fieldSystem->unk_08, v1->unk_264, 3, 0, 0, 32, 32, 0, 0); { GXRgb v6 = 0; - sub_0201972C(3, &v6, sizeof(short), 2 * 15); + Bg_LoadPalette(3, &v6, sizeof(short), 2 * 15); } - BGL_FillWindow(v1->unk_264, 0); - sub_0201A9A4(v1->unk_264); + Window_FillTilemap(v1->unk_264, 0); + Window_ScheduleCopyToVRAM(v1->unk_264); v1->unk_268 = ov5_021DE8F8(4); @@ -1626,7 +1626,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1) case 8: v3 = ov5_021DE988(v1->unk_268); - sub_0201A9A4(v1->unk_264); + Window_ScheduleCopyToVRAM(v1->unk_264); QuadraticInterpolationTaskFX32_Update(&v1->unk_270); Camera_SetDistance(v1->unk_270.currentValue, v1->camera); @@ -1653,12 +1653,12 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1) ov5_021DE928(v1->unk_268); - sub_0201ACF4(v1->unk_264); - BGL_DeleteWindow(v1->unk_264); - sub_0201A928(v1->unk_264, 1); + Window_ClearAndCopyToVRAM(v1->unk_264); + Window_Remove(v1->unk_264); + Windows_Delete(v1->unk_264, 1); - sub_02019690(3, 32, 0, 4); - sub_02019EBC(v0->fieldSystem->unk_08, 3); + Bg_ClearTilesRange(3, 32, 0, 4); + Bg_ClearTilemap(v0->fieldSystem->unk_08, 3); EncounterEffect_Finish(v0, param0); break; @@ -2146,17 +2146,17 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1) v1->unk_04 = ov5_021DEBEC(4); - v1->unk_00 = sub_0201A778(4, 1); - BGL_AddWindow(v0->fieldSystem->unk_08, v1->unk_00, 3, 0, 0, 32, 32, 0, 0); + v1->unk_00 = Window_New(4, 1); + Window_Add(v0->fieldSystem->unk_08, v1->unk_00, 3, 0, 0, 32, 32, 0, 0); { GXRgb v3 = 0; - sub_0201972C(3, &v3, sizeof(short), 2 * 15); + Bg_LoadPalette(3, &v3, sizeof(short), 2 * 15); } - BGL_FillWindow(v1->unk_00, 0); - sub_0201A9A4(v1->unk_00); + Window_FillTilemap(v1->unk_00, 0); + Window_ScheduleCopyToVRAM(v1->unk_00); v0->state++; break; @@ -2214,7 +2214,7 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1) v0->state++; } - sub_0201A9A4(v1->unk_00); + Window_ScheduleCopyToVRAM(v1->unk_00); break; case 7: @@ -2230,12 +2230,12 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1) ov5_021DE5A4(&v1->unk_08, &v1->unk_1A8); ov5_021DE4AC(&v1->unk_08); - sub_0201ACF4(v1->unk_00); - BGL_DeleteWindow(v1->unk_00); - sub_0201A928(v1->unk_00, 1); + Window_ClearAndCopyToVRAM(v1->unk_00); + Window_Remove(v1->unk_00); + Windows_Delete(v1->unk_00, 1); - sub_02019690(3, 32, 0, 4); - sub_02019EBC(v0->fieldSystem->unk_08, 3); + Bg_ClearTilesRange(3, 32, 0, 4); + Bg_ClearTilemap(v0->fieldSystem->unk_08, 3); G2_SetOBJMosaicSize(0, 0); @@ -2900,8 +2900,8 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he sub_02007130(encEffect->narc, 11, 0, 2 * 0x20, 0x20, heapID); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); - BGL_AddWindow(encEffect->fieldSystem->unk_08, &v0->unk_2E0, 2, 0, 10, 16, 2, 2, 1); - BGL_FillWindow(&v0->unk_2E0, 0); + Window_Add(encEffect->fieldSystem->unk_08, &v0->unk_2E0, 2, 0, 10, 16, 2, 2, 1); + Window_FillTilemap(&v0->unk_2E0, 0); v7 = EncounterEffect_GetGymLeaderName(param->trainerID, heapID); Text_AddPrinterWithParamsAndColor(&v0->unk_2E0, FONT_SYSTEM, v7, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v7); @@ -3029,9 +3029,9 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he sub_0200AB4C(-14, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BD, 1); - sub_0201C63C(encEffect->fieldSystem->unk_08, 2, 0, -((v0->unk_00.currentValue >> FX32_SHIFT) + -92)); + Bg_ScheduleScroll(encEffect->fieldSystem->unk_08, 2, 0, -((v0->unk_00.currentValue >> FX32_SHIFT) + -92)); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); - BGL_SetPriority(2, 0); + Bg_SetPriority(2, 0); encEffect->state++; } @@ -3089,19 +3089,19 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he ov5_021DE5A4(&v0->unk_44, &v0->unk_1E4[1]); ov5_021DE4AC(&v0->unk_44); - BGL_DeleteWindow(&v0->unk_2E0); + Window_Remove(&v0->unk_2E0); GX_SetVisibleWnd(GX_WNDMASK_NONE); sub_0200AB4C(0, GX_BLEND_PLANEMASK_NONE, 1); - sub_02019184(encEffect->fieldSystem->unk_08, 2, 0, 0); + Bg_SetOffset(encEffect->fieldSystem->unk_08, 2, 0, 0); return 1; } if (v0->unk_2F0 == 1) { - sub_0201C63C(encEffect->fieldSystem->unk_08, 3, 0, v0->unk_2F4); + Bg_ScheduleScroll(encEffect->fieldSystem->unk_08, 3, 0, v0->unk_2F4); v0->unk_2F4 = (v0->unk_2F4 + 30) % 512; } @@ -3335,8 +3335,8 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H sub_02007130(encEffect->narc, 11, 0, 2 * 0x20, 0x20, heapID); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); - BGL_AddWindow(encEffect->fieldSystem->unk_08, &v0->unk_358, 2, 21, 13, 11, 2, 2, 1); - BGL_FillWindow(&v0->unk_358, 0); + Window_Add(encEffect->fieldSystem->unk_08, &v0->unk_358, 2, 21, 13, 11, 2, 2, 1); + Window_FillTilemap(&v0->unk_358, 0); v9 = EncounterEffect_GetGymLeaderName(param->trainerID, heapID); Text_AddPrinterWithParamsAndColor(&v0->unk_358, FONT_SYSTEM, v9, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v9); @@ -3426,7 +3426,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H LinearInterpolationTaskS32_Init(&v0->unk_48, 16, 0, 6); ov5_021DF17C(4); - BGL_SetPriority(0, 1); + Bg_SetPriority(0, 1); encEffect->state++; break; @@ -3545,7 +3545,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H ov5_021E519C(&v0->unk_2F4); - BGL_DeleteWindow(&v0->unk_358); + Window_Remove(&v0->unk_358); for (v5 = 0; v5 < 4; v5++) { CellActor_Delete(v0->unk_2CC[v5]); diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index 9a5172976c..189d0d750e 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -138,7 +138,7 @@ static void ov5_021D0D80(void *param0) { FieldSystem *fieldSystem = param0; - sub_0201C2B8(fieldSystem->unk_08); + Bg_RunScheduledUpdates(fieldSystem->unk_08); sub_0201DCAC(); sub_0200A858(); @@ -198,7 +198,7 @@ static BOOL FieldMap_Init(OverlayManager *overlayMan, int *param1) ov5_021D154C(); GXLayers_SwapDisplay(); - fieldSystem->unk_08 = sub_02018340(4); + fieldSystem->unk_08 = BgConfig_New(4); ov5_021D1444(fieldSystem->unk_08); sub_0205D8CC(0, 1); sub_0203F5C0(fieldSystem, 4); @@ -580,7 +580,7 @@ static void ov5_021D1444(BgConfig *bgl) GX_BG0_AS_3D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -600,9 +600,9 @@ static void ov5_021D1444(BgConfig *bgl) 0 }; - sub_020183C4(bgl, 1, &v1, 0); - sub_02019690(1, 32, 0, 4); - sub_02019EBC(bgl, 1); + Bg_InitFromTemplate(bgl, 1, &v1, 0); + Bg_ClearTilesRange(1, 32, 0, 4); + Bg_ClearTilemap(bgl, 1); } { @@ -622,9 +622,9 @@ static void ov5_021D1444(BgConfig *bgl) 0 }; - sub_020183C4(bgl, 2, &v2, 0); - sub_02019690(2, 32, 0, 4); - sub_02019EBC(bgl, 2); + Bg_InitFromTemplate(bgl, 2, &v2, 0); + Bg_ClearTilesRange(2, 32, 0, 4); + Bg_ClearTilemap(bgl, 2); } { BgTemplate v3 = { @@ -643,9 +643,9 @@ static void ov5_021D1444(BgConfig *bgl) 0 }; - sub_020183C4(bgl, 3, &v3, 0); - sub_02019690(3, 32, 0, 4); - sub_02019EBC(bgl, 3); + Bg_InitFromTemplate(bgl, 3, &v3, 0); + Bg_ClearTilesRange(3, 32, 0, 4); + Bg_ClearTilemap(bgl, 3); } { @@ -659,9 +659,9 @@ static void ov5_021D1444(BgConfig *bgl) static void ov5_021D1524(BgConfig *bgl) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 0); - sub_02019044(bgl, 1); - sub_02019044(bgl, 2); - sub_02019044(bgl, 3); + Bg_FreeTilemapBuffer(bgl, 1); + Bg_FreeTilemapBuffer(bgl, 2); + Bg_FreeTilemapBuffer(bgl, 3); } static void ov5_021D154C(void) diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c index 386e3311b9..e609bbbb44 100644 --- a/src/overlay005/ov5_021D5EB8.c +++ b/src/overlay005/ov5_021D5EB8.c @@ -1496,7 +1496,7 @@ static void ov5_021D6D84(UnkStruct_ov5_021D6594 *param0, int param1) NNS_G2dGetUnpackedPaletteData(v0.unk_00, &v0.unk_14); - sub_0201972C(2, v0.unk_14->pRawData, 32, 32 * 6); + Bg_LoadPalette(2, v0.unk_14->pRawData, 32, 32 * 6); Heap_FreeToHeap(v0.unk_00); v0.unk_00 = NULL; @@ -1512,7 +1512,7 @@ static void ov5_021D6DCC(UnkStruct_ov5_021D6594 *param0, int param1) NNS_G2dGetUnpackedCharacterData(v0.unk_04, &v0.unk_10); - sub_0201958C(param0->fieldSystem->unk_08, 2, v0.unk_10->pRawData, v0.unk_10->szByte, 0); + Bg_LoadTiles(param0->fieldSystem->unk_08, 2, v0.unk_10->pRawData, v0.unk_10->szByte, 0); Heap_FreeToHeap(v0.unk_04); v0.unk_04 = NULL; @@ -1531,10 +1531,10 @@ static void ov5_021D6E20(UnkStruct_ov5_021D6594 *param0, int param1) NNS_G2dGetUnpackedScreenData(v0.unk_08, &v0.unk_0C); - sub_02019460(param0->fieldSystem->unk_08, 2, (void *)v0.unk_0C->rawData, v0.unk_0C->szByte, 0); - sub_02019574(param0->fieldSystem->unk_08, 2, (void *)v0.unk_0C->rawData, v0.unk_0C->szByte); - sub_02019E2C(param0->fieldSystem->unk_08, 2, 0, 0, 32, 32, 6); - sub_02019448(param0->fieldSystem->unk_08, 2); + Bg_CopyTilemapBufferRangeToVRAM(param0->fieldSystem->unk_08, 2, (void *)v0.unk_0C->rawData, v0.unk_0C->szByte, 0); + Bg_LoadTilemapBuffer(param0->fieldSystem->unk_08, 2, (void *)v0.unk_0C->rawData, v0.unk_0C->szByte); + Bg_ChangeTilemapRectPalette(param0->fieldSystem->unk_08, 2, 0, 0, 32, 32, 6); + Bg_CopyTilemapBufferToVRAM(param0->fieldSystem->unk_08, 2); Heap_FreeToHeap(v0.unk_08); v0.unk_08 = NULL; @@ -5245,8 +5245,8 @@ static void ov5_021DB144(SysTask *param0, void *param1) v5 = Unk_ov5_02201D38[v1->unk_B4 / 8]; - sub_0201C63C(v0->unk_00->fieldSystem->unk_08, 2, 0, (v1->unk_AC >> FX32_SHIFT) + v5); - sub_0201C63C(v0->unk_00->fieldSystem->unk_08, 2, 3, (v1->unk_B0 >> FX32_SHIFT)); + Bg_ScheduleScroll(v0->unk_00->fieldSystem->unk_08, 2, 0, (v1->unk_AC >> FX32_SHIFT) + v5); + Bg_ScheduleScroll(v0->unk_00->fieldSystem->unk_08, 2, 3, (v1->unk_B0 >> FX32_SHIFT)); } } diff --git a/src/overlay005/ov5_021DC018.c b/src/overlay005/ov5_021DC018.c index e1c58d15ad..e1e183ed0a 100644 --- a/src/overlay005/ov5_021DC018.c +++ b/src/overlay005/ov5_021DC018.c @@ -194,7 +194,7 @@ void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 *param0) param0->unk_99 -= param0->unk_9B * 2; } - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2))); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2))); sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); Window_Show(¶m0->unk_08, 1, 1024 - (18 + 12) - 9, 11); @@ -311,7 +311,7 @@ void ov5_021DC424(UnkStruct_ov5_021DC1A4 *param0) Sound_PlayEffect(1500); sub_02001BC4(param0->unk_B8, NULL); Window_Clear(param0->unk_AC.unk_04, 0); - BGL_DeleteWindow(param0->unk_AC.unk_04); + Window_Remove(param0->unk_AC.unk_04); for (v0 = 0; v0 < 28; v0++) { Strbuf_Free(param0->unk_1C[v0]); @@ -379,9 +379,9 @@ void ov5_021DC528(UnkStruct_ov5_021DC1A4 *param0, u16 param1) static void ov5_021DC530(UnkStruct_ov5_021DC1A4 *param0, u32 param1) { if (param0->unk_9B > 8) { - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, param1, 8 * 2, 13, ((1 + (10 * 4)) + (10 * 2))); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, param1, 8 * 2, 13, ((1 + (10 * 4)) + (10 * 2))); } else { - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, param1, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2))); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, param1, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2))); } sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); @@ -409,9 +409,9 @@ void ov5_021DC600(UnkStruct_ov5_021DC1A4 *param0, u16 *param1, u16 *param2) } if (param0->unk_9B > 8) { - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, v0, 8 * 2, 13, ((1 + (10 * 4)) + (10 * 2))); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, v0, 8 * 2, 13, ((1 + (10 * 4)) + (10 * 2))); } else { - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2))); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2))); } sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); @@ -587,7 +587,7 @@ static void ov5_021DCA28(UnkStruct_ov5_021DC1A4 *param0) Sound_PlayEffect(1500); sub_02001384(param0->unk_1BC, NULL, NULL); Window_Clear(param0->unk_19C.unk_0C, 0); - BGL_DeleteWindow(¶m0->unk_08); + Window_Remove(¶m0->unk_08); for (v0 = 0; v0 < 28; v0++) { Strbuf_Free(param0->unk_1C[v0]); @@ -608,7 +608,7 @@ static void ov5_021DCA90(UnkStruct_ov5_021DC1A4 *param0, u16 param1, u32 param2) Strbuf *v0 = Strbuf_Init((40 * 2), 4); Strbuf *v1 = Strbuf_Init((40 * 2), 4); - BGL_FillWindow(param0->unk_18, 15); + Window_FillTilemap(param0->unk_18, 15); MessageLoader_GetStrbuf(param0->unk_8C, param1, v0); StringTemplate_Format(param0->unk_90, v1, v0); Text_AddPrinterWithParams(param0->unk_18, FONT_MESSAGE, v1, 0, 0, param2, NULL); @@ -644,16 +644,16 @@ void ov5_021DCB24(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 *param3, S v1 = (v1 / 8) + 1; } - BGL_AddWindow(v3->fieldSystem->unk_08, &v3->unk_08, 3, v3->unk_98, v3->unk_99, v1, 4, 13, ((1 + (10 * 4)) + (10 * 2)) + (16 * 10)); + Window_Add(v3->fieldSystem->unk_08, &v3->unk_08, 3, v3->unk_98, v3->unk_99, v1, 4, 13, ((1 + (10 * 4)) + (10 * 2)) + (16 * 10)); sub_0200DAA4(v3->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); Window_Show(&v3->unk_08, 1, 1024 - (18 + 12) - 9, 11); - BGL_WindowColor(&v3->unk_08, 15, 0, 0, (v1 * 8), (4 * 8)); + Window_FillRectWithColor(&v3->unk_08, 15, 0, 0, (v1 * 8), (4 * 8)); ov5_021DCC00(v3, 15, 0, 0); ov5_021DCC00(v3, 16, (8 * 4), 16); v3->unk_AC.unk_04 = &v3->unk_08; - sub_0201A954(&v3->unk_08); + Window_CopyToVRAM(&v3->unk_08); v3->unk_04 = SysTask_Start(ov5_021DCC64, v3, 0); return; @@ -682,7 +682,7 @@ static void ov5_021DCC64(SysTask *param0, void *param1) if (*v1->unk_A0 == 0xffff) { Window_Clear(v1->unk_AC.unk_04, 0); - BGL_DeleteWindow(v1->unk_AC.unk_04); + Window_Remove(v1->unk_AC.unk_04); for (v0 = 0; v0 < 28; v0++) { Strbuf_Free(v1->unk_1C[v0]); @@ -784,7 +784,7 @@ void ov5_021DCD94(UnkStruct_ov5_021DC1A4 *param0, u8 param1) v1++; } - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, (v0 * param1), v1 * 2, 13, ((1 + (10 * 4)) + (10 * 2))); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, (v0 * param1), v1 * 2, 13, ((1 + (10 * 4)) + (10 * 2))); sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); Window_Show(¶m0->unk_08, 1, 1024 - (18 + 12) - 9, 11); @@ -811,12 +811,12 @@ static void ov5_021DCE64(UnkStruct_ov5_021DC1A4 *param0, u8 param1, u8 param2) Window *ov5_021DCEB0(FieldSystem *fieldSystem, u8 param1, u8 param2) { - Window *v0 = sub_0201A778(4, 1); + Window *v0 = Window_New(4, 1); - BGL_AddWindow(fieldSystem->unk_08, v0, 3, param1, param2, 10, 4, 13, 1); + Window_Add(fieldSystem->unk_08, v0, 3, param1, param2, 10, 4, 13, 1); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); Window_Show(v0, 1, 1024 - (18 + 12) - 9, 11); - BGL_FillWindow(v0, 15); + Window_FillTilemap(v0, 15); { MessageLoader *v1; @@ -838,7 +838,7 @@ Window *ov5_021DCEB0(FieldSystem *fieldSystem, u8 param1, u8 param2) void ov5_021DCF58(Window *param0) { Window_Clear(param0, 0); - sub_0201A928(param0, 1); + Windows_Delete(param0, 1); } void ov5_021DCF6C(FieldSystem *fieldSystem, Window *param1) @@ -850,7 +850,7 @@ void ov5_021DCF6C(FieldSystem *fieldSystem, Window *param1) u32 v4; u32 v5; - BGL_WindowColor(param1, 15, 0, 16, 10 * 8, 4 * 8 - 16); + Window_FillRectWithColor(param1, 15, 0, 16, 10 * 8, 4 * 8 - 16); v0 = MessageLoader_Init(0, 26, 543, 4); v1 = StringTemplate_Default(4); @@ -868,14 +868,14 @@ void ov5_021DCF6C(FieldSystem *fieldSystem, Window *param1) Strbuf_Free(v2); StringTemplate_Free(v1); MessageLoader_Free(v0); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); } Window *ov5_021DD020(FieldSystem *fieldSystem, u8 param1, u8 param2) { - Window *v0 = sub_0201A778(4, 1); + Window *v0 = Window_New(4, 1); - BGL_AddWindow(fieldSystem->unk_08, v0, 3, param1, param2, 10, 2, 13, (1 + (10 * 4))); + Window_Add(fieldSystem->unk_08, v0, 3, param1, param2, 10, 2, 13, (1 + (10 * 4))); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); Window_Show(v0, 1, 1024 - (18 + 12) - 9, 11); @@ -887,7 +887,7 @@ Window *ov5_021DD020(FieldSystem *fieldSystem, u8 param1, u8 param2) void ov5_021DD084(Window *param0) { Window_Clear(param0, 0); - sub_0201A928(param0, 1); + Windows_Delete(param0, 1); } void ov5_021DD098(FieldSystem *fieldSystem, Window *param1) @@ -899,7 +899,7 @@ void ov5_021DD098(FieldSystem *fieldSystem, Window *param1) u32 v4; u32 v5; - BGL_FillWindow(param1, 15); + Window_FillTilemap(param1, 15); v0 = MessageLoader_Init(0, 26, 361, 4); v1 = StringTemplate_Default(4); @@ -917,14 +917,14 @@ void ov5_021DD098(FieldSystem *fieldSystem, Window *param1) Strbuf_Free(v2); StringTemplate_Free(v1); MessageLoader_Free(v0); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); } Window *ov5_021DD140(FieldSystem *fieldSystem, u8 param1, u8 param2) { - Window *v0 = sub_0201A778(4, 1); + Window *v0 = Window_New(4, 1); - BGL_AddWindow(fieldSystem->unk_08, v0, 3, param1, param2, 10, 2, 13, (1 + (10 * 4))); + Window_Add(fieldSystem->unk_08, v0, 3, param1, param2, 10, 2, 13, (1 + (10 * 4))); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); Window_Show(v0, 1, 1024 - (18 + 12) - 9, 11); @@ -942,7 +942,7 @@ void ov5_021DD1A4(FieldSystem *fieldSystem, Window *param1) u16 v4; u32 v5; - BGL_FillWindow(param1, 15); + Window_FillTilemap(param1, 15); v0 = MessageLoader_Init(0, 26, 361, 4); v1 = StringTemplate_Default(4); @@ -960,7 +960,7 @@ void ov5_021DD1A4(FieldSystem *fieldSystem, Window *param1) Strbuf_Free(v2); StringTemplate_Free(v1); MessageLoader_Free(v0); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); } UnkStruct_ov5_021DC1A4 *ov5_021DD250(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 *param3, StringTemplate *param4, u8 param5, u8 param6, u8 param7, u8 param8) @@ -969,10 +969,10 @@ UnkStruct_ov5_021DC1A4 *ov5_021DD250(FieldSystem *fieldSystem, u8 param1, u8 par v0 = ov5_021DC150(fieldSystem, param1, param2, 0, 0, param3, param4, NULL, NULL); - BGL_AddWindow(v0->fieldSystem->unk_08, &v0->unk_08, 3, v0->unk_98, v0->unk_99, 10, 16, 13, ((1 + (10 * 4)) + (10 * 2))); + Window_Add(v0->fieldSystem->unk_08, &v0->unk_08, 3, v0->unk_98, v0->unk_99, 10, 16, 13, ((1 + (10 * 4)) + (10 * 2))); sub_0200DAA4(v0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); Window_Show(&v0->unk_08, 1, 1024 - (18 + 12) - 9, 11); - BGL_WindowColor(&v0->unk_08, 15, 0, 0, (10 * 8), (16 * 8)); + Window_FillRectWithColor(&v0->unk_08, 15, 0, 0, (10 * 8), (16 * 8)); ov5_021DCC00(v0, 273, 0, 0); StringTemplate_SetNumber(param4, 0, param5, 3, 1, 1); @@ -991,7 +991,7 @@ UnkStruct_ov5_021DC1A4 *ov5_021DD250(FieldSystem *fieldSystem, u8 param1, u8 par ov5_021DCC00(v0, 277, 0, (96 + 16)); v0->unk_AC.unk_04 = &v0->unk_08; - sub_0201A954(&v0->unk_08); + Window_CopyToVRAM(&v0->unk_08); return v0; } @@ -1001,7 +1001,7 @@ void ov5_021DD3A8(UnkStruct_ov5_021DC1A4 *param0) int v0; Window_Clear(param0->unk_AC.unk_04, 0); - BGL_DeleteWindow(param0->unk_AC.unk_04); + Window_Remove(param0->unk_AC.unk_04); for (v0 = 0; v0 < 28; v0++) { Strbuf_Free(param0->unk_1C[v0]); diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index 1432382abc..aa585ff0d7 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -138,7 +138,7 @@ static void ov5_021DD610(FieldSystem *fieldSystem, UnkStruct_ov5_021DD648 *param *(param1->unk_10) = 1; } - BGL_FillWindow(param1->unk_0C, 15); + Window_FillTilemap(param1->unk_0C, 15); } static void ov5_021DD648(UnkStruct_ov5_021DD648 *param0, const MessageLoader *param1, u32 param2) diff --git a/src/overlay005/ov5_021DD6FC.c b/src/overlay005/ov5_021DD6FC.c index beaa58b18c..b1d8e8736c 100644 --- a/src/overlay005/ov5_021DD6FC.c +++ b/src/overlay005/ov5_021DD6FC.c @@ -52,7 +52,7 @@ static void ov5_021DD6FC(void *param0, u16 param1, u16 param2) static void ov5_021DD718(UnkStruct_ov5_021DD9C8 *param0) { - BGL_AddWindow(param0->unk_1C, ¶m0->unk_20, 3, 0, 0, 32, 5, 7, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (32 * 5))); + Window_Add(param0->unk_1C, ¶m0->unk_20, 3, 0, 0, 32, 5, 7, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (32 * 5))); } static void ov5_021DD744(UnkStruct_ov5_021DD9C8 *param0, u8 param1, u16 param2, u8 param3, u8 param4) @@ -65,7 +65,7 @@ static void ov5_021DD744(UnkStruct_ov5_021DD9C8 *param0, u8 param1, u16 param2, v3 = param0->unk_31 * 2; param0->unk_38 = sub_02006F50(160, v3, 0, ¶m0->unk_34, 4); - sub_0201958C(param0->unk_1C, param1, param0->unk_34->pRawData, param0->unk_34->szByte, param2); + Bg_LoadTiles(param0->unk_1C, param1, param0->unk_34->pRawData, param0->unk_34->szByte, param2); v0 = sub_02006F88(160, v3 + 1, &v2, 4); ov5_021DD6FC(v2->pRawData, 1, param3); @@ -115,13 +115,13 @@ static void ov5_021DD7A0(UnkStruct_ov5_021DD9C8 *param0, const int param1) int v9, v10; ov5_021DD744(param0, 3, (1024 - (18 + 12) - 9 - (32 * 8)), 7, 0); - BGL_FillWindow(¶m0->unk_20, 0); + Window_FillTilemap(¶m0->unk_20, 0); for (v9 = 0; v9 < 85; v9++) { - sub_0201ADDC(¶m0->unk_20, param0->unk_34->pRawData, v9 * 8, 0, 8, 8, (v9 % 17) * 8, (v9 / 17) * 8, 8, 8); + Window_BlitBitmapRect(¶m0->unk_20, param0->unk_34->pRawData, v9 * 8, 0, 8, 8, (v9 % 17) * 8, (v9 / 17) * 8, 8, 8); } - sub_0201A954(¶m0->unk_20); + Window_CopyToVRAM(¶m0->unk_20); Heap_FreeToHeap(param0->unk_38); } } @@ -158,7 +158,7 @@ static void ov5_021DD8A4(SysTask *param0, void *param1) v2->unk_0C = 0; } - sub_02019184(v2->unk_1C, 3, 3, v2->unk_0C); + Bg_SetOffset(v2->unk_1C, 3, 3, v2->unk_0C); if (v2->unk_0C == 0) { v2->unk_10 = 0; @@ -182,7 +182,7 @@ static void ov5_021DD8A4(SysTask *param0, void *param1) v2->unk_0C = 38; } - sub_02019184(v2->unk_1C, 3, 3, v2->unk_0C); + Bg_SetOffset(v2->unk_1C, 3, 3, v2->unk_0C); if (v2->unk_0C == 38) { if (v2->unk_14) { @@ -237,7 +237,7 @@ UnkStruct_ov5_021DD9C8 *ov5_021DD98C(BgConfig *param0) void ov5_021DD9C8(UnkStruct_ov5_021DD9C8 *param0) { MessageLoader_Free(param0->unk_3C); - BGL_DeleteWindow(¶m0->unk_20); + Window_Remove(¶m0->unk_20); Strbuf_Free(param0->unk_40); Heap_FreeToHeap(param0); @@ -254,7 +254,7 @@ void ov5_021DD9E8(UnkStruct_ov5_021DD9C8 *param0, const int param1, const int pa if (param0->unk_00 == 0) { param0->unk_00 = 1; - sub_02019184(param0->unk_1C, 3, 3, 38); + Bg_SetOffset(param0->unk_1C, 3, 3, 38); param0->unk_0C = 38; param0->unk_08 = SysTask_Start(ov5_021DD8A4, param0, 0); @@ -291,8 +291,8 @@ void ov5_021DDA78(UnkStruct_ov5_021DD9C8 *param0) SysTask_Done(param0->unk_08); } - sub_0201ACF4(¶m0->unk_20); - sub_02019184(param0->unk_1C, 3, 3, 0); + Window_ClearAndCopyToVRAM(¶m0->unk_20); + Bg_SetOffset(param0->unk_1C, 3, 3, 0); { BgConfig *v0 = param0->unk_1C; diff --git a/src/overlay005/ov5_021E1B08.c b/src/overlay005/ov5_021E1B08.c index eb94af7b04..6dfc0d8cb2 100644 --- a/src/overlay005/ov5_021E1B08.c +++ b/src/overlay005/ov5_021E1B08.c @@ -34,7 +34,7 @@ void *ov5_021E1B08(u32 param0) void ov5_021E1B20(UnkStruct_ov5_021E1B20 *param0) { if (param0->unk_13_7 != 0) { - BGL_DeleteWindow(¶m0->unk_00); + Window_Remove(¶m0->unk_00); } Heap_FreeToHeap(param0); @@ -106,7 +106,7 @@ void ov5_021E1BCC(FieldSystem *fieldSystem, u8 param1) static void ov5_021E1BE0(FieldSystem *fieldSystem) { - sub_02019184(fieldSystem->unk_08, 3, 3, -48); + Bg_SetOffset(fieldSystem->unk_08, 3, 3, -48); if (fieldSystem->unk_64->unk_13_7 == 0) { sub_0205DA1C(fieldSystem->unk_08, &fieldSystem->unk_64->unk_00, fieldSystem->unk_64->unk_12, 3); @@ -122,47 +122,47 @@ static void ov5_021E1C1C(FieldSystem *fieldSystem) return; } - BGL_DeleteWindow(&fieldSystem->unk_64->unk_00); - sub_02019CB8(fieldSystem->unk_08, 3, 0, 0, 18, 32, 6, 16); - sub_02019448(fieldSystem->unk_08, 3); - sub_02019184(fieldSystem->unk_08, 3, 3, 0); + Window_Remove(&fieldSystem->unk_64->unk_00); + Bg_FillTilemapRect(fieldSystem->unk_08, 3, 0, 0, 18, 32, 6, 16); + Bg_CopyTilemapBufferToVRAM(fieldSystem->unk_08, 3); + Bg_SetOffset(fieldSystem->unk_08, 3, 3, 0); fieldSystem->unk_64->unk_13_7 = 0; } static BOOL ov5_021E1C70(FieldSystem *fieldSystem) { - int v0 = sub_020192F8(fieldSystem->unk_08, 3); + int v0 = Bg_GetYOffset(fieldSystem->unk_08, 3); if (v0 == 0) { return 1; } if (!((v0 > -48) && (v0 < 0))) { - sub_02019184(fieldSystem->unk_08, 3, 3, -48); + Bg_SetOffset(fieldSystem->unk_08, 3, 3, -48); } - sub_02019184(fieldSystem->unk_08, 3, 4, 16); + Bg_SetOffset(fieldSystem->unk_08, 3, 4, 16); return 0; } static BOOL ov5_021E1CB0(FieldSystem *fieldSystem) { - int v0 = sub_020192F8(fieldSystem->unk_08, 3); + int v0 = Bg_GetYOffset(fieldSystem->unk_08, 3); if (v0 == -48) { - sub_02019CB8(fieldSystem->unk_08, 3, 0, 0, 18, 32, 6, 16); - sub_02019448(fieldSystem->unk_08, 3); - sub_02019184(fieldSystem->unk_08, 3, 3, 0); + Bg_FillTilemapRect(fieldSystem->unk_08, 3, 0, 0, 18, 32, 6, 16); + Bg_CopyTilemapBufferToVRAM(fieldSystem->unk_08, 3); + Bg_SetOffset(fieldSystem->unk_08, 3, 3, 0); return 1; } if (!((v0 > -48) && (v0 < 0))) { - sub_02019184(fieldSystem->unk_08, 3, 3, 0); + Bg_SetOffset(fieldSystem->unk_08, 3, 3, 0); } - sub_02019184(fieldSystem->unk_08, 3, 5, 16); + Bg_SetOffset(fieldSystem->unk_08, 3, 5, 16); return 0; } diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index 80cfdf9682..2ec78da2f5 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -167,9 +167,9 @@ void ov5_021E1F04(UnkStruct_ov5_021E1FF4 *param0) { param0->unk_10 = Heap_AllocFromHeap(param0->unk_04, sizeof(Window)); - BGL_AddWindow(param0->unk_0C, param0->unk_10, param0->unk_08, 1, 1, param0->unk_2C, param0->unk_30, 13, 393); + Window_Add(param0->unk_0C, param0->unk_10, param0->unk_08, 1, 1, param0->unk_2C, param0->unk_30, 13, 393); sub_0200DAA4(param0->unk_0C, param0->unk_08, 985, 11, 0, param0->unk_04); - BGL_FillWindow(param0->unk_10, Font_GetAttribute(FONT_SYSTEM, FONTATTR_BG_COLOR)); + Window_FillTilemap(param0->unk_10, Font_GetAttribute(FONT_SYSTEM, FONTATTR_BG_COLOR)); ov5_021E1E20(param0); Window_Show(param0->unk_10, 0, 985, 11); @@ -178,7 +178,7 @@ void ov5_021E1F04(UnkStruct_ov5_021E1FF4 *param0) void ov5_021E1F7C(UnkStruct_ov5_021E1FF4 *param0) { Window_Clear(param0->unk_10, 0); - BGL_DeleteWindow(param0->unk_10); + Window_Remove(param0->unk_10); Heap_FreeToHeap(param0->unk_10); } diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c index b66388ff02..f9573259df 100644 --- a/src/overlay005/ov5_021EA874.c +++ b/src/overlay005/ov5_021EA874.c @@ -265,7 +265,7 @@ static BOOL ov5_021EAB58(UnkStruct_ov5_021EAE78 *param0) param0->unk_00 = sub_02013A04(v2 + 1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_20, 3, 19, 1, 12, v3 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (10 * (v3 + 2) * 2)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_20, 3, 19, 1, 12, v3 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (10 * (v3 + 2) * 2)); Window_Show(¶m0->unk_20, 1, 1024 - (18 + 12) - 9, 11); { @@ -292,7 +292,7 @@ static BOOL ov5_021EAB58(UnkStruct_ov5_021EAE78 *param0) v1.unk_1C = param0; param0->unk_04 = sub_0200112C(&v1, 0, 0, 4); - sub_0201A954(¶m0->unk_20); + Window_CopyToVRAM(¶m0->unk_20); param0->unk_48 = 9; return 0; @@ -334,7 +334,7 @@ static BOOL ov5_021EAC44(UnkStruct_ov5_021EAE78 *param0) } Window_Clear(¶m0->unk_20, 0); - BGL_DeleteWindow(¶m0->unk_20); + Window_Remove(¶m0->unk_20); sub_02001384(param0->unk_04, NULL, NULL); sub_02013A3C(param0->unk_00); @@ -434,8 +434,8 @@ static BOOL ov5_021EADB4(TaskManager *param0) static void ov5_021EAE78(UnkStruct_ov5_021EAE78 *param0, int param1) { - if (BGL_WindowAdded(¶m0->unk_10)) { - BGL_DeleteWindow(¶m0->unk_10); + if (Window_IsInUse(¶m0->unk_10)) { + Window_Remove(¶m0->unk_10); } MessageLoader_GetStrbuf(param0->unk_3C, param1, param0->unk_08); @@ -463,8 +463,8 @@ static void ov5_021EAF1C(UnkStruct_ov5_021EAE78 *param0) Strbuf_Free(param0->unk_0C); Strbuf_Free(param0->unk_08); - if (BGL_WindowAdded(¶m0->unk_10)) { - BGL_DeleteWindow(¶m0->unk_10); + if (Window_IsInUse(¶m0->unk_10)) { + Window_Remove(¶m0->unk_10); } } diff --git a/src/overlay005/ov5_021F007C.c b/src/overlay005/ov5_021F007C.c index e032e40ce1..03d6fec50f 100644 --- a/src/overlay005/ov5_021F007C.c +++ b/src/overlay005/ov5_021F007C.c @@ -67,7 +67,7 @@ static void ov5_021F007C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste ov5_021F02B8(&v0->unk_28, 0, 8, 19); - BGL_SetPriority(2, 0); + Bg_SetPriority(2, 0); GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 1); Sound_PlayEffect(1608); } @@ -106,7 +106,7 @@ static void ov5_021F00F0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste } sub_020039F8(v1->unk_04->pRawData, v1->unk_08, 0x1, v1->unk_28.unk_00, (GX_RGB(31, 10, 23))); - sub_0201972C(2, v1->unk_08, 32, 6 * 32); + Bg_LoadPalette(2, v1->unk_08, 32, 6 * 32); } static void ov5_021F013C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) @@ -120,7 +120,7 @@ static void ov5_021F013C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste G2_SetBlendAlpha((GX_PLANEMASK_BG2), GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD, 0, 16 - 0); - BGL_SetPriority(2, 0); + Bg_SetPriority(2, 0); GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 1); Sound_PlayEffect(1608); } @@ -251,14 +251,14 @@ static void ov5_021F0260(BgConfig *param0) GXRgb v0 = (GX_RGB(31, 10, 23)); u8 *v1; - sub_0201972C(2, &v0, sizeof(short), (6 * 32) + 2); + Bg_LoadPalette(2, &v0, sizeof(short), (6 * 32) + 2); v1 = Heap_AllocFromHeap(4, sizeof(u8) * 32); memset(v1, 0x11, sizeof(u8) * 32); - sub_0201958C(param0, 2, v1, sizeof(u8) * 32, 1); + Bg_LoadTiles(param0, 2, v1, sizeof(u8) * 32, 1); Heap_FreeToHeap(v1); - sub_02019EE0(param0, 2, (6 << 12) | 1); + Bg_FillTilemap(param0, 2, (6 << 12) | 1); } static void ov5_021F02B8(UnkStruct_ov5_021F02B8 *param0, int param1, int param2, int param3) @@ -290,12 +290,12 @@ static BOOL ov5_021F02C8(UnkStruct_ov5_021F02B8 *param0) static void ov5_021F02F4(FieldSystem *fieldSystem) { - sub_0201975C(2, 0); + Bg_MaskPalette(2, 0); } static void ov5_021F0300(FieldSystem *fieldSystem) { - sub_0201975C(2, 0x7fff); + Bg_MaskPalette(2, 0x7fff); } static void ov5_021F0310(FieldSystem *fieldSystem) @@ -306,9 +306,9 @@ static void ov5_021F0310(FieldSystem *fieldSystem) G2_SetBG2Priority(3); - sub_0201972C(2, &v0, 2, ((6 * 32) + 4)); - sub_020196C0(fieldSystem->unk_08, 2, 2, 1, 2); - sub_02019EE0(fieldSystem->unk_08, 2, ((6 << 12) | 2)); + Bg_LoadPalette(2, &v0, 2, ((6 * 32) + 4)); + Bg_FillTilesRange(fieldSystem->unk_08, 2, 2, 1, 2); + Bg_FillTilemap(fieldSystem->unk_08, 2, ((6 << 12) | 2)); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); ov5_021F02F4(fieldSystem); @@ -322,9 +322,9 @@ static void ov5_021F0374(FieldSystem *fieldSystem) G2_SetBG3Priority(3); - sub_0201972C(3, &v0, 2, ((6 * 32) + 4)); - sub_020196C0(fieldSystem->unk_08, 3, 2, 1, 2); - sub_02019EE0(fieldSystem->unk_08, 3, ((6 << 12) | 2)); + Bg_LoadPalette(3, &v0, 2, ((6 * 32) + 4)); + Bg_FillTilesRange(fieldSystem->unk_08, 3, 2, 1, 2); + Bg_FillTilemap(fieldSystem->unk_08, 3, ((6 << 12) | 2)); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); ov5_021F02F4(fieldSystem); @@ -461,7 +461,7 @@ BOOL ov5_021F0488(TaskManager *param0) v1->unk_0C = 2; - BGL_SetPriority(2, 0); + Bg_SetPriority(2, 0); GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 1); break; case 2: @@ -522,11 +522,11 @@ BOOL ov5_021F0488(TaskManager *param0) if (v1->unk_08 == 0) { GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 0); G2_BlendNone(); - BGL_SetPriority(2, 3); + Bg_SetPriority(2, 3); - sub_02019EBC(fieldSystem->unk_08, 2); + Bg_ClearTilemap(fieldSystem->unk_08, 2); } else { - BGL_SetPriority(2, 1); + Bg_SetPriority(2, 1); } v1->unk_0C = 8; diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index cbe524d10e..1beaf22697 100644 --- a/src/overlay005/ov5_021F08CC.c +++ b/src/overlay005/ov5_021F08CC.c @@ -543,7 +543,7 @@ static int ov5_021F0E24(UnkStruct_ov5_021F0D6C *param0) { if ((FieldMessage_FinishedPrinting(param0->unk_28) == 1) && (ov5_021F0D54() == 1)) { sub_0200E084(¶m0->window, 0); - BGL_DeleteWindow(¶m0->window); + Window_Remove(¶m0->window); return 1; } diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index befb89c930..38fe0f7ec5 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -275,9 +275,9 @@ void ov5_021F6760(UnkStruct_ov5_021F6704 *param0, u32 param1, u32 param2, u32 pa static void ov5_021F6768(UnkStruct_ov5_021F6704 *param0) { if (param0->unk_20B > 8) { - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_208, param0->unk_209, 11, 8 * 2, 13, 1); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_208, param0->unk_209, 11, 8 * 2, 13, 1); } else { - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_208, param0->unk_209, 11, param0->unk_20B * 2, 13, 1); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_208, param0->unk_209, 11, param0->unk_20B * 2, 13, 1); } sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); @@ -420,7 +420,7 @@ static void ov5_021F6AD4(UnkStruct_ov5_021F6704 *param0) Sound_PlayEffect(1500); sub_02001384(param0->unk_23C, NULL, NULL); Window_Clear(param0->unk_21C.unk_0C, 0); - BGL_DeleteWindow(¶m0->unk_08); + Window_Remove(¶m0->unk_08); for (v0 = 0; v0 < 120; v0++) { Strbuf_Free(param0->unk_1C[v0]); diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 57f3f8ea34..01fe548b24 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -474,9 +474,9 @@ void ov5_021F7F2C(UnkStruct_ov5_021F7ED8 *param0, u32 param1, u32 param2, u32 pa static void ov5_021F7F34(UnkStruct_ov5_021F7ED8 *param0) { if (param0->unk_C7 > 8) { - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_C4, param0->unk_C5, 11, 8 * 2, 13, 1); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_C4, param0->unk_C5, 11, 8 * 2, 13, 1); } else { - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_C4, param0->unk_C5, 11, param0->unk_C7 * 2, 13, 1); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_C4, param0->unk_C5, 11, param0->unk_C7 * 2, 13, 1); } sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); @@ -604,7 +604,7 @@ static void ov5_021F8250(UnkStruct_ov5_021F7ED8 *param0) Sound_PlayEffect(1500); sub_02001384(param0->unk_F0, NULL, NULL); Window_Clear(param0->unk_D0.unk_0C, 0); - BGL_DeleteWindow(¶m0->unk_08); + Window_Remove(¶m0->unk_08); for (v0 = 0; v0 < ((NELEMS(sTeachableMoves)) + 1); v0++) { Strbuf_Free(param0->unk_1C[v0]); diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index 1c21834675..5d3ea3c1a4 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -375,7 +375,7 @@ static void ov6_0223E1D0(BgConfig *param0) GX_BG0_AS_3D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } GXLayers_EngineAToggleLayers( @@ -398,9 +398,9 @@ static void ov6_0223E1D0(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v1, 0); - sub_02019690(3, 32, 0, 4); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v1, 0); + Bg_ClearTilesRange(3, 32, 0, 4); + Bg_ClearTilemap(param0, 3); } } @@ -2064,7 +2064,7 @@ UnkStruct_ov6_022401B8 *ov6_02240104(u32 param0, FieldSystem *fieldSystem) sub_02006E3C(172, 74, v1, 2, 0, 0, 0, param0); sub_02006E60(172, 76, v1, 2, 0, 0, 0, param0); sub_02006E84(172, 75, 0, 0x20 * 6, 0x20, param0); - BGL_SetPriority(2, 1); + Bg_SetPriority(2, 1); v0->unk_34.unk_00 = 0; v0->unk_34.unk_04 = 31; diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c index 4c10d1ac5c..d18e006226 100644 --- a/src/overlay006/ov6_02243258.c +++ b/src/overlay006/ov6_02243258.c @@ -1688,8 +1688,8 @@ static void ov6_0224481C(UnkStruct_ov6_02243FFC *param0) ov6_02244F80(param0, (FX32_ONE * 0), (FX32_ONE * 192), (FX32_ONE * 1), (FX32_ONE * 192)); ov6_02244F2C(param0); - param0->unk_24 = sub_0201A008(param0->fieldSystem->unk_08, 0); - param0->unk_26 = sub_0201A008(param0->fieldSystem->unk_08, 3); + param0->unk_24 = Bg_GetPriority(param0->fieldSystem->unk_08, 0); + param0->unk_26 = Bg_GetPriority(param0->fieldSystem->unk_08, 3); G2_SetBG1Priority(1); G2_SetBG3Priority(0); @@ -1945,7 +1945,7 @@ static void ov6_02244E54(NARC *param0, u32 param1, NNSG2dPaletteData **param2) NNS_G2dGetUnpackedPaletteData(v0, param2); - sub_0201972C(3, (*param2)->pRawData, (32 * 1), (32 * 12)); + Bg_LoadPalette(3, (*param2)->pRawData, (32 * 1), (32 * 12)); Heap_FreeToHeap(v0); } @@ -1956,7 +1956,7 @@ static void ov6_02244E7C(BgConfig *param0, NARC *param1, u32 param2, NNSG2dChara v0 = NARC_AllocAndReadWholeMember(param1, param2, 4); NNS_G2dGetUnpackedCharacterData(v0, param3); - sub_0201958C(param0, 3, (*param3)->pRawData, (*param3)->szByte, 0); + Bg_LoadTiles(param0, 3, (*param3)->pRawData, (*param3)->szByte, 0); Heap_FreeToHeap(v0); } @@ -1964,21 +1964,21 @@ static void ov6_02244EB4(BgConfig *param0, NARC *param1, u32 param2, NNSG2dScree { void *v0; - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); v0 = NARC_AllocAndReadWholeMember(param1, param2, 4); NNS_G2dGetUnpackedScreenData(v0, param3); - sub_02019574(param0, 3, (void *)(*param3)->rawData, (*param3)->szByte); - sub_02019E2C(param0, 3, 0, 0, 32, 32, 12); - sub_02019448(param0, 3); + Bg_LoadTilemapBuffer(param0, 3, (void *)(*param3)->rawData, (*param3)->szByte); + Bg_ChangeTilemapRectPalette(param0, 3, 0, 0, 32, 32, 12); + Bg_CopyTilemapBufferToVRAM(param0, 3); Heap_FreeToHeap(v0); } static void ov6_02244F20(BgConfig *param0) { - sub_02019EBC(param0, 3); + Bg_ClearTilemap(param0, 3); } static void ov6_02244F2C(UnkStruct_ov6_02243FFC *param0) diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c index 1825e5e5ef..0a7b02b65b 100644 --- a/src/overlay006/ov6_02247A0C.c +++ b/src/overlay006/ov6_02247A0C.c @@ -141,10 +141,10 @@ void *ov6_02247A90(void *param0) v0->unk_10 = MessageLoader_Init(0, 26, 208, 11); v0->unk_14 = StringTemplate_Default(11); - BGL_AddWindow(v1, &v0->unk_00, 3, 1, 3, 30, 17, 12, (1 + 10)); + Window_Add(v1, &v0->unk_00, 3, 1, 3, 30, 17, 12, (1 + 10)); sub_0200DAA4(v1, 3, 1, 11, 0, 11); Window_Show(&v0->unk_00, 1, 1, 11); - BGL_FillWindow(&v0->unk_00, 15); + Window_FillTilemap(&v0->unk_00, 15); v3 = Strbuf_Init(100, 11); v2 = MessageLoader_GetNewStrbuf(v0->unk_10, 0); @@ -190,7 +190,7 @@ void *ov6_02247A90(void *param0) } Strbuf_Free(v3); - sub_0201A954(&v0->unk_00); + Window_CopyToVRAM(&v0->unk_00); return v0; } @@ -200,8 +200,8 @@ void ov6_02247CC8(void *param0) UnkStruct_ov6_02247A90 *v0 = param0; Window_Clear(&v0->unk_00, 1); - sub_0201ACF4(&v0->unk_00); - BGL_DeleteWindow(&v0->unk_00); + Window_ClearAndCopyToVRAM(&v0->unk_00); + Window_Remove(&v0->unk_00); MessageLoader_Free(v0->unk_10); StringTemplate_Free(v0->unk_14); Heap_FreeToHeap(v0); diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c index 0907f89d47..f32503a6a8 100644 --- a/src/overlay007/communication_club.c +++ b/src/overlay007/communication_club.c @@ -165,7 +165,7 @@ static void CommClubMan_PrintMessage(int msgId, BOOL format) MessageLoader_GetStrbuf(sCommClubMan->msgLoader, msgId, sCommClubMan->strBuff[5]); } - if (!BGL_WindowAdded(&sCommClubMan->msgWindow)) { + if (!Window_IsInUse(&sCommClubMan->msgWindow)) { FieldMessage_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->msgWindow, 3); } @@ -186,7 +186,7 @@ static inline void CommClubMan_PrintMessageFastSpeed(int msgId, BOOL format) MessageLoader_GetStrbuf(sCommClubMan->msgLoader, msgId, sCommClubMan->strBuff[5]); } - if (!BGL_WindowAdded(&sCommClubMan->msgWindow)) { + if (!Window_IsInUse(&sCommClubMan->msgWindow)) { FieldMessage_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->msgWindow, 3); } @@ -199,8 +199,8 @@ static inline void CommClubMan_PrintMessageFastSpeed(int msgId, BOOL format) static void CommClubMan_CreateList(UnkStruct_ov84_02240FA8 param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5) { - if (!BGL_WindowAdded(&sCommClubMan->unk_20)) { - BGL_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_20, 3, param1, param2, param3, param4, 13, param5); + if (!Window_IsInUse(&sCommClubMan->unk_20)) { + Window_Add(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_20, 3, param1, param2, param3, param4, 13, param5); } Window_Show(&sCommClubMan->unk_20, 1, 1024 - (18 + 12) - 9, 11); @@ -210,7 +210,7 @@ static void CommClubMan_CreateList(UnkStruct_ov84_02240FA8 param0, u8 param1, u8 v0.unk_0C = &sCommClubMan->unk_20; sCommClubMan->unk_5C = sub_0200112C(&v0, 0, 0, 4); - sub_0201A954(&sCommClubMan->unk_20); + Window_CopyToVRAM(&sCommClubMan->unk_20); } static void CommClubMan_Init(FieldSystem *fieldSystem) @@ -273,7 +273,7 @@ static void CommClubMan_Delete(void) MessageLoader_Free(sCommClubMan->msgLoader); if (sCommClubMan->msgWindow.pixels != NULL) { - BGL_DeleteWindow(&sCommClubMan->msgWindow); + Window_Remove(&sCommClubMan->msgWindow); } Heap_FreeToHeap(sCommClubMan); @@ -334,7 +334,7 @@ static void ov7_02249C94(BmpList *param0, u32 param1, u8 param2) cnt += param2; - BGL_WindowColor(&sCommClubMan->unk_20, 15, 8, param2 * 16, sub_0201C294(&sCommClubMan->unk_20) * 8 - 8, 16); + Window_FillRectWithColor(&sCommClubMan->unk_20, 15, 8, param2 * 16, Window_GetWidth(&sCommClubMan->unk_20) * 8 - 8, 16); if (cnt < v0) { sub_020339AC(cnt, sCommClubMan->unk_7C); @@ -363,13 +363,13 @@ static void ov7_02249C94(BmpList *param0, u32 param1, u8 param2) static void CommClubMan_PrintChooseJoinMsg(CommClubManager *param0) { - if (!BGL_WindowAdded(&sCommClubMan->unk_30)) { - BGL_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_30, 3, 23, 2, 8, 4, 13, (1 + 20 * 5 * 2)); + if (!Window_IsInUse(&sCommClubMan->unk_30)) { + Window_Add(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_30, 3, 23, 2, 8, 4, 13, (1 + 20 * 5 * 2)); } Window_Show(&sCommClubMan->unk_30, 1, 1024 - (18 + 12) - 9, 11); - BGL_FillWindow(&sCommClubMan->unk_30, 15); - sub_0201A954(&sCommClubMan->unk_30); + Window_FillTilemap(&sCommClubMan->unk_30, 15); + Window_CopyToVRAM(&sCommClubMan->unk_30); param0->unk_97 = 1; @@ -500,9 +500,9 @@ static void ov7_0224A0C8(CommClubManager *commClubMan) if (sub_02033870() || sCommClubMan->unk_98) { sCommClubMan->unk_98 = 0; sub_02033884(); - BGL_WindowColor(&sCommClubMan->unk_20, 15, 8, 0, 20 - 8, (5 * 2) * 8); + Window_FillRectWithColor(&sCommClubMan->unk_20, 15, 8, 0, 20 - 8, (5 * 2) * 8); ov7_02249C64(sCommClubMan->unk_5C, 0, 0); - sub_0201A954(&sCommClubMan->unk_20); + Window_CopyToVRAM(&sCommClubMan->unk_20); } } @@ -694,13 +694,13 @@ static void ov7_0224A53C(CommClubManager *man) SysTask_Start(CommClubMan_Run, man, 0); ov7_0224A5D0(); - if (!BGL_WindowAdded(&sCommClubMan->unk_30)) { - BGL_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_30, 3, 22, 2, 9, 4, 13, (1 + 17 * 6 * 2)); + if (!Window_IsInUse(&sCommClubMan->unk_30)) { + Window_Add(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_30, 3, 22, 2, 9, 4, 13, (1 + 17 * 6 * 2)); } Window_Show(&sCommClubMan->unk_30, 1, 1024 - (18 + 12) - 9, 11); - BGL_FillWindow(&sCommClubMan->unk_30, 15); - sub_0201A954(&sCommClubMan->unk_30); + Window_FillTilemap(&sCommClubMan->unk_30, 15); + Window_CopyToVRAM(&sCommClubMan->unk_30); man->unk_97 = 1; @@ -774,7 +774,7 @@ static void ov7_0224A64C(CommClubManager *commClubMan) } StringTemplate_SetNumber(sCommClubMan->unk_54, 0, playerCnt, 2, 5, 1); - BGL_FillWindow(&sCommClubMan->unk_30, 15); + Window_FillTilemap(&sCommClubMan->unk_30, 15); MessageLoader_GetStrbuf(sCommClubMan->msgLoader, msg, sCommClubMan->strBuff[7]); StringTemplate_Format(sCommClubMan->unk_54, sCommClubMan->strBuff[6], sCommClubMan->strBuff[7]); @@ -1374,17 +1374,17 @@ static void ov7_0224AF84(SysTask *task, void *param1) static void CommClubMan_DestroyList(SysTask *task, CommClubManager *param1) { - BGL_FillWindow(&sCommClubMan->msgWindow, 15); + Window_FillTilemap(&sCommClubMan->msgWindow, 15); Window_Clear(¶m1->unk_20, 0); sub_02013A3C(param1->unk_64); sub_02001384(param1->unk_5C, NULL, NULL); - sub_0201ACF4(¶m1->unk_20); - BGL_DeleteWindow(¶m1->unk_20); + Window_ClearAndCopyToVRAM(¶m1->unk_20); + Window_Remove(¶m1->unk_20); if (param1->unk_97) { Window_Clear(&sCommClubMan->unk_30, 0); - sub_0201ACF4(&sCommClubMan->unk_30); - BGL_DeleteWindow(&sCommClubMan->unk_30); + Window_ClearAndCopyToVRAM(&sCommClubMan->unk_30); + Window_Remove(&sCommClubMan->unk_30); param1->unk_97 = 0; } diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c index 82e83df151..65c4e9e821 100644 --- a/src/overlay007/ov7_0224B4E8.c +++ b/src/overlay007/ov7_0224B4E8.c @@ -89,7 +89,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov7_0224F188 = { static void ov7_0224B4E8(UnkStruct_ov7_0224B4E8 *param0, int param1) { - if (BGL_WindowAdded(¶m0->unk_54) == 0) { + if (Window_IsInUse(¶m0->unk_54) == 0) { Window_Init(¶m0->unk_54); FieldMessage_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_54, 3); FieldMessage_DrawWindow(¶m0->unk_54, SaveData_Options(param0->fieldSystem->saveData)); @@ -107,10 +107,10 @@ static void ov7_0224B558(UnkStruct_ov7_0224B4E8 *param0, BOOL param1) { if (param1) { sub_0200E084(¶m0->unk_54, 0); - sub_0201ACF4(¶m0->unk_54); + Window_ClearAndCopyToVRAM(¶m0->unk_54); } - BGL_DeleteWindow(¶m0->unk_54); + Window_Remove(¶m0->unk_54); } static void ov7_0224B57C(UnkStruct_ov7_0224B4E8 *param0, int param1) @@ -130,12 +130,12 @@ static void ov7_0224B5A8(UnkStruct_ov7_0224B4E8 *param0) v3++; } - if (BGL_WindowAdded(v1) == 0) { + if (Window_IsInUse(v1) == 0) { int v4; param0->unk_08 = sub_02013A04(v3 + 2, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, v1, 3, 1, 1, 16, (v3 + 2) * 2, 13, 1); + Window_Add(param0->fieldSystem->unk_08, v1, 3, 1, 1, 16, (v3 + 2) * 2, 13, 1); Window_Show(¶m0->unk_34, 1, 1024 - (18 + 12) - 9, 11); sub_02013A4C(param0->unk_08, param0->unk_68, 123, 12); @@ -158,7 +158,7 @@ static void ov7_0224B5A8(UnkStruct_ov7_0224B4E8 *param0) v0.unk_1C = param0; param0->unk_00 = sub_0200112C(&v0, 0, param0->unk_78, 4); - sub_0201A954(¶m0->unk_34); + Window_CopyToVRAM(¶m0->unk_34); } static void ov7_0224B6AC(UnkStruct_ov7_0224B4E8 *param0) @@ -166,8 +166,8 @@ static void ov7_0224B6AC(UnkStruct_ov7_0224B4E8 *param0) if (param0->unk_00) { sub_02001384(param0->unk_00, NULL, NULL); Window_Clear(¶m0->unk_34, 1); - sub_0201C3C0(param0->unk_34.bgConfig, param0->unk_34.bgLayer); - BGL_DeleteWindow(¶m0->unk_34); + Bg_ScheduleTilemapTransfer(param0->unk_34.bgConfig, param0->unk_34.bgLayer); + Window_Remove(¶m0->unk_34); sub_02013A3C(param0->unk_08); param0->unk_00 = NULL; @@ -228,7 +228,7 @@ static void ov7_0224B788(UnkStruct_ov7_0224B4E8 *param0) param0->unk_0C = sub_02013A04(v1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_44, 3, v5, v3, v4, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - v4 * v1 * 2); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_44, 3, v5, v3, v4, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - v4 * v1 * 2); Window_Show(¶m0->unk_44, 1, 1024 - (18 + 12) - 9, 11); { @@ -248,7 +248,7 @@ static void ov7_0224B788(UnkStruct_ov7_0224B4E8 *param0) v0.unk_1C = param0; param0->unk_04 = sub_0200112C(&v0, 0, param0->unk_7A, 4); - sub_0201A954(¶m0->unk_44); + Window_CopyToVRAM(¶m0->unk_44); } static int ov7_0224B83C(UnkStruct_ov7_0224B4E8 *param0) @@ -282,8 +282,8 @@ static int ov7_0224B83C(UnkStruct_ov7_0224B4E8 *param0) if (param0->unk_04) { sub_02001384(param0->unk_04, NULL, NULL); Window_Clear(¶m0->unk_44, 1); - sub_0201C3C0(param0->unk_44.bgConfig, param0->unk_44.bgLayer); - BGL_DeleteWindow(¶m0->unk_44); + Bg_ScheduleTilemapTransfer(param0->unk_44.bgConfig, param0->unk_44.bgLayer); + Window_Remove(¶m0->unk_44); sub_02013A3C(param0->unk_0C); param0->unk_04 = NULL; @@ -335,9 +335,9 @@ static void ov7_0224B8DC(UnkStruct_ov7_0224B4E8 *param0) v3 = Strbuf_Init((90 * 2), 4); v4 = ¶m0->unk_24; - BGL_AddWindow(param0->fieldSystem->unk_08, v4, 3, 4, 2, 24, 19, 13, 1); + Window_Add(param0->fieldSystem->unk_08, v4, 3, 4, 2, 24, 19, 13, 1); Window_Show(v4, 1, 1024 - (18 + 12) - 9, 11); - BGL_FillWindow(v4, 15); + Window_FillTilemap(v4, 15); ov7_0224B57C(param0, param0->unk_78 - 1); @@ -415,14 +415,14 @@ static void ov7_0224B8DC(UnkStruct_ov7_0224B4E8 *param0) Strbuf_Free(v2); Strbuf_Free(v3); MessageLoader_Free(v0); - sub_0201A954(v4); + Window_CopyToVRAM(v4); } static void ov7_0224BBA0(UnkStruct_ov7_0224B4E8 *param0) { Window_Clear(¶m0->unk_24, 1); - sub_0201C3C0(param0->unk_24.bgConfig, param0->unk_24.bgLayer); - BGL_DeleteWindow(¶m0->unk_24); + Bg_ScheduleTilemapTransfer(param0->unk_24.bgConfig, param0->unk_24.bgLayer); + Window_Remove(¶m0->unk_24); } static BOOL ov7_0224BBC4(UnkStruct_ov7_0224B4E8 *param0) diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index 1f9480f99c..f5169d72d6 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -243,7 +243,7 @@ BOOL ov7_0224BF2C(UnkStruct_ov7_0224BEFC *param0) v1 = ov7_0224C9A4(¶m0->unk_1E8); if ((v1 != 0xffffffff) && (v1 != 0xfffffffe)) { - sub_02019CB8(param0->unk_14, 3, 0, 0, 0, 32, 18, 17); + Bg_FillTilemapRect(param0->unk_14, 3, 0, 0, 0, 32, 18, 17); ov7_0224CA34(¶m0->unk_1E8); ov7_0224C4E0(¶m0->unk_1B8, param0->unk_1AC, param0->unk_18, Unk_ov7_0224F1B4, param0->unk_1E8.unk_12C); @@ -369,12 +369,12 @@ static void ov7_0224C35C(UnkStruct_ov7_0224BEFC *param0) Font_LoadScreenIndicatorsPalette(0, 12 * 32, param0->unk_18); sub_0200DAA4(param0->unk_14, 3, (1 + (18 + 12)), 11, 0, param0->unk_18); Font_LoadTextPalette(0, 13 * 32, param0->unk_18); - sub_02019EBC(param0->unk_14, 3); + Bg_ClearTilemap(param0->unk_14, 3); } static void ov7_0224C3B8(UnkStruct_ov7_0224BEFC *param0) { - sub_02019EBC(param0->unk_14, 3); + Bg_ClearTilemap(param0->unk_14, 3); sub_0205D8CC(0, 1); } @@ -395,10 +395,10 @@ static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC *param0, BgConfig *param1, u32 p } param0->unk_08 = param3; - param0->unk_04 = sub_0201A778(param2, 1); + param0->unk_04 = Window_New(param2, 1); - BGL_AddWindow(param1, param0->unk_04, 3, 2, 19, 27, 4, 12, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(param0->unk_04, 15); + Window_Add(param1, param0->unk_04, 3, 2, 19, 27, 4, 12, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(param0->unk_04, 15); sub_0200E060(param0->unk_04, 0, 1, 10); param0->unk_00 = 1; @@ -410,9 +410,9 @@ static void ov7_0224C444(UnkStruct_ov7_0224C3EC *param0) return; } - sub_0201ACF4(param0->unk_04); - BGL_DeleteWindow(param0->unk_04); - sub_0201A928(param0->unk_04, 1); + Window_ClearAndCopyToVRAM(param0->unk_04); + Window_Remove(param0->unk_04); + Windows_Delete(param0->unk_04, 1); param0->unk_00 = 0; } @@ -421,12 +421,12 @@ static void ov7_0224C468(UnkStruct_ov7_0224C3EC *param0, Strbuf *param1, u32 par { GF_ASSERT(param0->unk_10 == NULL); - BGL_FillWindow(param0->unk_04, 15); + Window_FillTilemap(param0->unk_04, 15); param0->unk_10 = Strbuf_Clone(param1, param2); param0->unk_0C = Text_AddPrinterWithParamsAndColor(param0->unk_04, FONT_MESSAGE, param0->unk_10, 0, 0, param0->unk_08, TEXT_COLOR(1, 2, 15), NULL); - sub_0201A954(param0->unk_04); + Window_CopyToVRAM(param0->unk_04); } static BOOL ov7_0224C4B8(UnkStruct_ov7_0224C3EC *param0) @@ -505,8 +505,8 @@ static void ov7_0224C620(UnkStruct_ov7_0224C620 *param0, BgConfig *param1, Messa return; } - param0->unk_04 = sub_0201A778(param3, 1); - BGL_AddWindow(param1, param0->unk_04, 3, 1, 11, 14, 6, 13, (((1 + (18 + 12)) + 9) + (27 * 4))); + param0->unk_04 = Window_New(param3, 1); + Window_Add(param1, param0->unk_04, 3, 1, 11, 14, 6, 13, (((1 + (18 + 12)) + 9) + (27 * 4))); param0->unk_08 = StringTemplate_Default(param3); for (v0 = 0; v0 < 3; v0++) { @@ -514,7 +514,7 @@ static void ov7_0224C620(UnkStruct_ov7_0224C620 *param0, BgConfig *param1, Messa } param0->unk_0C = Strbuf_Init(32, param3); - BGL_FillWindow(param0->unk_04, 15); + Window_FillTilemap(param0->unk_04, 15); param0->unk_00 = 1; } @@ -532,9 +532,9 @@ static void ov7_0224C698(UnkStruct_ov7_0224C620 *param0) Strbuf_Free(param0->unk_0C); StringTemplate_Free(param0->unk_08); - sub_0201ACF4(param0->unk_04); - BGL_DeleteWindow(param0->unk_04); - sub_0201A928(param0->unk_04, 1); + Window_ClearAndCopyToVRAM(param0->unk_04); + Window_Remove(param0->unk_04); + Windows_Delete(param0->unk_04, 1); param0->unk_00 = 0; } @@ -546,7 +546,7 @@ static void ov7_0224C6DC(UnkStruct_ov7_0224C620 *param0, u32 param1, u32 param2, StringTemplate_SetItemName(param0->unk_08, 0, param1 + 149); StringTemplate_SetNumber(param0->unk_08, 1, param2, 3, 1, 1); StringTemplate_SetNumber(param0->unk_08, 2, param3, 3, 1, 1); - BGL_FillWindow(param0->unk_04, 15); + Window_FillTilemap(param0->unk_04, 15); for (v0 = 0; v0 < 3; v0++) { StringTemplate_Format(param0->unk_08, param0->unk_0C, param0->unk_10[v0]); @@ -595,9 +595,9 @@ static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BgConfig *param1, u32 p param0->unk_120 = param4 + 1; param0->unk_130 = param6; param0->unk_134 = param7; - param0->unk_04 = sub_0201A778(param2, 1); + param0->unk_04 = Window_New(param2, 1); - BGL_AddWindow(param1, param0->unk_04, 3, 17, 1, 14, 16, 13, ((((1 + (18 + 12)) + 9) + (27 * 4)) + (14 * 6))); + Window_Add(param1, param0->unk_04, 3, 17, 1, 14, 16, 13, ((((1 + (18 + 12)) + 9) + (27 * 4)) + (14 * 6))); param0->unk_124 = StringTemplate_Default(param2); param0->unk_128 = Strbuf_Init(32, param2); @@ -670,9 +670,9 @@ static void ov7_0224C934(UnkStruct_ov7_0224C768 *param0) } sub_02001384(param0->unk_08, NULL, NULL); - sub_0201ACF4(param0->unk_04); - BGL_DeleteWindow(param0->unk_04); - sub_0201A928(param0->unk_04, 1); + Window_ClearAndCopyToVRAM(param0->unk_04); + Window_Remove(param0->unk_04); + Windows_Delete(param0->unk_04, 1); param0->unk_00 = 1; } @@ -781,8 +781,8 @@ static void ov7_0224CBE4(void *param0, u32 param1) v1 = Bag_GetItemQuantity(v0->unk_10, v0->unk_0C[param1].unk_04 + 149, v0->unk_00); ov7_0224C6DC(v0->unk_08, v0->unk_0C[param1].unk_04, v0->unk_0C[param1].unk_08, v1); } else { - sub_02019CB8(v0->unk_04, 3, 0, 1 - 1, 11 - 1, 14 + 2, 6 + 2, 17); - sub_02019448(v0->unk_04, 3); + Bg_FillTilemapRect(v0->unk_04, 3, 0, 1 - 1, 11 - 1, 14 + 2, 6 + 2, 17); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 3); } } diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index 715a524515..3a63af93f3 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -334,21 +334,21 @@ static void ov7_0224D040(UnkStruct_ov7_0224D008 *param0) sub_02013A4C(param0->unk_84, param0->unk_88, 15, 2); sub_02013A4C(param0->unk_84, param0->unk_88, 16, 14); sub_02013A4C(param0->unk_84, param0->unk_88, 17, 0xfffffffe); - BGL_AddWindow(param0->unk_00, ¶m0->unk_08[0], 3, 1, 1, 13, 6, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6))); + Window_Add(param0->unk_00, ¶m0->unk_08[0], 3, 1, 1, 13, 6, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6))); } else if (param0->unk_2A9 == 3) { v1 = 2; param0->unk_84 = sub_02013A04(v1, 11); sub_02013A4C(param0->unk_84, param0->unk_88, 29, 2); sub_02013A4C(param0->unk_84, param0->unk_88, 30, 0xfffffffe); - BGL_AddWindow(param0->unk_00, ¶m0->unk_08[0], 3, 23, 13, 7, 4, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6))); + Window_Add(param0->unk_00, ¶m0->unk_08[0], 3, 23, 13, 7, 4, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6))); } else { v1 = 2; param0->unk_84 = sub_02013A04(v1, 11); sub_02013A4C(param0->unk_84, param0->unk_88, 15, 2); sub_02013A4C(param0->unk_84, param0->unk_88, 17, 0xfffffffe); - BGL_AddWindow(param0->unk_00, ¶m0->unk_08[0], 3, 1, 1, 13, 4, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6))); + Window_Add(param0->unk_00, ¶m0->unk_08[0], 3, 1, 1, 13, 4, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6))); } v0.unk_00 = param0->unk_84; @@ -386,10 +386,10 @@ static u8 ov7_0224D1EC(UnkStruct_ov7_0224D008 *param0) static void ov7_0224D21C(UnkStruct_ov7_0224D008 *param0) { Window_Clear(¶m0->unk_08[0], 1); - sub_0201ACF4(¶m0->unk_08[0]); + Window_ClearAndCopyToVRAM(¶m0->unk_08[0]); sub_02001BC4(param0->unk_80, NULL); sub_02013A3C(param0->unk_84); - BGL_DeleteWindow(¶m0->unk_08[0]); + Window_Remove(¶m0->unk_08[0]); } static u8 ov7_0224D250(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1) @@ -402,7 +402,7 @@ static u8 ov7_0224D250(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1) void *v0; sub_0200E084(¶m1->unk_08[1], 0); - BGL_DeleteWindow(¶m1->unk_08[1]); + Window_Remove(¶m1->unk_08[1]); MessageLoader_Free(param1->unk_88); StringTemplate_Free(param1->unk_8C); Strbuf_Free(param1->unk_298); @@ -440,7 +440,7 @@ static u8 ov7_0224D250(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1) static void ov7_0224D388(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1) { - sub_02019CB8(param1->unk_00, 3, 0, 2 - 2, 19 - 1, 27 + 5, 4 + 2, 0); + Bg_FillTilemapRect(param1->unk_00, 3, 0, 2 - 2, 19 - 1, 27 + 5, 4 + 2, 0); ov7_0224D21C(param1); ov7_0224D3E8(param1); @@ -459,11 +459,11 @@ static void ov7_0224D3E8(UnkStruct_ov7_0224D008 *param0) for (v0 = 0; v0 < 6; v0++) { if ((param0->unk_2A9 != 0) && (param0->unk_2A9 != 3) && (v0 == 1)) { - sub_0201A8D4(param0->unk_00, ¶m0->unk_08[v0], &Unk_ov7_0224F2BC); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_08[v0], &Unk_ov7_0224F2BC); } else if ((param0->unk_2A9 == 3) && (v0 == 2)) { - sub_0201A8D4(param0->unk_00, ¶m0->unk_08[v0], &Unk_ov7_0224F2C4); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_08[v0], &Unk_ov7_0224F2C4); } else { - sub_0201A8D4(param0->unk_00, ¶m0->unk_08[v0], &Unk_ov7_0224F328[v0]); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_08[v0], &Unk_ov7_0224F328[v0]); } } } @@ -475,8 +475,8 @@ static void ov7_0224D44C(UnkStruct_ov7_0224D008 *param0) Window_Clear(¶m0->unk_08[2], 1); for (v0 = 0; v0 < 6; v0++) { - sub_0201ACF4(¶m0->unk_08[v0]); - BGL_DeleteWindow(¶m0->unk_08[v0]); + Window_ClearAndCopyToVRAM(¶m0->unk_08[v0]); + Window_Remove(¶m0->unk_08[v0]); } } @@ -508,15 +508,15 @@ static void ov7_0224D474(UnkStruct_ov7_0224D008 *param0) static void ov7_0224D548(UnkStruct_ov7_0224D008 *param0) { param0->unk_2A0 = GXLayers_EngineAGetLayers(); - param0->unk_29C[0] = sub_0201A008(param0->unk_00, 0); - param0->unk_29C[1] = sub_0201A008(param0->unk_00, 1); - param0->unk_29C[2] = sub_0201A008(param0->unk_00, 2); - param0->unk_29C[3] = sub_0201A008(param0->unk_00, 3); + param0->unk_29C[0] = Bg_GetPriority(param0->unk_00, 0); + param0->unk_29C[1] = Bg_GetPriority(param0->unk_00, 1); + param0->unk_29C[2] = Bg_GetPriority(param0->unk_00, 2); + param0->unk_29C[3] = Bg_GetPriority(param0->unk_00, 3); - BGL_SetPriority(0, 3); - BGL_SetPriority(1, 2); - BGL_SetPriority(2, 1); - BGL_SetPriority(3, 0); + Bg_SetPriority(0, 3); + Bg_SetPriority(1, 2); + Bg_SetPriority(2, 1); + Bg_SetPriority(3, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); @@ -526,10 +526,10 @@ static void ov7_0224D548(UnkStruct_ov7_0224D008 *param0) static void ov7_0224D5D8(UnkStruct_ov7_0224D008 *param0) { - BGL_SetPriority(0, param0->unk_29C[0]); - BGL_SetPriority(1, param0->unk_29C[1]); - BGL_SetPriority(2, param0->unk_29C[2]); - BGL_SetPriority(3, param0->unk_29C[3]); + Bg_SetPriority(0, param0->unk_29C[0]); + Bg_SetPriority(1, param0->unk_29C[1]); + Bg_SetPriority(2, param0->unk_29C[2]); + Bg_SetPriority(3, param0->unk_29C[3]); GXLayers_EngineASetLayers(param0->unk_2A0); } @@ -661,7 +661,7 @@ static void ov7_0224D85C(BmpList *param0, u32 param1, u8 param2) Sound_PlayEffect(1592); } - BGL_FillWindow(&v0->unk_08[1], 0); + Window_FillTilemap(&v0->unk_08[1], 0); if (param1 != 0xfffffffe) { Strbuf *v1; @@ -715,7 +715,7 @@ static void ov7_0224D85C(BmpList *param0, u32 param1, u8 param2) CellActor_SetDrawFlag(v0->unk_25C[1], 0); } } - sub_0201A9A4(&v0->unk_08[1]); + Window_ScheduleCopyToVRAM(&v0->unk_08[1]); } static void ov7_0224D9B8(BmpList *param0, u32 param1, u8 param2) @@ -757,7 +757,7 @@ static void ov7_0224D9B8(BmpList *param0, u32 param1, u8 param2) if (param1 == 0xfffffffe) { Strbuf *v6 = MessageLoader_GetNewStrbuf(v0->unk_88, 8); - BGL_WindowColor(&v0->unk_08[0], 15, 0, param2, 19 * 8, 16); + Window_FillRectWithColor(&v0->unk_08[0], 15, 0, param2, 19 * 8, 16); Text_AddPrinterWithParamsAndColor(&v0->unk_08[0], FONT_SYSTEM, v6, 0, param2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v6); } @@ -772,11 +772,11 @@ static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1) if (param0->unk_2A9 == 3) { if (param1 == 0) { - BGL_FillWindow(¶m0->unk_08[2], 15); + Window_FillTilemap(¶m0->unk_08[2], 15); Window_Show( ¶m0->unk_08[2], 1, (1 + (18 + 12)), 11); } else { - BGL_WindowColor(¶m0->unk_08[2], 15, 0, 0, (9 * 8), 16); + Window_FillRectWithColor(¶m0->unk_08[2], 15, 0, 0, (9 * 8), 16); } v0 = Strbuf_Init(16, 11); @@ -791,7 +791,7 @@ static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1) Text_AddPrinterWithParams(¶m0->unk_08[2], FONT_SYSTEM, v0, (9 * 8) - v3 - 8, 0, TEXT_SPEED_NO_TRANSFER, NULL); } else { if (param1 == 0) { - BGL_FillWindow(¶m0->unk_08[2], 15); + Window_FillTilemap(¶m0->unk_08[2], 15); Window_Show(¶m0->unk_08[2], 1, (1 + (18 + 12)), 11); v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 18); @@ -799,7 +799,7 @@ static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1) Text_AddPrinterWithParams(¶m0->unk_08[2], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); Strbuf_Free(v1); } else { - BGL_WindowColor(¶m0->unk_08[2], 15, 0, 16, (9 * 8), 16); + Window_FillRectWithColor(¶m0->unk_08[2], 15, 0, 16, (9 * 8), 16); } v0 = Strbuf_Init(16, 11); @@ -816,7 +816,7 @@ static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1) Strbuf_Free(v1); Strbuf_Free(v0); - sub_0201A9A4(¶m0->unk_08[2]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[2]); } static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 *param0) @@ -840,7 +840,7 @@ static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 *param0) sub_02013A3C(param0->unk_7C); ov7_0224D44C(param0); ov7_0224D5D8(param0); - sub_02019EBC(param0->unk_00, 1); + Bg_ClearTilemap(param0->unk_00, 1); Sound_PlayEffect(1500); return 12; @@ -856,8 +856,8 @@ static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 *param0) ov7_0224EC10(param0, 1); - BGL_FillWindow(¶m0->unk_08[5], 15); - sub_0201ACF4(¶m0->unk_08[1]); + Window_FillTilemap(¶m0->unk_08[5], 15); + Window_ClearAndCopyToVRAM(¶m0->unk_08[1]); sub_0200E060(¶m0->unk_08[5], 0, 1, 10); param0->unk_2AA = (u16)v0; @@ -946,7 +946,7 @@ static void ov7_0224DED4(UnkStruct_ov7_0224D008 *param0) v2 = 0; } - BGL_FillWindow(¶m0->unk_08[4], 15); + Window_FillTilemap(¶m0->unk_08[4], 15); Window_Show(¶m0->unk_08[4], 1, (1 + (18 + 12)), 11); v0 = Strbuf_Init((12 * 2), 11); @@ -957,7 +957,7 @@ static void ov7_0224DED4(UnkStruct_ov7_0224D008 *param0) Text_AddPrinterWithParams(¶m0->unk_08[4], FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); Strbuf_Free(v1); Strbuf_Free(v0); - sub_0201A9A4(¶m0->unk_08[4]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[4]); } static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0) @@ -973,7 +973,7 @@ static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0) CellActor_SetDrawFlag(param0->unk_25C[1], 0); Window_Clear(¶m0->unk_08[4], 1); Window_Clear(¶m0->unk_08[3], 1); - BGL_FillWindow(¶m0->unk_08[5], 15); + Window_FillTilemap(¶m0->unk_08[5], 15); Sound_PlayEffect(1500); return ov7_0224E098(param0); @@ -991,7 +991,7 @@ static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0) ov7_0224EC10(param0, 0); - sub_0201A9A4(¶m0->unk_08[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[1]); Sound_PlayEffect(1500); return 4; @@ -1075,7 +1075,7 @@ static void ov7_0224E28C(UnkStruct_ov7_0224D008 *param0, u8 param1) Strbuf *v1; u32 v2; - BGL_FillWindow(¶m0->unk_08[3], 15); + Window_FillTilemap(¶m0->unk_08[3], 15); if (param1 == 0) { Window_Show(¶m0->unk_08[3], 1, (1 + (18 + 12)), 11); @@ -1103,7 +1103,7 @@ static void ov7_0224E28C(UnkStruct_ov7_0224D008 *param0, u8 param1) Text_AddPrinterWithParams(¶m0->unk_08[3], FONT_SYSTEM, v0, (12 * 8) - v2, 8, TEXT_SPEED_NO_TRANSFER, NULL); Strbuf_Free(v1); Strbuf_Free(v0); - sub_0201A9A4(¶m0->unk_08[3]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[3]); } static u8 ov7_0224E3A0(UnkStruct_ov7_0224D008 *param0) @@ -1159,7 +1159,7 @@ static u8 ov7_0224E3D8(UnkStruct_ov7_0224D008 *param0) StringTemplate_Format(param0->unk_8C, param0->unk_298, v0); Strbuf_Free(v0); } - BGL_FillWindow(¶m0->unk_08[5], 15); + Window_FillTilemap(¶m0->unk_08[5], 15); param0->unk_2A4 = FieldMessage_Print(¶m0->unk_08[5], param0->unk_298, param0->unk_278, 1); Sound_PlayEffect(1604); return 9; @@ -1169,7 +1169,7 @@ static u8 ov7_0224E3D8(UnkStruct_ov7_0224D008 *param0) CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]); CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]); ov7_0224EC10(param0, 0); - sub_0201A9A4(¶m0->unk_08[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[1]); return 4; } @@ -1231,7 +1231,7 @@ static u8 ov7_0224E6B8(UnkStruct_ov7_0224D008 *param0) StringTemplate_Format(param0->unk_8C, param0->unk_298, v0); Strbuf_Free(v0); - BGL_FillWindow(¶m0->unk_08[5], 15); + Window_FillTilemap(¶m0->unk_08[5], 15); param0->unk_2A4 = FieldMessage_Print(¶m0->unk_08[5], param0->unk_298, param0->unk_278, 1); @@ -1249,7 +1249,7 @@ static u8 ov7_0224E6B8(UnkStruct_ov7_0224D008 *param0) CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]); CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]); ov7_0224EC10(param0, 0); - sub_0201A9A4(¶m0->unk_08[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[1]); return 4; } @@ -1269,7 +1269,7 @@ static u8 ov7_0224E7C8(UnkStruct_ov7_0224D008 *param0) CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]); CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]); ov7_0224EC10(param0, 0); - sub_0201A9A4(¶m0->unk_08[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[1]); return 4; } @@ -1420,7 +1420,7 @@ static u8 ov7_0224EA2C(UnkStruct_ov7_0224D008 *param0) return 13; } - BGL_DeleteWindow(¶m0->unk_08[1]); + Window_Remove(¶m0->unk_08[1]); ov7_0224D040(param0); return 1; diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index cfe54fb77d..2f949c3ac9 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -2864,7 +2864,7 @@ static BOOL ov8_0224B3D4(TaskManager *param0) ov8_0224B240(&v2->unk_1C, v9, v10); sub_0200E084(v2->unk_44, 0); - BGL_DeleteWindow(v2->unk_44); + Window_Remove(v2->unk_44); v2->unk_04 = 0; v2->unk_00 = 5; break; diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index ff8050a8c5..2be54d7611 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -2577,7 +2577,7 @@ static void ov9_0224ADC0(UnkStruct_ov9_02249B04 *param0) v1 = NARC_AllocAndReadWholeMember(param0->unk_10, 1, 4); NNS_G2dGetUnpackedPaletteData(v1, &v2); - sub_0201972C(2, v2->pRawData, 32, 32 * 0); + Bg_LoadPalette(2, v2->pRawData, 32, 32 * 0); { int v3; @@ -2602,7 +2602,7 @@ static void ov9_0224ADC0(UnkStruct_ov9_02249B04 *param0) v6 = NARC_AllocAndReadWholeMember(param0->unk_10, 0, 4); NNS_G2dGetUnpackedCharacterData(v6, &v7); - sub_0201958C(param0->fieldSystem->unk_08, 2, v7->pRawData, v7->szByte, 0); + Bg_LoadTiles(param0->fieldSystem->unk_08, 2, v7->pRawData, v7->szByte, 0); Heap_FreeToHeap(v6); } @@ -2613,9 +2613,9 @@ static void ov9_0224ADC0(UnkStruct_ov9_02249B04 *param0) v8 = NARC_AllocAndReadWholeMember(param0->unk_10, 2, 4); NNS_G2dGetUnpackedScreenData(v8, &v9); - sub_02019460(param0->fieldSystem->unk_08, 2, (void *)v9->rawData, v9->szByte, 0); - sub_02019574(param0->fieldSystem->unk_08, 2, (void *)v9->rawData, v9->szByte); - sub_02019448(param0->fieldSystem->unk_08, 2); + Bg_CopyTilemapBufferRangeToVRAM(param0->fieldSystem->unk_08, 2, (void *)v9->rawData, v9->szByte, 0); + Bg_LoadTilemapBuffer(param0->fieldSystem->unk_08, 2, (void *)v9->rawData, v9->szByte); + Bg_CopyTilemapBufferToVRAM(param0->fieldSystem->unk_08, 2); Heap_FreeToHeap(v8); } @@ -7826,7 +7826,7 @@ static void ov9_0224F804(UnkStruct_ov9_02249B04 *param0) if (v0->unk_04 == 1) { { - sub_0201972C( + Bg_LoadPalette( 2, v0->unk_28, 32, 32 * 0); } diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index a05471038d..5ffcfbe289 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -479,7 +479,7 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0) ov10_022229D4(param0); MessageLoader_GetStrbuf(param0->unk_BA0, 0, param0->unk_BA8); param0->unk_BAC = Text_AddPrinterWithParams(¶m0->unk_B7C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL); - sub_0201C3C0(param0->unk_0C, 0); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 0); param0->unk_BB0 = 2; break; case 2: @@ -496,13 +496,13 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0) MessageLoader_GetStrbuf(param0->unk_BA0, 1, param0->unk_BA8); } - BGL_WindowColor(¶m0->unk_B8C, 15, 0, 0, 27 * 8, 4 * 8); + Window_FillRectWithColor(¶m0->unk_B8C, 15, 0, 0, 27 * 8, 4 * 8); sub_0200E060(¶m0->unk_B8C, 0, 1, 15); param0->unk_BAC = Text_AddPrinterWithParams(¶m0->unk_B8C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL); param0->unk_BB4 = sub_02002054(param0->unk_0C, &Unk_ov10_02222A68, (1 + (18 + 12)), 14, 1, param0->unk_00->unk_24); - sub_0201C3C0(param0->unk_0C, 0); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 0); param0->unk_BB0 = 4; break; case 4: { @@ -523,7 +523,7 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0) ov10_022229D4(param0); MessageLoader_GetStrbuf(param0->unk_BA0, 5, param0->unk_BA8); param0->unk_BAC = Text_AddPrinterWithParams(¶m0->unk_B7C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL); - sub_0201C3C0(param0->unk_0C, 0); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 0); param0->unk_BB0 = 6; break; case 6: @@ -535,7 +535,7 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0) } sub_0200E084(¶m0->unk_B7C, 0); - sub_0201C3C0(param0->unk_0C, 0); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 0); param0->unk_BB0 = 8; break; case 8: @@ -559,11 +559,11 @@ static u8 ov10_0221FB28(UnkStruct_ov10_0221FB28 *param0) ov10_0221F900(); - param0->unk_0C = sub_02018340(param0->unk_00->unk_24); + param0->unk_0C = BgConfig_New(param0->unk_00->unk_24); param0->unk_08 = sub_02002F38(param0->unk_00->unk_24); sub_02002F70(param0->unk_08, 0, 32 * 16, param0->unk_00->unk_24); - sub_0201975C(4, 0x0); + Bg_MaskPalette(4, 0x0); param0->unk_B76 = 0; param0->unk_B75 = 8; @@ -720,13 +720,13 @@ static u8 ov10_0221FE10(UnkStruct_ov10_0221FB28 *param0) static u8 ov10_0221FE48(UnkStruct_ov10_0221FB28 *param0) { - if (sub_020192EC(param0->unk_0C, 3) <= 24) { + if (Bg_GetXOffset(param0->unk_0C, 3) <= 24) { param0->unk_B76 = 0; param0->unk_B6C = 0; param0->unk_B6E = 0; - sub_0201C63C(param0->unk_0C, 3, 0, 24); - sub_0201C63C(param0->unk_0C, 2, 0, -24); + Bg_ScheduleScroll(param0->unk_0C, 3, 0, 24); + Bg_ScheduleScroll(param0->unk_0C, 2, 0, -24); ov10_02221188(param0, 0, 0, 0); ov10_02221188(param0, 1, 0, 0); @@ -740,8 +740,8 @@ static u8 ov10_0221FE48(UnkStruct_ov10_0221FB28 *param0) return 1; } - sub_0201C63C(param0->unk_0C, 3, 2, param0->unk_B68); - sub_0201C63C(param0->unk_0C, 2, 1, param0->unk_B68); + Bg_ScheduleScroll(param0->unk_0C, 3, 2, param0->unk_B68); + Bg_ScheduleScroll(param0->unk_0C, 2, 1, param0->unk_B68); param0->unk_B76++; @@ -775,10 +775,10 @@ static u8 ov10_02220014(UnkStruct_ov10_0221FB28 *param0) } if (param0->unk_B76 == 24) { - sub_0201C63C(param0->unk_0C, 3, 0, 24); - sub_0201C63C(param0->unk_0C, 2, 0, -24); - sub_0201C63C(param0->unk_0C, 3, 3, 0); - sub_0201C63C(param0->unk_0C, 2, 3, 0); + Bg_ScheduleScroll(param0->unk_0C, 3, 0, 24); + Bg_ScheduleScroll(param0->unk_0C, 2, 0, -24); + Bg_ScheduleScroll(param0->unk_0C, 3, 3, 0); + Bg_ScheduleScroll(param0->unk_0C, 2, 3, 0); ov10_02221188(param0, 0, 0, 0); ov10_02221188(param0, 1, 0, 0); @@ -801,10 +801,10 @@ static u8 ov10_02220014(UnkStruct_ov10_0221FB28 *param0) v1 *= -1; } - sub_0201C63C(param0->unk_0C, 3, 0, 24 + v0); - sub_0201C63C(param0->unk_0C, 2, 0, -24 + v0); - sub_0201C63C(param0->unk_0C, 3, 3, v1); - sub_0201C63C(param0->unk_0C, 2, 3, v1); + Bg_ScheduleScroll(param0->unk_0C, 3, 0, 24 + v0); + Bg_ScheduleScroll(param0->unk_0C, 2, 0, -24 + v0); + Bg_ScheduleScroll(param0->unk_0C, 3, 3, v1); + Bg_ScheduleScroll(param0->unk_0C, 2, 3, v1); ov10_02221188(param0, 0, v0, v1); ov10_02221188(param0, 1, v0, v1); @@ -840,8 +840,8 @@ static u8 ov10_02220228(UnkStruct_ov10_0221FB28 *param0) Sound_PlayEffect(1817); } - sub_0201C63C(param0->unk_0C, 3, 1, 16); - sub_0201C63C(param0->unk_0C, 2, 2, 16); + Bg_ScheduleScroll(param0->unk_0C, 3, 1, 16); + Bg_ScheduleScroll(param0->unk_0C, 2, 2, 16); param0->unk_B76++; @@ -894,8 +894,8 @@ static u8 ov10_022203A0(UnkStruct_ov10_0221FB28 *param0) static u8 ov10_022203BC(UnkStruct_ov10_0221FB28 *param0) { - sub_0201C63C(param0->unk_0C, 2, 2, Unk_ov10_02222A7C[param0->unk_B76][0]); - sub_0201C63C(param0->unk_0C, 3, 2, Unk_ov10_02222A7C[param0->unk_B76][0]); + Bg_ScheduleScroll(param0->unk_0C, 2, 2, Unk_ov10_02222A7C[param0->unk_B76][0]); + Bg_ScheduleScroll(param0->unk_0C, 3, 2, Unk_ov10_02222A7C[param0->unk_B76][0]); ov10_02221188(param0, 0, Unk_ov10_02222A7C[param0->unk_B76][1], 0); ov10_02221188(param0, 1, Unk_ov10_02222A7C[param0->unk_B76][1], 0); ov10_02221188(param0, 2, Unk_ov10_02222A7C[param0->unk_B76][1], 0); @@ -921,8 +921,8 @@ static u8 ov10_022203BC(UnkStruct_ov10_0221FB28 *param0) static u8 ov10_022204C0(UnkStruct_ov10_0221FB28 *param0) { - sub_0201C63C(param0->unk_0C, 2, 1, Unk_ov10_02222A7C[param0->unk_B76][0]); - sub_0201C63C(param0->unk_0C, 3, 1, Unk_ov10_02222A7C[param0->unk_B76][0]); + Bg_ScheduleScroll(param0->unk_0C, 2, 1, Unk_ov10_02222A7C[param0->unk_B76][0]); + Bg_ScheduleScroll(param0->unk_0C, 3, 1, Unk_ov10_02222A7C[param0->unk_B76][0]); ov10_02221188(param0, 0, -Unk_ov10_02222A7C[param0->unk_B76][1], 0); ov10_02221188(param0, 1, -Unk_ov10_02222A7C[param0->unk_B76][1], 0); @@ -1037,7 +1037,7 @@ static u8 ov10_02220700(UnkStruct_ov10_0221FB28 *param0) } ov10_02222A48(param0); - BGL_WindowColor(¶m0->unk_B7C, 15, 0, 0, 27 * 8, 4 * 8); + Window_FillRectWithColor(¶m0->unk_B7C, 15, 0, 0, 27 * 8, 4 * 8); param0->unk_BAC = Text_AddPrinterWithParams(¶m0->unk_B7C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL); } @@ -1055,13 +1055,13 @@ static u8 ov10_02220700(UnkStruct_ov10_0221FB28 *param0) break; default: sub_0200E084(¶m0->unk_B7C, 0); - sub_0201C3C0(param0->unk_0C, 0); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 0); param0->unk_B76 = 0; param0->unk_B75 = 64 / 3; return 1; } - sub_0201C3C0(param0->unk_0C, 0); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 0); return 0; } @@ -1091,7 +1091,7 @@ static u8 ov10_022208B0(UnkStruct_ov10_0221FB28 *param0) break; } - sub_0201C3C0(param0->unk_0C, 0); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 0); return 0; } @@ -1266,7 +1266,7 @@ static void ov10_02220C64(void *param0) { UnkStruct_ov10_0221FB28 *v0 = param0; - sub_0201C2B8(v0->unk_0C); + Bg_RunScheduledUpdates(v0->unk_0C); sub_02003694(v0->unk_08); sub_0201DCAC(); sub_0200C800(); @@ -1287,7 +1287,7 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p }; v0.bg0As2DOr3D = param1; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -1307,9 +1307,9 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p 0 }; - sub_020183C4(param0->unk_0C, 3, &v1, 0); - sub_02019EBC(param0->unk_0C, 3); - sub_0201C63C(param0->unk_0C, 3, 0, 256); + Bg_InitFromTemplate(param0->unk_0C, 3, &v1, 0); + Bg_ClearTilemap(param0->unk_0C, 3); + Bg_ScheduleScroll(param0->unk_0C, 3, 0, 256); } { @@ -1329,9 +1329,9 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p 0 }; - sub_020183C4(param0->unk_0C, 2, &v2, 0); - sub_02019EBC(param0->unk_0C, 2); - sub_0201C63C(param0->unk_0C, 2, 0, -256); + Bg_InitFromTemplate(param0->unk_0C, 2, &v2, 0); + Bg_ClearTilemap(param0->unk_0C, 2); + Bg_ScheduleScroll(param0->unk_0C, 2, 0, -256); } { @@ -1351,12 +1351,12 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p 0 }; - sub_020183C4(param0->unk_0C, 1, &v3, 0); - sub_02019EBC(param0->unk_0C, 1); + Bg_InitFromTemplate(param0->unk_0C, 1, &v3, 0); + Bg_ClearTilemap(param0->unk_0C, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); if (param2 == 1) { - sub_02019184(param0->unk_0C, 1, 3, 24); + Bg_SetOffset(param0->unk_0C, 1, 3, 24); } } @@ -1377,8 +1377,8 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p 0 }; - sub_020183C4(param0->unk_0C, 0, &v4, 0); - sub_02019EBC(param0->unk_0C, 0); + Bg_InitFromTemplate(param0->unk_0C, 0, &v4, 0); + Bg_ClearTilemap(param0->unk_0C, 0); if (param0->unk_BBC == 1) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -1391,11 +1391,11 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p static void ov10_02220DCC(UnkStruct_ov10_0221FB28 *param0) { if (param0->unk_B7C.pixels != NULL) { - BGL_DeleteWindow(¶m0->unk_B7C); + Window_Remove(¶m0->unk_B7C); } if (param0->unk_B8C.pixels != NULL) { - BGL_DeleteWindow(¶m0->unk_B8C); + Window_Remove(¶m0->unk_B8C); } } @@ -1417,12 +1417,12 @@ static void ov10_02220DFC(UnkStruct_ov10_0221FB28 *param0) static void ov10_02220E30(UnkStruct_ov10_0221FB28 *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0->unk_0C, 3); - sub_02019044(param0->unk_0C, 2); - sub_02019044(param0->unk_0C, 1); + Bg_FreeTilemapBuffer(param0->unk_0C, 3); + Bg_FreeTilemapBuffer(param0->unk_0C, 2); + Bg_FreeTilemapBuffer(param0->unk_0C, 1); if (param0->unk_B9C == GX_BG0_AS_2D) { - sub_02019044(param0->unk_0C, 0); + Bg_FreeTilemapBuffer(param0->unk_0C, 0); } Heap_FreeToHeap(param0->unk_0C); @@ -1440,7 +1440,7 @@ static void ov10_02220E70(UnkStruct_ov10_0221FB28 *param0) sub_0200710C(v0, 3, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->unk_24); sub_02007130(v0, 1, 0, 0, 0, param0->unk_00->unk_24); sub_02003070(param0->unk_08, 0, 0, 0x20 * 5); - sub_0201975C(1, 0x18c6); + Bg_MaskPalette(1, 0x18c6); NARC_dtor(v0); } @@ -1457,8 +1457,8 @@ static void ov10_02220F1C(UnkStruct_ov10_0221FB28 *param0) sub_02003070(param0->unk_08, 0, 14 * 16, 0x20 * 1); Font_LoadTextPalette(0, 13 * 0x20, param0->unk_00->unk_24); sub_02003070(param0->unk_08, 0, 13 * 16, 0x20 * 1); - BGL_AddWindow(param0->unk_0C, ¶m0->unk_B7C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9)); - BGL_AddWindow(param0->unk_0C, ¶m0->unk_B8C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9)); + Window_Add(param0->unk_0C, ¶m0->unk_B7C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9)); + Window_Add(param0->unk_0C, ¶m0->unk_B8C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9)); } static void ov10_02221004(void) @@ -1572,7 +1572,7 @@ static void ov10_0222130C(UnkStruct_ov10_0221FB28 *param0, u32 param1, Strbuf *p v0 = ¶m0->unk_10[0]; - BGL_AddFramelessWindow(param0->unk_0C, v0, 8, 2, 0, 0); + Window_AddToTopLeftCorner(param0->unk_0C, v0, 8, 2, 0, 0); Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 0), NULL); v1.unk_00 = param0->unk_B38; @@ -1591,7 +1591,7 @@ static void ov10_0222130C(UnkStruct_ov10_0221FB28 *param0, u32 param1, Strbuf *p param0->unk_B3C[param1] = sub_020127E8(&v1); sub_02012A60(param0->unk_B3C[param1], 0); - BGL_DeleteWindow(v0); + Window_Remove(v0); } static void ov10_022213B8(UnkStruct_ov10_0221FB28 *param0) @@ -1842,7 +1842,7 @@ static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -1862,8 +1862,8 @@ static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0) 0 }; - sub_020183C4(param0->unk_0C, 1, &v1, 0); - sub_02019EBC(param0->unk_0C, 1); + Bg_InitFromTemplate(param0->unk_0C, 1, &v1, 0); + Bg_ClearTilemap(param0->unk_0C, 1); } { @@ -1883,8 +1883,8 @@ static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0) 0 }; - sub_020183C4(param0->unk_0C, 2, &v2, 0); - sub_02019EBC(param0->unk_0C, 2); + Bg_InitFromTemplate(param0->unk_0C, 2, &v2, 0); + Bg_ClearTilemap(param0->unk_0C, 2); } { @@ -1904,16 +1904,16 @@ static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0) 0 }; - sub_020183C4(param0->unk_0C, 3, &v3, 0); + Bg_InitFromTemplate(param0->unk_0C, 3, &v3, 0); } } static void ov10_02221A10(UnkStruct_ov10_0221FB28 *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0->unk_0C, 3); - sub_02019044(param0->unk_0C, 2); - sub_02019044(param0->unk_0C, 1); + Bg_FreeTilemapBuffer(param0->unk_0C, 3); + Bg_FreeTilemapBuffer(param0->unk_0C, 2); + Bg_FreeTilemapBuffer(param0->unk_0C, 1); Heap_FreeToHeap(param0->unk_0C); } @@ -1933,7 +1933,7 @@ static void ov10_02221A3C(UnkStruct_ov10_0221FB28 *param0) v2 = NARC_AllocAndReadWholeMember(v0, 16, param0->unk_00->unk_24); NNS_G2dGetUnpackedPaletteData(v2, &v1); - sub_0201972C(3, (void *)v1->pRawData, v1->szByte, 0); + Bg_LoadPalette(3, (void *)v1->pRawData, v1->szByte, 0); v3 = (u16 *)v1->pRawData; memcpy(param0->unk_4D8, &v3[3 * 16], 32 * 3); @@ -1958,23 +1958,23 @@ static void ov10_02221AE4(UnkStruct_ov10_0221FB28 *param0) v0 = param0->unk_358; } - sub_020198E8(param0->unk_0C, 2, Unk_ov10_02222A70[v1][0], Unk_ov10_02222A70[v1][1], 16, 6, (const void *)v0, 0, 0, 16, 6); + Bg_CopyToTilemapRect(param0->unk_0C, 2, Unk_ov10_02222A70[v1][0], Unk_ov10_02222A70[v1][1], 16, 6, (const void *)v0, 0, 0, 16, 6); if (param0->unk_214[v1].unk_04 != 0) { - sub_02019E2C( + Bg_ChangeTilemapRectPalette( param0->unk_0C, 2, Unk_ov10_02222A70[v1][0], Unk_ov10_02222A70[v1][1], 16, 6, 3 + v1); if (((v1 < 3) && (param0->unk_00->unk_29 == 1)) || ((v1 >= 3) && (param0->unk_00->unk_29 == 0))) { - sub_0201972C( + Bg_LoadPalette( 2, (void *)¶m0->unk_4D8[16 * 1], 16 * 2, (3 + v1) * 16 * 2); } else { - sub_0201972C( + Bg_LoadPalette( 2, (void *)¶m0->unk_4D8[0], 16 * 2, (3 + v1) * 16 * 2); } } } - sub_0201C3C0(param0->unk_0C, 2); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 2); } static void ov10_02221BC8(UnkStruct_ov10_0221FB28 *param0, u16 *param1, u8 param2) @@ -1982,7 +1982,7 @@ static void ov10_02221BC8(UnkStruct_ov10_0221FB28 *param0, u16 *param1, u8 param u16 *v0; u16 v1, v2; - v0 = sub_02019FE4(param0->unk_0C, param2); + v0 = Bg_GetTilemapBuffer(param0->unk_0C, param2); if (param0->unk_00->unk_29 == 0) { v1 = 16; @@ -2001,22 +2001,22 @@ static void ov10_02221C14(UnkStruct_ov10_0221FB28 *param0) ov10_02221BC8(param0, ¶m0->unk_538[0][0], 1); ov10_02221BC8(param0, ¶m0->unk_538[1][0], 2); - sub_0201C3C0(param0->unk_0C, 1); - sub_0201C3C0(param0->unk_0C, 2); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 1); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 2); } static void ov10_02221C48(UnkStruct_ov10_0221FB28 *param0, u8 param1) { if (param0->unk_00->unk_29 == 0) { - sub_020198E8(param0->unk_0C, 1, 16 + 16 - param1, 0, param1, 24, (const void *)¶m0->unk_538[0][0], 0, 0, 16, 24); - sub_020198E8(param0->unk_0C, 2, 16 + 16 - param1, 0, param1, 24, (const void *)¶m0->unk_538[1][0], 0, 0, 16, 24); + Bg_CopyToTilemapRect(param0->unk_0C, 1, 16 + 16 - param1, 0, param1, 24, (const void *)¶m0->unk_538[0][0], 0, 0, 16, 24); + Bg_CopyToTilemapRect(param0->unk_0C, 2, 16 + 16 - param1, 0, param1, 24, (const void *)¶m0->unk_538[1][0], 0, 0, 16, 24); } else { - sub_020198E8(param0->unk_0C, 1, 0, 0, param1, 24, (const void *)¶m0->unk_538[0][0], 16 - param1, 0, 16, 24); - sub_020198E8(param0->unk_0C, 2, 0, 0, param1, 24, (const void *)¶m0->unk_538[1][0], 16 - param1, 0, 16, 24); + Bg_CopyToTilemapRect(param0->unk_0C, 1, 0, 0, param1, 24, (const void *)¶m0->unk_538[0][0], 16 - param1, 0, 16, 24); + Bg_CopyToTilemapRect(param0->unk_0C, 2, 0, 0, param1, 24, (const void *)¶m0->unk_538[1][0], 16 - param1, 0, 16, 24); } - sub_0201C3C0(param0->unk_0C, 1); - sub_0201C3C0(param0->unk_0C, 2); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 1); + Bg_ScheduleTilemapTransfer(param0->unk_0C, 2); } static void ov10_02221D14(UnkStruct_ov10_0221FB28 *param0, Party *param1, u8 param2) @@ -2236,7 +2236,7 @@ static void ov10_022223C0(UnkStruct_ov10_0221FB28 *param0) u32 v0; for (v0 = 0; v0 < 24; v0++) { - sub_0201A8D4(param0->unk_0C, ¶m0->unk_10[v0], &Unk_ov10_02222CF4[v0]); + Window_AddFromTemplate(param0->unk_0C, ¶m0->unk_10[v0], &Unk_ov10_02222CF4[v0]); } } @@ -2245,7 +2245,7 @@ static void ov10_022223E8(UnkStruct_ov10_0221FB28 *param0) u32 v0; for (v0 = 0; v0 < 24; v0++) { - BGL_DeleteWindow(¶m0->unk_10[v0]); + Window_Remove(¶m0->unk_10[v0]); } } @@ -2320,24 +2320,24 @@ static void ov10_02222594(UnkStruct_ov10_0221FB28 *param0, u32 param1) break; case 4: case 3: - sub_0201972C( + Bg_LoadPalette( 1, ¶m0->unk_4D8[9], 2 * 2, (v0->palette * 16 + 9) * 2); break; case 2: - sub_0201972C( + Bg_LoadPalette( 1, ¶m0->unk_4D8[(9 + 16)], 2 * 2, (v0->palette * 16 + 9) * 2); break; case 1: - sub_0201972C( + Bg_LoadPalette( 1, ¶m0->unk_4D8[(9 + 32)], 2 * 2, (v0->palette * 16 + 9) * 2); break; } v1 = App_PixelCount(param0->unk_214[param1].unk_06, param0->unk_214[param1].unk_08, 48); - BGL_WindowColor(v0, 10, 0, 2, v1, 1); - BGL_WindowColor(v0, 9, 0, 3, v1, 2); - BGL_WindowColor(v0, 10, 0, 5, v1, 1); + Window_FillRectWithColor(v0, 10, 0, 2, v1, 1); + Window_FillRectWithColor(v0, 9, 0, 3, v1, 2); + Window_FillRectWithColor(v0, 10, 0, 5, v1, 1); } static void ov10_02222684(UnkStruct_ov10_0221FB28 *param0, MessageLoader *param1, UnkStruct_0200C440 *param2, StringTemplate *param3, Strbuf *param4, u32 param5) @@ -2349,20 +2349,20 @@ static void ov10_02222684(UnkStruct_ov10_0221FB28 *param0, MessageLoader *param1 v1 = ¶m0->unk_10[param5 * 4]; - BGL_FillWindow(&v1[0], 0); - BGL_FillWindow(&v1[1], 0); - BGL_FillWindow(&v1[2], 0); - BGL_FillWindow(&v1[3], 0); + Window_FillTilemap(&v1[0], 0); + Window_FillTilemap(&v1[1], 0); + Window_FillTilemap(&v1[2], 0); + Window_FillTilemap(&v1[3], 0); ov10_02222400(param0, param1, param2, param3, param4, param5); ov10_022224F0(param0, param1, param2, param3, param4, param5); ov10_02222528(param0, param1, param2, param3, param4, param5); ov10_02222594(param0, param5); - sub_0201A9A4(&v1[0]); - sub_0201A9A4(&v1[1]); - sub_0201A9A4(&v1[2]); - sub_0201A9A4(&v1[3]); + Window_ScheduleCopyToVRAM(&v1[0]); + Window_ScheduleCopyToVRAM(&v1[1]); + Window_ScheduleCopyToVRAM(&v1[2]); + Window_ScheduleCopyToVRAM(&v1[3]); } static void ov10_02222720(UnkStruct_ov10_0221FB28 *param0) @@ -2478,7 +2478,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) static void ov10_022229D4(UnkStruct_ov10_0221FB28 *param0) { - BGL_WindowColor(¶m0->unk_B7C, 15, 0, 0, 27 * 8, 4 * 8); + Window_FillRectWithColor(¶m0->unk_B7C, 15, 0, 0, 27 * 8, 4 * 8); sub_0200E060(¶m0->unk_B7C, 0, 1, 15); } diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index 00832d5e66..f9e7ea31ff 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -610,10 +610,10 @@ BOOL ov12_0221FE30(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov16_02265BBC *par } param0->unk_18 = (u32 *)param0->unk_14; - param0->unk_19C[0] = sub_0201A008(param0->unk_C0, 0); - param0->unk_19C[1] = sub_0201A008(param0->unk_C0, 1); - param0->unk_19C[2] = sub_0201A008(param0->unk_C0, 2); - param0->unk_19C[3] = sub_0201A008(param0->unk_C0, 3); + param0->unk_19C[0] = Bg_GetPriority(param0->unk_C0, 0); + param0->unk_19C[1] = Bg_GetPriority(param0->unk_C0, 1); + param0->unk_19C[2] = Bg_GetPriority(param0->unk_C0, 2); + param0->unk_19C[3] = Bg_GetPriority(param0->unk_C0, 3); for (v0 = 0; v0 < 10; v0++) { param0->unk_D8[v0] = NULL; @@ -1323,22 +1323,22 @@ static void ov12_02220798(UnkStruct_ov12_0221FCDC *param0) if (ov12_0221FDD4(param0) == 0) { Battle_SetDefaultBlend(); - sub_02019690(ov12_022233B0(param0, 1), 0x4000, 0, ov12_0221FDE4(param0)); - sub_02019EBC(ov12_02220278(param0), ov12_022233B0(param0, 1)); - sub_02019120(2, 1); + Bg_ClearTilesRange(ov12_022233B0(param0, 1), 0x4000, 0, ov12_0221FDE4(param0)); + Bg_ClearTilemap(ov12_02220278(param0), ov12_022233B0(param0, 1)); + Bg_ToggleLayer(2, 1); } else { ov17_022413D8(); } - BGL_SetPriority(0, param0->unk_19C[0]); - BGL_SetPriority(1, param0->unk_19C[1]); - BGL_SetPriority(2, param0->unk_19C[2]); - BGL_SetPriority(3, param0->unk_19C[3]); + Bg_SetPriority(0, param0->unk_19C[0]); + Bg_SetPriority(1, param0->unk_19C[1]); + Bg_SetPriority(2, param0->unk_19C[2]); + Bg_SetPriority(3, param0->unk_19C[3]); - sub_02019184(param0->unk_C0, 2, 0, 0); - sub_02019184(param0->unk_C0, 2, 3, 0); - sub_02019184(param0->unk_C0, 3, 0, 0); - sub_02019184(param0->unk_C0, 3, 3, 0); + Bg_SetOffset(param0->unk_C0, 2, 0, 0); + Bg_SetOffset(param0->unk_C0, 2, 3, 0); + Bg_SetOffset(param0->unk_C0, 3, 0, 0); + Bg_SetOffset(param0->unk_C0, 3, 3, 0); param0->unk_10 = 0; } @@ -1977,8 +1977,8 @@ static void ov12_022211D8(SysTask *param0, void *param1) v2 = sub_020080C0(v0->unk_04.unk_04, 1); v2 -= sub_020080C0(v0->unk_04.unk_04, 41); - sub_02019184(v0->unk_00, 2, 0, -(v1 - 40)); - sub_02019184(v0->unk_00, 2, 3, -(v2 - 40)); + Bg_SetOffset(v0->unk_00, 2, 0, -(v1 - 40)); + Bg_SetOffset(v0->unk_00, 2, 3, -(v2 - 40)); } void ov12_02221238(UnkStruct_ov12_0221FCDC *param0, int param1) @@ -2040,12 +2040,12 @@ static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0) } { - u8 *v8 = sub_02019F28(2); + u8 *v8 = Bg_GetCharPtr(2); MI_CpuFill8(v8, 0, 10 * 10 * 2 * 0x20); } - sub_02019120(2, 0); - sub_0201958C(param0->unk_C0, 2, v0, (10 * 10 * ((8 / 2) * 8)), 0); + Bg_ToggleLayer(2, 0); + Bg_LoadTiles(param0->unk_C0, 2, v0, (10 * 10 * ((8 / 2) * 8)), 0); PaletteSys_LoadPalette(param0->unk_C4, v4, v5, param0->unk_00, 0, 0, (8 * 16)); sub_0200710C(param0->unk_1A0[0], v6, param0->unk_C0, 2, 0, 0, 0, param0->unk_00); @@ -2071,12 +2071,12 @@ static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0) v11 = sub_020080C0(ov12_022232FC(param0, v3), 1); v11 -= sub_020080C0(ov12_022232FC(param0, v3), 41); - sub_02019184(param0->unk_C0, 2, 0, -(v10 - 40)); - sub_02019184(param0->unk_C0, 2, 3, -(v11 - 40)); + Bg_SetOffset(param0->unk_C0, 2, 0, -(v10 - 40)); + Bg_SetOffset(param0->unk_C0, 2, 3, -(v11 - 40)); } - sub_02019120(2, 1); - BGL_SetPriority(2, ov12_0222339C(param0)); + Bg_ToggleLayer(2, 1); + Bg_SetPriority(2, ov12_0222339C(param0)); } static void ov12_02221424(UnkStruct_ov12_0221FCDC *param0) @@ -2085,7 +2085,7 @@ static void ov12_02221424(UnkStruct_ov12_0221FCDC *param0) param0->unk_18 += 1; { - u8 *v0 = sub_02019F28(2); + u8 *v0 = Bg_GetCharPtr(2); MI_CpuFill8(v0, 0, 10 * 10 * 2 * 0x20); } @@ -2520,7 +2520,7 @@ static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FC { sub_02006E3C(7, ov12_022234E4(param3, 0), param1->unk_C0, param2, 0, 0, 1, param1->unk_00); PaletteSys_LoadPalette(param1->unk_C4, 7, ov12_022234E4(param3, 1), param1->unk_00, 0, 0x20, (9 * 16)); - sub_02019EBC(param1->unk_C0, param2); + Bg_ClearTilemap(param1->unk_C0, param2); { int v0 = 2; @@ -2637,19 +2637,19 @@ static BOOL ov12_02221C50(SysTask *param0, UnkStruct_ov12_02221BBC *param1) int v0 = ov12_02223428(param1->unk_48, 2); int v1 = ov12_02223428(param1->unk_48, 1); - BGL_SetPriority(3, v0); - BGL_SetPriority(2, v0); + Bg_SetPriority(3, v0); + Bg_SetPriority(2, v0); } - sub_02019120(2, 1); + Bg_ToggleLayer(2, 1); param1->unk_05++; break; case 1: { - sub_02018898(param1->unk_48->unk_C0, 3, 2, GX_BG_CHARBASE_0x0c000); + Bg_SetControlParam(param1->unk_48->unk_C0, 3, 2, GX_BG_CHARBASE_0x0c000); if (ov12_0221FDD4(param1->unk_48) != 1) { - sub_02018898(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_16); + Bg_SetControlParam(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_16); } ov12_02221AA8(param1, param1->unk_48, 3, param1->unk_10); @@ -2696,14 +2696,14 @@ static BOOL ov12_02221D50(SysTask *param0, UnkStruct_ov12_02221BBC *param1) { switch (param1->unk_05) { case 0: - sub_02019120(2, 1); + Bg_ToggleLayer(2, 1); param1->unk_05++; case 1: { int v0 = ov12_02223428(param1->unk_48, 2); int v1 = ov12_02223428(param1->unk_48, 1); - BGL_SetPriority(3, v0); - BGL_SetPriority(2, v0); + Bg_SetPriority(3, v0); + Bg_SetPriority(2, v0); G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG3, param1->unk_09, param1->unk_0A); ov12_02221B64(param1); @@ -2742,12 +2742,12 @@ static BOOL ov12_02221D50(SysTask *param0, UnkStruct_ov12_02221BBC *param1) ov12_02222338(param1->unk_48); } - sub_02019184(param1->unk_48->unk_C0, 3, 0, 0); - sub_02019184(param1->unk_48->unk_C0, 3, 3, 0); - sub_02018898(param1->unk_48->unk_C0, 3, 2, GX_BG_CHARBASE_0x10000); + Bg_SetOffset(param1->unk_48->unk_C0, 3, 0, 0); + Bg_SetOffset(param1->unk_48->unk_C0, 3, 3, 0); + Bg_SetControlParam(param1->unk_48->unk_C0, 3, 2, GX_BG_CHARBASE_0x10000); if (ov12_0221FDD4(param1->unk_48) == 0) { - sub_02018898(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_256); + Bg_SetControlParam(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_256); ov12_02223460(param1->unk_48, 3); ov12_02223488(param1->unk_48); } else { @@ -2793,7 +2793,7 @@ static BOOL ov12_02221F44(SysTask *param0, UnkStruct_ov12_02221BBC *param1) break; } - sub_02018898(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_16); + Bg_SetControlParam(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_16); ov12_02221AA8(param1, param1->unk_48, 3, param1->unk_10); if (param1->unk_0D == 0) { @@ -2847,10 +2847,10 @@ static BOOL ov12_0222206C(SysTask *param0, UnkStruct_ov12_02221BBC *param1) ov12_02222338(param1->unk_48); } - sub_02019120(3, 0); + Bg_ToggleLayer(3, 0); if (ov12_0221FDD4(param1->unk_48) == 0) { - sub_02018898(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_256); + Bg_SetControlParam(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_256); ov12_02223460(param1->unk_48, 3); ov12_02223488(param1->unk_48); @@ -2860,12 +2860,12 @@ static BOOL ov12_0222206C(SysTask *param0, UnkStruct_ov12_02221BBC *param1) } sub_02006E60(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_0C, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->unk_00); - sub_02019120(3, 1); + Bg_ToggleLayer(3, 1); param1->unk_05++; case 3: - sub_02019184(param1->unk_48->unk_C0, 3, 0, 0); - sub_02019184(param1->unk_48->unk_C0, 3, 3, 0); + Bg_SetOffset(param1->unk_48->unk_C0, 3, 0, 0); + Bg_SetOffset(param1->unk_48->unk_C0, 3, 3, 0); if (param1->unk_0D == 0) { sub_02003178(param1->unk_48->unk_C4, 0x1, param1->unk_48->unk_198, 0, 16, 0, 0); @@ -2920,11 +2920,11 @@ static void ov12_022222D4(SysTask *param0, void *param1) v0->unk_06 += v0->unk_0A; if (v0->unk_08 != 0) { - sub_02019184(v0->unk_00, v0->unk_0C, 0, v0->unk_04); + Bg_SetOffset(v0->unk_00, v0->unk_0C, 0, v0->unk_04); } if (v0->unk_0A != 0) { - sub_02019184(v0->unk_00, v0->unk_0C, 3, v0->unk_06); + Bg_SetOffset(v0->unk_00, v0->unk_0C, 3, v0->unk_06); } } @@ -3062,17 +3062,17 @@ void ov12_02222590(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0 = ov12_02223428(param0, 2); - BGL_SetPriority(param1, v0); - sub_02019120(param1, 0); + Bg_SetPriority(param1, v0); + Bg_ToggleLayer(param1, 0); if (ov12_0221FDD4(param0) == 1) { - sub_02018898(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x10000); + Bg_SetControlParam(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x10000); } else { - sub_02018898(param0->unk_C0, param1, 0, GX_BG_COLORMODE_256); - sub_02018898(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x10000); + Bg_SetControlParam(param0->unk_C0, param1, 0, GX_BG_COLORMODE_256); + Bg_SetControlParam(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x10000); } - sub_02019EBC(param0->unk_C0, param1); + Bg_ClearTilemap(param0->unk_C0, param1); if (ov12_0221FDD4(param0) == 1) { sub_02006E3C(param0->unk_180.unk_00, param0->unk_180.unk_04, param0->unk_C0, param1, 0, 0, 1, param0->unk_00); @@ -3087,16 +3087,16 @@ void ov12_02222664(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0 = ov12_02223428(param0, 1); - BGL_SetPriority(param1, v0); + Bg_SetPriority(param1, v0); if (ov12_0221FDD4(param0) == 1) { - sub_02018898(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x0c000); + Bg_SetControlParam(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x0c000); } else { - sub_02018898(param0->unk_C0, param1, 0, GX_BG_COLORMODE_16); - sub_02018898(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x0c000); + Bg_SetControlParam(param0->unk_C0, param1, 0, GX_BG_COLORMODE_16); + Bg_SetControlParam(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x0c000); } - sub_02019EBC(param0->unk_C0, param1); + Bg_ClearTilemap(param0->unk_C0, param1); } static BOOL ov12_022226D0(UnkStruct_ov12_02221BBC *param0) @@ -4089,7 +4089,7 @@ int ov12_02223428(UnkStruct_ov12_0221FCDC *param0, int param1) void ov12_02223460(UnkStruct_ov12_0221FCDC *param0, int param1) { - sub_0201958C(param0->unk_C0, param1, param0->unk_BC->unk_110, 0x10000, 0); + Bg_LoadTiles(param0->unk_C0, param1, param0->unk_BC->unk_110, 0x10000, 0); } void ov12_02223488(UnkStruct_ov12_0221FCDC *param0) diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c index 39930dcc7f..bddfcf0148 100644 --- a/src/overlay012/ov12_02226B84.c +++ b/src/overlay012/ov12_02226B84.c @@ -477,7 +477,7 @@ static void ov12_02226BA0(SysTask *param0, void *param1) } if (inline_ov12_02235998(v1->unk_20.unk_08, 0x400) == 1) { - sub_02019184(v1->unk_04.unk_14, 3, 0, v1->unk_7C.unk_00); + Bg_SetOffset(v1->unk_04.unk_14, 3, 0, v1->unk_7C.unk_00); } } break; @@ -517,7 +517,7 @@ static void ov12_02226D38(SysTask *param0, void *param1) switch (v0->unk_1C.unk_00) { case 0: G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG3, v0->unk_16, v0->unk_18); - sub_02019120(2, 1); + Bg_ToggleLayer(2, 1); v0->unk_1C.unk_00++; case 1: { int v1 = 0; @@ -571,7 +571,7 @@ static void ov12_02226D38(SysTask *param0, void *param1) G2_ChangeBlendAlpha(v0->unk_16, v0->unk_18); } break; default: - sub_02019120(2, 0); + Bg_ToggleLayer(2, 0); ov12_02220220(v0->unk_1C.unk_04, param0); Heap_FreeToHeap(v0); return; @@ -602,8 +602,8 @@ static void ov12_02226D38(SysTask *param0, void *param1) v0->unk_14++; } - sub_02019184(v0->unk_1C.unk_14, 2, 0, v0->unk_0A); - sub_02019184(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); + Bg_SetOffset(v0->unk_1C.unk_14, 2, 0, v0->unk_0A); + Bg_SetOffset(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); } void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0) @@ -640,14 +640,14 @@ void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0) v0->unk_18 = 31; v0->unk_04 = 0; - sub_02019120(2, 0); + Bg_ToggleLayer(2, 0); { int v2 = ov12_02220280(param0, 0); sub_02006E3C(7, ov12_022234E4(v2, 0), v0->unk_1C.unk_14, 2, 0, 0, 1, ov12_0221FDE4(param0)); PaletteSys_LoadPalette(v0->unk_1C.unk_18, 7, ov12_022234E4(v2, 1), ov12_0221FDE4(param0), 0, 0x20, (9 * 16)); - sub_02019EBC(v0->unk_1C.unk_14, 2); + Bg_ClearTilemap(v0->unk_1C.unk_14, 2); { int v3 = 2; @@ -662,8 +662,8 @@ void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0) } } - sub_02019184(v0->unk_1C.unk_14, 2, 0, v0->unk_0A); - sub_02019184(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); + Bg_SetOffset(v0->unk_1C.unk_14, 2, 0, v0->unk_0A); + Bg_SetOffset(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); ov12_022201E8(v0->unk_1C.unk_04, ov12_02226D38, v0); } @@ -675,7 +675,7 @@ static void ov12_02227064(SysTask *param0, void *param1) switch (v0->unk_1C.unk_00) { case 0: G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG3, v0->unk_16, v0->unk_18); - sub_02019120(2, 1); + Bg_ToggleLayer(2, 1); v0->unk_1C.unk_00++; case 1: { int v1 = 0; @@ -729,7 +729,7 @@ static void ov12_02227064(SysTask *param0, void *param1) G2_ChangeBlendAlpha(v0->unk_16, v0->unk_18); } break; default: - sub_02019120(2, 0); + Bg_ToggleLayer(2, 0); ov12_02220220(v0->unk_1C.unk_04, param0); Heap_FreeToHeap(v0); return; @@ -760,8 +760,8 @@ static void ov12_02227064(SysTask *param0, void *param1) v0->unk_14++; } - sub_02019184(v0->unk_1C.unk_14, 2, 0, v0->unk_0A); - sub_02019184(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); + Bg_SetOffset(v0->unk_1C.unk_14, 2, 0, v0->unk_0A); + Bg_SetOffset(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); } void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0) @@ -800,14 +800,14 @@ void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0) v0->unk_18 = 16; v0->unk_04 = 0; - sub_02019120(2, 0); + Bg_ToggleLayer(2, 0); { int v2 = ov12_02220280(param0, 0); sub_02006E3C(7, ov12_022234E4(v2, 0), v0->unk_1C.unk_14, 2, 0, 0, 1, ov12_0221FDE4(param0)); PaletteSys_LoadPalette(v0->unk_1C.unk_18, 7, ov12_022234E4(v2, 1), ov12_0221FDE4(param0), 0, 0x20, (9 * 16)); - sub_02019EBC(v0->unk_1C.unk_14, 2); + Bg_ClearTilemap(v0->unk_1C.unk_14, 2); { int v3 = 2; @@ -822,8 +822,8 @@ void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0) } } - sub_02019184(v0->unk_1C.unk_14, 2, 0, v0->unk_0A); - sub_02019184(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); + Bg_SetOffset(v0->unk_1C.unk_14, 2, 0, v0->unk_0A); + Bg_SetOffset(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); ov12_022201E8(v0->unk_1C.unk_04, ov12_02227064, v0); } @@ -2694,23 +2694,23 @@ static void ov12_02229738(SysTask *param0, void *param1) } if (v1->unk_20 != 0) { - sub_02019184(v1->unk_28, v1->unk_1C, 0, 0); + Bg_SetOffset(v1->unk_28, v1->unk_1C, 0, 0); } if (v1->unk_24 != 0) { - sub_02019184(v1->unk_28, v1->unk_1C, 3, 0); + Bg_SetOffset(v1->unk_28, v1->unk_1C, 3, 0); } v1->unk_01++; } else { if (v1->unk_D4.unk_00 != 0) { v1->unk_20 = 1; - sub_02019184(v1->unk_28, v1->unk_1C, 0, v1->unk_D4.unk_00); + Bg_SetOffset(v1->unk_28, v1->unk_1C, 0, v1->unk_D4.unk_00); } if (v1->unk_D4.unk_02 != 0) { v1->unk_24 = 1; - sub_02019184(v1->unk_28, v1->unk_1C, 3, v1->unk_D4.unk_02); + Bg_SetOffset(v1->unk_28, v1->unk_1C, 3, v1->unk_D4.unk_02); } } } break; diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c index b451a62f33..80fd02856e 100644 --- a/src/overlay012/ov12_0222AC70.c +++ b/src/overlay012/ov12_0222AC70.c @@ -1370,7 +1370,7 @@ static void ov12_0222C4A8(SysTask *param0, void *param1) sub_02007DEC(v1->unk_14[v0].unk_08, 0, v1->unk_14[v0].unk_00.unk_00 + v1->unk_B4.unk_00); } - sub_02019184(v1->unk_08, 3, 0, v1->unk_B4.unk_00); + Bg_SetOffset(v1->unk_08, 3, 0, v1->unk_B4.unk_00); break; default: ov12_02220220(v1->unk_0C, param0); @@ -1605,8 +1605,8 @@ static void ov12_0222C994(SysTask *param0, void *param1) sub_02007DEC(v1->unk_38[v0], 0, v1->unk_28[v0].unk_00 + v1->unk_4C.unk_00); } - sub_02019184(v1->unk_00.unk_14, 3, 0, v1->unk_4C.unk_00); - sub_02019184(v1->unk_00.unk_14, 3, 3, v1->unk_4C.unk_02); + Bg_SetOffset(v1->unk_00.unk_14, 3, 0, v1->unk_4C.unk_00); + Bg_SetOffset(v1->unk_00.unk_14, 3, 3, v1->unk_4C.unk_02); } break; default: diff --git a/src/overlay012/ov12_0222D6B0.c b/src/overlay012/ov12_0222D6B0.c index 0dc5ac9467..5fd2c489a8 100644 --- a/src/overlay012/ov12_0222D6B0.c +++ b/src/overlay012/ov12_0222D6B0.c @@ -767,7 +767,7 @@ void ov12_0222E1A8(UnkStruct_ov12_0221FCDC *param0) ov12_02226424(&v0->unk_2C, 16, 2, 2, 16, 16); ov12_02222590(v0->unk_04.unk_04, 2); - sub_02019120(2, 1); + Bg_ToggleLayer(2, 1); ov12_022201E8(v0->unk_04.unk_04, ov12_0222E080, v0); } diff --git a/src/overlay012/ov12_0222E91C.c b/src/overlay012/ov12_0222E91C.c index daf6087585..9382593be2 100644 --- a/src/overlay012/ov12_0222E91C.c +++ b/src/overlay012/ov12_0222E91C.c @@ -672,7 +672,7 @@ void ov12_0222F5EC(UnkStruct_ov12_0221FCDC *param0) switch (v1) { case 3: case 4: - BGL_SetPriority(2, (ov12_0222339C(param0) - 1)); + Bg_SetPriority(2, (ov12_0222339C(param0) - 1)); break; } } diff --git a/src/overlay012/ov12_0222F700.c b/src/overlay012/ov12_0222F700.c index d673d8e357..90df1f3fb7 100644 --- a/src/overlay012/ov12_0222F700.c +++ b/src/overlay012/ov12_0222F700.c @@ -1013,8 +1013,8 @@ static void ov12_0223025C(SysTask *param0, void *param1) } break; case 2: - sub_02019184(ov12_02220278(v0->unk_00), 2, 0, -v0->unk_10); - sub_02019184(ov12_02220278(v0->unk_00), 2, 3, -v0->unk_12); + Bg_SetOffset(ov12_02220278(v0->unk_00), 2, 0, -v0->unk_10); + Bg_SetOffset(ov12_02220278(v0->unk_00), 2, 3, -v0->unk_12); v0->unk_08++; @@ -1032,11 +1032,11 @@ static void ov12_0223025C(SysTask *param0, void *param1) case 4: ov12_0222669C(v0->unk_18); - BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1)); - BGL_SetPriority(0, ov12_0222339C(v0->unk_00)); + Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1)); + Bg_SetPriority(0, ov12_0222339C(v0->unk_00)); - sub_02019690(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00)); - sub_02019EBC(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1)); + Bg_ClearTilesRange(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00)); + Bg_ClearTilemap(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1)); ov12_02220220(v0->unk_00, param0); Heap_FreeToHeap(v0); @@ -1089,8 +1089,8 @@ void ov12_022303D0(UnkStruct_ov12_0221FCDC *param0) v3 = ov12_02235254(v0->unk_00, ov12_02220240(param0)); if ((v3 == 3) || (v3 == 4)) { - BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00)); - BGL_SetPriority(0, ov12_0222339C(v0->unk_00) + 1); + Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00)); + Bg_SetPriority(0, ov12_0222339C(v0->unk_00) + 1); } ov12_0223025C(v2, v0); @@ -1333,15 +1333,15 @@ static void ov12_02230994(SysTask *param0, void *param1) } break; case 2: - BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1)); - BGL_SetPriority(0, ov12_0222339C(v0->unk_00)); + Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1)); + Bg_SetPriority(0, ov12_0222339C(v0->unk_00)); if (ov12_0222337C(v0->unk_00, ov12_02220248(v0->unk_00)) == 0) { sub_02007DEC(v0->unk_10, 6, 0); } - sub_02019690(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00)); - sub_02019EBC(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1)); + Bg_ClearTilesRange(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00)); + Bg_ClearTilemap(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1)); ov12_02220220(v0->unk_00, param0); Heap_FreeToHeap(v0); @@ -1380,8 +1380,8 @@ void ov12_02230A8C(UnkStruct_ov12_0221FCDC *param0) SpriteActor_EnableObject(v0->unk_48, 1); sub_0200D460(v0->unk_48, 2); } else { - BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00)); - BGL_SetPriority(0, ov12_0222339C(v0->unk_00) + 1); + Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00)); + Bg_SetPriority(0, ov12_0222339C(v0->unk_00) + 1); SpriteActor_EnableObject(v0->unk_48, 0); } @@ -3714,11 +3714,11 @@ static void ov12_02233BD8(SysTask *param0, void *param1) ov12_022265F8(v0->unk_04); ov12_022265C0(v0->unk_04); - BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1)); - BGL_SetPriority(0, ov12_0222339C(v0->unk_00)); + Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1)); + Bg_SetPriority(0, ov12_0222339C(v0->unk_00)); - sub_02019690(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00)); - sub_02019EBC(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1)); + Bg_ClearTilesRange(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00)); + Bg_ClearTilemap(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1)); Heap_FreeToHeap(v0); ov12_02220220(v0->unk_00, param0); @@ -3757,8 +3757,8 @@ void ov12_02233CD4(UnkStruct_ov12_0221FCDC *param0) v4 = ov12_02235254(v0->unk_00, ov12_02220248(param0)); if ((v4 == 3) || (v4 == 4)) { - BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00)); - BGL_SetPriority(0, ov12_0222339C(v0->unk_00) + 1); + Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00)); + Bg_SetPriority(0, ov12_0222339C(v0->unk_00) + 1); } ov12_022201E8(v0->unk_00, ov12_02233BD8, v0); diff --git a/src/overlay012/ov12_02234E44.c b/src/overlay012/ov12_02234E44.c index a329166217..4b3a3c49f1 100644 --- a/src/overlay012/ov12_02234E44.c +++ b/src/overlay012/ov12_02234E44.c @@ -64,10 +64,10 @@ static void ov12_02234E54(UnkStruct_ov12_02234E54 *param0, int param1) v0 = ov12_0221FDE4(param0->unk_18.unk_04); v1 = ov12_02223428(param0->unk_18.unk_04, 3); - BGL_SetPriority(param1, v1); + Bg_SetPriority(param1, v1); sub_02006E3C(param0->unk_00.unk_00, Unk_ov12_0223A1D8[param0->unk_00.unk_04][0], param0->unk_18.unk_14, param1, 0, 0, 1, v0); PaletteSys_LoadPalette(param0->unk_18.unk_18, param0->unk_00.unk_00, Unk_ov12_0223A1D8[param0->unk_00.unk_04][1], v0, 0, 0x20, (8 * 16)); - sub_02019EBC(param0->unk_18.unk_14, param1); + Bg_ClearTilemap(param0->unk_18.unk_14, param1); sub_02006E60(param0->unk_00.unk_00, Unk_ov12_0223A1D8[param0->unk_00.unk_04][2], param0->unk_18.unk_14, param1, 0, 0, 1, v0); } @@ -101,7 +101,7 @@ static void ov12_02234EF0(SysTask *param0, void *param1) } if ((v0->unk_00.unk_14 == 0) && (v0->unk_00.unk_16 == 16)) { - sub_02019EBC(v0->unk_18.unk_14, 2); + Bg_ClearTilemap(v0->unk_18.unk_14, 2); SpriteActor_EnableObject(v0->unk_34, 0); SpriteActor_EnableObject(v0->unk_38, 0); SpriteActor_EnableObject(v0->unk_3C, 0); @@ -113,8 +113,8 @@ static void ov12_02234EF0(SysTask *param0, void *param1) default: G2_SetWndOutsidePlane((GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ), 0); G2_SetWndOBJInsidePlane((GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ), 0); - sub_02019184(v0->unk_18.unk_14, 2, 0, 0); - sub_02019184(v0->unk_18.unk_14, 2, 3, 0); + Bg_SetOffset(v0->unk_18.unk_14, 2, 0, 0); + Bg_SetOffset(v0->unk_18.unk_14, 2, 3, 0); GX_SetVisibleWnd(GX_WNDMASK_NONE); ov12_02220220(v0->unk_18.unk_04, param0); ov12_02235E80(v0); @@ -125,8 +125,8 @@ static void ov12_02234EF0(SysTask *param0, void *param1) v0->unk_00.unk_10 += v0->unk_00.unk_0C; v0->unk_00.unk_12 += v0->unk_00.unk_0E; - sub_02019184(v0->unk_18.unk_14, 2, 0, v0->unk_00.unk_10); - sub_02019184(v0->unk_18.unk_14, 2, 3, v0->unk_00.unk_12); + Bg_SetOffset(v0->unk_18.unk_14, 2, 0, v0->unk_00.unk_10); + Bg_SetOffset(v0->unk_18.unk_14, 2, 3, v0->unk_00.unk_12); sub_0200D330(v0->unk_34); sub_0200D330(v0->unk_38); diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index aa8d6f16e6..6e47ee9be4 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -1021,7 +1021,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) GX_BG0_AS_3D, }; - sub_020183A0(&v0, 1); + SetScreenGraphicsModes(&v0, 1); } { @@ -1041,7 +1041,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) 0 }; - sub_020183C4(param0->unk_1E0, 7, &v1, 0); + Bg_InitFromTemplate(param0->unk_1E0, 7, &v1, 0); } { @@ -1061,7 +1061,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) 0 }; - sub_020183C4(param0->unk_1E0, 6, &v2, 0); + Bg_InitFromTemplate(param0->unk_1E0, 6, &v2, 0); } { @@ -1081,8 +1081,8 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) 0 }; - sub_020183C4(param0->unk_1E0, 5, &v3, 0); - sub_02019EBC(param0->unk_1E0, 5); + Bg_InitFromTemplate(param0->unk_1E0, 5, &v3, 0); + Bg_ClearTilemap(param0->unk_1E0, 5); } { @@ -1102,23 +1102,23 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) 0 }; - sub_020183C4(param0->unk_1E0, 4, &v4, 0); - sub_02019EBC(param0->unk_1E0, 4); + Bg_InitFromTemplate(param0->unk_1E0, 4, &v4, 0); + Bg_ClearTilemap(param0->unk_1E0, 4); } - sub_02019690(5, 32, 0, param0->unk_00->unk_0C); - sub_02019690(4, 32, 0, param0->unk_00->unk_0C); - sub_0201C3C0(param0->unk_1E0, 5); - sub_0201C3C0(param0->unk_1E0, 4); + Bg_ClearTilesRange(5, 32, 0, param0->unk_00->unk_0C); + Bg_ClearTilesRange(4, 32, 0, param0->unk_00->unk_0C); + Bg_ScheduleTilemapTransfer(param0->unk_1E0, 5); + Bg_ScheduleTilemapTransfer(param0->unk_1E0, 4); } static void ov13_02220D1C(BgConfig *param0) { GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 4); - sub_02019044(param0, 5); - sub_02019044(param0, 6); - sub_02019044(param0, 7); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 6); + Bg_FreeTilemapBuffer(param0, 7); } static void ov13_02220D4C(UnkStruct_ov13_022213F0 *param0) @@ -1485,20 +1485,20 @@ static void ov13_022214E0(UnkStruct_ov13_022213F0 *param0, u8 param1) } } - sub_0201C3C0(param0->unk_1E0, 7); + Bg_ScheduleTilemapTransfer(param0->unk_1E0, 7); } static void ov13_02221560(UnkStruct_ov13_022213F0 *param0, u16 param1, u16 param2, u16 param3) { - sub_02019CB8(param0->unk_1E0, 7, param1, param2, param3, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_1E0, 7, param1, param2, param3, 1, 1, 16); } static void ov13_02221590(UnkStruct_ov13_022213F0 *param0, u16 param1, u8 param2) { - sub_02019CB8(param0->unk_1E0, 7, param1, 2 + param2 * 2, 14, 1, 1, 16); - sub_02019CB8(param0->unk_1E0, 7, param1 + 1, 2 + param2 * 2 + 1, 14, 1, 1, 16); - sub_02019CB8(param0->unk_1E0, 7, param1 + 32, 2 + param2 * 2, 14 + 1, 1, 1, 16); - sub_02019CB8(param0->unk_1E0, 7, param1 + 33, 2 + param2 * 2 + 1, 14 + 1, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_1E0, 7, param1, 2 + param2 * 2, 14, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_1E0, 7, param1 + 1, 2 + param2 * 2 + 1, 14, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_1E0, 7, param1 + 32, 2 + param2 * 2, 14 + 1, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_1E0, 7, param1 + 33, 2 + param2 * 2 + 1, 14 + 1, 1, 1, 16); } static void ov13_02221630(UnkStruct_ov13_022213F0 *param0) @@ -1538,15 +1538,15 @@ static void ov13_02221654(UnkStruct_ov13_022213F0 *param0, u8 param1) ov13_02221590(param0, 0x140, v1); } - sub_0201C3C0(param0->unk_1E0, 7); + Bg_ScheduleTilemapTransfer(param0->unk_1E0, 7); } static void ov13_022216C0(UnkStruct_ov13_022213F0 *param0, u8 param1) { ov13_02221738(param0, param1); - sub_02019F04(param0->unk_1E0, 4, 0); - sub_02019F04(param0->unk_1E0, 5, 0); + Bg_ScheduleFillTilemap(param0->unk_1E0, 4, 0); + Bg_ScheduleFillTilemap(param0->unk_1E0, 5, 0); ov13_02224B7C(param0, param1); ov13_02221BB0(param0); @@ -1583,8 +1583,8 @@ static void ov13_02221738(UnkStruct_ov13_022213F0 *param0, u8 param1) for (v2 = 0; v2 < 2; v2++) { v1 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_BATTLE__GRAPHIC__PL_B_PLIST_GRA, Unk_ov13_02228E50[param1][v2], param0->unk_00->unk_0C); NNS_G2dGetUnpackedScreenData(v1, &v0); - sub_020198C0(param0->unk_1E0, 6 + v2, (u16 *)v0->rawData, 0, 0, 32, 24); - sub_0201C3C0(param0->unk_1E0, 6 + v2); + Bg_LoadToTilemapRect(param0->unk_1E0, 6 + v2, (u16 *)v0->rawData, 0, 0, 32, 24); + Bg_ScheduleTilemapTransfer(param0->unk_1E0, 6 + v2); Heap_FreeToHeap(v1); } } @@ -1717,15 +1717,15 @@ static u8 ov13_022219DC(UnkStruct_ov13_022213F0 *param0) static void ov13_02221A04(UnkStruct_ov13_022213F0 *param0) { SpriteActor_EnableObject(param0->unk_1FB4[26], 0); - sub_0201AD10(¶m0->unk_206C[10]); - sub_0201AD10(¶m0->unk_206C[6]); - sub_0201AD10(¶m0->unk_206C[7]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_206C[10]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_206C[6]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_206C[7]); } static void ov13_02221A3C(UnkStruct_ov13_022213F0 *param0) { ov13_02221630(param0); - sub_0201C3C0(param0->unk_1E0, 7); + Bg_ScheduleTilemapTransfer(param0->unk_1E0, 7); } static void ov13_02221A54(BattleSystem *param0, u16 param1, u16 param2, u32 param3) diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c index fa2dfb6f58..33061d95bf 100644 --- a/src/overlay013/ov13_02221A88.c +++ b/src/overlay013/ov13_02221A88.c @@ -195,7 +195,7 @@ void ov13_02221A88(UnkStruct_ov13_022213F0 *param0) u32 v0; for (v0 = 0; v0 < 2; v0++) { - sub_0201A8D4(param0->unk_1E0, ¶m0->unk_204C[v0], &Unk_ov13_02228EA0[v0]); + Window_AddFromTemplate(param0->unk_1E0, ¶m0->unk_204C[v0], &Unk_ov13_02228EA0[v0]); } ov13_02221AC4(param0, param0->unk_2076); @@ -246,26 +246,26 @@ void ov13_02221AC4(UnkStruct_ov13_022213F0 *param0, u32 param1) break; } - param0->unk_206C = sub_0201A778(param0->unk_00->unk_0C, param0->unk_2070); + param0->unk_206C = Window_New(param0->unk_00->unk_0C, param0->unk_2070); for (v1 = 0; v1 < param0->unk_2070; v1++) { - sub_0201A8D4(param0->unk_1E0, ¶m0->unk_206C[v1], &v0[v1]); + Window_AddFromTemplate(param0->unk_1E0, ¶m0->unk_206C[v1], &v0[v1]); } } void ov13_02221BB0(UnkStruct_ov13_022213F0 *param0) { - sub_0201A928(param0->unk_206C, param0->unk_2070); + Windows_Delete(param0->unk_206C, param0->unk_2070); } void ov13_02221BC8(UnkStruct_ov13_022213F0 *param0) { u32 v0; - sub_0201A928(param0->unk_206C, param0->unk_2070); + Windows_Delete(param0->unk_206C, param0->unk_2070); for (v0 = 0; v0 < 2; v0++) { - BGL_DeleteWindow(¶m0->unk_204C[v0]); + Window_Remove(¶m0->unk_204C[v0]); } } @@ -331,7 +331,7 @@ static void ov13_02221C54(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param if ((v1->unk_16_7 == 0) && (v1->unk_17_7 == 0)) { if (v1->unk_17_0 == 0) { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 16); - v4 = sub_0201C294(v0) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0); + v4 = Window_GetWidth(v0) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0); if (param2 == 0) { Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v3, v4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 0), NULL); @@ -342,7 +342,7 @@ static void ov13_02221C54(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param Strbuf_Free(v3); } else if (v1->unk_17_0 == 1) { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 17); - v4 = sub_0201C294(v0) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0); + v4 = Window_GetWidth(v0) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0); if (param2 == 0) { Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v3, v4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 0), NULL); @@ -354,7 +354,7 @@ static void ov13_02221C54(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param } } - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_02221E08(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param2, u8 param3, u8 param4) @@ -362,7 +362,7 @@ static void ov13_02221E08(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param UnkStruct_ov13_02221ED0 *v0 = ¶m0->unk_04[param2]; sub_0200C648(param0->unk_1FA0, 1, v0->unk_16_0, 3, 0, ¶m0->unk_206C[param1], param3 + 8, param4); - sub_0201A9A4(¶m0->unk_206C[param1]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[param1]); } static void ov13_02221E50(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param2, u8 param3, u8 param4) @@ -372,7 +372,7 @@ static void ov13_02221E50(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param sub_0200C5BC(param0->unk_1FA0, v0->unk_10, 3, 1, ¶m0->unk_206C[param1], param3, param4); sub_0200C578(param0->unk_1FA0, 0, ¶m0->unk_206C[param1], param3 + 8 * 3, param4); sub_0200C5BC(param0->unk_1FA0, v0->unk_12, 3, 0, ¶m0->unk_206C[param1], param3 + 8 * 3 + 8, param4); - sub_0201A9A4(¶m0->unk_206C[param1]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[param1]); } static void ov13_02221ED0(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param2, u8 param3, u8 param4) @@ -387,7 +387,7 @@ static void ov13_02221ED0(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param switch (HealthBar_Color(v0->unk_10, v0->unk_12, 48)) { case 0: - sub_0201A9A4(¶m0->unk_206C[param1]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[param1]); return; case 4: case 3: @@ -401,10 +401,10 @@ static void ov13_02221ED0(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param break; } - BGL_WindowColor(¶m0->unk_206C[param1], v1 + 1, param3, param4 + 1, v2, 1); - BGL_WindowColor(¶m0->unk_206C[param1], v1, param3, param4 + 2, v2, 2); - BGL_WindowColor(¶m0->unk_206C[param1], v1 + 1, param3, param4 + 4, v2, 1); - sub_0201A9A4(¶m0->unk_206C[param1]); + Window_FillRectWithColor(¶m0->unk_206C[param1], v1 + 1, param3, param4 + 1, v2, 1); + Window_FillRectWithColor(¶m0->unk_206C[param1], v1, param3, param4 + 2, v2, 2); + Window_FillRectWithColor(¶m0->unk_206C[param1], v1 + 1, param3, param4 + 4, v2, 1); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[param1]); } static void ov13_02221FA8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) @@ -422,7 +422,7 @@ static void ov13_02221FA8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[param1], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v2); Strbuf_Free(v1); - sub_0201A9A4(¶m0->unk_206C[param1]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[param1]); } static void ov13_02222030(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) @@ -446,7 +446,7 @@ static void ov13_02222030(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[param1], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(¶m0->unk_206C[param1]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[param1]); } static void ov13_022220CC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2, u32 param3, u16 param4, u16 param5, TextColor param6) @@ -464,7 +464,7 @@ static void ov13_022220CC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param StringTemplate_Format(param0->unk_1FA8, v1, v2); if (param4 == 2) { - v3 = (sub_0201C294(v0) * 8 - Font_CalcStrbufWidth(param4, v1, 0)) / 2; + v3 = (Window_GetWidth(v0) * 8 - Font_CalcStrbufWidth(param4, v1, 0)) / 2; } else { v3 = 0; } @@ -472,7 +472,7 @@ static void ov13_022220CC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param Text_AddPrinterWithParamsAndColor(v0, param4, v1, v3, param5, TEXT_SPEED_NO_TRANSFER, param6, NULL); Strbuf_Free(v2); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_02222170(UnkStruct_ov13_022213F0 *param0, u16 param1, u8 param2, u8 param3) @@ -483,7 +483,7 @@ static void ov13_02222170(UnkStruct_ov13_022213F0 *param0, u16 param1, u8 param2 Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[param1], FONT_SYSTEM, v0, param2, param3, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v0); - sub_0201A9A4(¶m0->unk_206C[param1]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[param1]); } static void ov13_022221C8(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -491,13 +491,13 @@ static void ov13_022221C8(UnkStruct_ov13_022213F0 *param0, u32 param1) Strbuf *v0; sub_0200E060(¶m0->unk_204C[0], 1, 1, 14); - BGL_FillWindow(¶m0->unk_204C[0], 15); + Window_FillTilemap(¶m0->unk_204C[0], 15); v0 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, param1); Text_AddPrinterWithParamsAndColor(¶m0->unk_204C[0], FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v0); - sub_0201A9A4(¶m0->unk_204C[0]); + Window_ScheduleCopyToVRAM(¶m0->unk_204C[0]); } static void ov13_0222222C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) @@ -510,9 +510,9 @@ static void ov13_0222222C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, param2); v2 = Font_CalcStrbufWidth(FONT_SUBSCREEN, v1, 0); - Text_AddPrinterWithParamsAndColor(v0, FONT_SUBSCREEN, v1, (sub_0201C294(v0) * 8 - v2) / 2, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL); + Text_AddPrinterWithParamsAndColor(v0, FONT_SUBSCREEN, v1, (Window_GetWidth(v0) * 8 - v2) / 2, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_02222290(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -557,15 +557,15 @@ static void ov13_02222290(UnkStruct_ov13_022213F0 *param0, u32 param1) StringTemplate_Format(param0->unk_1FA8, v2, v1); - v3 = sub_0201C294(¶m0->unk_206C[12 + v4]) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0); + v3 = Window_GetWidth(¶m0->unk_206C[12 + v4]) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0); Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[12 + v4], FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0201A9A4(¶m0->unk_206C[19]); - sub_0201A9A4(¶m0->unk_206C[11 + v4]); - sub_0201A9A4(¶m0->unk_206C[20]); - sub_0201A9A4(¶m0->unk_206C[12 + v4]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[19]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[11 + v4]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[20]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[12 + v4]); } static void ov13_02222464(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -591,13 +591,13 @@ static void ov13_02222464(UnkStruct_ov13_022213F0 *param0, u32 param1) StringTemplate_Format(param0->unk_1FA8, v2, v1); v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0); - v5 = sub_0201C294(¶m0->unk_206C[5 + v3]) * 8 - v4; + v5 = Window_GetWidth(¶m0->unk_206C[5 + v3]) * 8 - v4; Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[5 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0201A9A4(¶m0->unk_206C[14]); - sub_0201A9A4(¶m0->unk_206C[5 + v3]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[14]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[5 + v3]); } static void ov13_02222560(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -623,13 +623,13 @@ static void ov13_02222560(UnkStruct_ov13_022213F0 *param0, u32 param1) StringTemplate_Format(param0->unk_1FA8, v2, v1); v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0); - v5 = sub_0201C294(¶m0->unk_206C[6 + v3]) * 8 - v4; + v5 = Window_GetWidth(¶m0->unk_206C[6 + v3]) * 8 - v4; Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[6 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0201A9A4(¶m0->unk_206C[15]); - sub_0201A9A4(¶m0->unk_206C[6 + v3]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[15]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[6 + v3]); } static void ov13_0222265C(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -655,14 +655,14 @@ static void ov13_0222265C(UnkStruct_ov13_022213F0 *param0, u32 param1) StringTemplate_Format(param0->unk_1FA8, v2, v1); v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0); - v5 = sub_0201C294(¶m0->unk_206C[7 + v3]) * 8 - v4; + v5 = Window_GetWidth(¶m0->unk_206C[7 + v3]) * 8 - v4; Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[7 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0201A9A4(¶m0->unk_206C[16]); - sub_0201A9A4(¶m0->unk_206C[7 + v3]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[16]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[7 + v3]); } static void ov13_0222275C(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -688,13 +688,13 @@ static void ov13_0222275C(UnkStruct_ov13_022213F0 *param0, u32 param1) StringTemplate_Format(param0->unk_1FA8, v2, v1); v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0); - v5 = sub_0201C294(¶m0->unk_206C[8 + v3]) * 8 - v4; + v5 = Window_GetWidth(¶m0->unk_206C[8 + v3]) * 8 - v4; Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[8 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0201A9A4(¶m0->unk_206C[17]); - sub_0201A9A4(¶m0->unk_206C[8 + v3]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[17]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[8 + v3]); } static void ov13_0222285C(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -720,13 +720,13 @@ static void ov13_0222285C(UnkStruct_ov13_022213F0 *param0, u32 param1) StringTemplate_Format(param0->unk_1FA8, v2, v1); v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0); - v5 = sub_0201C294(¶m0->unk_206C[9 + v3]) * 8 - v4; + v5 = Window_GetWidth(¶m0->unk_206C[9 + v3]) * 8 - v4; Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[9 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0201A9A4(¶m0->unk_206C[18]); - sub_0201A9A4(¶m0->unk_206C[9 + v3]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[18]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[9 + v3]); } static void ov13_0222295C(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -747,7 +747,7 @@ static void ov13_0222295C(UnkStruct_ov13_022213F0 *param0, u32 param1) v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 31); v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0); - v5 = (sub_0201C294(¶m0->unk_206C[4]) * 8 - v3) / 2; + v5 = (Window_GetWidth(¶m0->unk_206C[4]) * 8 - v3) / 2; Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[4 + v6], FONT_SYSTEM, v1, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); @@ -772,8 +772,8 @@ static void ov13_0222295C(UnkStruct_ov13_022213F0 *param0, u32 param1) Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[4 + v6], FONT_SYSTEM, v2, v5 + v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0201A9A4(¶m0->unk_206C[13]); - sub_0201A9A4(¶m0->unk_206C[4 + v6]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[13]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[4 + v6]); } static void ov13_02222AF4(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -791,7 +791,7 @@ static void ov13_02222AF4(UnkStruct_ov13_022213F0 *param0, u32 param1) Text_AddPrinterWithParamsAndColor(¶m0->unk_206C[2 + v3], FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v2); MessageLoader_Free(v1); - sub_0201A9A4(¶m0->unk_206C[2 + v3]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[2 + v3]); } static void ov13_02222B6C(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -804,7 +804,7 @@ static void ov13_02222B6C(UnkStruct_ov13_022213F0 *param0, u32 param1) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_02222BB4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) @@ -820,7 +820,7 @@ static void ov13_02222BB4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param if (param2 == 0) { v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 50); v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0); - v4 = sub_0201C294(v0) * 8 - v3; + v4 = Window_GetWidth(v0) * 8 - v3; Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); @@ -832,14 +832,14 @@ static void ov13_02222BB4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param StringTemplate_Format(param0->unk_1FA8, v2, v1); v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0); - v4 = sub_0201C294(v0) * 8 - v3; + v4 = Window_GetWidth(v0) * 8 - v3; Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); } - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_02222C9C(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -852,7 +852,7 @@ static void ov13_02222C9C(UnkStruct_ov13_022213F0 *param0, u32 param1) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_02222CE4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) @@ -868,7 +868,7 @@ static void ov13_02222CE4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param if (param2 <= 1) { v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 50); v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0); - v4 = sub_0201C294(v0) * 8 - v3; + v4 = Window_GetWidth(v0) * 8 - v3; Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); @@ -880,14 +880,14 @@ static void ov13_02222CE4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param StringTemplate_Format(param0->unk_1FA8, v2, v1); v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0); - v4 = sub_0201C294(v0) * 8 - v3; + v4 = Window_GetWidth(v0) * 8 - v3; Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); } - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_02222DCC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) @@ -903,7 +903,7 @@ static void ov13_02222DCC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v2); MessageLoader_Free(v0); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov13_02222E2C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) @@ -924,7 +924,7 @@ static void ov13_02222E2C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param Strbuf_Free(v2); MessageLoader_Free(v0); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov13_02222E94(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -937,11 +937,11 @@ static void ov13_02222E94(UnkStruct_ov13_022213F0 *param0, u32 param1) v0 = ¶m0->unk_206C[param1]; v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 53); v2 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0); - v3 = (sub_0201C294(v0) * 8 - v2) / 2; + v3 = (Window_GetWidth(v0) * 8 - v2) / 2; Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_02222EF8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) @@ -968,7 +968,7 @@ static void ov13_02222EF8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param } Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_02222F74(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2, u32 param3) @@ -982,7 +982,7 @@ static void ov13_02222F74(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param v0 = ¶m0->unk_206C[param1]; v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 46); v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0); - v5 = (sub_0201C294(v0) * 8 - v3) / 2; + v5 = (Window_GetWidth(v0) * 8 - v3) / 2; Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); @@ -1007,7 +1007,7 @@ static void ov13_02222F74(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, v5 + v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_022230A8(UnkStruct_ov13_022213F0 *param0, u32 param1) @@ -1028,7 +1028,7 @@ static void ov13_022230A8(UnkStruct_ov13_022213F0 *param0, u32 param1) Text_AddPrinterWithParamsAndColor(v0, FONT_SUBSCREEN, v1, (12 * 8 - v2) / 2, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } void ov13_02223118(UnkStruct_ov13_022213F0 *param0) @@ -1042,13 +1042,13 @@ void ov13_02223118(UnkStruct_ov13_022213F0 *param0) v0 = ¶m0->unk_206C[5]; } - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 60); Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_0222317C(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236B8 *param1, u32 param2) @@ -1088,7 +1088,7 @@ static void ov13_0222317C(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236 Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, 80 - v3, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_022232C8(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236B8 *param1, u32 param2) @@ -1104,7 +1104,7 @@ static void ov13_022232C8(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236 v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0); Strbuf_Free(v1); - BGL_WindowColor(v0, 0, 40 + v3, 24, 80 - (40 + v3), 16); + Window_FillRectWithColor(v0, 0, 40 + v3, 24, 80 - (40 + v3), 16); v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 44); @@ -1116,7 +1116,7 @@ static void ov13_022232C8(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236 Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, 80 - v3, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_0222339C(UnkStruct_ov13_022213F0 *param0) @@ -1124,7 +1124,7 @@ static void ov13_0222339C(UnkStruct_ov13_022213F0 *param0) s32 v0; for (v0 = 0; v0 < Party_GetCurrentCount(param0->unk_00->unk_00); v0++) { - BGL_FillWindow(¶m0->unk_206C[0 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[0 + v0], 0); if (param0->unk_04[v0].unk_04 == 0) { continue; @@ -1152,8 +1152,8 @@ static void ov13_0222339C(UnkStruct_ov13_022213F0 *param0) void ov13_02223448(UnkStruct_ov13_022213F0 *param0, u8 param1) { - BGL_WindowColor(¶m0->unk_206C[0 + param1], 0, 56, 32, 24, 8); - BGL_WindowColor(¶m0->unk_206C[0 + param1], 0, (48 + 16), 24, 64, 8); + Window_FillRectWithColor(¶m0->unk_206C[0 + param1], 0, 56, 32, 24, 8); + Window_FillRectWithColor(¶m0->unk_206C[0 + param1], 0, (48 + 16), 24, 64, 8); ov13_02221E50(param0, 0 + param1, param1, 56, 32); ov13_02221ED0(param0, 0 + param1, param1, (48 + 16), 24); @@ -1168,10 +1168,10 @@ void ov13_022234A8(UnkStruct_ov13_022213F0 *param0, u8 param1) static void ov13_022234C8(UnkStruct_ov13_022213F0 *param0) { - BGL_FillWindow(¶m0->unk_206C[0], 0); - BGL_FillWindow(¶m0->unk_206C[1], 0); - BGL_FillWindow(¶m0->unk_206C[2], 0); - BGL_FillWindow(¶m0->unk_206C[3], 0); + Window_FillTilemap(¶m0->unk_206C[0], 0); + Window_FillTilemap(¶m0->unk_206C[1], 0); + Window_FillTilemap(¶m0->unk_206C[2], 0); + Window_FillTilemap(¶m0->unk_206C[3], 0); ov13_02223550(param0, param0->unk_00->unk_11); @@ -1181,8 +1181,8 @@ static void ov13_022234C8(UnkStruct_ov13_022213F0 *param0) ov13_0222222C(param0, 2, 18); ov13_0222222C(param0, 3, 19); } else { - sub_0201A9A4(¶m0->unk_206C[2]); - sub_0201A9A4(¶m0->unk_206C[3]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[2]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[3]); } } @@ -1226,7 +1226,7 @@ static void ov13_02223550(UnkStruct_ov13_022213F0 *param0, u32 param1) v6 = 8; } - v7 = (sub_0201C294(v0) * 8 - v4 - v5 - v6) / 2; + v7 = (Window_GetWidth(v0) * 8 - v4 - v5 - v6) / 2; Text_AddPrinterWithParamsAndColor(v0, FONT_SUBSCREEN, v2, v7, 8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL); Strbuf_Free(v2); @@ -1243,7 +1243,7 @@ static void ov13_02223550(UnkStruct_ov13_022213F0 *param0, u32 param1) Strbuf_Free(v3); } - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_022236B8(UnkStruct_ov13_022213F0 *param0) @@ -1253,12 +1253,12 @@ static void ov13_022236B8(UnkStruct_ov13_022213F0 *param0) v2 = 6 * param0->unk_2071; - BGL_FillWindow(¶m0->unk_206C[0 + v2], 0); - BGL_FillWindow(¶m0->unk_206C[1 + v2], 0); - BGL_FillWindow(¶m0->unk_206C[2 + v2], 0); - BGL_FillWindow(¶m0->unk_206C[3 + v2], 0); - BGL_FillWindow(¶m0->unk_206C[4 + v2], 0); - BGL_FillWindow(¶m0->unk_206C[5], 0); + Window_FillTilemap(¶m0->unk_206C[0 + v2], 0); + Window_FillTilemap(¶m0->unk_206C[1 + v2], 0); + Window_FillTilemap(¶m0->unk_206C[2 + v2], 0); + Window_FillTilemap(¶m0->unk_206C[3 + v2], 0); + Window_FillTilemap(¶m0->unk_206C[4 + v2], 0); + Window_FillTilemap(¶m0->unk_206C[5], 0); ov13_02221C54(param0, 0 + v2, 0, param0->unk_00->unk_11, 0, 0); @@ -1275,10 +1275,10 @@ static void ov13_022236B8(UnkStruct_ov13_022213F0 *param0) ov13_0222222C(param0, 5, 18); - sub_0201A9A4(¶m0->unk_206C[1 + v2]); - sub_0201A9A4(¶m0->unk_206C[2 + v2]); - sub_0201A9A4(¶m0->unk_206C[3 + v2]); - sub_0201A9A4(¶m0->unk_206C[4 + v2]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[1 + v2]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[2 + v2]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[3 + v2]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[4 + v2]); param0->unk_2071 ^= 1; } @@ -1289,29 +1289,29 @@ static void ov13_022237F8(UnkStruct_ov13_022213F0 *param0) v0 = 22 * param0->unk_2071; - BGL_FillWindow(¶m0->unk_206C[19], 0); - BGL_FillWindow(¶m0->unk_206C[20], 0); - BGL_FillWindow(¶m0->unk_206C[14], 0); - BGL_FillWindow(¶m0->unk_206C[15], 0); - BGL_FillWindow(¶m0->unk_206C[16], 0); - BGL_FillWindow(¶m0->unk_206C[17], 0); - BGL_FillWindow(¶m0->unk_206C[18], 0); - BGL_FillWindow(¶m0->unk_206C[13], 0); - BGL_FillWindow(¶m0->unk_206C[21], 0); + Window_FillTilemap(¶m0->unk_206C[19], 0); + Window_FillTilemap(¶m0->unk_206C[20], 0); + Window_FillTilemap(¶m0->unk_206C[14], 0); + Window_FillTilemap(¶m0->unk_206C[15], 0); + Window_FillTilemap(¶m0->unk_206C[16], 0); + Window_FillTilemap(¶m0->unk_206C[17], 0); + Window_FillTilemap(¶m0->unk_206C[18], 0); + Window_FillTilemap(¶m0->unk_206C[13], 0); + Window_FillTilemap(¶m0->unk_206C[21], 0); - BGL_FillWindow(¶m0->unk_206C[0 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[10 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[11 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[12 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[5 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[6 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[7 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[8 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[9 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[4 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[1 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[2 + v0], 0); - BGL_FillWindow(¶m0->unk_206C[3 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[0 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[10 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[11 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[12 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[5 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[6 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[7 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[8 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[9 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[4 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[1 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[2 + v0], 0); + Window_FillTilemap(¶m0->unk_206C[3 + v0], 0); ov13_02221C54(param0, 0 + v0, 0, param0->unk_00->unk_11, 0, 0); ov13_0222295C(param0, param0->unk_00->unk_11); @@ -1337,17 +1337,17 @@ static void ov13_02223A10(UnkStruct_ov13_022213F0 *param0) v1 = 11 * param0->unk_2071; - BGL_FillWindow(¶m0->unk_206C[6], 0); - BGL_FillWindow(¶m0->unk_206C[7], 0); - BGL_FillWindow(¶m0->unk_206C[8], 0); - BGL_FillWindow(¶m0->unk_206C[9], 0); - BGL_FillWindow(¶m0->unk_206C[10], 0); - BGL_FillWindow(¶m0->unk_206C[1 + v1], 0); - BGL_FillWindow(¶m0->unk_206C[0 + v1], 0); - BGL_FillWindow(¶m0->unk_206C[2 + v1], 0); - BGL_FillWindow(¶m0->unk_206C[3 + v1], 0); - BGL_FillWindow(¶m0->unk_206C[5 + v1], 0); - BGL_FillWindow(¶m0->unk_206C[4 + v1], 0); + Window_FillTilemap(¶m0->unk_206C[6], 0); + Window_FillTilemap(¶m0->unk_206C[7], 0); + Window_FillTilemap(¶m0->unk_206C[8], 0); + Window_FillTilemap(¶m0->unk_206C[9], 0); + Window_FillTilemap(¶m0->unk_206C[10], 0); + Window_FillTilemap(¶m0->unk_206C[1 + v1], 0); + Window_FillTilemap(¶m0->unk_206C[0 + v1], 0); + Window_FillTilemap(¶m0->unk_206C[2 + v1], 0); + Window_FillTilemap(¶m0->unk_206C[3 + v1], 0); + Window_FillTilemap(¶m0->unk_206C[5 + v1], 0); + Window_FillTilemap(¶m0->unk_206C[4 + v1], 0); v0 = ¶m0->unk_04[param0->unk_00->unk_11].unk_30[param0->unk_00->unk_34]; @@ -1371,12 +1371,12 @@ static void ov13_02223B74(UnkStruct_ov13_022213F0 *param0) UnkStruct_ov13_022236B8 *v0; u32 v1; - BGL_FillWindow(¶m0->unk_206C[0], 0); - BGL_FillWindow(¶m0->unk_206C[1], 0); - BGL_FillWindow(¶m0->unk_206C[2], 0); - BGL_FillWindow(¶m0->unk_206C[3], 0); - BGL_FillWindow(¶m0->unk_206C[4], 0); - BGL_FillWindow(¶m0->unk_206C[5], 0); + Window_FillTilemap(¶m0->unk_206C[0], 0); + Window_FillTilemap(¶m0->unk_206C[1], 0); + Window_FillTilemap(¶m0->unk_206C[2], 0); + Window_FillTilemap(¶m0->unk_206C[3], 0); + Window_FillTilemap(¶m0->unk_206C[4], 0); + Window_FillTilemap(¶m0->unk_206C[5], 0); ov13_02221C54(param0, 0, 0, param0->unk_00->unk_11, 0, 0); @@ -1401,27 +1401,27 @@ static void ov13_02223B74(UnkStruct_ov13_022213F0 *param0) ov13_0222317C(param0, &v2, 5); } - sub_0201A9A4(¶m0->unk_206C[1]); - sub_0201A9A4(¶m0->unk_206C[2]); - sub_0201A9A4(¶m0->unk_206C[3]); - sub_0201A9A4(¶m0->unk_206C[4]); - sub_0201A9A4(¶m0->unk_206C[5]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[2]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[3]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[4]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[5]); } static void ov13_02223C9C(UnkStruct_ov13_022213F0 *param0) { - BGL_FillWindow(¶m0->unk_206C[0], 0); - BGL_FillWindow(¶m0->unk_206C[2], 0); - BGL_FillWindow(¶m0->unk_206C[3], 0); - BGL_FillWindow(¶m0->unk_206C[1], 0); - BGL_FillWindow(¶m0->unk_206C[4], 0); - BGL_FillWindow(¶m0->unk_206C[6], 0); - BGL_FillWindow(¶m0->unk_206C[5], 0); - BGL_FillWindow(¶m0->unk_206C[7], 0); - BGL_FillWindow(¶m0->unk_206C[9], 0); - BGL_FillWindow(¶m0->unk_206C[10], 0); - BGL_FillWindow(¶m0->unk_206C[8], 0); - BGL_FillWindow(¶m0->unk_206C[11], 0); + Window_FillTilemap(¶m0->unk_206C[0], 0); + Window_FillTilemap(¶m0->unk_206C[2], 0); + Window_FillTilemap(¶m0->unk_206C[3], 0); + Window_FillTilemap(¶m0->unk_206C[1], 0); + Window_FillTilemap(¶m0->unk_206C[4], 0); + Window_FillTilemap(¶m0->unk_206C[6], 0); + Window_FillTilemap(¶m0->unk_206C[5], 0); + Window_FillTilemap(¶m0->unk_206C[7], 0); + Window_FillTilemap(¶m0->unk_206C[9], 0); + Window_FillTilemap(¶m0->unk_206C[10], 0); + Window_FillTilemap(¶m0->unk_206C[8], 0); + Window_FillTilemap(¶m0->unk_206C[11], 0); ov13_02221C54(param0, 0, 0, param0->unk_00->unk_11, 0, 0); ov13_02222170(param0, 2, 0, 0); @@ -1457,11 +1457,11 @@ static void ov13_02223E68(UnkStruct_ov13_022213F0 *param0) UnkStruct_ov13_022236B8 *v0; u32 v1; - BGL_FillWindow(¶m0->unk_206C[0], 0); - BGL_FillWindow(¶m0->unk_206C[1], 0); - BGL_FillWindow(¶m0->unk_206C[2], 0); - BGL_FillWindow(¶m0->unk_206C[3], 0); - BGL_FillWindow(¶m0->unk_206C[4], 0); + Window_FillTilemap(¶m0->unk_206C[0], 0); + Window_FillTilemap(¶m0->unk_206C[1], 0); + Window_FillTilemap(¶m0->unk_206C[2], 0); + Window_FillTilemap(¶m0->unk_206C[3], 0); + Window_FillTilemap(¶m0->unk_206C[4], 0); ov13_02221C54(param0, 0, 0, param0->unk_00->unk_11, 0, 0); @@ -1480,10 +1480,10 @@ static void ov13_02223E68(UnkStruct_ov13_022213F0 *param0) ov13_022221C8(param0, 94); } - sub_0201A9A4(¶m0->unk_206C[1]); - sub_0201A9A4(¶m0->unk_206C[2]); - sub_0201A9A4(¶m0->unk_206C[3]); - sub_0201A9A4(¶m0->unk_206C[4]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[2]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[3]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[4]); } void ov13_02223F5C(UnkStruct_ov13_022213F0 *param0, u16 param1, u16 param2) @@ -1494,13 +1494,13 @@ void ov13_02223F5C(UnkStruct_ov13_022213F0 *param0, u16 param1, u16 param2) static void ov13_02223F7C(UnkStruct_ov13_022213F0 *param0) { - BGL_FillWindow(¶m0->unk_206C[0], 0); - BGL_FillWindow(¶m0->unk_206C[2], 0); - BGL_FillWindow(¶m0->unk_206C[3], 0); - BGL_FillWindow(¶m0->unk_206C[1], 0); - BGL_FillWindow(¶m0->unk_206C[4], 0); - BGL_FillWindow(¶m0->unk_206C[5], 0); - BGL_FillWindow(¶m0->unk_206C[6], 0); + Window_FillTilemap(¶m0->unk_206C[0], 0); + Window_FillTilemap(¶m0->unk_206C[2], 0); + Window_FillTilemap(¶m0->unk_206C[3], 0); + Window_FillTilemap(¶m0->unk_206C[1], 0); + Window_FillTilemap(¶m0->unk_206C[4], 0); + Window_FillTilemap(¶m0->unk_206C[5], 0); + Window_FillTilemap(¶m0->unk_206C[6], 0); ov13_02221C54(param0, 0, 0, param0->unk_00->unk_11, 0, 0); ov13_02222170(param0, 2, 0, 0); @@ -1516,7 +1516,7 @@ static void ov13_02223F7C(UnkStruct_ov13_022213F0 *param0) } Strbuf_Free(v0); - sub_0201A9A4(¶m0->unk_206C[4]); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[4]); } if (param0->unk_00->unk_34 < 4) { @@ -1539,7 +1539,7 @@ static void ov13_02223F7C(UnkStruct_ov13_022213F0 *param0) void ov13_022240E0(UnkStruct_ov13_022213F0 *param0) { sub_0200E060(¶m0->unk_204C[1], 1, 1, 14); - BGL_FillWindow(¶m0->unk_204C[1], 15); + Window_FillTilemap(¶m0->unk_204C[1], 15); ov13_02224108(param0); } diff --git a/src/overlay013/ov13_02225710.c b/src/overlay013/ov13_02225710.c index 7a3ee67c48..a10f7a00fc 100644 --- a/src/overlay013/ov13_02225710.c +++ b/src/overlay013/ov13_02225710.c @@ -438,8 +438,8 @@ static void ov13_02225D8C(UnkStruct_ov13_022213F0 *param0, u8 param1, u8 param2, ov13_02225C4C(param0, v0, param1, param2, param3); - sub_020198C0(param0->unk_1E0, 6, v0, Unk_ov13_02229924[param1].unk_00, Unk_ov13_02229924[param1].unk_01, Unk_ov13_02229924[param1].unk_02, Unk_ov13_02229924[param1].unk_03); - sub_0201C3C0(param0->unk_1E0, 6); + Bg_LoadToTilemapRect(param0->unk_1E0, 6, v0, Unk_ov13_02229924[param1].unk_00, Unk_ov13_02229924[param1].unk_01, Unk_ov13_02229924[param1].unk_02, Unk_ov13_02229924[param1].unk_03); + Bg_ScheduleTilemapTransfer(param0->unk_1E0, 6); Heap_FreeToHeap(v0); } @@ -474,16 +474,16 @@ static void ov13_02225E08(UnkStruct_ov13_022213F0 *param0, u8 param1, u8 param2) } if ((param1 >= 14) && (param1 <= 17)) { - sub_0201C04C(¶m0->unk_206C[v0[param0->unk_2071]], v2, v3, 0); - sub_0201A9A4(¶m0->unk_206C[v0[param0->unk_2071]]); + Window_Scroll(¶m0->unk_206C[v0[param0->unk_2071]], v2, v3, 0); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[v0[param0->unk_2071]]); } else { for (v1 = 0; v1 < 8; v1++) { if (v0[v1] == 0xff) { break; } - sub_0201C04C(¶m0->unk_206C[v0[v1]], v2, v3, 0); - sub_0201A9A4(¶m0->unk_206C[v0[v1]]); + Window_Scroll(¶m0->unk_206C[v0[v1]], v2, v3, 0); + Window_ScheduleCopyToVRAM(¶m0->unk_206C[v0[v1]]); } } } diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 20275e5377..d9ac3eba79 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -642,7 +642,7 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0) GX_BG0_AS_3D, }; - sub_020183A0(&v0, 1); + SetScreenGraphicsModes(&v0, 1); } { @@ -662,7 +662,7 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0) 0 }; - sub_020183C4(param0->unk_04, 6, &v1, 0); + Bg_InitFromTemplate(param0->unk_04, 6, &v1, 0); } { @@ -682,8 +682,8 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0) 0 }; - sub_020183C4(param0->unk_04, 5, &v2, 0); - sub_02019EBC(param0->unk_04, 5); + Bg_InitFromTemplate(param0->unk_04, 5, &v2, 0); + Bg_ClearTilemap(param0->unk_04, 5); } { @@ -703,22 +703,22 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0) 0 }; - sub_020183C4(param0->unk_04, 4, &v3, 0); - sub_02019EBC(param0->unk_04, 4); + Bg_InitFromTemplate(param0->unk_04, 4, &v3, 0); + Bg_ClearTilemap(param0->unk_04, 4); } - sub_02019690(5, 32, 0, param0->unk_00->unk_0C); - sub_02019690(4, 32, 0, param0->unk_00->unk_0C); - sub_0201C3C0(param0->unk_04, 5); - sub_0201C3C0(param0->unk_04, 4); + Bg_ClearTilesRange(5, 32, 0, param0->unk_00->unk_0C); + Bg_ClearTilesRange(4, 32, 0, param0->unk_00->unk_0C); + Bg_ScheduleTilemapTransfer(param0->unk_04, 5); + Bg_ScheduleTilemapTransfer(param0->unk_04, 4); } static void ov13_02226F9C(BgConfig *param0) { GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 4); - sub_02019044(param0, 5); - sub_02019044(param0, 6); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 6); } static void ov13_02226FC4(UnkStruct_ov13_02227244 *param0) @@ -774,16 +774,16 @@ static void ov13_02227118(UnkStruct_ov13_02227244 *param0, u8 param1) { switch (param1) { case 0: - sub_0201C63C(param0->unk_04, 6, 0, 0); - sub_0201C63C(param0->unk_04, 6, 3, 0); + Bg_ScheduleScroll(param0->unk_04, 6, 0, 0); + Bg_ScheduleScroll(param0->unk_04, 6, 3, 0); break; case 1: - sub_0201C63C(param0->unk_04, 6, 0, 256); - sub_0201C63C(param0->unk_04, 6, 3, 0); + Bg_ScheduleScroll(param0->unk_04, 6, 0, 256); + Bg_ScheduleScroll(param0->unk_04, 6, 3, 0); break; case 2: - sub_0201C63C(param0->unk_04, 6, 0, 0); - sub_0201C63C(param0->unk_04, 6, 3, 256); + Bg_ScheduleScroll(param0->unk_04, 6, 0, 0); + Bg_ScheduleScroll(param0->unk_04, 6, 3, 256); break; } } @@ -794,8 +794,8 @@ static void ov13_0222717C(UnkStruct_ov13_02227244 *param0, u8 param1) return; } - sub_02019E2C(param0->unk_04, 6, 2, 35, 28, 4, 8 + param0->unk_114D); - sub_02019E2C(param0->unk_04, 6, 2, 40, 28, 8, 8 + param0->unk_114D); + Bg_ChangeTilemapRectPalette(param0->unk_04, 6, 2, 35, 28, 4, 8 + param0->unk_114D); + Bg_ChangeTilemapRectPalette(param0->unk_04, 6, 2, 40, 28, 8, 8 + param0->unk_114D); } static void ov13_022271D0(UnkStruct_ov13_02227244 *param0, u8 param1) @@ -803,8 +803,8 @@ static void ov13_022271D0(UnkStruct_ov13_02227244 *param0, u8 param1) ov13_0222717C(param0, param1); ov13_02227118(param0, param1); - sub_02019F04(param0->unk_04, 4, 0); - sub_02019F04(param0->unk_04, 5, 0); + Bg_ScheduleFillTilemap(param0->unk_04, 4, 0); + Bg_ScheduleFillTilemap(param0->unk_04, 5, 0); ov13_02227324(param0); ov13_022272AC(param0, param1); diff --git a/src/overlay013/ov13_02227288.c b/src/overlay013/ov13_02227288.c index 640f517657..063029f2f1 100644 --- a/src/overlay013/ov13_02227288.c +++ b/src/overlay013/ov13_02227288.c @@ -76,7 +76,7 @@ static const WindowTemplate Unk_ov13_02229A68[] = { void ov13_02227288(UnkStruct_ov13_02227244 *param0) { - sub_0201A8D4(param0->unk_04, ¶m0->unk_1C, &Unk_ov13_02229A60); + Window_AddFromTemplate(param0->unk_04, ¶m0->unk_1C, &Unk_ov13_02229A60); ov13_022272AC(param0, param0->unk_114C); } @@ -100,24 +100,24 @@ void ov13_022272AC(UnkStruct_ov13_02227244 *param0, u32 param1) break; } - param0->unk_2C = sub_0201A778(param0->unk_00->unk_0C, param0->unk_30); + param0->unk_2C = Window_New(param0->unk_00->unk_0C, param0->unk_30); for (v1 = 0; v1 < param0->unk_30; v1++) { - sub_0201A8D4(param0->unk_04, ¶m0->unk_2C[v1], &v0[v1]); + Window_AddFromTemplate(param0->unk_04, ¶m0->unk_2C[v1], &v0[v1]); } } void ov13_02227324(UnkStruct_ov13_02227244 *param0) { - sub_0201A928(param0->unk_2C, param0->unk_30); + Windows_Delete(param0->unk_2C, param0->unk_30); } void ov13_02227334(UnkStruct_ov13_02227244 *param0) { u32 v0; - sub_0201A928(param0->unk_2C, param0->unk_30); - BGL_DeleteWindow(¶m0->unk_1C); + Windows_Delete(param0->unk_2C, param0->unk_30); + Window_Remove(¶m0->unk_1C); } void ov13_02227350(UnkStruct_ov13_02227244 *param0, u32 param1) @@ -145,11 +145,11 @@ static void ov13_02227374(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param v0 = ¶m0->unk_2C[param1]; v1 = MessageLoader_GetNewStrbuf(param0->unk_10, param2); v2 = Font_CalcStrbufWidth(param3, v1, 0); - v3 = (sub_0201C294(v0) * 8 - v2) / 2; + v3 = (Window_GetWidth(v0) * 8 - v2) / 2; Text_AddPrinterWithParamsAndColor(v0, param3, v1, v3, param4, TEXT_SPEED_NO_TRANSFER, param5, NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_022273CC(UnkStruct_ov13_02227244 *param0) @@ -157,7 +157,7 @@ static void ov13_022273CC(UnkStruct_ov13_02227244 *param0) u32 v0; for (v0 = 0; v0 < 5; v0++) { - BGL_FillWindow(¶m0->unk_2C[v0], 0); + Window_FillTilemap(¶m0->unk_2C[v0], 0); } ov13_02227374(param0, 0, 0, FONT_SUBSCREEN, 8, TEXT_COLOR(3, 2, 1)); @@ -172,7 +172,7 @@ static void ov13_022273CC(UnkStruct_ov13_02227244 *param0) Text_AddPrinterWithParamsAndColor(¶m0->unk_2C[4], FONT_SUBSCREEN, v1, 0, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL); Strbuf_Free(v1); - sub_0201A9A4(¶m0->unk_2C[4]); + Window_ScheduleCopyToVRAM(¶m0->unk_2C[4]); } } @@ -194,7 +194,7 @@ static void ov13_022274A8(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param v0 = ¶m0->unk_2C[param3]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); if (param0->unk_3C[param0->unk_114D][param1].item != 0) { v1 = MessageLoader_GetNewStrbuf(param0->unk_10, Unk_ov13_02229AB0[param2][0]); @@ -203,13 +203,13 @@ static void ov13_022274A8(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param StringTemplate_Format(param0->unk_14, param0->unk_18, v1); v2 = Font_CalcStrbufWidth(param4, param0->unk_18, 0); - v3 = (sub_0201C294(v0) * 8 - v2) / 2; + v3 = (Window_GetWidth(v0) * 8 - v2) / 2; Text_AddPrinterWithParamsAndColor(v0, param4, param0->unk_18, v3, 8, TEXT_SPEED_NO_TRANSFER, param5, NULL); Strbuf_Free(v1); } - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_0222754C(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, TextColor param6) @@ -219,7 +219,7 @@ static void ov13_0222754C(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param v1 = ¶m0->unk_2C[param3]; - BGL_FillWindow(v1, 0); + Window_FillTilemap(v1, 0); if (param0->unk_3C[param0->unk_114D][param1].quantity != 0) { v0 = MessageLoader_GetNewStrbuf(param0->unk_10, Unk_ov13_02229AB0[param2][1]); @@ -230,7 +230,7 @@ static void ov13_0222754C(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param Strbuf_Free(v0); } - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov13_022275E0(UnkStruct_ov13_02227244 *param0, u32 param1) @@ -254,7 +254,7 @@ void ov13_02227650(UnkStruct_ov13_02227244 *param0) { u16 v0; - sub_02019CB8(param0->unk_04, 5, 0, 0, 0, 32, 19, 17); + Bg_FillTilemapRect(param0->unk_04, 5, 0, 0, 0, 32, 19, 17); for (v0 = 0; v0 < 6; v0++) { ov13_022275E0(param0, v0); @@ -270,12 +270,12 @@ void ov13_02227698(UnkStruct_ov13_02227244 *param0) u32 v2; u32 v3; - BGL_FillWindow(¶m0->unk_2C[25], 0); + Window_FillTilemap(¶m0->unk_2C[25], 0); v0 = ¶m0->unk_2C[25]; v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 28); v2 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0); - v3 = (sub_0201C294(v0) * 8 - v2) / 2; + v3 = (Window_GetWidth(v0) * 8 - v2) / 2; Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v3, 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); @@ -293,12 +293,12 @@ void ov13_02227698(UnkStruct_ov13_02227244 *param0) v2 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_18, 0); Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_18, v3 - v2, 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_022277C8(UnkStruct_ov13_02227244 *param0) { - BGL_FillWindow(¶m0->unk_2C[24], 0); + Window_FillTilemap(¶m0->unk_2C[24], 0); switch (param0->unk_114D) { case 0: @@ -335,10 +335,10 @@ static void ov13_022278A0(UnkStruct_ov13_02227244 *param0, u32 param1) StringTemplate_SetItemName(param0->unk_14, 0, param0->unk_3C[param0->unk_114D][param1].item); StringTemplate_Format(param0->unk_14, param0->unk_18, v1); - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_18, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_02227910(UnkStruct_ov13_02227244 *param0, u32 param1) @@ -352,7 +352,7 @@ static void ov13_02227910(UnkStruct_ov13_02227244 *param0, u32 param1) Item_LoadDescription(v1, param0->unk_3C[param0->unk_114D][param1].item, param0->unk_00->unk_0C); Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov13_02227974(UnkStruct_ov13_02227244 *param0) @@ -361,7 +361,7 @@ static void ov13_02227974(UnkStruct_ov13_02227244 *param0) u32 v1; for (v0 = 0; v0 < 4; v0++) { - BGL_FillWindow(¶m0->unk_2C[v0], 0); + Window_FillTilemap(¶m0->unk_2C[v0], 0); } v1 = param0->unk_00->unk_2C[param0->unk_114D] * 6 + param0->unk_00->unk_27[param0->unk_114D]; @@ -375,7 +375,7 @@ static void ov13_02227974(UnkStruct_ov13_02227244 *param0) void ov13_022279F4(UnkStruct_ov13_02227244 *param0) { sub_0200E060(¶m0->unk_1C, 1, 1024 - (18 + 12), 14); - BGL_FillWindow(¶m0->unk_1C, 15); + Window_FillTilemap(¶m0->unk_1C, 15); ov13_02227A1C(param0); } diff --git a/src/overlay013/ov13_02228128.c b/src/overlay013/ov13_02228128.c index 52d7fc28e5..ca5ca8297c 100644 --- a/src/overlay013/ov13_02228128.c +++ b/src/overlay013/ov13_02228128.c @@ -345,8 +345,8 @@ static void ov13_022286B8(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2, ov13_0222863C(param0, v0, param1, param2, param3); - sub_020198C0(param0->unk_04, 6, v0, Unk_ov13_02229D7C[param1].unk_00, Unk_ov13_02229D7C[param1].unk_01, Unk_ov13_02229D7C[param1].unk_02, Unk_ov13_02229D7C[param1].unk_03); - sub_0201C3C0(param0->unk_04, 6); + Bg_LoadToTilemapRect(param0->unk_04, 6, v0, Unk_ov13_02229D7C[param1].unk_00, Unk_ov13_02229D7C[param1].unk_01, Unk_ov13_02229D7C[param1].unk_02, Unk_ov13_02229D7C[param1].unk_03); + Bg_ScheduleTilemapTransfer(param0->unk_04, 6); Heap_FreeToHeap(v0); } @@ -383,8 +383,8 @@ static void ov13_0222872C(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2) break; } - sub_0201C04C(¶m0->unk_2C[v0[v1]], v2, v3, 0); - sub_0201A9A4(¶m0->unk_2C[v0[v1]]); + Window_Scroll(¶m0->unk_2C[v0[v1]], v2, v3, 0); + Window_ScheduleCopyToVRAM(¶m0->unk_2C[v0[v1]]); } } diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index 62c80e79da..a0b18105fb 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -177,7 +177,7 @@ int ov17_0223B140(OverlayManager *param0, int *param1) sub_02002F70(v0->unk_0C.unk_50, 2, (((16 - 2) * 16) * sizeof(u16)), 21); sub_02002F70(v0->unk_0C.unk_50, 3, 0x200, 21); - v0->unk_0C.unk_24 = sub_02018340(21); + v0->unk_0C.unk_24 = BgConfig_New(21); sub_0201DBEC(64, 21); SetAutorepeat(4, 8); @@ -331,14 +331,14 @@ int ov17_0223B580(OverlayManager *param0, int *param1) ov17_0223BCE4(v0); for (v1 = 0; v1 < 1; v1++) { - BGL_DeleteWindow(&v0->unk_0C.unk_28[v1]); + Window_Remove(&v0->unk_0C.unk_28[v1]); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); - sub_02019044(v0->unk_0C.unk_24, 1); - sub_02019044(v0->unk_0C.unk_24, 2); - sub_02019044(v0->unk_0C.unk_24, 3); + Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 1); + Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 2); + Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 3); ov17_0223F864(v0->unk_0C.unk_24); ov17_0223F960(v0->unk_7E4); @@ -393,7 +393,7 @@ static void ov17_0223B6BC(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_0C.unk_50); - sub_0201C2B8(v0->unk_0C.unk_24); + Bg_RunScheduledUpdates(v0->unk_0C.unk_24); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -447,7 +447,7 @@ static void ov17_0223B728(BgConfig *param0) GX_BG0_AS_3D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -499,18 +499,18 @@ static void ov17_0223B728(BgConfig *param0) }, }; - sub_020183C4(param0, 1, &v2[0], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); - sub_020183C4(param0, 2, &v2[1], 0); - sub_02019EBC(param0, 2); - sub_02019184(param0, 2, 0, 0); - sub_02019184(param0, 2, 3, 0); - sub_020183C4(param0, 3, &v2[2], 0); - sub_02019EBC(param0, 3); - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_InitFromTemplate(param0, 1, &v2[0], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 2, &v2[1], 0); + Bg_ClearTilemap(param0, 2); + Bg_SetOffset(param0, 2, 0, 0); + Bg_SetOffset(param0, 2, 3, 0); + Bg_InitFromTemplate(param0, 3, &v2[2], 0); + Bg_ClearTilemap(param0, 3); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); G2_SetBG0Priority(2); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -523,7 +523,7 @@ static void ov17_0223B728(BgConfig *param0) static void ov17_0223B858(UnkStruct_ov17_02246F24 *param0) { - BGL_AddWindow(param0->unk_0C.unk_24, ¶m0->unk_0C.unk_28[0], 1, 11, 0x13, 20, 4, 0xd, ((0x8000 - 0x2000) / 32)); + Window_Add(param0->unk_0C.unk_24, ¶m0->unk_0C.unk_28[0], 1, 11, 0x13, 20, 4, 0xd, ((0x8000 - 0x2000) / 32)); } static void ov17_0223B884(void) @@ -640,8 +640,8 @@ void ov17_0223BB14(UnkStruct_ov17_02246F24 *param0, int param1, int param2) if (param1 == 0) { sub_02006E3C(45, 3, param0->unk_0C.unk_24, 2, 0, 0x4000, 1, 21); sub_02006E60(45, 5, param0->unk_0C.unk_24, 2, 0, 0, 1, 21); - BGL_SetPriority(1, 1); - BGL_SetPriority(2, 0); + Bg_SetPriority(1, 1); + Bg_SetPriority(2, 0); ov17_02241428(param0); @@ -649,10 +649,10 @@ void ov17_0223BB14(UnkStruct_ov17_02246F24 *param0, int param1, int param2) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); } } else { - sub_02019690(2, 0x4000, 0, 21); - sub_02019EBC(param0->unk_0C.unk_24, 2); - BGL_SetPriority(1, 0); - BGL_SetPriority(2, 1); + Bg_ClearTilesRange(2, 0x4000, 0, 21); + Bg_ClearTilemap(param0->unk_0C.unk_24, 2); + Bg_SetPriority(1, 0); + Bg_SetPriority(2, 1); } } diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index 3978941256..d1a9eb995b 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -157,7 +157,7 @@ int ov17_0223CB1C(OverlayManager *param0, int *param1) sub_02002F70(v0->unk_0C.unk_44, 2, (((16 - 2) * 16) * sizeof(u16)), 22); sub_02002F70(v0->unk_0C.unk_44, 3, 0x200, 22); - v0->unk_0C.unk_24 = sub_02018340(22); + v0->unk_0C.unk_24 = BgConfig_New(22); sub_0201DBEC(64, 22); SetAutorepeat(4, 8); @@ -298,16 +298,16 @@ int ov17_0223CF8C(OverlayManager *param0, int *param1) ov17_0223D608(v0); for (v1 = 0; v1 < 1; v1++) { - BGL_DeleteWindow(&v0->unk_0C.unk_28[v1]); + Window_Remove(&v0->unk_0C.unk_28[v1]); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); - sub_02019044(v0->unk_0C.unk_24, 1); - sub_02019044(v0->unk_0C.unk_24, 2); - sub_02019044(v0->unk_0C.unk_24, 3); - sub_02019120(4, 0); - sub_02019044(v0->unk_0C.unk_24, 4); + Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 1); + Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 2); + Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 3); + Bg_ToggleLayer(4, 0); + Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 4); sub_0200D0B0(v0->unk_0C.unk_1C, v0->unk_0C.unk_20); sub_0200C8D4(v0->unk_0C.unk_1C); sub_0201DC3C(); @@ -374,7 +374,7 @@ static void ov17_0223D0C8(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_0C.unk_44); - sub_0201C2B8(v0->unk_0C.unk_24); + Bg_RunScheduledUpdates(v0->unk_0C.unk_24); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -440,7 +440,7 @@ static void ov17_0223D1B8(BgConfig *param0) GX_BG0_AS_3D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -492,18 +492,18 @@ static void ov17_0223D1B8(BgConfig *param0) }, }; - sub_020183C4(param0, 1, &v2[0], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); - sub_020183C4(param0, 2, &v2[1], 0); - sub_02019EBC(param0, 2); - sub_02019184(param0, 2, 0, 0); - sub_02019184(param0, 2, 3, 0); - sub_020183C4(param0, 3, &v2[2], 0); - sub_02019EBC(param0, 3); - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_InitFromTemplate(param0, 1, &v2[0], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 2, &v2[1], 0); + Bg_ClearTilemap(param0, 2); + Bg_SetOffset(param0, 2, 0, 0); + Bg_SetOffset(param0, 2, 3, 0); + Bg_InitFromTemplate(param0, 3, &v2[2], 0); + Bg_ClearTilemap(param0, 3); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); G2_SetBG0Priority(1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -528,16 +528,16 @@ static void ov17_0223D1B8(BgConfig *param0) }, }; - sub_020183C4(param0, 4, &v3[0], 0); - sub_02019EBC(param0, 4); - sub_02019184(param0, 4, 0, 0); - sub_02019184(param0, 4, 3, 0); + Bg_InitFromTemplate(param0, 4, &v3[0], 0); + Bg_ClearTilemap(param0, 4); + Bg_SetOffset(param0, 4, 0, 0); + Bg_SetOffset(param0, 4, 3, 0); } } static void ov17_0223D324(UnkStruct_ov17_02247A48 *param0) { - BGL_AddWindow(param0->unk_0C.unk_24, ¶m0->unk_0C.unk_28[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1)); + Window_Add(param0->unk_0C.unk_24, ¶m0->unk_0C.unk_28[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1)); } static void ov17_0223D350(void) @@ -605,7 +605,7 @@ static void ov17_0223D4A8(UnkStruct_ov17_02247A48 *param0, NARC *param1) sub_020070E8(param1, 23, param0->unk_0C.unk_24, 3, 0, 0, 1, 22); sub_0200710C(param1, 22, param0->unk_0C.unk_24, 3, 0, 0, 1, 22); - sub_02019EBC(param0->unk_0C.unk_24, 1); + Bg_ClearTilemap(param0->unk_0C.unk_24, 1); PaletteSys_LoadPalette(param0->unk_0C.unk_44, 45, 35, 22, 0, 0, 0); PaletteSys_LoadPalette(param0->unk_0C.unk_44, 45, 36, 22, 0, 0x20, 13 * 16); diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index b992f1bfb8..2478b3e27b 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -257,7 +257,7 @@ int ov17_0223DAD0(OverlayManager *param0, int *param1) v0->unk_1050.unk_00 = Heap_AllocFromHeap(23, 0x200); ov17_0224CDB4(v0, 1); - v0->unk_14.unk_60 = sub_02018340(23); + v0->unk_14.unk_60 = BgConfig_New(23); sub_0201DBEC(64, 23); SetAutorepeat(4, 8); @@ -408,14 +408,14 @@ int ov17_0223DF0C(OverlayManager *param0, int *param1) ov17_0223E774(v0); for (v1 = 0; v1 < 2; v1++) { - BGL_DeleteWindow(&v0->unk_14.unk_64[v1]); + Window_Remove(&v0->unk_14.unk_64[v1]); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); - sub_02019044(v0->unk_14.unk_60, 1); - sub_02019044(v0->unk_14.unk_60, 2); - sub_02019044(v0->unk_14.unk_60, 3); + Bg_FreeTilemapBuffer(v0->unk_14.unk_60, 1); + Bg_FreeTilemapBuffer(v0->unk_14.unk_60, 2); + Bg_FreeTilemapBuffer(v0->unk_14.unk_60, 3); ov17_02249358(v0->unk_14.unk_60); ov17_022493A4(v0->unk_1074); @@ -499,7 +499,7 @@ static void ov17_0223E09C(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_14.unk_90); - sub_0201C2B8(v0->unk_14.unk_60); + Bg_RunScheduledUpdates(v0->unk_14.unk_60); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -600,7 +600,7 @@ static void ov17_0223E250(BgConfig *param0) GX_BG0_AS_3D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -652,18 +652,18 @@ static void ov17_0223E250(BgConfig *param0) }, }; - sub_020183C4(param0, 1, &v2[0], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); - sub_020183C4(param0, 2, &v2[1], 0); - sub_02019EBC(param0, 2); - sub_02019184(param0, 2, 0, 0); - sub_02019184(param0, 2, 3, 0); - sub_020183C4(param0, 3, &v2[2], 0); - sub_02019EBC(param0, 3); - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_InitFromTemplate(param0, 1, &v2[0], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 2, &v2[1], 0); + Bg_ClearTilemap(param0, 2); + Bg_SetOffset(param0, 2, 0, 0); + Bg_SetOffset(param0, 2, 3, 0); + Bg_InitFromTemplate(param0, 3, &v2[2], 0); + Bg_ClearTilemap(param0, 3); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); G2_SetBG0Priority(2); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -676,8 +676,8 @@ static void ov17_0223E250(BgConfig *param0) static void ov17_0223E380(UnkStruct_ov17_0224DF54 *param0) { - BGL_AddWindow(param0->unk_14.unk_60, ¶m0->unk_14.unk_64[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1)); - BGL_AddWindow(param0->unk_14.unk_60, ¶m0->unk_14.unk_64[1], 1, 0x2, 0xb, 27, 2, 13, ((18 + 12) + 1)); + Window_Add(param0->unk_14.unk_60, ¶m0->unk_14.unk_64[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1)); + Window_Add(param0->unk_14.unk_60, ¶m0->unk_14.unk_64[1], 1, 0x2, 0xb, 27, 2, 13, ((18 + 12) + 1)); } static BOOL ov17_0223E3CC(UnkStruct_ov17_0224DF54 *param0, int *param1, int *param2) diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index bd63dfecc9..2beddc00f6 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -130,7 +130,7 @@ void ov17_0223F1E8(int param0, BgConfig *param1, SpriteGfxHandler *param2, UnkSt { Window_Init(&v1); - BGL_AddFramelessWindow(param1, &v1, v6, 16 / 8, 0, 0); + Window_AddToTopLeftCorner(param1, &v1, v6, 16 / 8, 0, 0); Text_AddPrinterWithParamsColorAndSpacing(&v1, param6, param5, 0, 0, TEXT_SPEED_NO_TRANSFER, param7, v7, 0, NULL); } @@ -163,7 +163,7 @@ void ov17_0223F1E8(int param0, BgConfig *param1, SpriteGfxHandler *param2, UnkSt } sub_020128C4(v4, param10, param11); - BGL_DeleteWindow(&v1); + Window_Remove(&v1); param4->unk_00 = v4; param4->unk_04 = v2; diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index be8c0a9852..17afc1ba06 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -545,10 +545,10 @@ void ov17_0223F80C(BgConfig *param0) int v0; for (v0 = 0; v0 < NELEMS(Unk_ov17_02253448); v0++) { - sub_020183C4(param0, 4 + v0, &Unk_ov17_02253448[v0], 0); - sub_02019EE0(param0, 4 + v0, 0); - sub_02019184(param0, 4 + v0, 0, 0); - sub_02019184(param0, 4 + v0, 3, 0); + Bg_InitFromTemplate(param0, 4 + v0, &Unk_ov17_02253448[v0], 0); + Bg_FillTilemap(param0, 4 + v0, 0); + Bg_SetOffset(param0, 4 + v0, 0, 0); + Bg_SetOffset(param0, 4 + v0, 3, 0); } } @@ -557,8 +557,8 @@ void ov17_0223F864(BgConfig *param0) int v0; for (v0 = 0; v0 < NELEMS(Unk_ov17_02253448); v0++) { - sub_02019120(4 + v0, 0); - sub_02019044(param0, 4 + v0); + Bg_ToggleLayer(4 + v0, 0); + Bg_FreeTilemapBuffer(param0, 4 + v0); } } @@ -655,7 +655,7 @@ void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void { for (v2 = 0; v2 < 4; v2++) { - BGL_SetPriority(4 + v2, v0->unk_0C_val2[v2]); + Bg_SetPriority(4 + v2, v0->unk_0C_val2[v2]); } } @@ -665,8 +665,8 @@ void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void for (v2 = 0; v2 < 4; v2++) { if ((v0->unk_04_val2[v2] != 0xffff) && ((param2 == 1) || (v0->unk_04_val2[v2] != v1->unk_04_val2[v2]))) { - sub_02019574(v3, 4 + v2, param0->unk_20[v0->unk_04_val2[v2]], 0x800); - sub_0201C3C0(v3, 4 + v2); + Bg_LoadTilemapBuffer(v3, 4 + v2, param0->unk_20[v0->unk_04_val2[v2]], 0x800); + Bg_ScheduleTilemapTransfer(v3, 4 + v2); } } @@ -971,7 +971,7 @@ static void ov17_02240138(UnkStruct_ov17_0223F7E4 *param0, UnkStruct_ov17_022401 if (param10 == NULL) { Window_Init(&v1); - BGL_AddFramelessWindow(v5, &v1, v8, 16 / 8, 0, 0); + Window_AddToTopLeftCorner(v5, &v1, v8, 16 / 8, 0, 0); Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); } else { v1 = param10->unk_00; @@ -1005,7 +1005,7 @@ static void ov17_02240138(UnkStruct_ov17_0223F7E4 *param0, UnkStruct_ov17_022401 sub_020128C4(v4, param7, param8); if (param10 == NULL) { - BGL_DeleteWindow(&v1); + Window_Remove(&v1); } param1->unk_00 = v4; @@ -1102,7 +1102,7 @@ static void ov17_022403B0(UnkStruct_ov17_0223F7E4 *param0, const s16 *param1, co int v7; v2 = param0->unk_04->unk_24; - v3 = sub_02019FE4(v2, 4); + v3 = Bg_GetTilemapBuffer(v2, 4); v5 = param0->unk_20[param3]; v7 = param1[param4]; @@ -1115,7 +1115,7 @@ static void ov17_022403B0(UnkStruct_ov17_0223F7E4 *param0, const s16 *param1, co } } - sub_0201C3C0(v2, 4); + Bg_ScheduleTilemapTransfer(v2, 4); } static void ov17_02240424(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2) @@ -1427,21 +1427,21 @@ static void ov17_022409F4(UnkStruct_ov17_0223F7E4 *param0) for (v0 = 0; v0 < 4; v0++) { if (param0->unk_18C.unk_00[v0].unk_00.pixels != NULL) { - BGL_DeleteWindow(¶m0->unk_18C.unk_00[v0].unk_00); + Window_Remove(¶m0->unk_18C.unk_00[v0].unk_00); } if (param0->unk_18C.unk_50[v0].unk_00.pixels != NULL) { - BGL_DeleteWindow(¶m0->unk_18C.unk_50[v0].unk_00); + Window_Remove(¶m0->unk_18C.unk_50[v0].unk_00); } if (param0->unk_18C.unk_A0[v0].unk_00.pixels != NULL) { - BGL_DeleteWindow(¶m0->unk_18C.unk_A0[v0].unk_00); + Window_Remove(¶m0->unk_18C.unk_A0[v0].unk_00); } } for (v0 = 0; v0 < (1 + 2); v0++) { if (param0->unk_18C.unk_F0[v0].unk_00.pixels != NULL) { - BGL_DeleteWindow(¶m0->unk_18C.unk_F0[v0].unk_00); + Window_Remove(¶m0->unk_18C.unk_F0[v0].unk_00); } } } @@ -1503,11 +1503,11 @@ static void ov17_02240BF4(UnkStruct_ov17_0223F7E4 *param0, const Strbuf *param1, param3->unk_10 = v1; if (param3->unk_00.pixels != NULL) { - BGL_DeleteWindow(¶m3->unk_00); + Window_Remove(¶m3->unk_00); } Window_Init(¶m3->unk_00); - BGL_AddFramelessWindow(param0->unk_04->unk_24, ¶m3->unk_00, v1, 16 / 8, 0, 0); + Window_AddToTopLeftCorner(param0->unk_04->unk_24, ¶m3->unk_00, v1, 16 / 8, 0, 0); Text_AddPrinterWithParamsColorAndSpacing(¶m3->unk_00, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); } @@ -1811,7 +1811,7 @@ static void ov17_022411E4(SysTask *param0, void *param1) { UnkStruct_ov17_0223F7E4 *v0 = param1; - sub_0201958C(v0->unk_04->unk_24, 4, v0->unk_2C4->pRawData, 0x6000, 0); + Bg_LoadTiles(v0->unk_04->unk_24, 4, v0->unk_2C4->pRawData, 0x6000, 0); Heap_FreeToHeap(v0->unk_2C0); v0->unk_2C0 = NULL; @@ -1829,9 +1829,9 @@ static void ov17_02241220(SysTask *param0, void *param1) for (v2 = 0; v2 < 4; v2++) { if (v1->unk_04_val2[v2] == 0xffff) { - sub_02019120(4 + v2, 0); + Bg_ToggleLayer(4 + v2, 0); } else { - sub_02019120(4 + v2, 1); + Bg_ToggleLayer(4 + v2, 1); } } diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index bb0f2fc8a5..07a5490541 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -396,7 +396,7 @@ void ov17_022413E4(UnkStruct_ov17_02246F24 *param0, int param1, int param2) u16 *v0; int v1, v2; - v0 = sub_02019FE4(param0->unk_0C.unk_24, 2); + v0 = Bg_GetTilemapBuffer(param0->unk_0C.unk_24, 2); v0 = &v0[32 * (param1 * 6) + 0]; for (v2 = 0; v2 < 6; v2++) { @@ -414,7 +414,7 @@ void ov17_02241428(UnkStruct_ov17_02246F24 *param0) ov17_022413E4(param0, v0, Unk_ov17_022536B4[param0->unk_220.unk_01[v0]]); } - sub_0201C3C0(param0->unk_0C.unk_24, 2); + Bg_ScheduleTilemapTransfer(param0->unk_0C.unk_24, 2); } UnkStruct_ov17_0224145C *ov17_0224145C(UnkStruct_ov17_02246F24 *param0, int param1) @@ -1504,8 +1504,8 @@ static void ov17_0224290C(UnkStruct_ov17_02246F24 *param0, int param1, const Unk void ov17_02242DA8(UnkStruct_ov17_02246F24 *param0) { - BGL_FillWindow(¶m0->unk_0C.unk_28[0], 0xff); - sub_0201A954(¶m0->unk_0C.unk_28[0]); + Window_FillTilemap(¶m0->unk_0C.unk_28[0], 0xff); + Window_CopyToVRAM(¶m0->unk_0C.unk_28[0]); } static void ov17_02242DC0(UnkStruct_ov17_02246F24 *param0, MessageLoader *param1, u32 param2, int param3, const UnkStruct_ov17_022449B8 *param4, const void *param5, int param6) @@ -1527,16 +1527,16 @@ static void ov17_02242DC0(UnkStruct_ov17_02246F24 *param0, MessageLoader *param1 ov17_0224290C(param0, param3, param4, param5); StringTemplate_Format(param0->unk_0C.unk_48, param0->unk_0C.unk_4C, v0); - BGL_FillWindow(¶m0->unk_0C.unk_28[0], 0xff); + Window_FillTilemap(¶m0->unk_0C.unk_28[0], 0xff); param0->unk_0C.unk_210 = Text_AddPrinterWithParams(¶m0->unk_0C.unk_28[0], FONT_MESSAGE, param0->unk_0C.unk_4C, 0, 0, v1, NULL); if (v1 == 0) { param0->unk_0C.unk_210 = 0xff; - sub_0201A954(¶m0->unk_0C.unk_28[0]); + Window_CopyToVRAM(¶m0->unk_0C.unk_28[0]); } - if (sub_020192EC(param0->unk_0C.unk_24, 1) == 0) { + if (Bg_GetXOffset(param0->unk_0C.unk_24, 1) == 0) { (void)0; } diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c index 9628b88941..e26f627e8f 100644 --- a/src/overlay017/ov17_022476F8.c +++ b/src/overlay017/ov17_022476F8.c @@ -218,7 +218,7 @@ static void ov17_02247990(UnkStruct_ov17_02247A48 *param0, MessageLoader *param1 ov17_0224792C(param0, param3, param4); StringTemplate_Format(param0->unk_0C.unk_3C, param0->unk_0C.unk_40, v0); - BGL_FillWindow(¶m0->unk_0C.unk_28[0], 0xff); + Window_FillTilemap(¶m0->unk_0C.unk_28[0], 0xff); param0->unk_0C.unk_C4 = Text_AddPrinterWithParams(¶m0->unk_0C.unk_28[0], FONT_MESSAGE, param0->unk_0C.unk_40, 0, 0, v1, NULL); Strbuf_Free(v0); diff --git a/src/overlay017/ov17_02247A48.c b/src/overlay017/ov17_02247A48.c index 440879160e..b80eceea05 100644 --- a/src/overlay017/ov17_02247A48.c +++ b/src/overlay017/ov17_02247A48.c @@ -625,7 +625,7 @@ static void ov17_022482B0(SysTask *param0, void *param1) u16 *v1, *v2; int v3, v4, v5, v6, v7; - v1 = sub_02019FE4(v0->unk_00->unk_0C.unk_24, 2); + v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_0C.unk_24, 2); for (v4 = 0; v4 < 4; v4++) { if (Unk_ov17_02254468[v0->unk_11] + v4 < 0) { @@ -656,7 +656,7 @@ static void ov17_022482B0(SysTask *param0, void *param1) } } - sub_0201C3C0(v0->unk_00->unk_0C.unk_24, 2); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_0C.unk_24, 2); } v0->unk_12++; @@ -727,7 +727,7 @@ static void ov17_02248464(SysTask *param0, void *param1) int v3, v4, v5, v6, v7; int v8; - v1 = sub_02019FE4(v0->unk_00->unk_0C.unk_24, 2); + v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_0C.unk_24, 2); for (v4 = 0; v4 < 4; v4++) { v8 = Unk_ov17_02254468[NELEMS(Unk_ov17_02254468) - 1 - v0->unk_11]; @@ -763,7 +763,7 @@ static void ov17_02248464(SysTask *param0, void *param1) } } - sub_0201C3C0(v0->unk_00->unk_0C.unk_24, 2); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_0C.unk_24, 2); } v0->unk_12++; @@ -1194,7 +1194,7 @@ static void ov17_02248DA4(SysTask *param0, void *param1) case 0: if (v0->unk_17 != 0) { sub_0200E060(&v0->unk_00->unk_0C.unk_28[0], 1, 1, 14); - sub_0201C3C0(v0->unk_00->unk_0C.unk_24, 1); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_0C.unk_24, 1); ov17_02247A08(v0->unk_00, v0->unk_17, &v0->unk_13); v0->unk_10++; } else { @@ -1213,7 +1213,7 @@ static void ov17_02248DA4(SysTask *param0, void *param1) v0->unk_10++; } else if (v0->unk_12 >= v0->unk_18) { sub_0200E084(&v0->unk_00->unk_0C.unk_28[0], 1); - sub_0201C3C0(v0->unk_00->unk_0C.unk_24, 1); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_0C.unk_24, 1); v0->unk_10++; } break; @@ -1362,7 +1362,7 @@ static void ov17_02249014(SysTask *param0, void *param1) u16 *v2, *v3; int v4, v5, v6, v7, v8; - v2 = sub_02019FE4(v0->unk_00->unk_0C.unk_24, 2); + v2 = Bg_GetTilemapBuffer(v0->unk_00->unk_0C.unk_24, 2); for (v5 = 0; v5 < 4; v5++) { if (Unk_ov17_02254468[v0->unk_11] + v5 < 0) { @@ -1393,7 +1393,7 @@ static void ov17_02249014(SysTask *param0, void *param1) } } - sub_0201C3C0(v0->unk_00->unk_0C.unk_24, 2); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_0C.unk_24, 2); } { diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index bf64c5019d..04907b9bac 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -289,10 +289,10 @@ void ov17_02249300(BgConfig *param0) int v0; for (v0 = 0; v0 < NELEMS(Unk_ov17_022545C0); v0++) { - sub_020183C4(param0, 4 + v0, &Unk_ov17_022545C0[v0], 0); - sub_02019EE0(param0, 4 + v0, 0); - sub_02019184(param0, 4 + v0, 0, 0); - sub_02019184(param0, 4 + v0, 3, 0); + Bg_InitFromTemplate(param0, 4 + v0, &Unk_ov17_022545C0[v0], 0); + Bg_FillTilemap(param0, 4 + v0, 0); + Bg_SetOffset(param0, 4 + v0, 0, 0); + Bg_SetOffset(param0, 4 + v0, 3, 0); } } @@ -301,8 +301,8 @@ void ov17_02249358(BgConfig *param0) int v0; for (v0 = 0; v0 < NELEMS(Unk_ov17_022545C0); v0++) { - sub_02019120(4 + v0, 0); - sub_02019044(param0, 4 + v0); + Bg_ToggleLayer(4 + v0, 0); + Bg_FreeTilemapBuffer(param0, 4 + v0); } } @@ -430,7 +430,7 @@ void ov17_02249640(UnkStruct_ov17_022492DC *param0, int param1, int param2, void { for (v2 = 0; v2 < 4; v2++) { - BGL_SetPriority(4 + v2, v0->unk_0C_val2[v2]); + Bg_SetPriority(4 + v2, v0->unk_0C_val2[v2]); } } @@ -445,8 +445,8 @@ void ov17_02249640(UnkStruct_ov17_022492DC *param0, int param1, int param2, void for (v2 = 0; v2 < 4; v2++) { if ((v0->unk_04_val2[v2] != 0xffff) && ((param2 == 1) || (v0->unk_04_val2[v2] != v1->unk_04_val2[v2]))) { - sub_02019574(v3, 4 + v2, param0->unk_D0[v0->unk_04_val2[v2]], 0x800); - sub_0201C3C0(v3, 4 + v2); + Bg_LoadTilemapBuffer(v3, 4 + v2, param0->unk_D0[v0->unk_04_val2[v2]], 0x800); + Bg_ScheduleTilemapTransfer(v3, 4 + v2); } } @@ -626,7 +626,7 @@ static UnkStruct_ov17_02249B30 *ov17_02249AAC(UnkStruct_ov17_022492DC *param0, i v0->unk_1C = param5 * 0x20; v0->unk_10 = *param4; - v0->unk_04 = sub_02019F28(param1); + v0->unk_04 = Bg_GetCharPtr(param1); return v0; } @@ -700,7 +700,7 @@ static void ov17_02249BC4(UnkStruct_ov17_022492DC *param0, UnkStruct_ov17_02249B { Window_Init(&v1); - BGL_AddFramelessWindow(v5, &v1, v8, 16 / 8, 0, 0); + Window_AddToTopLeftCorner(v5, &v1, v8, 16 / 8, 0, 0); Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); } @@ -730,7 +730,7 @@ static void ov17_02249BC4(UnkStruct_ov17_022492DC *param0, UnkStruct_ov17_02249B sub_02012AC0(v4, param5); sub_020128C4(v4, param7, param8); - BGL_DeleteWindow(&v1); + Window_Remove(&v1); param1->unk_00 = v4; param1->unk_04 = v2; @@ -917,9 +917,9 @@ static void ov17_0224A038(SysTask *param0, void *param1) for (v2 = 0; v2 < 4; v2++) { if (v1->unk_04_val2[v2] == 0xffff) { - sub_02019120(4 + v2, 0); + Bg_ToggleLayer(4 + v2, 0); } else { - sub_02019120(4 + v2, 1); + Bg_ToggleLayer(4 + v2, 1); } } @@ -931,7 +931,7 @@ static void ov17_0224A088(SysTask *param0, void *param1) UnkStruct_ov17_022492DC *v0 = param1; if (v0->unk_88 != 0xffff) { - sub_0201958C(v0->unk_04->unk_60, 4, v0->unk_C4[v0->unk_88], (0x8000 - (0x800 * 4)), 0); + Bg_LoadTiles(v0->unk_04->unk_60, 4, v0->unk_C4[v0->unk_88], (0x8000 - (0x800 * 4)), 0); v0->unk_88 = 0xffff; } diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index 3f35424148..5297b5d6c0 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -448,7 +448,7 @@ void ov17_0224A214(UnkStruct_ov17_0224A1EC *param0, int param1, int param2) { u16 *v6; - v6 = sub_02019FE4(param0->unk_60, 3); + v6 = Bg_GetTilemapBuffer(param0->unk_60, 3); v6 = &v6[32 * 0x13 + v5]; if (param2 == 0) { @@ -492,7 +492,7 @@ void ov17_0224A214(UnkStruct_ov17_0224A1EC *param0, int param1, int param2) } } - sub_0201C3C0(param0->unk_60, 3); + Bg_ScheduleTilemapTransfer(param0->unk_60, 3); } } @@ -1941,7 +1941,7 @@ static void ov17_0224C244(UnkStruct_ov17_0224DF54 *param0, MessageLoader *param1 ov17_0224C0C0(param0, param3, param4); StringTemplate_Format(param0->unk_14.unk_88, param0->unk_14.unk_8C, v0); - BGL_FillWindow(¶m0->unk_14.unk_64[0], 0xff); + Window_FillTilemap(¶m0->unk_14.unk_64[0], 0xff); param0->unk_14.unk_A18 = Text_AddPrinterWithParams(¶m0->unk_14.unk_64[0], FONT_MESSAGE, param0->unk_14.unk_8C, 0, 0, v1, NULL); Strbuf_Free(v0); @@ -2105,7 +2105,7 @@ void ov17_0224C5A0(UnkStruct_ov17_0224DF54 *param0, u32 param1, const UnkStruct_ } sub_0200E060(¶m0->unk_14.unk_64[1], 1, 1, 14); - sub_0201C3C0(param0->unk_14.unk_60, 1); + Bg_ScheduleTilemapTransfer(param0->unk_14.unk_60, 1); v0 = Unk_ov17_0225470C[param1].unk_00; v1 = Unk_ov17_0225470C[param1].unk_02; @@ -2114,7 +2114,7 @@ void ov17_0224C5A0(UnkStruct_ov17_0224DF54 *param0, u32 param1, const UnkStruct_ ov17_0224C0C0(param0, v1, param2); StringTemplate_Format(param0->unk_14.unk_88, param0->unk_14.unk_8C, v2); - BGL_FillWindow(¶m0->unk_14.unk_64[1], 0xff); + Window_FillTilemap(¶m0->unk_14.unk_64[1], 0xff); Text_AddPrinterWithParams(¶m0->unk_14.unk_64[1], FONT_MESSAGE, param0->unk_14.unk_8C, 0, 0, TEXT_SPEED_INSTANT, NULL); Strbuf_Free(v2); @@ -2124,7 +2124,7 @@ void ov17_0224C5A0(UnkStruct_ov17_0224DF54 *param0, u32 param1, const UnkStruct_ void ov17_0224C640(UnkStruct_ov17_0224DF54 *param0) { sub_0200E084(¶m0->unk_14.unk_64[1], 1); - sub_0201C3C0(param0->unk_14.unk_60, 1); + Bg_ScheduleTilemapTransfer(param0->unk_14.unk_60, 1); param0->unk_1B25 = 0; } diff --git a/src/overlay017/ov17_0224CFB8.c b/src/overlay017/ov17_0224CFB8.c index 8a8d416f0f..8107183c9b 100644 --- a/src/overlay017/ov17_0224CFB8.c +++ b/src/overlay017/ov17_0224CFB8.c @@ -209,7 +209,7 @@ static void ov17_0224D078(SysTask *param0, void *param1) u16 *v1, *v2; int v3, v4, v5, v6, v7; - v1 = sub_02019FE4(v0->unk_00->unk_14.unk_60, 2); + v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_14.unk_60, 2); for (v4 = 0; v4 < 4; v4++) { if (Unk_ov17_022549C4[v0->unk_11] + v4 < 0) { @@ -240,7 +240,7 @@ static void ov17_0224D078(SysTask *param0, void *param1) } } - sub_0201C3C0(v0->unk_00->unk_14.unk_60, 2); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_14.unk_60, 2); } v0->unk_12++; @@ -312,7 +312,7 @@ static void ov17_0224D240(SysTask *param0, void *param1) int v3, v4, v5, v6, v7; int v8; - v1 = sub_02019FE4(v0->unk_00->unk_14.unk_60, 2); + v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_14.unk_60, 2); for (v4 = 0; v4 < 4; v4++) { v8 = Unk_ov17_022549C4[NELEMS(Unk_ov17_022549C4) - 1 - v0->unk_11]; @@ -348,7 +348,7 @@ static void ov17_0224D240(SysTask *param0, void *param1) } } - sub_0201C3C0(v0->unk_00->unk_14.unk_60, 2); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_14.unk_60, 2); } v0->unk_12++; @@ -1404,7 +1404,7 @@ static void ov17_0224E6C8(SysTask *param0, void *param1) case 0: if (v0->unk_1A != 0) { sub_0200E060(&v0->unk_00->unk_14.unk_64[0], 1, 1, 14); - sub_0201C3C0(v0->unk_00->unk_14.unk_60, 1); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_14.unk_60, 1); ov17_0224C2CC(v0->unk_00, v0->unk_1A, &v0->unk_14); v0->unk_10++; @@ -1424,7 +1424,7 @@ static void ov17_0224E6C8(SysTask *param0, void *param1) v0->unk_10++; } else if (v0->unk_12 >= v0->unk_1B) { sub_0200E084(&v0->unk_00->unk_14.unk_64[0], 1); - sub_0201C3C0(v0->unk_00->unk_14.unk_60, 1); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_14.unk_60, 1); v0->unk_10++; } break; diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index d3e88ce136..42e2c823d7 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -168,7 +168,7 @@ int ov17_0224F4D4(OverlayManager *param0, int *param1) sub_02002F70(v0->unk_10.unk_C0, 2, (((16 - 2) * 16) * sizeof(u16)), 24); sub_02002F70(v0->unk_10.unk_C0, 3, 0x200, 24); - v0->unk_10.unk_20 = sub_02018340(24); + v0->unk_10.unk_20 = BgConfig_New(24); sub_0201DBEC(64, 24); SetAutorepeat(4, 8); @@ -288,16 +288,16 @@ int ov17_0224F86C(OverlayManager *param0, int *param1) ov17_0224FEC8(v0); for (v1 = 0; v1 < 9; v1++) { - BGL_DeleteWindow(&v0->unk_10.unk_24[v1]); + Window_Remove(&v0->unk_10.unk_24[v1]); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); - sub_02019044(v0->unk_10.unk_20, 1); - sub_02019044(v0->unk_10.unk_20, 2); - sub_02019044(v0->unk_10.unk_20, 3); - sub_02019120(4, 0); - sub_02019044(v0->unk_10.unk_20, 4); + Bg_FreeTilemapBuffer(v0->unk_10.unk_20, 1); + Bg_FreeTilemapBuffer(v0->unk_10.unk_20, 2); + Bg_FreeTilemapBuffer(v0->unk_10.unk_20, 3); + Bg_ToggleLayer(4, 0); + Bg_FreeTilemapBuffer(v0->unk_10.unk_20, 4); sub_0200D0B0(v0->unk_10.unk_18, v0->unk_10.unk_1C); sub_0200C8D4(v0->unk_10.unk_18); sub_0201DC3C(); @@ -362,7 +362,7 @@ static void ov17_0224FA24(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_10.unk_C0); - sub_0201C2B8(v0->unk_10.unk_20); + Bg_RunScheduledUpdates(v0->unk_10.unk_20); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -376,9 +376,9 @@ static void ov17_0224FAAC(void *param0) v1 = GX_GetVCount(); if ((v1 >= (0x13 - 1) * 8) && (v1 <= (0x13 - 0) * 8)) { - BGL_SetPriority(1, 0); + Bg_SetPriority(1, 0); } else if (v1 < (0x13 - 1) * 8) { - BGL_SetPriority(1, 2); + Bg_SetPriority(1, 2); } } } @@ -388,7 +388,7 @@ static void ov17_0224FAE4(SysTask *param0, void *param1) UnkStruct_ov17_0224FCA0 *v0 = param1; if (v0->unk_127B == 1) { - BGL_SetPriority(1, 2); + Bg_SetPriority(1, 2); } } @@ -441,7 +441,7 @@ static void ov17_0224FB34(BgConfig *param0) GX_BG0_AS_3D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -493,18 +493,18 @@ static void ov17_0224FB34(BgConfig *param0) }, }; - sub_020183C4(param0, 1, &v2[0], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); - sub_020183C4(param0, 2, &v2[1], 0); - sub_02019EBC(param0, 2); - sub_02019184(param0, 2, 0, 0); - sub_02019184(param0, 2, 3, 0); - sub_020183C4(param0, 3, &v2[2], 0); - sub_02019EBC(param0, 3); - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_InitFromTemplate(param0, 1, &v2[0], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 2, &v2[1], 0); + Bg_ClearTilemap(param0, 2); + Bg_SetOffset(param0, 2, 0, 0); + Bg_SetOffset(param0, 2, 3, 0); + Bg_InitFromTemplate(param0, 3, &v2[2], 0); + Bg_ClearTilemap(param0, 3); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); G2_SetBG0Priority(1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -529,24 +529,24 @@ static void ov17_0224FB34(BgConfig *param0) }, }; - sub_020183C4(param0, 4, &v3[0], 0); - sub_02019EBC(param0, 4); - sub_02019184(param0, 4, 0, 0); - sub_02019184(param0, 4, 3, 0); + Bg_InitFromTemplate(param0, 4, &v3[0], 0); + Bg_ClearTilemap(param0, 4); + Bg_SetOffset(param0, 4, 0, 0); + Bg_SetOffset(param0, 4, 3, 0); } } static void ov17_0224FCA0(UnkStruct_ov17_0224FCA0 *param0) { - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1)); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[1], 1, 6, 1 + 4 * 0, 8, 3, 13, (((18 + 12) + 1) + (27 * 4))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[2], 1, 6, 1 + 4 * 1, 8, 3, 13, ((((18 + 12) + 1) + (27 * 4)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[3], 1, 6, 1 + 4 * 2, 8, 3, 13, (((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[4], 1, 6, 1 + 4 * 3, 8, 3, 13, ((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[5], 1, 0x10, 1 + 4 * 0, 8, 3, 13, (((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[6], 1, 0x10, 1 + 4 * 1, 8, 3, 13, ((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[7], 1, 0x10, 1 + 4 * 2, 8, 3, 13, (((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[8], 1, 0x10, 1 + 4 * 3, 8, 3, 13, ((((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); + Window_Add(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1)); + Window_Add(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[1], 1, 6, 1 + 4 * 0, 8, 3, 13, (((18 + 12) + 1) + (27 * 4))); + Window_Add(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[2], 1, 6, 1 + 4 * 1, 8, 3, 13, ((((18 + 12) + 1) + (27 * 4)) + (8 * 3))); + Window_Add(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[3], 1, 6, 1 + 4 * 2, 8, 3, 13, (((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3))); + Window_Add(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[4], 1, 6, 1 + 4 * 3, 8, 3, 13, ((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3))); + Window_Add(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[5], 1, 0x10, 1 + 4 * 0, 8, 3, 13, (((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); + Window_Add(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[6], 1, 0x10, 1 + 4 * 1, 8, 3, 13, ((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); + Window_Add(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[7], 1, 0x10, 1 + 4 * 2, 8, 3, 13, (((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); + Window_Add(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[8], 1, 0x10, 1 + 4 * 3, 8, 3, 13, ((((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); } static void ov17_0224FDDC(void) diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 6cef5ab9ee..ff9edcd886 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -252,7 +252,7 @@ static void ov17_022508E4(UnkStruct_ov17_0224FCA0 *param0, MessageLoader *param1 ov17_022507F0(param0, param3, param4); StringTemplate_Format(param0->unk_10.unk_B8, param0->unk_10.unk_BC, v0); - BGL_FillWindow(¶m0->unk_10.unk_24[0], 0xff); + Window_FillTilemap(¶m0->unk_10.unk_24[0], 0xff); param0->unk_10.unk_388 = Text_AddPrinterWithParams(¶m0->unk_10.unk_24[0], FONT_MESSAGE, param0->unk_10.unk_BC, 0, 0, v1, NULL); @@ -285,7 +285,7 @@ void ov17_022509AC(UnkStruct_ov17_0224FCA0 *param0) sub_020070E8(v1, 23, param0->unk_10.unk_20, 3, 0, 0, 1, 24); sub_0200710C(v1, 22, param0->unk_10.unk_20, 3, 0, 0, 1, 24); - sub_02019EBC(param0->unk_10.unk_20, 1); + Bg_ClearTilemap(param0->unk_10.unk_20, 1); PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 35, 24, 0, 0, 0); PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 36, 24, 0, 0x20, 13 * 16); @@ -293,7 +293,7 @@ void ov17_022509AC(UnkStruct_ov17_0224FCA0 *param0) sub_0200DD0C(param0->unk_10.unk_20, 1, 1, 15, v0, 24); PaletteSys_LoadPalette(param0->unk_10.unk_C0, 38, sub_0200DD08(v0), 24, 0, 0x20, 14 * 16); - sub_02019EBC(param0->unk_10.unk_20, 2); + Bg_ClearTilemap(param0->unk_10.unk_20, 2); NARC_dtor(v1); } @@ -324,7 +324,7 @@ void ov17_02250B00(UnkStruct_ov17_0224FCA0 *param0) sub_020070E8(v1, 27, param0->unk_10.unk_20, 3, 0, 0, 1, 24); sub_0200710C(v1, 25, param0->unk_10.unk_20, 3, 0, 0, 1, 24); sub_0200710C(v1, 26, param0->unk_10.unk_20, 2, 0, 0, 1, 24); - sub_02019EBC(param0->unk_10.unk_20, 1); + Bg_ClearTilemap(param0->unk_10.unk_20, 1); PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 39, 24, 0, 0, 0); PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 36, 24, 0, 0x20, 13 * 16); @@ -342,8 +342,8 @@ void ov17_02250B00(UnkStruct_ov17_0224FCA0 *param0) for (v3 = 0; v3 < 4; v3++) { v4 = param0->unk_39A.unk_30[v3]; Pokemon_GetValue(param0->unk_10.unk_00->unk_00[v4], MON_DATA_NICKNAME_STRBUF, v2); - BGL_FillWindow(¶m0->unk_10.unk_24[1 + v3], 0x0); - BGL_FillWindow(¶m0->unk_10.unk_24[5 + v3], 0x0); + Window_FillTilemap(¶m0->unk_10.unk_24[1 + v3], 0x0); + Window_FillTilemap(¶m0->unk_10.unk_24[5 + v3], 0x0); Text_AddPrinterWithParamsAndColor(¶m0->unk_10.unk_24[1 + v3], FONT_SYSTEM, v2, 0, 3, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); Text_AddPrinterWithParamsAndColor(¶m0->unk_10.unk_24[5 + v3], FONT_SYSTEM, param0->unk_00->unk_00.unk_D8[v4], 0, 3, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); } diff --git a/src/overlay017/ov17_02251D6C.c b/src/overlay017/ov17_02251D6C.c index 5585087970..b07062c9b4 100644 --- a/src/overlay017/ov17_02251D6C.c +++ b/src/overlay017/ov17_02251D6C.c @@ -208,7 +208,7 @@ static void ov17_02251EAC(SysTask *param0, void *param1) u16 *v1, *v2; int v3, v4, v5, v6, v7; - v1 = sub_02019FE4(v0->unk_00->unk_10.unk_20, 2); + v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_10.unk_20, 2); for (v4 = 0; v4 < 4; v4++) { if (Unk_ov17_02254CF8[v0->unk_11] + v4 < 0) { @@ -239,7 +239,7 @@ static void ov17_02251EAC(SysTask *param0, void *param1) } } - sub_0201C3C0(v0->unk_00->unk_10.unk_20, 2); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_10.unk_20, 2); } v0->unk_12++; @@ -309,7 +309,7 @@ static void ov17_02252060(SysTask *param0, void *param1) int v3, v4, v5, v6, v7; int v8; - v1 = sub_02019FE4(v0->unk_00->unk_10.unk_20, 2); + v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_10.unk_20, 2); for (v4 = 0; v4 < 4; v4++) { v8 = Unk_ov17_02254CF8[NELEMS(Unk_ov17_02254CF8) - 1 - v0->unk_11]; @@ -345,7 +345,7 @@ static void ov17_02252060(SysTask *param0, void *param1) } } - sub_0201C3C0(v0->unk_00->unk_10.unk_20, 2); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_10.unk_20, 2); } v0->unk_12++; @@ -426,7 +426,7 @@ static void ov17_0225228C(SysTask *param0, void *param1) if (v0->unk_1A != 0) { if (v0->unk_1D == 0) { sub_0200E060(&v0->unk_00->unk_10.unk_24[0], 1, 1, 14); - sub_0201C3C0(v0->unk_00->unk_10.unk_20, 1); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_10.unk_20, 1); } ov17_02250968(v0->unk_00, v0->unk_1A, &v0->unk_14); @@ -447,7 +447,7 @@ static void ov17_0225228C(SysTask *param0, void *param1) v0->unk_10++; } else if (v0->unk_12 >= v0->unk_1B) { sub_0200E084(&v0->unk_00->unk_10.unk_24[0], 1); - sub_0201C3C0(v0->unk_00->unk_10.unk_20, 1); + Bg_ScheduleTilemapTransfer(v0->unk_00->unk_10.unk_20, 1); v0->unk_10++; } break; @@ -520,8 +520,8 @@ static void ov17_022523AC(SysTask *param0, void *param1) sub_0200E060(&v0->unk_00->unk_10.unk_24[0], 0, 1, 14); - BGL_FillWindow(&v0->unk_00->unk_10.unk_24[0], 0xff); - sub_0201A954(&v0->unk_00->unk_10.unk_24[0]); + Window_FillTilemap(&v0->unk_00->unk_10.unk_24[0], 0xff); + Window_CopyToVRAM(&v0->unk_00->unk_10.unk_24[0]); { int v1; diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index 06a2ad122e..2e59916e02 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -156,7 +156,7 @@ BOOL ov19_021D61B0(UnkStruct_ov19_021D61B0 **param0, const UnkStruct_ov19_021D4D if (v0 != NULL) { v0->unk_1C4 = param1; - v0->unk_1C0 = sub_02018340(10); + v0->unk_1C0 = BgConfig_New(10); if (v0->unk_1C0 != NULL) { u32 v1; @@ -253,10 +253,10 @@ void ov19_021D64A0(UnkStruct_ov19_021D61B0 *param0) ov19_021DA384(&(param0->unk_1C8)); CellActorCollection_Delete(param0->unk_18); - sub_02019044(param0->unk_1C0, 3); - sub_02019044(param0->unk_1C0, 2); - sub_02019044(param0->unk_1C0, 1); - sub_02019044(param0->unk_1C0, 4); + Bg_FreeTilemapBuffer(param0->unk_1C0, 3); + Bg_FreeTilemapBuffer(param0->unk_1C0, 2); + Bg_FreeTilemapBuffer(param0->unk_1C0, 1); + Bg_FreeTilemapBuffer(param0->unk_1C0, 4); sub_02007B6C(param0->unk_1BC); Font_UseLazyGlyphAccess(FONT_SYSTEM); Heap_FreeToHeap(param0->unk_1C0); @@ -1774,21 +1774,21 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); GX_SetGraphicsMode(GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D); - sub_02018368(&v1); - sub_020183C4(param0->unk_1C0, 1, &v3, 0); - sub_020183C4(param0->unk_1C0, 2, &v4, 0); - sub_020183C4(param0->unk_1C0, 3, &v5, 0); + SetAllGraphicsModes(&v1); + Bg_InitFromTemplate(param0->unk_1C0, 1, &v3, 0); + Bg_InitFromTemplate(param0->unk_1C0, 2, &v4, 0); + Bg_InitFromTemplate(param0->unk_1C0, 3, &v5, 0); if (ov19_021D5E08(param1) != 4) { - sub_020183C4(param0->unk_1C0, 4, &v6, 0); - sub_020183C4(param0->unk_1C0, 5, &v7, 0); - sub_020183C4(param0->unk_1C0, 6, &v8, 0); - sub_020183C4(param0->unk_1C0, 7, &v9, 0); + Bg_InitFromTemplate(param0->unk_1C0, 4, &v6, 0); + Bg_InitFromTemplate(param0->unk_1C0, 5, &v7, 0); + Bg_InitFromTemplate(param0->unk_1C0, 6, &v8, 0); + Bg_InitFromTemplate(param0->unk_1C0, 7, &v9, 0); } else { - sub_020183C4(param0->unk_1C0, 4, &v6, 0); - sub_020183C4(param0->unk_1C0, 5, &v10, 0); - sub_020183C4(param0->unk_1C0, 6, &v11, 0); - sub_020183C4(param0->unk_1C0, 7, &v9, 0); + Bg_InitFromTemplate(param0->unk_1C0, 4, &v6, 0); + Bg_InitFromTemplate(param0->unk_1C0, 5, &v10, 0); + Bg_InitFromTemplate(param0->unk_1C0, 6, &v11, 0); + Bg_InitFromTemplate(param0->unk_1C0, 7, &v9, 0); } ov19_021D76FC(); @@ -1797,8 +1797,8 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_ static void ov19_021D75CC(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_021D4DF0 *param1, NARC *param2) { sub_020070E8(param2, 4, param0->unk_1C0, 1, 0, 0, 1, 10); - sub_02019CB8(param0->unk_1C0, 1, 0x0, 0, 0, 32, 32, 17); - sub_02019448(param0->unk_1C0, 1); + Bg_FillTilemapRect(param0->unk_1C0, 1, 0x0, 0, 0, 32, 32, 17); + Bg_CopyTilemapBufferToVRAM(param0->unk_1C0, 1); sub_020070E8(param2, 1, param0->unk_1C0, 2, 0, 0, 1, 10); sub_02007130(param2, 5, 0, 0, 0x20 * 7, 10); diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c index 96444e7665..c23ccc6353 100644 --- a/src/overlay019/ov19_021D79F8.c +++ b/src/overlay019/ov19_021D79F8.c @@ -132,12 +132,12 @@ void ov19_021D7A74(UnkStruct_ov19_021D8318 *param0) void ov19_021D7A9C(UnkStruct_ov19_021D8318 *param0) { - param0->unk_0C = sub_020192EC(param0->unk_58F4, 3); + param0->unk_0C = Bg_GetXOffset(param0->unk_58F4, 3); param0->unk_0C -= param0->unk_585C; param0->unk_0C &= (REG_G2_BG3HOFS_OFFSET_MASK); - sub_02019184(param0->unk_58F4, 3, 0, param0->unk_0C); - sub_02019CB8(param0->unk_58F4, 3, 0x18, 0, 0, 64, 32, 9); + Bg_SetOffset(param0->unk_58F4, 3, 0, param0->unk_0C); + Bg_FillTilemapRect(param0->unk_58F4, 3, 0x18, 0, 0, 64, 32, 9); } static void ov19_021D7AF4(const UnkStruct_ov19_021D8318 *param0, int param1, u32 *param2, u32 *param3, u32 *param4) @@ -208,7 +208,7 @@ static void ov19_021D7C58(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_ if (NNS_G2dGetUnpackedBGCharacterData(v0, &v1)) { Window *v2; - v2 = sub_0201A778(10, 1); + v2 = Window_New(10, 1); if (v2) { u32 v3, v4; @@ -225,7 +225,7 @@ static void ov19_021D7C58(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_ Heap_FreeToHeap(v2); } - sub_0201958C(param0->unk_58F4, 3, v1->pRawData, v1->szByte, param2); + Bg_LoadTiles(param0->unk_58F4, 3, v1->pRawData, v1->szByte, param2); } Heap_FreeToHeap(v0); @@ -243,20 +243,20 @@ static void ov19_021D7D00(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_ NNSG2dScreenData *v2; NNS_G2dGetUnpackedScreenData(v0, &v2); - v1 = sub_02019FE4(param0->unk_58F4, 3); + v1 = Bg_GetTilemapBuffer(param0->unk_58F4, 3); if (v1) { ov19_021D8764(v1, (const u16 *)(v2->rawData), param2, param3, param4); } Heap_FreeToHeap(v0); - sub_02019460(param0->unk_58F4, 3, v1, 0x1000, 0); + Bg_CopyTilemapBufferRangeToVRAM(param0->unk_58F4, 3, v1, 0x1000, 0); } } void ov19_021D7D70(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2) { - param0->unk_08 = (sub_020192EC(param0->unk_58F4, 3) & (REG_G2_BG3HOFS_OFFSET_MASK)) << FX32_SHIFT; + param0->unk_08 = (Bg_GetXOffset(param0->unk_58F4, 3) & (REG_G2_BG3HOFS_OFFSET_MASK)) << FX32_SHIFT; param0->unk_14 = param0->unk_08 + ((((21 + 2) * 8) * param2) << FX32_SHIFT); param0->unk_10 = (param0->unk_14 - param0->unk_08) / (15 * 2); param0->unk_14 >>= FX32_SHIFT; @@ -322,11 +322,11 @@ static void ov19_021D7E6C(SysTask *param0, void *param1) v0->unk_98++; v0->unk_0C = (v0->unk_08 >> FX32_SHIFT) & (REG_G2_BG3HOFS_OFFSET_MASK); v0->unk_08 += v0->unk_10; - sub_02019184(v0->unk_58F4, 3, 0, v0->unk_0C); + Bg_SetOffset(v0->unk_58F4, 3, 0, v0->unk_0C); v0->unk_04--; } } else { - sub_02019184(v0->unk_58F4, 3, 0, v0->unk_14); + Bg_SetOffset(v0->unk_58F4, 3, 0, v0->unk_14); ov19_021D870C(v0, v0->unk_A8[v2]); SysTask_Done(param0); } diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index a5a04d3fd1..f236f3d2e4 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -41,7 +41,7 @@ u32 sub_0207C924(void); u32 sub_0207C928(void); u8 sub_0207C92C(int param0); u32 sub_0207C944(void); -void sub_0201AA10(Window *param0, u32 param1, u32 param2); +void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2); static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0); static void ov19_021DAC4C(UnkStruct_ov19_021DA9E0 *param0); static void ov19_021DAC90(UnkStruct_ov19_021DA9E0 *param0); @@ -99,7 +99,7 @@ void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 *param0) if (param0->unk_04) { for (v0 = 0; v0 < 4; v0++) { - BGL_DeleteWindow(¶m0->unk_04[v0]); + Window_Remove(¶m0->unk_04[v0]); } Heap_FreeToHeap(param0->unk_04); @@ -187,22 +187,22 @@ void ov19_021DAADC(UnkStruct_ov19_021DA9E0 *param0) return; } - param0->unk_04 = sub_0201A778(10, 4); + param0->unk_04 = Window_New(10, 4); if (param0->unk_04) { int v1; for (v1 = 0; v1 < 4; v1++) { - sub_0201A8D4(param0->unk_08, ¶m0->unk_04[v1], &v0[v1]); + Window_AddFromTemplate(param0->unk_08, ¶m0->unk_04[v1], &v0[v1]); if (v1 != 3) { - sub_0201A9F4(¶m0->unk_04[v1]); + Window_PutToTilemap(¶m0->unk_04[v1]); } else { - sub_0201AA10(¶m0->unk_04[v1], 12, 2); + Window_PutRectToTilemap(¶m0->unk_04[v1], 12, 2); } } - sub_02019448(param0->unk_08, 2); + Bg_CopyTilemapBufferToVRAM(param0->unk_08, 2); } ov19_021DAB44(param0); @@ -303,7 +303,7 @@ static void ov19_021DACF8(SysTask *param0, void *param1) v0->unk_00 = 1; case 1: ov19_021DAE60(&v1->unk_04[3], v1, v0->unk_02, 0); - sub_0201ACCC(&v1->unk_04[3]); + Window_LoadTiles(&v1->unk_04[3]); v0->unk_04 = 0; v0->unk_00 = 2; break; @@ -321,8 +321,8 @@ static void ov19_021DACF8(SysTask *param0, void *param1) v0->unk_06 += 4; ov19_021DADCC(v1, 4 << FX32_SHIFT); - sub_0201C04C(&v1->unk_04[3], 0, 4, 0x0); - sub_0201ACCC(&v1->unk_04[3]); + Window_Scroll(&v1->unk_04[3], 0, 4, 0x0); + Window_LoadTiles(&v1->unk_04[3]); if (v0->unk_06 >= 16) { if (v0->unk_02 == 1) { @@ -379,7 +379,7 @@ static void ov19_021DAE2C(UnkStruct_ov19_021DAE2C *param0) v1 = &(param0->unk_08->unk_04[3]); - BGL_FillWindow(v1, 0); + Window_FillTilemap(v1, 0); ov19_021DAE60(v1, param0->unk_08, param0->unk_02, 0); v0 = param0->unk_02 + 1; @@ -451,19 +451,19 @@ void ov19_021DAF98(UnkStruct_ov19_021DA9E0 *param0) return; } - BGL_FillWindow(¶m0->unk_04[0], 15); - BGL_FillWindow(¶m0->unk_04[1], 15); - BGL_FillWindow(¶m0->unk_04[2], 15); - BGL_FillWindow(¶m0->unk_04[3], 0); + Window_FillTilemap(¶m0->unk_04[0], 15); + Window_FillTilemap(¶m0->unk_04[1], 15); + Window_FillTilemap(¶m0->unk_04[2], 15); + Window_FillTilemap(¶m0->unk_04[3], 0); if (ov19_021D5E4C(param0->unk_10)) { ov19_021DB0E4(param0); } - sub_0201ACCC(¶m0->unk_04[0]); - sub_0201ACCC(¶m0->unk_04[1]); - sub_0201ACCC(¶m0->unk_04[2]); - sub_0201ACCC(¶m0->unk_04[3]); + Window_LoadTiles(¶m0->unk_04[0]); + Window_LoadTiles(¶m0->unk_04[1]); + Window_LoadTiles(¶m0->unk_04[2]); + Window_LoadTiles(¶m0->unk_04[3]); } void ov19_021DAFF8(UnkStruct_ov19_021DA9E0 *param0) @@ -472,10 +472,10 @@ void ov19_021DAFF8(UnkStruct_ov19_021DA9E0 *param0) return; } - BGL_FillWindow(¶m0->unk_04[0], 15); - BGL_FillWindow(¶m0->unk_04[1], 15); - BGL_FillWindow(¶m0->unk_04[2], 15); - BGL_FillWindow(¶m0->unk_04[3], 0); + Window_FillTilemap(¶m0->unk_04[0], 15); + Window_FillTilemap(¶m0->unk_04[1], 15); + Window_FillTilemap(¶m0->unk_04[2], 15); + Window_FillTilemap(¶m0->unk_04[3], 0); if (param0->unk_24) { sub_02007DC8(param0->unk_24); @@ -488,10 +488,10 @@ void ov19_021DAFF8(UnkStruct_ov19_021DA9E0 *param0) ov19_021DB24C(param0, 0); } - sub_0201ACCC(¶m0->unk_04[0]); - sub_0201ACCC(¶m0->unk_04[1]); - sub_0201ACCC(¶m0->unk_04[2]); - sub_0201ACCC(¶m0->unk_04[3]); + Window_LoadTiles(¶m0->unk_04[0]); + Window_LoadTiles(¶m0->unk_04[1]); + Window_LoadTiles(¶m0->unk_04[2]); + Window_LoadTiles(¶m0->unk_04[3]); ov19_021DACB0(param0); } @@ -502,10 +502,10 @@ void ov19_021DB078(UnkStruct_ov19_021DA9E0 *param0) return; } - BGL_FillWindow(¶m0->unk_04[0], 15); - BGL_FillWindow(¶m0->unk_04[1], 15); - BGL_FillWindow(¶m0->unk_04[2], 15); - BGL_FillWindow(¶m0->unk_04[3], 0); + Window_FillTilemap(¶m0->unk_04[0], 15); + Window_FillTilemap(¶m0->unk_04[1], 15); + Window_FillTilemap(¶m0->unk_04[2], 15); + Window_FillTilemap(¶m0->unk_04[3], 0); if (param0->unk_24) { sub_02007DC8(param0->unk_24); @@ -514,10 +514,10 @@ void ov19_021DB078(UnkStruct_ov19_021DA9E0 *param0) ov19_021DB24C(param0, 0); - sub_0201ACCC(¶m0->unk_04[0]); - sub_0201ACCC(¶m0->unk_04[1]); - sub_0201ACCC(¶m0->unk_04[2]); - sub_0201ACCC(¶m0->unk_04[3]); + Window_LoadTiles(¶m0->unk_04[0]); + Window_LoadTiles(¶m0->unk_04[1]); + Window_LoadTiles(¶m0->unk_04[2]); + Window_LoadTiles(¶m0->unk_04[3]); ov19_021DACDC(param0); } @@ -587,7 +587,7 @@ static void ov19_021DB24C(UnkStruct_ov19_021DA9E0 *param0, u8 param1) int v2; v1 = (19 * 32) + 4; - v0 = sub_02019FE4(param0->unk_08, 2); + v0 = Bg_GetTilemapBuffer(param0->unk_08, 2); v0 += v1; for (v2 = 0; v2 < 6; v2++) { @@ -598,7 +598,7 @@ static void ov19_021DB24C(UnkStruct_ov19_021DA9E0 *param0, u8 param1) } } - sub_02019460(param0->unk_08, 2, v0, 6 * sizeof(u16), v1); + Bg_CopyTilemapBufferRangeToVRAM(param0->unk_08, 2, v0, 6 * sizeof(u16), v1); } void ov19_021DB2B0(UnkStruct_ov19_021DA9E0 *param0) @@ -610,7 +610,7 @@ void ov19_021DB2B0(UnkStruct_ov19_021DA9E0 *param0) } v0 = ov19_021D5E70(param0->unk_10); - BGL_FillWindow(¶m0->unk_04[3], 0); + Window_FillTilemap(¶m0->unk_04[3], 0); if (v0->unk_0F == 0) { Text_AddPrinterWithParamsAndColor(¶m0->unk_04[3], FONT_SYSTEM, v0->unk_1C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(9, 6, 0), NULL); diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c index 03f7602a1a..de5354360a 100644 --- a/src/overlay019/ov19_021DB2FC.c +++ b/src/overlay019/ov19_021DB2FC.c @@ -58,7 +58,7 @@ void ov19_021DB370(UnkStruct_ov19_021DB6F0 *param0) int v0; for (v0 = 0; v0 < 2; v0++) { - BGL_DeleteWindow(&(param0->unk_18[v0])); + Window_Remove(&(param0->unk_18[v0])); } if (param0->unk_24) { @@ -89,13 +89,13 @@ void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 *param0) { 1, 19, 3, 12, 16, 4, 593 } }; - param0->unk_18 = sub_0201A778(10, 2); + param0->unk_18 = Window_New(10, 2); if (param0->unk_18) { int v1; for (v1 = 0; v1 < 2; v1++) { - sub_0201A8D4(param0->unk_00, ¶m0->unk_18[v1], &v0[v1]); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_18[v1], &v0[v1]); } } @@ -106,14 +106,14 @@ void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 *param0) void ov19_021DB448(UnkStruct_ov19_021DB6F0 *param0, u32 param1) { - sub_0201A9F4(¶m0->unk_18[0]); + Window_PutToTilemap(¶m0->unk_18[0]); ov19_021DB4B4(param0->unk_00, param0->unk_18[0].bgLayer, param0->unk_18[0].tilemapLeft, param0->unk_18[0].tilemapTop, param0->unk_18[0].width, param0->unk_18[0].height); - BGL_FillWindow(¶m0->unk_18[0], 15); + Window_FillTilemap(¶m0->unk_18[0], 15); MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_30); StringTemplate_Format(param0->unk_2C, param0->unk_34, param0->unk_30); Text_AddPrinterWithParams(&(param0->unk_18[0]), FONT_MESSAGE, param0->unk_34, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201ACCC(&(param0->unk_18[0])); - sub_02019448(param0->unk_00, 1); + Window_LoadTiles(&(param0->unk_18[0])); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 1); param0->unk_1C = 1; } @@ -123,7 +123,7 @@ static void ov19_021DB4B4(BgConfig *param0, u32 param1, u32 param2, u32 param3, u16 *v0; u32 v1, v2; - v0 = sub_02019FE4(param0, param1); + v0 = Bg_GetTilemapBuffer(param0, param1); v0 += (((param3 - 1) * 32) + (param2 - 2)); v0[0] = (8 << 12) | 521; @@ -170,7 +170,7 @@ void ov19_021DB57C(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF96 } v0 = &(param0->unk_18[1]); - BGL_FillWindow(v0, 15); + Window_FillTilemap(v0, 15); v1 = (8 - param1->unk_21) * 16; for (v2 = 0; v2 < param1->unk_21; v2++) { @@ -187,15 +187,15 @@ void ov19_021DB57C(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF96 ov19_021DB748(param0, param1); ov19_021DB684(param0, param1->unk_21); - sub_0201ACCC(v0); - sub_02019448(param0->unk_00, 1); + Window_LoadTiles(v0); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 1); param0->unk_1E = 1; } static void ov19_021DB638(UnkStruct_ov19_021DB6F0 *param0, Window *param1, u8 param2, u32 param3) { - sub_0201AE08(param1, param0->unk_28->pRawData, param3 * 8, ((param2 & (1 << param3)) ? 0 : 8), 48, 16, 44, param3 * 16 + 4, 8, 8, 0xff); + Window_BlitBitmapRectWithTransparency(param1, param0->unk_28->pRawData, param3 * 8, ((param2 & (1 << param3)) ? 0 : 8), 48, 16, 44, param3 * 16 + 4, 8, 8, 0xff); } static void ov19_021DB684(UnkStruct_ov19_021DB6F0 *param0, u32 param1) @@ -203,7 +203,7 @@ static void ov19_021DB684(UnkStruct_ov19_021DB6F0 *param0, u32 param1) u16 *v0; u32 v1, v2, v3, v4; - v0 = sub_02019FE4(param0->unk_00, 1); + v0 = Bg_GetTilemapBuffer(param0->unk_00, 1); v0 += (3 * 32 + 19); v3 = 593; v4 = 8 - param1; @@ -234,7 +234,7 @@ void ov19_021DB6F0(UnkStruct_ov19_021DB6F0 *param0) param0->unk_1E = 0; } - sub_02019448(param0->unk_00, 1); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 1); } void ov19_021DB724(UnkStruct_ov19_021DB6F0 *param0) @@ -244,7 +244,7 @@ void ov19_021DB724(UnkStruct_ov19_021DB6F0 *param0) param0->unk_1E = 0; } - sub_02019448(param0->unk_00, 1); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 1); } void ov19_021DB748(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF964 *param1) @@ -255,9 +255,9 @@ void ov19_021DB748(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF96 v0 = &(param0->unk_18[1]); v1 = (8 - param1->unk_21) * 16; - BGL_WindowColor(v0, 15, 0, v1, 10, param1->unk_21 * 16); + Window_FillRectWithColor(v0, 15, 0, v1, 10, param1->unk_21 * 16); sub_02002180(v0, 0, v1 + (param1->unk_20 * 16)); - sub_0201ACCC(v0); + Window_LoadTiles(v0); } void ov19_021DB790(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF964 *param1) @@ -271,7 +271,7 @@ void ov19_021DB790(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF96 ov19_021DB638(param0, v0, param1->unk_22, v1); } - sub_0201ACCC(v0); + Window_LoadTiles(v0); } static void ov19_021DB7BC(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) @@ -279,7 +279,7 @@ static void ov19_021DB7BC(BgConfig *param0, u32 param1, u32 param2, u32 param3, u16 *v0; u32 v1; - v0 = sub_02019FE4(param0, param1); + v0 = Bg_GetTilemapBuffer(param0, param1); v0 += (((param3 - 1) * 32) + (param2 - 1)); *v0 = (7 << 12) | 512; @@ -310,7 +310,7 @@ static void ov19_021DB84C(BgConfig *param0, Window *param1) u16 *v0; u32 v1, v2, v3, v4; - v0 = sub_02019FE4(param0, param1->bgLayer); + v0 = Bg_GetTilemapBuffer(param0, param1->bgLayer); v0 += (((param1->tilemapTop - 1) * 32) + (param1->tilemapLeft - 1)); for (v2 = 0; v2 < (param1->height + 2); v2++) { @@ -327,7 +327,7 @@ static void ov19_021DB898(BgConfig *param0, Window *param1) u16 *v0; u32 v1, v2, v3, v4; - v0 = sub_02019FE4(param0, param1->bgLayer); + v0 = Bg_GetTilemapBuffer(param0, param1->bgLayer); v0 += (((param1->tilemapTop - 1) * 32) + (param1->tilemapLeft - 2)); for (v2 = 0; v2 < (param1->height + 2); v2++) { diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index 02932b4cea..b47278d070 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -140,13 +140,13 @@ void ov19_021DBA9C(UnkStruct_ov19_021DBA9C *param0) { 1, 5, 25, 27, 6, 2, 178 } }; - param0->unk_10 = sub_0201A778(10, NELEMS(v0)); + param0->unk_10 = Window_New(10, NELEMS(v0)); if (param0->unk_10) { int v1; for (v1 = 0; v1 < NELEMS(v0); v1++) { - sub_0201A8D4(param0->unk_04, ¶m0->unk_10[v1], &v0[v1]); + Window_AddFromTemplate(param0->unk_04, ¶m0->unk_10[v1], &v0[v1]); } } } @@ -185,7 +185,7 @@ void ov19_021DBAD0(UnkStruct_ov19_021DBA9C *param0) int v0; for (v0 = 0; v0 < 3; v0++) { - BGL_DeleteWindow(&(param0->unk_10[v0])); + Window_Remove(&(param0->unk_10[v0])); } Heap_FreeToHeap(param0->unk_10); @@ -239,7 +239,7 @@ void ov19_021DBBA8(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2, NNS_ } v6 = 13 * 0x10 + v8; - sub_0201A6D0(&(param0->unk_3C), 9, 10, 14, 12, v6); + Bitmap_FillRect8bpp(&(param0->unk_3C), 9, 10, 14, 12, v6); for (v3 = 0, v4 = 0; v3 < 5; v3++) { for (v2 = 0; v2 < 6; v2++) { @@ -273,7 +273,7 @@ void ov19_021DBBA8(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2, NNS_ v6 = 14 * 0x10 + v10[v6]; } - sub_0201A6D0(&(param0->unk_3C), 10 + v2 * 2, 11 + v3 * 2, 2, 2, v6); + Bitmap_FillRect8bpp(&(param0->unk_3C), 10 + v2 * 2, 11 + v3 * 2, 2, 2, v6); } BoxPokemon_ExitDecryptionContext(v1, v7); @@ -431,17 +431,17 @@ static void ov19_021DBF4C(UnkStruct_ov19_021DBA9C *param0) v2 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_4BFC, 0); v3 = 48 - (v2 / 2); - BGL_FillWindow(v1, 7); + Window_FillTilemap(v1, 7); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param0->unk_4BFC, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 8, 7), NULL); - sub_0201ACCC(v1); + Window_LoadTiles(v1); } static void ov19_021DBFB0(UnkStruct_ov19_021DBA9C *param0) { Window *v0 = ¶m0->unk_10[0]; - BGL_FillWindow(v0, 7); - sub_0201ACCC(v0); + Window_FillTilemap(v0, 7); + Window_LoadTiles(v0); } static void ov19_021DBFC4(UnkStruct_ov19_021DBA9C *param0) @@ -450,7 +450,7 @@ static void ov19_021DBFC4(UnkStruct_ov19_021DBA9C *param0) Window *v2; v2 = ¶m0->unk_10[1]; - BGL_FillWindow(v2, 4); + Window_FillTilemap(v2, 4); v0 = ov19_021DBD40(param0); for (v1 = 0; v1 < 7; v1++) { @@ -461,15 +461,15 @@ static void ov19_021DBFC4(UnkStruct_ov19_021DBA9C *param0) } } - sub_0201ACCC(v2); + Window_LoadTiles(v2); } static void ov19_021DC01C(UnkStruct_ov19_021DBA9C *param0) { Window *v0 = ¶m0->unk_10[1]; - BGL_FillWindow(v0, 4); - sub_0201ACCC(v0); + Window_FillTilemap(v0, 4); + Window_LoadTiles(v0); } static void ov19_021DC034(UnkStruct_ov19_021DBA9C *param0, int param1) @@ -520,14 +520,14 @@ static void ov19_021DC0A0(SysTask *param0, void *param1) if ((v0->unk_05 * 2) < 10) { u32 v2 = 5 + (10 / 2); - sub_020198C0(v1->unk_04, 1, v1->unk_30->rawData, 0, v2 - v0->unk_05, 32, v0->unk_05); - sub_020198E8(v1->unk_04, 1, 0, v2, 32, v0->unk_05, v1->unk_30->rawData, 0, 10 - v0->unk_05, 32, 10); + Bg_LoadToTilemapRect(v1->unk_04, 1, v1->unk_30->rawData, 0, v2 - v0->unk_05, 32, v0->unk_05); + Bg_CopyToTilemapRect(v1->unk_04, 1, 0, v2, 32, v0->unk_05, v1->unk_30->rawData, 0, 10 - v0->unk_05, 32, 10); } else { - sub_020198C0(v1->unk_04, 1, v1->unk_30->rawData, 0, 5, 32, 10); + Bg_LoadToTilemapRect(v1->unk_04, 1, v1->unk_30->rawData, 0, 5, 32, 10); v0->unk_04++; } - sub_02019448(v1->unk_04, 1); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 1); v0->unk_05 = 8 - 1; break; case 1: @@ -543,11 +543,11 @@ static void ov19_021DC0A0(SysTask *param0, void *param1) GX_LoadOBJPltt(v1->unk_E4[v0->unk_05], 13 * 0x20, 96); if (v0->unk_05 == 0) { - sub_0201A9F4(&v1->unk_10[0]); - sub_0201A9F4(&v1->unk_10[1]); + Window_PutToTilemap(&v1->unk_10[0]); + Window_PutToTilemap(&v1->unk_10[1]); ov19_021DBF4C(v1); ov19_021DBFC4(v1); - sub_02019448(v1->unk_04, 1); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 1); v0->unk_04++; } break; @@ -570,19 +570,19 @@ static void ov19_021DC1CC(SysTask *param0, void *param1) v0->unk_04++; break; case 1: - sub_02019CB8(v1->unk_04, 1, 0x0, 0, 5, 32, 10, 17); + Bg_FillTilemapRect(v1->unk_04, 1, 0x0, 0, 5, 32, 10, 17); v0->unk_05 += 1; if ((v0->unk_05 * 2) < 10) { u32 v2 = 5 + (10 / 2); - sub_020198C0(v1->unk_04, 1, v1->unk_30->rawData, 0, 5 + v0->unk_05, 32, (10 / 2) - v0->unk_05); - sub_020198E8(v1->unk_04, 1, 0, v2, 32, (10 / 2) - v0->unk_05, v1->unk_30->rawData, 0, 10 - v0->unk_05, 32, 10); + Bg_LoadToTilemapRect(v1->unk_04, 1, v1->unk_30->rawData, 0, 5 + v0->unk_05, 32, (10 / 2) - v0->unk_05); + Bg_CopyToTilemapRect(v1->unk_04, 1, 0, v2, 32, (10 / 2) - v0->unk_05, v1->unk_30->rawData, 0, 10 - v0->unk_05, 32, 10); } else { v0->unk_04++; } - sub_02019448(v1->unk_04, 1); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 1); break; case 2: ov19_021DC074(param0, v0); @@ -596,12 +596,12 @@ void ov19_021DC29C(UnkStruct_ov19_021DBA9C *param0) if (v0) { u32 v1 = ov19_021D5F88(param0->unk_0C); - sub_02019184(param0->unk_04, 1, 3, 0); - sub_020198C0(param0->unk_04, 1, param0->unk_38->rawData, 0, 24, 32, 7); - BGL_FillWindow(¶m0->unk_10[2], 4); + Bg_SetOffset(param0->unk_04, 1, 3, 0); + Bg_LoadToTilemapRect(param0->unk_04, 1, param0->unk_38->rawData, 0, 24, 32, 7); + Window_FillTilemap(¶m0->unk_10[2], 4); MessageLoader_GetStrbuf(param0->unk_4BF8, v1, param0->unk_4BFC); Text_AddPrinterWithParamsAndColor(¶m0->unk_10[2], FONT_SYSTEM, param0->unk_4BFC, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 1, 4), NULL); - sub_0201A954(¶m0->unk_10[2]); + Window_CopyToVRAM(¶m0->unk_10[2]); ov19_021DC4F8(param0, v1); @@ -640,10 +640,10 @@ static void ov19_021DC37C(SysTask *param0, void *param1) if (v0->unk_14) { v0->unk_14--; v0->unk_08 += v0->unk_10; - sub_02019184(v0->unk_04, 1, 3, (v0->unk_08 >> FX32_SHIFT)); + Bg_SetOffset(v0->unk_04, 1, 3, (v0->unk_08 >> FX32_SHIFT)); ov19_021DC5B8(v0->unk_00, (224 << FX32_SHIFT) - v0->unk_08); } else { - sub_02019184(v0->unk_04, 1, 3, (v0->unk_0C >> FX32_SHIFT)); + Bg_SetOffset(v0->unk_04, 1, 3, (v0->unk_0C >> FX32_SHIFT)); ov19_021DC5B8(v0->unk_00, (224 << FX32_SHIFT) - v0->unk_0C); ov19_021D79B8(v0, ov19_021DC374, v0->unk_00); SysTask_Done(param0); @@ -671,7 +671,7 @@ void ov19_021DC3F4(UnkStruct_ov19_021DBA9C *param0) BOOL ov19_021DC43C(UnkStruct_ov19_021DBA9C *param0) { if (param0->unk_DC == NULL) { - sub_02019184(param0->unk_04, 1, 3, 0); + Bg_SetOffset(param0->unk_04, 1, 3, 0); ov19_021DC5E0(param0); return 1; } @@ -692,13 +692,13 @@ static void ov19_021DC46C(SysTask *param0, void *param1) if (v0->unk_14) { v0->unk_14--; v0->unk_08 += v0->unk_10; - sub_02019184(v0->unk_04, 1, 3, (v0->unk_08 >> FX32_SHIFT)); + Bg_SetOffset(v0->unk_04, 1, 3, (v0->unk_08 >> FX32_SHIFT)); ov19_021DC5B8(v0->unk_00, (224 << FX32_SHIFT) - v0->unk_08); } else { - sub_02019184(v0->unk_04, 1, 3, (v0->unk_0C >> FX32_SHIFT)); + Bg_SetOffset(v0->unk_04, 1, 3, (v0->unk_0C >> FX32_SHIFT)); ov19_021DC5B8(v0->unk_00, (224 << FX32_SHIFT) - v0->unk_0C); - sub_02019CB8(v0->unk_04, 1, 0x0, 0, 0, 32, 32, 17); - sub_02019448(v0->unk_04, 1); + Bg_FillTilemapRect(v0->unk_04, 1, 0x0, 0, 0, 32, 32, 17); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 1); ov19_021D79B8(v0, ov19_021DC464, v0->unk_00); SysTask_Done(param0); } diff --git a/src/overlay019/ov19_021DC5F0.c b/src/overlay019/ov19_021DC5F0.c index 4eba0324f4..7c263513d2 100644 --- a/src/overlay019/ov19_021DC5F0.c +++ b/src/overlay019/ov19_021DC5F0.c @@ -98,7 +98,7 @@ void ov19_021DC6A0(UnkStruct_ov19_021DC680 *param0) param0->unk_2B = 0; ov19_021DCD64(param0, param0->unk_2B); ov19_021DCEB8(param0, 1); - sub_02019448(param0->unk_04, 2); + Bg_CopyTilemapBufferToVRAM(param0->unk_04, 2); } void ov19_021DC6C8(UnkStruct_ov19_021DC680 *param0) @@ -128,7 +128,7 @@ static void ov19_021DC708(SysTask *param0, void *param1) } ov19_021DCD64(v0, v0->unk_2B); - sub_02019448(v0->unk_04, 2); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 2); ov19_021DCE50(v0, v1); if (v0->unk_2B == 0) { @@ -171,11 +171,11 @@ static void ov19_021DC79C(SysTask *param0, void *param1) v3 = (u32)((v1) >> FX32_SHIFT) / 8; v2 = v0->unk_2B - 2 - v3; - sub_02019CB8(v0->unk_04, 2, 0x0, v0->unk_30, v2, 15, v3, 17); + Bg_FillTilemapRect(v0->unk_04, 2, 0x0, v0->unk_30, v2, 15, v3, 17); } ov19_021DCD64(v0, v0->unk_2B); - sub_02019448(v0->unk_04, 2); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 2); ov19_021DCE50(v0, v1); if (v0->unk_2B == 26) { @@ -458,7 +458,7 @@ static void ov19_021DCD64(UnkStruct_ov19_021DC680 *param0, u32 param1) v2 = 24 - v1; } - sub_020198C0(param0->unk_04, 2, ((u8 *)param0->unk_18->rawData) + v0, param0->unk_30, v2, 15, v1); + Bg_LoadToTilemapRect(param0->unk_04, 2, ((u8 *)param0->unk_18->rawData) + v0, param0->unk_30, v2, 15, v1); } static void ov19_021DCDB4(UnkStruct_ov19_021DC680 *param0, VecFx32 *param1) diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c index 0e2429aa04..409aac84eb 100644 --- a/src/overlay019/ov19_021DCF88.c +++ b/src/overlay019/ov19_021DCF88.c @@ -370,7 +370,7 @@ void ov19_021DD078(UnkStruct_ov19_021DCF88 *param0) if (param0) { int v0; - BGL_DeleteWindow(&(param0->unk_88)); + Window_Remove(&(param0->unk_88)); if (param0->unk_98) { Heap_FreeToHeap(param0->unk_98); @@ -423,13 +423,13 @@ void ov19_021DD114(UnkStruct_ov19_021DCF88 *param0, NARC *param1) sub_0200710C(param1, 124, param0->unk_08, 7, 0, 0, 1, 10); sub_0200710C(param1, 125, param0->unk_08, 6, 0, 0, 1, 10); sub_0200710C(param1, 126, param0->unk_08, 5, 0, 0, 1, 10); - sub_020196C0(param0->unk_08, 4, 0x0, 1, 0); - sub_02019CB8(param0->unk_08, 4, 0x0, 0, 0, 32, 32, 17); - sub_02019448(param0->unk_08, 4); - sub_02019184(param0->unk_08, 5, 0, Unk_ov19_021E0258[param0->unk_10]); - BGL_AddWindow(param0->unk_08, &(param0->unk_88), 4, 0, 0, 32, 24, 2, 0); - BGL_FillWindow(&(param0->unk_88), 0x0); - sub_0201A954(¶m0->unk_88); + Bg_FillTilesRange(param0->unk_08, 4, 0x0, 1, 0); + Bg_FillTilemapRect(param0->unk_08, 4, 0x0, 0, 0, 32, 32, 17); + Bg_CopyTilemapBufferToVRAM(param0->unk_08, 4); + Bg_SetOffset(param0->unk_08, 5, 0, Unk_ov19_021E0258[param0->unk_10]); + Window_Add(param0->unk_08, &(param0->unk_88), 4, 0, 0, 32, 24, 2, 0); + Window_FillTilemap(&(param0->unk_88), 0x0); + Window_CopyToVRAM(¶m0->unk_88); ov19_021DE324(param0); sub_02007130(param1, 128, 4, 0, 0x20 * 3, 10); ov19_021DD224(param0, param1); @@ -540,7 +540,7 @@ void ov19_021DD378(UnkStruct_ov19_021DCF88 *param0) } param0->unk_10 = v0; - v2->unk_10 = (sub_020192EC(param0->unk_08, 5) * FX32_ONE); + v2->unk_10 = (Bg_GetXOffset(param0->unk_08, 5) * FX32_ONE); v2->unk_14 = (Unk_ov19_021E0258[v0] - v2->unk_10) / v2->unk_0C; v2->unk_18 = Unk_ov19_021E0258[v0] >> FX32_SHIFT; @@ -576,16 +576,16 @@ static void ov19_021DD46C(SysTask *param0, void *param1) case 1: if (v0->unk_0C) { v0->unk_10 += v0->unk_14; - sub_02019184(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT)); + Bg_SetOffset(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT)); v0->unk_0C--; } else { - sub_02019184(v1->unk_08, 5, 0, v0->unk_18); + Bg_SetOffset(v1->unk_08, 5, 0, v0->unk_18); G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG3, 0, 16); v0->unk_04++; } break; case 2: - sub_02019184(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]); + Bg_SetOffset(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]); v0->unk_0E = 0; v0->unk_04++; break; @@ -618,23 +618,23 @@ static void ov19_021DD544(SysTask *param0, void *param1) G2S_ChangeBlendAlpha(v1->unk_D4[v0->unk_0E], v1->unk_E4[v0->unk_0E]); if (v0->unk_0E == 0) { - sub_02019184(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]); + Bg_SetOffset(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]); v0->unk_04++; } break; case 2: if (v0->unk_0C) { v0->unk_10 += v0->unk_14; - sub_02019184(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT)); + Bg_SetOffset(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT)); v0->unk_0C--; } else { - sub_02019184(v1->unk_08, 5, 0, v0->unk_18); + Bg_SetOffset(v1->unk_08, 5, 0, v0->unk_18); G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG3, 0, 16); v0->unk_04++; } break; case 3: - sub_02019184(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]); + Bg_SetOffset(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]); v0->unk_0E = 0; v0->unk_04++; break; @@ -663,17 +663,17 @@ static void ov19_021DD670(SysTask *param0, void *param1) G2S_ChangeBlendAlpha(v1->unk_D4[v0->unk_0E], v1->unk_E4[v0->unk_0E]); if (v0->unk_0E == 0) { - sub_02019184(v1->unk_08, 6, 0, Unk_ov19_021E024C[0]); + Bg_SetOffset(v1->unk_08, 6, 0, Unk_ov19_021E024C[0]); v0->unk_04++; } break; case 2: if (v0->unk_0C) { v0->unk_10 += v0->unk_14; - sub_02019184(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT)); + Bg_SetOffset(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT)); v0->unk_0C--; } else { - sub_02019184(v1->unk_08, 5, 0, v0->unk_18); + Bg_SetOffset(v1->unk_08, 5, 0, v0->unk_18); v0->unk_04++; } break; @@ -1479,13 +1479,13 @@ void ov19_021DE2F4(UnkStruct_ov19_021DCF88 *param0) static void ov19_021DE324(UnkStruct_ov19_021DCF88 *param0) { - sub_02019120(4, 0); + Bg_ToggleLayer(4, 0); } static void ov19_021DE330(UnkStruct_ov19_021DCF88 *param0) { G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_ALL, 14, 2); - sub_02019120(4, 1); + Bg_ToggleLayer(4, 1); } static void ov19_021DE350(UnkStruct_ov19_021DCF88 *param0) @@ -1511,7 +1511,7 @@ static void ov19_021DE350(UnkStruct_ov19_021DCF88 *param0) for (v1 = 0; v1 < NELEMS(v0); v1++) { sub_02079AF4(param0->unk_04->unk_00, v2, param0->unk_84); - BGL_WindowColor(¶m0->unk_88, 0, v0[v1].unk_00, v0[v1].unk_02, 104, 17); + Window_FillRectWithColor(¶m0->unk_88, 0, v0[v1].unk_00, v0[v1].unk_02, 104, 17); Text_AddPrinterWithParamsAndColor(¶m0->unk_88, FONT_SYSTEM, param0->unk_84, v0[v1].unk_00 + 4, v0[v1].unk_02 + 2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); if (--v2 < 0) { @@ -1519,6 +1519,6 @@ static void ov19_021DE350(UnkStruct_ov19_021DCF88 *param0) } } - sub_0201ACCC(¶m0->unk_88); + Window_LoadTiles(¶m0->unk_88); ov19_021DE330(param0); } diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c index cd8d5ce2b6..2bfa6a0f5e 100644 --- a/src/overlay019/ov19_021DEC04.c +++ b/src/overlay019/ov19_021DEC04.c @@ -134,15 +134,15 @@ void ov19_021DECE8(UnkStruct_ov19_021DEC04 *param0, NARC *param1) sub_0200710C(param1, 131, param0->unk_0C, 7, 0, 0, 1, 10); sub_02007130(param1, 133, 4, 0, 0x20 * 4, 10); sub_02006E84(19, PokeIconPalettesFileIndex(), 5, 4 * 0x20, 4 * 0x20, 10); - sub_02019690(4, 0x20, 0, 10); - sub_02019CB8(param0->unk_0C, 4, 0x0, 0, 0, 32, 32, 17); + Bg_ClearTilesRange(4, 0x20, 0, 10); + Bg_FillTilemapRect(param0->unk_0C, 4, 0x0, 0, 0, 32, 32, 17); ov19_021DEF64(param0); ov19_021DEFC8(param0); param0->unk_378 = ov19_021D5FA4(param0->unk_08); - sub_02019448(param0->unk_0C, 4); + Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 4); ov19_021DF5D0(param0, param1); } } @@ -197,7 +197,7 @@ void ov19_021DEE88(UnkStruct_ov19_021DEC04 *param0) if (param0) { param0->unk_37C = 0; ov19_021DF0CC(param0, param0->unk_378); - sub_02019448(param0->unk_0C, 4); + Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 4); } } @@ -212,7 +212,7 @@ BOOL ov19_021DEEA8(UnkStruct_ov19_021DEC04 *param0) case 1: ov19_021DF2E0(param0); ov19_021DF064(param0); - sub_02019448(param0->unk_0C, 4); + Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 4); param0->unk_37C++; break; case 2: @@ -228,28 +228,28 @@ static void ov19_021DEEFC(UnkStruct_ov19_021DEC04 *param0) { NNSG2dScreenData *v0 = (ov19_021D5F9C(param0->unk_08) == 0) ? param0->unk_368 : param0->unk_36C; - sub_020198E8(param0->unk_0C, 2, 0, 0, 6, 32, v0->rawData, 0, 0, 32, 32); - sub_020198E8(param0->unk_0C, 2, 26, 0, 6, 32, v0->rawData, 26, 0, 32, 32); - sub_02019448(param0->unk_0C, 2); + Bg_CopyToTilemapRect(param0->unk_0C, 2, 0, 0, 6, 32, v0->rawData, 0, 0, 32, 32); + Bg_CopyToTilemapRect(param0->unk_0C, 2, 26, 0, 6, 32, v0->rawData, 26, 0, 32, 32); + Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 2); } static void ov19_021DEF64(UnkStruct_ov19_021DEC04 *param0) { switch (ov19_021D5FA4(param0->unk_08)) { case 0: - sub_02019120(5, 1); - sub_02019120(6, 0); - sub_02019120(7, 0); + Bg_ToggleLayer(5, 1); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); break; case 1: - sub_02019120(6, 1); - sub_02019120(5, 0); - sub_02019120(7, 0); + Bg_ToggleLayer(6, 1); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(7, 0); break; case 2: - sub_02019120(7, 1); - sub_02019120(5, 0); - sub_02019120(6, 0); + Bg_ToggleLayer(7, 1); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); break; } } @@ -268,16 +268,16 @@ static void ov19_021DEFC8(UnkStruct_ov19_021DEC04 *param0) } for (v1 = 0; v1 < NELEMS(v0); v1++) { - sub_0201A8D4(param0->unk_0C, ¶m0->unk_78[0 + v1], &v0[v1]); - sub_0201A9F4(¶m0->unk_78[0 + v1]); + Window_AddFromTemplate(param0->unk_0C, ¶m0->unk_78[0 + v1], &v0[v1]); + Window_PutToTilemap(¶m0->unk_78[0 + v1]); } ov19_021DF2E0(param0); - BGL_FillWindow(¶m0->unk_78[0], 0); - BGL_FillWindow(¶m0->unk_78[1], 0); + Window_FillTilemap(¶m0->unk_78[0], 0); + Window_FillTilemap(¶m0->unk_78[1], 0); for (v1 = 0; v1 < NELEMS(v0); v1++) { - sub_0201ACCC(¶m0->unk_78[0 + v1]); + Window_LoadTiles(¶m0->unk_78[0 + v1]); } ov19_021DF064(param0); @@ -289,7 +289,7 @@ static void ov19_021DF03C(UnkStruct_ov19_021DEC04 *param0) for (v0 = 0; v0 < 7; v0++) { if (param0->unk_78[v0].pixels) { - BGL_DeleteWindow(&(param0->unk_78[v0])); + Window_Remove(&(param0->unk_78[v0])); } } } @@ -345,9 +345,9 @@ static void ov19_021DF108(UnkStruct_ov19_021DEC04 *param0) int v1; for (v1 = 0; v1 < NELEMS(v0); v1++) { - sub_0201A8D4(param0->unk_0C, ¶m0->unk_78[3 + v1], &v0[v1]); - sub_0201A9F4(¶m0->unk_78[3 + v1]); - BGL_FillWindow(¶m0->unk_78[3 + v1], 0); + Window_AddFromTemplate(param0->unk_0C, ¶m0->unk_78[3 + v1], &v0[v1]); + Window_PutToTilemap(¶m0->unk_78[3 + v1]); + Window_FillTilemap(¶m0->unk_78[3 + v1], 0); } } @@ -357,8 +357,8 @@ static void ov19_021DF140(UnkStruct_ov19_021DEC04 *param0) for (v0 = 3; v0 <= 4; v0++) { if (param0->unk_78[v0].pixels) { - sub_0201AA3C(&(param0->unk_78[v0])); - BGL_DeleteWindow(&(param0->unk_78[v0])); + Window_ClearTilemap(&(param0->unk_78[v0])); + Window_Remove(&(param0->unk_78[v0])); param0->unk_78[v0].pixels = NULL; } } @@ -432,9 +432,9 @@ static void ov19_021DF270(UnkStruct_ov19_021DEC04 *param0) int v1; for (v1 = 0; v1 < NELEMS(v0); v1++) { - sub_0201A8D4(param0->unk_0C, ¶m0->unk_78[5 + v1], &v0[v1]); - sub_0201A9F4(¶m0->unk_78[5 + v1]); - BGL_FillWindow(¶m0->unk_78[5 + v1], 0); + Window_AddFromTemplate(param0->unk_0C, ¶m0->unk_78[5 + v1], &v0[v1]); + Window_PutToTilemap(¶m0->unk_78[5 + v1]); + Window_FillTilemap(¶m0->unk_78[5 + v1], 0); } } @@ -444,8 +444,8 @@ static void ov19_021DF2A8(UnkStruct_ov19_021DEC04 *param0) for (v0 = 5; v0 <= 6; v0++) { if (param0->unk_78[v0].pixels) { - sub_0201AA3C(&(param0->unk_78[v0])); - BGL_DeleteWindow(&(param0->unk_78[v0])); + Window_ClearTilemap(&(param0->unk_78[v0])); + Window_Remove(&(param0->unk_78[v0])); param0->unk_78[v0].pixels = NULL; } } @@ -471,7 +471,7 @@ static void ov19_021DF2E0(UnkStruct_ov19_021DEC04 *param0) Window *v1 = ¶m0->unk_78[2]; int v2; - BGL_FillWindow(v1, 0); + Window_FillTilemap(v1, 0); switch (ov19_021D5FA4(param0->unk_08)) { case 0: @@ -486,15 +486,15 @@ static void ov19_021DF2E0(UnkStruct_ov19_021DEC04 *param0) break; } - sub_0201ACCC(v1); + Window_LoadTiles(v1); } static void ov19_021DF394(UnkStruct_ov19_021DEC04 *param0) { Window *v0 = ¶m0->unk_78[2]; - BGL_FillWindow(v0, 0); - sub_0201ACCC(v0); + Window_FillTilemap(v0, 0); + Window_LoadTiles(v0); } static void ov19_021DF3AC(UnkStruct_ov19_021DEC04 *param0, int param1) @@ -509,7 +509,7 @@ static void ov19_021DF3AC(UnkStruct_ov19_021DEC04 *param0, int param1) v3 = ov19_021D5F9C(param0->unk_08) == param1; v4 = ov19_021D5FB8(param0->unk_08, param1); - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); if (((v2 == 1) && (v3 == 1)) || ((v3 == 0) && (v4 == 1))) { int v5; @@ -532,7 +532,7 @@ static void ov19_021DF3AC(UnkStruct_ov19_021DEC04 *param0, int param1) } } - sub_0201ACCC(v0); + Window_LoadTiles(v0); } static void ov19_021DF4D0(UnkStruct_ov19_021DEC04 *param0, int param1) @@ -547,7 +547,7 @@ static void ov19_021DF4D0(UnkStruct_ov19_021DEC04 *param0, int param1) v3 = (ov19_021D5F9C(param0->unk_08) == param1); v4 = ov19_021D5FB8(param0->unk_08, param1); - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); if (((v2 == 1) && (v3 == 1)) || ((v3 == 0) && (v4 == 1))) { int v5; @@ -568,7 +568,7 @@ static void ov19_021DF4D0(UnkStruct_ov19_021DEC04 *param0, int param1) } } - sub_0201ACCC(v0); + Window_LoadTiles(v0); } static void ov19_021DF5D0(UnkStruct_ov19_021DEC04 *param0, NARC *param1) @@ -693,14 +693,14 @@ static void ov19_021DF8C8(UnkStruct_ov19_021DEC04 *param0, int param1) param1 = ov19_021D5F9C(param0->unk_08); v0 = &(param0->unk_78[0 + param1]); - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); if (ov19_021D5E34(param0->unk_08)) { const UnkStruct_ov19_021D5FAC *v1 = ov19_021D5FAC(param0->unk_08, param1); Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1->unk_28, inline_ov19_021DF3AC(v0, 0, v1->unk_28), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); } - sub_0201ACCC(v0); + Window_LoadTiles(v0); } static void ov19_021DF930(SysTask *param0, void *param1) diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c index 310879a208..8b26af17d6 100644 --- a/src/overlay020/ov20_021D2098.c +++ b/src/overlay020/ov20_021D2098.c @@ -117,7 +117,7 @@ UnkStruct_ov20_021D2128 *ov20_021D2098(const UnkStruct_ov20_021D16E8 *param0, co sub_0200A784(0, 128, 0, 32, 0, 128, 0, 32, 35); v0->unk_24 = sub_020095C4(128, &v0->unk_28, 35); - v0->unk_20 = sub_02018340(35); + v0->unk_20 = BgConfig_New(35); v0->unk_00 = SysTask_Start(ov20_021D2178, v0, 2); v0->unk_04 = ov20_021D2170(ov20_021D217C, v0, 1); @@ -360,11 +360,11 @@ static void ov20_021D2414(SysTask *param0, void *param1) } } - sub_02019044(v1->unk_20, 0); - sub_02019044(v1->unk_20, 1); - sub_02019044(v1->unk_20, 2); - sub_02019044(v1->unk_20, 3); - sub_02019044(v1->unk_20, 4); + Bg_FreeTilemapBuffer(v1->unk_20, 0); + Bg_FreeTilemapBuffer(v1->unk_20, 1); + Bg_FreeTilemapBuffer(v1->unk_20, 2); + Bg_FreeTilemapBuffer(v1->unk_20, 3); + Bg_FreeTilemapBuffer(v1->unk_20, 4); ov20_021D2238(v0); } @@ -473,14 +473,14 @@ static void ov20_021D24EC(UnkStruct_ov20_021D2238 *param0) GX_SetGraphicsMode(GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D); GXLayers_SetBanks(&v0); - sub_02018368(&v1); + SetAllGraphicsModes(&v1); - sub_020183C4(v7->unk_20, 0, &v2, 0); - sub_020183C4(v7->unk_20, 1, &v3, 0); - sub_020183C4(v7->unk_20, 2, &v4, 0); - sub_020183C4(v7->unk_20, 3, &v5, 0); + Bg_InitFromTemplate(v7->unk_20, 0, &v2, 0); + Bg_InitFromTemplate(v7->unk_20, 1, &v3, 0); + Bg_InitFromTemplate(v7->unk_20, 2, &v4, 0); + Bg_InitFromTemplate(v7->unk_20, 3, &v5, 0); - sub_020183C4(v7->unk_20, 4, &v6, 0); + Bg_InitFromTemplate(v7->unk_20, 4, &v6, 0); } static void ov20_021D2570(SysTask *param0, void *param1) diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c index 0f57d67b16..d752e129b5 100644 --- a/src/overlay020/ov20_021D2EA4.c +++ b/src/overlay020/ov20_021D2EA4.c @@ -113,9 +113,9 @@ void ov20_021D2EF0(UnkStruct_ov20_021D30F8 *param0) Strbuf_Free(param0->unk_4C); } - BGL_DeleteWindow(¶m0->unk_0C); - BGL_DeleteWindow(¶m0->unk_1C); - BGL_DeleteWindow(¶m0->unk_2C); + Window_Remove(¶m0->unk_0C); + Window_Remove(¶m0->unk_1C); + Window_Remove(¶m0->unk_2C); Heap_FreeToHeap(param0); } @@ -132,13 +132,13 @@ void ov20_021D2F50(UnkStruct_ov20_021D30F8 *param0, NARC *param1) v1 = sub_020070E8(param1, 1, v0, 0, 0, 0, 1, 35); v1 /= 0x20; - BGL_AddWindow(v0, ¶m0->unk_0C, 0, 3, 1, 27, 4, 0, v1); + Window_Add(v0, ¶m0->unk_0C, 0, 3, 1, 27, 4, 0, v1); v1 += 108; - BGL_AddWindow(v0, ¶m0->unk_1C, 0, 2, 21, 27, 2, 11, v1); + Window_Add(v0, ¶m0->unk_1C, 0, 2, 21, 27, 2, 11, v1); v1 += 54; - BGL_AddWindow(v0, ¶m0->unk_2C, 0, 23, 15, 8, 4, 11, v1); + Window_Add(v0, ¶m0->unk_2C, 0, 23, 15, 8, 4, 11, v1); v1 += 32; sub_02006E3C(38, 0, v0, 0, v1, 0, 0, 35); @@ -148,15 +148,15 @@ void ov20_021D2F50(UnkStruct_ov20_021D30F8 *param0, NARC *param1) sub_02006E84(38, 24, 0, 14 * 0x20, 0x20, 35); sub_0200DD0C(v0, 0, v1, 15, ov20_021D2080(param0->unk_04), 35); sub_0200E010(¶m0->unk_1C, v1, 15); - sub_0201A9F4(¶m0->unk_0C); - sub_0201A9F4(¶m0->unk_1C); + Window_PutToTilemap(¶m0->unk_0C); + Window_PutToTilemap(¶m0->unk_1C); ov20_021D312C(param0); ov20_021D3228(param0); ov20_021D3578(param0, 0); ov20_021D3184(param0); - sub_02019448(v0, 0); + Bg_CopyTilemapBufferToVRAM(v0, 0); } static void ov20_021D30A4(UnkStruct_ov20_021D30F8 *param0, NARC *param1) @@ -237,7 +237,7 @@ static void ov20_021D3184(UnkStruct_ov20_021D30F8 *param0) void ov20_021D3228(UnkStruct_ov20_021D30F8 *param0) { ov20_021D30F8(param0); - BGL_FillWindow(¶m0->unk_0C, 13); + Window_FillTilemap(¶m0->unk_0C, 13); switch (ov20_021D1F84(param0->unk_04)) { case 0: @@ -255,7 +255,7 @@ void ov20_021D3228(UnkStruct_ov20_021D30F8 *param0) break; } - sub_0201ACCC(¶m0->unk_0C); + Window_LoadTiles(¶m0->unk_0C); } static u32 ov20_021D32D0(UnkStruct_ov20_021D30F8 *param0) @@ -397,7 +397,7 @@ static void ov20_021D34F4(Window *param0, const UnkStruct_ov20_021D34CC *param1) UnkStruct_ov20_021D34CC v0; ov20_021D34CC(param1, &v0); - BGL_WindowColor(param0, 14, v0.unk_00, v0.unk_02, 96, 16); + Window_FillRectWithColor(param0, 14, v0.unk_00, v0.unk_02, 96, 16); } static void ov20_021D351C(UnkStruct_ov20_021D30F8 *param0, Window *param1, const UnkStruct_ov20_021D34CC *param2, u16 param3) @@ -422,7 +422,7 @@ u32 ov20_021D3574(const UnkStruct_ov20_021D30F8 *param0) void ov20_021D3578(UnkStruct_ov20_021D30F8 *param0, u32 param1) { - BGL_FillWindow(¶m0->unk_1C, 9); + Window_FillTilemap(¶m0->unk_1C, 9); switch (param1) { case 0: @@ -453,7 +453,7 @@ void ov20_021D3578(UnkStruct_ov20_021D30F8 *param0, u32 param1) break; } - sub_0201ACCC(¶m0->unk_1C); + Window_LoadTiles(¶m0->unk_1C); } void ov20_021D3684(UnkStruct_ov20_021D30F8 *param0) @@ -533,7 +533,7 @@ static void ov20_021D375C(UnkStruct_ov20_021D30F8 *param0, BOOL param1) void ov20_021D3790(UnkStruct_ov20_021D30F8 *param0, int param1) { - BGL_FillWindow(¶m0->unk_2C, 9); + Window_FillTilemap(¶m0->unk_2C, 9); MessageLoader_GetStrbuf(param0->unk_48, 9, param0->unk_4C); Text_AddPrinterWithParamsAndColor(¶m0->unk_2C, FONT_SYSTEM, param0->unk_4C, 14, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 9), NULL); @@ -544,17 +544,17 @@ void ov20_021D3790(UnkStruct_ov20_021D30F8 *param0, int param1) Window_Show(¶m0->unk_2C, 0, param0->unk_60, 14); ColoredArrow_Print(param0->unk_50, ¶m0->unk_2C, 0, 0 + (param1 * 16)); - sub_0201A954(¶m0->unk_2C); + Window_CopyToVRAM(¶m0->unk_2C); } void ov20_021D381C(UnkStruct_ov20_021D30F8 *param0, int param1) { - BGL_WindowColor(¶m0->unk_2C, 9, 0, 0, 14, 4 * 8); + Window_FillRectWithColor(¶m0->unk_2C, 9, 0, 0, 14, 4 * 8); ColoredArrow_Print(param0->unk_50, ¶m0->unk_2C, 0, 0 + (param1 * 16)); } void ov20_021D384C(UnkStruct_ov20_021D30F8 *param0) { Window_Clear(¶m0->unk_2C, 0); - sub_0201ACF4(¶m0->unk_2C); + Window_ClearAndCopyToVRAM(¶m0->unk_2C); } diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c index 6cfee71ef8..c6e4538d27 100644 --- a/src/overlay020/ov20_021D3864.c +++ b/src/overlay020/ov20_021D3864.c @@ -69,7 +69,7 @@ void ov20_021D3898(UnkStruct_ov20_021D3980 *param0, NARC *param1) ov20_021D390C(v2, &v1, 1); ov20_021D3980(param0); - sub_02019448(v2, 3); + Bg_CopyTilemapBufferToVRAM(v2, 3); } static void ov20_021D390C(BgConfig *param0, const WindowTemplate *param1, u32 param2) @@ -78,17 +78,17 @@ static void ov20_021D390C(BgConfig *param0, const WindowTemplate *param1, u32 pa Strbuf *v1; u32 v2; - sub_0201A8D4(param0, &v0, param1); - sub_0201A9F4(&v0); - BGL_FillWindow(&v0, 14); + Window_AddFromTemplate(param0, &v0, param1); + Window_PutToTilemap(&v0); + Window_FillTilemap(&v0, 14); v1 = MessageBank_GetNewStrbufFromNARC(26, 438, param2, 35); v2 = ((param1->width * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0)) / 2; Text_AddPrinterWithParamsAndColor(&v0, FONT_SYSTEM, v1, v2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 14), NULL); - sub_0201ACCC(&v0); + Window_LoadTiles(&v0); Strbuf_Free(v1); - BGL_DeleteWindow(&v0); + Window_Remove(&v0); } static void ov20_021D3980(UnkStruct_ov20_021D3980 *param0) @@ -146,10 +146,10 @@ void ov20_021D39EC(UnkStruct_ov20_021D3980 *param0, int param1) void ov20_021D3A2C(UnkStruct_ov20_021D3980 *param0) { - sub_02019184(ov20_021D2E04(param0->unk_00), 3, 3, 64); + Bg_SetOffset(ov20_021D2E04(param0->unk_00), 3, 3, 64); } void ov20_021D3A40(UnkStruct_ov20_021D3980 *param0) { - sub_02019184(ov20_021D2E04(param0->unk_00), 3, 3, 0); + Bg_SetOffset(ov20_021D2E04(param0->unk_00), 3, 3, 0); } diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c index 30033262e3..2596fad2b7 100644 --- a/src/overlay020/ov20_021D3A54.c +++ b/src/overlay020/ov20_021D3A54.c @@ -84,8 +84,8 @@ void ov20_021D3A98(UnkStruct_ov20_021D3E0C *param0, NARC *param1) v1 = ov20_021D3C78(param0, v0, v1); ov20_021D3D44(param0, v0, v1); - sub_02019184(v0, 1, 0, -4); - sub_02019184(v0, 1, 3, 2); + Bg_SetOffset(v0, 1, 0, -4); + Bg_SetOffset(v0, 1, 3, 2); ov20_021D3E0C(param0); G2_SetBlendBrightness(GX_BLEND_PLANEMASK_BG1, -10); @@ -94,7 +94,7 @@ void ov20_021D3A98(UnkStruct_ov20_021D3E0C *param0, NARC *param1) G2_SetWnd0Position(0, 0, 255, 160); GX_SetVisibleWnd(GX_WNDMASK_W0); - sub_02019448(v0, 1); + Bg_CopyTilemapBufferToVRAM(v0, 1); } static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 param2) @@ -126,16 +126,16 @@ static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 GF_ASSERT(param2 < (1024 - 18)); - BGL_AddWindow(param1, &v3, 1, v1, v2, 9, 2, 11, param2); - BGL_FillWindow(&v3, 15); + Window_Add(param1, &v3, 1, v1, v2, 9, 2, 11, param2); + Window_FillTilemap(&v3, 15); v7 = ((9 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v5, 0)) / 2; Text_AddPrinterWithParamsAndColor(&v3, FONT_SYSTEM, v5, v7, 0, TEXT_SPEED_NO_TRANSFER, v6, NULL); - sub_0201A9F4(&v3); - sub_0201ACCC(&v3); + Window_PutToTilemap(&v3); + Window_LoadTiles(&v3); Strbuf_Free(v5); - BGL_DeleteWindow(&v3); + Window_Remove(&v3); param2 += 18; v1 += (9 + 1); @@ -154,12 +154,12 @@ static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 GF_ASSERT(param2 < (1024 - 200)); - BGL_AddWindow(param1, &v0, 1, 34, 10, 25, 8, 11, param2); + Window_Add(param1, &v0, 1, 34, 10, 25, 8, 11, param2); param2 += 200; v1 = Strbuf_Init(4, 35); - BGL_FillWindow(&v0, 15); + Window_FillTilemap(&v0, 15); v3 = ov20_021D5044(); @@ -176,11 +176,11 @@ static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 Text_AddPrinterWithParamsAndColor(&v0, FONT_SYSTEM, v1, v5 + 3, v6, TEXT_SPEED_NO_TRANSFER, v2, NULL); } - sub_0201ACCC(&v0); - sub_0201A9F4(&v0); + Window_LoadTiles(&v0); + Window_PutToTilemap(&v0); Strbuf_Free(v1); - BGL_DeleteWindow(&v0); + Window_Remove(&v0); return param2; } @@ -206,12 +206,12 @@ static u32 ov20_021D3D44(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 for (v4 = 0; v4 < NELEMS(v0); v4++) { GF_ASSERT(param2 < (1024 - 16)); - BGL_AddWindow(param1, &v1, 1, v0[v4].unk_00, v0[v4].unk_02, 8, 2, 11, param2); - BGL_FillWindow(&v1, 15); + Window_Add(param1, &v1, 1, v0[v4].unk_00, v0[v4].unk_02, 8, 2, 11, param2); + Window_FillTilemap(&v1, 15); Text_AddPrinterWithParamsAndColor(&v1, FONT_SYSTEM, v3, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); - sub_0201A9F4(&v1); - sub_0201ACCC(&v1); - BGL_DeleteWindow(&v1); + Window_PutToTilemap(&v1); + Window_LoadTiles(&v1); + Window_Remove(&v1); param2 += 16; } @@ -326,7 +326,7 @@ BOOL ov20_021D3F84(UnkStruct_ov20_021D3E0C *param0) void ov20_021D3FD0(UnkStruct_ov20_021D3E0C *param0) { - sub_02019184(param0->unk_0C, 1, 3, 2); + Bg_SetOffset(param0->unk_0C, 1, 3, 2); } void ov20_021D3FE0(UnkStruct_ov20_021D3E0C *param0) @@ -347,7 +347,7 @@ void ov20_021D4004(UnkStruct_ov20_021D3E0C *param0) BOOL ov20_021D4020(UnkStruct_ov20_021D3E0C *param0) { if (ov20_021D4F4C(¶m0->unk_1C)) { - sub_02019120(1, 0); + Bg_ToggleLayer(1, 0); return 1; } @@ -357,7 +357,7 @@ BOOL ov20_021D4020(UnkStruct_ov20_021D3E0C *param0) void ov20_021D403C(UnkStruct_ov20_021D3E0C *param0) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_ALL, 0, 16); - sub_02019120(1, 1); + Bg_ToggleLayer(1, 1); ov20_021D4F1C(¶m0->unk_1C, GX_BLEND_PLANEMASK_BG1, GX_BLEND_ALL, 0, 124, (6 * 2)); } @@ -376,7 +376,7 @@ void ov20_021D4084(UnkStruct_ov20_021D3E0C *param0) v0 = 252; } - sub_02019184(param0->unk_0C, 1, 0, v0); + Bg_SetOffset(param0->unk_0C, 1, 0, v0); } void ov20_021D40A8(UnkStruct_ov20_021D3E0C *param0) diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c index e9981b34b2..e41ada1d7f 100644 --- a/src/overlay020/ov20_021D40E8.c +++ b/src/overlay020/ov20_021D40E8.c @@ -55,8 +55,8 @@ UnkStruct_ov20_021D4210 *ov20_021D40E8(UnkStruct_ov20_021D2128 *param0, const Un v0->unk_0C = ov20_021D2E04(param0); v0->unk_3C = Strbuf_Init(32, 35); - BGL_AddWindow(v0->unk_0C, &v0->unk_10, 2, 4, 0, 26, 32, 12, 1); - BGL_AddWindow(v0->unk_0C, &v0->unk_20, 2, 0, 0, 12, 4, 12, 1); + Window_Add(v0->unk_0C, &v0->unk_10, 2, 4, 0, 26, 32, 12, 1); + Window_Add(v0->unk_0C, &v0->unk_20, 2, 0, 0, 12, 4, 12, 1); v0->unk_30 = NULL; v0->unk_34 = NULL; @@ -83,8 +83,8 @@ void ov20_021D4164(UnkStruct_ov20_021D4210 *param0) Strbuf_Free(param0->unk_3C); } - BGL_DeleteWindow(&(param0->unk_20)); - BGL_DeleteWindow(&(param0->unk_10)); + Window_Remove(&(param0->unk_20)); + Window_Remove(&(param0->unk_10)); Heap_FreeToHeap(param0); } @@ -95,17 +95,17 @@ void ov20_021D41A8(UnkStruct_ov20_021D4210 *param0) v0 = ov20_021D2E04(param0->unk_00); - sub_02019690(2, 0x20, 0 * 0x20, 35); - sub_02019CB8(v0, 2, 0, 0, 0, 32, 32, 12); + Bg_ClearTilesRange(2, 0x20, 0 * 0x20, 35); + Bg_FillTilemapRect(v0, 2, 0, 0, 0, 32, 32, 12); - BGL_FillWindow(¶m0->unk_10, 0); - sub_0201A9F4(¶m0->unk_10); - sub_0201ACCC(¶m0->unk_10); - sub_02019448(v0, 2); + Window_FillTilemap(¶m0->unk_10, 0); + Window_PutToTilemap(¶m0->unk_10); + Window_LoadTiles(¶m0->unk_10); + Bg_CopyTilemapBufferToVRAM(v0, 2); ov20_021D4210(param0); - sub_02019120(2, 0); + Bg_ToggleLayer(2, 0); } static void ov20_021D4210(UnkStruct_ov20_021D4210 *param0) @@ -131,7 +131,7 @@ void ov20_021D4294(UnkStruct_ov20_021D4210 *param0) { u32 v0, v1, v2; - BGL_FillWindow(¶m0->unk_10, 0); + Window_FillTilemap(¶m0->unk_10, 0); ov20_021D4638(param0); v0 = ov20_021D1FE4(param0->unk_04); @@ -150,13 +150,13 @@ void ov20_021D4294(UnkStruct_ov20_021D4210 *param0) } } - sub_0201ACCC(¶m0->unk_10); + Window_LoadTiles(¶m0->unk_10); } void ov20_021D42E4(UnkStruct_ov20_021D4210 *param0) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_ALL, 0, 16); - sub_02019120(2, 1); + Bg_ToggleLayer(2, 1); G2_SetWnd1InsidePlane(GX_WND_PLANEMASK_ALL, 1); param0->unk_84 = G2_GetWndOutsidePlane(); @@ -196,7 +196,7 @@ BOOL ov20_021D43D8(UnkStruct_ov20_021D4210 *param0) switch (param0->unk_80) { case 0: if (ov20_021D4F4C(¶m0->unk_40)) { - sub_02019120(2, 0); + Bg_ToggleLayer(2, 0); G2_SetWndOutsidePlane(param0->unk_84.planeMask, param0->unk_84.effect); GX_SetVisibleWnd(param0->unk_88); return 1; @@ -275,7 +275,7 @@ void ov20_021D44BC(UnkStruct_ov20_021D4210 *param0, int param1) param0->unk_8C = v0; param0->unk_90 = v1; - sub_0201ACCC(¶m0->unk_10); + Window_LoadTiles(¶m0->unk_10); ov20_021D4E38(&(param0->unk_60), param0->unk_0C, 2, 1, param1 * 24, v6); } @@ -303,10 +303,10 @@ static void ov20_021D45AC(UnkStruct_ov20_021D4210 *param0, int param1) } if (v0 < v1) { - BGL_WindowColor(¶m0->unk_10, 0, 0, v0, 26 * 8, (v1 - v0)); + Window_FillRectWithColor(¶m0->unk_10, 0, 0, v0, 26 * 8, (v1 - v0)); } else { - BGL_WindowColor(¶m0->unk_10, 0, 0, v0, 26 * 8, 256 - v0); - BGL_WindowColor(¶m0->unk_10, 0, 0, 0, 26 * 8, v1); + Window_FillRectWithColor(¶m0->unk_10, 0, 0, v0, 26 * 8, 256 - v0); + Window_FillRectWithColor(¶m0->unk_10, 0, 0, 0, 26 * 8, v1); } } @@ -315,7 +315,7 @@ static void ov20_021D4638(UnkStruct_ov20_021D4210 *param0) param0->unk_8C = 48; param0->unk_90 = 0; - sub_02019184(param0->unk_0C, 2, 3, 0); + Bg_SetOffset(param0->unk_0C, 2, 3, 0); } static void ov20_021D4658(UnkStruct_ov20_021D4210 *param0, u32 param1, u32 param2) @@ -327,9 +327,9 @@ static void ov20_021D4658(UnkStruct_ov20_021D4210 *param0, u32 param1, u32 param } else { u32 v0 = 256 - param2; - BGL_FillWindow(¶m0->unk_20, 0); + Window_FillTilemap(¶m0->unk_20, 0); Text_AddPrinterWithParamsAndColor(¶m0->unk_20, FONT_SYSTEM, param0->unk_3C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201ADDC(¶m0->unk_10, param0->unk_20.pixels, 0, 0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, param2, 12 * 8, v0); - sub_0201ADDC(¶m0->unk_10, param0->unk_20.pixels, 0, v0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, 0, 12 * 8, (2 * 8) - v0); + Window_BlitBitmapRect(¶m0->unk_10, param0->unk_20.pixels, 0, 0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, param2, 12 * 8, v0); + Window_BlitBitmapRect(¶m0->unk_10, param0->unk_20.pixels, 0, v0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, 0, 12 * 8, (2 * 8) - v0); } } diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c index 7f99dbddf7..7e56adf532 100644 --- a/src/overlay020/ov20_021D4728.c +++ b/src/overlay020/ov20_021D4728.c @@ -98,15 +98,15 @@ void ov20_021D4774(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) ov20_021D48C4(param0, param1); if (ov20_021D1F94(param0->unk_04) == 0) { - sub_020198E8(param0->unk_0C, 4, 3, 3, 11, 7, param0->unk_2C[3], 0, 0, 11, 7); - sub_020198E8(param0->unk_0C, 4, 3, 14, 11, 7, param0->unk_2C[4], 0, 0, 11, 7); + Bg_CopyToTilemapRect(param0->unk_0C, 4, 3, 3, 11, 7, param0->unk_2C[3], 0, 0, 11, 7); + Bg_CopyToTilemapRect(param0->unk_0C, 4, 3, 14, 11, 7, param0->unk_2C[4], 0, 0, 11, 7); } else { - sub_020198E8(param0->unk_0C, 4, 3, 3, 11, 7, param0->unk_2C[0], 0, 0, 11, 7); - sub_020198E8(param0->unk_0C, 4, 3, 14, 11, 7, param0->unk_2C[7], 0, 0, 11, 7); + Bg_CopyToTilemapRect(param0->unk_0C, 4, 3, 3, 11, 7, param0->unk_2C[0], 0, 0, 11, 7); + Bg_CopyToTilemapRect(param0->unk_0C, 4, 3, 14, 11, 7, param0->unk_2C[7], 0, 0, 11, 7); } ov20_021D4A24(param0, param1); - sub_02019448(param0->unk_0C, 4); + Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 4); } static void ov20_021D4874(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) @@ -159,7 +159,7 @@ static void ov20_021D48C4(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) v4.pixels = (u8 *)(v3->pRawData) + (11 * 7 * 4 * 0x20); ov20_021D498C(&v4, param0->unk_0C, v1, 0); DC_FlushRange(v3->pRawData, v3->szByte); - sub_0201958C(param0->unk_0C, 4, v3->pRawData, v3->szByte, 0); + Bg_LoadTiles(param0->unk_0C, 4, v3->pRawData, v3->szByte, 0); Heap_FreeToHeap(v2); } @@ -326,17 +326,17 @@ static void ov20_021D4C40(SysTask *param0, void *param1) switch (v0->unk_04) { case 0: - sub_020198E8(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7); - sub_020198E8(v0->unk_00->unk_0C, 4, v0->unk_14, v0->unk_16, 11, 7, v0->unk_00->unk_2C[v0->unk_12], 0, 0, 11, 7); - sub_02019448(v0->unk_00->unk_0C, 4); + Bg_CopyToTilemapRect(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7); + Bg_CopyToTilemapRect(v0->unk_00->unk_0C, 4, v0->unk_14, v0->unk_16, 11, 7, v0->unk_00->unk_2C[v0->unk_12], 0, 0, 11, 7); + Bg_CopyTilemapBufferToVRAM(v0->unk_00->unk_0C, 4); v0->unk_0A++; v0->unk_04++; break; case 1: if (++(v0->unk_08) >= 2) { - sub_020198E8(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7); - sub_02019448(v0->unk_00->unk_0C, 4); + Bg_CopyToTilemapRect(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7); + Bg_CopyTilemapBufferToVRAM(v0->unk_00->unk_0C, 4); v0->unk_08 = 0; v0->unk_0A++; @@ -345,8 +345,8 @@ static void ov20_021D4C40(SysTask *param0, void *param1) break; case 2: if (++(v0->unk_08) >= 4) { - sub_020198E8(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7); - sub_02019448(v0->unk_00->unk_0C, 4); + Bg_CopyToTilemapRect(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7); + Bg_CopyTilemapBufferToVRAM(v0->unk_00->unk_0C, 4); v0->unk_04++; } break; diff --git a/src/overlay020/ov20_021D4E38.c b/src/overlay020/ov20_021D4E38.c index be2f286bdb..f2d3a5bde6 100644 --- a/src/overlay020/ov20_021D4E38.c +++ b/src/overlay020/ov20_021D4E38.c @@ -21,10 +21,10 @@ void ov20_021D4E38(UnkStruct_ov20_021D4E8C *param0, BgConfig *param1, u32 param2 param0->unk_04 = param2; if (param3 == 0) { - param0->unk_0C = sub_020192EC(param1, param2); + param0->unk_0C = Bg_GetXOffset(param1, param2); param0->unk_08 = 0; } else { - param0->unk_0C = sub_020192F8(param1, param2); + param0->unk_0C = Bg_GetYOffset(param1, param2); param0->unk_08 = 3; } @@ -62,10 +62,10 @@ static void ov20_021D4ED8(SysTask *param0, void *param1) if (v0->unk_18) { v0->unk_0C += v0->unk_14; - sub_02019184(v0->unk_00, v0->unk_04, v0->unk_08, (v0->unk_0C >> FX32_SHIFT)); + Bg_SetOffset(v0->unk_00, v0->unk_04, v0->unk_08, (v0->unk_0C >> FX32_SHIFT)); v0->unk_18--; } else { - sub_02019184(v0->unk_00, v0->unk_04, v0->unk_08, v0->unk_10); + Bg_SetOffset(v0->unk_00, v0->unk_04, v0->unk_08, v0->unk_10); } } diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 150b6e0053..ac9b43a3ed 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -629,7 +629,7 @@ BOOL ov21_021D157C(UnkStruct_ov21_021D157C *param0) int v1; if (param0->unk_1C <= param0->unk_20) { - sub_02019CB8(param0->unk_00, param0->unk_08, 0, 0, 0, 32, 24, 16); + Bg_FillTilemapRect(param0->unk_00, param0->unk_08, 0, 0, 0, 32, 24, 16); v0 = (param0->unk_14 * param0->unk_1C) / param0->unk_20; v1 = (param0->unk_18 * param0->unk_1C) / param0->unk_20; @@ -637,14 +637,14 @@ BOOL ov21_021D157C(UnkStruct_ov21_021D157C *param0) v1 += param0->unk_10; if (v0 > 0) { - sub_020198E8(param0->unk_00, param0->unk_08, 0, 0, 32, v0, param0->unk_04->rawData, 0, 32 - v0, 32, 32); + Bg_CopyToTilemapRect(param0->unk_00, param0->unk_08, 0, 0, 32, v0, param0->unk_04->rawData, 0, 32 - v0, 32, 32); } if ((32 - v1) > 0) { - sub_020198E8(param0->unk_00, param0->unk_08, 0, 32 - v1, 32, v1, param0->unk_04->rawData, 0, 0, 32, 32); + Bg_CopyToTilemapRect(param0->unk_00, param0->unk_08, 0, 32 - v1, 32, v1, param0->unk_04->rawData, 0, 0, 32, 32); } - sub_0201C3C0(param0->unk_00, param0->unk_08); + Bg_ScheduleTilemapTransfer(param0->unk_00, param0->unk_08); param0->unk_1C++; return 0; diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c index 4a30840c74..2277d4d015 100644 --- a/src/overlay021/ov21_021D1FA4.c +++ b/src/overlay021/ov21_021D1FA4.c @@ -65,14 +65,14 @@ void ov21_021D1FA4(UnkStruct_ov21_021D13FC *param0, int param1) UnkStruct_ov21_021D1FA4 v1; param0->unk_278 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1); - param0->unk_00 = sub_02018340(param1); + param0->unk_00 = BgConfig_New(param1); v0.displayMode = GX_DISPMODE_GRAPHICS; v0.mainBgMode = GX_BGMODE_0; v0.subBgMode = GX_BGMODE_1; v0.bg0As2DOr3D = GX_BG0_AS_3D; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); ov21_021D2830(param0->unk_00, param1); ov21_021D29D0(param0, param1); @@ -138,7 +138,7 @@ void ov21_021D2124(UnkStruct_ov21_021D13FC *param0) void ov21_021D214C(UnkStruct_ov21_021D13FC *param0) { - sub_0201C2B8(param0->unk_00); + Bg_RunScheduledUpdates(param0->unk_00); sub_02008A94(param0->unk_150); } @@ -506,7 +506,7 @@ u32 ov21_021D2724(UnkStruct_ov21_021D13FC *param0, u32 param1, BgConfig *param2, param5 = v1->szByte; } - sub_0201958C(param2, param3, v1->pRawData, param5, param4); + Bg_LoadTiles(param2, param3, v1->pRawData, param5, param4); } Heap_FreeToHeap(v0); @@ -607,9 +607,9 @@ static void ov21_021D2830(BgConfig *param0, int param1) 0 }; - sub_020183C4(param0, 1, &v0, 0); - sub_02019690(1, 32, 0, param1); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v0, 0); + Bg_ClearTilesRange(1, 32, 0, param1); + Bg_ClearTilemap(param0, 1); } { @@ -629,12 +629,12 @@ static void ov21_021D2830(BgConfig *param0, int param1) 0 }; - sub_020183C4(param0, 2, &v1, 0); - sub_02019690(2, 32, 0, param1); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v1, 0); + Bg_ClearTilesRange(2, 32, 0, param1); + Bg_ClearTilemap(param0, 2); } - BGL_SetPriority(0, 2); + Bg_SetPriority(0, 2); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); { @@ -654,9 +654,9 @@ static void ov21_021D2830(BgConfig *param0, int param1) 0 }; - sub_020183C4(param0, 3, &v2, 0); - sub_02019690(3, 32, 0, param1); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v2, 0); + Bg_ClearTilesRange(3, 32, 0, param1); + Bg_ClearTilemap(param0, 3); } { @@ -676,9 +676,9 @@ static void ov21_021D2830(BgConfig *param0, int param1) 0 }; - sub_020183C4(param0, 5, &v3, 0); - sub_02019690(5, 32, 0, param1); - sub_02019EBC(param0, 5); + Bg_InitFromTemplate(param0, 5, &v3, 0); + Bg_ClearTilesRange(5, 32, 0, param1); + Bg_ClearTilemap(param0, 5); } { @@ -698,9 +698,9 @@ static void ov21_021D2830(BgConfig *param0, int param1) 0 }; - sub_020183C4(param0, 6, &v4, 0); - sub_02019690(6, 32, 0, param1); - sub_02019EBC(param0, 6); + Bg_InitFromTemplate(param0, 6, &v4, 0); + Bg_ClearTilesRange(6, 32, 0, param1); + Bg_ClearTilemap(param0, 6); } { @@ -720,32 +720,32 @@ static void ov21_021D2830(BgConfig *param0, int param1) 0 }; - sub_020183C4(param0, 7, &v5, 1); - sub_02019690(7, 64, 0, param1); - sub_02019EBC(param0, 7); + Bg_InitFromTemplate(param0, 7, &v5, 1); + Bg_ClearTilesRange(7, 64, 0, param1); + Bg_ClearTilemap(param0, 7); } } static void ov21_021D299C(BgConfig *param0) { - sub_02019044(param0, 1); - sub_02019044(param0, 2); - sub_02019044(param0, 3); - sub_02019044(param0, 5); - sub_02019044(param0, 7); - sub_02019044(param0, 6); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 7); + Bg_FreeTilemapBuffer(param0, 6); } static void ov21_021D29D0(UnkStruct_ov21_021D13FC *param0, int param1) { - BGL_AddWindow(param0->unk_00, ¶m0->unk_04, 1, 0, 0, 32, 32, 0, 0); - BGL_FillWindow(¶m0->unk_04, 0); - sub_0201A954(¶m0->unk_04); + Window_Add(param0->unk_00, ¶m0->unk_04, 1, 0, 0, 32, 32, 0, 0); + Window_FillTilemap(¶m0->unk_04, 0); + Window_CopyToVRAM(¶m0->unk_04); } static void ov21_021D2A00(UnkStruct_ov21_021D13FC *param0) { - BGL_DeleteWindow(¶m0->unk_04); + Window_Remove(¶m0->unk_04); } static void ov21_021D2A0C(UnkStruct_ov21_021D13FC *param0, int param1) diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c index e4aaa0f62b..9e2508cf71 100644 --- a/src/overlay021/ov21_021D4C0C.c +++ b/src/overlay021/ov21_021D4C0C.c @@ -127,17 +127,17 @@ Window *ov21_021D4D6C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2) { Window *v0; - v0 = sub_0201A778(param0->unk_14, 1); + v0 = Window_New(param0->unk_14, 1); Window_Init(v0); - BGL_AddFramelessWindow(param0->unk_08, v0, param1, param2, 0, 0); + Window_AddToTopLeftCorner(param0->unk_08, v0, param1, param2, 0, 0); return v0; } void ov21_021D4DA0(Window *param0) { - sub_0201A928(param0, 1); + Windows_Delete(param0, 1); } u32 ov21_021D4DAC(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3, int param4, int param5) @@ -171,7 +171,7 @@ void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, v1 = MessageLoader_GetNewStrbuf(v0, param3); v2 = Font_CalcStrbufWidth(FONT_SUBSCREEN, v1, 0); - v3 = sub_0201C294(param1) * 8; + v3 = Window_GetWidth(param1) * 8; v3 = v3 - v2; v3 /= 2; diff --git a/src/overlay021/ov21_021D517C.c b/src/overlay021/ov21_021D517C.c index 941f22bf94..e7a1c0b215 100644 --- a/src/overlay021/ov21_021D517C.c +++ b/src/overlay021/ov21_021D517C.c @@ -43,7 +43,7 @@ static void ov21_021D5248(Window *param0, u8 *param1, u16 param2, u16 param3, in v1 = v0 / param2; v0 = v0 % param2; - sub_0201ADDC(param0, param1, v0, v1, param2, param3, param6, param7, param4, param4); + Window_BlitBitmapRect(param0, param1, v0, v1, param2, param3, param6, param7, param4, param4); } } diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c index ebe6381f79..8d7cd10e55 100644 --- a/src/overlay021/ov21_021D5AEC.c +++ b/src/overlay021/ov21_021D5AEC.c @@ -700,14 +700,14 @@ static void ov21_021D62E4(UnkStruct_ov21_021D13FC *param0, int param1) v0 = ov21_021D27B8(param0, 38, 1, &v1, param1); - sub_020198C0(param0->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = ov21_021D27B8(param0, 39, 1, &v1, param1); - sub_020198C0(param0->unk_00, 3, v1->rawData, 1, 4, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00, 3, v1->rawData, 1, 4, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00, 3); + Bg_ScheduleTilemapTransfer(param0->unk_00, 3); } static void ov21_021D637C(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2, int param3) @@ -751,7 +751,7 @@ static void ov21_021D63DC(UnkStruct_ov21_021D13FC *param0, int param1, int param Strbuf_Free(v0); MessageLoader_Free(v1); - sub_0201C3C0(param0->unk_00, 1); + Bg_ScheduleTilemapTransfer(param0->unk_00, 1); } static void ov21_021D64B0(UnkStruct_ov21_021D13FC *param0, int param1, int param2) @@ -765,7 +765,7 @@ static void ov21_021D64B0(UnkStruct_ov21_021D13FC *param0, int param1, int param Text_AddPrinterWithParamsAndColor(¶m0->unk_04, FONT_SYSTEM, v0, 48, 170, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_Free(v0); MessageLoader_Free(v1); - sub_0201C3C0(param0->unk_00, 1); + Bg_ScheduleTilemapTransfer(param0->unk_00, 1); } static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, int param1) @@ -1394,7 +1394,7 @@ static void ov21_021D6FB4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C v3 = 14; v4 = 4; - sub_02019184(param1->unk_00->unk_00, 1, 3, 192); + Bg_SetOffset(param1->unk_00->unk_00, 1, 3, 192); } else { v0 = 3; v2 = 14; @@ -1439,7 +1439,7 @@ static BOOL ov21_021D7044(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C v1 = -48; } - sub_0201C63C(param1->unk_00->unk_00, 1, 3, v1); + Bg_ScheduleScroll(param1->unk_00->unk_00, 1, 3, v1); } return v0; @@ -1449,7 +1449,7 @@ static void ov21_021D7094(UnkStruct_ov21_021D5C08 *param0, const UnkStruct_ov21_ { if (param1->unk_10 == 0) { if (param2 == 0) { - sub_02019184(param0->unk_00->unk_00, 1, 3, 0); + Bg_SetOffset(param0->unk_00->unk_00, 1, 3, 0); } } @@ -1542,8 +1542,8 @@ static BOOL ov21_021D71E4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C if (param2->unk_10 != 1) { if (param3 == 0) { sub_0200AB4C(-16, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), 1); - BGL_FillWindow(¶m1->unk_00->unk_04, 0); - sub_02019EBC(param1->unk_00->unk_00, 1); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); + Bg_ClearTilemap(param1->unk_00->unk_00, 1); } } @@ -1603,8 +1603,8 @@ static BOOL ov21_021D72D4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C if (param3 == 0) { if (param2->unk_10 != 1) { G2_SetBlendBrightnessExt((GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD), GX_BLEND_PLANEMASK_BG3, 0, 0, -16); - BGL_FillWindow(¶m1->unk_00->unk_04, 0); - sub_02019EBC(param1->unk_00->unk_00, 1); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); + Bg_ClearTilemap(param1->unk_00->unk_00, 1); } } else { ov21_021D7124(param0); diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index 5cb1a6b585..21e3db2eac 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -517,7 +517,7 @@ static void ov21_021D7C64(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 ov21_021D7E80(param0, param1, param2, param3); ov21_021D8018(param0, param1, param2, param3); - BGL_SetPriority(7, 3); + Bg_SetPriority(7, 3); } static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, int param2) @@ -527,7 +527,7 @@ static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 ov21_021D7E3C(param0, param1); ov21_021D828C(param1, param2); - BGL_SetPriority(7, 1); + Bg_SetPriority(7, 1); } static void ov21_021D7CD8(UnkStruct_ov21_021D77E8 *param0, const UnkStruct_ov21_021D77D4 *param1, int param2) @@ -550,9 +550,9 @@ static void ov21_021D7CD8(UnkStruct_ov21_021D77E8 *param0, const UnkStruct_ov21_ v0 = ov21_021D27B8(param0->unk_00, 41, 1, &v1, param2); - sub_020198C0(v2, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(v2, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(v2, 6); + Bg_ScheduleTilemapTransfer(v2, 6); } static void ov21_021D7D8C(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, int param2) @@ -764,19 +764,19 @@ static void ov21_021D820C(UnkStruct_ov21_021D77E8 *param0, int param1) v0 = ov21_021D27B8(param0->unk_00, 37, 1, &v1, param1); - sub_020198C0(v2, 7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(v2, 7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(v2, 7); - sub_02019184(v2, 7, 0, -120); - sub_02019184(v2, 7, 3, 0); + Bg_ScheduleTilemapTransfer(v2, 7); + Bg_SetOffset(v2, 7, 0, -120); + Bg_SetOffset(v2, 7, 3, 0); } static void ov21_021D828C(UnkStruct_ov21_021D77E8 *param0, int param1) { BgConfig *v0 = param0->unk_00->unk_00; - sub_02019690(7, 64, 0, param1); - sub_02019EBC(v0, 7); + Bg_ClearTilesRange(7, 64, 0, param1); + Bg_ClearTilemap(v0, 7); } static void ov21_021D82A8(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1) @@ -844,9 +844,9 @@ static void ov21_021D8354(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 param0->unk_28 += v0; param0->unk_28 &= 0xffff; - sub_0201C660(param1->unk_00->unk_00, 7, 0, param0->unk_28 / 182); - sub_0201C718(param1->unk_00->unk_00, 7, 9, 128); - sub_0201C718(param1->unk_00->unk_00, 7, 12, 104); + Bg_ScheduleAffineRotation(param1->unk_00->unk_00, 7, 0, param0->unk_28 / 182); + Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 9, 128); + Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 12, 104); param0->unk_2A = param0->unk_28; } @@ -867,9 +867,9 @@ static void ov21_021D83C0(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 param0->unk_28 = param0->unk_2A + v0; param0->unk_28 &= 0xffff; - sub_0201C660(param1->unk_00->unk_00, 7, 0, param0->unk_28 / 182); - sub_0201C718(param1->unk_00->unk_00, 7, 9, 128); - sub_0201C718(param1->unk_00->unk_00, 7, 12, 104); + Bg_ScheduleAffineRotation(param1->unk_00->unk_00, 7, 0, param0->unk_28 / 182); + Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 9, 128); + Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 12, 104); if (param2->unk_1C->unk_0C == 0) { param0->unk_2A = param0->unk_28; diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c index ffe66e53ad..534fa56152 100644 --- a/src/overlay021/ov21_021D85B0.c +++ b/src/overlay021/ov21_021D85B0.c @@ -534,10 +534,10 @@ static int ov21_021D89F4(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo static void ov21_021D8A7C(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, const UnkStruct_ov21_021D87CC *param3, int param4) { - sub_02019EBC(param1->unk_00->unk_00, 2); - sub_02019EBC(param1->unk_00->unk_00, 1); - BGL_FillWindow(¶m1->unk_00->unk_04, 0); - sub_0201C2B4(¶m1->unk_00->unk_04, 7); + Bg_ClearTilemap(param1->unk_00->unk_00, 2); + Bg_ClearTilemap(param1->unk_00->unk_00, 1); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); + Window_SetPalette(¶m1->unk_00->unk_04, 7); ov21_021D8C00(param1); ov21_021D8B8C(param1, param2, param4); @@ -553,8 +553,8 @@ static void ov21_021D8A7C(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D87 ov21_021D9240(param1, param2->unk_1C, param4); ov21_021D924C(param0, param2->unk_20); - BGL_SetPriority(1, 1); - BGL_SetPriority(2, 0); + Bg_SetPriority(1, 1); + Bg_SetPriority(2, 0); } static void ov21_021D8B40(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1) @@ -563,11 +563,11 @@ static void ov21_021D8B40(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D87 ov21_021D8CC8(param0, param1); ov21_021D8BEC(param0, param1); - sub_02019EBC(param1->unk_00->unk_00, 1); - BGL_FillWindow(¶m1->unk_00->unk_04, 0); - sub_0201C2B4(¶m1->unk_00->unk_04, 0); - BGL_SetPriority(1, 0); - BGL_SetPriority(2, 1); + Bg_ClearTilemap(param1->unk_00->unk_00, 1); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); + Window_SetPalette(¶m1->unk_00->unk_04, 0); + Bg_SetPriority(1, 0); + Bg_SetPriority(2, 1); } static void ov21_021D8B8C(UnkStruct_ov21_021D879C *param0, const UnkStruct_ov21_021D8788 *param1, int param2) @@ -681,7 +681,7 @@ static void ov21_021D8DD4(UnkStruct_ov21_021D879C *param0, int param1, int param Strbuf *v1; int v2; - BGL_WindowColor(&v0->unk_04, 0, 24, 8, 208, 32); + Window_FillRectWithColor(&v0->unk_04, 0, 24, 8, 208, 32); switch (param1) { case 0: @@ -716,7 +716,7 @@ static void ov21_021D8E68(UnkStruct_ov21_021D879C *param0, int param1) UnkStruct_ov21_021D13FC *v0 = param0->unk_00; Strbuf *v1; - BGL_WindowColor(&v0->unk_04, 0, 24, 8, 208, 32); + Window_FillRectWithColor(&v0->unk_04, 0, 24, 8, 208, 32); v1 = ov21_021D1CE0(93, param1); @@ -788,7 +788,7 @@ static void ov21_021D8F98(UnkStruct_ov21_021D879C *param0, int param1, int param v0 = ov21_021D27B8(param0->unk_00, 43, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v2 = 6; @@ -816,9 +816,9 @@ static void ov21_021D8F98(UnkStruct_ov21_021D879C *param0, int param1, int param v0 = ov21_021D27B8(param0->unk_00, v4, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, v2, v3, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, v2, v3, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 3); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } static void ov21_021D9054(UnkStruct_ov21_021D879C *param0, int param1, int param2) @@ -827,7 +827,7 @@ static void ov21_021D9054(UnkStruct_ov21_021D879C *param0, int param1, int param Strbuf *v1; int v2; - BGL_WindowColor(&v0->unk_04, 0, 88, 52, 80, 16); + Window_FillRectWithColor(&v0->unk_04, 0, 88, 52, 80, 16); v2 = 81 + param1; v1 = ov21_021D1CE0(v2, param2); @@ -847,7 +847,7 @@ static void ov21_021D90B4(UnkStruct_ov21_021D879C *param0, int param1, int param int v2; int v3; - BGL_WindowColor(&v0->unk_04, 0, 88, 77, 80, 16); + Window_FillRectWithColor(&v0->unk_04, 0, 88, 77, 80, 16); switch (param1) { case 0: @@ -899,7 +899,7 @@ static void ov21_021D915C(UnkStruct_ov21_021D879C *param0, int param1, int param int v2; int v3; - BGL_WindowColor(&v0->unk_04, 0, 88, param3, 80, 16); + Window_FillRectWithColor(&v0->unk_04, 0, 88, param3, 80, 16); switch (param1) { case 0: @@ -1059,8 +1059,8 @@ static void ov21_021D9390(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D87 ov21_021D93F4(param1, param3); } else if (param2->unk_34 == 0) { CellActor_SetDrawFlag(param0->unk_58, 0); - BGL_FillWindow(¶m1->unk_00->unk_04, 0); - sub_0201A9A4(¶m1->unk_00->unk_04); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); + Window_ScheduleCopyToVRAM(¶m1->unk_00->unk_04); } v1 = 4 - param2->unk_34; @@ -1076,7 +1076,7 @@ static void ov21_021D93F4(UnkStruct_ov21_021D879C *param0, int param1) Strbuf *v1; int v2; - BGL_FillWindow(¶m0->unk_00->unk_04, 0); + Window_FillTilemap(¶m0->unk_00->unk_04, 0); v1 = ov21_021D1CE0(94, param1); @@ -1087,15 +1087,15 @@ static void ov21_021D93F4(UnkStruct_ov21_021D879C *param0, int param1) } Strbuf_Free(v1); - BGL_SetPriority(1, 0); - BGL_SetPriority(2, 1); + Bg_SetPriority(1, 0); + Bg_SetPriority(2, 1); } static void ov21_021D9454(UnkStruct_ov21_021D879C *param0, UnkStruct_ov21_021D9320 *param1, int param2) { - BGL_SetPriority(1, 1); - BGL_SetPriority(2, 0); - BGL_FillWindow(¶m0->unk_00->unk_04, 0); + Bg_SetPriority(1, 1); + Bg_SetPriority(2, 0); + Window_FillTilemap(¶m0->unk_00->unk_04, 0); ov21_021D8F98(param0, param1->unk_00, param2); ov21_021D8DD4(param0, param1->unk_00, param2); diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c index 669b805368..7b5435e4f9 100644 --- a/src/overlay021/ov21_021D94BC.c +++ b/src/overlay021/ov21_021D94BC.c @@ -597,9 +597,9 @@ static void ov21_021D9A74(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_ v0 = ov21_021D27B8(param0->unk_00, 75, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 6); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6); } static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c index d1ec708a30..accc7005f9 100644 --- a/src/overlay021/ov21_021DC9BC.c +++ b/src/overlay021/ov21_021DC9BC.c @@ -492,38 +492,38 @@ static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_ v0 = ov21_021D27B8(param0->unk_00, 64, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); if (param1->unk_00->unk_1764) { v0 = ov21_021D27B8(param0->unk_00, 65, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 13, 8, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 13, 8, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); } if (param1->unk_00->unk_176C) { v0 = ov21_021D27B8(param0->unk_00, 66, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 28, 7, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 28, 7, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); } if (param1->unk_00->unk_1760) { v0 = ov21_021D27B8(param0->unk_00, 67, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 11, 8, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 11, 8, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); } if (param1->unk_00->unk_1768) { v0 = ov21_021D27B8(param0->unk_00, 68, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 25, 16, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 25, 16, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); } - sub_0201C3C0(param0->unk_00->unk_00, 3); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } static void ov21_021DCFC8(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, int param2) @@ -796,18 +796,18 @@ static BOOL ov21_021DD5E4(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCA static void ov21_021DD668(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, int param2) { - BGL_FillWindow(¶m1->unk_00->unk_04, 0); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); param0->unk_7F4 = ov21_021D2808(param1->unk_00, 30, 1, ¶m0->unk_7F8, param2); param0->unk_7FC = ov21_021D2808(param1->unk_00, 31, 1, ¶m0->unk_800, param2); - sub_0201C2B4(¶m1->unk_00->unk_04, 8); + Window_SetPalette(¶m1->unk_00->unk_04, 8); } static void ov21_021DD6C0(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1) { - BGL_FillWindow(¶m1->unk_00->unk_04, 0); - sub_02019EBC(param1->unk_00->unk_00, 1); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); + Bg_ClearTilemap(param1->unk_00->unk_00, 1); Heap_FreeToHeap(param0->unk_7F4); param0->unk_7F4 = NULL; @@ -818,7 +818,7 @@ static void ov21_021DD6C0(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCA param0->unk_7FC = NULL; param0->unk_800 = NULL; - sub_0201C2B4(¶m1->unk_00->unk_04, 0); + Window_SetPalette(¶m1->unk_00->unk_04, 0); } static void ov21_021DD710(UnkStruct_ov21_021DD420 *param0, const UnkStruct_ov21_021DCACC *param1, const UnkStruct_ov21_021DDABC *param2, int param3) @@ -1091,12 +1091,12 @@ static u8 *ov21_021DD908(u32 param0, const UnkStruct_ov21_021DCACC *param1, u32 static void ov21_021DD964(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1) { - BGL_FillWindow(¶m1->unk_00->unk_04, 0); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); ov21_021D517C(¶m1->unk_00->unk_04, param0->unk_800->pRawData, param0->unk_800->W * 8, param0->unk_800->H * 8, 5, param0->unk_470, 30, 30, 89, 30); ov21_021D517C(¶m1->unk_00->unk_04, param0->unk_7F8->pRawData, param0->unk_7F8->W * 8, param0->unk_7F8->H * 8, 5, param0->unk_EC, 30, 30, 89, 30); - sub_0201A954(¶m1->unk_00->unk_04); + Window_CopyToVRAM(¶m1->unk_00->unk_04); } static void ov21_021DD9E8(UnkStruct_ov21_021DD420 *param0, const UnkStruct_ov21_021DDABC *param1) diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c index 48d83be82c..555ec3b21d 100644 --- a/src/overlay021/ov21_021DDD2C.c +++ b/src/overlay021/ov21_021DDD2C.c @@ -396,9 +396,9 @@ static void ov21_021DE13C(UnkStruct_ov21_021DDDF0 *param0, int param1) v0 = ov21_021D27B8(param0->unk_00, 69, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 6); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6); } static void ov21_021DE1A4(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, int param2) diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c index 7c12b15fb1..30173debef 100644 --- a/src/overlay021/ov21_021DE668.c +++ b/src/overlay021/ov21_021DE668.c @@ -378,13 +378,13 @@ static void ov21_021DEA0C(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7 { ov21_021DF35C(param0); - BGL_FillWindow(¶m1->unk_00->unk_04, 0); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); ov21_021DED68(param0, param1); ov21_021DF1F8(param0); ov21_021DF054(param0, param1); - sub_02019EBC(param1->unk_00->unk_00, 1); + Bg_ClearTilemap(param1->unk_00->unk_00, 1); } static void ov21_021DEA44(UnkStruct_ov21_021DE760 *param0, int param1) @@ -395,21 +395,21 @@ static void ov21_021DEA44(UnkStruct_ov21_021DE760 *param0, int param1) ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param1); v0 = ov21_021D27B8(param0->unk_00, 50, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = ov21_021D27B8(param0->unk_00, 51, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = ov21_021D27B8(param0->unk_00, 52, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = ov21_021D27B8(param0->unk_00, 54, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 3); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } static void ov21_021DEB58(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_021DE6D4 *param1, int param2) diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c index f5a89d1bc6..426655153a 100644 --- a/src/overlay021/ov21_021DF734.c +++ b/src/overlay021/ov21_021DF734.c @@ -433,9 +433,9 @@ static void ov21_021DFAE8(UnkStruct_ov21_021DF858 *param0, int param1) v0 = ov21_021D27B8(param0->unk_00, 50, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 3); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } static void ov21_021DFB50(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2) diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c index 5770e3cc3b..3b7a78a657 100644 --- a/src/overlay021/ov21_021E0C68.c +++ b/src/overlay021/ov21_021E0C68.c @@ -380,10 +380,10 @@ static void ov21_021E0F4C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D static void ov21_021E0F94(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1) { ov21_021E14BC(param0); - BGL_FillWindow(¶m1->unk_00->unk_04, 0); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); ov21_021E1328(param0, param1); - sub_02019EBC(param1->unk_00->unk_00, 1); + Bg_ClearTilemap(param1->unk_00->unk_00, 1); } static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C *param0, int param1) @@ -394,24 +394,24 @@ static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C *param0, int param1) ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param1); v0 = ov21_021D27B8(param0->unk_00, 50, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = ov21_021D27B8(param0->unk_00, 51, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = ov21_021D27B8(param0->unk_00, 55, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = ov21_021D27B8(param0->unk_00, 56, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 3); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int param2) diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c index 35993fa351..222e70fdb1 100644 --- a/src/overlay021/ov21_021E1924.c +++ b/src/overlay021/ov21_021E1924.c @@ -647,19 +647,19 @@ static void ov21_021E20A4(UnkStruct_ov21_021E1A90 *param0, int param1) v0 = ov21_021D27B8(param0->unk_00, 62, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = ov21_021D27B8(param0->unk_00, 60, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((132 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((132 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = ov21_021D27B8(param0->unk_00, 63, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((76 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((76 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 6); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6); } static void ov21_021E2180(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2) diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c index 160a1975c6..ffe37b3f2a 100644 --- a/src/overlay021/ov21_021E29DC.c +++ b/src/overlay021/ov21_021E29DC.c @@ -643,7 +643,7 @@ static void ov21_021E30BC(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E32 ov21_021E3224(param0, param1); ov21_021E3304(param1); - sub_02019EBC(param0->unk_00->unk_00, 2); + Bg_ClearTilemap(param0->unk_00->unk_00, 2); } static void ov21_021E30E4(UnkStruct_ov21_021E2BBC *param0, const UnkStruct_ov21_021E2BA8 *param1, int param2) @@ -661,9 +661,9 @@ static void ov21_021E30E4(UnkStruct_ov21_021E2BBC *param0, const UnkStruct_ov21_ v0 = ov21_021D27B8(param0->unk_00, 57, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 2, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 2, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 2); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 2); } static void ov21_021E3178(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1, int param2) @@ -1213,7 +1213,7 @@ static void ov21_021E393C(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E34 ov21_021E3BDC(param0); ov21_021E3BC0(param0); ov21_021E3AAC(param0, param1); - sub_02019EBC(param1->unk_00->unk_00, 5); + Bg_ClearTilemap(param1->unk_00->unk_00, 5); } static void ov21_021E3960(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_021E342C *param1, int param2) @@ -1233,9 +1233,9 @@ static void ov21_021E3960(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_ v0 = ov21_021D27B8(param0->unk_00, 59, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 5, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 5, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 5); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 5); } static void ov21_021E39FC(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, int param2) diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c index e92b60ed61..685fddf1c8 100644 --- a/src/overlay021/ov21_021E3FFC.c +++ b/src/overlay021/ov21_021E3FFC.c @@ -521,17 +521,17 @@ static void ov21_021E45FC(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_ ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param2); v0 = ov21_021D27B8(param0->unk_00, 70, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 3); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } static void ov21_021E4664(UnkStruct_ov21_021E4108 *param0) { - sub_0201C63C(param0->unk_00->unk_00, 1, 0, 0); - BGL_WindowColor(¶m0->unk_00->unk_04, 0, 0, 0, 256, 192); - sub_02019EBC(param0->unk_00->unk_00, 1); - sub_0201C2B4(¶m0->unk_00->unk_04, 0); + Bg_ScheduleScroll(param0->unk_00->unk_00, 1, 0, 0); + Window_FillRectWithColor(¶m0->unk_00->unk_04, 0, 0, 0, 256, 192); + Bg_ClearTilemap(param0->unk_00->unk_00, 1); + Window_SetPalette(¶m0->unk_00->unk_04, 0); } static void ov21_021E46A8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, int param2) @@ -628,7 +628,7 @@ static void ov21_021E48B0(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41 int v2; int v3; - BGL_WindowColor(¶m1->unk_00->unk_04, 0, param6, param7 - 32, 1 * (param5), 32 * 2); + Window_FillRectWithColor(¶m1->unk_00->unk_04, 0, param6, param7 - 32, 1 * (param5), 32 * 2); v3 = param4 - param3; @@ -674,7 +674,7 @@ static void ov21_021E495C(Window *param0, u8 param1, int param2, int param3, int v2++; v2 *= 1; - BGL_WindowColor(param0, 6, param2, v1, 1, v2); + Window_FillRectWithColor(param0, 6, param2, v1, 1, v2); *param4 = v0; } @@ -683,7 +683,7 @@ static void ov21_021E49D0(UnkStruct_ov21_021E4108 *param0, int param1, int param { int v0; - BGL_WindowColor(¶m0->unk_00->unk_04, 0, param3, param4 - 32, 1 * (param2 - param1), 32 * 2); + Window_FillRectWithColor(¶m0->unk_00->unk_04, 0, param3, param4 - 32, 1 * (param2 - param1), 32 * 2); for (v0 = param1; v0 < param2; v0++) { ov21_021E495C(¶m0->unk_00->unk_04, 0, param3, param4, param5); @@ -710,17 +710,17 @@ static void ov21_021E4A28(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41 ov21_021E49D0(param1, 0, 4, v0, 151, ¶m0->unk_328); } - sub_0201C63C(param1->unk_00->unk_00, 1, 0, param0->unk_324); - sub_0201A9A4(¶m1->unk_00->unk_04); + Bg_ScheduleScroll(param1->unk_00->unk_00, 1, 0, param0->unk_324); + Window_ScheduleCopyToVRAM(¶m1->unk_00->unk_04); param0->unk_32C = param2->unk_04; } static void ov21_021E4ABC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1) { - sub_0201C2B4(¶m1->unk_00->unk_04, 9); + Window_SetPalette(¶m1->unk_00->unk_04, 9); ov21_021E49D0(param1, 0, 256, 0, 151, ¶m0->unk_328); - sub_0201A954(¶m1->unk_00->unk_04); + Window_CopyToVRAM(¶m1->unk_00->unk_04); } static void ov21_021E4AF4(UnkStruct_ov21_021E4360 *param0) diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c index 900b2f66c0..6fdecd67fb 100644 --- a/src/overlay021/ov21_021E4CA4.c +++ b/src/overlay021/ov21_021E4CA4.c @@ -782,26 +782,26 @@ static void ov21_021E5538(UnkStruct_ov21_021E4DA4 *param0, int param1) ov21_021D2724(param0->unk_00, 34, param0->unk_00->unk_00, 6, 0, 0, 1, param1); v0 = ov21_021D27B8(param0->unk_00, 71, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 6); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6); ov21_021D2724(param0->unk_00, 35, param0->unk_00->unk_00, 7, 0, 0, 1, param1); v0 = ov21_021D27B8(param0->unk_00, 72, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 7); - sub_02019184(param0->unk_00->unk_00, 7, 0, -48); - sub_02019184(param0->unk_00->unk_00, 7, 3, -16); - BGL_SetPriority(7, 3); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 7); + Bg_SetOffset(param0->unk_00->unk_00, 7, 0, -48); + Bg_SetOffset(param0->unk_00->unk_00, 7, 3, -16); + Bg_SetPriority(7, 3); } static void ov21_021E5620(UnkStruct_ov21_021E4DA4 *param0) { - sub_02019EBC(param0->unk_00->unk_00, 6); - sub_02019EBC(param0->unk_00->unk_00, 7); - BGL_SetPriority(7, 1); + Bg_ClearTilemap(param0->unk_00->unk_00, 6); + Bg_ClearTilemap(param0->unk_00->unk_00, 7); + Bg_SetPriority(7, 1); } static void ov21_021E5644(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2) @@ -1115,9 +1115,9 @@ static void ov21_021E5B6C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D param0->unk_4C += (v0 - param0->unk_48) * -16; param0->unk_4C &= 0xffff; - sub_0201C660(param1->unk_00->unk_00, 7, 0, param0->unk_4C / 182); - sub_0201C718(param1->unk_00->unk_00, 7, 9, 131); - sub_0201C718(param1->unk_00->unk_00, 7, 12, 99); + Bg_ScheduleAffineRotation(param1->unk_00->unk_00, 7, 0, param0->unk_4C / 182); + Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 9, 131); + Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 12, 99); param0->unk_48 = v0; } diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c index b12fed06ec..40dada1f14 100644 --- a/src/overlay021/ov21_021E6014.c +++ b/src/overlay021/ov21_021E6014.c @@ -349,8 +349,8 @@ static void ov21_021E638C(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E61 ov21_021E65EC(param0); ov21_021E64D4(param0, param1); - BGL_FillWindow(¶m1->unk_00->unk_04, 0); - sub_02019EBC(param1->unk_00->unk_00, 1); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); + Bg_ClearTilemap(param1->unk_00->unk_00, 1); ov21_021E6844(param1); } @@ -364,9 +364,9 @@ static void ov21_021E63C0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_ v0 = ov21_021D27B8(param0->unk_00, 74, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 3); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } static void ov21_021E6428(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, int param2) diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c index 11b2553454..e6e0a26574 100644 --- a/src/overlay021/ov21_021E68F4.c +++ b/src/overlay021/ov21_021E68F4.c @@ -528,9 +528,9 @@ static void ov21_021E6EF0(UnkStruct_ov21_021E6A34 *param0, int param1) v0 = ov21_021D27B8(param0->unk_00, 61, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 6); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6); } static void ov21_021E6F58(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2) diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c index 131c50e4e2..7a4acd1a14 100644 --- a/src/overlay021/ov21_021E737C.c +++ b/src/overlay021/ov21_021E737C.c @@ -523,8 +523,8 @@ static void ov21_021E785C(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 ov21_021E7CCC(param0); ov21_021E7AA0(param0, param1); - BGL_FillWindow(¶m1->unk_00->unk_04, 0); - sub_02019EBC(param1->unk_00->unk_00, 1); + Window_FillTilemap(¶m1->unk_00->unk_04, 0); + Bg_ClearTilemap(param1->unk_00->unk_00, 1); sub_02015240(param1->unk_0C, 0); sub_020152BC(param1->unk_0C, 0); @@ -539,9 +539,9 @@ static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_ v0 = ov21_021D27B8(param0->unk_00, 73, 1, &v1, param2); - sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 3); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3) diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c index a31064a7df..965f40a98c 100644 --- a/src/overlay021/ov21_021E8484.c +++ b/src/overlay021/ov21_021E8484.c @@ -500,9 +500,9 @@ static void ov21_021E898C(UnkStruct_ov21_021E8584 *param0, int param1) v0 = ov21_021D27B8(param0->unk_00, 58, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_00->unk_00, 6); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6); } static void ov21_021E89F4(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2) diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 503f593ae8..420bf47970 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -293,10 +293,10 @@ static void ov21_021E90B0(BgConfig *param0, int param1) 0 }; - sub_02019044(param0, 1); - sub_020183C4(param0, 1, &v0, 0); - sub_02019690(1, 32, 0, param1); - sub_02019EBC(param0, 1); + Bg_FreeTilemapBuffer(param0, 1); + Bg_InitFromTemplate(param0, 1, &v0, 0); + Bg_ClearTilesRange(1, 32, 0, param1); + Bg_ClearTilemap(param0, 1); } { @@ -316,15 +316,15 @@ static void ov21_021E90B0(BgConfig *param0, int param1) 0 }; - sub_02019044(param0, 2); - sub_020183C4(param0, 2, &v1, 0); - sub_02019690(2, 32, 0, param1); - sub_02019EBC(param0, 2); + Bg_FreeTilemapBuffer(param0, 2); + Bg_InitFromTemplate(param0, 2, &v1, 0); + Bg_ClearTilesRange(2, 32, 0, param1); + Bg_ClearTilemap(param0, 2); } - BGL_SetPriority(0, 0); + Bg_SetPriority(0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 0); { BgTemplate v2 = { @@ -343,38 +343,38 @@ static void ov21_021E90B0(BgConfig *param0, int param1) 0 }; - sub_02019044(param0, 3); - sub_020183C4(param0, 3, &v2, 0); - sub_02019690(3, 32, 0, param1); - sub_02019EBC(param0, 3); + Bg_FreeTilemapBuffer(param0, 3); + Bg_InitFromTemplate(param0, 3, &v2, 0); + Bg_ClearTilesRange(3, 32, 0, param1); + Bg_ClearTilemap(param0, 3); } } static void ov21_021E9194(BgConfig *param0) { - sub_02019044(param0, 1); - sub_02019044(param0, 2); - sub_02019044(param0, 3); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 3); } static Window *ov21_021E91B0(BgConfig *param0, int param1) { Window *v0; - v0 = sub_0201A778(param1, 1); + v0 = Window_New(param1, 1); - BGL_AddWindow(param0, v0, 1, 0, 0, 32, 32, 0xc, 0); - BGL_FillWindow(v0, 0); - sub_0201A954(v0); + Window_Add(param0, v0, 1, 0, 0, 32, 32, 0xc, 0); + Window_FillTilemap(v0, 0); + Window_CopyToVRAM(v0); return v0; } static void ov21_021E91F0(Window *param0) { - sub_0201ACF4(param0); - BGL_DeleteWindow(param0); - sub_0201A928(param0, 1); + Window_ClearAndCopyToVRAM(param0); + Window_Remove(param0); + Windows_Delete(param0, 1); } static void ov21_021E9208(SpriteResourceCollection **param0, int param1) @@ -642,24 +642,24 @@ static void ov21_021E96A8(BgConfig *param0, int param1, NARC *param2) v0 = sub_020071D0(param2, 50, 1, &v1, param1); - sub_020198C0(param0, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = sub_020071D0(param2, 51, 1, &v1, param1); - sub_020198C0(param0, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = sub_020071D0(param2, 52, 1, &v1, param1); - sub_020198C0(param0, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = sub_020071D0(param2, 54, 1, &v1, param1); - sub_020198C0(param0, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0, 3); + Bg_ScheduleTilemapTransfer(param0, 3); } static void ov21_021E97C4(BgConfig *param0, int param1, NARC *param2) @@ -671,9 +671,9 @@ static void ov21_021E97C4(BgConfig *param0, int param1, NARC *param2) v0 = sub_020071D0(param2, 57, 1, &v1, param1); - sub_020198C0(param0, 2, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_LoadToTilemapRect(param0, 2, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); - sub_0201C3C0(param0, 2); + Bg_ScheduleTilemapTransfer(param0, 2); } static void ov21_021E9828(SysTask *param0, void *param1) diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c index ca98cb4887..626c9ebc53 100644 --- a/src/overlay022/ov22_02255094.c +++ b/src/overlay022/ov22_02255094.c @@ -95,7 +95,7 @@ void ov22_022550D4(UnkStruct_ov22_0225A0E4 *param0) ov22_02255BF4(param0, 13); ov22_022559F8(param0); - param0->unk_40 = sub_02018340(14); + param0->unk_40 = BgConfig_New(14); ov22_02255860(param0); } @@ -265,7 +265,7 @@ void ov22_02255390(void) void ov22_022553F8(UnkStruct_ov22_0225A0E4 *param0) { - sub_0201C2B8(param0->unk_40); + Bg_RunScheduledUpdates(param0->unk_40); sub_02008A94(param0->unk_20); sub_0200A858(); } @@ -332,10 +332,10 @@ void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BgConfig *param1, int param2 0 }; - sub_02019044(param0->unk_40, 2); - sub_020183C4(param0->unk_40, 2, &v0, 0); - sub_02019690(2, 32, 0, param2); - sub_02019EBC(param0->unk_40, 2); + Bg_FreeTilemapBuffer(param0->unk_40, 2); + Bg_InitFromTemplate(param0->unk_40, 2, &v0, 0); + Bg_ClearTilesRange(2, 32, 0, param2); + Bg_ClearTilemap(param0->unk_40, 2); } } @@ -354,7 +354,7 @@ void ov22_022554F8(UnkStruct_ov22_0225A0E4 *param0) void ov22_02255524(UnkStruct_ov22_0225A0E4 *param0) { - sub_02019044(param0->unk_40, 2); + Bg_FreeTilemapBuffer(param0->unk_40, 2); } void ov22_02255530(UnkStruct_ov22_0225A0E4 *param0) @@ -397,7 +397,7 @@ void ov22_022555D4(UnkStruct_ov22_0225A0E4 *param0, int param1) { param0->unk_5C = NARC_ctor(NARC_INDEX_GRAPHIC__IMAGECLIP, 14); ov22_022559F8(param0); - param0->unk_40 = sub_02018340(14); + param0->unk_40 = BgConfig_New(14); ov22_02255860(param0); } @@ -411,7 +411,7 @@ void ov22_022555FC(UnkStruct_ov22_0225A0E4 *param0) void ov22_0225561C(UnkStruct_ov22_0225A0E4 *param0) { - sub_0201C2B8(param0->unk_40); + Bg_RunScheduledUpdates(param0->unk_40); sub_0200A858(); } @@ -468,7 +468,7 @@ static void ov22_022556DC(void) GX_BG0_AS_3D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } GX_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K); @@ -570,9 +570,9 @@ static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0) 0 }; - sub_020183C4(param0->unk_40, 1, &v0, 0); - sub_02019690(1, 32, 0, 14); - sub_02019EBC(param0->unk_40, 1); + Bg_InitFromTemplate(param0->unk_40, 1, &v0, 0); + Bg_ClearTilesRange(1, 32, 0, 14); + Bg_ClearTilemap(param0->unk_40, 1); } { @@ -592,9 +592,9 @@ static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0) 0 }; - sub_020183C4(param0->unk_40, 2, &v1, 0); - sub_02019690(2, 32, 0, 14); - sub_02019EBC(param0->unk_40, 2); + Bg_InitFromTemplate(param0->unk_40, 2, &v1, 0); + Bg_ClearTilesRange(2, 32, 0, 14); + Bg_ClearTilemap(param0->unk_40, 2); } { @@ -614,9 +614,9 @@ static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0) 0 }; - sub_020183C4(param0->unk_40, 3, &v2, 0); - sub_02019690(3, 32, 0, 14); - sub_02019EBC(param0->unk_40, 3); + Bg_InitFromTemplate(param0->unk_40, 3, &v2, 0); + Bg_ClearTilesRange(3, 32, 0, 14); + Bg_ClearTilemap(param0->unk_40, 3); } { @@ -636,9 +636,9 @@ static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0) 0 }; - sub_020183C4(param0->unk_40, 4, &v3, 0); - sub_02019690(4, 32, 0, 14); - sub_02019EBC(param0->unk_40, 4); + Bg_InitFromTemplate(param0->unk_40, 4, &v3, 0); + Bg_ClearTilesRange(4, 32, 0, 14); + Bg_ClearTilemap(param0->unk_40, 4); } { @@ -658,19 +658,19 @@ static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0) 0 }; - sub_020183C4(param0->unk_40, 5, &v4, 0); - sub_02019690(5, 32, 0, 14); - sub_02019EBC(param0->unk_40, 5); + Bg_InitFromTemplate(param0->unk_40, 5, &v4, 0); + Bg_ClearTilesRange(5, 32, 0, 14); + Bg_ClearTilemap(param0->unk_40, 5); } } static void ov22_02255984(UnkStruct_ov22_0225A0E4 *param0) { - sub_02019044(param0->unk_40, 1); - sub_02019044(param0->unk_40, 2); - sub_02019044(param0->unk_40, 3); - sub_02019044(param0->unk_40, 4); - sub_02019044(param0->unk_40, 5); + Bg_FreeTilemapBuffer(param0->unk_40, 1); + Bg_FreeTilemapBuffer(param0->unk_40, 2); + Bg_FreeTilemapBuffer(param0->unk_40, 3); + Bg_FreeTilemapBuffer(param0->unk_40, 4); + Bg_FreeTilemapBuffer(param0->unk_40, 5); } static void ov22_022559B4(UnkStruct_ov22_0225A0E4 *param0) diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index 3f6ecb51d4..bff486031c 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -228,7 +228,7 @@ int ov22_02255D44(OverlayManager *param0, int *param1) ov22_022589E0(&v0->unk_4FC, &v0->unk_458, &v0->unk_3CC, &v0->unk_00, &v0->unk_5C4, 1); v0->unk_714 = sub_02015920(13); - v0->unk_718 = sub_0201A778(13, 1); + v0->unk_718 = Window_New(13, 1); v0->unk_70C = 0; sub_02004550(53, 0, 0); @@ -379,7 +379,7 @@ int ov22_02256098(OverlayManager *param0, int *param1) } sub_02015938(v0->unk_714); - sub_0201A928(v0->unk_718, 1); + Windows_Delete(v0->unk_718, 1); ov22_02256C38(v0); ov22_02258A34(&v0->unk_4FC); @@ -464,7 +464,7 @@ int ov22_02256174(OverlayManager *param0, int *param1) ov22_022589E0(&v0->unk_4FC, &v0->unk_458, &v0->unk_3CC, &v0->unk_00, &v0->unk_5C4, 0); v0->unk_714 = sub_02015920(13); - v0->unk_718 = sub_0201A778(13, 1); + v0->unk_718 = Window_New(13, 1); v0->unk_70C = 0; sub_020959F4(v0->unk_734->unk_16); @@ -640,7 +640,7 @@ int ov22_02256600(OverlayManager *param0, int *param1) ov22_02256FD8(v2->unk_04, &v0->unk_458, v0->unk_724, v2->unk_24); sub_02015938(v0->unk_714); - sub_0201A928(v0->unk_718, 1); + Windows_Delete(v0->unk_718, 1); ov22_02256C38(v0); ov22_02258A34(&v0->unk_4FC); @@ -800,7 +800,7 @@ static void ov22_022568DC(UnkStruct_ov22_02255D44 *param0) G2_SetBG2Priority(2); G2_SetBG3Priority(3); - sub_02019184(param0->unk_00.unk_40, 3, 3, -16); + Bg_SetOffset(param0->unk_00.unk_40, 3, 3, -16); ov22_02258354(¶m0->unk_3CC, 0); ov22_022583A0(¶m0->unk_3CC, 0, 2, 0, NULL); @@ -1028,7 +1028,7 @@ static void ov22_02256C70(SysTask *param0, void *param1) break; case 6: ov22_02256948(v0->unk_00, 1); - sub_0201C63C(v0->unk_00->unk_00.unk_40, 1, 3, 0); + Bg_ScheduleScroll(v0->unk_00->unk_00.unk_40, 1, 3, 0); ov22_022571D4(v0->unk_00); v0->unk_0C++; break; @@ -1088,7 +1088,7 @@ static void ov22_02256DE0(SysTask *param0, void *param1) ov22_022568DC(v0->unk_00); ov22_02256AD4(v0->unk_00); ov22_02256948(v0->unk_00, 0); - sub_0201C63C(v0->unk_00->unk_00.unk_40, 1, 3, -(5 * 8)); + Bg_ScheduleScroll(v0->unk_00->unk_00.unk_40, 1, 3, -(5 * 8)); v0->unk_0C++; break; case 3: @@ -1230,10 +1230,10 @@ static BOOL ov22_02257098(UnkStruct_ov22_02256C48 *param0, int param1, int param } if (param0->unk_08 >= 1) { - sub_0201C63C(param0->unk_00->unk_00.unk_40, 2, 2, param1); - sub_0201C63C(param0->unk_00->unk_00.unk_40, 1, 2, param1); - sub_0201C63C(param0->unk_00->unk_00.unk_40, 2, 5, param2); - sub_0201C63C(param0->unk_00->unk_00.unk_40, 1, 5, param2); + Bg_ScheduleScroll(param0->unk_00->unk_00.unk_40, 2, 2, param1); + Bg_ScheduleScroll(param0->unk_00->unk_00.unk_40, 1, 2, param1); + Bg_ScheduleScroll(param0->unk_00->unk_00.unk_40, 2, 5, param2); + Bg_ScheduleScroll(param0->unk_00->unk_00.unk_40, 1, 5, param2); } param0->unk_08++; @@ -1247,9 +1247,9 @@ static BOOL ov22_02257098(UnkStruct_ov22_02256C48 *param0, int param1, int param static void ov22_02257104(UnkStruct_ov22_02255D44 *param0) { - sub_02019EBC(param0->unk_00.unk_40, 3); - sub_02019184(param0->unk_00.unk_40, 3, 0, 0); - sub_02019184(param0->unk_00.unk_40, 3, 3, 0); + Bg_ClearTilemap(param0->unk_00.unk_40, 3); + Bg_SetOffset(param0->unk_00.unk_40, 3, 0, 0); + Bg_SetOffset(param0->unk_00.unk_40, 3, 3, 0); ov22_022574F4(param0, 0); @@ -1270,7 +1270,7 @@ static void ov22_0225718C(UnkStruct_ov22_02255D44 *param0) { ov22_02257548(param0); - sub_02019EBC(param0->unk_00.unk_40, 3); + Bg_ClearTilemap(param0->unk_00.unk_40, 3); ov22_022568DC(param0); @@ -1286,9 +1286,9 @@ static void ov22_022571D4(UnkStruct_ov22_02255D44 *param0) { UnkStruct_02015958 v0; - sub_02019EBC(param0->unk_00.unk_40, 3); - sub_02019184(param0->unk_00.unk_40, 3, 0, 0); - sub_02019184(param0->unk_00.unk_40, 3, 3, 0); + Bg_ClearTilemap(param0->unk_00.unk_40, 3); + Bg_SetOffset(param0->unk_00.unk_40, 3, 0, 0); + Bg_SetOffset(param0->unk_00.unk_40, 3, 3, 0); v0.unk_00 = param0->unk_00.unk_40; v0.unk_04 = 3; @@ -1310,7 +1310,7 @@ static void ov22_02257258(UnkStruct_ov22_02255D44 *param0) { sub_02015A54(param0->unk_714); ov22_022574EC(param0); - sub_02019EBC(param0->unk_00.unk_40, 3); + Bg_ClearTilemap(param0->unk_00.unk_40, 3); } static u32 ov22_02257278(UnkStruct_ov22_02255D44 *param0) @@ -1341,8 +1341,8 @@ static void ov22_022572A0(UnkStruct_ov22_02255D44 *param0, u32 param1, u8 param2 int v2 = Options_Frame(param0->unk_738); Font_LoadScreenIndicatorsPalette(0, 7 * 32, 14); - BGL_AddWindow(param0->unk_00.unk_40, param0->unk_718, 3, param2, param3, param4, param5, 7, (0 + (29 * 4) + (18 + 12))); - BGL_FillWindow(param0->unk_718, 15); + Window_Add(param0->unk_00.unk_40, param0->unk_718, 3, param2, param3, param4, param5, 7, (0 + (29 * 4) + (18 + 12))); + Window_FillTilemap(param0->unk_718, 15); sub_0200DD0C(param0->unk_00.unk_40, 3, (0 + (29 * 4)), 8, v2, 14); sub_0200E060(param0->unk_718, 0, (0 + (29 * 4)), 8); @@ -1352,7 +1352,7 @@ static void ov22_022572A0(UnkStruct_ov22_02255D44 *param0, u32 param1, u8 param2 Text_AddPrinterWithParamsAndColor(param0->unk_718, FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); Strbuf_Free(v1); MessageLoader_Free(v0); - sub_0201A954(param0->unk_718); + Window_CopyToVRAM(param0->unk_718); } static void ov22_02257368(UnkStruct_ov22_02255D44 *param0, u32 param1) @@ -1361,7 +1361,7 @@ static void ov22_02257368(UnkStruct_ov22_02255D44 *param0, u32 param1) Strbuf *v1; Strbuf *v2; - BGL_FillWindow(param0->unk_718, 15); + Window_FillTilemap(param0->unk_718, 15); v0 = MessageLoader_Init(0, 26, 385, 13); v2 = MessageLoader_GetNewStrbuf(v0, param1); @@ -1372,7 +1372,7 @@ static void ov22_02257368(UnkStruct_ov22_02255D44 *param0, u32 param1) Strbuf_Free(v1); Strbuf_Free(v2); MessageLoader_Free(v0); - sub_0201A954(param0->unk_718); + Window_CopyToVRAM(param0->unk_718); } static u32 ov22_022573EC(UnkStruct_ov22_02255D44 *param0, u32 param1) @@ -1384,7 +1384,7 @@ static u32 ov22_022573EC(UnkStruct_ov22_02255D44 *param0, u32 param1) GF_ASSERT(param0->unk_740 == NULL); - BGL_FillWindow(param0->unk_718, 15); + Window_FillTilemap(param0->unk_718, 15); v1 = MessageLoader_Init(0, 26, 385, 13); v3 = MessageLoader_GetNewStrbuf(v1, param1); @@ -1402,7 +1402,7 @@ static u32 ov22_022573EC(UnkStruct_ov22_02255D44 *param0, u32 param1) Strbuf_Free(v3); MessageLoader_Free(v1); - sub_0201A954(param0->unk_718); + Window_CopyToVRAM(param0->unk_718); return v0; } @@ -1415,8 +1415,8 @@ static void ov22_02257498(UnkStruct_ov22_02255D44 *param0) static void ov22_022574B0(UnkStruct_ov22_02255D44 *param0) { - sub_0201ACF4(param0->unk_718); - BGL_DeleteWindow(param0->unk_718); + Window_ClearAndCopyToVRAM(param0->unk_718); + Window_Remove(param0->unk_718); } static void ov22_022574CC(UnkStruct_ov22_02255D44 *param0, u32 param1) diff --git a/src/overlay022/ov22_022597BC.c b/src/overlay022/ov22_022597BC.c index ae4e5a937d..1fbfe1d6c1 100644 --- a/src/overlay022/ov22_022597BC.c +++ b/src/overlay022/ov22_022597BC.c @@ -68,7 +68,7 @@ void ov22_022597BC(UnkStruct_ov22_022597BC *param0, UnkStruct_ov22_022599A0 *par void ov22_02259804(UnkStruct_ov22_022597BC *param0) { - sub_02019EBC(param0->unk_00, param0->unk_1C); + Bg_ClearTilemap(param0->unk_00, param0->unk_1C); memset(param0, 0, sizeof(UnkStruct_ov22_022597BC)); } @@ -135,8 +135,8 @@ void ov22_022598F4(UnkStruct_ov22_022597BC *param0, UnkStruct_ov22_022599A0 *par v0->unk_38 = param4; v0->unk_3C = param2 / param4; v0->unk_40 = param3 / param4; - v0->unk_44 = sub_020192EC(param0->unk_00, param0->unk_1C); - v0->unk_48 = sub_020192F8(param0->unk_00, param0->unk_1C); + v0->unk_44 = Bg_GetXOffset(param0->unk_00, param0->unk_1C); + v0->unk_48 = Bg_GetYOffset(param0->unk_00, param0->unk_1C); param1->unk_28 = 128; param1->unk_24 = 0x5; @@ -204,11 +204,11 @@ static void ov22_02259A4C(SysTask *param0, void *param1) v0->unk_38--; if (v0->unk_38 >= 0) { - sub_0201C63C(v0->unk_00->unk_00, v0->unk_00->unk_1C, 2, v0->unk_3C); - sub_0201C63C(v0->unk_00->unk_00, v0->unk_00->unk_1C, 5, v0->unk_40); + Bg_ScheduleScroll(v0->unk_00->unk_00, v0->unk_00->unk_1C, 2, v0->unk_3C); + Bg_ScheduleScroll(v0->unk_00->unk_00, v0->unk_00->unk_1C, 5, v0->unk_40); } else { - sub_0201C63C(v0->unk_00->unk_00, v0->unk_00->unk_1C, 0, v0->unk_44); - sub_0201C63C(v0->unk_00->unk_00, v0->unk_00->unk_1C, 3, v0->unk_48); + Bg_ScheduleScroll(v0->unk_00->unk_00, v0->unk_00->unk_1C, 0, v0->unk_44); + Bg_ScheduleScroll(v0->unk_00->unk_00, v0->unk_00->unk_1C, 3, v0->unk_48); ov22_022597BC(v0->unk_00, &v0->unk_04); if (v0->unk_34) { @@ -222,9 +222,9 @@ static void ov22_02259A4C(SysTask *param0, void *param1) static void ov22_02259ABC(BgConfig *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4, int param5, int param6, int param7, int param8) { ov22_02259980(param2, param7); - sub_020198E8(param0, param1, param5, param6, param3, param4, param2->rawData, 0, 0, param3, param4); - sub_02019E2C(param0, param1, param5, param6, param3, param4, param8); - sub_0201C3C0(param0, param1); + Bg_CopyToTilemapRect(param0, param1, param5, param6, param3, param4, param2->rawData, 0, 0, param3, param4); + Bg_ChangeTilemapRectPalette(param0, param1, param5, param6, param3, param4, param8); + Bg_ScheduleTilemapTransfer(param0, param1); } static void ov22_02259B3C(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5) @@ -263,7 +263,7 @@ static void ov22_02259BD4(SysTask *param0, void *param1) DC_FlushRange(v0->unk_04->pRawData, v0->unk_04->szByte); - sub_0201958C(v0->unk_00, v0->unk_0C, v0->unk_04->pRawData, v0->unk_04->szByte, v0->unk_10); + Bg_LoadTiles(v0->unk_00, v0->unk_0C, v0->unk_04->pRawData, v0->unk_04->szByte, v0->unk_10); SysTask_Done(param0); Heap_FreeToHeap(v0->unk_08); Heap_FreeToHeap(v0); diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c index 4344c3ebce..bdc59f2bf2 100644 --- a/src/overlay022/ov22_02259C58.c +++ b/src/overlay022/ov22_02259C58.c @@ -435,9 +435,9 @@ static Window *ov22_0225A348(UnkStruct_ov22_0225A0E4 *param0, u32 param1, u32 pa GF_ASSERT(v0); v1 = MessageLoader_GetNewStrbuf(v0, param3); - v2 = sub_0201A778(14, 1); + v2 = Window_New(14, 1); Window_Init(v2); - BGL_AddFramelessWindow(param0->unk_40, v2, param4, param5, 0, 0); + Window_AddToTopLeftCorner(param0->unk_40, v2, param4, param5, 0, 0); { u32 v3 = Font_CalcCenterAlignment(FONT_SUBSCREEN, v1, 0, param4 * 8); @@ -452,7 +452,7 @@ static Window *ov22_0225A348(UnkStruct_ov22_0225A0E4 *param0, u32 param1, u32 pa static void ov22_0225A3D0(Window *param0) { - sub_0201A928(param0, 1); + Windows_Delete(param0, 1); } static void ov22_0225A3DC(UnkStruct_ov22_02259C58 *param0, int param1, int param2) diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c index bbfbe5788d..c316e0dbf0 100644 --- a/src/overlay022/ov22_0225A428.c +++ b/src/overlay022/ov22_0225A428.c @@ -82,7 +82,7 @@ void ov22_0225A428(UnkStruct_ov22_0225A428 *param0, UnkStruct_ov22_02256BAC *par if (param2 & 32) { ov22_0225A748(¶m0->unk_134, param1->unk_00, 2, 1, 27, 2, (18 + 12) + (1 + (27 * 4)), 1); - BGL_FillWindow(param0->unk_134, 15); + Window_FillTilemap(param0->unk_134, 15); ov22_0225A860(param0->unk_134, 26, param1->unk_14, 6, 0, 0, TEXT_COLOR(1, 2, 15), TEXT_SPEED_NO_TRANSFER); ov22_0225A860(param0->unk_134, 26, param1->unk_14, param1->unk_18, 72, 0, TEXT_COLOR(1, 2, 15), TEXT_SPEED_NO_TRANSFER); sub_0200E060(param0->unk_134, 0, 1, 1); @@ -203,17 +203,17 @@ static void ov22_0225A718(BgConfig *param0, const Options *param1) static void ov22_0225A748(Window **param0, BgConfig *param1, int param2, int param3, int param4, int param5, int param6, BOOL param7) { - *param0 = sub_0201A778(14, 1); + *param0 = Window_New(14, 1); Window_Init(*param0); - BGL_AddWindow(param1, *param0, 5, param2, param3, param4, param5, 2, param6); - BGL_FillWindow(*param0, 15); + Window_Add(param1, *param0, 5, param2, param3, param4, param5, 2, param6); + Window_FillTilemap(*param0, 15); if (param7) { sub_0200E060(*param0, 0, 1, 1); } - sub_0201A954(*param0); + Window_CopyToVRAM(*param0); } static void ov22_0225A7B8(UnkStruct_ov22_022597BC *param0) @@ -223,14 +223,14 @@ static void ov22_0225A7B8(UnkStruct_ov22_022597BC *param0) static void ov22_0225A7C0(Window *param0) { - sub_0201A928(param0, 1); + Windows_Delete(param0, 1); } static s32 ov22_0225A7CC(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6) { s32 v0; - BGL_FillWindow(param0, 15); + Window_FillTilemap(param0, 15); v0 = ov22_0225A860(param0, param1, param2, param3, param4, param5, TEXT_COLOR(1, 2, 15), param6); sub_0200E060(param0, 0, 1, 1); @@ -241,7 +241,7 @@ static s32 ov22_0225A814(Window *param0, int param1, int param2, int param3, int { s32 v0; - BGL_FillWindow(param0, 15); + Window_FillTilemap(param0, 15); v0 = ov22_0225A8B4(param0, param1, param2, param3, param4, param5, TEXT_COLOR(1, 2, 15), param6, param7); sub_0200E060(param0, 0, 1, 1); @@ -409,12 +409,12 @@ static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, CellActorCollection * ov22_0225ACE4(param0); ov22_0225A748(¶m0->unk_18, param4, 10, 8, 14, 4, (18 + 12) + ((1 + (27 * 4)) + (27 * 2)), 0); - BGL_FillWindow(param0->unk_18, 0); + Window_FillTilemap(param0->unk_18, 0); ov22_0225A860(param0->unk_18, 26, 385, 4, 0, 4, TEXT_COLOR(1, 2, 0), TEXT_SPEED_NO_TRANSFER); ov22_0225A860(param0->unk_18, 26, 385, 5, 0 + 72, 4, TEXT_COLOR(1, 2, 0), TEXT_SPEED_NO_TRANSFER); - sub_0201A954(param0->unk_18); + Window_CopyToVRAM(param0->unk_18); } static void ov22_0225AC58(UnkStruct_ov22_0225AB54 *param0, SpriteResourceCollection **param1) diff --git a/src/overlay022/ov22_0225AF8C.c b/src/overlay022/ov22_0225AF8C.c index 4a67cc4c8a..499ef5c191 100644 --- a/src/overlay022/ov22_0225AF8C.c +++ b/src/overlay022/ov22_0225AF8C.c @@ -158,8 +158,8 @@ void ov22_0225B080(UnkStruct_ov22_0225B1BC *param0, int param1, int param2) ov22_02257AD8(¶m0->unk_1F4, param0->unk_2A0, param0->unk_2A4, param1, param2); if (param0->unk_2C4) { - sub_02019184(param0->unk_00.unk_40, 2, 0, 136 - param1); - sub_02019184(param0->unk_00.unk_40, 2, 3, 16 - param2); + Bg_SetOffset(param0->unk_00.unk_40, 2, 0, 136 - param1); + Bg_SetOffset(param0->unk_00.unk_40, 2, 3, 16 - param2); } param0->unk_2A0 = param1; diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index f12a457265..6a0d52de3f 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -201,10 +201,10 @@ static void ov22_0225B85C(UnkStruct_ov22_0225B85C *param0) v0 = sub_020071D0(param0->unk_14.unk_5C, v2, 0, &v1, 14); - sub_020198C0(param0->unk_14.unk_40, 1, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); - sub_02019E2C(param0->unk_14.unk_40, 1, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8, v3); + Bg_LoadToTilemapRect(param0->unk_14.unk_40, 1, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_ChangeTilemapRectPalette(param0->unk_14.unk_40, 1, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8, v3); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_14.unk_40, 1); + Bg_ScheduleTilemapTransfer(param0->unk_14.unk_40, 1); } static void ov22_0225B910(UnkStruct_ov22_0225B85C *param0) @@ -237,26 +237,26 @@ static void ov22_0225BA00(UnkStruct_ov22_0225B85C *param0) static void ov22_0225BA40(UnkStruct_ov22_0225B85C *param0) { - param0->unk_200 = sub_0201A778(14, 1); + param0->unk_200 = Window_New(14, 1); - BGL_AddWindow(param0->unk_14.unk_40, param0->unk_200, 3, 0, 18, 32, 6, 5, 1); + Window_Add(param0->unk_14.unk_40, param0->unk_200, 3, 0, 18, 32, 6, 5, 1); Font_LoadTextPalette(0, 5 * 32, 14); - BGL_SetPriority(3, 0); - BGL_SetPriority(0, 2); - BGL_SetPriority(1, 1); - sub_02019184(param0->unk_14.unk_40, 3, 3, 0); + Bg_SetPriority(3, 0); + Bg_SetPriority(0, 2); + Bg_SetPriority(1, 1); + Bg_SetOffset(param0->unk_14.unk_40, 3, 3, 0); } static void ov22_0225BAA8(UnkStruct_ov22_0225B85C *param0) { - sub_0201ACF4(param0->unk_200); - BGL_DeleteWindow(param0->unk_200); - sub_0201A928(param0->unk_200, 1); + Window_ClearAndCopyToVRAM(param0->unk_200); + Window_Remove(param0->unk_200); + Windows_Delete(param0->unk_200, 1); } static void ov22_0225BAD0(UnkStruct_ov22_0225B85C *param0) { - BGL_FillWindow(param0->unk_200, 0); + Window_FillTilemap(param0->unk_200, 0); if (param0->unk_0C == 0) { ov22_0225BB00(param0); @@ -264,7 +264,7 @@ static void ov22_0225BAD0(UnkStruct_ov22_0225B85C *param0) ov22_0225BC18(param0); } - sub_0201A954(param0->unk_200); + Window_CopyToVRAM(param0->unk_200); } static void ov22_0225BB00(UnkStruct_ov22_0225B85C *param0) diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index d438aef5a6..ca794b9727 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -1157,7 +1157,7 @@ static void ov23_0223EC34(BgConfig *param0) GX_BG0_AS_2D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -1177,9 +1177,9 @@ static void ov23_0223EC34(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v2, 0); - sub_02019690(0, 32, 0, 29); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v2, 0); + Bg_ClearTilesRange(0, 32, 0, 29); + Bg_ClearTilemap(param0, 0); } { @@ -1199,9 +1199,9 @@ static void ov23_0223EC34(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v3, 0); - sub_02019690(1, 32, 0, 29); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v3, 0); + Bg_ClearTilesRange(1, 32, 0, 29); + Bg_ClearTilemap(param0, 1); } { BgTemplate v4 = { @@ -1220,9 +1220,9 @@ static void ov23_0223EC34(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v4, 0); - sub_02019690(2, 32, 0, 29); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v4, 0); + Bg_ClearTilesRange(2, 32, 0, 29); + Bg_ClearTilemap(param0, 2); } { BgTemplate v5 = { @@ -1241,13 +1241,13 @@ static void ov23_0223EC34(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v5, 0); - sub_02019690(3, 32, 0, 29); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v5, 0); + Bg_ClearTilesRange(3, 32, 0, 29); + Bg_ClearTilemap(param0, 3); } - sub_02019690(4, 32, 0, 29); - sub_02019690(0, 32, 0, 29); + Bg_ClearTilesRange(4, 32, 0, 29); + Bg_ClearTilesRange(0, 32, 0, 29); } static void ov23_0223ED68(int param0, int param1, BOOL param2, BOOL param3, BOOL param4) @@ -1308,7 +1308,7 @@ static void ov23_0223EE80(UnkStruct_ov23_0223EE80 *param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 0); Heap_Create(3, 29, 0x50000); - v1 = sub_02018340(29); + v1 = BgConfig_New(29); Unk_ov23_02257740->unk_04 = v1; SetMainCallback(ov23_022411E8, v1); @@ -1316,9 +1316,9 @@ static void ov23_0223EE80(UnkStruct_ov23_0223EE80 *param0) ov23_02253E2C(ov23_0224219C(), v1, (512 - (18 + 12)), (((512 - (18 + 12)) - 73) - (27 * 4))); ov23_0223EC34(v1); - sub_02019EBC(v1, 0); - sub_02019EBC(v1, 1); - sub_02019EBC(v1, 2); + Bg_ClearTilemap(v1, 0); + Bg_ClearTilemap(v1, 1); + Bg_ClearTilemap(v1, 2); sub_0200DD0C(v1, 3, (512 - (18 + 12)), 10, 0, 29); { @@ -1346,17 +1346,17 @@ static void ov23_0223EF98(void) int v5; ov23_022404C8(Unk_ov23_02257740->unk_04); - sub_02019448(Unk_ov23_02257740->unk_04, 1); + Bg_CopyTilemapBufferToVRAM(Unk_ov23_02257740->unk_04, 1); ov23_0223FF8C(Unk_ov23_02257740->unk_04); sub_02006E3C(55, 9, Unk_ov23_02257740->unk_04, 2, 1, 0, 0, 29); ov23_022401B0(Unk_ov23_02257740->unk_04); - BGL_SetPriority(0, 3); - BGL_SetPriority(1, 2); - BGL_SetPriority(2, 1); - BGL_SetPriority(3, 0); + Bg_SetPriority(0, 3); + Bg_SetPriority(1, 2); + Bg_SetPriority(2, 1); + Bg_SetPriority(3, 0); ov23_02240E88(); ov23_0224108C(); @@ -1368,10 +1368,10 @@ static void ov23_0223F020(UnkStruct_ov23_0223EE80 *param0) void *v0; int v1; - sub_02019044(Unk_ov23_02257740->unk_04, 0); - sub_02019044(Unk_ov23_02257740->unk_04, 1); - sub_02019044(Unk_ov23_02257740->unk_04, 2); - sub_02019044(Unk_ov23_02257740->unk_04, 3); + Bg_FreeTilemapBuffer(Unk_ov23_02257740->unk_04, 0); + Bg_FreeTilemapBuffer(Unk_ov23_02257740->unk_04, 1); + Bg_FreeTilemapBuffer(Unk_ov23_02257740->unk_04, 2); + Bg_FreeTilemapBuffer(Unk_ov23_02257740->unk_04, 3); sub_0200A4E4(Unk_ov23_02257740->unk_1C0[0]); sub_0200A4E4(Unk_ov23_02257740->unk_1C0[4]); sub_0200A6DC(Unk_ov23_02257740->unk_1C0[1]); @@ -1922,7 +1922,7 @@ static void ov23_0223FA3C(BgConfig *param0, int param1, UnkStruct_ov23_0223EE80 static int ov23_0223FC9C(int param0, BgConfig *param1, int param2, UnkStruct_ov23_0223EE80 *param3) { UnkStruct_ov23_0223FC9C *v0 = &Unk_ov23_02257740->unk_874[param0]; - u16 *v1 = sub_02019FE4(param1, 1); + u16 *v1 = Bg_GetTilemapBuffer(param1, 1); int v2 = v0->unk_05 * 2; int v3 = v0->unk_06 * 2; int v4 = v2 + v0->unk_00->unk_0C; @@ -2158,7 +2158,7 @@ static void ov23_022401B0(BgConfig *param0) static u8 v5[] = { 0x2, 0x3, 0x12, 0x13 }; static u8 v6[] = { 0x0, 0x1, 0x10, 0x11 }; static u8 *v7[] = { v0, v1, v2, v3, v4, v5, v6 }; - u16 *v8 = sub_02019FE4(param0, 2); + u16 *v8 = Bg_GetTilemapBuffer(param0, 2); int v9, v10, v11; for (v9 = 0; v9 < 10; v9++) { @@ -2173,7 +2173,7 @@ static void ov23_022401B0(BgConfig *param0) } } - sub_02019448(param0, 2); + Bg_CopyTilemapBufferToVRAM(param0, 2); } static BOOL ov23_02240244(int param0, int param1) @@ -2326,7 +2326,7 @@ static void ov23_022404C8(BgConfig *param0) Unk_ov23_02257740->unk_A2A = 1; Unk_ov23_02257740->unk_A28 = 1; - v0 = sub_02019FE4(param0, 1); + v0 = Bg_GetTilemapBuffer(param0, 1); ov23_02240454(v0, Unk_ov23_02256BF4, 0x30, 54); } @@ -2356,7 +2356,7 @@ static void ov23_022404F8(BgConfig *param0, int param1, int param2, int param3) } } - v2 = sub_02019FE4(param0, 1); + v2 = Bg_GetTilemapBuffer(param0, 1); switch (Unk_ov23_02257740->unk_A2A) { case 0: @@ -2399,7 +2399,7 @@ static void ov23_022404F8(BgConfig *param0, int param1, int param2, int param3) break; } - sub_02019448(param0, 1); + Bg_CopyTilemapBufferToVRAM(param0, 1); } static void ov23_02240660(VecFx32 *param0) @@ -2419,7 +2419,7 @@ static void ov23_02240688(BgConfig *param0) VecFx32 v0; int v1 = Unk_ov23_02257740->unk_A2B; int v2, v3, v4; - u16 *v5 = sub_02019FE4(param0, 0); + u16 *v5 = Bg_GetTilemapBuffer(param0, 0); v1 = (v1 / 4) * 4; v4 = 6 - (v1 % 24) / 4; @@ -2437,7 +2437,7 @@ static void ov23_02240688(BgConfig *param0) v5[0x79 - v3] = (v5[0x79 - v3] & 0xfc00) + 0xad - (v3 % 3); } - sub_02019448(param0, 0); + Bg_CopyTilemapBufferToVRAM(param0, 0); } static void ov23_02240758(UnkStruct_ov23_0223EE80 *param0) @@ -2676,8 +2676,8 @@ static void ov23_02240C94(BgConfig *param0) } for (v0 = 0; v0 < 3; v0++) { - sub_02019184(param0, v0, 0, Unk_ov23_02257740->unk_A2D); - sub_02019184(param0, v0, 3, Unk_ov23_02257740->unk_A2E); + Bg_SetOffset(param0, v0, 0, Unk_ov23_02257740->unk_A2D); + Bg_SetOffset(param0, v0, 3, Unk_ov23_02257740->unk_A2E); } } @@ -2864,7 +2864,7 @@ static void ov23_022411E8(void *param0) ov23_02240C94(v0); - sub_0201C2B8(v0); + Bg_RunScheduledUpdates(v0); sub_0201DCAC(); sub_0200A858(); } diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index d8b0990cf2..1fe419a139 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -2225,13 +2225,13 @@ static void ov23_02244FD0(int param0, BOOL param1) { int v1; - u8 *v2 = sub_02019FE4(Unk_ov23_02257764->fieldSystem->unk_08, 2); + u8 *v2 = Bg_GetTilemapBuffer(Unk_ov23_02257764->fieldSystem->unk_08, 2); for (v1 = 0; v1 < 0x800; v1 += 2) { v2[v1] = 0; } - BGL_SetPriority(2, 3); + Bg_SetPriority(2, 3); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } @@ -2247,7 +2247,7 @@ static void ov23_02244FD0(int param0, BOOL param1) static BOOL ov23_02245064(UnkStruct_ov23_0224271C *param0, BgConfig *param1, UnkStruct_ov23_022451BC *param2) { int v0, v1 = 0; - u8 *v2 = sub_02019FE4(param1, 2); + u8 *v2 = Bg_GetTilemapBuffer(param1, 2); if (v2 == NULL) { return 0; @@ -2256,7 +2256,7 @@ static BOOL ov23_02245064(UnkStruct_ov23_0224271C *param0, BgConfig *param1, Unk if ((param2->unk_08 != 0xffff) && (param2->unk_0A != 0xffff)) { ov23_02244EF8(param0->unk_00, param0->unk_02, param2->unk_08, param2->unk_0A, v2); - sub_02019448(param1, 2); + Bg_CopyTilemapBufferToVRAM(param1, 2); } param2->unk_08 = param0->unk_00; @@ -2366,10 +2366,10 @@ static void ov23_022451C8(SysTask *param0, void *param1) sub_02006E60(50, v2[v3], v0->unk_10, 2, 0, 32 * 24 * 2, 0, 4); } - BGL_SetPriority(0, 3); - BGL_SetPriority(1, 2); - BGL_SetPriority(2, 1); - BGL_SetPriority(3, 0); + Bg_SetPriority(0, 3); + Bg_SetPriority(1, 2); + Bg_SetPriority(2, 1); + Bg_SetPriority(3, 0); v0->unk_00++; break; case 4: diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c index dd30823515..2cbef333ea 100644 --- a/src/overlay023/ov23_02248F1C.c +++ b/src/overlay023/ov23_02248F1C.c @@ -145,7 +145,7 @@ static void ov23_02248F1C(SysTask *param0, void *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); - sub_0201975C(4, 0); + Bg_MaskPalette(4, 0); v0->unk_00++; break; case 4: @@ -174,8 +174,8 @@ static void ov23_02248F1C(SysTask *param0, void *param1) CellActorCollection_Delete(v0->unk_1BC); sub_0200E084(&v0->unk_3F4, 0); - BGL_DeleteWindow(&v0->unk_3F4); - sub_02019044(v1, 7); + Window_Remove(&v0->unk_3F4); + Bg_FreeTilemapBuffer(v1, 7); ov23_02249438(v1); ov23_02249778(&v0->unk_410); @@ -340,8 +340,8 @@ void ov23_0224942C(UnkStruct_ov23_0224942C *param0) static void ov23_02249438(BgConfig *param0) { - sub_02019044(param0, 4); - sub_02019044(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 5); } static void ov23_0224944C(BgConfig *param0, Window *param1) @@ -366,7 +366,7 @@ static void ov23_0224944C(BgConfig *param0, Window *param1) 0 }; - sub_020183C4(param0, 4, &v0, 0); + Bg_InitFromTemplate(param0, 4, &v0, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); } { @@ -386,7 +386,7 @@ static void ov23_0224944C(BgConfig *param0, Window *param1) 0 }; - sub_020183C4(param0, 5, &v1, 0); + Bg_InitFromTemplate(param0, 5, &v1, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); } { @@ -406,9 +406,9 @@ static void ov23_0224944C(BgConfig *param0, Window *param1) 0 }; - sub_020183C4(param0, 7, &v2, 0); + Bg_InitFromTemplate(param0, 7, &v2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); - sub_02019EBC(param0, 7); + Bg_ClearTilemap(param0, 7); } { @@ -423,9 +423,9 @@ static void ov23_0224944C(BgConfig *param0, Window *param1) } sub_0205D8CC(4, 0); - sub_02019690(7, 32, 0, 4); + Bg_ClearTilesRange(7, 32, 0, 4); FieldMessage_AddWindow(param0, param1, 7); - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); sub_02006E84(50, 52, 4, 10 * 0x20, 4 * 0x20, 4); sub_0200F338(1); } @@ -481,8 +481,8 @@ static void ov23_0224966C(BgConfig *param0, Window *param1, int *param2, int *pa break; case 2: if (ov23_02249900(param5) == 0) { - sub_0201C04C(param1, 0, 2, 0x0); - sub_0201A954(param1); + Window_Scroll(param1, 0, 2, 0x0); + Window_CopyToVRAM(param1); if (++(*param4) >= 8) { *param4 = 0; diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index dedf4844c3..c1ea9ec359 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -1025,7 +1025,7 @@ static UIControlData *ov23_0224BD90(BgConfig *param0, const WindowTemplate *para sub_02013A4C(v2, v1, 39, 1); v0.unk_00 = v2; - v0.unk_04 = sub_0201A778(param4, 1); + v0.unk_04 = Window_New(param4, 1); v0.unk_08 = 0; v0.unk_09 = 1; v0.unk_0A = 2; @@ -1033,7 +1033,7 @@ static UIControlData *ov23_0224BD90(BgConfig *param0, const WindowTemplate *para v0.unk_0B_4 = 0; v0.unk_0B_0 = 0; - sub_0201A8D4(param0, v0.unk_04, param1); + Window_AddFromTemplate(param0, v0.unk_04, param1); Window_Show(v0.unk_04, 1, param2, param3); return sub_02001B7C(&v0, 8, 0, 0, param4, PAD_BUTTON_B); diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c index fda80a8e35..b89e332d1d 100644 --- a/src/overlay023/ov23_0224DC40.c +++ b/src/overlay023/ov23_0224DC40.c @@ -239,7 +239,7 @@ static void ov23_0224DD2C(UnkStruct_ov23_0224E280 *param0) param0->unk_1C = sub_02013A04(NELEMS(Unk_ov23_022568B4), 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_0C, 3, 1, 1, 10, NELEMS(Unk_ov23_022568B4) * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (10 * NELEMS(Unk_ov23_022568B4) * 2)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_0C, 3, 1, 1, 10, NELEMS(Unk_ov23_022568B4) * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (10 * NELEMS(Unk_ov23_022568B4) * 2)); Window_Show(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11); { @@ -265,7 +265,7 @@ static void ov23_0224DD2C(UnkStruct_ov23_0224E280 *param0) param0->unk_3A = 0; param0->unk_20 = sub_0200112C(&v0, 0, 0, 4); - sub_0201A954(¶m0->unk_0C); + Window_CopyToVRAM(¶m0->unk_0C); sub_020594FC(); } @@ -300,7 +300,7 @@ static void ov23_0224DE3C(UnkStruct_ov23_0224E280 *param0) param0->unk_1C = sub_02013A04(4, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_0C, 3, 1, 1, 16, 4 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * 4 * 2)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_0C, 3, 1, 1, 16, 4 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * 4 * 2)); Window_Show(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11); { @@ -337,7 +337,7 @@ static void ov23_0224DE3C(UnkStruct_ov23_0224E280 *param0) param0->unk_3A = 0; param0->unk_20 = sub_0200112C(&v0, 0, 0, 4); - sub_0201A954(¶m0->unk_0C); + Window_CopyToVRAM(¶m0->unk_0C); } static BOOL ov23_0224DF1C(SysTask *param0, void *param1) @@ -388,7 +388,7 @@ static void ov23_0224DFA0(UnkStruct_ov23_0224E280 *param0) param0->unk_1C = sub_02013A04(4, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_0C, 3, 1, 1, 16, 4 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * 4 * 2)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_0C, 3, 1, 1, 16, 4 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * 4 * 2)); Window_Show(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11); { @@ -413,7 +413,7 @@ static void ov23_0224DFA0(UnkStruct_ov23_0224E280 *param0) param0->unk_3A = 0; param0->unk_20 = sub_0200112C(&v0, 0, 0, 4); - sub_0201A954(¶m0->unk_0C); + Window_CopyToVRAM(¶m0->unk_0C); } static BOOL ov23_0224E05C(SysTask *param0, void *param1) @@ -537,8 +537,8 @@ static void ov23_0224E244(SysTask *param0, UnkStruct_ov23_0224E280 *param1) if (param1->unk_1C) { Window_Clear(¶m1->unk_0C, 1); sub_02001384(param1->unk_20, NULL, NULL); - sub_0201ACF4(¶m1->unk_0C); - BGL_DeleteWindow(¶m1->unk_0C); + Window_ClearAndCopyToVRAM(¶m1->unk_0C); + Window_Remove(¶m1->unk_0C); sub_02013A3C(param1->unk_1C); param1->unk_1C = NULL; } @@ -954,8 +954,8 @@ static void ov23_0224EA08(SysTask *param0, UnkStruct_ov23_022577B0 *param1) if (param1->unk_18) { Window_Clear(¶m1->unk_08, 1); sub_02001384(param1->unk_1C, NULL, NULL); - sub_0201ACF4(¶m1->unk_08); - BGL_DeleteWindow(¶m1->unk_08); + Window_ClearAndCopyToVRAM(¶m1->unk_08); + Window_Remove(¶m1->unk_08); sub_02013A3C(param1->unk_18); param1->unk_18 = NULL; @@ -982,7 +982,7 @@ static void ov23_0224EAA4(UnkStruct_ov23_022577B0 *param0) param0->unk_18 = sub_02013A04(v1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, 1, 1, 16, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * v1 * 2)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, 1, 1, 16, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * v1 * 2)); Window_Show(¶m0->unk_08, 1, 1024 - (18 + 12) - 9, 11); { MessageLoader *v2; @@ -1009,7 +1009,7 @@ static void ov23_0224EAA4(UnkStruct_ov23_022577B0 *param0) param0->unk_36 = 0; param0->unk_1C = sub_0200112C(&v0, 0, 0, 4); - sub_0201A954(¶m0->unk_08); + Window_CopyToVRAM(¶m0->unk_08); } static BOOL ov23_0224EB74(SysTask *param0, void *param1) diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c index 01957dbe3f..df6610498c 100644 --- a/src/overlay023/ov23_0224F294.c +++ b/src/overlay023/ov23_0224F294.c @@ -481,7 +481,7 @@ static void ov23_0224F7F4(UnkStruct_ov23_02250CD4 *param0) v3 = ov23_0224F7D4(v2); param0->unk_40 = sub_02013A04(NELEMS(Unk_ov23_02256924), 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 20, 1, 11, NELEMS(Unk_ov23_02256924) * 3, 13, (1024 - (18 + 12) - 9 - 11 * 22)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 20, 1, 11, NELEMS(Unk_ov23_02256924) * 3, 13, (1024 - (18 + 12) - 9 - 11 * 22)); Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { @@ -522,7 +522,7 @@ static void ov23_0224F7F4(UnkStruct_ov23_02250CD4 *param0) param0->unk_54 = sub_02001AF4(&v0, 28, 4, param0->unk_29C, 11, PAD_BUTTON_B | PAD_BUTTON_X); param0->unk_48 = NULL; - sub_0201A9A4(¶m0->unk_10); + Window_ScheduleCopyToVRAM(¶m0->unk_10); ov23_0224F294(param0, v2, NELEMS(Unk_ov23_02256924)); sub_020594FC(); } @@ -683,10 +683,10 @@ void ov23_0224FB7C(UnkStruct_ov23_02250CD4 *param0) param0->unk_25C = 0; } - if (BGL_WindowAdded(¶m0->unk_10)) { + if (Window_IsInUse(¶m0->unk_10)) { Window_Clear(¶m0->unk_10, 1); - sub_0201C3C0(param0->unk_10.bgConfig, param0->unk_10.bgLayer); - BGL_DeleteWindow(¶m0->unk_10); + Bg_ScheduleTilemapTransfer(param0->unk_10.bgConfig, param0->unk_10.bgLayer); + Window_Remove(¶m0->unk_10); sub_02013A3C(param0->unk_40); ov23_02252DF4(param0); } @@ -738,7 +738,7 @@ static void ov23_0224FBFC(UnkStruct_ov23_02250CD4 *param0, int param1) param0->unk_44 = sub_02013A04(v1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_20, 3, v5, v3, v4, v1 * 2, 13, (1024 - (18 + 12) - 9 - 11 * 22)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_20, 3, v5, v3, v4, v1 * 2, 13, (1024 - (18 + 12) - 9 - 11 * 22)); Window_Show(¶m0->unk_20, 1, 1024 - (18 + 12) - 9, 11); { @@ -767,15 +767,15 @@ static void ov23_0224FCF4(UnkStruct_ov23_02250CD4 *param0) { if (param0->unk_50) { sub_02001384(param0->unk_50, NULL, NULL); - sub_0201C3C0(param0->unk_20.bgConfig, param0->unk_20.bgLayer); + Bg_ScheduleTilemapTransfer(param0->unk_20.bgConfig, param0->unk_20.bgLayer); sub_02013A3C(param0->unk_44); param0->unk_50 = NULL; } - if (BGL_WindowAdded(¶m0->unk_20)) { + if (Window_IsInUse(¶m0->unk_20)) { Window_Clear(¶m0->unk_20, 1); - BGL_DeleteWindow(¶m0->unk_20); + Window_Remove(¶m0->unk_20); } } @@ -850,7 +850,7 @@ static void ov23_0224FE38(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248 param0->unk_40 = sub_02013A04(v3 + 1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2))); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2))); Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { @@ -1041,7 +1041,7 @@ static void ov23_0225021C(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248 param0->unk_40 = sub_02013A04(v4 + 1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2))); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2))); Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { @@ -1217,7 +1217,7 @@ static void ov23_022505EC(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248 param0->unk_40 = sub_02013A04(v3 + 1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2))); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2))); Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { @@ -1618,7 +1618,7 @@ static void ov23_02250D90(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248 param0->unk_40 = sub_02013A04(v3 + 1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2))); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2))); Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c index ebec344c17..f61215ef58 100644 --- a/src/overlay023/ov23_0225128C.c +++ b/src/overlay023/ov23_0225128C.c @@ -358,7 +358,7 @@ static void ov23_022515D8(UnkStruct_ov23_02250CD4 *param0, int param1, int param param0->unk_40 = sub_02013A04(v1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 17, 3, 14, v1 * 2, 13, 2); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 17, 3, 14, v1 * 2, 13, 2); Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { @@ -404,7 +404,7 @@ static void ov23_022516E8(UnkStruct_ov23_02250CD4 *param0, int param1, int param param0->unk_40 = sub_02013A04(v1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 17, 3, 14, v1 * 2, 13, (2 + 14 * 16)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 17, 3, 14, v1 * 2, 13, (2 + 14 * 16)); Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index 9016a07b16..695281f7fe 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -218,7 +218,7 @@ static void *ov23_022524B8(UnkStruct_ov23_02250CD4 *param0) param0->unk_40 = sub_02013A04(v1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, v1 * 2, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - 12 * 6)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, v1 * 2, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - 12 * 6)); Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { @@ -258,7 +258,7 @@ static void *ov23_022524B8(UnkStruct_ov23_02250CD4 *param0) param0->unk_48 = sub_0200112C(&v0, param0->unk_294, param0->unk_290, 4); param0->unk_2AE = param0->unk_290; - sub_0201A954(¶m0->unk_10); + Window_CopyToVRAM(¶m0->unk_10); return param0; } @@ -268,7 +268,7 @@ static void ov23_0225265C(BmpList *param0, u32 param1, u8 param2) UnkStruct_ov23_02250CD4 *v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); u32 v1 = param1; - BGL_FillWindow(&v0->unk_20, 15); + Window_FillTilemap(&v0->unk_20, 15); MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 23 + v0->unk_2AB, v0->unk_68); Text_AddPrinterWithParams(&v0->unk_20, FONT_SYSTEM, v0->unk_68, 1, 1, TEXT_SPEED_NO_TRANSFER, NULL); @@ -282,7 +282,7 @@ static void ov23_0225265C(BmpList *param0, u32 param1, u8 param2) (void)0; } - sub_0201A9A4(&v0->unk_20); + Window_ScheduleCopyToVRAM(&v0->unk_20); if (v1 == 0xfffffffe) { v1 = 0xfffffffe; @@ -305,7 +305,7 @@ static void ov23_02252754(BmpList *param0, u32 param1, u8 param2) int v3 = param1, v4, v5; int v6, v7 = 0, v8; - BGL_FillWindow(&v1->unk_20, 15); + Window_FillTilemap(&v1->unk_20, 15); if (param1 != 0xfffffffe) { if (v1->unk_2AC == 1) { @@ -370,7 +370,7 @@ static void ov23_02252754(BmpList *param0, u32 param1, u8 param2) Text_AddPrinterWithParams(&v1->unk_20, FONT_SYSTEM, v1->unk_68, 1, 17, TEXT_SPEED_NO_TRANSFER, NULL); } - sub_0201A9A4(&v1->unk_20); + Window_ScheduleCopyToVRAM(&v1->unk_20); if (v1->unk_2AC == 1) { ov23_0224FD84(param0, param1, param2); @@ -400,7 +400,7 @@ static void ov23_02252A18(UnkStruct_ov23_02250CD4 *param0) ov23_0224FB7C(param0); param0->unk_40 = sub_02013A04(v1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, v1 * 2, 13, (((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - 12 * 6) - 12 * 12)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, v1 * 2, 13, (((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - 12 * 6) - 12 * 12)); Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { @@ -442,14 +442,14 @@ static void ov23_02252A18(UnkStruct_ov23_02250CD4 *param0) ov23_02251238(param0, v0.unk_12, v0.unk_10); param0->unk_48 = sub_0200112C(&v0, param0->unk_294, param0->unk_290, 4); - sub_0201A954(¶m0->unk_10); + Window_CopyToVRAM(¶m0->unk_10); } static void ov23_02252B90(UnkStruct_ov23_02250CD4 *param0, BOOL param1) { - if (BGL_WindowAdded(¶m0->unk_20)) { + if (Window_IsInUse(¶m0->unk_20)) { Window_Clear(¶m0->unk_20, 1); - BGL_DeleteWindow(¶m0->unk_20); + Window_Remove(¶m0->unk_20); } ov23_0224FB7C(param0); @@ -547,41 +547,41 @@ void ov23_02252D08(int param0, int param1) static void ov23_02252D1C(UnkStruct_ov23_02250CD4 *param0) { - if (!BGL_WindowAdded(¶m0->unk_20)) { - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_20, 3, 1, 12, 12, 4, 13, 1); + if (!Window_IsInUse(¶m0->unk_20)) { + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_20, 3, 1, 12, 12, 4, 13, 1); Window_Show(¶m0->unk_20, 1, 1024 - (18 + 12) - 9, 11); } - BGL_FillWindow(¶m0->unk_20, 15); - sub_0201A954(¶m0->unk_20); + Window_FillTilemap(¶m0->unk_20, 15); + Window_CopyToVRAM(¶m0->unk_20); } void ov23_02252D74(UnkStruct_ov23_02250CD4 *param0, int param1) { - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_30, 3, 1, 1, 7, 4, 13, 51); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_30, 3, 1, 1, 7, 4, 13, 51); Window_Show(¶m0->unk_30, 1, 1024 - (18 + 12) - 9, 11); - BGL_FillWindow(¶m0->unk_30, 15); - sub_0201A954(¶m0->unk_30); + Window_FillTilemap(¶m0->unk_30, 15); + Window_CopyToVRAM(¶m0->unk_30); MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), param1, param0->unk_68); Text_AddPrinterWithParams(¶m0->unk_30, FONT_SYSTEM, param0->unk_68, 1, 1, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A9A4(¶m0->unk_30); + Window_ScheduleCopyToVRAM(¶m0->unk_30); } void ov23_02252DF4(UnkStruct_ov23_02250CD4 *param0) { - if (BGL_WindowAdded(¶m0->unk_30)) { + if (Window_IsInUse(¶m0->unk_30)) { Window_Clear(¶m0->unk_30, 1); - BGL_DeleteWindow(¶m0->unk_30); + Window_Remove(¶m0->unk_30); } } void ov23_02252E18(UnkStruct_ov23_02250CD4 *param0) { - if (BGL_WindowAdded(¶m0->unk_30)) { + if (Window_IsInUse(¶m0->unk_30)) { Window_Clear(¶m0->unk_30, 0); - BGL_DeleteWindow(¶m0->unk_30); + Window_Remove(¶m0->unk_30); } } diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index 58ffe136c7..9dd3dbf92a 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -183,8 +183,8 @@ static void ov23_022537D4(SysTask *param0, void *param1) UnkStruct_ov23_022537D4 *v0 = param1; Window_Clear(&v0->unk_08, 0); - sub_0201ACF4(&v0->unk_08); - BGL_DeleteWindow(&v0->unk_08); + Window_ClearAndCopyToVRAM(&v0->unk_08); + Window_Remove(&v0->unk_08); { UnkFuncPtr_ov23_02253834 v1 = v0->unk_00; @@ -223,11 +223,11 @@ void ov23_02253834(BgConfig *param0, TrainerInfo *param1, UnkFuncPtr_ov23_022538 v4->unk_00 = param2; v4->unk_04 = param3; - BGL_AddWindow(param0, &v4->unk_08, 3, 4, 2, 24, 19, 13, 1); + Window_Add(param0, &v4->unk_08, 3, 4, 2, 24, 19, 13, 1); Window_Show(&v4->unk_08, 1, 1024 - (18 + 12) - 9, 11); v1 = MessageLoader_Init(0, 26, 640, 4); - BGL_FillWindow(&v4->unk_08, 15); + Window_FillTilemap(&v4->unk_08, 15); if (param4) { v0 = Unk_ov23_022577BC->unk_0C; @@ -237,7 +237,7 @@ void ov23_02253834(BgConfig *param0, TrainerInfo *param1, UnkFuncPtr_ov23_022538 ov23_0225360C(&v4->unk_08, v1, param1, v0); - sub_0201A9A4(&v4->unk_08); + Window_ScheduleCopyToVRAM(&v4->unk_08); Sound_PlayEffect(1533); Unk_ov23_022577BC->unk_04 = SysTask_Start(ov23_0225381C, v4, 10); @@ -406,17 +406,17 @@ void *ov23_02253C64(BgConfig *param0, TrainerInfo *param1, UndergroundData *para v4->unk_00 = param3; v4->unk_04 = param4; - BGL_AddWindow(param0, &v4->unk_08, 3, 4, 2, 24, 19, 13, 1); + Window_Add(param0, &v4->unk_08, 3, 4, 2, 24, 19, 13, 1); Window_Show(&v4->unk_08, 1, 1024 - (18 + 12) - 9, 11); v1 = MessageLoader_Init(0, 26, 639, 4); - BGL_FillWindow(&v4->unk_08, 15); + Window_FillTilemap(&v4->unk_08, 15); v0 = Unk_ov23_022577BC->unk_0C; ov23_02253A78(&v4->unk_08, v1, param1, v0, param2); Sound_PlayEffect(1533); - sub_0201A9A4(&v4->unk_08); + Window_ScheduleCopyToVRAM(&v4->unk_08); MessageLoader_Free(v1); return v4; @@ -427,8 +427,8 @@ void ov23_02253D10(void *param0) UnkStruct_ov23_022537D4 *v0 = param0; Window_Clear(&v0->unk_08, 0); - sub_0201ACF4(&v0->unk_08); - BGL_DeleteWindow(&v0->unk_08); + Window_ClearAndCopyToVRAM(&v0->unk_08); + Window_Remove(&v0->unk_08); { UnkFuncPtr_ov23_02253834 v1 = v0->unk_00; diff --git a/src/overlay023/ov23_02253D40.c b/src/overlay023/ov23_02253D40.c index 8de4e29af9..94ad21f0d9 100644 --- a/src/overlay023/ov23_02253D40.c +++ b/src/overlay023/ov23_02253D40.c @@ -168,11 +168,11 @@ static int ov23_02253E90(UnkStruct_ov23_02253E2C *param0, BOOL param1, UnkStruct ov23_02253FA4(param0, 0); ov23_022421EC(); - if (!BGL_WindowAdded(¶m0->unk_08)) { - BGL_AddWindow(param0->unk_18, ¶m0->unk_08, 3, 2, 19, 27, 4, 12, param0->unk_40); + if (!Window_IsInUse(¶m0->unk_08)) { + Window_Add(param0->unk_18, ¶m0->unk_08, 3, 2, 19, 27, 4, 12, param0->unk_40); } - BGL_FillWindow(¶m0->unk_08, 15); + Window_FillTilemap(¶m0->unk_08, 15); sub_0200E060(¶m0->unk_08, 1, param0->unk_42, 10); if (param1) { @@ -237,13 +237,13 @@ static void ov23_02253FA4(UnkStruct_ov23_02253E2C *param0, int param1) break; case 1: sub_0200E084(¶m0->unk_08, 1); - sub_0201ACF4(¶m0->unk_08); - BGL_DeleteWindow(¶m0->unk_08); + Window_ClearAndCopyToVRAM(¶m0->unk_08); + Window_Remove(¶m0->unk_08); break; case 2: sub_0200E084(¶m0->unk_08, 1); - sub_0201AD10(¶m0->unk_08); - BGL_DeleteWindow(¶m0->unk_08); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08); + Window_Remove(¶m0->unk_08); break; } diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c index da8aa5faf8..ccd1662da5 100644 --- a/src/overlay023/ov23_022542CC.c +++ b/src/overlay023/ov23_022542CC.c @@ -166,8 +166,8 @@ static void ov23_0225437C(UnkStruct_ov23_022542D8 *param0) v1 = 12 * v4 * 2; v2 = 7 * (1 * 2); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_04, 3, 19, 3, 12, v4 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (v1)); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_14, 3, 1, 1, 7, (1 * 2), 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (v1 + v2)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_04, 3, 19, 3, 12, v4 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (v1)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_14, 3, 1, 1, 7, (1 * 2), 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (v1 + v2)); Window_Show(¶m0->unk_04, 1, 1024 - (18 + 12) - 9, 11); Window_Show(¶m0->unk_14, 1, 1024 - (18 + 12) - 9, 11); @@ -187,7 +187,7 @@ static void ov23_0225437C(UnkStruct_ov23_022542D8 *param0) { Strbuf *v8; - BGL_FillWindow(¶m0->unk_14, 15); + Window_FillTilemap(¶m0->unk_14, 15); v8 = MessageLoader_GetNewStrbuf(v5, 0); Text_AddPrinterWithParams(¶m0->unk_14, FONT_SYSTEM, v8, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); Strbuf_Free(v8); @@ -208,8 +208,8 @@ static void ov23_0225437C(UnkStruct_ov23_022542D8 *param0) v0.unk_04 = ov23_02254350; param0->unk_28 = sub_0200112C(&v0, *(param0->unk_30), *(param0->unk_34), 4); - sub_0201A954(¶m0->unk_04); - sub_0201A954(¶m0->unk_14); + Window_CopyToVRAM(¶m0->unk_04); + Window_CopyToVRAM(¶m0->unk_14); param0->unk_38 = 1; } @@ -252,9 +252,9 @@ static void ov23_0225451C(UnkStruct_ov23_022542D8 *param0) Window_Clear(¶m0->unk_14, 1); sub_02001384(param0->unk_28, param0->unk_30, param0->unk_34); Window_Clear(¶m0->unk_04, 1); - sub_0201C3C0(param0->unk_04.bgConfig, param0->unk_04.bgLayer); - BGL_DeleteWindow(¶m0->unk_04); - BGL_DeleteWindow(¶m0->unk_14); + Bg_ScheduleTilemapTransfer(param0->unk_04.bgConfig, param0->unk_04.bgLayer); + Window_Remove(¶m0->unk_04); + Window_Remove(¶m0->unk_14); sub_02013A3C(param0->unk_24); } @@ -407,8 +407,8 @@ static void ov23_022546E0(UnkStruct_ov23_02254594 *param0) v2 = 12 * 7 * 2; v3 = 8 * (2 * 2); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, 19, 3, 12, v5 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (v2)); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_18, 3, 1, 1, 8, (2 * 2), 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (v2 + v3)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, 19, 3, 12, v5 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (v2)); + Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_18, 3, 1, 1, 8, (2 * 2), 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (v2 + v3)); Window_Show(¶m0->unk_08, 1, 1024 - (18 + 12) - 9, 11); Window_Show(¶m0->unk_18, 1, 1024 - (18 + 12) - 9, 11); @@ -431,7 +431,7 @@ static void ov23_022546E0(UnkStruct_ov23_02254594 *param0) v12 = MessageLoader_Init(0, 26, 637, 4); - BGL_FillWindow(¶m0->unk_18, 15); + Window_FillTilemap(¶m0->unk_18, 15); v13 = MessageLoader_GetNewStrbuf(v12, 9); v14 = MessageLoader_GetNewStrbuf(v12, 10); @@ -486,8 +486,8 @@ static void ov23_022546E0(UnkStruct_ov23_02254594 *param0) param0->unk_2C = ov23_02248C08(&v1, *(param0->unk_38), *(param0->unk_3C), 4, sub_02028A10, v0, 1); - sub_0201A954(¶m0->unk_08); - sub_0201A954(¶m0->unk_18); + Window_CopyToVRAM(¶m0->unk_08); + Window_CopyToVRAM(¶m0->unk_18); param0->unk_04 = sub_0206A780(4); @@ -505,9 +505,9 @@ static void ov23_02254958(UnkStruct_ov23_02254594 *param0) ov23_02248EF8(param0->unk_2C, param0->unk_38, param0->unk_3C); Window_Clear(¶m0->unk_08, 1); - sub_0201C3C0(param0->unk_08.bgConfig, param0->unk_08.bgLayer); - BGL_DeleteWindow(¶m0->unk_08); - BGL_DeleteWindow(¶m0->unk_18); + Bg_ScheduleTilemapTransfer(param0->unk_08.bgConfig, param0->unk_08.bgLayer); + Window_Remove(¶m0->unk_08); + Window_Remove(¶m0->unk_18); sub_02013A3C(param0->unk_28); sub_0206A844(param0->unk_04); } diff --git a/src/overlay024/ov24_02253CE0.c b/src/overlay024/ov24_02253CE0.c index 7d2371b3ae..3828d6782f 100644 --- a/src/overlay024/ov24_02253CE0.c +++ b/src/overlay024/ov24_02253CE0.c @@ -37,7 +37,7 @@ void ov24_02253CE0(BgConfig *param0) #endif // SDK_ARM9 GXS_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K); - sub_020183C4(param0, 4, &v0, 0); + Bg_InitFromTemplate(param0, 4, &v0, 0); { NARC *v1; @@ -56,7 +56,7 @@ void ov24_02253CE0(BgConfig *param0) void ov24_02253DA4(BgConfig *param0) { - sub_02019044(param0, 4); + Bg_FreeTilemapBuffer(param0, 4); Heap_Destroy(8); } diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index 3178559c5d..95875c2bc6 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -104,7 +104,7 @@ BOOL ov25_02254560(UnkStruct_ov25_02254560 **param0, const UnkStruct_ov25_022545 } v0->unk_00 = param1; - v0->unk_1F8 = sub_02018340(7); + v0->unk_1F8 = BgConfig_New(7); v0->poketchSys = poketchSys; ov25_02254684(v0); @@ -315,15 +315,15 @@ static void ov25_02254820(SysTask *param0, void *param1) GXLayers_DisableEngineBLayers(); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); - sub_020183C4(v2->unk_1F8, 4, &v0, 0); - sub_020183C4(v2->unk_1F8, 5, &v1, 0); + Bg_InitFromTemplate(v2->unk_1F8, 4, &v0, 0); + Bg_InitFromTemplate(v2->unk_1F8, 5, &v1, 0); sub_02006E3C(12, 14, v2->unk_1F8, 4, 64, 0, 1, 7); sub_02006E60(12, 15, v2->unk_1F8, 4, 0, 0, 1, 7); sub_02006E9C(12, 13, 4, PoketchSystem_GetBorderColor(v2->poketchSys) * 0x20, 15 * 0x20, 0x20, 7); - sub_02019CB8(v2->unk_1F8, 5, 64 + 164, 0, 0, 32, 24, 15); - sub_02019448(v2->unk_1F8, 5); + Bg_FillTilemapRect(v2->unk_1F8, 5, 64 + 164, 0, 0, 32, 24, 15); + Bg_CopyTilemapBufferToVRAM(v2->unk_1F8, 5); GXS_SetVisiblePlane(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_OBJ); GXS_SetVisibleWnd(GX_WNDMASK_NONE); @@ -361,14 +361,14 @@ static void ov25_02254944(SysTask *param0, void *param1) v4 = v0->unk_02 % 4; v5 = 2 + (20 / 2) - v3; - sub_02019CB8(v1->unk_1F8, 5, 64, 2, v5, 24, v3 * 2, 15); + Bg_FillTilemapRect(v1->unk_1F8, 5, 64, 2, v5, 24, v3 * 2, 15); if (v4) { - sub_02019CB8(v1->unk_1F8, 5, 64 + 164 + v4, 2, v5 - 1, 24, 1, 15); - sub_02019CB8(v1->unk_1F8, 5, 64 + 164 - v4, 2, v5 + v3 * 2, 24, 1, 15); + Bg_FillTilemapRect(v1->unk_1F8, 5, 64 + 164 + v4, 2, v5 - 1, 24, 1, 15); + Bg_FillTilemapRect(v1->unk_1F8, 5, 64 + 164 - v4, 2, v5 + v3 * 2, 24, 1, 15); } - sub_02019448(v1->unk_1F8, 5); + Bg_CopyTilemapBufferToVRAM(v1->unk_1F8, 5); if (v0->unk_02 == 40) { ov25_0225524C(param1); @@ -410,17 +410,17 @@ static void ov25_02254A5C(SysTask *param0, void *param1) v4 = v0->unk_02 % 4; v5 = 2 + 20 - v3; - sub_02019CB8(v1->unk_1F8, 5, 64 + 164, 2, 2, 24, v3, 15); - sub_02019CB8(v1->unk_1F8, 5, 64 + 164, 2, v5, 24, v3, 15); + Bg_FillTilemapRect(v1->unk_1F8, 5, 64 + 164, 2, 2, 24, v3, 15); + Bg_FillTilemapRect(v1->unk_1F8, 5, 64 + 164, 2, v5, 24, v3, 15); if (v4) { v4--; - sub_02019CB8(v1->unk_1F8, 5, 64 + 167 - v4, 2, 0, 24, 1, 15); - sub_02019CB8(v1->unk_1F8, 5, 64 + 161 + v4, 2, v5 - 1, 24, 1, 15); + Bg_FillTilemapRect(v1->unk_1F8, 5, 64 + 167 - v4, 2, 0, 24, 1, 15); + Bg_FillTilemapRect(v1->unk_1F8, 5, 64 + 161 + v4, 2, v5 - 1, 24, 1, 15); } - sub_02019448(v1->unk_1F8, 5); + Bg_CopyTilemapBufferToVRAM(v1->unk_1F8, 5); if (v0->unk_02 == 40) { ov25_0225524C(param1); @@ -443,8 +443,8 @@ static void ov25_02254B8C(SysTask *param0, void *param1) v2 = ov25_02255248(param1); if (v2 < 4) { - sub_02019CB8(v1->unk_1F8, 5, 64 + 164 - v2 - 1, 2, 2, 24, 20, 15); - sub_02019448(v1->unk_1F8, 5); + Bg_FillTilemapRect(v1->unk_1F8, 5, 64 + 164 - v2 - 1, 2, 2, 24, 20, 15); + Bg_CopyTilemapBufferToVRAM(v1->unk_1F8, 5); ov25_0225524C(param1); } else { ov25_0225480C(param1); @@ -462,8 +462,8 @@ static void ov25_02254BF0(SysTask *param0, void *param1) v2 = ov25_02255248(param1); if (v2 < 4) { - sub_02019CB8(v1->unk_1F8, 5, 64 + 167 - v2, 2, 2, 24, 20, 15); - sub_02019448(v1->unk_1F8, 5); + Bg_FillTilemapRect(v1->unk_1F8, 5, 64 + 167 - v2, 2, 2, 24, 20, 15); + Bg_CopyTilemapBufferToVRAM(v1->unk_1F8, 5); ov25_0225524C(param1); } else { ov25_0225480C(param1); @@ -483,8 +483,8 @@ static void ov25_02254C54(void *param0, u16 *param1, int param2) v2 = 12; } - sub_020198C0(v0->unk_1F8, 4, param1, v1, v2, 4, 8); - sub_02019448(v0->unk_1F8, 4); + Bg_LoadToTilemapRect(v0->unk_1F8, 4, param1, v1, v2, 4, 8); + Bg_CopyTilemapBufferToVRAM(v0->unk_1F8, 4); ov25_0225480C(param0); } @@ -663,12 +663,12 @@ static void ov25_02254F68(SysTask *param0, void *param1) switch (v0) { case 0: G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ, 0x1a, 0x6); - sub_02019448(v2->unk_1F8, 4); + Bg_CopyTilemapBufferToVRAM(v2->unk_1F8, 4); case 1: case 2: case 3: - sub_02019CB8(v2->unk_1F8, 5, 64 + 167 - v0, 2, 2, 24, 20, 15); - sub_02019448(v2->unk_1F8, 5); + Bg_FillTilemapRect(v2->unk_1F8, 5, 64 + 167 - v0, 2, 2, 24, 20, 15); + Bg_CopyTilemapBufferToVRAM(v2->unk_1F8, 5); if (v0 == 3) { ov25_0225480C(param1); @@ -683,9 +683,9 @@ static void ov25_02255004(SysTask *param0, void *param1) { UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); - sub_02019CB8(v0->unk_1F8, 5, 64, 2, 2, 24, 20, 15); - sub_02019448(v0->unk_1F8, 4); - sub_02019448(v0->unk_1F8, 5); + Bg_FillTilemapRect(v0->unk_1F8, 5, 64, 2, 2, 24, 20, 15); + Bg_CopyTilemapBufferToVRAM(v0->unk_1F8, 4); + Bg_CopyTilemapBufferToVRAM(v0->unk_1F8, 5); G2S_SetBlendAlpha(0, 0, 0x1f, 0x0); ov25_0225480C(param1); @@ -695,8 +695,8 @@ static void ov25_02255064(SysTask *param0, void *param1) { UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_1F8, 4); - sub_02019044(v0->unk_1F8, 5); + Bg_FreeTilemapBuffer(v0->unk_1F8, 4); + Bg_FreeTilemapBuffer(v0->unk_1F8, 5); ov25_0225480C(param1); } diff --git a/src/overlay025/ov25_02255090.c b/src/overlay025/ov25_02255090.c index 359821ecb0..34992c263c 100644 --- a/src/overlay025/ov25_02255090.c +++ b/src/overlay025/ov25_02255090.c @@ -307,7 +307,7 @@ void ov25_02255440(BgConfig *param0, u32 param1, u32 param2) (v0)[3] = v2 + 9; } - sub_020198C0(param0, param2, v0, 9 + 0, 11, 2, 2); + Bg_LoadToTilemapRect(param0, param2, v0, 9 + 0, 11, 2, 2); { u32 v2 = ((2 / 4) * 16) + ((2 & 3) * 2); @@ -317,7 +317,7 @@ void ov25_02255440(BgConfig *param0, u32 param1, u32 param2) (v0)[3] = v2 + 9; } - sub_020198C0(param0, param2, v0, 9 + 2, 11, 2, 2); + Bg_LoadToTilemapRect(param0, param2, v0, 9 + 2, 11, 2, 2); { u32 v2 = ((3 / 4) * 16) + ((3 & 3) * 2); @@ -327,7 +327,7 @@ void ov25_02255440(BgConfig *param0, u32 param1, u32 param2) (v0)[3] = v2 + 9; } - sub_020198C0(param0, param2, v0, 9 + 4, 11, 2, 2); + Bg_LoadToTilemapRect(param0, param2, v0, 9 + 4, 11, 2, 2); v1 = param1 / 10; param1 -= (v1 * 10); @@ -342,7 +342,7 @@ void ov25_02255440(BgConfig *param0, u32 param1, u32 param2) (v0)[3] = v2 + 9; } - sub_020198C0(param0, param2, v0, 9 + 6, 11, 2, 2); + Bg_LoadToTilemapRect(param0, param2, v0, 9 + 6, 11, 2, 2); { u32 v2 = (((param1) / 4) * 16) + (((param1) & 3) * 2); @@ -352,5 +352,5 @@ void ov25_02255440(BgConfig *param0, u32 param1, u32 param2) (v0)[3] = v2 + 9; } - sub_020198C0(param0, param2, v0, 9 + 8, 11, 2, 2); + Bg_LoadToTilemapRect(param0, param2, v0, 9 + 8, 11, 2, 2); } diff --git a/src/overlay026/ov26_02256404.c b/src/overlay026/ov26_02256404.c index 5031d6d579..04cff76c43 100644 --- a/src/overlay026/ov26_02256404.c +++ b/src/overlay026/ov26_02256404.c @@ -135,14 +135,14 @@ static void ov26_022564F8(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 23, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 24, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); ov26_022565F4(v2); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -154,7 +154,7 @@ static void ov26_0225658C(SysTask *param0, void *param1) UnkStruct_ov26_02256404 *v0 = ov25_0225523C(param1); ov26_022565F4(v0); - sub_02019448(v0->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 6); ov26_022564E4(param1); } @@ -175,7 +175,7 @@ static void ov26_022565D8(SysTask *param0, void *param1) { UnkStruct_ov26_02256404 *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov26_022564E4(param1); } @@ -188,14 +188,14 @@ static void ov26_022565F4(UnkStruct_ov26_02256404 *param0) v0 = CP_GetDivResult32(); v1 = CP_GetDivRemainder32(); - sub_020198E8(param0->unk_04, 6, 3, 7, 4, 9, param0->unk_30, 4 * v0, 0, (4 * 10), 9); - sub_020198E8(param0->unk_04, 6, (3 + (4 + 1)), 7, 4, 9, param0->unk_30, 4 * v1, 0, (4 * 10), 9); + Bg_CopyToTilemapRect(param0->unk_04, 6, 3, 7, 4, 9, param0->unk_30, 4 * v0, 0, (4 * 10), 9); + Bg_CopyToTilemapRect(param0->unk_04, 6, (3 + (4 + 1)), 7, 4, 9, param0->unk_30, 4 * v1, 0, (4 * 10), 9); CP_SetDiv32_32(param0->unk_00->unk_00.minute, 10); v0 = CP_GetDivResult32(); v1 = CP_GetDivRemainder32(); - sub_020198E8(param0->unk_04, 6, 15, 7, 4, 9, param0->unk_30, 4 * v0, 0, (4 * 10), 9); - sub_020198E8(param0->unk_04, 6, (15 + (4 + 1)), 7, 4, 9, param0->unk_30, 4 * v1, 0, (4 * 10), 9); + Bg_CopyToTilemapRect(param0->unk_04, 6, 15, 7, 4, 9, param0->unk_30, 4 * v0, 0, (4 * 10), 9); + Bg_CopyToTilemapRect(param0->unk_04, 6, (15 + (4 + 1)), 7, 4, 9, param0->unk_30, 4 * v1, 0, (4 * 10), 9); } diff --git a/src/overlay027/ov27_0225680C.c b/src/overlay027/ov27_0225680C.c index 2bc19cd14b..11482b34c6 100644 --- a/src/overlay027/ov27_0225680C.c +++ b/src/overlay027/ov27_0225680C.c @@ -67,7 +67,7 @@ BOOL ov27_0225680C(UnkStruct_ov27_0225680C **param0, const UnkStruct_ov27_022568 if (v0 != NULL) { v0->unk_00 = param1; v0->unk_5C = ov25_02254664(); - v0->unk_04 = sub_02018340(8); + v0->unk_04 = BgConfig_New(8); if (v0->unk_04 == NULL) { return 0; @@ -190,12 +190,12 @@ static void ov27_02256A18(SysTask *param0, void *param1) GXSDispCnt v1; UnkStruct_ov27_0225680C *v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 21, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 20, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); { UnkStruct_ov27_0225680C *v3 = ov25_0225523C(param1); @@ -341,7 +341,7 @@ static void ov27_02256BB0(SysTask *param0, void *param1) ov25_02255914(v0->unk_60[8], 1); ov27_02256EC4(v0->unk_04, 0); - sub_02019448(v0->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 6); ov27_02256A04(param1); } @@ -353,7 +353,7 @@ static void ov27_02256BE8(SysTask *param0, void *param1) ov25_022558C4(v0->unk_60[8], 11); ov27_02256EC4(v0->unk_04, 1); - sub_02019448(v0->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 6); PoketchSystem_PlaySoundEffect(1641); ov27_02256A04(param1); @@ -373,7 +373,7 @@ static void ov27_02256C2C(SysTask *param0, void *param1) case 0: ov25_022558C4(v1->unk_60[8], 12); ov27_02256EC4(v1->unk_04, 0); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); ov25_0225524C(param1); break; case 1: @@ -408,7 +408,7 @@ static void ov27_02256C80(SysTask *param0, void *param1) if (ov27_02256E90(v2, 6)) { PoketchSystem_PlaySoundEffect(1641); ov27_02256EC4(v1->unk_04, v2->unk_03); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); } break; } @@ -441,7 +441,7 @@ static void ov27_02256D00(SysTask *param0, void *param1) if (ov27_02256E90(v2, 3)) { PoketchSystem_PlaySoundEffect(1641); ov27_02256EC4(v1->unk_04, v2->unk_03); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); } break; } @@ -468,7 +468,7 @@ static void ov27_02256D80(SysTask *param0, void *param1) v2->unk_02 = 0; ov25_022558C4(v1->unk_60[8], 15); ov27_02256EC4(v1->unk_04, 5); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); PoketchSystem_PlaySoundEffect(1638); ov25_0225524C(param1); case 1: @@ -477,7 +477,7 @@ static void ov27_02256D80(SysTask *param0, void *param1) v2->unk_02 ^= 1; v2->unk_03 = 5 + v2->unk_02; ov27_02256EC4(v1->unk_04, v2->unk_03); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); } break; } @@ -502,7 +502,7 @@ static void ov27_02256E1C(SysTask *param0, void *param1) case 0: ov25_022558C4(v1->unk_60[8], 16); ov27_02256EC4(v1->unk_04, 6); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); ov25_0225524C(param1); v2->unk_00 = 0; case 1: @@ -541,7 +541,7 @@ static void ov27_02256EC4(BgConfig *param0, u32 param1) u32 v1, v2; u16 v3; - v0 = sub_02019FE4(param0, 6); + v0 = Bg_GetTilemapBuffer(param0, 6); v0 += ((9 * 32) + 9); v3 = 2 + param1 * 5; @@ -568,7 +568,7 @@ static void ov27_02256F24(SysTask *param0, void *param1) case 1: ov25_022559B0(&(v0->unk_34)); ov25_022559B0(&(v0->unk_48)); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); SysTask_Done(v0->unk_84); v0->unk_84 = NULL; ov27_02256A04(param1); diff --git a/src/overlay028/ov28_0225697C.c b/src/overlay028/ov28_0225697C.c index c637a8655e..00b2b076b9 100644 --- a/src/overlay028/ov28_0225697C.c +++ b/src/overlay028/ov28_0225697C.c @@ -541,14 +541,14 @@ static void ov28_02256A08(SysTask *param0, void *param1) v2 = ov25_02255240(param1); v3 = ov25_0225523C(param1); - sub_020183C4(v3->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v3->unk_04, 6, &v0, 0); sub_02006E3C(12, 16, v3->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 17, v3->unk_04, 6, 0, 0, 1, 8); ov28_02256AA4(v3); ov25_022546B8(0, 0); - sub_02019448(v3->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v3->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -561,7 +561,7 @@ static void ov28_02256AA4(UnkStruct_ov28_0225697C *param0) u16 *v0; u32 v1, v2, v3, v4; - v0 = sub_02019FE4(param0->unk_04, 6); + v0 = Bg_GetTilemapBuffer(param0->unk_04, 6); for (v1 = 0; v1 < NELEMS(Unk_ov28_02257938); v1++) { v4 = 0; @@ -586,8 +586,8 @@ static void ov28_02256B24(SysTask *param0, void *param1) PoketchSystem_PlaySoundEffect(1635); - sub_020198C0(v1->unk_04, 6, Unk_ov28_0225797C[v2], Unk_ov28_02257938[v2].unk_00, Unk_ov28_02257938[v2].unk_01, Unk_ov28_02257938[v2].unk_02, Unk_ov28_02257938[v2].unk_03); - sub_02019448(v1->unk_04, 6); + Bg_LoadToTilemapRect(v1->unk_04, 6, Unk_ov28_0225797C[v2], Unk_ov28_02257938[v2].unk_00, Unk_ov28_02257938[v2].unk_01, Unk_ov28_02257938[v2].unk_02, Unk_ov28_02257938[v2].unk_03); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); ov28_022569F4(param1); } @@ -602,8 +602,8 @@ static void ov28_02256B90(SysTask *param0, void *param1) v2 = v0->unk_00; v1 = ov25_0225523C(param1); - sub_020198C0(v1->unk_04, 6, v1->unk_4C[v2], Unk_ov28_02257938[v2].unk_00, Unk_ov28_02257938[v2].unk_01, Unk_ov28_02257938[v2].unk_02, Unk_ov28_02257938[v2].unk_03); - sub_02019448(v1->unk_04, 6); + Bg_LoadToTilemapRect(v1->unk_04, 6, v1->unk_4C[v2], Unk_ov28_02257938[v2].unk_00, Unk_ov28_02257938[v2].unk_01, Unk_ov28_02257938[v2].unk_02, Unk_ov28_02257938[v2].unk_03); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); ov28_022569F4(param1); } @@ -618,7 +618,7 @@ static void ov28_02256BF0(SysTask *param0, void *param1) ov28_0225726C(v0->unk_04, v1->unk_30); ov28_02256E0C(v1->unk_04, v1->unk_30); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); ov28_022569F4(param1); } @@ -633,7 +633,7 @@ static void ov28_02256C28(SysTask *param0, void *param1) ov28_0225726C(v0->unk_04, v1->unk_30); ov28_02256E0C(v1->unk_04, v1->unk_30); ov28_02256DCC(v1->unk_04); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); ov28_022569F4(param1); } @@ -647,7 +647,7 @@ static void ov28_02256C68(SysTask *param0, void *param1) ov28_0225726C(v0->unk_08, v1->unk_30); ov28_02256E0C(v1->unk_04, v1->unk_30); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); ov28_022569F4(param1); } @@ -662,7 +662,7 @@ static void ov28_02256CA0(SysTask *param0, void *param1) ov28_0225726C(v0->unk_0C, v1->unk_30); ov28_02256E0C(v1->unk_04, v1->unk_30); ov28_02256DCC(v1->unk_04); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); ov28_022569F4(param1); } @@ -677,7 +677,7 @@ static void ov28_02256CE0(SysTask *param0, void *param1) ov28_0225726C(v0->unk_0C, v1->unk_30); ov28_02256E0C(v1->unk_04, v1->unk_30); ov28_02256D90(v1->unk_04, v0); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); ov28_022569F4(param1); } @@ -696,7 +696,7 @@ static void ov28_02256D20(SysTask *param0, void *param1) ov28_02256E0C(v0->unk_04, v0->unk_30); ov28_02256DCC(v0->unk_04); - sub_02019448(v0->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 6); ov28_022569F4(param1); } @@ -709,7 +709,7 @@ static void ov28_02256D64(SysTask *param0, void *param1) v0 = ov25_02255240(param1); ov28_02256D90(v1->unk_04, v0); - sub_02019448(v1->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v1->unk_04, 6); ov28_022569F4(param1); } @@ -717,7 +717,7 @@ static void ov28_02256D90(BgConfig *param0, const UnkStruct_ov28_0225697C_1 *par { u16 *v0; - v0 = sub_02019FE4(param0, 6); + v0 = Bg_GetTilemapBuffer(param0, 6); if (param1->unk_02 == 17) { ov28_02256DCC(param0); @@ -729,7 +729,7 @@ static void ov28_02256D90(BgConfig *param0, const UnkStruct_ov28_0225697C_1 *par static void ov28_02256DCC(BgConfig *param0) { - u16 *v0 = sub_02019FE4(param0, 6); + u16 *v0 = Bg_GetTilemapBuffer(param0, 6); ov25_02255258(v0, 3, 3, 32, 41, 40, 0); } @@ -738,7 +738,7 @@ static void ov28_02256DF0(SysTask *param0, void *param1) UnkStruct_ov28_0225697C *v0; v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov28_022569F4(param1); } @@ -747,7 +747,7 @@ static void ov28_02256E0C(BgConfig *param0, const u16 *param1) u32 v0, v1, v2; u16 *v3; - v3 = sub_02019FE4(param0, 6); + v3 = Bg_GetTilemapBuffer(param0, 6); for (v0 = 0; param1[v0] != 13; v0++) { (void)0; diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c index b135c1fd33..8ab4dbf203 100644 --- a/src/overlay029/ov29_022566C8.c +++ b/src/overlay029/ov29_022566C8.c @@ -70,13 +70,13 @@ static BOOL ov29_02256728(UnkStruct_ov29_022566C8 *param0) 7, 2, 2, 20, 19, 0, 12 }; - param0->unk_70 = sub_0201A778(8, 1); + param0->unk_70 = Window_New(8, 1); if (param0->unk_70) { - sub_0201A8D4(param0->unk_04, param0->unk_70, &v0); + Window_AddFromTemplate(param0->unk_04, param0->unk_70, &v0); if (sub_02099DD0(param0->unk_00->unk_16E8, param0->unk_70->pixels, (20 * 19 * 0x20)) == 0) { - BGL_FillWindow(param0->unk_70, 0x4); + Window_FillTilemap(param0->unk_70, 0x4); } return 1; @@ -92,7 +92,7 @@ void ov29_02256770(UnkStruct_ov29_022566C8 *param0) if (param0->unk_70) { sub_02099DA8(param0->unk_00->unk_16E8, param0->unk_70->pixels, (20 * 19 * 0x20)); - BGL_DeleteWindow(param0->unk_70); + Window_Remove(param0->unk_70); Heap_FreeToHeap(param0->unk_70); } @@ -170,8 +170,8 @@ static void ov29_02256804(SysTask *param0, void *param1) v3 = ov25_0225523C(param1); - sub_020183C4(v3->unk_04, 6, &v0, 0); - sub_020183C4(v3->unk_04, 7, &v1, 0); + Bg_InitFromTemplate(v3->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v3->unk_04, 7, &v1, 0); GF_ASSERT(GF_heap_c_dummy_return_true(8)); @@ -182,7 +182,7 @@ static void ov29_02256804(SysTask *param0, void *param1) GF_ASSERT(GF_heap_c_dummy_return_true(8)); ov29_02256728(v3); - sub_0201A954(v3->unk_70); + Window_CopyToVRAM(v3->unk_70); GF_ASSERT(GF_heap_c_dummy_return_true(8)); @@ -190,7 +190,7 @@ static void ov29_02256804(SysTask *param0, void *param1) GF_ASSERT(GF_heap_c_dummy_return_true(8)); - sub_02019448(v3->unk_04, 7); + Bg_CopyTilemapBufferToVRAM(v3->unk_04, 7); v2 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v2.visiblePlane | GX_PLANEMASK_BG2 | GX_PLANEMASK_OBJ); @@ -222,7 +222,7 @@ static void ov29_02256950(SysTask *param0, void *param1) UnkStruct_ov29_022566C8 *v0; v0 = ov25_0225523C(param1); - sub_0201ACCC(v0->unk_70); + Window_LoadTiles(v0->unk_70); ov29_022567F0(param1); } @@ -270,13 +270,13 @@ static void ov29_022569DC(SysTask *param0, void *param1) v1 = 0; } - BGL_WindowColor(v2->unk_70, 0x4, v0, v1, v3, v4); + Window_FillRectWithColor(v2->unk_70, 0x4, v0, v1, v3, v4); ov29_02256968((u8 *)v2->unk_70->pixels, v0, v1, v3, v4); } else { v0 = v2->unk_00->unk_04 * 2; v1 = v2->unk_00->unk_08 * 2; - BGL_WindowColor(v2->unk_70, 0x1, v0, v1, 2, 2); + Window_FillRectWithColor(v2->unk_70, 0x1, v0, v1, 2, 2); ov29_02256968((u8 *)v2->unk_70->pixels, v0, v1, 2, 2); } @@ -289,7 +289,7 @@ static void ov29_02256A7C(SysTask *param0, void *param1) v0 = ov25_0225523C(param1); - sub_0201ACCC(v0->unk_70); + Window_LoadTiles(v0->unk_70); ov29_022567F0(param1); } @@ -298,8 +298,8 @@ static void ov29_02256A94(SysTask *param0, void *param1) UnkStruct_ov29_022566C8 *v0 = ov25_0225523C(param1); ov29_02256B18(v0); - sub_02019044(v0->unk_04, 6); - sub_02019044(v0->unk_04, 7); + Bg_FreeTilemapBuffer(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 7); ov29_022567F0(param1); } diff --git a/src/overlay030/ov30_022563EC.c b/src/overlay030/ov30_022563EC.c index 5f38f9af97..3886362098 100644 --- a/src/overlay030/ov30_022563EC.c +++ b/src/overlay030/ov30_022563EC.c @@ -139,14 +139,14 @@ static void ov30_022564B4(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 23, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 26, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); ov30_022565B0(v2); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2 | GX_PLANEMASK_OBJ); @@ -158,7 +158,7 @@ static void ov30_02256548(SysTask *param0, void *param1) UnkStruct_ov30_022563EC *v0 = ov25_0225523C(param1); ov30_022565B0(v0); - sub_02019448(v0->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 6); ov30_022564A0(param1); } @@ -179,7 +179,7 @@ static void ov30_02256594(SysTask *param0, void *param1) { UnkStruct_ov30_022563EC *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov30_022564A0(param1); } diff --git a/src/overlay031/ov31_02256554.c b/src/overlay031/ov31_02256554.c index c7749dbbb0..af99a4ed99 100644 --- a/src/overlay031/ov31_02256554.c +++ b/src/overlay031/ov31_02256554.c @@ -103,13 +103,13 @@ static void ov31_022565E0(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); ov31_02256644(v2->unk_04); ov31_0225672C(v2->unk_04, v2->unk_00); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -129,7 +129,7 @@ static void ov31_02256644(BgConfig *param0) MI_CpuFillFast(v0 + v1 * 0x20, v2, 0x20); } - sub_0201958C(param0, 6, v0, 0x20 * 16, 0); + Bg_LoadTiles(param0, 6, v0, 0x20 * 16, 0); Heap_FreeToHeap(v0); } } @@ -141,7 +141,7 @@ static void ov31_022566EC(SysTask *param0, void *param1) v0 = ov25_0225523C(param1); ov31_0225672C(v0->unk_04, v0->unk_00); - sub_02019448(v0->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 6); ov31_022565CC(param1); } @@ -149,7 +149,7 @@ static void ov31_02256710(SysTask *param0, void *param1) { UnkStruct_ov31_02256554 *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov31_022565CC(param1); } @@ -159,7 +159,7 @@ static void ov31_0225672C(BgConfig *param0, const UnkStruct_ov31_02256554_1 *par 4, 15, 8, 1 }; int v1, v2, v3; - u16 *v4 = sub_02019FE4(param0, 6); + u16 *v4 = Bg_GetTilemapBuffer(param0, 6); v4 += ((2 * 32) + 2); diff --git a/src/overlay032/ov32_02256470.c b/src/overlay032/ov32_02256470.c index e250b83220..c961f1c6be 100644 --- a/src/overlay032/ov32_02256470.c +++ b/src/overlay032/ov32_02256470.c @@ -177,17 +177,17 @@ static void ov32_02256588(SysTask *param0, void *param1) u32 v3; v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); v3 = sub_02006E3C(12, 106, v2->unk_04, 6, 0, 0, 1, 8); v3 /= 0x20; - sub_02019CB8(v2->unk_04, 6, 0x5, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(v2->unk_04, 6, 0x5, 0, 0, 32, 24, 0); ov25_022546B8(0, 0); v2->unk_34 = v3; ov32_02256648(v2, v2->unk_00, v3); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); ov25_02255308(15, 1); ov25_02255360(2); @@ -217,8 +217,8 @@ static void ov32_02256648(UnkStruct_ov32_02256470 *param0, const UnkStruct_ov32_ for (v1 = 0; v1 < param1->unk_00; v1++) { Window_Init(&(param0->unk_3C[v1])); - BGL_AddWindow(param0->unk_04, &(param0->unk_3C[v1]), 6, v0[v1].unk_00, v0[v1].unk_02, 8, 1, 0, param2 + v1 * 8); - sub_0201A9F4(&(param0->unk_3C[v1])); + Window_Add(param0->unk_04, &(param0->unk_3C[v1]), 6, v0[v1].unk_00, v0[v1].unk_02, 8, 1, 0, param2 + v1 * 8); + Window_PutToTilemap(&(param0->unk_3C[v1])); ov32_022566E0(&(param0->unk_3C[v1]), param0); ov32_0225682C(&(param0->unk_3C[v1]), ov32_0225686C(param1->unk_04[v1].unk_06, param1->unk_04[v1].unk_08)); @@ -229,27 +229,27 @@ static void ov32_02256648(UnkStruct_ov32_02256470 *param0, const UnkStruct_ov32_ static void ov32_022566E0(Window *param0, UnkStruct_ov32_02256470 *param1) { - sub_02019CB8(param1->unk_04, 6, 1, param0->tilemapLeft - 1, param0->tilemapTop - 1, 1, 1, 0); - sub_02019CB8(param1->unk_04, 6, 2, param0->tilemapLeft, param0->tilemapTop - 1, param0->width, 1, 0); - sub_02019CB8(param1->unk_04, 6, 1025, param0->tilemapLeft + param0->width, param0->tilemapTop - 1, 1, 1, 0); + Bg_FillTilemapRect(param1->unk_04, 6, 1, param0->tilemapLeft - 1, param0->tilemapTop - 1, 1, 1, 0); + Bg_FillTilemapRect(param1->unk_04, 6, 2, param0->tilemapLeft, param0->tilemapTop - 1, param0->width, 1, 0); + Bg_FillTilemapRect(param1->unk_04, 6, 1025, param0->tilemapLeft + param0->width, param0->tilemapTop - 1, 1, 1, 0); - sub_02019CB8(param1->unk_04, 6, 6, param0->tilemapLeft - 1, param0->tilemapTop, 1, param0->height, 0); - sub_02019CB8(param1->unk_04, 6, 1030, param0->tilemapLeft + param0->width, param0->tilemapTop, 1, param0->height, 0); + Bg_FillTilemapRect(param1->unk_04, 6, 6, param0->tilemapLeft - 1, param0->tilemapTop, 1, param0->height, 0); + Bg_FillTilemapRect(param1->unk_04, 6, 1030, param0->tilemapLeft + param0->width, param0->tilemapTop, 1, param0->height, 0); - sub_02019CB8(param1->unk_04, 6, 2049, param0->tilemapLeft - 1, param0->tilemapTop + param0->height, 1, 1, 0); - sub_02019CB8(param1->unk_04, 6, 2050, param0->tilemapLeft, param0->tilemapTop + param0->height, param0->width, 1, 0); - sub_02019CB8(param1->unk_04, 6, 3073, param0->tilemapLeft + param0->width, param0->tilemapTop + param0->height, 1, 1, 0); + Bg_FillTilemapRect(param1->unk_04, 6, 2049, param0->tilemapLeft - 1, param0->tilemapTop + param0->height, 1, 1, 0); + Bg_FillTilemapRect(param1->unk_04, 6, 2050, param0->tilemapLeft, param0->tilemapTop + param0->height, param0->width, 1, 0); + Bg_FillTilemapRect(param1->unk_04, 6, 3073, param0->tilemapLeft + param0->width, param0->tilemapTop + param0->height, 1, 1, 0); } static void ov32_0225682C(Window *param0, u32 param1) { - BGL_WindowColor(param0, 4, 0, 0, 64, 8); + Window_FillRectWithColor(param0, 4, 0, 0, 64, 8); if (param1) { - BGL_WindowColor(param0, 15, 0, 0, param1, 8); + Window_FillRectWithColor(param0, 15, 0, 0, param1, 8); } - sub_0201ACCC(param0); + Window_LoadTiles(param0); } static u32 ov32_0225686C(u32 param0, u32 param1) @@ -447,7 +447,7 @@ static void ov32_02256BD4(UnkStruct_ov32_02256470 *param0) } for (v0 = 0; v0 < param0->unk_38; v0++) { - BGL_DeleteWindow(&(param0->unk_3C[v0])); + Window_Remove(&(param0->unk_3C[v0])); } param0->unk_38 = 0; @@ -457,7 +457,7 @@ static void ov32_02256C38(SysTask *param0, void *param1) { UnkStruct_ov32_02256470 *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov32_02256574(param1); } @@ -468,13 +468,13 @@ static void ov32_02256C54(SysTask *param0, void *param1) ov32_02256BD4(v0); - sub_02019CB8(v0->unk_04, 6, 0x5, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(v0->unk_04, 6, 0x5, 0, 0, 32, 24, 0); ov32_02256898(v0, v1); ov32_0225692C(v0, v1); ov32_02256648(v0, v1, v0->unk_34); - sub_02019448(v0->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 6); PoketchSystem_PlaySoundEffect(1641); ov32_02256574(param1); diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c index 2952fd3e7f..4767768b63 100644 --- a/src/overlay033/ov33_02256474.c +++ b/src/overlay033/ov33_02256474.c @@ -218,12 +218,12 @@ static void ov33_02256598(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 7, v2->unk_04, 6, 0, 0, 1, 8); - sub_02019CB8(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); ov33_02256634(v2, v2->unk_00); ov33_0225681C(v2, v2->unk_00); @@ -343,7 +343,7 @@ static void ov33_02256898(SysTask *param0, void *param1) { UnkStruct_ov33_02256474 *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov33_02256584(param1); } diff --git a/src/overlay034/ov34_02256540.c b/src/overlay034/ov34_02256540.c index f77f99dd13..bd32b04283 100644 --- a/src/overlay034/ov34_02256540.c +++ b/src/overlay034/ov34_02256540.c @@ -180,7 +180,7 @@ static void ov34_02256690(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 39, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 38, v2->unk_04, 6, 0, 0, 1, 8); @@ -198,7 +198,7 @@ static void ov34_02256690(SysTask *param0, void *param1) GXS_LoadOBJPltt(v2->unk_70, 14 * 0x20, 0x20); } - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -211,7 +211,7 @@ static void ov34_02256774(SysTask *param0, void *param1) { UnkStruct_ov34_02256540 *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov34_0225667C(param1); } diff --git a/src/overlay035/ov35_02256410.c b/src/overlay035/ov35_02256410.c index 6ab6f3e1aa..976cc10725 100644 --- a/src/overlay035/ov35_02256410.c +++ b/src/overlay035/ov35_02256410.c @@ -175,12 +175,12 @@ static void ov35_02256598(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 44, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 43, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -192,7 +192,7 @@ static void ov35_02256628(SysTask *param0, void *param1) { UnkStruct_ov35_02256410 *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov35_02256584(param1); } diff --git a/src/overlay036/ov36_02256404.c b/src/overlay036/ov36_02256404.c index 1421a80624..ffe2b8d196 100644 --- a/src/overlay036/ov36_02256404.c +++ b/src/overlay036/ov36_02256404.c @@ -168,12 +168,12 @@ static void ov36_0225658C(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 49, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 48, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -185,7 +185,7 @@ static void ov36_0225661C(SysTask *param0, void *param1) { UnkStruct_ov36_02256404 *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov36_02256578(param1); } diff --git a/src/overlay037/ov37_022563D4.c b/src/overlay037/ov37_022563D4.c index 8a173ce3a0..81b2f7208f 100644 --- a/src/overlay037/ov37_022563D4.c +++ b/src/overlay037/ov37_022563D4.c @@ -143,12 +143,12 @@ static void ov37_022564D8(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 101, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 100, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -161,7 +161,7 @@ static void ov37_02256568(SysTask *param0, void *param1) UnkStruct_ov37_022563D4 *v0 = ov25_0225523C(param1); ov37_02256470(v0); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov37_022564C4(param1); } diff --git a/src/overlay038/ov38_0225632C.c b/src/overlay038/ov38_0225632C.c index 4c74924b38..6e79320a9d 100644 --- a/src/overlay038/ov38_0225632C.c +++ b/src/overlay038/ov38_0225632C.c @@ -100,13 +100,13 @@ static void ov38_022563B8(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 8, v2->unk_04, 6, 0, 0, 0, 8); - sub_02019CB8(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); sub_02006E84(12, 9, 4, 0 * 0x20, 0x20, 8); ov25_02255440(v2->unk_04, 12, 6); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -118,6 +118,6 @@ static void ov38_02256458(SysTask *param0, void *param1) { UnkStruct_ov38_0225632C *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov38_022563A4(param1); } diff --git a/src/overlay039/ov39_022563DC.c b/src/overlay039/ov39_022563DC.c index 6281deb8cf..f0f6d648d3 100644 --- a/src/overlay039/ov39_022563DC.c +++ b/src/overlay039/ov39_022563DC.c @@ -110,7 +110,7 @@ static void ov39_02256468(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); v3 = ov25_02255240(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 59, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 58, v2->unk_04, 6, 0, 0, 1, 8); @@ -120,7 +120,7 @@ static void ov39_02256468(SysTask *param0, void *param1) ov39_0225659C(v2, v6, v3->unk_04[v6], 0); } - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -132,7 +132,7 @@ static void ov39_02256518(SysTask *param0, void *param1) { UnkStruct_ov39_022563DC *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov39_02256454(param1); } @@ -142,7 +142,7 @@ static void ov39_02256534(SysTask *param0, void *param1) const UnkStruct_ov39_022563DC_1 *v1 = ov25_02255240(param1); ov39_0225659C(v0, v1->unk_1C, v1->unk_04[v1->unk_1C], 1); - sub_02019448(v0->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 6); ov39_02256454(param1); } @@ -152,7 +152,7 @@ static void ov39_02256568(SysTask *param0, void *param1) const UnkStruct_ov39_022563DC_1 *v1 = ov25_02255240(param1); ov39_0225659C(v0, v1->unk_1C, v1->unk_04[v1->unk_1C], 0); - sub_02019448(v0->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 6); ov39_02256454(param1); } @@ -169,7 +169,7 @@ static void ov39_0225659C(UnkStruct_ov39_022563DC *param0, u32 param1, BOOL para u16 *v1; int v2, v3, v4; - v1 = sub_02019FE4(param0->unk_04, 6); + v1 = Bg_GetTilemapBuffer(param0->unk_04, 6); v1 += v0[param1]; v4 = (param2) ? (36 * 2) * (param1 + 1) : 0; diff --git a/src/overlay040/ov40_0225645C.c b/src/overlay040/ov40_0225645C.c index 49f8f84324..25f8aaba45 100644 --- a/src/overlay040/ov40_0225645C.c +++ b/src/overlay040/ov40_0225645C.c @@ -270,12 +270,12 @@ static void ov40_02256618(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 81, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 80, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); G2S_SetBGMosaicSize(0, 0); G2S_SetOBJMosaicSize(0, 0); @@ -299,7 +299,7 @@ static void ov40_022566B0(SysTask *param0, void *param1) if (ov40_022565EC(v0, 2)) { G2S_SetBGMosaicSize(0, 0); G2S_SetOBJMosaicSize(0, 0); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov40_02256604(param1); } break; diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c index c023869efc..143ab829f6 100644 --- a/src/overlay041/ov41_022567B0.c +++ b/src/overlay041/ov41_022567B0.c @@ -217,8 +217,8 @@ static void ov41_022568DC(SysTask *param0, void *param1) GF_ASSERT(GF_heap_c_dummy_return_true(8)); v3 = ov25_0225523C(param1); - sub_020183C4(v3->unk_04, 6, &v0, 0); - sub_020183C4(v3->unk_04, 7, &v1, 0); + Bg_InitFromTemplate(v3->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v3->unk_04, 7, &v1, 0); GF_ASSERT(GF_heap_c_dummy_return_true(8)); @@ -231,7 +231,7 @@ static void ov41_022568DC(SysTask *param0, void *param1) GF_ASSERT(GF_heap_c_dummy_return_true(8)); ov41_022569BC(v3, v4); - sub_02019448(v3->unk_04, 7); + Bg_CopyTilemapBufferToVRAM(v3->unk_04, 7); v2 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v2.visiblePlane | GX_PLANEMASK_BG2 | GX_PLANEMASK_OBJ); @@ -249,14 +249,14 @@ static void ov41_022569BC(UnkStruct_ov41_022567B0 *param0, u32 param1) param0->unk_58 = param1; v0.baseTile = param1; - sub_0201A8D4(param0->unk_04, ¶m0->unk_48, &v0); + Window_AddFromTemplate(param0->unk_04, ¶m0->unk_48, &v0); if (sub_02099DD0(param0->unk_00->unk_08, param0->unk_48.pixels, (20 * 19 * 0x20)) == 0) { - BGL_FillWindow(¶m0->unk_48, 0x4); + Window_FillTilemap(¶m0->unk_48, 0x4); } - sub_0201A9F4(¶m0->unk_48); - sub_0201ACCC(¶m0->unk_48); + Window_PutToTilemap(¶m0->unk_48); + Window_LoadTiles(¶m0->unk_48); } static void ov41_02256A1C(SysTask *param0, void *param1) @@ -270,9 +270,9 @@ static void ov41_02256A1C(SysTask *param0, void *param1) break; case 1: sub_02099DA8(v0->unk_00->unk_08, v0->unk_48.pixels, (20 * 19 * 0x20)); - BGL_DeleteWindow(&v0->unk_48); - sub_02019044(v0->unk_04, 6); - sub_02019044(v0->unk_04, 7); + Window_Remove(&v0->unk_48); + Bg_FreeTilemapBuffer(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 7); ov41_022568C8(param1); } } @@ -282,7 +282,7 @@ static void ov41_02256A74(SysTask *param0, void *param1) UnkStruct_ov41_022567B0 *v0; v0 = ov25_0225523C(param1); - sub_0201ACCC(&v0->unk_48); + Window_LoadTiles(&v0->unk_48); ov41_022568C8(param1); } @@ -296,7 +296,7 @@ static void ov41_02256A8C(SysTask *param0, void *param1) v1 = v4->unk_00->unk_04 * 2; v3 = ((v1 >> 3) * 20) + (v0 >> 3); - BGL_WindowColor(&v4->unk_48, 0x1, v0, v1, 2, 2); + Window_FillRectWithColor(&v4->unk_48, 0x1, v0, v1, 2, 2); GXS_LoadBG3Char((u8 *)(v4->unk_48.pixels) + (v3 * 0x20), (v4->unk_58 + v3) * 0x20, 0x20); ov41_022568C8(param1); } @@ -306,7 +306,7 @@ static void ov41_02256AE4(SysTask *param0, void *param1) UnkStruct_ov41_022567B0 *v0; v0 = ov25_0225523C(param1); - sub_0201ACCC(&v0->unk_48); + Window_LoadTiles(&v0->unk_48); ov41_022568C8(param1); } @@ -326,8 +326,8 @@ static void ov41_02256B60(SysTask *param0, void *param1) UnkStruct_ov41_022567B0 *v0 = ov25_0225523C(param1); const UnkStruct_ov41_022567B0_1 *v1 = ov25_02255240(param1); - BGL_FillWindow(&v0->unk_48, 0x4); - sub_0201ACCC(&v0->unk_48); + Window_FillTilemap(&v0->unk_48, 0x4); + Window_LoadTiles(&v0->unk_48); ov41_022568C8(param1); } diff --git a/src/overlay042/ov42_022563D4.c b/src/overlay042/ov42_022563D4.c index 69972d8a90..177fdfa846 100644 --- a/src/overlay042/ov42_022563D4.c +++ b/src/overlay042/ov42_022563D4.c @@ -151,12 +151,12 @@ static void ov42_022564F0(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 54, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 53, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -174,7 +174,7 @@ static void ov42_02256580(SysTask *param0, void *param1) ov25_0225524C(param1); case 1: if (ov42_022564C4(v0, 2)) { - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov42_022564DC(param1); } break; diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index d884cc3760..ecb55e80f7 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -240,7 +240,7 @@ static void ov43_02256700(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); v3 = ov25_02255240(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); v6 = sub_02006E3C(12, 61, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 60, v2->unk_04, 6, 0, 0, 1, 8); @@ -248,7 +248,7 @@ static void ov43_02256700(SysTask *param0, void *param1) v6 /= 0x20; ov43_022567A4(v2, v3, v6); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -258,31 +258,31 @@ static void ov43_02256700(SysTask *param0, void *param1) static void ov43_022567A4(UnkStruct_ov43_02256544 *param0, const UnkStruct_ov43_02256544_1 *param1, u32 param2) { - BGL_AddWindow(param0->unk_04, &(param0->unk_74), 6, 6, 15, 6, 2, 0, param2); + Window_Add(param0->unk_04, &(param0->unk_74), 6, 6, 15, 6, 2, 0, param2); param2 += 12; - BGL_AddWindow(param0->unk_04, &(param0->unk_84), 6, 16, 4, 6, 2, 0, param2); + Window_Add(param0->unk_04, &(param0->unk_84), 6, 16, 4, 6, 2, 0, param2); param2 += 12; - BGL_AddWindow(param0->unk_04, &(param0->unk_94), 6, 16, 8, 6, 2, 0, param2); + Window_Add(param0->unk_04, &(param0->unk_94), 6, 16, 8, 6, 2, 0, param2); param2 += 12; - BGL_AddWindow(param0->unk_04, &(param0->unk_A4), 6, 3, 19, 22, 2, 0, param2); + Window_Add(param0->unk_04, &(param0->unk_A4), 6, 3, 19, 22, 2, 0, param2); - sub_0201A9F4(&(param0->unk_74)); - sub_0201A9F4(&(param0->unk_84)); - sub_0201A9F4(&(param0->unk_94)); - sub_0201A9F4(&(param0->unk_A4)); + Window_PutToTilemap(&(param0->unk_74)); + Window_PutToTilemap(&(param0->unk_84)); + Window_PutToTilemap(&(param0->unk_94)); + Window_PutToTilemap(&(param0->unk_A4)); ov43_02256948(param0, param1); } static void ov43_02256870(UnkStruct_ov43_02256544 *param0) { - BGL_DeleteWindow(&(param0->unk_74)); - BGL_DeleteWindow(&(param0->unk_84)); - BGL_DeleteWindow(&(param0->unk_94)); - BGL_DeleteWindow(&(param0->unk_A4)); + Window_Remove(&(param0->unk_74)); + Window_Remove(&(param0->unk_84)); + Window_Remove(&(param0->unk_94)); + Window_Remove(&(param0->unk_A4)); } static void ov43_02256894(SysTask *param0, void *param1) @@ -290,7 +290,7 @@ static void ov43_02256894(SysTask *param0, void *param1) UnkStruct_ov43_02256544 *v0 = ov25_0225523C(param1); ov43_02256870(v0); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov43_022566EC(param1); } @@ -341,7 +341,7 @@ static void ov43_02256988(UnkStruct_ov43_02256544 *param0, Window *param1, u32 p { u32 v0; - BGL_FillWindow(param1, 4); + Window_FillTilemap(param1, 4); if (param2 == 18) { MessageLoader_GetStrbuf(param0->unk_B8, 6, param0->unk_BC); @@ -352,15 +352,15 @@ static void ov43_02256988(UnkStruct_ov43_02256544 *param0, Window *param1, u32 p v0 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_BC, 0); Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, param0->unk_BC, ((6 * 8) - v0) / 2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL); - sub_0201ACCC(param1); + Window_LoadTiles(param1); } static void ov43_02256A00(UnkStruct_ov43_02256544 *param0, Window *param1, u32 param2) { - BGL_FillWindow(param1, 4); + Window_FillTilemap(param1, 4); MessageLoader_GetStrbuf(param0->unk_B8, param2, param0->unk_BC); Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, param0->unk_BC, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL); - sub_0201ACCC(param1); + Window_LoadTiles(param1); } static void ov43_02256A4C(UnkStruct_ov43_02256544 *param0, u32 param1) diff --git a/src/overlay044/ov44_022565BC.c b/src/overlay044/ov44_022565BC.c index 5aaee4a7bd..062b01f047 100644 --- a/src/overlay044/ov44_022565BC.c +++ b/src/overlay044/ov44_022565BC.c @@ -238,12 +238,12 @@ static void ov44_02256794(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); v3 = ov25_02255240(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 71, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 70, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -262,7 +262,7 @@ static void ov44_02256828(SysTask *param0, void *param1) break; case 1: if (ov44_02256768(v0, 6)) { - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov44_02256780(param1); } break; diff --git a/src/overlay045/ov45_022566EC.c b/src/overlay045/ov45_022566EC.c index bf1e5014b5..61f42b0085 100644 --- a/src/overlay045/ov45_022566EC.c +++ b/src/overlay045/ov45_022566EC.c @@ -295,12 +295,12 @@ static void ov45_02256968(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 76, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 75, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -319,7 +319,7 @@ static void ov45_022569F8(SysTask *param0, void *param1) break; case 1: if (ov45_0225693C(v0, 5)) { - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov45_02256954(param1); } break; diff --git a/src/overlay046/ov46_02256BCC.c b/src/overlay046/ov46_02256BCC.c index 28e2532cb5..838092acaf 100644 --- a/src/overlay046/ov46_02256BCC.c +++ b/src/overlay046/ov46_02256BCC.c @@ -314,12 +314,12 @@ static void ov46_02256D74(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 91, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 90, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -358,7 +358,7 @@ static void ov46_02256E58(SysTask *param0, void *param1) ov25_0225524C(param1); case 1: if (ov46_02256D48(v0, 6)) { - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov46_02256D60(param1); } } diff --git a/src/overlay047/ov47_02256634.c b/src/overlay047/ov47_02256634.c index 69280d0220..8057a43a1e 100644 --- a/src/overlay047/ov47_02256634.c +++ b/src/overlay047/ov47_02256634.c @@ -216,13 +216,13 @@ static void ov47_022568BC(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 117, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 115, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -234,7 +234,7 @@ static void ov47_0225694C(SysTask *param0, void *param1) { UnkStruct_ov47_02256634 *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov47_022568A8(param1); } diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c index 8401bb85f8..eec8f3b902 100644 --- a/src/overlay048/ov48_0225650C.c +++ b/src/overlay048/ov48_0225650C.c @@ -131,7 +131,7 @@ static void ov48_022565A8(SysTask *param0, void *param1) G2S_SetBGMosaicSize(0, 0); G2S_SetOBJMosaicSize(0, 0); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); v4 = sub_02006E3C(12, 117, v2->unk_04, 6, 0, 0, 1, 8); v4 /= 0x20; @@ -141,7 +141,7 @@ static void ov48_022565A8(SysTask *param0, void *param1) ov25_022546B8(0, 0); ov48_02256650(v2, v4); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -158,12 +158,12 @@ static void ov48_02256650(UnkStruct_ov48_0225650C *param0, u32 param1) v1 = MessageBank_GetNewStrbufFromNARC(26, 459, 0, 8); if (v1) { - BGL_AddWindow(param0->unk_04, &v0, 6, 18, 20, 8, 2, 0, param1); - BGL_FillWindow(&v0, 4); + Window_Add(param0->unk_04, &v0, 6, 18, 20, 8, 2, 0, param1); + Window_FillTilemap(&v0, 4); Text_AddPrinterWithParamsAndColor(&v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL); - sub_0201A9F4(&v0); - sub_0201ACCC(&v0); - BGL_DeleteWindow(&v0); + Window_PutToTilemap(&v0); + Window_LoadTiles(&v0); + Window_Remove(&v0); Strbuf_Free(v1); } } @@ -182,7 +182,7 @@ static void ov48_022566D0(SysTask *param0, void *param1) ov48_02256984(v0); G2S_SetBGMosaicSize(0, 0); G2S_SetOBJMosaicSize(0, 0); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov48_02256594(param1); } break; diff --git a/src/overlay049/ov49_022563D4.c b/src/overlay049/ov49_022563D4.c index b026bf5356..37aa778ba8 100644 --- a/src/overlay049/ov49_022563D4.c +++ b/src/overlay049/ov49_022563D4.c @@ -146,12 +146,12 @@ static void ov49_022564E4(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); v3 = ov25_02255240(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 66, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 65, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -163,7 +163,7 @@ static void ov49_02256578(SysTask *param0, void *param1) { UnkStruct_ov49_022563D4 *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov49_022564D0(param1); } diff --git a/src/overlay050/ov50_02256510.c b/src/overlay050/ov50_02256510.c index 7db3fecf02..910fad3d55 100644 --- a/src/overlay050/ov50_02256510.c +++ b/src/overlay050/ov50_02256510.c @@ -169,8 +169,8 @@ static void ov50_0225664C(SysTask *param0, void *param1) v3 = ov25_0225523C(param1); v4 = ov25_02255240(param1); - sub_020183C4(v3->unk_04, 6, &v0, 0); - sub_020183C4(v3->unk_04, 7, &v1, 0); + Bg_InitFromTemplate(v3->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v3->unk_04, 7, &v1, 0); ov50_0225675C(v3, v4); ov50_022567F4(v3, v4); @@ -178,8 +178,8 @@ static void ov50_0225664C(SysTask *param0, void *param1) sub_02006E3C(12, 111, v3->unk_04, 7, 0, 0, 1, 8); ov25_022546B8(0, 0); - sub_02019448(v3->unk_04, 6); - sub_02019448(v3->unk_04, 7); + Bg_CopyTilemapBufferToVRAM(v3->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v3->unk_04, 7); v2 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v2.visiblePlane | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3); @@ -190,8 +190,8 @@ static void ov50_022566F0(SysTask *param0, void *param1) { UnkStruct_ov50_02256510 *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); - sub_02019044(v0->unk_04, 7); + Bg_FreeTilemapBuffer(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 7); ov50_02256638(param1); } @@ -207,7 +207,7 @@ static void ov50_02256714(SysTask *param0, void *param1) v2 = (v1->unk_0C[v1->unk_88].unk_03) ? 143 : 131; ov50_022567A8(v0->unk_04, v2, v1->unk_0C[v1->unk_88].unk_02); - sub_02019448(v0->unk_04, 7); + Bg_CopyTilemapBufferToVRAM(v0->unk_04, 7); ov50_02256638(param1); } @@ -231,14 +231,14 @@ static void ov50_022567A8(BgConfig *param0, u16 param1, u32 param2) v0 = 4 + 3 * (param2 % 7); v1 = 5 + 3 * (param2 / 7); - sub_02019CB8(param0, 7, param1, v0, v1, 2, 2, 0); + Bg_FillTilemapRect(param0, 7, param1, v0, v1, 2, 2, 0); } static void ov50_022567F4(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_02256510_1 *param1) { u32 v0; - sub_02019CB8(param0->unk_04, 6, 130, 0, 0, 32, 32, 0); + Bg_FillTilemapRect(param0->unk_04, 6, 130, 0, 0, 32, 32, 0); ov50_0225683C(param0->unk_04, param1->unk_00); for (v0 = 0; v0 < param1->unk_04; v0++) { @@ -256,7 +256,7 @@ static void ov50_0225683C(BgConfig *param0, u32 param1) for (v3 = 0; v3 < 2; v3++) { for (v2 = 0; v2 < 4; v2++) { - sub_02019CB8(param0, 6, v1 + v2, 12 + v2, 2 + v3, 1, 1, 0); + Bg_FillTilemapRect(param0, 6, v1 + v2, 12 + v2, 2 + v3, 1, 1, 0); } v1 += 12; @@ -279,10 +279,10 @@ static void ov50_02256894(BgConfig *param0, u32 param1, u32 param2) v4 = param1 % 10; if (v3) { - sub_02019CB8(param0, 6, v0[v5][v3], v1, v2, 1, 1, 0); - sub_02019CB8(param0, 6, v0[v5][v3] + 12, v1, v2 + 1, 1, 1, 0); + Bg_FillTilemapRect(param0, 6, v0[v5][v3], v1, v2, 1, 1, 0); + Bg_FillTilemapRect(param0, 6, v0[v5][v3] + 12, v1, v2 + 1, 1, 1, 0); } - sub_02019CB8(param0, 6, v0[v5][v4], v1 + 1, v2, 1, 1, 0); - sub_02019CB8(param0, 6, v0[v5][v4] + 12, v1 + 1, v2 + 1, 1, 1, 0); + Bg_FillTilemapRect(param0, 6, v0[v5][v4], v1 + 1, v2, 1, 1, 0); + Bg_FillTilemapRect(param0, 6, v0[v5][v4] + 12, v1 + 1, v2 + 1, 1, 1, 0); } diff --git a/src/overlay051/ov51_0225632C.c b/src/overlay051/ov51_0225632C.c index e90f0b0a7c..dc75572f34 100644 --- a/src/overlay051/ov51_0225632C.c +++ b/src/overlay051/ov51_0225632C.c @@ -100,13 +100,13 @@ static void ov51_022563B8(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 8, v2->unk_04, 6, 0, 0, 0, 8); - sub_02019CB8(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); sub_02006E84(12, 9, 4, 0 * 0x20, 0x20, 8); ov25_02255440(v2->unk_04, 26, 6); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -118,6 +118,6 @@ static void ov51_02256458(SysTask *param0, void *param1) { UnkStruct_ov51_0225632C *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov51_022563A4(param1); } diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c index 59396c1577..976ff7cdde 100644 --- a/src/overlay052/ov52_02256694.c +++ b/src/overlay052/ov52_02256694.c @@ -205,7 +205,7 @@ static void ov52_022567F4(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); v5 = sub_02006E3C(12, 96, v2->unk_04, 6, 0, 0, 1, 8); v5 /= 0x20; @@ -213,11 +213,11 @@ static void ov52_022567F4(SysTask *param0, void *param1) sub_02006E60(12, 95, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); - BGL_AddWindow(v2->unk_04, &v2->unk_20, 6, 2, 2, 24, 20, 0, v5); - sub_0201A9F4(&v2->unk_20); + Window_Add(v2->unk_04, &v2->unk_20, 6, 2, 2, 24, 20, 0, v5); + Window_PutToTilemap(&v2->unk_20); ov52_02256A7C(v2); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -229,8 +229,8 @@ static void ov52_022568B4(SysTask *param0, void *param1) { UnkStruct_ov52_02256694 *v0 = ov25_0225523C(param1); - BGL_DeleteWindow(&v0->unk_20); - sub_02019044(v0->unk_04, 6); + Window_Remove(&v0->unk_20); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov52_022567E0(param1); } @@ -321,7 +321,7 @@ static void ov52_02256A7C(UnkStruct_ov52_02256694 *param0) { u32 v0; - BGL_FillWindow(¶m0->unk_20, 4); + Window_FillTilemap(¶m0->unk_20, 4); MessageLoader_GetStrbuf(param0->unk_58, 0, param0->unk_5C); v0 = ((24 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2; @@ -338,12 +338,12 @@ static void ov52_02256A7C(UnkStruct_ov52_02256694 *param0) Text_AddPrinterWithParamsAndColor(¶m0->unk_20, FONT_SYSTEM, param0->unk_5C, v0, v1, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL); } - sub_0201ACCC(¶m0->unk_20); + Window_LoadTiles(¶m0->unk_20); } static void ov52_02256B10(UnkStruct_ov52_02256694 *param0) { - BGL_FillWindow(¶m0->unk_20, 4); + Window_FillTilemap(¶m0->unk_20, 4); MessageLoader_GetStrbuf(param0->unk_58, 1, param0->unk_5C); { @@ -351,14 +351,14 @@ static void ov52_02256B10(UnkStruct_ov52_02256694 *param0) Text_AddPrinterWithParamsAndColor(¶m0->unk_20, FONT_SYSTEM, param0->unk_5C, v0, 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL); } - sub_0201ACCC(¶m0->unk_20); + Window_LoadTiles(¶m0->unk_20); } static void ov52_02256B64(UnkStruct_ov52_02256694 *param0) { u32 v0; - BGL_FillWindow(¶m0->unk_20, 4); + Window_FillTilemap(¶m0->unk_20, 4); MessageLoader_GetStrbuf(param0->unk_58, 2, param0->unk_5C); v0 = ((24 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2; @@ -366,7 +366,7 @@ static void ov52_02256B64(UnkStruct_ov52_02256694 *param0) Text_AddPrinterWithParamsAndColor(¶m0->unk_20, FONT_SYSTEM, param0->unk_5C, v0, 8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL); MessageLoader_GetStrbuf(param0->unk_58, 3, param0->unk_5C); Text_AddPrinterWithParamsAndColor(¶m0->unk_20, FONT_SYSTEM, param0->unk_5C, 16, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL); - sub_0201ACCC(¶m0->unk_20); + Window_LoadTiles(¶m0->unk_20); } static void ov52_02256BDC(UnkStruct_ov52_02256694 *param0) @@ -374,7 +374,7 @@ static void ov52_02256BDC(UnkStruct_ov52_02256694 *param0) u32 v0; u32 v1; - BGL_FillWindow(¶m0->unk_20, 4); + Window_FillTilemap(¶m0->unk_20, 4); MessageLoader_GetStrbuf(param0->unk_58, 2, param0->unk_5C); v0 = ((24 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2; @@ -384,7 +384,7 @@ static void ov52_02256BDC(UnkStruct_ov52_02256694 *param0) v1 = ((24 * 8) - Font_CalcMaxLineWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2; Text_AddPrinterWithParamsAndColor(¶m0->unk_20, FONT_SYSTEM, param0->unk_5C, v1, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL); - sub_0201ACCC(¶m0->unk_20); + Window_LoadTiles(¶m0->unk_20); } static void ov52_02256C64(UnkStruct_ov52_02256694 *param0, const UnkStruct_ov52_02256694_1 *param1) @@ -398,7 +398,7 @@ static void ov52_02256C64(UnkStruct_ov52_02256694 *param0, const UnkStruct_ov52_ u32 v1; int v2; - BGL_FillWindow(¶m0->unk_20, 4); + Window_FillTilemap(¶m0->unk_20, 4); MessageLoader_GetStrbuf(param0->unk_58, 5, param0->unk_5C); v1 = ((24 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2; @@ -411,5 +411,5 @@ static void ov52_02256C64(UnkStruct_ov52_02256694 *param0, const UnkStruct_ov52_ Text_AddPrinterWithParamsAndColor(¶m0->unk_20, FONT_SYSTEM, param0->unk_5C, 160, 32 + 16 * v2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL); } - sub_0201ACCC(¶m0->unk_20); + Window_LoadTiles(¶m0->unk_20); } diff --git a/src/overlay053/ov53_02256420.c b/src/overlay053/ov53_02256420.c index 08ff70ca73..5d96c08028 100644 --- a/src/overlay053/ov53_02256420.c +++ b/src/overlay053/ov53_02256420.c @@ -125,7 +125,7 @@ static void ov53_022564B0(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); v3 = ov25_02255240(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 122, v2->unk_04, 6, 0, 0, 1, 8); sub_02006E60(12, 121, v2->unk_04, 6, 0, 0, 1, 8); @@ -142,7 +142,7 @@ static void ov53_02256548(SysTask *param0, void *param1) UnkStruct_ov53_02256420 *v0 = ov25_0225523C(param1); ov53_02256840(v0); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov53_0225649C(param1); } diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c index a317514585..30fdff1d83 100644 --- a/src/overlay054/ov54_0225642C.c +++ b/src/overlay054/ov54_0225642C.c @@ -116,28 +116,28 @@ static void ov54_022564BC(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); v3 = ov25_02255240(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); - sub_020196C0(v2->unk_04, 6, 4, 1, 0); - sub_02019CB8(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); + Bg_FillTilesRange(v2->unk_04, 6, 4, 1, 0); + Bg_FillTilemapRect(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); ov25_022546B8(0, 0); - BGL_AddWindow(v2->unk_04, &v4, 6, 2, 2, 24, 2, 0, 1); - BGL_FillWindow(&v4, 4); - sub_0201A9F4(&v4); + Window_Add(v2->unk_04, &v4, 6, 2, 2, 24, 2, 0, 1); + Window_FillTilemap(&v4, 4); + Window_PutToTilemap(&v4); { Strbuf *v5 = MessageBank_GetNewStrbufFromNARC(26, 458, 0, 8); if (v5) { Text_AddPrinterWithParamsAndColor(&v4, FONT_SYSTEM, v5, (192 - Font_CalcStrbufWidth(FONT_SYSTEM, v5, 0)) / 2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL); - sub_0201ACCC(&v4); + Window_LoadTiles(&v4); Strbuf_Free(v5); } } - BGL_DeleteWindow(&v4); - sub_02019448(v2->unk_04, 6); + Window_Remove(&v4); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); ov54_022565EC(v2, v3); v1 = GXS_GetDispCnt(); @@ -151,7 +151,7 @@ static void ov54_022565CC(SysTask *param0, void *param1) UnkStruct_ov54_0225642C *v0 = ov25_0225523C(param1); ov54_022566A8(v0); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov54_022564A8(param1); } diff --git a/src/overlay055/ov55_0225632C.c b/src/overlay055/ov55_0225632C.c index ff6b3f0988..15d10b11d3 100644 --- a/src/overlay055/ov55_0225632C.c +++ b/src/overlay055/ov55_0225632C.c @@ -31,7 +31,7 @@ BOOL ov55_0225632C(UnkStruct_ov55_0225632C **param0, const UnkStruct_ov55_022563 if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); v0->unk_00 = param1; - v0->unk_04 = sub_02018340(8); + v0->unk_04 = BgConfig_New(8); if (v0->unk_04 != NULL) { *param0 = v0; @@ -103,13 +103,13 @@ static void ov55_022563C8(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); - sub_020183C4(v2->unk_04, 6, &v0, 0); + Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 8, v2->unk_04, 6, 0, 0, 0, 8); - sub_02019CB8(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); sub_02006E84(12, 9, 4, 0 * 0x20, 0x20, 8); ov25_02255440(v2->unk_04, v2->unk_00->unk_00, 6); - sub_02019448(v2->unk_04, 6); + Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); v1 = GXS_GetDispCnt(); GXS_SetVisiblePlane(v1.visiblePlane | GX_PLANEMASK_BG2); @@ -121,6 +121,6 @@ static void ov55_02256468(SysTask *param0, void *param1) { UnkStruct_ov55_0225632C *v0 = ov25_0225523C(param1); - sub_02019044(v0->unk_04, 6); + Bg_FreeTilemapBuffer(v0->unk_04, 6); ov55_022563B4(param1); } diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index 23cdf6755a..d784ef5913 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -193,18 +193,18 @@ static void ov56_022562EC(BgConfig *param0, UnkStruct_ov56_022562EC *param1) int v0; for (v0 = 0; v0 < 3; v0++) { - BGL_AddWindow(param0, ¶m1[v0].unk_00, 4 + v0, 1, 1 + v0 * 8, 8, 2, 12, (32 * 5) + v0 * (8 * 2)); - BGL_FillWindow(¶m1[v0].unk_00, 0x0); + Window_Add(param0, ¶m1[v0].unk_00, 4 + v0, 1, 1 + v0 * 8, 8, 2, 12, (32 * 5) + v0 * (8 * 2)); + Window_FillTilemap(¶m1[v0].unk_00, 0x0); - sub_0201A954(¶m1[v0].unk_00); + Window_CopyToVRAM(¶m1[v0].unk_00); - BGL_AddWindow(param0, ¶m1[v0].unk_10, 4 + v0, 2, 3 + v0 * 8, 27, 5, 12, ((32 * 5) + (8 * 2) * 3) + v0 * (27 * 5)); - BGL_FillWindow(¶m1[v0].unk_10, 0x0); - sub_0201A954(¶m1[v0].unk_10); + Window_Add(param0, ¶m1[v0].unk_10, 4 + v0, 2, 3 + v0 * 8, 27, 5, 12, ((32 * 5) + (8 * 2) * 3) + v0 * (27 * 5)); + Window_FillTilemap(¶m1[v0].unk_10, 0x0); + Window_CopyToVRAM(¶m1[v0].unk_10); - BGL_AddWindow(param0, ¶m1[v0].unk_20, 4 + v0, 12, 1 + v0 * 8, 15, 2, 12, (((32 * 5) + (8 * 2) * 3) + (27 * 5) * 3) + v0 * (15 * 2)); - BGL_FillWindow(¶m1[v0].unk_20, 0x0); - sub_0201A954(¶m1[v0].unk_20); + Window_Add(param0, ¶m1[v0].unk_20, 4 + v0, 12, 1 + v0 * 8, 15, 2, 12, (((32 * 5) + (8 * 2) * 3) + (27 * 5) * 3) + v0 * (15 * 2)); + Window_FillTilemap(¶m1[v0].unk_20, 0x0); + Window_CopyToVRAM(¶m1[v0].unk_20); } } @@ -213,9 +213,9 @@ static void ov56_022563E8(UnkStruct_ov56_022562EC *param0) int v0; for (v0 = 0; v0 < 3; v0++) { - BGL_DeleteWindow(¶m0[v0].unk_10); - BGL_DeleteWindow(¶m0[v0].unk_00); - BGL_DeleteWindow(¶m0[v0].unk_20); + Window_Remove(¶m0[v0].unk_10); + Window_Remove(¶m0[v0].unk_00); + Window_Remove(¶m0[v0].unk_20); } } @@ -271,10 +271,10 @@ void ov56_02256468(UnkStruct_ov56_02256468 *param0) static void ov56_022564E4(BgConfig *param0) { - sub_02019044(param0, 4); - sub_02019044(param0, 5); - sub_02019044(param0, 6); - sub_02019044(param0, 7); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 6); + Bg_FreeTilemapBuffer(param0, 7); } static void ov56_02256508(BgConfig *param0) @@ -298,8 +298,8 @@ static void ov56_02256508(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v0, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v0, 0); + Bg_ClearTilemap(param0, 4); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); } @@ -320,8 +320,8 @@ static void ov56_02256508(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v1, 0); - sub_02019EBC(param0, 5); + Bg_InitFromTemplate(param0, 5, &v1, 0); + Bg_ClearTilemap(param0, 5); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); } @@ -342,8 +342,8 @@ static void ov56_02256508(BgConfig *param0) 0 }; - sub_020183C4(param0, 6, &v2, 0); - sub_02019EBC(param0, 6); + Bg_InitFromTemplate(param0, 6, &v2, 0); + Bg_ClearTilemap(param0, 6); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); } @@ -364,7 +364,7 @@ static void ov56_02256508(BgConfig *param0) 0 }; - sub_020183C4(param0, 7, &v3, 0); + Bg_InitFromTemplate(param0, 7, &v3, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); } @@ -457,20 +457,20 @@ static void ov56_022567FC(UnkStruct_ov56_02256468 *param0, int param1, UnkStruct { param0->unk_22C[param1].unk_30 = param2->unk_10; - sub_020198E8(param0->unk_14, 7, 0, param1 * 8, 32, 8, param0->unk_24->rawData, 0, 24 * param0->unk_22C[param1].unk_30, 32, 48); - BGL_FillWindow(¶m0->unk_22C[param1].unk_00, 0x0); - BGL_FillWindow(¶m0->unk_22C[param1].unk_10, 0x0); - BGL_FillWindow(¶m0->unk_22C[param1].unk_20, 0x0); + Bg_CopyToTilemapRect(param0->unk_14, 7, 0, param1 * 8, 32, 8, param0->unk_24->rawData, 0, 24 * param0->unk_22C[param1].unk_30, 32, 48); + Window_FillTilemap(¶m0->unk_22C[param1].unk_00, 0x0); + Window_FillTilemap(¶m0->unk_22C[param1].unk_10, 0x0); + Window_FillTilemap(¶m0->unk_22C[param1].unk_20, 0x0); Text_AddPrinterWithParamsAndColor(¶m0->unk_22C[param1].unk_00, FONT_MESSAGE, param2->unk_00, 0, 1, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Text_AddPrinterWithParamsAndColor(¶m0->unk_22C[param1].unk_10, FONT_MESSAGE, param2->unk_04, 0, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A9A4(¶m0->unk_22C[param1].unk_00); - sub_0201A9A4(¶m0->unk_22C[param1].unk_10); + Window_ScheduleCopyToVRAM(¶m0->unk_22C[param1].unk_00); + Window_ScheduleCopyToVRAM(¶m0->unk_22C[param1].unk_10); if (param2->unk_08) { Text_AddPrinterWithParamsAndColor(¶m0->unk_22C[param1].unk_20, FONT_MESSAGE, param2->unk_08, 0, 1, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); } - sub_0201A9A4(¶m0->unk_22C[param1].unk_20); + Window_ScheduleCopyToVRAM(¶m0->unk_22C[param1].unk_20); } static void ov56_022568E0(UnkStruct_ov56_02256468 *param0) @@ -494,8 +494,8 @@ static void ov56_022568E0(UnkStruct_ov56_02256468 *param0) v2 = ov56_022567E4(param0->unk_2D4, v2); } - DC_FlushRange((void *)sub_02019FE4(param0->unk_14, 7), 32 * 24 * 2); - sub_02019460(param0->unk_14, 7, sub_02019FE4(param0->unk_14, 7), 32 * 24 * 2, 0); + DC_FlushRange((void *)Bg_GetTilemapBuffer(param0->unk_14, 7), 32 * 24 * 2); + Bg_CopyTilemapBufferRangeToVRAM(param0->unk_14, 7, Bg_GetTilemapBuffer(param0->unk_14, 7), 32 * 24 * 2, 0); param0->unk_2E8 = 0; } @@ -751,12 +751,12 @@ static void ov56_02256D64(BgConfig *param0, NNSG2dScreenData *param1, UnkStruct_ for (v0 = 0; v0 < param4; v0++) { int v2 = param2[v0].unk_34 / 2; - sub_020198E8(param0, 7, 0, v0 * 8, 32, 8, param1->rawData, 0, 24 * param2[v0].unk_30 + 8 * v2, 32, 48); - sub_02019184(param0, 4 + v0, 3, Unk_ov56_02257244[v2]); + Bg_CopyToTilemapRect(param0, 7, 0, v0 * 8, 32, 8, param1->rawData, 0, 24 * param2[v0].unk_30 + 8 * v2, 32, 48); + Bg_SetOffset(param0, 4 + v0, 3, Unk_ov56_02257244[v2]); } - DC_FlushRange((void *)sub_02019FE4(param0, 7), 32 * 24 * 2); - sub_02019460(param0, 7, sub_02019FE4(param0, 7), 32 * 24 * 2, 0); + DC_FlushRange((void *)Bg_GetTilemapBuffer(param0, 7), 32 * 24 * 2); + Bg_CopyTilemapBufferRangeToVRAM(param0, 7, Bg_GetTilemapBuffer(param0, 7), 32 * 24 * 2, 0); } static Strbuf *ov56_02256E5C(UnkStruct_02027F8C *param0, u32 param1, StringTemplate *param2, MessageLoader *param3, TrainerInfo *param4) diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 6ab7f3f1cf..fe06f580e2 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -173,7 +173,7 @@ int ov58_021D0D80(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_02095EAC), 39); memset(v0, 0, sizeof(UnkStruct_02095EAC)); - v0->unk_00 = sub_02018340(39); + v0->unk_00 = BgConfig_New(39); v0->unk_0C = StringTemplate_Default(39); v0->unk_10 = MessageLoader_Init(0, 26, 425, 39); @@ -373,7 +373,7 @@ static void ov58_021D115C(void *param0) { sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8((BgConfig *)param0); + Bg_RunScheduledUpdates((BgConfig *)param0); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -406,7 +406,7 @@ static void ov58_021D11A4(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -426,8 +426,8 @@ static void ov58_021D11A4(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { @@ -447,8 +447,8 @@ static void ov58_021D11A4(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilemap(param0, 1); } { @@ -468,7 +468,7 @@ static void ov58_021D11A4(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); + Bg_InitFromTemplate(param0, 2, &v3, 0); } { @@ -488,8 +488,8 @@ static void ov58_021D11A4(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v4, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v4, 0); + Bg_ClearTilemap(param0, 4); } { @@ -509,13 +509,13 @@ static void ov58_021D11A4(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v5, 0); + Bg_InitFromTemplate(param0, 5, &v5, 0); } - sub_02019690(0, 32, 0, 39); - sub_02019690(4, 32, 0, 39); - sub_02019690(1, 32, 0, 39); - sub_02019690(5, 32, 0, 39); + Bg_ClearTilesRange(0, 32, 0, 39); + Bg_ClearTilesRange(4, 32, 0, 39); + Bg_ClearTilesRange(1, 32, 0, 39); + Bg_ClearTilesRange(5, 32, 0, 39); } static void ov58_021D12C4(UnkStruct_02095EAC *param0) @@ -574,12 +574,12 @@ static void ov58_021D13B4(UnkStruct_02095EAC *param0) static void ov58_021D13F0(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); Heap_FreeToHeap(param0); } @@ -728,12 +728,12 @@ static void ov58_021D16D8(UnkStruct_02095EAC *param0) static void ov58_021D18AC(UnkStruct_02095EAC *param0, OverlayManager *param1) { - BGL_AddWindow(param0->unk_00, ¶m0->unk_33C, 0, 2, 1, 27, 4, 13, 1 + (18 + 12) + 9); - BGL_FillWindow(¶m0->unk_33C, 0xf0f); - BGL_AddWindow(param0->unk_00, ¶m0->unk_32C, 1, 1, 2, 30, 15, 0, 1); - BGL_FillWindow(¶m0->unk_32C, 0x202); - BGL_AddWindow(param0->unk_00, ¶m0->unk_34C, 1, 25, 21, 7, 2, 13, 1 + 30 * 15); - BGL_FillWindow(¶m0->unk_34C, 0x0); + Window_Add(param0->unk_00, ¶m0->unk_33C, 0, 2, 1, 27, 4, 13, 1 + (18 + 12) + 9); + Window_FillTilemap(¶m0->unk_33C, 0xf0f); + Window_Add(param0->unk_00, ¶m0->unk_32C, 1, 1, 2, 30, 15, 0, 1); + Window_FillTilemap(¶m0->unk_32C, 0x202); + Window_Add(param0->unk_00, ¶m0->unk_34C, 1, 25, 21, 7, 2, 13, 1 + 30 * 15); + Window_FillTilemap(¶m0->unk_34C, 0x0); { u32 v0 = Font_CalcCenterAlignment(FONT_MESSAGE, param0->unk_28, 0, (7 - 1) * 8) + 2; @@ -744,8 +744,8 @@ static void ov58_021D18AC(UnkStruct_02095EAC *param0, OverlayManager *param1) int v1; for (v1 = 0; v1 < 5; v1++) { - BGL_AddWindow(param0->unk_00, ¶m0->unk_2DC[v1], 4, 24 / 8 + 2, 32 / 8 + v1 * 4 - 1, 10, 2, 13, 1 + v1 * (10 * 2)); - BGL_FillWindow(¶m0->unk_2DC[v1], 0); + Window_Add(param0->unk_00, ¶m0->unk_2DC[v1], 4, 24 / 8 + 2, 32 / 8 + v1 * 4 - 1, 10, 2, 13, 1 + v1 * (10 * 2)); + Window_FillTilemap(¶m0->unk_2DC[v1], 0); } ov58_021D28E4(param0->unk_2DC, 0, TEXT_COLOR(14, 13, 15), param0); @@ -757,12 +757,12 @@ static void ov58_021D19D4(UnkStruct_02095EAC *param0) int v0; for (v0 = 0; v0 < 5; v0++) { - BGL_DeleteWindow(¶m0->unk_2DC[v0]); + Window_Remove(¶m0->unk_2DC[v0]); } - BGL_DeleteWindow(¶m0->unk_34C); - BGL_DeleteWindow(¶m0->unk_32C); - BGL_DeleteWindow(¶m0->unk_33C); + Window_Remove(¶m0->unk_34C); + Window_Remove(¶m0->unk_32C); + Window_Remove(¶m0->unk_33C); } static void ov58_021D1A10(CellActor *param0, int param1, int param2) @@ -1052,14 +1052,14 @@ static int ov58_021D1E4C(UnkStruct_02095EAC *param0, int param1) } ov58_021D2D10(param0); - sub_0201A954(¶m0->unk_32C); + Window_CopyToVRAM(¶m0->unk_32C); break; case 2: ov58_021D2CB0(param0, 4); ov58_021D1CDC(param0->unk_2AC, 0); sub_0200E084(¶m0->unk_33C, 1); ov58_021D2D10(param0); - sub_0201A954(¶m0->unk_32C); + Window_CopyToVRAM(¶m0->unk_32C); if (CommSys_CurNetId() == 0) { sub_02037B58(CommSys_ConnectedCount() + 1); @@ -1366,7 +1366,7 @@ void ov58_021D2434(UnkStruct_02095EAC *param0, int param1, u8 param2) if ((param0->unk_368 == 6) || (param0->unk_368 == 14)) { ov58_021D2D10(param0); - sub_0201A954(¶m0->unk_32C); + Window_CopyToVRAM(¶m0->unk_32C); } ov58_021D1CDC(param0->unk_2AC, 0); @@ -1450,7 +1450,7 @@ static void ov58_021D2528(Window *param0, void *param1, int param2, int param3, param9 -= v1; } - sub_0201ADDC(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9); + Window_BlitBitmapRect(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9); } static void ov58_021D25A8(Window *param0, const u8 *param1, int param2, int param3, int *param4, int *param5, int param6, int param7) @@ -1558,7 +1558,7 @@ static void ov58_021D2754(Window *param0, UnkStruct_ov58_021D2820 *param1, UnkSt } if (v4 && param3) { - sub_0201A954(param0); + Window_CopyToVRAM(param0); } ov58_021D2720(param1, param2); @@ -1640,7 +1640,7 @@ static void ov58_021D28E4(Window *param0, int param1, u32 param2, UnkStruct_0209 } for (v0 = 0; v0 < 5; v0++) { - BGL_WindowColor(¶m0[v0], 0, 0, 0, 10 * 8, 2 * 8); + Window_FillRectWithColor(¶m0[v0], 0, 0, 0, 10 * 8, 2 * 8); } for (v0 = 0; v0 < 5; v0++) { @@ -1654,7 +1654,7 @@ static void ov58_021D28E4(Window *param0, int param1, u32 param2, UnkStruct_0209 } } - sub_0201A954(¶m0[v0]); + Window_CopyToVRAM(¶m0[v0]); } } @@ -1719,7 +1719,7 @@ static void ov58_021D2A98(UnkStruct_02095EAC *param0, int param1, int param2) StringTemplate_Format(param0->unk_0C, param0->unk_2C, v0); Strbuf_Free(v0); - BGL_FillWindow(¶m0->unk_33C, 0xf0f); + Window_FillTilemap(¶m0->unk_33C, 0xf0f); sub_0200E060(¶m0->unk_33C, 0, 1, 10); if (param2 == 0) { diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index 6e511d27d2..7bebd625d4 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -183,7 +183,7 @@ int ov59_021D0D80(OverlayManager *param0, int *param1) memset(v0, 0, sizeof(UnkStruct_020961E8)); - v0->unk_00 = sub_02018340(51); + v0->unk_00 = BgConfig_New(51); v0->unk_08 = (UnkStruct_0203DE34 *)OverlayManager_Args(param0); v0->unk_4A9C = v0->unk_08->unk_00; v0->unk_24 = StringTemplate_Default(51); @@ -367,7 +367,7 @@ static void ov59_021D1100(void *param0) { sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8((BgConfig *)param0); + Bg_RunScheduledUpdates((BgConfig *)param0); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -400,7 +400,7 @@ static void ov59_021D1148(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -420,8 +420,8 @@ static void ov59_021D1148(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v1, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v1, 0); + Bg_ClearTilemap(param0, 4); } { @@ -441,8 +441,8 @@ static void ov59_021D1148(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v2, 0); - sub_02019EBC(param0, 5); + Bg_InitFromTemplate(param0, 5, &v2, 0); + Bg_ClearTilemap(param0, 5); } { @@ -462,7 +462,7 @@ static void ov59_021D1148(BgConfig *param0) 0 }; - sub_020183C4(param0, 6, &v3, 0); + Bg_InitFromTemplate(param0, 6, &v3, 0); } { @@ -482,8 +482,8 @@ static void ov59_021D1148(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v4, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v4, 0); + Bg_ClearTilemap(param0, 0); } { @@ -503,11 +503,11 @@ static void ov59_021D1148(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v5, 0); + Bg_InitFromTemplate(param0, 1, &v5, 0); } - sub_02019690(0, 32, 0, 51); - sub_02019690(4, 32, 0, 51); + Bg_ClearTilesRange(0, 32, 0, 51); + Bg_ClearTilesRange(4, 32, 0, 51); } static void ov59_021D1250(UnkStruct_020961E8 *param0, NARC *param1) @@ -559,11 +559,11 @@ static void ov59_021D131C(UnkStruct_020961E8 *param0) static void ov59_021D1354(BgConfig *param0) { - sub_02019044(param0, 6); - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 6); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); Heap_FreeToHeap(param0); } @@ -681,19 +681,19 @@ static void ov59_021D1598(UnkStruct_020961E8 *param0) static void ov59_021D16A0(UnkStruct_020961E8 *param0, OverlayManager *param1) { - BGL_AddWindow(param0->unk_00, ¶m0->unk_35C, 5, 26, 20, 6, 2, 13, 1 + 30 * 15); - BGL_FillWindow(¶m0->unk_35C, 0x0); - BGL_AddWindow(param0->unk_00, ¶m0->unk_34C, 0, 2, 19, 27, 4, 13, (1 + (18 + 12) + 9)); - BGL_FillWindow(¶m0->unk_34C, 0xf0f); - BGL_AddWindow(param0->unk_00, ¶m0->unk_36C, 0, 3, 1, 26, 2, 15, ((1 + (18 + 12) + 9) + 27 * 4)); + Window_Add(param0->unk_00, ¶m0->unk_35C, 5, 26, 20, 6, 2, 13, 1 + 30 * 15); + Window_FillTilemap(¶m0->unk_35C, 0x0); + Window_Add(param0->unk_00, ¶m0->unk_34C, 0, 2, 19, 27, 4, 13, (1 + (18 + 12) + 9)); + Window_FillTilemap(¶m0->unk_34C, 0xf0f); + Window_Add(param0->unk_00, ¶m0->unk_36C, 0, 3, 1, 26, 2, 15, ((1 + (18 + 12) + 9) + 27 * 4)); ov59_021D1784(¶m0->unk_36C, param0->unk_48, TEXT_SPEED_INSTANT); { int v0; - BGL_AddWindow(param0->unk_00, ¶m0->unk_2FC[0], 0, 2, 6, 16, 11, 15, (((1 + (18 + 12) + 9) + 27 * 4) + 26 * 2)); - BGL_FillWindow(¶m0->unk_2FC[0], 0); + Window_Add(param0->unk_00, ¶m0->unk_2FC[0], 0, 2, 6, 16, 11, 15, (((1 + (18 + 12) + 9) + 27 * 4) + 26 * 2)); + Window_FillTilemap(¶m0->unk_2FC[0], 0); ov59_021D2418(param0->unk_2FC, 0, TEXT_COLOR(1, 3, 0), param0); } @@ -704,7 +704,7 @@ static void ov59_021D1784(Window *param0, Strbuf *param1, int param2) int v0 = Font_CalcStrbufWidth(FONT_MESSAGE, param1, 0); int v1 = (26 * 8 - v0) / 2; - BGL_FillWindow(param0, 0x0); + Window_FillTilemap(param0, 0x0); Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, param1, v1, 1, param2, TEXT_COLOR(1, 4, 0), NULL); } @@ -712,10 +712,10 @@ static void ov59_021D17C8(UnkStruct_020961E8 *param0) { int v0; - BGL_DeleteWindow(¶m0->unk_2FC[0]); - BGL_DeleteWindow(¶m0->unk_36C); - BGL_DeleteWindow(¶m0->unk_35C); - BGL_DeleteWindow(¶m0->unk_34C); + Window_Remove(¶m0->unk_2FC[0]); + Window_Remove(¶m0->unk_36C); + Window_Remove(¶m0->unk_35C); + Window_Remove(¶m0->unk_34C); } static int ov59_021D17F8(UnkStruct_020961E8 *param0, int param1) @@ -1470,7 +1470,7 @@ static BOOL ov59_021D2418(Window *param0, int param1, u32 param2, UnkStruct_0209 return 0; } - BGL_FillWindow(¶m0[0], 0x0); + Window_FillTilemap(¶m0[0], 0x0); for (v0 = 0; v0 < 5; v0++) { if (param3->unk_3C8[v0][0] != NULL) { @@ -1493,7 +1493,7 @@ static BOOL ov59_021D2418(Window *param0, int param1, u32 param2, UnkStruct_0209 } } - sub_0201A954(¶m0[0]); + Window_CopyToVRAM(¶m0[0]); return 1; } @@ -1572,7 +1572,7 @@ static void ov59_021D2628(UnkStruct_020961E8 *param0, int param1, int param2) MessageLoader_GetStrbuf(param0->unk_28, param1, v0); StringTemplate_Format(param0->unk_24, param0->unk_44, v0); Strbuf_Free(v0); - BGL_FillWindow(¶m0->unk_34C, 0xf0f); + Window_FillTilemap(¶m0->unk_34C, 0xf0f); sub_0200E060(¶m0->unk_34C, 0, 1, 10); if (param2 == 0) { diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index 9a8dd01c28..eaf3b7a22a 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -161,7 +161,7 @@ int ov61_0222BF44(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov61_0222C664), 117); MI_CpuClear8(v0, sizeof(UnkStruct_ov61_0222C664)); v0->unk_00 = OverlayManager_Args(param0); - v0->unk_04 = sub_02018340(117); + v0->unk_04 = BgConfig_New(117); sub_0201DBEC(64, 117); SetAutorepeat(4, 8); @@ -282,7 +282,7 @@ static void ov61_0222C1FC(void *param0) sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8(v0->unk_04); + Bg_RunScheduledUpdates(v0->unk_04); inline_ov61_0222C1FC(&v0->unk_A4); @@ -324,7 +324,7 @@ static void ov61_0222C224(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -361,14 +361,14 @@ static void ov61_0222C224(BgConfig *param0) }, }; - sub_020183C4(param0, 0, &v2[0], 0); - sub_02019EBC(param0, 0); - sub_02019184(param0, 0, 0, 0); - sub_02019184(param0, 0, 3, 0); - sub_020183C4(param0, 1, &v2[1], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 0, &v2[0], 0); + Bg_ClearTilemap(param0, 0); + Bg_SetOffset(param0, 0, 0, 0); + Bg_SetOffset(param0, 0, 3, 0); + Bg_InitFromTemplate(param0, 1, &v2[1], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); } { @@ -405,26 +405,26 @@ static void ov61_0222C224(BgConfig *param0) }, }; - sub_020183C4(param0, 4, &v3[0], 0); - sub_02019EBC(param0, 4); - sub_02019184(param0, 4, 0, 0); - sub_02019184(param0, 4, 3, 0); - sub_020183C4(param0, 5, &v3[1], 0); - sub_02019EBC(param0, 5); - sub_02019184(param0, 5, 0, 0); - sub_02019184(param0, 5, 3, 0); + Bg_InitFromTemplate(param0, 4, &v3[0], 0); + Bg_ClearTilemap(param0, 4); + Bg_SetOffset(param0, 4, 0, 0); + Bg_SetOffset(param0, 4, 3, 0); + Bg_InitFromTemplate(param0, 5, &v3[1], 0); + Bg_ClearTilemap(param0, 5); + Bg_SetOffset(param0, 5, 0, 0); + Bg_SetOffset(param0, 5, 3, 0); } - sub_02019690(0, 32, 0, 117); - sub_02019690(4, 32, 0, 117); + Bg_ClearTilesRange(0, 32, 0, 117); + Bg_ClearTilesRange(4, 32, 0, 117); } static void ov61_0222C38C(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); } static void ov61_0222C3B0(UnkStruct_ov61_0222C664 *param0) @@ -444,8 +444,8 @@ static void ov61_0222C3B0(UnkStruct_ov61_0222C664 *param0) sub_0200710C(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, 117); sub_020070E8(v1, 10, v0, 5, 0, 0, 0, 117); sub_0200710C(v1, 11, v0, 5, 0, 32 * 24 * 2, 0, 117); - sub_0201975C(0, 0); - sub_0201975C(4, 0); + Bg_MaskPalette(0, 0); + Bg_MaskPalette(4, 0); inline_ov61_0222C3B0(¶m0->unk_A4, v1, 4, 117); @@ -454,22 +454,22 @@ static void ov61_0222C3B0(UnkStruct_ov61_0222C664 *param0) static void ov61_0222C664(UnkStruct_ov61_0222C664 *param0) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_64, 0, 4, 4, 23, 16, 13, (((1 + (18 + 12)) + 9) + 27 * 4)); - BGL_FillWindow(¶m0->unk_64, 0x0); - BGL_AddWindow(param0->unk_04, ¶m0->unk_54, 0, 4, 1, 24, 2, 13, ((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16)); - BGL_FillWindow(¶m0->unk_54, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_64, 0, 4, 4, 23, 16, 13, (((1 + (18 + 12)) + 9) + 27 * 4)); + Window_FillTilemap(¶m0->unk_64, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_54, 0, 4, 1, 24, 2, 13, ((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16)); + Window_FillTilemap(¶m0->unk_54, 0x0); ov61_0222C760(¶m0->unk_54, param0->unk_38, 0, 1, 1, TEXT_COLOR(15, 14, 0)); - BGL_AddWindow(param0->unk_04, ¶m0->unk_44, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_44, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_44, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_44, 0x0); } static void ov61_0222C70C(UnkStruct_ov61_0222C664 *param0) { - BGL_DeleteWindow(¶m0->unk_44); - BGL_DeleteWindow(¶m0->unk_54); - BGL_DeleteWindow(¶m0->unk_64); + Window_Remove(¶m0->unk_44); + Window_Remove(¶m0->unk_54); + Window_Remove(¶m0->unk_64); } static int ov61_0222C728(Window *param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) @@ -502,7 +502,7 @@ static void ov61_0222C794(UnkStruct_ov61_0222C664 *param0, int param1) MessageLoader_GetStrbuf(param0->unk_2C, param1, v0); StringTemplate_Format(param0->unk_20, param0->unk_3C, v0); - BGL_FillWindow(¶m0->unk_64, 15); + Window_FillTilemap(¶m0->unk_64, 15); Window_Show(¶m0->unk_64, 1, (1 + (18 + 12)), 11); param0->unk_40 = Text_AddPrinterWithParams(¶m0->unk_64, FONT_MESSAGE, param0->unk_3C, 0, 0, TEXT_SPEED_INSTANT, NULL); @@ -570,7 +570,7 @@ static void ov61_0222C8B8(UnkStruct_ov61_0222C664 *param0, MessageLoader *param1 StringTemplate_Format(param0->unk_20, param0->unk_34, v0); Strbuf_Free(v0); - BGL_FillWindow(¶m0->unk_44, 0xf0f); + Window_FillTilemap(¶m0->unk_44, 0xf0f); sub_0200E060(¶m0->unk_44, 0, 1, 10); param0->unk_40 = Text_AddPrinterWithParams(¶m0->unk_44, FONT_MESSAGE, param0->unk_34, 0, 0, param3, NULL); diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index 8291acf8d5..7dcc1beb99 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -57,7 +57,7 @@ void ov62_0222F2C0(UnkStruct_0208C06C *param0) sub_0201DBEC(4, 102); param0->unk_14.unk_00 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__BATT_REC__BATT_REC_GRA, 102); - param0->unk_14.unk_10 = sub_02018340(102); + param0->unk_14.unk_10 = BgConfig_New(102); param0->unk_14.unk_14 = sub_02002F38(102); param0->unk_14.unk_4C = sub_02024220(102, 0, 1, 0, 4, NULL); param0->unk_14.unk_50 = sub_0200762C(102); @@ -149,14 +149,14 @@ void ov62_0222F514(UnkStruct_0208C06C *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); - sub_02019044(param0->unk_14.unk_10, 0); - sub_02019044(param0->unk_14.unk_10, 1); - sub_02019044(param0->unk_14.unk_10, 2); - sub_02019044(param0->unk_14.unk_10, 3); - sub_02019044(param0->unk_14.unk_10, 4); - sub_02019044(param0->unk_14.unk_10, 5); - sub_02019044(param0->unk_14.unk_10, 6); - sub_02019044(param0->unk_14.unk_10, 7); + Bg_FreeTilemapBuffer(param0->unk_14.unk_10, 0); + Bg_FreeTilemapBuffer(param0->unk_14.unk_10, 1); + Bg_FreeTilemapBuffer(param0->unk_14.unk_10, 2); + Bg_FreeTilemapBuffer(param0->unk_14.unk_10, 3); + Bg_FreeTilemapBuffer(param0->unk_14.unk_10, 4); + Bg_FreeTilemapBuffer(param0->unk_14.unk_10, 5); + Bg_FreeTilemapBuffer(param0->unk_14.unk_10, 6); + Bg_FreeTilemapBuffer(param0->unk_14.unk_10, 7); Heap_FreeToHeap(param0->unk_14.unk_10); sub_02002FA0(param0->unk_14.unk_14, 0); sub_02002FA0(param0->unk_14.unk_14, 1); @@ -238,7 +238,7 @@ static void ov62_0222F670(BgConfig *param0) GX_BG0_AS_3D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -264,25 +264,25 @@ static void ov62_0222F670(BgConfig *param0) } { - sub_020183C4(param0, 0, &Unk_ov62_022487B0[0], 0); - sub_020183C4(param0, 1, &Unk_ov62_022487B0[1], 0); - sub_020183C4(param0, 2, &Unk_ov62_022487B0[2], 0); - sub_020183C4(param0, 3, &Unk_ov62_022487B0[3], 0); - sub_02019EBC(param0, 0); - sub_02019EBC(param0, 1); - sub_02019EBC(param0, 2); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 0, &Unk_ov62_022487B0[0], 0); + Bg_InitFromTemplate(param0, 1, &Unk_ov62_022487B0[1], 0); + Bg_InitFromTemplate(param0, 2, &Unk_ov62_022487B0[2], 0); + Bg_InitFromTemplate(param0, 3, &Unk_ov62_022487B0[3], 0); + Bg_ClearTilemap(param0, 0); + Bg_ClearTilemap(param0, 1); + Bg_ClearTilemap(param0, 2); + Bg_ClearTilemap(param0, 3); } { - sub_020183C4(param0, 4, &Unk_ov62_02248820[0], 0); - sub_020183C4(param0, 5, &Unk_ov62_02248820[1], 0); - sub_020183C4(param0, 6, &Unk_ov62_02248820[2], 0); - sub_020183C4(param0, 7, &Unk_ov62_02248820[3], 0); - sub_02019EBC(param0, 4); - sub_02019EBC(param0, 5); - sub_02019EBC(param0, 6); - sub_02019EBC(param0, 7); + Bg_InitFromTemplate(param0, 4, &Unk_ov62_02248820[0], 0); + Bg_InitFromTemplate(param0, 5, &Unk_ov62_02248820[1], 0); + Bg_InitFromTemplate(param0, 6, &Unk_ov62_02248820[2], 0); + Bg_InitFromTemplate(param0, 7, &Unk_ov62_02248820[3], 0); + Bg_ClearTilemap(param0, 4); + Bg_ClearTilemap(param0, 5); + Bg_ClearTilemap(param0, 6); + Bg_ClearTilemap(param0, 7); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); @@ -310,7 +310,7 @@ void ov62_0222F824(int param0) void ov62_0222F834(UnkStruct_0208C06C *param0) { - sub_020183C4(param0->unk_14.unk_10, 2, &Unk_ov62_022487B0[2], 0); + Bg_InitFromTemplate(param0->unk_14.unk_10, 2, &Unk_ov62_022487B0[2], 0); } static void ov62_0222F848(UnkStruct_0208C06C *param0) @@ -364,7 +364,7 @@ void ov62_0222F8E4(void *param0) sub_0201DCAC(); sub_02003694(v0->unk_14.unk_14); - sub_0201C2B8(v0->unk_14.unk_10); + Bg_RunScheduledUpdates(v0->unk_14.unk_10); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index 5ac017d6eb..94464c5a52 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -661,7 +661,7 @@ void ov62_02230E80(UnkStruct_0208C06C *param0) for (v11 = 0; v11 < 2; v11++) { Window_Init(&v6); - BGL_AddFramelessWindow(param0->unk_14.unk_10, &v6, 20, 2, 0, 0); + Window_AddToTopLeftCorner(param0->unk_14.unk_10, &v6, 20, 2, 0, 0); v7[v11]->unk_18 = sub_02012B20(&v6, 102); v4 = sub_02012898(&v6, v8[v11], 102); @@ -684,7 +684,7 @@ void ov62_02230E80(UnkStruct_0208C06C *param0) v7[v11]->unk_14 = sub_02012B60(&v2, v7[v11]->unk_18); sub_02012AC0(v7[v11]->unk_14, (2 - 1)); - BGL_DeleteWindow(&v6); + Window_Remove(&v6); sub_020129D0(v7[v11]->unk_14, 0); } } @@ -738,11 +738,11 @@ void ov62_02230FC8(UnkStruct_0208C06C *param0, UnkStruct_ov62_022307C0_sub1 *par } Window_Init(&v2); - BGL_AddFramelessWindow(param0->unk_14.unk_10, &v2, 20, 2, 0, 0); + Window_AddToTopLeftCorner(param0->unk_14.unk_10, &v2, 20, 2, 0, 0); Text_AddPrinterWithParamsAndColor(&v2, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 13, 0), NULL); sub_02012BE0(param1->unk_14, param1->unk_18, &v2, 102); Strbuf_Free(v0); - BGL_DeleteWindow(&v2); + Window_Remove(&v2); } void ov62_0223113C(UnkStruct_0208C06C *param0) @@ -777,7 +777,7 @@ void ov62_0223118C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *par } Window_Init(&v6); - BGL_AddFramelessWindow(param1->unk_10, &v6, 20, 2, 0, 0); + Window_AddToTopLeftCorner(param1->unk_10, &v6, 20, 2, 0, 0); param0->unk_10 = sub_02012B20(&v6, 102); v4 = sub_02012898(&v6, param2, 102); @@ -801,7 +801,7 @@ void ov62_0223118C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *par param0->unk_0C = sub_02012B60(&v2, param0->unk_10); sub_02012AC0(param0->unk_0C, (2 - 1)); - BGL_DeleteWindow(&v6); + Window_Remove(&v6); sub_020129D0(param0->unk_0C, 0); } @@ -815,11 +815,11 @@ void ov62_0223124C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *par v0 = MessageLoader_GetNewStrbuf(v1, param2); Window_Init(&v2); - BGL_AddFramelessWindow(param1->unk_10, &v2, 20, 2, 0, 0); + Window_AddToTopLeftCorner(param1->unk_10, &v2, 20, 2, 0, 0); Text_AddPrinterWithParamsAndColor(&v2, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 13, 0), NULL); sub_02012BE0(param0->unk_0C, param0->unk_10, &v2, 102); Strbuf_Free(v0); - BGL_DeleteWindow(&v2); + Window_Remove(&v2); } void ov62_022312B0(UnkStruct_ov62_022312B0 *param0) diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index fe25d58c6c..93e10a0411 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -224,15 +224,15 @@ void ov62_0223197C(UnkStruct_0208C06C *param0, int param1) ov62_022302A8(param0, 6, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1); G2S_BlendNone(); - BGL_SetPriority(6, 0); + Bg_SetPriority(6, 0); Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 1, 19, 30, 4, 14, 32); + Window_Add(param0->unk_14.unk_10, v1, 6, 1, 19, 30, 4, 14, 32); v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); - BGL_FillWindow(v1, 0xCC); + Window_FillTilemap(v1, 0xCC); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v0); } @@ -244,11 +244,11 @@ void ov62_02231A1C(UnkStruct_0208C06C *param0) param0->unk_8A0 = 0; - sub_0201ACF4(¶m0->unk_8A4); - BGL_DeleteWindow(¶m0->unk_8A4); - sub_02019EBC(param0->unk_14.unk_10, 6); + Window_ClearAndCopyToVRAM(¶m0->unk_8A4); + Window_Remove(¶m0->unk_8A4); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); - BGL_SetPriority(6, 2); + Bg_SetPriority(6, 2); G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ, 7, 8); G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ, 7, 8); @@ -256,8 +256,8 @@ void ov62_02231A1C(UnkStruct_0208C06C *param0) void ov62_02231A88(UnkStruct_0208C06C *param0) { - sub_0201ACF4(¶m0->unk_8A4); - BGL_DeleteWindow(¶m0->unk_8A4); + Window_ClearAndCopyToVRAM(¶m0->unk_8A4); + Window_Remove(¶m0->unk_8A4); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } @@ -275,13 +275,13 @@ void ov62_02231AAC(UnkStruct_0208C06C *param0, int param1) ov62_022302A8(param0, 2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 2, 1, 19, 30, 4, 14, 32); + Window_Add(param0->unk_14.unk_10, v1, 2, 1, 19, 30, 4, 14, 32); v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); - BGL_FillWindow(v1, 0xCC); + Window_FillTilemap(v1, 0xCC); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v0); } @@ -296,9 +296,9 @@ void ov62_02231B3C(UnkStruct_0208C06C *param0, int param1) v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); - BGL_FillWindow(v1, 0xCC); + Window_FillTilemap(v1, 0xCC); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v0); } @@ -310,9 +310,9 @@ void ov62_02231B8C(UnkStruct_0208C06C *param0) param0->unk_8A0 = 0; - sub_0201ACF4(¶m0->unk_8A4); - BGL_DeleteWindow(¶m0->unk_8A4); - sub_02019EBC(param0->unk_14.unk_10, 2); + Window_ClearAndCopyToVRAM(¶m0->unk_8A4); + Window_Remove(¶m0->unk_8A4); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } @@ -334,17 +334,17 @@ void ov62_02231BC4(UnkStruct_0208C06C *param0, int param1) G2S_BlendNone(); - BGL_SetPriority(6, 0); + Bg_SetPriority(6, 0); ov62_022302A8(param0, 6, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1); Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 1, 19, 30, 4, 14, 32); + Window_Add(param0->unk_14.unk_10, v1, 6, 1, 19, 30, 4, 14, 32); v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); - BGL_FillWindow(v1, 0xCC); + Window_FillTilemap(v1, 0xCC); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v0); } @@ -399,10 +399,10 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p v2 = ¶m0->unk_0C[v0]; v3 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, Unk_ov62_022489F8[v0]); Window_Init(v2); - BGL_AddWindow(param1->unk_14.unk_10, v2, 2, Unk_ov62_02248A28[v0][0], Unk_ov62_02248A28[v0][1], Unk_ov62_02248A28[v0][2], Unk_ov62_02248A28[v0][3], 14, v1); - BGL_FillWindow(v2, 0x00); + Window_Add(param1->unk_14.unk_10, v2, 2, Unk_ov62_02248A28[v0][0], Unk_ov62_02248A28[v0][1], Unk_ov62_02248A28[v0][2], Unk_ov62_02248A28[v0][3], 14, v1); + Window_FillTilemap(v2, 0x00); Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, v3, ov62_0223429C(v2, v3), 0, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL); - sub_0201A9A4(v2); + Window_ScheduleCopyToVRAM(v2); v1 += (Unk_ov62_02248A28[v0][2] * Unk_ov62_02248A28[v0][3]); Strbuf_Free(v3); } @@ -428,9 +428,9 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p StringTemplate_SetStrbuf(v9, 0, v6, 0, 1, 2); StringTemplate_Format(v9, v8, v7); - BGL_FillWindow(v10, 0x00); + Window_FillTilemap(v10, 0x00); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v6); Strbuf_Free(v7); @@ -449,9 +449,9 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p StringTemplate_SetMonthName(v9, 0, v12); StringTemplate_Format(v9, v8, v6); - BGL_FillWindow(v10, 0x00); + Window_FillTilemap(v10, 0x00); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v6); Strbuf_Free(v7); @@ -462,9 +462,9 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p { v10 = ¶m0->unk_0C[3]; v8 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 16); - BGL_FillWindow(v10, 0x00); + Window_FillTilemap(v10, 0x00); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v8); { @@ -472,12 +472,12 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p int v14 = sub_02030C08(v11); v10 = ¶m0->unk_0C[4]; - BGL_FillWindow(v10, 0x00); + Window_FillTilemap(v10, 0x00); if (v13 == 0) { v8 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 21); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v8); } else { v8 = Strbuf_Init(255, 102); @@ -486,19 +486,19 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p StringTemplate_Format(v9, v8, v6); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v8); Strbuf_Free(v6); if (v14 != 0) { v10 = ¶m0->unk_0C[5]; - BGL_FillWindow(v10, 0x00); + Window_FillTilemap(v10, 0x00); v8 = Strbuf_Init(255, 102); v6 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 23); StringTemplate_SetCityName(v9, 0, v13, v14); StringTemplate_Format(v9, v8, v6); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, 4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v8); Strbuf_Free(v6); } @@ -511,9 +511,9 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p { v10 = ¶m0->unk_0C[6]; v8 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 17); - BGL_FillWindow(v10, 0x00); + Window_FillTilemap(v10, 0x00); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v8); { @@ -526,9 +526,9 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p v8 = sub_02014B34(&v15, 102); } - BGL_FillWindow(v10, 0x00); + Window_FillTilemap(v10, 0x00); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v8); } @@ -543,8 +543,8 @@ static void ov62_02232080(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p int v0; for (v0 = 0; v0 < 8; v0++) { - sub_0201ACF4(¶m0->unk_0C[v0]); - BGL_DeleteWindow(¶m0->unk_0C[v0]); + Window_ClearAndCopyToVRAM(¶m0->unk_0C[v0]); + Window_Remove(¶m0->unk_0C[v0]); } } @@ -801,7 +801,7 @@ static void ov62_022323CC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *p } Text_AddPrinterWithParamsAndColor(v3, FONT_SYSTEM, v0, 0, 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v3); + Window_ScheduleCopyToVRAM(v3); Strbuf_Free(v0); } @@ -828,8 +828,8 @@ void ov62_022324A0(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, } Window_Init(v1); - BGL_AddWindow(param1->unk_14.unk_10, v1, param2->unk_20, param2->unk_0C, param2->unk_10, param2->unk_14, param2->unk_18, 14, param2->unk_1C); - BGL_FillWindow(v1, 0x0); + Window_Add(param1->unk_14.unk_10, v1, param2->unk_20, param2->unk_0C, param2->unk_10, param2->unk_14, param2->unk_18, 14, param2->unk_1C); + Window_FillTilemap(v1, 0x0); for (v0 = 0; v0 < param0->unk_10; v0++) { v2 = MessageLoader_GetNewStrbuf(param0->unk_34, param2->unk_00[v0].unk_00); @@ -842,7 +842,7 @@ void ov62_022324A0(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, } } - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } void ov62_02232594(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, MessageLoader *param2, const UnkStruct_ov62_02248CDC *param3) @@ -876,8 +876,8 @@ void ov62_02232594(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, } Window_Init(v1); - BGL_AddWindow(param1->unk_14.unk_10, v1, param3->unk_20, param3->unk_0C, param3->unk_10, param3->unk_14, param3->unk_18, 14, param3->unk_1C); - BGL_FillWindow(v1, 0x0); + Window_Add(param1->unk_14.unk_10, v1, param3->unk_20, param3->unk_0C, param3->unk_10, param3->unk_14, param3->unk_18, 14, param3->unk_1C); + Window_FillTilemap(v1, 0x0); if (param3->unk_00) { for (v0 = 0; v0 < param0->unk_10; v0++) { @@ -912,7 +912,7 @@ void ov62_02232594(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, } } - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } void ov62_02232778(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, MessageLoader *param2, const UnkStruct_ov62_02248CDC *param3, int param4, int param5, Strbuf *param6) @@ -955,8 +955,8 @@ void ov62_02232778(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, param0->unk_38.unk_0C = param0->unk_10 / 2; Window_Init(v1); - BGL_AddWindow(param1->unk_14.unk_10, v1, param3->unk_20, param3->unk_0C, param3->unk_10, param3->unk_14, param3->unk_18, 14, param3->unk_1C); - BGL_FillWindow(v1, 0x00); + Window_Add(param1->unk_14.unk_10, v1, param3->unk_20, param3->unk_0C, param3->unk_10, param3->unk_14, param3->unk_18, 14, param3->unk_1C); + Window_FillTilemap(v1, 0x00); v7 = ov62_02231690(102); @@ -1033,7 +1033,7 @@ void ov62_02232778(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, StringTemplate_ClearArgs(v7); } - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); StringTemplate_Free(v7); } @@ -1063,15 +1063,15 @@ void ov62_02232AAC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, param0->unk_48 = 1; Window_Init(v1); - BGL_AddWindow(param1->unk_14.unk_10, v1, param2->unk_20, param2->unk_0C, param2->unk_10, param2->unk_14, param2->unk_18, 14, param2->unk_1C); - BGL_FillWindow(v1, 0x0); + Window_Add(param1->unk_14.unk_10, v1, param2->unk_20, param2->unk_0C, param2->unk_10, param2->unk_14, param2->unk_18, 14, param2->unk_1C); + Window_FillTilemap(v1, 0x0); for (v0 = 0; v0 < param0->unk_10; v0++) { Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param3[v0][0], 0, ((param2->unk_08 * 8) * v0) + 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param3[v0][1], 136, ((param2->unk_08 * 8) * v0) + 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); } - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } int ov62_02232BB4(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, Strbuf *param2[20][2]) @@ -1089,7 +1089,7 @@ int ov62_02232BB4(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, S v2 = ¶m0->unk_18; - BGL_FillWindow(v2, 0x0); + Window_FillTilemap(v2, 0x0); { int v3; int v4 = 0; @@ -1111,7 +1111,7 @@ int ov62_02232BB4(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, S Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, param2[v4 + v3][1], 136, ((param0->unk_28->unk_08 * 8) * v3) + 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); } } - sub_0201A954(v2); + Window_CopyToVRAM(v2); param0->unk_0C = param0->unk_38.unk_00; @@ -1163,7 +1163,7 @@ asm int ov62_02232C78 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * pa add r5, r0, #0 ldr r0, [sp, #0x58] mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap mov r0, #0 str r0, [sp, #0x44] str r0, [sp, #0x40] @@ -1474,7 +1474,7 @@ asm int ov62_02232C78 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * pa b _02232D7A _02232F46: ldr r0, [sp, #0x58] - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r0, r5, #0 bl StringTemplate_Free mov r0, #8 @@ -1513,7 +1513,7 @@ int ov62_02232F68(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1) v2 = ¶m0->unk_18; - BGL_FillWindow(v2, 0x0); + Window_FillTilemap(v2, 0x0); { int v4 = 0; @@ -1533,7 +1533,7 @@ int ov62_02232F68(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1) } } - sub_0201A954(v2); + Window_CopyToVRAM(v2); param0->unk_0C = param0->unk_08; return v1; @@ -1555,7 +1555,7 @@ int ov62_02233064(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1) } v2 = ¶m0->unk_18; - BGL_FillWindow(v2, 0x0); + Window_FillTilemap(v2, 0x0); { int v4; @@ -1595,7 +1595,7 @@ int ov62_02233064(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1) } } - sub_0201A954(v2); + Window_CopyToVRAM(v2); param0->unk_0C = param0->unk_38.unk_00; return v1; @@ -1701,8 +1701,8 @@ void ov62_022332AC(UnkStruct_ov62_02233310 *param0, s16 param1) void ov62_022332FC(UnkStruct_ov62_02233310 *param0) { - sub_0201ACF4(¶m0->unk_18); - BGL_DeleteWindow(¶m0->unk_18); + Window_ClearAndCopyToVRAM(¶m0->unk_18); + Window_Remove(¶m0->unk_18); } void ov62_02233310(UnkStruct_ov62_02233310 *param0) @@ -2290,10 +2290,10 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p v3 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, v5[v0]); Window_Init(v2); - BGL_AddWindow(param1->unk_14.unk_10, v2, 2, v4[v0][0], v4[v0][1], v4[v0][2], v4[v0][3], 14, v1); - BGL_FillWindow(v2, 0x0); + Window_Add(param1->unk_14.unk_10, v2, 2, v4[v0][0], v4[v0][1], v4[v0][2], v4[v0][3], 14, v1); + Window_FillTilemap(v2, 0x0); Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, v3, ov62_0223429C(v2, v3), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v2); + Window_ScheduleCopyToVRAM(v2); v1 += (v4[v0][2] * v4[v0][3]); @@ -2320,9 +2320,9 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p StringTemplate_SetStrbuf(v9, 0, v6, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v9, v8, v7); - BGL_FillWindow(v10, 0x0); + Window_FillTilemap(v10, 0x0); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v6); Strbuf_Free(v7); Strbuf_Free(v8); @@ -2334,9 +2334,9 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p v10 = ¶m0->unk_3C[1]; v8 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 132 + v12); - BGL_FillWindow(v10, 0x0); + Window_FillTilemap(v10, 0x0); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v8); StringTemplate_ClearArgs(v9); } @@ -2353,17 +2353,17 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p Strbuf_FormatInt(v6, v13, 4, 0, 1); StringTemplate_SetStrbuf(v9, 0, v6, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v9, v8, v7); - BGL_FillWindow(v10, 0x0); + Window_FillTilemap(v10, 0x0); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v6); Strbuf_Free(v7); Strbuf_Free(v8); StringTemplate_ClearArgs(v9); } else { v10 = ¶m0->unk_3C[3]; - BGL_FillWindow(v10, 0x0); - sub_0201A9A4(v10); + Window_FillTilemap(v10, 0x0); + Window_ScheduleCopyToVRAM(v10); } } @@ -2401,9 +2401,9 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p StringTemplate_SetStrbuf(v9, 1, v18, 0, 1, GAME_LANGUAGE); StringTemplate_SetStrbuf(v9, 0, v19, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v9, v8, v7); - BGL_FillWindow(v10, 0x0); + Window_FillTilemap(v10, 0x0); Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v10); + Window_ScheduleCopyToVRAM(v10); Strbuf_Free(v17); Strbuf_Free(v18); Strbuf_Free(v19); @@ -2421,8 +2421,8 @@ static void ov62_02233F74(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p int v0; for (v0 = 0; v0 < 5; v0++) { - sub_0201ACF4(¶m0->unk_3C[v0]); - BGL_DeleteWindow(¶m0->unk_3C[v0]); + Window_ClearAndCopyToVRAM(¶m0->unk_3C[v0]); + Window_Remove(¶m0->unk_3C[v0]); } } @@ -2649,7 +2649,7 @@ void ov62_0223427C(UnkStruct_ov62_02233F74 *param0, int param1) int ov62_0223429C(Window *param0, Strbuf *param1) { int v0 = Font_CalcStrbufWidth(FONT_SYSTEM, param1, 0); - int v1 = (sub_0201C294(param0) * 8 - v0) / 2; + int v1 = (Window_GetWidth(param0) * 8 - v0) / 2; return v1; } @@ -2674,14 +2674,14 @@ BOOL ov62_022342CC(UnkStruct_0208C06C *param0) void ov62_02234314(void) { - BGL_SetPriority(0, 1); - BGL_SetPriority(1, 3); - BGL_SetPriority(2, 0); - BGL_SetPriority(3, 1); - BGL_SetPriority(4, 1); - BGL_SetPriority(5, 3); - BGL_SetPriority(6, 0); - BGL_SetPriority(7, 1); + Bg_SetPriority(0, 1); + Bg_SetPriority(1, 3); + Bg_SetPriority(2, 0); + Bg_SetPriority(3, 1); + Bg_SetPriority(4, 1); + Bg_SetPriority(5, 3); + Bg_SetPriority(6, 0); + Bg_SetPriority(7, 1); } void ov62_02234358(UnkStruct_0208C06C *param0, UnkStruct_0208B878 *param1, s16 param2, s16 param3) diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c index bb44441568..db99ac437e 100644 --- a/src/overlay062/ov62_02234A10.c +++ b/src/overlay062/ov62_02234A10.c @@ -42,22 +42,22 @@ static void ov62_02234A10(UnkStruct_0208C06C *param0) Window *v2 = ¶m0->unk_8A4; Window_Init(v2); - BGL_AddWindow(param0->unk_14.unk_10, v2, 2, 8, 16, 16, 2, 14, 300); - BGL_FillWindow(v2, 0x0); + Window_Add(param0->unk_14.unk_10, v2, 2, 8, 16, 16, 2, 14, 300); + Window_FillTilemap(v2, 0x0); v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 192); v1 = ov62_0223429C(v2, v0); Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, v0, v1, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 14, 0), NULL); Strbuf_Free(v0); - sub_0201A9A4(v2); + Window_ScheduleCopyToVRAM(v2); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); } static void ov62_02234A90(UnkStruct_0208C06C *param0) { - sub_0201ACF4(¶m0->unk_8A4); - BGL_DeleteWindow(¶m0->unk_8A4); + Window_ClearAndCopyToVRAM(¶m0->unk_8A4); + Window_Remove(¶m0->unk_8A4); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c index 3d2e8ea620..5401655d44 100644 --- a/src/overlay062/ov62_02235E64.c +++ b/src/overlay062/ov62_02235E64.c @@ -89,10 +89,10 @@ static BOOL ov62_02235E64(UnkStruct_0208C06C *param0) memset(v0, 0, sizeof(UnkStruct_ov62_02235E64)); param0->unk_860 = v0; - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_022315C8(&v0->unk_00, &v0->unk_04, 0); ov62_0222FB60(param0, 1); @@ -118,14 +118,14 @@ static BOOL ov62_02235EBC(UnkStruct_0208C06C *param0) ov62_02234540(param0, 1); ov62_02231454(param0); ov62_02234540(param0, 0); - BGL_SetPriority(0, 0); - BGL_SetPriority(1, 3); - BGL_SetPriority(2, 0); - BGL_SetPriority(3, 2); - BGL_SetPriority(4, 0); - BGL_SetPriority(5, 3); - BGL_SetPriority(6, 1); - BGL_SetPriority(7, 2); + Bg_SetPriority(0, 0); + Bg_SetPriority(1, 3); + Bg_SetPriority(2, 0); + Bg_SetPriority(3, 2); + Bg_SetPriority(4, 0); + Bg_SetPriority(5, 3); + Bg_SetPriority(6, 1); + Bg_SetPriority(7, 2); sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; @@ -291,39 +291,39 @@ static void ov62_022362B8(UnkStruct_0208C06C *param0) v1 = &v0->unk_178[0]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); - BGL_FillWindow(v1, 0x0); + Window_Add(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130); v4 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); v3 += (10 * 2); v1 = &v0->unk_178[1]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); - BGL_FillWindow(v1, 0x0); + Window_Add(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131); v4 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov62_02236398(UnkStruct_0208C06C *param0) { UnkStruct_ov62_02235E64 *v0 = param0->unk_860; - sub_0201ACF4(&v0->unk_178[0]); - BGL_DeleteWindow(&v0->unk_178[0]); - sub_0201ACF4(&v0->unk_178[1]); - BGL_DeleteWindow(&v0->unk_178[1]); + Window_ClearAndCopyToVRAM(&v0->unk_178[0]); + Window_Remove(&v0->unk_178[0]); + Window_ClearAndCopyToVRAM(&v0->unk_178[1]); + Window_Remove(&v0->unk_178[1]); } static BOOL ov62_022363CC(UnkStruct_0208C06C *param0) @@ -552,10 +552,10 @@ static BOOL ov62_022367B4(UnkStruct_0208C06C *param0) ov62_02234540(param0, 1); ov62_0223146C(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); param0->unk_08++; break; default: @@ -696,7 +696,7 @@ static void ov62_02236B64(UnkStruct_0208C06C *param0) v1 = &v0->unk_178[0]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 8, 3, 16, 2, 14, v2); + Window_Add(param0->unk_14.unk_10, v1, 6, 8, 3, 16, 2, 14, v2); ov62_02236BC8(param0, 121); } @@ -704,8 +704,8 @@ static void ov62_02236BA8(UnkStruct_0208C06C *param0) { UnkStruct_ov62_02235E64 *v0 = param0->unk_860; - sub_0201ACF4(&v0->unk_178[0]); - BGL_DeleteWindow(&v0->unk_178[0]); + Window_ClearAndCopyToVRAM(&v0->unk_178[0]); + Window_Remove(&v0->unk_178[0]); } static void ov62_02236BC8(UnkStruct_0208C06C *param0, int param1) @@ -717,14 +717,14 @@ static void ov62_02236BC8(UnkStruct_0208C06C *param0, int param1) v1 = &v0->unk_178[0]; - BGL_FillWindow(v1, 0x0); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); v3 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov62_02236C20(UnkStruct_0208C06C *param0) diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c index 7e06ee7bef..721ee30b97 100644 --- a/src/overlay062/ov62_02236CBC.c +++ b/src/overlay062/ov62_02236CBC.c @@ -593,10 +593,10 @@ static BOOL ov62_02237884(UnkStruct_0208C06C *param0) v0->unk_04[v1] = 0.2f; } } - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 7); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); ov62_022315C8(&v0->unk_D4, &v0->unk_D8, 0); ov62_02231560(&v0->unk_D4, &v0->unk_D8, 0, 0, GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG1, 0); Sound_PlayEffect(1377); @@ -626,7 +626,7 @@ static BOOL ov62_02237884(UnkStruct_0208C06C *param0) ov62_0223376C(param0, 0); sub_0208B9E0(param0->unk_6F0, 0); ov62_02234314(); - BGL_SetPriority(6, 2); + Bg_SetPriority(6, 2); ov62_02236E14(param0); sub_02003A2C(param0->unk_14.unk_14, 3, 0xC | 0x10, v0->unk_00, param0->unk_14.unk_44); param0->unk_08++; @@ -730,10 +730,10 @@ static BOOL ov62_02237B00(UnkStruct_0208C06C *param0) ov62_02234540(param0, 1); ov62_0223146C(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); param0->unk_08++; break; case 4: diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index 3c70132b44..11dfda6111 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -222,10 +222,10 @@ static BOOL ov62_02237D24(UnkStruct_0208C06C *param0) v0->unk_250.unk_00 = sub_02030A80(102); } - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_022315C8(&v0->unk_00, &v0->unk_04, 0); ov62_0222FB60(param0, 1); @@ -248,14 +248,14 @@ static BOOL ov62_02237DB8(UnkStruct_0208C06C *param0) sub_02003A2C(param0->unk_14.unk_14, 1, 0x2, v0->unk_08, param0->unk_14.unk_44); break; case 1: - BGL_SetPriority(0, 0); - BGL_SetPriority(2, 0); - BGL_SetPriority(1, 3); - BGL_SetPriority(3, 2); - BGL_SetPriority(4, 0); - BGL_SetPriority(6, 1); - BGL_SetPriority(5, 3); - BGL_SetPriority(7, 2); + Bg_SetPriority(0, 0); + Bg_SetPriority(2, 0); + Bg_SetPriority(1, 3); + Bg_SetPriority(3, 2); + Bg_SetPriority(4, 0); + Bg_SetPriority(6, 1); + Bg_SetPriority(5, 3); + Bg_SetPriority(7, 2); sub_0208B9E0(param0->unk_6F0, 0); param0->unk_08++; break; @@ -372,22 +372,22 @@ static BOOL ov62_022380B0(UnkStruct_0208C06C *param0) switch (param0->unk_08) { case 0: - BGL_SetPriority(0, 1); - BGL_SetPriority(1, 3); - BGL_SetPriority(2, 2); - BGL_SetPriority(3, 1); - BGL_SetPriority(4, 1); - BGL_SetPriority(5, 3); - BGL_SetPriority(6, 2); - BGL_SetPriority(7, 1); + Bg_SetPriority(0, 1); + Bg_SetPriority(1, 3); + Bg_SetPriority(2, 2); + Bg_SetPriority(3, 1); + Bg_SetPriority(4, 1); + Bg_SetPriority(5, 3); + Bg_SetPriority(6, 2); + Bg_SetPriority(7, 1); { Heap_FreeToHeap(v0->unk_230.unk_08); sub_02030A98(v0->unk_250.unk_00); } - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); ov62_02239D0C(param0); param0->unk_08++; break; @@ -398,10 +398,10 @@ static BOOL ov62_022380B0(UnkStruct_0208C06C *param0) ov62_02234540(param0, 1); ov62_022396E8(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); - sub_02019184(param0->unk_14.unk_10, 2, 0, 0); - BGL_SetPriority(2, 0); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); + Bg_SetOffset(param0->unk_14.unk_10, 2, 0, 0); + Bg_SetPriority(2, 0); param0->unk_08++; } @@ -448,10 +448,10 @@ static BOOL ov62_022380B0(UnkStruct_0208C06C *param0) ov62_02231688(&v0->unk_08); ov62_0223146C(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_0223376C(param0, 1); param0->unk_08++; break; @@ -464,7 +464,7 @@ static BOOL ov62_022380B0(UnkStruct_0208C06C *param0) if (v0->unk_228) { ov22_0225B020(v0->unk_228); ov62_0222F834(param0); - BGL_SetPriority(2, 0); + Bg_SetPriority(2, 0); ov62_0223956C(); } @@ -496,22 +496,22 @@ static BOOL ov62_022383E4(UnkStruct_0208C06C *param0) switch (param0->unk_08) { case 0: - BGL_SetPriority(0, 1); - BGL_SetPriority(1, 3); - BGL_SetPriority(2, 2); - BGL_SetPriority(3, 1); - BGL_SetPriority(4, 1); - BGL_SetPriority(5, 3); - BGL_SetPriority(6, 2); - BGL_SetPriority(7, 1); + Bg_SetPriority(0, 1); + Bg_SetPriority(1, 3); + Bg_SetPriority(2, 2); + Bg_SetPriority(3, 1); + Bg_SetPriority(4, 1); + Bg_SetPriority(5, 3); + Bg_SetPriority(6, 2); + Bg_SetPriority(7, 1); { Heap_FreeToHeap(v0->unk_230.unk_08); sub_02030A98(v0->unk_250.unk_00); } - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); ov62_02239D0C(param0); param0->unk_08++; break; @@ -522,8 +522,8 @@ static BOOL ov62_022383E4(UnkStruct_0208C06C *param0) ov62_02234540(param0, 1); ov62_022396E8(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); param0->unk_08++; } @@ -534,10 +534,10 @@ static BOOL ov62_022383E4(UnkStruct_0208C06C *param0) ov62_02234540(param0, 1); ov62_0223146C(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_0223376C(param0, 1); param0->unk_08++; break; @@ -552,7 +552,7 @@ static BOOL ov62_022383E4(UnkStruct_0208C06C *param0) if (v0->unk_228) { ov22_0225B020(v0->unk_228); ov62_0222F834(param0); - BGL_SetPriority(2, 0); + Bg_SetPriority(2, 0); ov62_0223956C(); } @@ -747,22 +747,22 @@ static BOOL ov62_0223896C(UnkStruct_0208C06C *param0) switch (param0->unk_08) { case 0: - BGL_SetPriority(0, 1); - BGL_SetPriority(1, 3); - BGL_SetPriority(2, 2); - BGL_SetPriority(3, 1); - BGL_SetPriority(4, 1); - BGL_SetPriority(5, 3); - BGL_SetPriority(6, 2); - BGL_SetPriority(7, 1); + Bg_SetPriority(0, 1); + Bg_SetPriority(1, 3); + Bg_SetPriority(2, 2); + Bg_SetPriority(3, 1); + Bg_SetPriority(4, 1); + Bg_SetPriority(5, 3); + Bg_SetPriority(6, 2); + Bg_SetPriority(7, 1); { Heap_FreeToHeap(v0->unk_230.unk_08); sub_02030A98(v0->unk_250.unk_00); } - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); param0->unk_08++; break; case 1: @@ -772,8 +772,8 @@ static BOOL ov62_0223896C(UnkStruct_0208C06C *param0) ov62_02234540(param0, 1); ov62_022396E8(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); param0->unk_08++; } @@ -784,10 +784,10 @@ static BOOL ov62_0223896C(UnkStruct_0208C06C *param0) ov62_02234540(param0, 1); ov62_0223146C(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_0223376C(param0, 1); param0->unk_08++; break; @@ -802,7 +802,7 @@ static BOOL ov62_0223896C(UnkStruct_0208C06C *param0) if (v0->unk_228) { ov22_0225B020(v0->unk_228); ov62_0222F834(param0); - BGL_SetPriority(2, 0); + Bg_SetPriority(2, 0); ov62_0223956C(); } @@ -1003,8 +1003,8 @@ static BOOL ov62_02238F24(UnkStruct_0208C06C *param0) switch (param0->unk_08) { case 0: if (v0->unk_0C == 0) { - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); ov62_02239D0C(param0); } else { ov62_02234540(param0, 1); @@ -1022,15 +1022,15 @@ static BOOL ov62_02238F24(UnkStruct_0208C06C *param0) if (v0->unk_228) { ov22_0225B020(v0->unk_228); ov62_0222F834(param0); - BGL_SetPriority(2, 0); + Bg_SetPriority(2, 0); v0->unk_228 = NULL; ov62_0223956C(); } - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); param0->unk_08++; } @@ -1052,7 +1052,7 @@ static BOOL ov62_0223900C(UnkStruct_0208C06C *param0) case 0: if (v0->unk_0C == 0) { ov62_02239D0C(param0); - sub_02019EBC(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); } else { ov62_02234540(param0, 1); ov62_02232394(&v0->unk_250, param0); @@ -1067,13 +1067,13 @@ static BOOL ov62_0223900C(UnkStruct_0208C06C *param0) if (v0->unk_228) { ov22_0225B020(v0->unk_228); ov62_0222F834(param0); - BGL_SetPriority(2, 0); + Bg_SetPriority(2, 0); v0->unk_228 = NULL; ov62_0223956C(); } - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } @@ -1144,7 +1144,7 @@ static BOOL ov62_0223921C(UnkStruct_0208C06C *param0) case 0: if (v0->unk_0C == 0) { ov62_02239D0C(param0); - sub_02019EBC(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); } else { ov62_02234540(param0, 1); ov62_02232394(&v0->unk_250, param0); @@ -1159,13 +1159,13 @@ static BOOL ov62_0223921C(UnkStruct_0208C06C *param0) if (v0->unk_228) { ov22_0225B020(v0->unk_228); ov62_0222F834(param0); - BGL_SetPriority(2, 0); + Bg_SetPriority(2, 0); v0->unk_228 = NULL; ov62_0223956C(); } - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } @@ -1232,8 +1232,8 @@ static void ov62_02239424(UnkStruct_0208C06C *param0) { UnkStruct_ov62_02237D24 *v0 = param0->unk_860; - sub_0201ACF4(&v0->unk_D0[0]); - BGL_DeleteWindow(&v0->unk_D0[0]); + Window_ClearAndCopyToVRAM(&v0->unk_D0[0]); + Window_Remove(&v0->unk_D0[0]); } static void ov62_02239440(UnkStruct_0208C06C *param0, int param1) @@ -1245,14 +1245,14 @@ static void ov62_02239440(UnkStruct_0208C06C *param0, int param1) v1 = &v0->unk_D0[0]; - BGL_FillWindow(v1, 0x0); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); v3 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov62_02239498(UnkStruct_0208C06C *param0) @@ -1263,7 +1263,7 @@ static void ov62_02239498(UnkStruct_0208C06C *param0) v1 = &v0->unk_D0[0]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 8, 3, 16, 2, 14, v2); + Window_Add(param0->unk_14.unk_10, v1, 6, 8, 3, 16, 2, 14, v2); ov62_02239440(param0, 121); } @@ -1279,7 +1279,7 @@ static void ov62_022394D8(void *param0) sub_0201DCAC(); sub_02003694(v0->unk_14.unk_14); - sub_0201C2B8(v0->unk_14.unk_10); + Bg_RunScheduledUpdates(v0->unk_14.unk_10); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -1367,14 +1367,14 @@ static void ov62_02239724(UnkStruct_0208C06C *param0) u32 v7; int v8, v9; - if (BGL_WindowAdded(&v5->unk_10[0]) == 1) { + if (Window_IsInUse(&v5->unk_10[0]) == 1) { return; } v0 = &v5->unk_10[0]; Window_Init(v0); - BGL_AddWindow(param0->unk_14.unk_10, v0, 2, 16, 19, 16, 4, 14, 300); - BGL_FillWindow(v0, 0x00); + Window_Add(param0->unk_14.unk_10, v0, 2, 16, 19, 16, 4, 14, 300); + Window_FillTilemap(v0, 0x00); v4 = ov62_02231690(102); v3 = Strbuf_Init(255, 102); @@ -1396,7 +1396,7 @@ static void ov62_02239724(UnkStruct_0208C06C *param0) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v9, 16 * v8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); } - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); Strbuf_Free(v1); Strbuf_Free(v2); @@ -1416,14 +1416,14 @@ static void ov62_02239854(UnkStruct_0208C06C *param0, int param1) u32 v7; int v8, v9; - if (BGL_WindowAdded(&v5->unk_10[0]) == 1) { + if (Window_IsInUse(&v5->unk_10[0]) == 1) { return; } v0 = &v5->unk_10[0]; Window_Init(v0); - BGL_AddWindow(param0->unk_14.unk_10, v0, 2, 16, 19, 16, 4, 14, 300); - BGL_FillWindow(v0, 0x00); + Window_Add(param0->unk_14.unk_10, v0, 2, 16, 19, 16, 4, 14, 300); + Window_FillTilemap(v0, 0x00); v4 = ov62_02231690(102); v3 = Strbuf_Init(255, 102); @@ -1445,7 +1445,7 @@ static void ov62_02239854(UnkStruct_0208C06C *param0, int param1) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v9, 16 * v8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); } - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); Strbuf_Free(v1); Strbuf_Free(v2); @@ -1604,8 +1604,8 @@ static void ov62_02239BD8(UnkStruct_0208C06C *param0) v7 = Unk_ov62_022491F0[v3].rect.right / 8 - v5; v8 = Unk_ov62_022491F0[v3].rect.bottom / 8 - v6; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, v5, v6, v7, v8, 14, v4); - BGL_FillWindow(v1, 0x00); + Window_Add(param0->unk_14.unk_10, v1, 6, v5, v6, v7, v8, 14, v4); + Window_FillTilemap(v1, 0x00); v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 68 + v3); v9 = ov62_0223429C(v1, v0); v10 = (8 * v8 - 16) / 2; @@ -1615,7 +1615,7 @@ static void ov62_02239BD8(UnkStruct_0208C06C *param0) Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, v9, v10, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(12, 11, 0), NULL); } - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v0); v4 += v7 * v8; } @@ -1629,8 +1629,8 @@ static void ov62_02239CE8(UnkStruct_0208C06C *param0) for (v0 = 0; v0 < 9; v0++) { v1 = &v2->unk_D0[v0]; - sub_0201ACF4(v1); - BGL_DeleteWindow(v1); + Window_ClearAndCopyToVRAM(v1); + Window_Remove(v1); } } @@ -1638,9 +1638,9 @@ static void ov62_02239D0C(UnkStruct_0208C06C *param0) { UnkStruct_ov62_02237D24 *v0 = param0->unk_860; - if (BGL_WindowAdded(&v0->unk_10[0]) == 1) { - sub_0201ACF4(&v0->unk_10[0]); - BGL_DeleteWindow(&v0->unk_10[0]); + if (Window_IsInUse(&v0->unk_10[0]) == 1) { + Window_ClearAndCopyToVRAM(&v0->unk_10[0]); + Window_Remove(&v0->unk_10[0]); } } diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index 2766e83b6c..e5c7566a69 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -458,10 +458,10 @@ static BOOL ov62_0223A17C(UnkStruct_0208C06C *param0) param0->unk_860 = v0; - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); v0->unk_00 = SaveData_PCBoxes(param0->unk_830); ov62_0223A154(param0->unk_830, v0->unk_00, v0->unk_1A0, &v0->unk_04); @@ -881,9 +881,9 @@ static void ov62_0223AA90(UnkStruct_0208C06C *param0) v1 = &v0->unk_1B4[v3]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 2, Unk_ov62_02248D9C[v3][0], Unk_ov62_02248D9C[v3][1], Unk_ov62_02248D9C[v3][2], Unk_ov62_02248D9C[v3][3], 14, v2); - BGL_FillWindow(v1, Unk_ov62_02248D78[v3]); - sub_0201A9A4(v1); + Window_Add(param0->unk_14.unk_10, v1, 2, Unk_ov62_02248D9C[v3][0], Unk_ov62_02248D9C[v3][1], Unk_ov62_02248D9C[v3][2], Unk_ov62_02248D9C[v3][3], 14, v2); + Window_FillTilemap(v1, Unk_ov62_02248D78[v3]); + Window_ScheduleCopyToVRAM(v1); v2 += (Unk_ov62_02248D9C[v3][2] * Unk_ov62_02248D9C[v3][3]); } @@ -910,14 +910,14 @@ static void ov62_0223AB14(UnkStruct_0208C06C *param0) for (v3 = 0; v3 < NELEMS(Unk_ov62_02248DC4); v3++) { v1 = &v0->unk_234[v3]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, Unk_ov62_02248DC4[v3][0], Unk_ov62_02248DC4[v3][1], Unk_ov62_02248DC4[v3][2], Unk_ov62_02248DC4[v3][3], 14, v2); + Window_Add(param0->unk_14.unk_10, v1, 6, Unk_ov62_02248DC4[v3][0], Unk_ov62_02248DC4[v3][1], Unk_ov62_02248DC4[v3][2], Unk_ov62_02248DC4[v3][3], 14, v2); v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 60 + v3); v4 = ov62_0223429C(v1, v5); - BGL_FillWindow(v1, Unk_ov62_02248D78[0]); + Window_FillTilemap(v1, Unk_ov62_02248D78[0]); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v5, v4, 0, TEXT_SPEED_NO_TRANSFER, Unk_ov62_02248D90[0], NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v5); v2 += (Unk_ov62_02248DC4[v3][2] * Unk_ov62_02248DC4[v3][3]); @@ -933,8 +933,8 @@ static void ov62_0223ABBC(UnkStruct_0208C06C *param0) for (v2 = 0; v2 < NELEMS(Unk_ov62_02248DC4); v2++) { v1 = &v0->unk_234[v2]; - sub_0201ACF4(v1); - BGL_DeleteWindow(v1); + Window_ClearAndCopyToVRAM(v1); + Window_Remove(v1); } } @@ -944,8 +944,8 @@ static void ov62_0223ABE4(UnkStruct_0208C06C *param0) UnkStruct_ov62_02239DBC *v1 = param0->unk_860; for (v0 = 0; v0 < 3; v0++) { - sub_0201ACF4(&v1->unk_1B4[v0]); - BGL_DeleteWindow(&v1->unk_1B4[v0]); + Window_ClearAndCopyToVRAM(&v1->unk_1B4[v0]); + Window_Remove(&v1->unk_1B4[v0]); } } @@ -958,9 +958,9 @@ static void ov62_0223AC0C(UnkStruct_0208C06C *param0, int param1) v1 = &v0->unk_1B4[2]; v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); - BGL_FillWindow(v1, Unk_ov62_02248D78[2]); + Window_FillTilemap(v1, Unk_ov62_02248D78[2]); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, Unk_ov62_02248DA8[2], TEXT_SPEED_NO_TRANSFER, Unk_ov62_02248D90[2], NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v2); } @@ -984,9 +984,9 @@ static void ov62_0223AC58(UnkStruct_0208C06C *param0, int param1) ov62_022349A8(param0, v3); StringTemplate_SetStrbuf(v5, 0, v3, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v5, v4, v2); - BGL_FillWindow(v1, Unk_ov62_02248D78[2]); + Window_FillTilemap(v1, Unk_ov62_02248D78[2]); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v4, 0, Unk_ov62_02248DA8[2], TEXT_SPEED_NO_TRANSFER, Unk_ov62_02248D90[2], NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v2); Strbuf_Free(v3); Strbuf_Free(v4); @@ -1004,12 +1004,12 @@ static void ov62_0223AD20(UnkStruct_0208C06C *param0) v2 = Strbuf_Init(255, 102); Strbuf_CopyChars(v2, v0->unk_04.unk_00); - BGL_FillWindow(v1, Unk_ov62_02248D78[1]); + Window_FillTilemap(v1, Unk_ov62_02248D78[1]); v3 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, Unk_ov62_02248DA8[1], TEXT_SPEED_NO_TRANSFER, Unk_ov62_02248D90[1], NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v2); } @@ -1022,8 +1022,8 @@ static void ov62_0223AD7C(UnkStruct_0208C06C *param0) for (v0 = 0; v0 < 2; v0++) { v1 = &v2->unk_1B4[v0]; - BGL_FillWindow(v1, Unk_ov62_02248D78[v0]); - sub_0201A9A4(v1); + Window_FillTilemap(v1, Unk_ov62_02248D78[v0]); + Window_ScheduleCopyToVRAM(v1); } } @@ -1042,11 +1042,11 @@ static void ov62_0223ADC0(UnkStruct_0208C06C *param0, int param1) u16 v5[255]; v1 = &v0->unk_1B4[0]; - BGL_FillWindow(v1, Unk_ov62_02248D78[0]); + Window_FillTilemap(v1, Unk_ov62_02248D78[0]); v4 = v0->unk_04.unk_28[param1]; if (v4 == 0) { - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); return; } @@ -1062,7 +1062,7 @@ static void ov62_0223ADC0(UnkStruct_0208C06C *param0, int param1) v3 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, Unk_ov62_02248DA8[0], TEXT_SPEED_NO_TRANSFER, Unk_ov62_02248D90[0], NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v2); } @@ -1372,10 +1372,10 @@ static BOOL ov62_0223B424(UnkStruct_0208C06C *param0) ov62_02231688(&v0->unk_1AC); ov62_0223146C(param0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); param0->unk_08++; break; @@ -1475,14 +1475,14 @@ static void ov62_0223B6AC(UnkStruct_0208C06C *param0) for (v3 = 0; v3 < 2; v3++) { v1 = &v0->unk_234[v3]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, Unk_ov62_02248D5C[v3][0], Unk_ov62_02248D5C[v3][1], Unk_ov62_02248D5C[v3][2], Unk_ov62_02248D5C[v3][3], 14, v2); - BGL_FillWindow(v1, 0x0); + Window_Add(param0->unk_14.unk_10, v1, 6, Unk_ov62_02248D5C[v3][0], Unk_ov62_02248D5C[v3][1], Unk_ov62_02248D5C[v3][2], Unk_ov62_02248D5C[v3][3], 14, v2); + Window_FillTilemap(v1, 0x0); v6 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v5[v3]); v4 = ov62_0223429C(v1, v6); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v6, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); v2 += (Unk_ov62_02248D5C[v3][2] * Unk_ov62_02248D5C[v3][3]); Strbuf_Free(v6); } @@ -1497,14 +1497,14 @@ static void ov62_0223B768(UnkStruct_0208C06C *param0, int param1) v1 = &v0->unk_234[0]; - BGL_FillWindow(v1, 0x0); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); v3 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov62_0223B7C0(UnkStruct_0208C06C *param0) @@ -1520,8 +1520,8 @@ static void ov62_0223B7C0(UnkStruct_0208C06C *param0) v1 = &v0->unk_234[v3]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 12, 6, 8, 4, 14, v2); - BGL_FillWindow(v1, 0x0); + Window_Add(param0->unk_14.unk_10, v1, 6, 12, 6, 8, 4, 14, v2); + Window_FillTilemap(v1, 0x0); v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 34); @@ -1530,7 +1530,7 @@ static void ov62_0223B7C0(UnkStruct_0208C06C *param0) Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v5, v6, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); } - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v5); } } @@ -1539,8 +1539,8 @@ static void ov62_0223B840(UnkStruct_0208C06C *param0) { UnkStruct_ov62_02239DBC *v0 = param0->unk_860; - sub_0201ACF4(&v0->unk_234[0]); - BGL_DeleteWindow(&v0->unk_234[0]); + Window_ClearAndCopyToVRAM(&v0->unk_234[0]); + Window_Remove(&v0->unk_234[0]); } static void ov62_0223B860(UnkStruct_0208C06C *param0) @@ -1549,8 +1549,8 @@ static void ov62_0223B860(UnkStruct_0208C06C *param0) int v1; for (v1 = 0; v1 < 2; v1++) { - sub_0201ACF4(&v0->unk_234[v1]); - BGL_DeleteWindow(&v0->unk_234[v1]); + Window_ClearAndCopyToVRAM(&v0->unk_234[v1]); + Window_Remove(&v0->unk_234[v1]); } } @@ -1573,8 +1573,8 @@ static void ov62_0223B888(UnkStruct_0208C06C *param0) v1 = &v0->unk_1B4[v3]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 2, Unk_ov62_02248D50[v3][0], Unk_ov62_02248D50[v3][1], Unk_ov62_02248D50[v3][2], Unk_ov62_02248D50[v3][3], 14, v2); - BGL_FillWindow(v1, 0x0); + Window_Add(param0->unk_14.unk_10, v1, 2, Unk_ov62_02248D50[v3][0], Unk_ov62_02248D50[v3][1], Unk_ov62_02248D50[v3][2], Unk_ov62_02248D50[v3][3], 14, v2); + Window_FillTilemap(v1, 0x0); if (v3 == 0) { v7 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 310 + v0->unk_380.unk_00); @@ -1587,7 +1587,7 @@ static void ov62_0223B888(UnkStruct_0208C06C *param0) Strbuf_Free(v7); } - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); v2 += (Unk_ov62_02248D50[v3][2] * Unk_ov62_02248D50[v3][3]); } } @@ -1599,8 +1599,8 @@ static void ov62_0223B958(UnkStruct_0208C06C *param0) int v2; for (v2 = 0; v2 < NELEMS(Unk_ov62_02248D50); v2++) { - sub_0201ACF4(&v0->unk_1B4[v2]); - BGL_DeleteWindow(&v0->unk_1B4[v2]); + Window_ClearAndCopyToVRAM(&v0->unk_1B4[v2]); + Window_Remove(&v0->unk_1B4[v2]); } } @@ -1632,7 +1632,7 @@ static BOOL ov62_0223B980(UnkStruct_0208C06C *param0) sub_0208B9E0(param0->unk_6F4, 0); ov62_0223ABE4(param0); ov62_0223ABBC(param0); - sub_02019EBC(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); ov62_02231560(&v0->unk_1A4, &v0->unk_1A8, (GX_BLEND_PLANEMASK_BG3), (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ), (GX_BLEND_PLANEMASK_BG3), (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ), 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); param0->unk_08++; @@ -1680,7 +1680,7 @@ static BOOL ov62_0223B980(UnkStruct_0208C06C *param0) sub_0208B9E0(param0->unk_6F0, 0); sub_0208BA08(param0->unk_6F0, 0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); - sub_02019EBC(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); ov62_02234540(param0, 0); param0->unk_08 = 7; @@ -1716,7 +1716,7 @@ static BOOL ov62_0223B980(UnkStruct_0208C06C *param0) sub_0208B9E0(param0->unk_6F0, 0); sub_0208BA08(param0->unk_6F0, 0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); - sub_02019EBC(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); ov62_02234540(param0, 0); param0->unk_08++; @@ -1871,7 +1871,7 @@ static BOOL ov62_0223BFB4(UnkStruct_0208C06C *param0) sub_0208B9E0(param0->unk_6F0, 0); sub_0208BA08(param0->unk_6F0, 0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); - sub_02019EBC(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); ov62_02234540(param0, 0); param0->unk_08++; case 1: @@ -2008,7 +2008,7 @@ static BOOL ov62_0223C424(UnkStruct_0208C06C *param0) ov62_0223AFEC(param0); ov62_0223AD7C(param0); - sub_02019EBC(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); ov62_0223ABE4(param0); ov62_0223B840(param0); @@ -2085,7 +2085,7 @@ static BOOL ov62_0223C63C(UnkStruct_0208C06C *param0) v0->unk_2F64 = 1; - sub_02019EBC(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); ov62_02231560(&v0->unk_1A4, &v0->unk_1A8, (GX_BLEND_PLANEMASK_BG3), (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ), (GX_BLEND_PLANEMASK_BG3), (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ), 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); @@ -2135,7 +2135,7 @@ static BOOL ov62_0223C79C(UnkStruct_0208C06C *param0) param0->unk_08++; case 2: if (ov62_022315E0(&v0->unk_1A4, &v0->unk_1A8, 1, 1)) { - sub_02019EBC(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); sub_0200710C(param0->unk_14.unk_00, 3, param0->unk_14.unk_10, 3, 0, 0, 0, 102); @@ -2209,10 +2209,10 @@ static BOOL ov62_0223C948(UnkStruct_0208C06C *param0) ov62_02231688(&v0->unk_1AC); ov62_0223146C(param0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); param0->unk_08++; break; default: diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index d119c536ad..f046762e9c 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -339,15 +339,15 @@ static void ov62_0223CF2C (UnkStruct_0208C06C * param0) for (v3 = 0; v3 < 2; v3++) { v1 = &v0->unk_84[v3]; - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, Unk_ov62_02248EA0[v3][0], Unk_ov62_02248EA0[v3][1], Unk_ov62_02248EA0[v3][2], Unk_ov62_02248EA0[v3][3], 14, v2); + Window_Add(param0->unk_14.unk_10, v1, 6, Unk_ov62_02248EA0[v3][0], Unk_ov62_02248EA0[v3][1], Unk_ov62_02248EA0[v3][2], Unk_ov62_02248EA0[v3][3], 14, v2); v2 += (Unk_ov62_02248EA0[v3][2] * Unk_ov62_02248EA0[v3][3]); - BGL_FillWindow(v1, 0x0); + Window_FillTilemap(v1, 0x0); v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 80 + v3); v4 = ov62_0223429C(v1, v5); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v5, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v5); } } @@ -359,8 +359,8 @@ static void ov62_0223CFE0 (UnkStruct_0208C06C * param0) int v2; for (v2 = 0; v2 < 2; v2++) { - sub_0201ACF4(&v0->unk_84[v2]); - BGL_DeleteWindow(&v0->unk_84[v2]); + Window_ClearAndCopyToVRAM(&v0->unk_84[v2]); + Window_Remove(&v0->unk_84[v2]); } } @@ -386,20 +386,20 @@ static void ov62_0223D004 (UnkStruct_0208C06C * param0) Window_Init(v1); if (v0->unk_1C == 0) { - BGL_AddWindow(param0->unk_14.unk_10, v1, 2, Unk_ov62_02248EC0[v3][0], Unk_ov62_02248EC0[v3][1], Unk_ov62_02248EC0[v3][2], Unk_ov62_02248EC0[v3][3], 14, v2); + Window_Add(param0->unk_14.unk_10, v1, 2, Unk_ov62_02248EC0[v3][0], Unk_ov62_02248EC0[v3][1], Unk_ov62_02248EC0[v3][2], Unk_ov62_02248EC0[v3][3], 14, v2); v2 += (Unk_ov62_02248EC0[v3][2] * Unk_ov62_02248EC0[v3][3]); } else { - BGL_AddWindow(param0->unk_14.unk_10, v1, 2, Unk_ov62_02248EE0[v3][0], Unk_ov62_02248EE0[v3][1], Unk_ov62_02248EE0[v3][2], Unk_ov62_02248EE0[v3][3], 14, v2); + Window_Add(param0->unk_14.unk_10, v1, 2, Unk_ov62_02248EE0[v3][0], Unk_ov62_02248EE0[v3][1], Unk_ov62_02248EE0[v3][2], Unk_ov62_02248EE0[v3][3], 14, v2); v2 += (Unk_ov62_02248EE0[v3][2] * Unk_ov62_02248EE0[v3][3]); } - BGL_FillWindow(v1, 0x0); + Window_FillTilemap(v1, 0x0); v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 67); v4 = 0; Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v5, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v5); } } @@ -421,8 +421,8 @@ static void ov62_0223D100 (UnkStruct_0208C06C * param0) } for (v3 = 0; v3 < v6; v3++) { - sub_0201ACF4(&v0->unk_24[v3]); - BGL_DeleteWindow(&v0->unk_24[v3]); + Window_ClearAndCopyToVRAM(&v0->unk_24[v3]); + Window_Remove(&v0->unk_24[v3]); } } @@ -555,7 +555,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) add r0, r4, #0 add r0, #0x24 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap ldr r0, [r4, #0x1c] cmp r0, #0 ldr r0, [r5, #0x4c] @@ -595,13 +595,13 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) bl Text_AddPrinterWithParamsAndColor add r0, r4, #0 add r0, #0x24 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r0, r7, #0 bl Strbuf_Free add r0, r4, #0 add r0, #0x34 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap ldr r0, [r4, #0x1c] cmp r0, #0 ldr r0, [r5, #0x48] @@ -629,7 +629,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) bl Text_AddPrinterWithParamsAndColor add r0, r4, #0 add r0, #0x34 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r0, r7, #0 bl Strbuf_Free ldr r0, = 0x88C @@ -770,7 +770,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) bl Text_AddPrinterWithParamsAndColor add r4, #0x34 add r0, r4, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r0, r7, #0 bl Strbuf_Free ldr r0, [sp, #0x1c] @@ -904,10 +904,10 @@ static BOOL ov62_0223D5A4 (UnkStruct_0208C06C * param0) ov62_0223D518(v0); v0->unk_744 = param0->unk_14.unk_34; - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_022315C8(&v0->unk_00, &v0->unk_04, 0); v0->unk_DC = sub_02023FCC(Unk_ov62_02248E94, NELEMS(Unk_ov62_02248E94), ov62_0223D540, param0, 102); @@ -936,15 +936,15 @@ static BOOL ov62_0223D644 (UnkStruct_0208C06C * param0) ov62_0223D424(param0); ov62_02234540(param0, 0); - BGL_SetPriority(0, 1); - BGL_SetPriority(1, 3); - BGL_SetPriority(2, 0); - BGL_SetPriority(3, 1); + Bg_SetPriority(0, 1); + Bg_SetPriority(1, 3); + Bg_SetPriority(2, 0); + Bg_SetPriority(3, 1); - BGL_SetPriority(4, 1); - BGL_SetPriority(5, 3); - BGL_SetPriority(6, 0); - BGL_SetPriority(7, 2); + Bg_SetPriority(4, 1); + Bg_SetPriority(5, 3); + Bg_SetPriority(6, 0); + Bg_SetPriority(7, 2); ov62_0223376C(param0, 0); sub_0208B9E0(param0->unk_6F0, 0); @@ -1057,10 +1057,10 @@ static BOOL ov62_0223D744 (UnkStruct_0208C06C * param0) ov62_0223146C(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_0223376C(param0, 1); param0->unk_08++; break; @@ -1207,10 +1207,10 @@ static BOOL ov62_0223DD44 (UnkStruct_0208C06C * param0) ov62_02231688(&v0->unk_08); ov62_0223146C(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_0223376C(param0, 1); param0->unk_08++; break; diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c index 55e90c80ea..c803e574b1 100644 --- a/src/overlay062/ov62_0223DFA8.c +++ b/src/overlay062/ov62_0223DFA8.c @@ -276,9 +276,9 @@ static void ov62_0223E0FC (UnkStruct_0208C06C * param0, int param1, int param2) v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); } - BGL_FillWindow(v1, 0xCC); + Window_FillTilemap(v1, 0xCC); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v0); } @@ -293,8 +293,8 @@ static BOOL ov62_0223E22C (UnkStruct_0208C06C * param0) switch (param0->unk_08) { case 0: - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); if (v0->unk_10 == 0) { ov62_0223427C(&v0->unk_220, 0); @@ -387,8 +387,8 @@ static BOOL ov62_0223E460 (UnkStruct_0208C06C * param0) case 1: if (ov62_022315E0(&v0->unk_00, &v0->unk_04, 1, 2)) { ov62_02240A24(param0); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); param0->unk_08++; } break; @@ -426,7 +426,7 @@ static BOOL ov62_0223E510 (UnkStruct_0208C06C * param0) ov62_02231664(&v0->unk_08, 1); if (ov62_022315E0(&v0->unk_00, &v0->unk_04, 1, 2)) { - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); ov62_0223E0FC(param0, 278, 0); ov62_022342BC(param0); param0->unk_08++; @@ -518,10 +518,10 @@ static BOOL ov62_0223E510 (UnkStruct_0208C06C * param0) sub_02003A2C(param0->unk_14.unk_14, 2, 0xC, 16, param0->unk_14.unk_44); ov62_0222FB44(param0, 1, 1, param0->unk_10); ov62_0222FB60(param0, 5); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); Heap_FreeToHeap(v0); if (sub_0202F250() == 1) { @@ -575,8 +575,8 @@ static BOOL ov62_0223E8BC (UnkStruct_0208C06C * param0) switch (param0->unk_08) { case 0: - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); param0->unk_08++; @@ -666,8 +666,8 @@ static BOOL ov62_0223EB28 (UnkStruct_0208C06C * param0) switch (param0->unk_08) { case 0: - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); param0->unk_08++; @@ -842,11 +842,11 @@ static void ov62_0223EE88 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C } Window_Init(&v2); - BGL_AddFramelessWindow(param1->unk_14.unk_10, &v2, 20, 2, 0, 0); + Window_AddToTopLeftCorner(param1->unk_14.unk_10, &v2, 20, 2, 0, 0); Text_AddPrinterWithParamsAndColor(&v2, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 13, 0), NULL); sub_02012BE0(param0->unk_0C, param0->unk_10, &v2, 102); Strbuf_Free(v0); - BGL_DeleteWindow(&v2); + Window_Remove(&v2); } static void ov62_0223EF60 (UnkStruct_0208C06C * param0) @@ -922,8 +922,8 @@ static void ov62_0223F124 (UnkStruct_0208C06C * param0) UnkStruct_ov62_0223E01C * v1 = param0->unk_860; for (v0 = 0; v0 < v1->unk_1FB8; v0++) { - sub_0201ACF4(&v1->unk_14[v0]); - BGL_DeleteWindow(&v1->unk_14[v0]); + Window_ClearAndCopyToVRAM(&v1->unk_14[v0]); + Window_Remove(&v1->unk_14[v0]); } v1->unk_1FB8 = 0; @@ -935,8 +935,8 @@ static void ov62_0223F160 (UnkStruct_0208C06C * param0) UnkStruct_ov62_0223E01C * v1 = param0->unk_860; for (v0 = 0; v0 < v1->unk_1FB4; v0++) { - sub_0201ACF4(&v1->unk_94[v0]); - BGL_DeleteWindow(&v1->unk_94[v0]); + Window_ClearAndCopyToVRAM(&v1->unk_94[v0]); + Window_Remove(&v1->unk_94[v0]); } v1->unk_1FB4 = 0; @@ -958,10 +958,10 @@ static BOOL ov62_0223F19C (UnkStruct_0208C06C * param0) v0->unk_0C = 2; } - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_022315C8(&v0->unk_00, &v0->unk_04, 0); ov62_0222FB60(param0, 1); @@ -983,14 +983,14 @@ static BOOL ov62_0223F218 (UnkStruct_0208C06C * param0) sub_02003A2C(param0->unk_14.unk_14, 1, 0x2, v0->unk_08, param0->unk_14.unk_44); break; case 1: - BGL_SetPriority(0, 1); - BGL_SetPriority(1, 3); - BGL_SetPriority(2, 0); - BGL_SetPriority(3, 1); - BGL_SetPriority(4, 1); - BGL_SetPriority(5, 3); - BGL_SetPriority(6, 0); - BGL_SetPriority(7, 2); + Bg_SetPriority(0, 1); + Bg_SetPriority(1, 3); + Bg_SetPriority(2, 0); + Bg_SetPriority(3, 1); + Bg_SetPriority(4, 1); + Bg_SetPriority(5, 3); + Bg_SetPriority(6, 0); + Bg_SetPriority(7, 2); ov62_0223376C(param0, 0); sub_0208B9E0(param0->unk_6F0, 0); param0->unk_08++; @@ -1134,10 +1134,10 @@ static BOOL ov62_0223F348 (UnkStruct_0208C06C * param0) sub_02003A2C(param0->unk_14.unk_14, 2, 0xC, 16, param0->unk_14.unk_44); ov62_0222FB44(param0, 1, 1, param0->unk_10); ov62_0222FB60(param0, 5); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); Heap_FreeToHeap(v0); } else { sub_02003A2C(param0->unk_14.unk_14, 1, 0x2, v0->unk_08, param0->unk_14.unk_44); @@ -1167,21 +1167,21 @@ static void ov62_0223F65C (UnkStruct_0208C06C * param0) v4 = &v0->unk_14[0]; Window_Init(v4); - BGL_AddWindow(param0->unk_14.unk_10, v4, 2, 3, 3, 20, 4, 14, v2); - BGL_FillWindow(v4, 0x0); + Window_Add(param0->unk_14.unk_10, v4, 2, 3, 3, 20, 4, 14, v2); + Window_FillTilemap(v4, 0x0); v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v5[v0->unk_0C]); Text_AddPrinterWithParamsAndColor(v4, FONT_SYSTEM, v3, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v4); + Window_ScheduleCopyToVRAM(v4); Strbuf_Free(v3); v2 = 256; v4 = &v0->unk_94[0]; Window_Init(v4); - BGL_AddWindow(param0->unk_14.unk_10, v4, 6, 11, 6, 10, 4, 14, v2); - BGL_FillWindow(v4, 0x0); + Window_Add(param0->unk_14.unk_10, v4, 6, 11, 6, 10, 4, 14, v2); + Window_FillTilemap(v4, 0x0); v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 95); @@ -1190,7 +1190,7 @@ static void ov62_0223F65C (UnkStruct_0208C06C * param0) Text_AddPrinterWithParamsAndColor(v4, FONT_SYSTEM, v3, v6, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); } - sub_0201A9A4(v4); + Window_ScheduleCopyToVRAM(v4); Strbuf_Free(v3); v0->unk_1FB4 = 1; @@ -1345,6 +1345,7 @@ static BOOL ov62_0223F984 (UnkStruct_0208C06C * param0) return 0; } +// clang-format off asm static BOOL ov62_0223FB74 (UnkStruct_0208C06C * param0) { push {r3, r4, r5, lr} @@ -1456,16 +1457,16 @@ asm static BOOL ov62_0223FB74 (UnkStruct_0208C06C * param0) bl ov62_0222FB60 ldr r0, [r5, #0x24] mov r1, #2 - bl sub_02019EBC + bl Bg_ClearTilemap ldr r0, [r5, #0x24] mov r1, #6 - bl sub_02019EBC + bl Bg_ClearTilemap ldr r0, [r5, #0x24] mov r1, #3 - bl sub_02019EBC + bl Bg_ClearTilemap ldr r0, [r5, #0x24] mov r1, #7 - bl sub_02019EBC + bl Bg_ClearTilemap add r0, r4, #0 bl Heap_FreeToHeap b _0223FCC0 @@ -1496,6 +1497,7 @@ asm static BOOL ov62_0223FB74 (UnkStruct_0208C06C * param0) mov r0, #0 pop {r3, r4, r5, pc} } +// clang-format on static BOOL ov62_0223FCC4 (UnkStruct_0208C06C * param0) { @@ -1761,7 +1763,7 @@ static void ov62_022402FC (UnkStruct_0208C06C * param0, int param1, BOOL param2) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 2, 1, 19, 30, 4, 14, 300); + Window_Add(param0->unk_14.unk_10, v1, 2, 1, 19, 30, 4, 14, 300); if (param1 == 100) { StringTemplate * v3; @@ -1783,12 +1785,13 @@ static void ov62_022402FC (UnkStruct_0208C06C * param0, int param1, BOOL param2) v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); } - BGL_FillWindow(v1, 0xCC); + Window_FillTilemap(v1, 0xCC); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v0); } +// clang-format off asm static BOOL ov62_022403F8 (UnkStruct_0208C06C * param0) { push {r4, r5, r6, lr} @@ -1891,10 +1894,10 @@ asm static BOOL ov62_022403F8 (UnkStruct_0208C06C * param0) bl ov62_02234540 ldr r0, [r4, #0x24] mov r1, #3 - bl sub_02019EBC + bl Bg_ClearTilemap ldr r0, [r4, #0x24] mov r1, #7 - bl sub_02019EBC + bl Bg_ClearTilemap ldr r0, [r4, #8] add r0, r0, #1 str r0, [r4, #8] @@ -1929,10 +1932,10 @@ asm static BOOL ov62_022403F8 (UnkStruct_0208C06C * param0) bl ov62_02231B8C ldr r0, [r4, #0x24] mov r1, #2 - bl sub_02019EBC + bl Bg_ClearTilemap ldr r0, [r4, #0x24] mov r1, #6 - bl sub_02019EBC + bl Bg_ClearTilemap mov r0, #4 mov r1, #0 bl GXLayers_EngineBToggleLayers @@ -2255,10 +2258,10 @@ asm static BOOL ov62_022403F8 (UnkStruct_0208C06C * param0) bl ov62_02234540 ldr r0, [r4, #0x24] mov r1, #3 - bl sub_02019EBC + bl Bg_ClearTilemap ldr r0, [r4, #0x24] mov r1, #7 - bl sub_02019EBC + bl Bg_ClearTilemap ldr r0, [r4, #8] add r0, r0, #1 str r0, [r4, #8] @@ -2316,13 +2319,14 @@ asm static BOOL ov62_022403F8 (UnkStruct_0208C06C * param0) add sp, #0x10 pop {r4, r5, r6, pc} } +// clang-format on static void ov62_0224088C (UnkStruct_0208C06C * param0) { UnkStruct_ov62_0223E01C * v0 = param0->unk_860; - sub_0201ACF4(&v0->unk_94[0]); - BGL_DeleteWindow(&v0->unk_94[0]); + Window_ClearAndCopyToVRAM(&v0->unk_94[0]); + Window_Remove(&v0->unk_94[0]); } static void ov62_022408A8 (UnkStruct_0208C06C * param0, int param1) @@ -2333,13 +2337,13 @@ static void ov62_022408A8 (UnkStruct_0208C06C * param0, int param1) int v3; v1 = &v0->unk_94[0]; - BGL_FillWindow(v1, 0x0); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); v3 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov62_02240900 (UnkStruct_0208C06C * param0) @@ -2351,7 +2355,7 @@ static void ov62_02240900 (UnkStruct_0208C06C * param0) v1 = &v0->unk_94[0]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 8, 3, 16, 2, 14, v2); + Window_Add(param0->unk_14.unk_10, v1, 6, 8, 3, 16, 2, 14, v2); ov62_022408A8(param0, 121 + v0->unk_10); } @@ -2366,39 +2370,39 @@ static void ov62_02240944 (UnkStruct_0208C06C * param0) v1 = &v0->unk_94[0]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); - BGL_FillWindow(v1, 0x0); + Window_Add(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130); v4 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); v3 += (10 * 2); v1 = &v0->unk_94[1]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); - BGL_FillWindow(v1, 0x0); + Window_Add(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131); v4 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov62_02240A24 (UnkStruct_0208C06C * param0) { UnkStruct_ov62_0223E01C * v0 = param0->unk_860; - sub_0201ACF4(&v0->unk_94[0]); - BGL_DeleteWindow(&v0->unk_94[0]); - sub_0201ACF4(&v0->unk_94[1]); - BGL_DeleteWindow(&v0->unk_94[1]); + Window_ClearAndCopyToVRAM(&v0->unk_94[0]); + Window_Remove(&v0->unk_94[0]); + Window_ClearAndCopyToVRAM(&v0->unk_94[1]); + Window_Remove(&v0->unk_94[1]); } static void ov62_02240A50 (u32 param0, u32 param1, void * param2) diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index b8af98444e..b99536366f 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -627,8 +627,8 @@ static void ov62_022417C0 (UnkStruct_0208C06C * param0, int param1) v11 = &v0->unk_614[v7]; Window_Init(v11); - BGL_AddWindow(param0->unk_14.unk_10, v11, 2, v3[v7][0], v3[v7][1], v3[v7][2], v3[v7][3], 14, v9); - BGL_FillWindow(v11, 0x0); + Window_Add(param0->unk_14.unk_10, v11, 2, v3[v7][0], v3[v7][1], v3[v7][2], v3[v7][3], 14, v9); + Window_FillTilemap(v11, 0x0); v10 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v4[v7]); v9 += v3[v7][2] * v3[v7][3]; @@ -638,7 +638,7 @@ static void ov62_022417C0 (UnkStruct_0208C06C * param0, int param1) } Text_AddPrinterWithParamsAndColor(v11, FONT_SYSTEM, v10, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v11); + Window_ScheduleCopyToVRAM(v11); Strbuf_Free(v10); } } @@ -652,7 +652,7 @@ static void ov62_022418DC (UnkStruct_0208C06C * param0, int param1) int v3; v1 = &v0->unk_614[3]; - BGL_FillWindow(v1, 0x0); + Window_FillTilemap(v1, 0x0); if (param1 == 0xff) { v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 125); @@ -667,7 +667,7 @@ static void ov62_022418DC (UnkStruct_0208C06C * param0, int param1) } Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v2); } @@ -679,7 +679,7 @@ static void ov62_02241954 (UnkStruct_0208C06C * param0, int param1) u16 v3[255]; v1 = &v0->unk_614[4]; - BGL_FillWindow(v1, 0x0); + Window_FillTilemap(v1, 0x0); if (param1 == 0xffff) { v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 125); @@ -690,7 +690,7 @@ static void ov62_02241954 (UnkStruct_0208C06C * param0, int param1) } Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v2); } @@ -703,7 +703,7 @@ static void ov62_022419D4 (UnkStruct_0208C06C * param0, int param1, int param2) StringTemplate * v4; v1 = &v0->unk_614[5]; - BGL_FillWindow(v1, 0x0); + Window_FillTilemap(v1, 0x0); if ((param1 == 0xff) && (param2 == 0xff)) { v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 125); @@ -727,7 +727,7 @@ static void ov62_022419D4 (UnkStruct_0208C06C * param0, int param1, int param2) } Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v2); } @@ -769,8 +769,8 @@ static void ov62_02241AA4 (UnkStruct_0208C06C * param0, int param1) v11 = &v0->unk_6D4[v7]; Window_Init(v11); - BGL_AddWindow(param0->unk_14.unk_10, v11, 6, v3[v7][0], v3[v7][1], v3[v7][2], v3[v7][3], 14, v9); - BGL_FillWindow(v11, 0x0); + Window_Add(param0->unk_14.unk_10, v11, 6, v3[v7][0], v3[v7][1], v3[v7][2], v3[v7][3], 14, v9); + Window_FillTilemap(v11, 0x0); v10 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v4[v7]); v9 += v3[v7][2] * v3[v7][3]; @@ -780,7 +780,7 @@ static void ov62_02241AA4 (UnkStruct_0208C06C * param0, int param1) } Text_AddPrinterWithParamsAndColor(v11, FONT_SYSTEM, v10, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v11); + Window_ScheduleCopyToVRAM(v11); Strbuf_Free(v10); } } @@ -792,8 +792,8 @@ static void ov62_02241BB8 (UnkStruct_0208C06C * param0) UnkStruct_ov62_02241204 * v1 = param0->unk_860; for (v0 = 0; v0 < v1->unk_794; v0++) { - sub_0201ACF4(&v1->unk_614[v0]); - BGL_DeleteWindow(&v1->unk_614[v0]); + Window_ClearAndCopyToVRAM(&v1->unk_614[v0]); + Window_Remove(&v1->unk_614[v0]); } v1->unk_794 = 0; @@ -805,8 +805,8 @@ static void ov62_02241BF8 (UnkStruct_0208C06C * param0) UnkStruct_ov62_02241204 * v1 = param0->unk_860; for (v0 = 0; v0 < v1->unk_798; v0++) { - sub_0201ACF4(&v1->unk_6D4[v0]); - BGL_DeleteWindow(&v1->unk_6D4[v0]); + Window_ClearAndCopyToVRAM(&v1->unk_6D4[v0]); + Window_Remove(&v1->unk_6D4[v0]); } v1->unk_798 = 0; @@ -822,19 +822,19 @@ static void ov62_02241C38 (UnkStruct_0208C06C * param0) v4 = &v0->unk_614[0]; Window_Init(v4); - BGL_AddWindow(param0->unk_14.unk_10, v4, 2, 3, 3, 20, 4, 14, v2); - BGL_FillWindow(v4, 0x0); + Window_Add(param0->unk_14.unk_10, v4, 2, 3, 3, 20, 4, 14, v2); + Window_FillTilemap(v4, 0x0); v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 126); Text_AddPrinterWithParamsAndColor(v4, FONT_SYSTEM, v3, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v4); + Window_ScheduleCopyToVRAM(v4); Strbuf_Free(v3); v2 = 256; v4 = &v0->unk_6D4[0]; Window_Init(v4); - BGL_AddWindow(param0->unk_14.unk_10, v4, 6, 11, 6, 10, 4, 14, v2); - BGL_FillWindow(v4, 0x0); + Window_Add(param0->unk_14.unk_10, v4, 6, 11, 6, 10, 4, 14, v2); + Window_FillTilemap(v4, 0x0); v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 95); { @@ -842,7 +842,7 @@ static void ov62_02241C38 (UnkStruct_0208C06C * param0) Text_AddPrinterWithParamsAndColor(v4, FONT_SYSTEM, v3, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); } - sub_0201A9A4(v4); + Window_ScheduleCopyToVRAM(v4); Strbuf_Free(v3); v0->unk_798 = 1; @@ -959,10 +959,10 @@ static BOOL ov62_02241ECC (UnkStruct_0208C06C * param0) ov62_0222FB44(param0, 1, 1, param0->unk_10); ov62_0222FB60(param0, 5); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); Heap_FreeToHeap(v0); } else { sub_02003A2C(param0->unk_14.unk_14, 1, 0x2, v0->unk_08, param0->unk_14.unk_44); @@ -1256,10 +1256,10 @@ asm static void ov62_022422C0 (UnkStruct_0208C06C * param0) ldr r0, [sp, #0x14] ldr r3, [sp, #0x24] ldr r0, [r0, #0x24] - bl BGL_AddWindow + bl Window_Add add r0, r4, #0 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap ldr r0, [sp, #0x14] add r1, r7, #0 ldr r0, [r0, #0x48] @@ -1311,7 +1311,7 @@ asm static void ov62_022422C0 (UnkStruct_0208C06C * param0) bl Text_AddPrinterWithParamsAndColor _022423A0: add r0, r4, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM ldr r0, [sp, #0x2c] bl Strbuf_Free ldr r0, [sp, #0x1c] @@ -1339,8 +1339,8 @@ static void ov62_022423D8 (UnkStruct_0208C06C * param0) for (v0 = 0; v0 < 9; v0++) { v1 = &v2->unk_6D4[v0]; - sub_0201ACF4(v1); - BGL_DeleteWindow(v1); + Window_ClearAndCopyToVRAM(v1); + Window_Remove(v1); } } @@ -2191,8 +2191,8 @@ static BOOL ov62_02243514 (UnkStruct_0208C06C * param0) ov62_02245D50(param0); ov62_02244BE4(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); param0->unk_08++; } @@ -2209,8 +2209,8 @@ static BOOL ov62_02243514 (UnkStruct_0208C06C * param0) ov62_02244CA4(param0); ov62_02231B8C(param0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); param0->unk_08++; @@ -2367,8 +2367,8 @@ static BOOL ov62_0224391C (UnkStruct_0208C06C * param0) switch (param0->unk_08) { case 0: - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); if (v0->unk_1CC == 0) { ov62_0223427C(&v0->unk_10C, 0); @@ -2605,10 +2605,10 @@ static BOOL ov62_02243DC8 (UnkStruct_0208C06C * param0) memset(v0, 0, sizeof(UnkStruct_ov62_02241204)); param0->unk_860 = v0; - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_022315C8(&v0->unk_00, &v0->unk_04, 0); ov62_0222FB60(param0, 1); @@ -2634,14 +2634,14 @@ static BOOL ov62_02243E20 (UnkStruct_0208C06C * param0) ov62_02234540(param0, 1); ov62_02231454(param0); ov62_02234540(param0, 0); - BGL_SetPriority(0, 0); - BGL_SetPriority(1, 3); - BGL_SetPriority(2, 0); - BGL_SetPriority(3, 2); - BGL_SetPriority(4, 0); - BGL_SetPriority(5, 3); - BGL_SetPriority(6, 1); - BGL_SetPriority(7, 2); + Bg_SetPriority(0, 0); + Bg_SetPriority(1, 3); + Bg_SetPriority(2, 0); + Bg_SetPriority(3, 2); + Bg_SetPriority(4, 0); + Bg_SetPriority(5, 3); + Bg_SetPriority(6, 1); + Bg_SetPriority(7, 2); param0->unk_08++; break; default: @@ -2809,10 +2809,10 @@ static BOOL ov62_02244180 (UnkStruct_0208C06C * param0) ov62_0222FB44(param0, 1, 1, param0->unk_10); ov62_0222FB60(param0, 5); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); Heap_FreeToHeap(v0); } else { sub_02003A2C(param0->unk_14.unk_14, 3, 0xC, v0->unk_08, param0->unk_14.unk_44); @@ -2951,14 +2951,14 @@ static BOOL ov62_022444BC (UnkStruct_0208C06C * param0) ov62_022343B8(param0, 6, 7); - BGL_SetPriority(0, 1); - BGL_SetPriority(1, 3); - BGL_SetPriority(2, 0); - BGL_SetPriority(3, 1); - BGL_SetPriority(4, 1); - BGL_SetPriority(5, 3); - BGL_SetPriority(6, 0); - BGL_SetPriority(7, 2); + Bg_SetPriority(0, 1); + Bg_SetPriority(1, 3); + Bg_SetPriority(2, 0); + Bg_SetPriority(3, 1); + Bg_SetPriority(4, 1); + Bg_SetPriority(5, 3); + Bg_SetPriority(6, 0); + Bg_SetPriority(7, 2); ov62_022443EC(param0); ov62_02245C64(param0); @@ -3092,10 +3092,10 @@ static BOOL ov62_02244720 (UnkStruct_0208C06C * param0) ov62_0222FB60(param0, 5); Heap_FreeToHeap(v0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); if (sub_0202F250() == 1) { sub_0202F22C(); @@ -3139,11 +3139,11 @@ static void ov62_022448E0 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C } Window_Init(&v2); - BGL_AddFramelessWindow(param1->unk_14.unk_10, &v2, 20, 2, 0, 0); + Window_AddToTopLeftCorner(param1->unk_14.unk_10, &v2, 20, 2, 0, 0); Text_AddPrinterWithParamsAndColor(&v2, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 13, 0), NULL); sub_02012BE0(param0->unk_0C, param0->unk_10, &v2, 102); Strbuf_Free(v0); - BGL_DeleteWindow(&v2); + Window_Remove(&v2); } static void ov62_022449B8 (UnkStruct_0208C06C * param0, int param1, BOOL param2) @@ -3155,7 +3155,7 @@ static void ov62_022449B8 (UnkStruct_0208C06C * param0, int param1, BOOL param2) ov62_022302A8(param0, 2, param2); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 2, 1, 19, 30, 4, 14, 300); + Window_Add(param0->unk_14.unk_10, v1, 2, 1, 19, 30, 4, 14, 300); if (param1 == 100) { StringTemplate * v3; @@ -3177,9 +3177,9 @@ static void ov62_022449B8 (UnkStruct_0208C06C * param0, int param1, BOOL param2) v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); } - BGL_FillWindow(v1, 0xCC); + Window_FillTilemap(v1, 0xCC); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v0); } @@ -3225,9 +3225,9 @@ static void ov62_02244AB4 (UnkStruct_0208C06C * param0, int param1, int param2) v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); } - BGL_FillWindow(v1, 0xCC); + Window_FillTilemap(v1, 0xCC); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v0); } @@ -3298,8 +3298,8 @@ static BOOL ov62_02244CD4 (UnkStruct_0208C06C * param0) ov62_02245D50(param0); ov62_02244BE4(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); param0->unk_08++; } @@ -3315,8 +3315,8 @@ static BOOL ov62_02244CD4 (UnkStruct_0208C06C * param0) } ov62_02231B8C(param0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); param0->unk_08++; @@ -3357,10 +3357,10 @@ static BOOL ov62_02244CD4 (UnkStruct_0208C06C * param0) ov62_0222FB60(param0, 5); Heap_FreeToHeap(v0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); if (sub_0202F250() == 1) { sub_0202F22C(); @@ -3470,8 +3470,8 @@ static BOOL ov62_02245018 (UnkStruct_0208C06C * param0) ov62_0223371C(param0); ov62_022443EC(param0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); @@ -3485,14 +3485,14 @@ static BOOL ov62_02245018 (UnkStruct_0208C06C * param0) } if (ov62_022315E0(&v0->unk_00, &v0->unk_04, 0, 1)) { - BGL_SetPriority(0, 1); - BGL_SetPriority(1, 3); - BGL_SetPriority(2, 0); - BGL_SetPriority(3, 1); - BGL_SetPriority(4, 1); - BGL_SetPriority(5, 3); - BGL_SetPriority(6, 0); - BGL_SetPriority(7, 2); + Bg_SetPriority(0, 1); + Bg_SetPriority(1, 3); + Bg_SetPriority(2, 0); + Bg_SetPriority(3, 1); + Bg_SetPriority(4, 1); + Bg_SetPriority(5, 3); + Bg_SetPriority(6, 0); + Bg_SetPriority(7, 2); v0->unk_608[0] = sub_02023FCC(Unk_ov62_0224919C, NELEMS(Unk_ov62_0224919C), ov62_022457A0, param0, 102); v0->unk_608[1] = sub_02023FCC(Unk_ov62_0224915C, NELEMS(Unk_ov62_0224915C), ov62_02245800, param0, 102); @@ -3672,10 +3672,10 @@ static BOOL ov62_022454D8 (UnkStruct_0208C06C * param0) ov62_0222FB60(param0, 5); Heap_FreeToHeap(v0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); } else { sub_02003A2C(param0->unk_14.unk_14, 1, 0x2, v0->unk_08, param0->unk_14.unk_44); sub_02003A2C(param0->unk_14.unk_14, 3, 0xC, v0->unk_08, param0->unk_14.unk_44); @@ -3691,8 +3691,8 @@ static void ov62_022455C4 (UnkStruct_0208C06C * param0) { UnkStruct_ov62_02241204 * v0 = param0->unk_860; - sub_0201ACF4(&v0->unk_6D4[0]); - BGL_DeleteWindow(&v0->unk_6D4[0]); + Window_ClearAndCopyToVRAM(&v0->unk_6D4[0]); + Window_Remove(&v0->unk_6D4[0]); } static void ov62_022455E4 (UnkStruct_0208C06C * param0, int param1) @@ -3703,12 +3703,12 @@ static void ov62_022455E4 (UnkStruct_0208C06C * param0, int param1) int v3; v1 = &v0->unk_6D4[0]; - BGL_FillWindow(v1, 0x0); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); v3 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov62_02245640 (UnkStruct_0208C06C * param0) @@ -3720,7 +3720,7 @@ static void ov62_02245640 (UnkStruct_0208C06C * param0) v1 = &v0->unk_6D4[0]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 8, 3, 16, 2, 14, v2); + Window_Add(param0->unk_14.unk_10, v1, 6, 8, 3, 16, 2, 14, v2); ov62_022455E4(param0, 121 + v0->unk_1CC); } @@ -3735,40 +3735,40 @@ static void ov62_0224568C (UnkStruct_0208C06C * param0) v1 = &v0->unk_6D4[0]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); - BGL_FillWindow(v1, 0x0); + Window_Add(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130); v4 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); v3 += (10 * 2); v1 = &v0->unk_6D4[1]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); - BGL_FillWindow(v1, 0x0); + Window_Add(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131); v4 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov62_0224576C (UnkStruct_0208C06C * param0) { UnkStruct_ov62_02241204 * v0 = param0->unk_860; - sub_0201ACF4(&v0->unk_6D4[0]); - BGL_DeleteWindow(&v0->unk_6D4[0]); - sub_0201ACF4(&v0->unk_6D4[1]); - BGL_DeleteWindow(&v0->unk_6D4[1]); + Window_ClearAndCopyToVRAM(&v0->unk_6D4[0]); + Window_Remove(&v0->unk_6D4[0]); + Window_ClearAndCopyToVRAM(&v0->unk_6D4[1]); + Window_Remove(&v0->unk_6D4[1]); } static void ov62_022457A0 (u32 param0, u32 param1, void * param2) @@ -4227,8 +4227,8 @@ static BOOL ov62_02245ECC (UnkStruct_0208C06C * param0) ov62_02245D50(param0); ov62_02244BE4(param0); ov62_02234540(param0, 0); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); param0->unk_08++; } @@ -4294,8 +4294,8 @@ static BOOL ov62_02246090 (UnkStruct_0208C06C * param0) case 1: if (ov62_022315E0(&v0->unk_00, &v0->unk_04, 1, 2)) { ov62_0224576C(param0); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); param0->unk_08++; } break; @@ -4331,7 +4331,7 @@ static BOOL ov62_0224613C (UnkStruct_0208C06C * param0) ov62_02231664(&v0->unk_08, 1); if (ov62_022315E0(&v0->unk_00, &v0->unk_04, 1, 2)) { - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); ov62_02244AB4(param0, 278, 0); ov62_022342BC(param0); param0->unk_08++; @@ -4428,10 +4428,10 @@ static BOOL ov62_0224613C (UnkStruct_0208C06C * param0) ov62_0222FB60(param0, 5); Heap_FreeToHeap(v0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); if (sub_0202F250() == 1) { sub_0202F22C(); @@ -4453,8 +4453,8 @@ static BOOL ov62_02246428 (UnkStruct_0208C06C * param0) switch (param0->unk_08) { case 0: - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); param0->unk_08++; @@ -4531,8 +4531,8 @@ static BOOL ov62_02246640 (UnkStruct_0208C06C * param0) switch (param0->unk_08) { case 0: ov62_02231A88(param0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); param0->unk_08++; @@ -4719,9 +4719,9 @@ static void ov62_022469A0 (UnkStruct_ov62_02241204 * param0, UnkStruct_0208C06C StringTemplate_SetStrbuf(v3, 1, v9, 0, 1, GAME_LANGUAGE); StringTemplate_SetStrbuf(v3, 0, v10, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v3, v2, v1); - BGL_FillWindow(v4, 0xCC); + Window_FillTilemap(v4, 0xCC); Text_AddPrinterWithParamsAndColor(v4, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); - sub_0201A9A4(v4); + Window_ScheduleCopyToVRAM(v4); Strbuf_Free(v8); Strbuf_Free(v9); Strbuf_Free(v10); diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c index 25671b41b0..9f38009e3b 100644 --- a/src/overlay062/ov62_02247D74.c +++ b/src/overlay062/ov62_02247D74.c @@ -45,13 +45,13 @@ static void ov62_02247D74(UnkStruct_0208C06C *param0, BOOL param1) ov62_022302A8(param0, 2, param1); Window_Init(v0); - BGL_AddWindow(param0->unk_14.unk_10, v0, 2, 1, 19, 30, 4, 14, 300); + Window_Add(param0->unk_14.unk_10, v0, 2, 1, 19, 30, 4, 14, 300); } static void ov62_02247DB4(UnkStruct_0208C06C *param0) { - sub_0201ACF4(¶m0->unk_8A4); - BGL_DeleteWindow(¶m0->unk_8A4); + Window_ClearAndCopyToVRAM(¶m0->unk_8A4); + Window_Remove(¶m0->unk_8A4); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } @@ -82,9 +82,9 @@ static void ov62_02247DD8(UnkStruct_0208C06C *param0, int param1, int param2) v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); } - BGL_FillWindow(v1, 0xCC); + Window_FillTilemap(v1, 0xCC); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); Strbuf_Free(v0); } @@ -99,39 +99,39 @@ static void ov62_02247E9C(UnkStruct_0208C06C *param0) v1 = &v0->unk_10[0]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); - BGL_FillWindow(v1, 0x0); + Window_Add(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130); v4 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); v3 += (10 * 2); v1 = &v0->unk_10[1]; Window_Init(v1); - BGL_AddWindow(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); - BGL_FillWindow(v1, 0x0); + Window_Add(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); + Window_FillTilemap(v1, 0x0); v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131); v4 = ov62_0223429C(v1, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); Strbuf_Free(v2); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov62_02247F7C(UnkStruct_0208C06C *param0) { UnkStruct_ov62_02247F7C *v0 = param0->unk_860; - sub_0201ACF4(&v0->unk_10[0]); - BGL_DeleteWindow(&v0->unk_10[0]); - sub_0201ACF4(&v0->unk_10[1]); - BGL_DeleteWindow(&v0->unk_10[1]); + Window_ClearAndCopyToVRAM(&v0->unk_10[0]); + Window_Remove(&v0->unk_10[0]); + Window_ClearAndCopyToVRAM(&v0->unk_10[1]); + Window_Remove(&v0->unk_10[1]); } static BOOL ov62_02247FA8(UnkStruct_0208C06C *param0) @@ -141,10 +141,10 @@ static BOOL ov62_02247FA8(UnkStruct_0208C06C *param0) memset(v0, 0, sizeof(UnkStruct_ov62_02247F7C)); param0->unk_860 = v0; - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_022315C8(&v0->unk_00, &v0->unk_04, 0); ov62_0222FB60(param0, 1); @@ -166,14 +166,14 @@ static BOOL ov62_02247FFC(UnkStruct_0208C06C *param0) sub_02003A2C(param0->unk_14.unk_14, 1, 0x2, v0->unk_08, param0->unk_14.unk_44); break; case 1: - BGL_SetPriority(0, 0); - BGL_SetPriority(1, 3); - BGL_SetPriority(2, 0); - BGL_SetPriority(3, 2); - BGL_SetPriority(4, 0); - BGL_SetPriority(5, 3); - BGL_SetPriority(6, 1); - BGL_SetPriority(7, 2); + Bg_SetPriority(0, 0); + Bg_SetPriority(1, 3); + Bg_SetPriority(2, 0); + Bg_SetPriority(3, 2); + Bg_SetPriority(4, 0); + Bg_SetPriority(5, 3); + Bg_SetPriority(6, 1); + Bg_SetPriority(7, 2); sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_02234540(param0, 1); @@ -299,10 +299,10 @@ static BOOL ov62_02248324(UnkStruct_0208C06C *param0) param0->unk_08++; case 2: ov62_0223146C(param0); - sub_02019EBC(param0->unk_14.unk_10, 2); - sub_02019EBC(param0->unk_14.unk_10, 6); - sub_02019EBC(param0->unk_14.unk_10, 3); - sub_02019EBC(param0->unk_14.unk_10, 7); + Bg_ClearTilemap(param0->unk_14.unk_10, 2); + Bg_ClearTilemap(param0->unk_14.unk_10, 6); + Bg_ClearTilemap(param0->unk_14.unk_10, 3); + Bg_ClearTilemap(param0->unk_14.unk_10, 7); ov62_0223376C(param0, 1); param0->unk_08++; break; diff --git a/src/overlay063/ov63_0222D1C0.c b/src/overlay063/ov63_0222D1C0.c index a108794e5c..0b86d242f4 100644 --- a/src/overlay063/ov63_0222D1C0.c +++ b/src/overlay063/ov63_0222D1C0.c @@ -93,8 +93,8 @@ static void ov63_0222D31C(BgConfig *param0, int param1, const UnkStruct_ov65_022 v0.areaOver = 0; v0.mosaic = param2->unk_07; - sub_02019044(param0, param1); - sub_020183C4(param0, param1, &v0, 0); + Bg_FreeTilemapBuffer(param0, param1); + Bg_InitFromTemplate(param0, param1, &v0, 0); } static void ov63_0222D378(UnkStruct_ov63_0222D1C0 *param0, s16 param1, s16 param2) @@ -114,11 +114,11 @@ static void ov63_0222D378(UnkStruct_ov63_0222D1C0 *param0, s16 param1, s16 param param0->unk_1A = v1; ov63_0222D408(param0->unk_04, param0->unk_14, param0->unk_0C, -v0, -v1); - sub_0201C3C0(param0->unk_04, param0->unk_14); + Bg_ScheduleTilemapTransfer(param0->unk_04, param0->unk_14); } - sub_0201C63C(param0->unk_04, param0->unk_14, 0, v2); - sub_0201C63C(param0->unk_04, param0->unk_14, 3, v3); + Bg_ScheduleScroll(param0->unk_04, param0->unk_14, 0, v2); + Bg_ScheduleScroll(param0->unk_04, param0->unk_14, 3, v3); } static void ov63_0222D408(BgConfig *param0, int param1, const NNSG2dScreenData *param2, s16 param3, s16 param4) @@ -166,7 +166,7 @@ static void ov63_0222D408(BgConfig *param0, int param1, const NNSG2dScreenData * v1 -= (v3 + v1) - v7; } - sub_02019CB8(param0, param1, 0, 0, 0, 33, 25, 17); + Bg_FillTilemapRect(param0, param1, 0, 0, 0, 33, 25, 17); ov63_0222D4F8(param0, param1, v4, v5, v0, v1, param2->rawData, v2, v3, v6, v7); } @@ -183,7 +183,7 @@ static void ov63_0222D4F8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 v8 = ov63_0222D688(param9, param10); if (v8 == 0) { - sub_020198E8(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10); + Bg_CopyToTilemapRect(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10); return; } @@ -215,7 +215,7 @@ static void ov63_0222D4F8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 v6 = v9 / 32; v4 = ov63_0222D6BC(param6, v6, v7, v8, param9, param10, &v5); - sub_020198E8(param0, param1, v10, param3, v2, v3, v4, v9 % 32, param8 % 32, v5.unk_00, v5.unk_02); + Bg_CopyToTilemapRect(param0, param1, v10, param3, v2, v3, v4, v9 % 32, param8 % 32, v5.unk_00, v5.unk_02); v9 += v2; v10 += v2; diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index 06c3cc0dcf..aa120e9da2 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -885,7 +885,7 @@ static void ov64_0222E21C (UnkStruct_ov64_0222E21C * param0) static void ov64_0222E228 (UnkStruct_ov64_0222E21C * param0) { - sub_0201C2B8(param0->unk_00); + Bg_RunScheduledUpdates(param0->unk_00); sub_0201DCAC(); sub_0200A858(); } @@ -923,7 +923,7 @@ static void ov64_0222E290 (UnkStruct_ov64_0222E21C * param0, u32 param1) { int v0; - param0->unk_00 = sub_02018340(param1); + param0->unk_00 = BgConfig_New(param1); { GraphicsModes v1 = { @@ -933,13 +933,13 @@ static void ov64_0222E290 (UnkStruct_ov64_0222E21C * param0, u32 param1) GX_BG0_AS_2D, }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } for (v0 = 0; v0 < 5; v0++) { - sub_020183C4(param0->unk_00, Unk_ov64_02232258[v0], &Unk_ov64_02232390[v0], 0); - sub_02019690(Unk_ov64_02232258[v0], 32, 0, param1); - sub_02019EBC(param0->unk_00, Unk_ov64_02232258[v0]); + Bg_InitFromTemplate(param0->unk_00, Unk_ov64_02232258[v0], &Unk_ov64_02232390[v0], 0); + Bg_ClearTilesRange(Unk_ov64_02232258[v0], 32, 0, param1); + Bg_ClearTilemap(param0->unk_00, Unk_ov64_02232258[v0]); } sub_02007130(param0->unk_21C, 0, 0, 0, ((6 + 1) - 0) * 32, param1); @@ -958,7 +958,7 @@ static void ov64_0222E3AC (UnkStruct_ov64_0222E21C * param0) int v0; for (v0 = 0; v0 < 5; v0++) { - sub_02019044(param0->unk_00, Unk_ov64_02232258[v0]); + Bg_FreeTilemapBuffer(param0->unk_00, Unk_ov64_02232258[v0]); } Heap_FreeToHeap(param0->unk_00); @@ -1056,7 +1056,7 @@ static void ov64_0222E620 (UnkStruct_ov64_0222E21C * param0, const UnkStruct_ov6 sub_0200DD0C(param0->unk_00, Unk_ov64_02232258[1], (1 + 9), 8, v0, param2); sub_0200DAA4(param0->unk_00, Unk_ov64_02232258[1], 1, 9, 0, param2); Window_Init(¶m0->unk_220); - BGL_AddWindow(param0->unk_00, ¶m0->unk_220, Unk_ov64_02232258[1], 1, 0, 24, 3, 7, (((1 + 9) + (18 + 12)))); + Window_Add(param0->unk_00, ¶m0->unk_220, Unk_ov64_02232258[1], 1, 0, 24, 3, 7, ((1 + 9) + (18 + 12))); param0->unk_230 = Strbuf_Init(128, param2); param0->unk_234 = Strbuf_Init(128, param2); @@ -1066,7 +1066,7 @@ static void ov64_0222E6B4 (UnkStruct_ov64_0222E21C * param0) { Strbuf_Free(param0->unk_230); Strbuf_Free(param0->unk_234); - BGL_DeleteWindow(¶m0->unk_220); + Window_Remove(¶m0->unk_220); } static void ov64_0222E6D8 (UnkStruct_ov64_0222E21C * param0, u32 param1) @@ -1096,13 +1096,13 @@ static void ov64_0222E738 (UnkStruct_ov64_0222E21C * param0, u32 param1) Text_RemovePrinter(param0->unk_238); } - BGL_FillWindow(¶m0->unk_220, 0); + Window_FillTilemap(¶m0->unk_220, 0); MessageLoader_GetStrbuf(param0->unk_218, param1, param0->unk_234); StringTemplate_Format(param0->unk_214, param0->unk_230, param0->unk_234); param0->unk_238 = Text_AddPrinterWithParamsAndColor(¶m0->unk_220, FONT_MESSAGE, param0->unk_230, 0, 4, TEXT_SPEED_QUICK, TEXT_COLOR(15, 2, 0), NULL); - sub_0201A9A4(¶m0->unk_220); + Window_ScheduleCopyToVRAM(¶m0->unk_220); } static void ov64_0222E7C8 (UnkStruct_ov64_0222E21C * param0) @@ -1111,7 +1111,7 @@ static void ov64_0222E7C8 (UnkStruct_ov64_0222E21C * param0) Text_RemovePrinter(param0->unk_238); } - sub_0201AD10(¶m0->unk_220); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_220); } static void ov64_0222E7F8 (UnkStruct_ov64_0222E21C * param0, u64 param1) @@ -1440,7 +1440,7 @@ asm static void ov64_0222EC94 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_ ldr r0, [r0, #0] add r1, r1, #4 add r3, r2, #0 - bl BGL_AddWindow + bl Window_Add ldr r0, [sp, #0x14] add r0, #0x1c bl Window_Init @@ -1460,15 +1460,15 @@ asm static void ov64_0222EC94 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_ add r1, #0x1c mov r2, #1 mov r3, #2 - bl BGL_AddWindow + bl Window_Add ldr r0, [sp, #0x14] mov r1, #0 add r0, r0, #4 - bl BGL_FillWindow + bl Window_FillTilemap ldr r0, [sp, #0x14] mov r1, #0 add r0, #0x1c - bl BGL_FillWindow + bl Window_FillTilemap ldr r1, [sp, #0x1c] mov r0, #0x80 bl Strbuf_Init @@ -1577,8 +1577,8 @@ asm static void ov64_0222EC94 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_ static void ov64_0222EE00 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2) { Strbuf_Free(param0->unk_38); - BGL_DeleteWindow(¶m0->unk_04); - BGL_DeleteWindow(¶m0->unk_1C); + Window_Remove(¶m0->unk_04); + Window_Remove(¶m0->unk_1C); Heap_FreeToHeap(param0->unk_14); } @@ -1586,13 +1586,13 @@ static void ov64_0222EE20 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222 { ov64_0222E738(param2, 0); - sub_0201A9A4(¶m0->unk_04); - sub_020198C0(param2->unk_00, Unk_ov64_02232258[2], param0->unk_18->rawData, 0, 0, param0->unk_18->screenWidth / 8, param0->unk_18->screenHeight / 8); - sub_0201C63C(param2->unk_00, Unk_ov64_02232258[2], 0, 0); - sub_0201C63C(param2->unk_00, Unk_ov64_02232258[2], 3, 0); + Window_ScheduleCopyToVRAM(¶m0->unk_04); + Bg_LoadToTilemapRect(param2->unk_00, Unk_ov64_02232258[2], param0->unk_18->rawData, 0, 0, param0->unk_18->screenWidth / 8, param0->unk_18->screenHeight / 8); + Bg_ScheduleScroll(param2->unk_00, Unk_ov64_02232258[2], 0, 0); + Bg_ScheduleScroll(param2->unk_00, Unk_ov64_02232258[2], 3, 0); ov64_0222EF08(param0, param2); - sub_0201C3C0(param2->unk_00, Unk_ov64_02232258[2]); + Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov64_02232258[2]); } static BOOL ov64_0222EE84 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2) @@ -1625,7 +1625,7 @@ static BOOL ov64_0222EE84 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222 if (v0 == 1) { Sound_PlayEffect(1509); ov64_0222EF08(param0, param2); - sub_0201C3C0(param2->unk_00, Unk_ov64_02232258[2]); + Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov64_02232258[2]); } return 0; @@ -1649,7 +1649,7 @@ static void ov64_0222EF08 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222 v2 = 0; } - sub_02019E2C(param1->unk_00, Unk_ov64_02232258[2], Unk_ov64_022321FC[v0][0], Unk_ov64_022321FC[v0][1], 28, 4, v2); + Bg_ChangeTilemapRectPalette(param1->unk_00, Unk_ov64_02232258[2], Unk_ov64_022321FC[v0][0], Unk_ov64_022321FC[v0][1], 28, 4, v2); } } @@ -1666,12 +1666,12 @@ static void ov64_0222EF64 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222 { ov64_0222E7C8(param1); - sub_02019CB8(param1->unk_00, Unk_ov64_02232258[2], 0, 0, 0, 32, 24, 0); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[2]); - sub_02019CB8(param1->unk_00, Unk_ov64_02232258[3], 0, 0, 0, 32, 24, 0); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[3]); + Bg_FillTilemapRect(param1->unk_00, Unk_ov64_02232258[2], 0, 0, 0, 32, 24, 0); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[2]); + Bg_FillTilemapRect(param1->unk_00, Unk_ov64_02232258[3], 0, 0, 0, 32, 24, 0); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[3]); - sub_0201AD10(¶m0->unk_04); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_04); } static void ov64_0222EFBC (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222E21C * param1, u32 param2, u32 param3) @@ -1680,14 +1680,14 @@ static void ov64_0222EFBC (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222 v0 = Strbuf_Init(128, param3); - BGL_FillWindow(¶m0->unk_1C, 15); + Window_FillTilemap(¶m0->unk_1C, 15); MessageLoader_GetStrbuf(param1->unk_218, param2, v0); StringTemplate_Format(param1->unk_214, param0->unk_38, v0); param0->unk_30 = Text_AddPrinterWithParamsAndColor(¶m0->unk_1C, FONT_MESSAGE, param0->unk_38, 0, 0, param0->unk_34, TEXT_COLOR(1, 2, 0), NULL); sub_0200E060(¶m0->unk_1C, 1, (1 + 9), 8); - sub_0201A9A4(¶m0->unk_1C); + Window_ScheduleCopyToVRAM(¶m0->unk_1C); Strbuf_Free(v0); } @@ -1703,7 +1703,7 @@ static BOOL ov64_0222F038 (const UnkStruct_ov64_0222F038 * param0) static void ov64_0222F050 (UnkStruct_ov64_0222F038 * param0) { sub_0200E084(¶m0->unk_1C, 1); - sub_0201AD10(¶m0->unk_1C); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_1C); } static BOOL ov64_0222F068 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222E060 * param1) @@ -2017,11 +2017,11 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_ add r1, #0xb8 mov r2, #1 mov r3, #0xd - bl BGL_AddWindow + bl Window_Add ldr r0, [sp, #0x14] mov r1, #0 add r0, #0xb8 - bl BGL_FillWindow + bl Window_FillTilemap ldr r1, [sp, #0x18] mov r0, #0x80 bl Strbuf_Init @@ -2069,11 +2069,11 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_ add r1, #0xe4 mov r2, #1 mov r3, #0x10 - bl BGL_AddWindow + bl Window_Add ldr r0, [sp, #0x14] mov r1, #0 add r0, #0xe4 - bl BGL_FillWindow + bl Window_FillTilemap mov r0, #0 str r0, [sp, #0x1c] ldr r0, = Unk_ov64_022322E4 @@ -2129,11 +2129,11 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_ add r1, #0xc8 mov r2, #1 mov r3, #2 - bl BGL_AddWindow + bl Window_Add ldr r0, [sp, #0x14] mov r1, #0xf add r0, #0xc8 - bl BGL_FillWindow + bl Window_FillTilemap ldr r1, [sp, #0x18] mov r0, #0x80 bl Strbuf_Init @@ -2169,15 +2169,15 @@ static void ov64_0222F5F4 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 int v0; CellActor_Delete(param0->unk_104); - BGL_DeleteWindow(¶m0->unk_C4); + Window_Remove(¶m0->unk_C4); Strbuf_Free(param0->unk_D4); for (v0 = 0; v0 < 2; v0++) { sub_02013A3C(param0->unk_F0[v0]); } - BGL_DeleteWindow(¶m0->unk_E0); - BGL_DeleteWindow(¶m0->unk_B4); + Window_Remove(¶m0->unk_E0); + Window_Remove(¶m0->unk_B4); ov63_0222B078(param0->unk_B0); ov63_0222AF14(param0->unk_B0); @@ -2193,10 +2193,10 @@ static void ov64_0222F668 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 ov64_0222E738(param2, 5); - sub_020198E8(param2->unk_00, Unk_ov64_02232258[0], 11, 20, 10, 4, param2->unk_278.unk_08[1]->rawData, 6, 0, param2->unk_278.unk_08[1]->screenWidth / 8, param2->unk_278.unk_08[1]->screenHeight / 8); - sub_0201A9A4(¶m0->unk_B4); + Bg_CopyToTilemapRect(param2->unk_00, Unk_ov64_02232258[0], 11, 20, 10, 4, param2->unk_278.unk_08[1]->rawData, 6, 0, param2->unk_278.unk_08[1]->screenWidth / 8, param2->unk_278.unk_08[1]->screenHeight / 8); + Window_ScheduleCopyToVRAM(¶m0->unk_B4); - sub_0201C3C0(param2->unk_00, Unk_ov64_02232258[0]); + Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov64_02232258[0]); ov64_0222EA28(param2, 1); ov64_0222FC80(param0, param1, param2, param0->unk_00, param0->unk_04, 0, param3); @@ -2207,7 +2207,7 @@ static void ov64_0222F6E8 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 int v0; ov64_0222E7C8(param2); - sub_0201AD10(¶m0->unk_B4); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_B4); for (v0 = 0; v0 < 3; v0++) { ov64_02230240(¶m0->unk_08[v0], param2, ¶m2->unk_278); @@ -2215,9 +2215,9 @@ static void ov64_0222F6E8 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 ov64_0222EA28(param2, 0); - sub_020198E8(param2->unk_00, Unk_ov64_02232258[0], 11, 20, 10, 4, param2->unk_278.unk_08[1]->rawData, 0, 8, param2->unk_278.unk_08[1]->screenWidth / 8, param2->unk_278.unk_08[1]->screenHeight / 8); - sub_020198E8(param2->unk_00, Unk_ov64_02232258[0], 0x16, 0, 9, 3, param2->unk_278.unk_08[1]->rawData, 0x10, 0x0, param2->unk_278.unk_08[1]->screenWidth / 8, param2->unk_278.unk_08[1]->screenHeight / 8); - sub_0201C3C0(param2->unk_00, Unk_ov64_02232258[0]); + Bg_CopyToTilemapRect(param2->unk_00, Unk_ov64_02232258[0], 11, 20, 10, 4, param2->unk_278.unk_08[1]->rawData, 0, 8, param2->unk_278.unk_08[1]->screenWidth / 8, param2->unk_278.unk_08[1]->screenHeight / 8); + Bg_CopyToTilemapRect(param2->unk_00, Unk_ov64_02232258[0], 0x16, 0, 9, 3, param2->unk_278.unk_08[1]->rawData, 0x10, 0x0, param2->unk_278.unk_08[1]->screenWidth / 8, param2->unk_278.unk_08[1]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov64_02232258[0]); } static u32 ov64_0222F798 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2) @@ -2359,8 +2359,8 @@ static BOOL ov64_0222F948 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 }; if (param0->unk_AA >= 12) { - sub_0201C63C(param2->unk_00, Unk_ov64_02232258[2], 0, 0); - sub_0201C63C(param2->unk_00, Unk_ov64_02232258[3], 0, 0); + Bg_ScheduleScroll(param2->unk_00, Unk_ov64_02232258[2], 0, 0); + Bg_ScheduleScroll(param2->unk_00, Unk_ov64_02232258[3], 0, 0); v2 = Unk_ov64_02232460; sub_020230E0(¶m2->unk_08, &v2); @@ -2383,8 +2383,8 @@ static BOOL ov64_0222F948 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 v1 = -v1; } - sub_0201C63C(param2->unk_00, Unk_ov64_02232258[2], 0, v1); - sub_0201C63C(param2->unk_00, Unk_ov64_02232258[3], 0, v1); + Bg_ScheduleScroll(param2->unk_00, Unk_ov64_02232258[2], 0, v1); + Bg_ScheduleScroll(param2->unk_00, Unk_ov64_02232258[3], 0, v1); v2 = Unk_ov64_02232460; v2.posTopLeft.x += v1 << FX32_SHIFT; @@ -2425,7 +2425,7 @@ static void ov64_0222FA70 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 param0->unk_F8 = sub_0200112C(&v0, 0, 0, param3); Window_Show(¶m0->unk_E0, 1, 1, 9); - sub_0201A9A4(¶m0->unk_E0); + Window_ScheduleCopyToVRAM(¶m0->unk_E0); ov64_0222E880(param2, param1->unk_00, param1->unk_08.unk_04[v3], param3); ov64_0222FE70(param0, param2, 12, param3); @@ -2460,7 +2460,7 @@ static u32 ov64_0222FB24 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E ov64_0222FF18(param0); Window_Clear(¶m0->unk_E0, 1); - sub_0201AD10(¶m0->unk_E0); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_E0); sub_02001384(param0->unk_F8, NULL, NULL); if (v1 == 2) { @@ -2531,12 +2531,12 @@ static void ov64_0222FCF0 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 { u32 v0; - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], 0x16, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 0, 4, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], 0x16, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 0, 4, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); v0 = 0x16 + (2 * param2) + 1; - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 3, Unk_ov64_02232428[param2], param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[0]); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 3, Unk_ov64_02232428[param2], param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[0]); } static void ov64_0222FD7C (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E21C * param1, u32 param2, u32 param3) @@ -2545,20 +2545,20 @@ static void ov64_0222FD7C (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 v0 = 0x16 + (2 * param3) + 1; - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 4, Unk_ov64_02232428[param3], param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[0]); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 4, Unk_ov64_02232428[param3], param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[0]); } static void ov64_0222FDD0 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E21C * param1, u32 param2, u32 param3) { u32 v0; - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], 0x16, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 0, 4, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], 0x16, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 0, 4, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); v0 = 0x16 + (2 * param2) + 1; - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 3, Unk_ov64_02232428[param2], param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[0]); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 3, Unk_ov64_02232428[param2], param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[0]); } static void ov64_0222FE5C (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E060 * param1, int param2) @@ -2572,7 +2572,7 @@ static void ov64_0222FE70 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 { Strbuf* v0; - BGL_FillWindow(¶m0->unk_C4, 15); + Window_FillTilemap(¶m0->unk_C4, 15); v0 = Strbuf_Init(128, param3); @@ -2582,7 +2582,7 @@ static void ov64_0222FE70 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 param0->unk_D8 = Text_AddPrinterWithParamsAndColor(¶m0->unk_C4, FONT_MESSAGE, param0->unk_D4, 0, 0, param0->unk_DC, TEXT_COLOR(1, 2, 0), NULL); sub_0200E060(¶m0->unk_C4, 1, (1 + 9), 8); - sub_0201A9A4(¶m0->unk_C4); + Window_ScheduleCopyToVRAM(¶m0->unk_C4); Strbuf_Free(v0); } @@ -2598,8 +2598,8 @@ static BOOL ov64_0222FEFC (const UnkStruct_ov64_0222F0C4 * param0) static void ov64_0222FF18 (UnkStruct_ov64_0222F0C4 * param0) { sub_0200E084(¶m0->unk_C4, 1); - sub_0201AD10(¶m0->unk_C4); - sub_0201A9A4(¶m0->unk_B4); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_C4); + Window_ScheduleCopyToVRAM(¶m0->unk_B4); } static u32 ov64_0222FF38 (const UnkStruct_ov64_0222F0C4 * param0) @@ -2678,18 +2678,18 @@ static void ov64_02230074 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222 param0->unk_00 = *param2; Window_Init(¶m0->unk_08); - BGL_AddWindow(param1->unk_00, ¶m0->unk_08, Unk_ov64_02232258[3], 4 + MATH_ABS(param2->unk_00), 4 + MATH_ABS(param2->unk_02), 26, 17, 7, param3); + Window_Add(param1->unk_00, ¶m0->unk_08, Unk_ov64_02232258[3], 4 + MATH_ABS(param2->unk_00), 4 + MATH_ABS(param2->unk_02), 26, 17, 7, param3); } static void ov64_022300D8 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222E21C * param1) { - BGL_DeleteWindow(¶m0->unk_08); + Window_Remove(¶m0->unk_08); } static void ov64_022300E4 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222E21C * param1, const UnkStruct_ov64_022300E4 * param2) { - sub_020198C0(param1->unk_00, Unk_ov64_02232258[2], param2->unk_08[0]->rawData, MATH_ABS(param0->unk_00.unk_00), MATH_ABS(param0->unk_00.unk_02), param2->unk_08[0]->screenWidth / 8, param2->unk_08[0]->screenHeight / 8); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[2]); + Bg_LoadToTilemapRect(param1->unk_00, Unk_ov64_02232258[2], param2->unk_08[0]->rawData, MATH_ABS(param0->unk_00.unk_00), MATH_ABS(param0->unk_00.unk_02), param2->unk_08[0]->screenWidth / 8, param2->unk_08[0]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[2]); } static void ov64_02230130 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222E21C * param1, u32 param2) @@ -2704,11 +2704,11 @@ static void ov64_02230130 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222 v1 = 0; } - sub_02019E2C(param1->unk_00, Unk_ov64_02232324[v0].unk_08, MATH_ABS(param0->unk_00.unk_00) + Unk_ov64_02232324[v0].unk_00.unk_00, MATH_ABS(param0->unk_00.unk_02) + Unk_ov64_02232324[v0].unk_00.unk_02, Unk_ov64_02232324[v0].unk_00.unk_04, Unk_ov64_02232324[v0].unk_00.unk_05, v1); + Bg_ChangeTilemapRectPalette(param1->unk_00, Unk_ov64_02232324[v0].unk_08, MATH_ABS(param0->unk_00.unk_00) + Unk_ov64_02232324[v0].unk_00.unk_00, MATH_ABS(param0->unk_00.unk_02) + Unk_ov64_02232324[v0].unk_00.unk_02, Unk_ov64_02232324[v0].unk_00.unk_04, Unk_ov64_02232324[v0].unk_00.unk_05, v1); } - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[2]); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[0]); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[2]); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[0]); } static void ov64_022301B4 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2, UnkStruct_ov63_0222AE60 * param3, const UnkStruct_ov64_022300E4 * param4, const UnkStruct_ov64_022301B4 * param5, u32 param6, u32 param7) @@ -2719,7 +2719,7 @@ static void ov64_022301B4 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222 v2 = sub_0202B370(param1->unk_00); - BGL_FillWindow(¶m0->unk_08, 0); + Window_FillTilemap(¶m0->unk_08, 0); ov64_022302CC(param0, param2); v1 = param6 * 8; @@ -2732,19 +2732,19 @@ static void ov64_022301B4 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222 } } - sub_0201C3C0(param2->unk_00, Unk_ov64_02232258[2]); - sub_0201A9A4(¶m0->unk_08); + Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov64_02232258[2]); + Window_ScheduleCopyToVRAM(¶m0->unk_08); } static void ov64_02230240 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222E21C * param1, const UnkStruct_ov64_022300E4 * param2) { ov64_022302CC(param0, param1); - sub_0201AD10(¶m0->unk_08); - sub_02019CB8(param1->unk_00, Unk_ov64_02232258[2], 0, MATH_ABS(param0->unk_00.unk_00), MATH_ABS(param0->unk_00.unk_02), param0->unk_00.unk_04, param0->unk_00.unk_05, 0); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[2]); - sub_02019CB8(param1->unk_00, Unk_ov64_02232258[3], 0, MATH_ABS(param0->unk_00.unk_00), MATH_ABS(param0->unk_00.unk_02), param0->unk_00.unk_04, param0->unk_00.unk_05, 0); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[3]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08); + Bg_FillTilemapRect(param1->unk_00, Unk_ov64_02232258[2], 0, MATH_ABS(param0->unk_00.unk_00), MATH_ABS(param0->unk_00.unk_02), param0->unk_00.unk_04, param0->unk_00.unk_05, 0); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[2]); + Bg_FillTilemapRect(param1->unk_00, Unk_ov64_02232258[3], 0, MATH_ABS(param0->unk_00.unk_00), MATH_ABS(param0->unk_00.unk_02), param0->unk_00.unk_04, param0->unk_00.unk_05, 0); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[3]); } static void ov64_022302CC (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222E21C * param1) @@ -2792,8 +2792,8 @@ static void ov64_022302EC (UnkStruct_ov64_02230074 * param0, UnkStruct_ov63_0222 static void ov64_022303CC (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222E21C * param1, const UnkStruct_ov64_022300E4 * param2, u32 param3) { - sub_020198E8(param1->unk_00, Unk_ov64_02232258[2], MATH_ABS(param0->unk_00.unk_00) + Unk_ov64_02232324[param3].unk_00.unk_00, MATH_ABS(param0->unk_00.unk_02) + Unk_ov64_02232324[param3].unk_00.unk_02, 3, 4, param2->unk_08[1]->rawData, 0, 0, param2->unk_08[1]->screenWidth / 8, param2->unk_08[1]->screenHeight / 8); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[2]); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[2], MATH_ABS(param0->unk_00.unk_00) + Unk_ov64_02232324[param3].unk_00.unk_00, MATH_ABS(param0->unk_00.unk_02) + Unk_ov64_02232324[param3].unk_00.unk_02, 3, 4, param2->unk_08[1]->rawData, 0, 0, param2->unk_08[1]->screenWidth / 8, param2->unk_08[1]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[2]); } static void ov64_02230444 (UnkStruct_ov64_02230444 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2, u32 param3) @@ -2970,7 +2970,7 @@ asm static void ov64_02230680 (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_ add r1, r5, #0 mov r2, #3 mov r3, #5 - bl BGL_AddWindow + bl Window_Add add r0, r5, #0 add r0, #0x10 bl Window_Init @@ -2989,14 +2989,14 @@ asm static void ov64_02230680 (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_ add r1, #0x10 mov r2, #3 mov r3, #9 - bl BGL_AddWindow + bl Window_Add add r0, r5, #0 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap add r0, r5, #0 add r0, #0x10 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap mov r0, #0x80 add r1, r7, #0 bl Strbuf_Init @@ -3123,8 +3123,8 @@ asm static void ov64_02230680 (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_ static void ov64_02230804 (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2) { - BGL_DeleteWindow(¶m0->unk_00); - BGL_DeleteWindow(¶m0->unk_10); + Window_Remove(¶m0->unk_00); + Window_Remove(¶m0->unk_10); Heap_FreeToHeap(param0->unk_20); } @@ -3133,24 +3133,24 @@ static void ov64_0223081C (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_0222 StringTemplate_SetPlayerName(param2->unk_214, 0, SaveData_GetTrainerInfo(param1->unk_00)); ov64_0222E738(param2, 46); - sub_020198C0(param2->unk_00, Unk_ov64_02232258[2], param0->unk_24->rawData, 0, 0, param0->unk_24->screenWidth / 8, param0->unk_24->screenHeight / 8); - sub_0201C3C0(param2->unk_00, Unk_ov64_02232258[2]); - sub_0201A9A4(¶m0->unk_00); - sub_0201A9A4(¶m0->unk_10); + Bg_LoadToTilemapRect(param2->unk_00, Unk_ov64_02232258[2], param0->unk_24->rawData, 0, 0, param0->unk_24->screenWidth / 8, param0->unk_24->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov64_02232258[2]); + Window_ScheduleCopyToVRAM(¶m0->unk_00); + Window_ScheduleCopyToVRAM(¶m0->unk_10); } static void ov64_0223087C (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_0222E21C * param1) { ov64_0222E7C8(param1); - sub_02019CB8(param1->unk_00, Unk_ov64_02232258[2], 0, 0, 0, 32, 24, 0); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[2]); + Bg_FillTilemapRect(param1->unk_00, Unk_ov64_02232258[2], 0, 0, 0, 32, 24, 0); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[2]); - sub_0201AD10(¶m0->unk_00); - sub_0201AD10(¶m0->unk_10); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_00); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_10); - sub_02019CB8(param1->unk_00, Unk_ov64_02232258[3], 0, 0, 0, 32, 24, 0); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[3]); + Bg_FillTilemapRect(param1->unk_00, Unk_ov64_02232258[3], 0, 0, 0, 32, 24, 0); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[3]); } static void ov64_022308DC (UnkStruct_ov64_02230904 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2, u32 param3) @@ -3278,8 +3278,8 @@ static BOOL ov64_02230A9C (UnkStruct_ov64_02230904 * param0, UnkStruct_ov64_0222 }; if (param0->unk_04 > 4) { - sub_0201C63C(param2->unk_00, Unk_ov64_02232258[2], 0, 0); - sub_0201C63C(param2->unk_00, Unk_ov64_02232258[3], 0, 0); + Bg_ScheduleScroll(param2->unk_00, Unk_ov64_02232258[2], 0, 0); + Bg_ScheduleScroll(param2->unk_00, Unk_ov64_02232258[3], 0, 0); if (param0->unk_08 == 2) { v0 = 2; @@ -3299,8 +3299,8 @@ static BOOL ov64_02230A9C (UnkStruct_ov64_02230904 * param0, UnkStruct_ov64_0222 v1 = -v1; } - sub_0201C63C(param2->unk_00, Unk_ov64_02232258[2], 0, v1); - sub_0201C63C(param2->unk_00, Unk_ov64_02232258[3], 0, v1); + Bg_ScheduleScroll(param2->unk_00, Unk_ov64_02232258[2], 0, v1); + Bg_ScheduleScroll(param2->unk_00, Unk_ov64_02232258[3], 0, v1); if (param0->unk_04 % (4 / 4)) { v3 = param0->unk_04 / (4 / 4); @@ -3386,21 +3386,21 @@ static void ov64_02230C8C (UnkStruct_ov64_02230904 * param0, UnkStruct_ov64_0222 u32 v0; if (param0->unk_10 == 1) { - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], 22, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 16, 4, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], 22, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 16, 4, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); } else { - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], 22, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 16, 4 + 3, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], 22, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 16, 4 + 3, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); } v0 = 22 + (1 * param2) + 1; - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 5, 0, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[0]); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 5, 0, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[0]); } static void ov64_02230D50 (UnkStruct_ov64_02230904 * param0, UnkStruct_ov64_0222E21C * param1) { - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], 22, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 0x10, 0x0, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[0]); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], 22, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 0x10, 0x0, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[0]); } static void ov64_02230D98 (UnkStruct_ov64_02230904 * param0, UnkStruct_ov64_0222E21C * param1, u32 param2, u32 param3) @@ -3409,8 +3409,8 @@ static void ov64_02230D98 (UnkStruct_ov64_02230904 * param0, UnkStruct_ov64_0222 v0 = 22 + (1 * param3) + 1; - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 5, 1, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[0]); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 5, 1, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[0]); } static void ov64_02230DE4 (UnkStruct_ov64_02230904 * param0, UnkStruct_ov64_0222E21C * param1, u32 param2, u32 param3) @@ -3418,15 +3418,15 @@ static void ov64_02230DE4 (UnkStruct_ov64_02230904 * param0, UnkStruct_ov64_0222 int v0; if (param0->unk_10 == 1) { - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], 22, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 16, 4, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], 22, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 16, 4, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); } else { - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], 22, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 16, 4 + 3, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], 22, 0, 9, 3, param1->unk_278.unk_08[1]->rawData, 16, 4 + 3, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); } v0 = 22 + (1 * param2) + 1; - sub_020198E8(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 5, 0, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); - sub_0201C3C0(param1->unk_00, Unk_ov64_02232258[0]); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov64_02232258[0], v0, 0 + 1, 1, 1, param1->unk_278.unk_08[1]->rawData, 5, 0, param1->unk_278.unk_08[1]->screenWidth / 8, param1->unk_278.unk_08[1]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[0]); } static BOOL ov64_02230EA8 (UnkStruct_ov64_0222E060 * param0, int param1) @@ -3514,15 +3514,15 @@ static void ov64_02230F9C (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_0222 int v0; u16 v1; - param0->unk_0C[param2] = sub_0201A778(param5, param3); + param0->unk_0C[param2] = Window_New(param5, param3); param0->unk_28[param2] = param3; v1 = param0->unk_08; for (v0 = 0; v0 < param3; v0++) { Window_Init(¶m0->unk_0C[param2][v0]); - BGL_AddWindow(param1->unk_00, ¶m0->unk_0C[param2][v0], Unk_ov64_02232258[3], MATH_ABS(param0->unk_00.unk_00) + param4[v0].unk_00, MATH_ABS(param0->unk_00.unk_02) + param4[v0].unk_01, param4[v0].unk_02, param4[v0].unk_03, 7, v1); - BGL_FillWindow(¶m0->unk_0C[param2][v0], 0); + Window_Add(param1->unk_00, ¶m0->unk_0C[param2][v0], Unk_ov64_02232258[3], MATH_ABS(param0->unk_00.unk_00) + param4[v0].unk_00, MATH_ABS(param0->unk_00.unk_02) + param4[v0].unk_01, param4[v0].unk_02, param4[v0].unk_03, 7, v1); + Window_FillTilemap(¶m0->unk_0C[param2][v0], 0); v1 += (param4[v0].unk_02 * param4[v0].unk_03); } } @@ -3530,7 +3530,7 @@ static void ov64_02230F9C (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_0222 static void ov64_02231058 (UnkStruct_ov64_02230F98 * param0, u32 param1) { if (param0->unk_0C[param1]) { - sub_0201A928(param0->unk_0C[param1], param0->unk_28[param1]); + Windows_Delete(param0->unk_0C[param1], param0->unk_28[param1]); param0->unk_0C[param1] = NULL; param0->unk_28[param1] = 0; } @@ -3541,7 +3541,7 @@ static void ov64_02231080 (UnkStruct_ov64_02230F98 * param0, u32 param1) int v0; for (v0 = 0; v0 < param0->unk_28[param1]; v0++) { - sub_0201A9A4(¶m0->unk_0C[param1][v0]); + Window_ScheduleCopyToVRAM(¶m0->unk_0C[param1][v0]); } } @@ -3550,8 +3550,8 @@ static void ov64_022310A4 (UnkStruct_ov64_02230F98 * param0, u32 param1) int v0; for (v0 = 0; v0 < param0->unk_28[param1]; v0++) { - sub_0201AD10(¶m0->unk_0C[param1][v0]); - BGL_FillWindow(¶m0->unk_0C[param1][v0], 0); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_0C[param1][v0]); + Window_FillTilemap(¶m0->unk_0C[param1][v0], 0); } } @@ -3569,8 +3569,8 @@ static void ov64_022310D4 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_0222 ov64_02231144(param0, param2); - sub_020198C0(param2->unk_00, Unk_ov64_02232258[2], param4->unk_1C[param3]->rawData, MATH_ABS(param0->unk_00.unk_00), MATH_ABS(param0->unk_00.unk_02), param4->unk_1C[param3]->screenWidth / 8, param4->unk_1C[param3]->screenHeight / 8); - sub_0201C3C0(param2->unk_00, Unk_ov64_02232258[2]); + Bg_LoadToTilemapRect(param2->unk_00, Unk_ov64_02232258[2], param4->unk_1C[param3]->rawData, MATH_ABS(param0->unk_00.unk_00), MATH_ABS(param0->unk_00.unk_02), param4->unk_1C[param3]->screenWidth / 8, param4->unk_1C[param3]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov64_02232258[2]); v0[param3](param0, param1, param2, param5); } @@ -3939,7 +3939,7 @@ asm static void ov64_02231164 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_ ldr r0, [r0, #0xc] add r3, r2, #0 add r0, #0x40 - bl sub_0201ADDC + bl Window_BlitBitmapRect ldr r0, [sp, #0x34] bl Heap_FreeToHeap mov r0, #0x20 @@ -4001,12 +4001,12 @@ asm static void ov64_02231164 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_ ldr r0, [sp, #0x20] ldr r0, [r0, #0xc] add r0, #0x40 - bl sub_0201C29C + bl Window_GetXPos add r5, r0, #0 ldr r0, [sp, #0x20] ldr r0, [r0, #0xc] add r0, #0x40 - bl sub_0201C2A0 + bl Window_GetYPos add r3, r0, #0 mov r0, #0xb str r0, [sp] @@ -4019,7 +4019,7 @@ asm static void ov64_02231164 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_ mov r1, #3 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl sub_02019E2C + bl Bg_ChangeTilemapRectPalette add r0, r7, #0 bl Strbuf_Free add r0, r6, #0 @@ -5344,10 +5344,10 @@ asm static void ov64_02231E94 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_ static void ov64_02232038 (UnkStruct_ov64_0222E21C * param0, const UnkStruct_ov64_0223221C * param1) { - sub_02019CB8(param0->unk_00, Unk_ov64_02232258[2], 0, MATH_ABS(param1->unk_00), MATH_ABS(param1->unk_02), 32, 24, 0); - sub_0201C3C0(param0->unk_00, Unk_ov64_02232258[2]); - sub_02019CB8(param0->unk_00, Unk_ov64_02232258[3], 0, MATH_ABS(param1->unk_00), MATH_ABS(param1->unk_02), 32, 24, 0); - sub_0201C3C0(param0->unk_00, Unk_ov64_02232258[3]); + Bg_FillTilemapRect(param0->unk_00, Unk_ov64_02232258[2], 0, MATH_ABS(param1->unk_00), MATH_ABS(param1->unk_02), 32, 24, 0); + Bg_ScheduleTilemapTransfer(param0->unk_00, Unk_ov64_02232258[2]); + Bg_FillTilemapRect(param0->unk_00, Unk_ov64_02232258[3], 0, MATH_ABS(param1->unk_00), MATH_ABS(param1->unk_02), 32, 24, 0); + Bg_ScheduleTilemapTransfer(param0->unk_00, Unk_ov64_02232258[3]); } // clang-format off diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index e7ed07ecef..f74f8d3f40 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -702,7 +702,7 @@ static void ov65_0222E01C (UnkStruct_ov65_0222EBE0 * param0) v0 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 54); - param0->unk_15C = sub_02018340(54); + param0->unk_15C = BgConfig_New(54); param0->unk_164 = StringTemplate_Default(54); param0->unk_168 = MessageLoader_Init(0, 26, 674, 54); param0->unk_16C = MessageLoader_Init(0, 26, 695, 54); @@ -933,7 +933,7 @@ static void ov65_0222E5E0 (void * param0) { UnkStruct_ov65_0222EBE0 * v0 = param0; - sub_0201C2B8(v0->unk_15C); + Bg_RunScheduledUpdates(v0->unk_15C); sub_0201DCAC(); sub_0200A858(); @@ -974,7 +974,7 @@ static void ov65_0222E638(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -994,9 +994,9 @@ static void ov65_0222E638(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019690(0, 32, 0, 54); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilesRange(0, 32, 0, 54); + Bg_ClearTilemap(param0, 0); } { @@ -1016,9 +1016,9 @@ static void ov65_0222E638(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019690(1, 32, 0, 54); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilesRange(1, 32, 0, 54); + Bg_ClearTilemap(param0, 1); } { @@ -1038,9 +1038,9 @@ static void ov65_0222E638(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019690(2, 32, 0, 54); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilesRange(2, 32, 0, 54); + Bg_ClearTilemap(param0, 2); } { @@ -1060,9 +1060,9 @@ static void ov65_0222E638(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v4, 0); - sub_02019690(3, 32, 0, 54); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v4, 0); + Bg_ClearTilesRange(3, 32, 0, 54); + Bg_ClearTilemap(param0, 3); } { @@ -1082,8 +1082,8 @@ static void ov65_0222E638(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v5, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v5, 0); + Bg_ClearTilemap(param0, 4); } { @@ -1103,8 +1103,8 @@ static void ov65_0222E638(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v6, 0); - sub_02019EBC(param0, 5); + Bg_InitFromTemplate(param0, 5, &v6, 0); + Bg_ClearTilemap(param0, 5); } { @@ -1124,8 +1124,8 @@ static void ov65_0222E638(BgConfig *param0) 0 }; - sub_020183C4(param0, 6, &v7, 0); - sub_02019EBC(param0, 6); + Bg_InitFromTemplate(param0, 6, &v7, 0); + Bg_ClearTilemap(param0, 6); } { @@ -1145,23 +1145,23 @@ static void ov65_0222E638(BgConfig *param0) 0 }; - sub_020183C4(param0, 7, &v8, 0); - sub_02019EBC(param0, 7); + Bg_InitFromTemplate(param0, 7, &v8, 0); + Bg_ClearTilemap(param0, 7); } - sub_02019690(0, 32, 0, 54); - sub_02019690(1, 32, 0, 54); - sub_02019690(2, 32, 0, 54); - sub_02019690(3, 32, 0, 54); - sub_02019690(4, 32, 0, 54); - sub_02019690(5, 32, 0, 54); - sub_02019690(6, 32, 0, 54); - sub_02019690(7, 32, 0, 54); + Bg_ClearTilesRange(0, 32, 0, 54); + Bg_ClearTilesRange(1, 32, 0, 54); + Bg_ClearTilesRange(2, 32, 0, 54); + Bg_ClearTilesRange(3, 32, 0, 54); + Bg_ClearTilesRange(4, 32, 0, 54); + Bg_ClearTilesRange(5, 32, 0, 54); + Bg_ClearTilesRange(6, 32, 0, 54); + Bg_ClearTilesRange(7, 32, 0, 54); - BGL_SetPriority(0, 3); - BGL_SetPriority(1, 1); - BGL_SetPriority(3, 0); - BGL_SetPriority(2, 0); + Bg_SetPriority(0, 3); + Bg_SetPriority(1, 1); + Bg_SetPriority(3, 0); + Bg_SetPriority(2, 0); G2_BlendNone(); G2S_BlendNone(); @@ -1243,12 +1243,12 @@ static void ov65_0222E9C0(BgConfig *param0, UnkStruct_ov65_0222E99C *param1, u32 { int v0; - sub_020198E8(param0, param2, param3, param4, 2, 2, param1->unk_04->rawData, 2 * param5, 0, param1->unk_04->screenWidth / 8, param1->unk_04->screenHeight / 8); + Bg_CopyToTilemapRect(param0, param2, param3, param4, 2, 2, param1->unk_04->rawData, 2 * param5, 0, param1->unk_04->screenWidth / 8, param1->unk_04->screenHeight / 8); v0 = ov65_0222EBAC(param2); - sub_02019E2C(param0, param2, param3, param4, 2, 2, v0 + param6); - sub_0201C3C0(param0, param2); + Bg_ChangeTilemapRectPalette(param0, param2, param3, param4, 2, 2, v0 + param6); + Bg_ScheduleTilemapTransfer(param0, param2); } static void ov65_0222EA38(BgConfig *param0, UnkStruct_ov65_0222E99C *param1, u32 param2, u8 param3, u8 param4, u32 param5) @@ -1321,9 +1321,9 @@ static void ov65_0222EAD0 (Window * param0, UnkStruct_ov65_0222E99C * param1, u1 { int v0; - sub_0201ADDC(param0, param1->unk_0C->pRawData, (2 * 8) * param4, 0, param1->unk_0C->W * 8, param1->unk_0C->H * 8, param2, param3, 2 * 8, 2 * 8); + Window_BlitBitmapRect(param0, param1->unk_0C->pRawData, (2 * 8) * param4, 0, param1->unk_0C->W * 8, param1->unk_0C->H * 8, param2, param3, 2 * 8, 2 * 8); v0 = ov65_0222EBAC(param0->bgLayer); - sub_0201C2B4(param0, v0 + param5); + Window_SetPalette(param0, v0 + param5); } static void ov65_0222EB1C (Window * param0, UnkStruct_ov65_0222E99C * param1, u16 param2, u16 param3, u32 param4) @@ -1433,14 +1433,14 @@ static void ov65_0222EC2C (UnkStruct_ov65_0222EBE0 * param0) static void ov65_0222EC5C(BgConfig *param0) { - sub_02019044(param0, 7); - sub_02019044(param0, 6); - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 7); + Bg_FreeTilemapBuffer(param0, 6); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); Heap_FreeToHeap(param0); } @@ -1518,13 +1518,13 @@ static void ov65_0222EE98 (UnkStruct_ov65_0222EBE0 * param0) { int v0, v1; - if (BGL_WindowAdded(¶m0->unk_350)) { + if (Window_IsInUse(¶m0->unk_350)) { Window_Clear(¶m0->unk_350, 0); - BGL_DeleteWindow(¶m0->unk_350); + Window_Remove(¶m0->unk_350); } - BGL_AddWindow(param0->unk_15C, ¶m0->unk_350, 3, 5, 1, 22, 2, 13, 512 - 18 * 3); - BGL_FillWindow(¶m0->unk_350, 0x8000); + Window_Add(param0->unk_15C, ¶m0->unk_350, 3, 5, 1, 22, 2, 13, 512 - 18 * 3); + Window_FillTilemap(¶m0->unk_350, 0x8000); MessageLoader_GetStrbuf(param0->unk_168, 21, param0->unk_178); { @@ -1533,7 +1533,7 @@ static void ov65_0222EE98 (UnkStruct_ov65_0222EBE0 * param0) Text_AddPrinterWithParamsAndColor(¶m0->unk_350, FONT_MESSAGE, param0->unk_178, v2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); } - sub_0201A9A4(¶m0->unk_350); + Window_ScheduleCopyToVRAM(¶m0->unk_350); } static void ov65_0222EF4C (UnkStruct_ov65_0222EBE0 * param0) @@ -1542,24 +1542,24 @@ static void ov65_0222EF4C (UnkStruct_ov65_0222EBE0 * param0) ov65_02232DFC(param0); - if (BGL_WindowAdded(¶m0->unk_350)) { - BGL_DeleteWindow(¶m0->unk_350); + if (Window_IsInUse(¶m0->unk_350)) { + Window_Remove(¶m0->unk_350); } - if (BGL_WindowAdded(¶m0->unk_330)) { - BGL_DeleteWindow(¶m0->unk_330); + if (Window_IsInUse(¶m0->unk_330)) { + Window_Remove(¶m0->unk_330); } - if (BGL_WindowAdded(¶m0->unk_390)) { - BGL_DeleteWindow(¶m0->unk_390); + if (Window_IsInUse(¶m0->unk_390)) { + Window_Remove(¶m0->unk_390); } - if (BGL_WindowAdded(¶m0->unk_340)) { - BGL_DeleteWindow(¶m0->unk_340); + if (Window_IsInUse(¶m0->unk_340)) { + Window_Remove(¶m0->unk_340); } - if (BGL_WindowAdded(¶m0->unk_370)) { - BGL_DeleteWindow(¶m0->unk_370); + if (Window_IsInUse(¶m0->unk_370)) { + Window_Remove(¶m0->unk_370); } if (param0->unk_150) { @@ -1571,8 +1571,8 @@ static void ov65_0222EF4C (UnkStruct_ov65_0222EBE0 * param0) param0->unk_14C = NULL; } - if (BGL_WindowAdded(¶m0->unk_360)) { - BGL_DeleteWindow(¶m0->unk_360); + if (Window_IsInUse(¶m0->unk_360)) { + Window_Remove(¶m0->unk_360); } } @@ -1627,10 +1627,10 @@ static int ov65_0222F010 (UnkStruct_ov65_0222EBE0 * param0, int param1) ov65_0222EE98(param0); if (!DWC_CheckHasProfile(sub_0202AD28(param0->unk_00))) { - BGL_SetPriority(0, 3); - BGL_SetPriority(1, 0); - BGL_SetPriority(3, 0); - BGL_SetPriority(2, 1); + Bg_SetPriority(0, 3); + Bg_SetPriority(1, 0); + Bg_SetPriority(3, 0); + Bg_SetPriority(2, 1); ov65_02232CA8(param0, 18); @@ -1684,10 +1684,10 @@ static int ov65_0222F21C (UnkStruct_ov65_0222EBE0 * param0, int param1) { if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { ov65_02232CA8(param0, 21); - BGL_SetPriority(3, 0); - BGL_SetPriority(2, 1); - BGL_SetPriority(1, 0); - BGL_SetPriority(0, 3); + Bg_SetPriority(3, 0); + Bg_SetPriority(2, 1); + Bg_SetPriority(1, 0); + Bg_SetPriority(0, 3); param0->unk_184 = sub_02002054(param0->unk_15C, &Unk_ov65_02238954, ((512 - (18 + 12)) - 9), 11, 1, 54); param0->unk_3A8 = 4; @@ -1705,7 +1705,7 @@ static int ov65_0222F288 (UnkStruct_ov65_0222EBE0 * param0, int param1) return param1; } else { sub_0200E084(¶m0->unk_360, 0); - BGL_DeleteWindow(¶m0->unk_360); + Window_Remove(¶m0->unk_360); if (v1 == 0) { ov65_02232CA8(param0, 22); @@ -1727,12 +1727,12 @@ static int ov65_0222F304 (UnkStruct_ov65_0222EBE0 * param0, int param1) if (v1 == 0xffffffff) { return param1; } else { - BGL_SetPriority(3, 0); - BGL_SetPriority(2, 0); - BGL_SetPriority(1, 1); - BGL_SetPriority(0, 3); + Bg_SetPriority(3, 0); + Bg_SetPriority(2, 0); + Bg_SetPriority(1, 1); + Bg_SetPriority(0, 3); sub_0200E084(¶m0->unk_360, 0); - BGL_DeleteWindow(¶m0->unk_360); + Window_Remove(¶m0->unk_360); if (v1 == 0) { WiFiList_Init(param0->unk_00); @@ -1760,12 +1760,12 @@ static int ov65_0222F3DC (UnkStruct_ov65_0222EBE0 * param0, int param1) if (v1 == 0xffffffff) { return param1; } else { - BGL_SetPriority(0, 3); - BGL_SetPriority(1, 1); - BGL_SetPriority(3, 0); - BGL_SetPriority(2, 0); + Bg_SetPriority(0, 3); + Bg_SetPriority(1, 1); + Bg_SetPriority(3, 0); + Bg_SetPriority(2, 0); sub_0200E084(¶m0->unk_360, 0); - BGL_DeleteWindow(¶m0->unk_360); + Window_Remove(¶m0->unk_360); if (v1 == 0) { param0->unk_3A8 = 14; @@ -1784,10 +1784,10 @@ static int ov65_0222F3DC (UnkStruct_ov65_0222EBE0 * param0, int param1) static int ov65_0222F490 (UnkStruct_ov65_0222EBE0 * param0, int param1) { - BGL_SetPriority(0, 3); - BGL_SetPriority(1, 1); - BGL_SetPriority(3, 0); - BGL_SetPriority(2, 0); + Bg_SetPriority(0, 3); + Bg_SetPriority(1, 1); + Bg_SetPriority(3, 0); + Bg_SetPriority(2, 0); param0->unk_3A8 = 15; return param1; } @@ -1955,9 +1955,9 @@ static void ov65_0222F6EC (UnkStruct_ov65_0222EBE0 * param0) static int ov65_0222F7AC (UnkStruct_ov65_0222EBE0 * param0, int param1) { if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { - if (BGL_WindowAdded(¶m0->unk_360)) { + if (Window_IsInUse(¶m0->unk_360)) { sub_0200E084(¶m0->unk_360, 0); - BGL_DeleteWindow(¶m0->unk_360); + Window_Remove(¶m0->unk_360); } param0->unk_3A8 = 8; @@ -1986,9 +1986,9 @@ static int ov65_0222F808 (UnkStruct_ov65_0222EBE0 * param0, int param1) } if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { - if (BGL_WindowAdded(¶m0->unk_360)) { + if (Window_IsInUse(¶m0->unk_360)) { sub_0200E084(¶m0->unk_360, 0); - BGL_DeleteWindow(¶m0->unk_360); + Window_Remove(¶m0->unk_360); } ov65_02232B58(param0, 88, 0); @@ -2054,16 +2054,16 @@ static int ov65_0222F90C (UnkStruct_ov65_0222EBE0 * param0, int param1) ov65_02233068(param0); } - if (BGL_WindowAdded(¶m0->unk_350)) { + if (Window_IsInUse(¶m0->unk_350)) { Window_Clear(¶m0->unk_350, 0); - BGL_DeleteWindow(¶m0->unk_350); + Window_Remove(¶m0->unk_350); } - if (BGL_WindowAdded(¶m0->unk_340)) { - BGL_DeleteWindow(¶m0->unk_340); + if (Window_IsInUse(¶m0->unk_340)) { + Window_Remove(¶m0->unk_340); } - sub_02019EBC(param0->unk_15C, 3); + Bg_ClearTilemap(param0->unk_15C, 3); v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 54); ov65_0222ECA8(param0, v1); @@ -2074,7 +2074,7 @@ static int ov65_0222F90C (UnkStruct_ov65_0222EBE0 * param0, int param1) param0->unk_1158 = 1; if (param0->unk_14C) { - BGL_DeleteWindow(¶m0->unk_370); + Window_Remove(¶m0->unk_370); sub_02001384(param0->unk_150, NULL, NULL); param0->unk_150 = NULL; sub_02013A3C(param0->unk_14C); @@ -2283,9 +2283,9 @@ static int ov65_0222FCDC (UnkStruct_ov65_0222EBE0 * param0, int param1) param0->unk_3A8 = ov65_0222EBB8(); - if (BGL_WindowAdded(¶m0->unk_360)) { + if (Window_IsInUse(¶m0->unk_360)) { sub_0200E084(¶m0->unk_360, 0); - BGL_DeleteWindow(¶m0->unk_360); + Window_Remove(¶m0->unk_360); } } } @@ -2301,12 +2301,12 @@ static void ov65_0222FD70 (UnkStruct_ov65_0222EBE0 * param0) Strbuf* v5 = TrainerInfo_NameNewStrbuf(v4, 54); u32 v6; - if (!BGL_WindowAdded(¶m0->unk_340)) { + if (!Window_IsInUse(¶m0->unk_340)) { Strbuf_Free(v5); return; } - BGL_FillWindow(¶m0->unk_340, 0); + Window_FillTilemap(¶m0->unk_340, 0); v1 = TrainerInfo_Gender(v4); @@ -2350,7 +2350,7 @@ static void ov65_0222FD70 (UnkStruct_ov65_0222EBE0 * param0) } ov65_0222E9C0(param0->unk_15C, ¶m0->unk_BD0, 1, 26, 1, v2, 0); - sub_0201A9A4(¶m0->unk_340); + Window_ScheduleCopyToVRAM(¶m0->unk_340); } static void ov65_0222FED8 (BmpList * param0, u32 param1, u8 param2) @@ -2362,19 +2362,19 @@ static void ov65_0222FED8 (BmpList * param0, u32 param1, u8 param2) static void ov65_0222FEEC (UnkStruct_ov65_0222EBE0 * param0) { - if (BGL_WindowAdded(¶m0->unk_340)) { - BGL_DeleteWindow(¶m0->unk_340); + if (Window_IsInUse(¶m0->unk_340)) { + Window_Remove(¶m0->unk_340); } - if (BGL_WindowAdded(¶m0->unk_350)) { + if (Window_IsInUse(¶m0->unk_350)) { Window_Clear(¶m0->unk_350, 0); - BGL_DeleteWindow(¶m0->unk_350); + Window_Remove(¶m0->unk_350); } - BGL_AddWindow(param0->unk_15C, ¶m0->unk_340, 3, 1, 1, 28, 2, 13, ((512 - 18 * 3) - (28 * 2))); - BGL_AddWindow(param0->unk_15C, ¶m0->unk_350, 1, 1, 1, 28, 2, 13, (((512 - (18 + 12)) - 9) - (28 * 2))); - BGL_FillWindow(¶m0->unk_350, 15); - sub_0201A9A4(¶m0->unk_350); + Window_Add(param0->unk_15C, ¶m0->unk_340, 3, 1, 1, 28, 2, 13, ((512 - 18 * 3) - (28 * 2))); + Window_Add(param0->unk_15C, ¶m0->unk_350, 1, 1, 1, 28, 2, 13, (((512 - (18 + 12)) - 9) - (28 * 2))); + Window_FillTilemap(¶m0->unk_350, 15); + Window_ScheduleCopyToVRAM(¶m0->unk_350); Window_Show(¶m0->unk_350, 0, ((512 - (18 + 12)) - 9), 11); } @@ -2406,10 +2406,10 @@ static int ov65_0222FFAC (UnkStruct_ov65_0222EBE0 * param0, int param1) ov65_02232F30(param0); ov65_02232DFC(param0); - sub_02019EBC(param0->unk_15C, 3); + Bg_ClearTilemap(param0->unk_15C, 3); if (param0->unk_14C) { - BGL_DeleteWindow(¶m0->unk_370); + Window_Remove(¶m0->unk_370); sub_02001384(param0->unk_150, NULL, NULL); param0->unk_150 = NULL; sub_02013A3C(param0->unk_14C); @@ -3282,12 +3282,12 @@ static int ov65_02230E04 (UnkStruct_ov65_0222EBE0 * param0, int param1) sub_02013A4C(param0->unk_154, param0->unk_168, v3[v0].unk_00, v3[v0].unk_04); } - if (BGL_WindowAdded(¶m0->unk_380)) { + if (Window_IsInUse(¶m0->unk_380)) { Window_Clear(¶m0->unk_380, 0); - BGL_DeleteWindow(¶m0->unk_380); + Window_Remove(¶m0->unk_380); } - BGL_AddWindow(param0->unk_15C, ¶m0->unk_380, 2, 16, 3, 15, v1 * 2, 13, ((((((512 - (18 + 12)) - 9) - 10) - (18 + 12 + 24)) - (27 * 4)) - (11 * 22)) - v1 * 2); + Window_Add(param0->unk_15C, ¶m0->unk_380, 2, 16, 3, 15, v1 * 2, 13, ((((((512 - (18 + 12)) - 9) - 10) - (18 + 12 + 24)) - (27 * 4)) - (11 * 22)) - v1 * 2); Window_Show(¶m0->unk_380, 1, ((512 - (18 + 12)) - 9), 11); v2.unk_00 = param0->unk_154; @@ -3295,7 +3295,7 @@ static int ov65_02230E04 (UnkStruct_ov65_0222EBE0 * param0, int param1) param0->unk_158 = sub_0200112C(&v2, 0, param0->unk_3D4, 54); - sub_0201A9A4(¶m0->unk_380); + Window_ScheduleCopyToVRAM(¶m0->unk_380); ov65_02232B58(param0, 8, 0); ov65_022355FC(¶m0->unk_3EC); @@ -3315,7 +3315,7 @@ static int ov65_02230FBC (UnkStruct_ov65_0222EBE0 * param0, int param1) if (0 != ov65_02230140(param0)) { param0->unk_3A8 = 19; Window_Clear(¶m0->unk_380, 0); - BGL_DeleteWindow(¶m0->unk_380); + Window_Remove(¶m0->unk_380); sub_02001384(param0->unk_158, NULL, ¶m0->unk_3D4); sub_02013A3C(param0->unk_154); ov65_02232DFC(param0); @@ -3359,7 +3359,7 @@ static int ov65_02230FBC (UnkStruct_ov65_0222EBE0 * param0, int param1) param0->unk_3A8 = 29; } else if ((v0 == 0) || (v0 == 1) || (v0 == 29)) { Window_Clear(¶m0->unk_380, 0); - BGL_DeleteWindow(¶m0->unk_380); + Window_Remove(¶m0->unk_380); sub_02001384(param0->unk_158, NULL, ¶m0->unk_3D4); sub_02013A3C(param0->unk_154); ov65_0223128C(param0, v0); @@ -3394,7 +3394,7 @@ static int ov65_02230FBC (UnkStruct_ov65_0222EBE0 * param0, int param1) } Window_Clear(¶m0->unk_380, 0); - BGL_DeleteWindow(¶m0->unk_380); + Window_Remove(¶m0->unk_380); sub_02001384(param0->unk_158, NULL, ¶m0->unk_3D4); sub_02013A3C(param0->unk_154); @@ -3475,12 +3475,12 @@ static int ov65_0223128C (UnkStruct_ov65_0222EBE0 * param0, int param1) } } - if (BGL_WindowAdded(¶m0->unk_380)) { + if (Window_IsInUse(¶m0->unk_380)) { Window_Clear(¶m0->unk_380, 0); - BGL_DeleteWindow(¶m0->unk_380); + Window_Remove(¶m0->unk_380); } - BGL_AddWindow(param0->unk_15C, ¶m0->unk_380, 2, 16, 9, 15, v1 * 2, 13, ((((((512 - (18 + 12)) - 9) - 10) - (18 + 12 + 24)) - (27 * 4)) - (11 * 22)) - v1 * 2); + Window_Add(param0->unk_15C, ¶m0->unk_380, 2, 16, 9, 15, v1 * 2, 13, ((((((512 - (18 + 12)) - 9) - 10) - (18 + 12 + 24)) - (27 * 4)) - (11 * 22)) - v1 * 2); Window_Show(¶m0->unk_380, 1, ((512 - (18 + 12)) - 9), 11); v2.unk_00 = param0->unk_154; @@ -3488,7 +3488,7 @@ static int ov65_0223128C (UnkStruct_ov65_0222EBE0 * param0, int param1) param0->unk_158 = sub_0200112C(&v2, 0, param0->unk_3D6[param0->unk_3DC], 54); - sub_0201A9A4(¶m0->unk_380); + Window_ScheduleCopyToVRAM(¶m0->unk_380); return 1; } @@ -3502,7 +3502,7 @@ static int ov65_02231440 (UnkStruct_ov65_0222EBE0 * param0, int param1) if (0 != ov65_02230140(param0)) { param0->unk_3A8 = 19; Window_Clear(¶m0->unk_380, 0); - BGL_DeleteWindow(¶m0->unk_380); + Window_Remove(¶m0->unk_380); sub_02001384(param0->unk_158, NULL, ¶m0->unk_3D6[param0->unk_3DC]); sub_02013A3C(param0->unk_154); ov65_02232DFC(param0); @@ -3549,7 +3549,7 @@ static int ov65_02231440 (UnkStruct_ov65_0222EBE0 * param0, int param1) } Window_Clear(¶m0->unk_380, 0); - BGL_DeleteWindow(¶m0->unk_380); + Window_Remove(¶m0->unk_380); sub_02001384(param0->unk_158, NULL, ¶m0->unk_3D6[param0->unk_3DC]); sub_02013A3C(param0->unk_154); @@ -3751,7 +3751,7 @@ static int ov65_022316F0 (UnkStruct_ov65_0222EBE0 * param0, int param1) } } - BGL_AddWindow(param0->unk_15C, ¶m0->unk_380, 2, 16, 11 + ((3 - v6) * 2), 15, v6 * 2, 13, ((((((512 - (18 + 12)) - 9) - 10) - (18 + 12 + 24)) - (27 * 4)) - (11 * 22))); + Window_Add(param0->unk_15C, ¶m0->unk_380, 2, 16, 11 + ((3 - v6) * 2), 15, v6 * 2, 13, ((((((512 - (18 + 12)) - 9) - 10) - (18 + 12 + 24)) - (27 * 4)) - (11 * 22))); Window_Show(¶m0->unk_380, 1, ((512 - (18 + 12)) - 9), 11); v7.unk_00 = param0->unk_154; @@ -3759,7 +3759,7 @@ static int ov65_022316F0 (UnkStruct_ov65_0222EBE0 * param0, int param1) param0->unk_158 = sub_0200112C(&v7, 0, 0, 54); - sub_0201A9A4(¶m0->unk_380); + Window_ScheduleCopyToVRAM(¶m0->unk_380); } param0->unk_3A8 = 44; @@ -3869,7 +3869,7 @@ static int ov65_02231A98 (UnkStruct_ov65_0222EBE0 * param0, int param1) if (sub_020383E8()) { Window_Clear(¶m0->unk_380, 0); - BGL_DeleteWindow(¶m0->unk_380); + Window_Remove(¶m0->unk_380); sub_02001384(param0->unk_158, NULL, NULL); sub_02013A3C(param0->unk_154); @@ -4033,7 +4033,7 @@ static int ov65_02231A98 (UnkStruct_ov65_0222EBE0 * param0, int param1) } Window_Clear(¶m0->unk_380, 0); - BGL_DeleteWindow(¶m0->unk_380); + Window_Remove(¶m0->unk_380); sub_02001384(param0->unk_158, NULL, NULL); sub_02013A3C(param0->unk_154); @@ -4324,7 +4324,7 @@ static BOOL ov65_02232390 (UnkStruct_ov65_0222EBE0 * param0) return 1; } - if (BGL_WindowAdded(¶m0->unk_330) == 0) { + if (Window_IsInUse(¶m0->unk_330) == 0) { return 1; } @@ -4397,7 +4397,7 @@ static int ov65_022323C0 (UnkStruct_ov65_0222EBE0 * param0, int param1) static int ov65_02232530 (UnkStruct_ov65_0222EBE0 * param0, int param1) { - sub_02019EBC(param0->unk_15C, 3); + Bg_ClearTilemap(param0->unk_15C, 3); param0->unk_3C4 = 0; param0->unk_3A8 = ov65_0222EBB8(); @@ -4731,14 +4731,14 @@ static void ov65_02232B58 (UnkStruct_ov65_0222EBE0 * param0, int param1, BOOL pa ov65_02232F50(param0); - if (BGL_WindowAdded(¶m0->unk_360)) { + if (Window_IsInUse(¶m0->unk_360)) { sub_0200E084(¶m0->unk_360, 0); - BGL_DeleteWindow(¶m0->unk_360); + Window_Remove(¶m0->unk_360); } - if (BGL_WindowAdded(¶m0->unk_330)) { + if (Window_IsInUse(¶m0->unk_330)) { sub_0200E084(¶m0->unk_330, 0); - BGL_DeleteWindow(¶m0->unk_330); + Window_Remove(¶m0->unk_330); } if (param0->unk_180 != 8) { @@ -4748,7 +4748,7 @@ static void ov65_02232B58 (UnkStruct_ov65_0222EBE0 * param0, int param1, BOOL pa } } - BGL_AddWindow(param0->unk_15C, ¶m0->unk_330, 2, 2, 19, 27, 4, 12, (((512 - (18 + 12)) - 73) - (27 * 4))); + Window_Add(param0->unk_15C, ¶m0->unk_330, 2, 2, 19, 27, 4, 12, (((512 - (18 + 12)) - 73) - (27 * 4))); if (param2) { MessageLoader_GetStrbuf(param0->unk_16C, param1, param0->unk_170); @@ -4757,28 +4757,28 @@ static void ov65_02232B58 (UnkStruct_ov65_0222EBE0 * param0, int param1, BOOL pa } StringTemplate_Format(param0->unk_164, param0->unk_174, param0->unk_170); - BGL_FillWindow(¶m0->unk_330, 15); + Window_FillTilemap(¶m0->unk_330, 15); sub_0200E060(¶m0->unk_330, 1, (512 - (18 + 12)), 10); RenderControlFlags_SetCanABSpeedUpPrint(1); RenderControlFlags_SetAutoScrollFlags(0); param0->unk_180 = Text_AddPrinterWithParams(¶m0->unk_330, FONT_MESSAGE, param0->unk_174, 0, 0, v0, NULL); - sub_0201A9A4(¶m0->unk_330); + Window_ScheduleCopyToVRAM(¶m0->unk_330); } static void ov65_02232CA8 (UnkStruct_ov65_0222EBE0 * param0, int param1) { ov65_02232F50(param0); - if (BGL_WindowAdded(¶m0->unk_360)) { + if (Window_IsInUse(¶m0->unk_360)) { sub_0200E084(¶m0->unk_360, 0); - BGL_DeleteWindow(¶m0->unk_360); + Window_Remove(¶m0->unk_360); } - if (BGL_WindowAdded(¶m0->unk_330)) { + if (Window_IsInUse(¶m0->unk_330)) { sub_0200E084(¶m0->unk_330, 0); - BGL_DeleteWindow(¶m0->unk_330); + Window_Remove(¶m0->unk_330); } if (param0->unk_180 != 8) { @@ -4788,15 +4788,15 @@ static void ov65_02232CA8 (UnkStruct_ov65_0222EBE0 * param0, int param1) } } - BGL_AddWindow(param0->unk_15C, ¶m0->unk_360, 2, 4, 4, 23, 16, 12, (((512 - (18 + 12)) - 9) - (23 * 16))); + Window_Add(param0->unk_15C, ¶m0->unk_360, 2, 4, 4, 23, 16, 12, (((512 - (18 + 12)) - 9) - (23 * 16))); MessageLoader_GetStrbuf(param0->unk_16C, param1, param0->unk_170); StringTemplate_Format(param0->unk_164, param0->unk_174, param0->unk_170); - BGL_FillWindow(¶m0->unk_360, 15); + Window_FillTilemap(¶m0->unk_360, 15); Window_Show(¶m0->unk_360, 1, ((512 - (18 + 12)) - 9), 11); param0->unk_180 = Text_AddPrinterWithParams(¶m0->unk_360, 1, param0->unk_174, 0, 0, 0xff, NULL); - sub_0201A9A4(¶m0->unk_360); + Window_ScheduleCopyToVRAM(¶m0->unk_360); } static void ov65_02232DC0 (UnkStruct_ov65_0222EBE0 * param0, int param1) @@ -4821,9 +4821,9 @@ static void ov65_02232DFC (UnkStruct_ov65_0222EBE0 * param0) } } - if (BGL_WindowAdded(¶m0->unk_330)) { + if (Window_IsInUse(¶m0->unk_330)) { sub_0200E084(¶m0->unk_330, 0); - BGL_DeleteWindow(¶m0->unk_330); + Window_Remove(¶m0->unk_330); } } @@ -4898,9 +4898,9 @@ static void ov65_02232F50 (UnkStruct_ov65_0222EBE0 * param0) param0->unk_188 = NULL; - if (BGL_WindowAdded(¶m0->unk_330)) { + if (Window_IsInUse(¶m0->unk_330)) { sub_0200E084(¶m0->unk_330, 0); - BGL_DeleteWindow(¶m0->unk_330); + Window_Remove(¶m0->unk_330); } } } @@ -5141,7 +5141,7 @@ static void ov65_022332FC (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32 int v0, v1; int v2, v3; - sub_02019EBC(param0->unk_15C, 4); + Bg_ClearTilemap(param0->unk_15C, 4); sub_02007130(param1, 16, 4, 0 * 32, 4 * 32, param2); sub_02007130(param1, 19, 4, 4 * 32, 5 * 32, param2); sub_020070E8(param1, 15, param0->unk_15C, 4, 0, 0, 0, param2); @@ -5167,21 +5167,21 @@ static void ov65_022332FC (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32 v3 = v0 % 4; Window_Init(¶m0->unk_BE0.unk_7C[v0]); - BGL_AddWindow(param0->unk_15C, ¶m0->unk_BE0.unk_7C[v0], 5, 4 + (16 * v2), 1 + (6 * v3), 9, 3, 15, 1 + ((9 * 3) * v0)); - BGL_FillWindow(¶m0->unk_BE0.unk_7C[v0], 0); - sub_0201A9A4(¶m0->unk_BE0.unk_7C[v0]); + Window_Add(param0->unk_15C, ¶m0->unk_BE0.unk_7C[v0], 5, 4 + (16 * v2), 1 + (6 * v3), 9, 3, 15, 1 + ((9 * 3) * v0)); + Window_FillTilemap(¶m0->unk_BE0.unk_7C[v0], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_BE0.unk_7C[v0]); for (v1 = 0; v1 < 2; v1++) { Window_Init(¶m0->unk_BE0.unk_FC[v0][v1]); - BGL_AddWindow(param0->unk_15C, ¶m0->unk_BE0.unk_FC[v0][v1], 5, 1 + (16 * v2) + (v1 * 12), 1 + (6 * v3), 2, 3, 13, ((((9 * 3) * 8) + 1) + 1) + ((2 * 3) * ((v0 * 2) + v1))); - BGL_FillWindow(¶m0->unk_BE0.unk_FC[v0][v1], 0); - sub_0201A9A4(¶m0->unk_BE0.unk_FC[v0][v1]); + Window_Add(param0->unk_15C, ¶m0->unk_BE0.unk_FC[v0][v1], 5, 1 + (16 * v2) + (v1 * 12), 1 + (6 * v3), 2, 3, 13, ((((9 * 3) * 8) + 1) + 1) + ((2 * 3) * ((v0 * 2) + v1))); + Window_FillTilemap(¶m0->unk_BE0.unk_FC[v0][v1], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_BE0.unk_FC[v0][v1]); } } - BGL_AddWindow(param0->unk_15C, ¶m0->unk_BE0.unk_1FC, 7, 1, 1, 30, 21, 15, 1); - BGL_FillWindow(¶m0->unk_BE0.unk_1FC, 0); - sub_0201A9A4(¶m0->unk_BE0.unk_1FC); + Window_Add(param0->unk_15C, ¶m0->unk_BE0.unk_1FC, 7, 1, 1, 30, 21, 15, 1); + Window_FillTilemap(¶m0->unk_BE0.unk_1FC, 0); + Window_ScheduleCopyToVRAM(¶m0->unk_BE0.unk_1FC); ov65_02234A68(param0, param1, param2); } @@ -5193,14 +5193,14 @@ static void ov65_02233570 (UnkStruct_ov65_0222EBE0 * param0) ov65_02234CFC(param0); for (v0 = 0; v0 < 8; v0++) { - BGL_DeleteWindow(¶m0->unk_BE0.unk_7C[v0]); + Window_Remove(¶m0->unk_BE0.unk_7C[v0]); for (v1 = 0; v1 < 2; v1++) { - BGL_DeleteWindow(¶m0->unk_BE0.unk_FC[v0][v1]); + Window_Remove(¶m0->unk_BE0.unk_FC[v0][v1]); } } - BGL_DeleteWindow(¶m0->unk_BE0.unk_1FC); + Window_Remove(¶m0->unk_BE0.unk_1FC); Heap_FreeToHeap(param0->unk_BE0.unk_04); for (v0 = 0; v0 < 7; v0++) { @@ -5269,8 +5269,8 @@ static void ov65_022336C4 (UnkStruct_ov65_0222EBE0 * param0) static void ov65_022336D4 (UnkStruct_ov65_0222EBE0 * param0) { - sub_02019E2C(param0->unk_15C, 4, 0, 0, 32, 24, param0->unk_BE0.unk_70 + 0); - sub_0201C3C0(param0->unk_15C, 4); + Bg_ChangeTilemapRectPalette(param0->unk_15C, 4, 0, 0, 32, 24, param0->unk_BE0.unk_70 + 0); + Bg_ScheduleTilemapTransfer(param0->unk_15C, 4); } static void ov65_0223370C (UnkStruct_ov65_0222EBE0 * param0) @@ -5287,7 +5287,7 @@ static void ov65_0223370C (UnkStruct_ov65_0222EBE0 * param0) if (param0->unk_BE0.unk_78 == 1) { param0->unk_BE0.unk_78 = 0; v8 = 1; - sub_02019CB8(param0->unk_15C, 6, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_15C, 6, 0, 0, 0, 32, 24, 0); } else { v8 = 0; } @@ -5329,18 +5329,18 @@ static void ov65_0223370C (UnkStruct_ov65_0222EBE0 * param0) ov65_02234900(param0, ¶m0->unk_BE0.unk_7C[v0], v6, v7, v0); ov65_0223498C(param0, param0->unk_BE0.unk_FC[v0], v6, v7, v0); } else { - BGL_FillWindow(¶m0->unk_BE0.unk_7C[v0], 0); - sub_0201A9A4(¶m0->unk_BE0.unk_7C[v0]); + Window_FillTilemap(¶m0->unk_BE0.unk_7C[v0], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_BE0.unk_7C[v0]); for (v1 = 0; v1 < 2; v1++) { - BGL_FillWindow(¶m0->unk_BE0.unk_FC[v0][v1], 0); - sub_0201A9A4(¶m0->unk_BE0.unk_FC[v0][v1]); + Window_FillTilemap(¶m0->unk_BE0.unk_FC[v0][v1], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_BE0.unk_FC[v0][v1]); } } } } - sub_0201C3C0(param0->unk_15C, 6); + Bg_ScheduleTilemapTransfer(param0->unk_15C, 6); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); } @@ -5367,20 +5367,20 @@ static void ov65_02233874 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) v2 = 4 + 4; } - sub_02019574(param0->unk_15C, 6, param0->unk_BE0.unk_28[param0->unk_BE0.unk_74]->rawData, param0->unk_BE0.unk_28[param0->unk_BE0.unk_74]->szByte); - sub_02019E2C(param0->unk_15C, 6, 0, 0, 32, 24, v2); - sub_02019EBC(param0->unk_15C, 7); + Bg_LoadTilemapBuffer(param0->unk_15C, 6, param0->unk_BE0.unk_28[param0->unk_BE0.unk_74]->rawData, param0->unk_BE0.unk_28[param0->unk_BE0.unk_74]->szByte); + Bg_ChangeTilemapRectPalette(param0->unk_15C, 6, 0, 0, 32, 24, v2); + Bg_ClearTilemap(param0->unk_15C, 7); if (ov65_0222DCE0(param0) == 0) { ov65_02234628(param0); } - BGL_FillWindow(¶m0->unk_BE0.unk_1FC, 0x0); + Window_FillTilemap(¶m0->unk_BE0.unk_1FC, 0x0); v0[param0->unk_BE0.unk_74](param0, param1); - sub_0201C3C0(param0->unk_15C, 6); - sub_0201A9A4(¶m0->unk_BE0.unk_1FC); + Bg_ScheduleTilemapTransfer(param0->unk_15C, 6); + Window_ScheduleCopyToVRAM(¶m0->unk_BE0.unk_1FC); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1); } @@ -6392,10 +6392,10 @@ static void ov65_02234628 (UnkStruct_ov65_0222EBE0 * param0) v1 = 7 - 2; for (v0 = 0; v0 < v1; v0++) { - sub_020198E8(param0->unk_15C, 6, 0x1a + (0x1 * v0), 0, 0x1, 0x1, param0->unk_BE0.unk_48->rawData, 0, 0, param0->unk_BE0.unk_48->screenWidth / 8, param0->unk_BE0.unk_48->screenHeight / 8); + Bg_CopyToTilemapRect(param0->unk_15C, 6, 0x1a + (0x1 * v0), 0, 0x1, 0x1, param0->unk_BE0.unk_48->rawData, 0, 0, param0->unk_BE0.unk_48->screenWidth / 8, param0->unk_BE0.unk_48->screenHeight / 8); } - sub_02019E2C(param0->unk_15C, 6, 0x1a, 0, (0x1 * v1), 0x1, 4 + 2); + Bg_ChangeTilemapRectPalette(param0->unk_15C, 6, 0x1a, 0, (0x1 * v1), 0x1, 4 + 2); } static void ov65_02234694 (UnkStruct_ov65_0222EBE0 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) @@ -6459,16 +6459,16 @@ static void ov65_02234788 (UnkStruct_ov65_0222EBE0 * param0, u8 param1, u8 param v0 = 16 * param4; v1 = 6 * param3; - sub_020198E8(param0->unk_15C, 6, param1, param2, 16, 6, param0->unk_BE0.unk_08->rawData, v0, v1, 32, 18); + Bg_CopyToTilemapRect(param0->unk_15C, 6, param1, param2, 16, 6, param0->unk_BE0.unk_08->rawData, v0, v1, 32, 18); } else { v0 = 0; v1 = 6 * param3; v2 = (u16 *)param0->unk_BE0.unk_08->rawData; - sub_020198E8(param0->unk_15C, 6, param1, param2, 16, 6, &v2[32 * 18], v0, v1, 16, 18); + Bg_CopyToTilemapRect(param0->unk_15C, 6, param1, param2, 16, 6, &v2[32 * 18], v0, v1, 16, 18); } - sub_02019E2C(param0->unk_15C, 6, param1, param2, 16, 6, param3 + 4); + Bg_ChangeTilemapRectPalette(param0->unk_15C, 6, param1, param2, 16, 6, param3 + 4); } static u32 ov65_0223484C(u32 param0, TextColor *param1) @@ -6558,7 +6558,7 @@ static void ov65_02234900 (UnkStruct_ov65_0222EBE0 * param0, Window * param1, u3 TextColor v1; int v2; - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); v2 = Unk_ov65_02238934[param3]; v0 = sub_0202AD2C(param0->unk_00, param2 - 1, 8); @@ -6574,7 +6574,7 @@ static void ov65_02234900 (UnkStruct_ov65_0222EBE0 * param0, Window * param1, u3 MessageLoader_GetStrbuf(param0->unk_168, 42, param0->unk_170); StringTemplate_Format(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); Text_AddPrinterWithParamsAndColor(param1, FONT_MESSAGE, param0->unk_178, 0, v2, TEXT_SPEED_NO_TRANSFER, v1, NULL); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); } static void ov65_0223498C (UnkStruct_ov65_0222EBE0 * param0, Window * param1, u32 param2, u32 param3, u32 param4) @@ -6590,7 +6590,7 @@ static void ov65_0223498C (UnkStruct_ov65_0222EBE0 * param0, Window * param1, u3 v0 = Unk_ov65_02238934[param3]; for (v1 = 0; v1 < 2; v1++) { - BGL_FillWindow(¶m1[v1], 0); + Window_FillTilemap(¶m1[v1], 0); if (v1 == 0) { ov65_0222EB1C(¶m1[v1], ¶m0->unk_BD0, 0, v0, v4); @@ -6604,7 +6604,7 @@ static void ov65_0223498C (UnkStruct_ov65_0222EBE0 * param0, Window * param1, u3 ov65_0222EAD0(¶m1[v1], ¶m0->unk_BD0, 0, v0, v2, 0); } - sub_0201A9A4(¶m1[v1]); + Window_ScheduleCopyToVRAM(¶m1[v1]); } } @@ -6707,7 +6707,7 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32 Font_InitManager(FONT_SUBSCREEN, param2); Window_Init(&v3); - BGL_AddFramelessWindow(param0->unk_15C, &v3, 8, 2, 0, 0); + Window_AddToTopLeftCorner(param0->unk_15C, &v3, 8, 2, 0, 0); v4 = Strbuf_Init(64, param2); MessageLoader_GetStrbuf(param0->unk_168, 73, v4); @@ -6741,7 +6741,7 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32 param0->unk_BE0.unk_234 = sub_02012B60(&v7, v5); sub_02012B48(v5); - BGL_DeleteWindow(&v3); + Window_Remove(&v3); Font_Free(FONT_SUBSCREEN); param0->unk_BE0.unk_244 = sub_02023FCC(Unk_ov65_0223895C, 3, ov65_02234E40, param0, param2); diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c index e04c3f1717..33da31d812 100644 --- a/src/overlay065/ov65_02235060.c +++ b/src/overlay065/ov65_02235060.c @@ -639,7 +639,7 @@ static void ov65_0223591C(BgConfig *param0) static void ov65_02235920(BgConfig *param0, u32 param1, NARC *param2) { sub_02007130(param2, 30, 0, 0, 8 * 32, param1); - sub_0201975C(0, 0); + Bg_MaskPalette(0, 0); sub_020070E8(param2, 29, param0, 0, 0, 0, 0, param1); } diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 20ee23c10c..d348282283 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -568,7 +568,7 @@ static void ov65_02236780(void *param0) { UnkStruct_ov65_022367A8 *v0 = param0; - sub_0201C2B8(v0->unk_30.unk_00); + Bg_RunScheduledUpdates(v0->unk_30.unk_00); sub_0201DCAC(); sub_0200A858(); } @@ -623,7 +623,7 @@ static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1) { NARC *v0; - param0->unk_00 = sub_02018340(param1); + param0->unk_00 = BgConfig_New(param1); { GraphicsModes v1 = { @@ -633,7 +633,7 @@ static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1) GX_BG0_AS_2D, }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -653,9 +653,9 @@ static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1) 0 }; - sub_020183C4(param0->unk_00, 0, &v2, 0); - sub_02019690(0, 32, 0, param1); - sub_02019EBC(param0->unk_00, 0); + Bg_InitFromTemplate(param0->unk_00, 0, &v2, 0); + Bg_ClearTilesRange(0, 32, 0, param1); + Bg_ClearTilemap(param0->unk_00, 0); } { @@ -675,9 +675,9 @@ static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1) 0 }; - sub_020183C4(param0->unk_00, 1, &v3, 0); - sub_02019690(1, 32, 0, param1); - sub_02019EBC(param0->unk_00, 1); + Bg_InitFromTemplate(param0->unk_00, 1, &v3, 0); + Bg_ClearTilesRange(1, 32, 0, param1); + Bg_ClearTilemap(param0->unk_00, 1); } { @@ -697,9 +697,9 @@ static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1) 0 }; - sub_020183C4(param0->unk_00, 2, &v4, 0); - sub_02019690(2, 32, 0, param1); - sub_02019EBC(param0->unk_00, 2); + Bg_InitFromTemplate(param0->unk_00, 2, &v4, 0); + Bg_ClearTilesRange(2, 32, 0, param1); + Bg_ClearTilemap(param0->unk_00, 2); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 0); @@ -735,9 +735,9 @@ static void ov65_022369F0(UnkStruct_ov65_02236840 *param0) { Heap_FreeToHeap(param0->unk_244); Heap_FreeToHeap(param0->unk_250); - sub_02019044(param0->unk_00, 2); - sub_02019044(param0->unk_00, 1); - sub_02019044(param0->unk_00, 0); + Bg_FreeTilemapBuffer(param0->unk_00, 2); + Bg_FreeTilemapBuffer(param0->unk_00, 1); + Bg_FreeTilemapBuffer(param0->unk_00, 0); Heap_FreeToHeap(param0->unk_00); } @@ -752,19 +752,19 @@ static void ov65_02236A28(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D sub_0200DD0C(param0->unk_00, 1, 1, 2, v0, param2); sub_0200DAA4(param0->unk_00, 1, (1 + (18 + 12)), 3, 0, param2); sub_0200DAA4(param0->unk_00, 2, (0 + (24 * 2)), 4, 0, param2); - BGL_AddWindow(param0->unk_00, ¶m0->unk_1F0, 1, 2, 19, 27, 4, 1, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_1F0, 15); + Window_Add(param0->unk_00, ¶m0->unk_1F0, 1, 2, 19, 27, 4, 1, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_1F0, 15); sub_0200E060(¶m0->unk_1F0, 1, 1, 2); - BGL_AddWindow(param0->unk_00, ¶m0->unk_200, 1, 1, 1, 27, 2, 1, (((1 + (18 + 12)) + 9) + (27 * 4))); - BGL_FillWindow(¶m0->unk_200, 15); + Window_Add(param0->unk_00, ¶m0->unk_200, 1, 1, 1, 27, 2, 1, (((1 + (18 + 12)) + 9) + (27 * 4))); + Window_FillTilemap(¶m0->unk_200, 15); Window_Show(¶m0->unk_200, 1, (1 + (18 + 12)), 3); - BGL_AddWindow(param0->unk_00, ¶m0->unk_210, 1, 2, 16, 28, 2, 1, ((((1 + (18 + 12)) + 9) + (27 * 4)) + (27 * 2))); - BGL_FillWindow(¶m0->unk_210, 0); - BGL_AddWindow(param0->unk_00, ¶m0->unk_220, 1, 1, 5, 20, 8, 1, (((((1 + (18 + 12)) + 9) + (27 * 4)) + (27 * 2)) + (28 * 2))); - BGL_FillWindow(¶m0->unk_220, 15); + Window_Add(param0->unk_00, ¶m0->unk_210, 1, 2, 16, 28, 2, 1, ((((1 + (18 + 12)) + 9) + (27 * 4)) + (27 * 2))); + Window_FillTilemap(¶m0->unk_210, 0); + Window_Add(param0->unk_00, ¶m0->unk_220, 1, 1, 5, 20, 8, 1, (((((1 + (18 + 12)) + 9) + (27 * 4)) + (27 * 2)) + (28 * 2))); + Window_FillTilemap(¶m0->unk_220, 15); Window_Show(¶m0->unk_220, 1, (1 + (18 + 12)), 3); - BGL_AddWindow(param0->unk_00, ¶m0->unk_230, 1, 23, 5, 7, 5, 1, ((((((1 + (18 + 12)) + 9) + (27 * 4)) + (27 * 2)) + (28 * 2)) + (20 * 8))); - BGL_FillWindow(¶m0->unk_230, 15); + Window_Add(param0->unk_00, ¶m0->unk_230, 1, 23, 5, 7, 5, 1, ((((((1 + (18 + 12)) + 9) + (27 * 4)) + (27 * 2)) + (28 * 2)) + (20 * 8))); + Window_FillTilemap(¶m0->unk_230, 15); } static void ov65_02236B90(UnkStruct_ov65_02236840 *param0, u32 param1) @@ -772,14 +772,14 @@ static void ov65_02236B90(UnkStruct_ov65_02236840 *param0, u32 param1) ov65_02236F38(param0); sub_0200E084(¶m0->unk_1F0, 0); - BGL_DeleteWindow(¶m0->unk_1F0); + Window_Remove(¶m0->unk_1F0); Window_Clear(¶m0->unk_200, 0); - BGL_DeleteWindow(¶m0->unk_200); - BGL_DeleteWindow(¶m0->unk_210); + Window_Remove(¶m0->unk_200); + Window_Remove(¶m0->unk_210); Window_Clear(¶m0->unk_220, 0); - BGL_DeleteWindow(¶m0->unk_220); + Window_Remove(¶m0->unk_220); Window_Clear(¶m0->unk_230, 0); - BGL_DeleteWindow(¶m0->unk_230); + Window_Remove(¶m0->unk_230); if (param0->unk_240 != NULL) { sub_02002154(param0->unk_240, param1); @@ -823,12 +823,12 @@ static void ov65_02236C7C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D MessageLoader_GetStrbuf(param0->unk_08, Unk_ov65_02239E5C[param1->unk_00], param0->unk_10); StringTemplate_Format(param0->unk_04, param0->unk_0C, param0->unk_10); Text_AddPrinterWithParamsAndColor(¶m0->unk_200, FONT_SYSTEM, param0->unk_0C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); - sub_0201A9A4(¶m0->unk_200); - sub_0201A9A4(¶m0->unk_220); + Window_ScheduleCopyToVRAM(¶m0->unk_200); + Window_ScheduleCopyToVRAM(¶m0->unk_220); MessageLoader_GetStrbuf(param0->unk_08, 128, param0->unk_0C); Text_AddPrinterWithParamsAndColor(¶m0->unk_210, FONT_SYSTEM, param0->unk_0C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A9A4(¶m0->unk_210); - sub_0201A9A4(¶m0->unk_1F0); + Window_ScheduleCopyToVRAM(¶m0->unk_210); + Window_ScheduleCopyToVRAM(¶m0->unk_1F0); } static void ov65_02236D50(UnkStruct_ov65_02236840 *param0, u32 param1) @@ -898,7 +898,7 @@ static void ov65_02236E50(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D } } - BGL_FillWindow(¶m0->unk_1F0, 15); + Window_FillTilemap(¶m0->unk_1F0, 15); v0 = Strbuf_Init(256, param4); MessageLoader_GetStrbuf(param0->unk_08, param2, v0); @@ -906,7 +906,7 @@ static void ov65_02236E50(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D param0->unk_14 = Text_AddPrinterWithParamsAndColor(¶m0->unk_1F0, FONT_MESSAGE, param0->unk_0C, 0, 0, param0->unk_16, TEXT_COLOR(1, 2, 15), NULL); - sub_0201A9A4(¶m0->unk_1F0); + Window_ScheduleCopyToVRAM(¶m0->unk_1F0); Strbuf_Free(v0); v1 = Options_Frame(SaveData_Options(param1->unk_08)); @@ -948,8 +948,8 @@ static void ov65_02236F38(UnkStruct_ov65_02236840 *param0) param0->unk_14 = 0xff; } - BGL_FillWindow(¶m0->unk_1F0, 15); - sub_0201A9A4(¶m0->unk_1F0); + Window_FillTilemap(¶m0->unk_1F0, 15); + Window_ScheduleCopyToVRAM(¶m0->unk_1F0); param0->unk_15 = 0; } @@ -968,10 +968,10 @@ static void ov65_02236F70(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D MessageLoader_GetStrbuf(param0->unk_08, 131, v0); StringTemplate_Format(param0->unk_04, v1, v0); - BGL_FillWindow(¶m0->unk_230, 15); + Window_FillTilemap(¶m0->unk_230, 15); Text_AddPrinterWithParamsAndColor(¶m0->unk_230, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); Window_Show(¶m0->unk_230, 1, (1 + (18 + 12)), 3); - sub_0201A9A4(¶m0->unk_230); + Window_ScheduleCopyToVRAM(¶m0->unk_230); Strbuf_Free(v0); Strbuf_Free(v1); @@ -980,7 +980,7 @@ static void ov65_02236F70(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D static void ov65_02237018(UnkStruct_ov65_02236840 *param0) { Window_Clear(¶m0->unk_230, 1); - sub_0201AD10(¶m0->unk_230); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_230); } static void ov65_02237034(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2) @@ -1019,7 +1019,7 @@ static void ov65_0223709C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_022368 MessageLoader_GetStrbuf(param1->unk_08, 129, v0); StringTemplate_Format(param1->unk_04, v1, v0); - BGL_WindowColor(¶m1->unk_220, 15, 0, param3 * (2 * 8), (20 * 8), (2 * 8)); + Window_FillRectWithColor(¶m1->unk_220, 15, 0, param3 * (2 * 8), (20 * 8), (2 * 8)); Text_AddPrinterWithParamsAndColor(¶m1->unk_220, FONT_SYSTEM, v1, 0, param3 * (2 * 8), TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); ov65_02237284(param1, param2, param3, 0, param4); @@ -1027,7 +1027,7 @@ static void ov65_0223709C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_022368 MessageLoader_GetStrbuf(param1->unk_08, 130, v0); StringTemplate_Format(param1->unk_04, v1, v0); Text_AddPrinterWithParamsAndColor(¶m1->unk_220, FONT_SYSTEM, v1, 72, param3 * (2 * 8), TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); - sub_0201A9A4(¶m1->unk_220); + Window_ScheduleCopyToVRAM(¶m1->unk_220); if (param3 == CommSys_CurNetId()) { if (param0->unk_00.unk_00->unk_00.unk_21) { @@ -1045,19 +1045,19 @@ static void ov65_0223709C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_022368 } } - sub_020198E8(param1->unk_00, 2, 18, 5 + (param3 * 2), 2, 2, param1->unk_248->rawData, v2 * 2, 0, param1->unk_248->screenWidth / 8, param1->unk_248->screenHeight / 8); - sub_02019E2C(param1->unk_00, 2, 18, 5 + (param3 * 2), 2, 2, 5); - sub_0201C3C0(param1->unk_00, 2); + Bg_CopyToTilemapRect(param1->unk_00, 2, 18, 5 + (param3 * 2), 2, 2, param1->unk_248->rawData, v2 * 2, 0, param1->unk_248->screenWidth / 8, param1->unk_248->screenHeight / 8); + Bg_ChangeTilemapRectPalette(param1->unk_00, 2, 18, 5 + (param3 * 2), 2, 2, 5); + Bg_ScheduleTilemapTransfer(param1->unk_00, 2); Strbuf_Free(v0); Strbuf_Free(v1); } static void ov65_022371FC(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 param3) { - BGL_WindowColor(¶m0->unk_220, 15, 0, param2 * (2 * 8), (20 * 8), (2 * 8)); - sub_020198E8(param0->unk_00, 2, 18, 5 + param2 * 2, 2, 2, param0->unk_248->rawData, 0 * 2, 0, param0->unk_248->screenWidth / 8, param0->unk_248->screenHeight / 8); - sub_0201C3C0(param0->unk_00, 2); - sub_0201A9A4(¶m0->unk_220); + Window_FillRectWithColor(¶m0->unk_220, 15, 0, param2 * (2 * 8), (20 * 8), (2 * 8)); + Bg_CopyToTilemapRect(param0->unk_00, 2, 18, 5 + param2 * 2, 2, 2, param0->unk_248->rawData, 0 * 2, 0, param0->unk_248->screenWidth / 8, param0->unk_248->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param0->unk_00, 2); + Window_ScheduleCopyToVRAM(¶m0->unk_220); } static void ov65_0223726C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 param4) diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 8d5afbbe31..857dfae0a5 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -558,19 +558,19 @@ static void ov67_0225CE30(UnkStruct_ov67_0225D154 *param0, u32 param1) GXLayers_SetBanks(&Unk_ov67_0225D410); { - sub_0201975C(Unk_ov67_0225D3F4[0], 0); + Bg_MaskPalette(Unk_ov67_0225D3F4[0], 0); } { int v0; - sub_02018368(&Unk_ov67_0225D400); - param0->unk_0C = sub_02018340(param1); + SetAllGraphicsModes(&Unk_ov67_0225D400); + param0->unk_0C = BgConfig_New(param1); for (v0 = 0; v0 < 3; v0++) { - sub_020183C4(param0->unk_0C, Unk_ov67_0225D3F4[v0], &Unk_ov67_0225D438[v0], 0); - sub_02019690(Unk_ov67_0225D3F4[v0], 32, 0, param1); - sub_02019EBC(param0->unk_0C, Unk_ov67_0225D3F4[v0]); + Bg_InitFromTemplate(param0->unk_0C, Unk_ov67_0225D3F4[v0], &Unk_ov67_0225D438[v0], 0); + Bg_ClearTilesRange(Unk_ov67_0225D3F4[v0], 32, 0, param1); + Bg_ClearTilemap(param0->unk_0C, Unk_ov67_0225D3F4[v0]); } } @@ -615,7 +615,7 @@ static void ov67_0225D154(UnkStruct_ov67_0225D154 *param0) int v0; for (v0 = 0; v0 < 3; v0++) { - sub_02019044(param0->unk_0C, Unk_ov67_0225D3F4[v0]); + Bg_FreeTilemapBuffer(param0->unk_0C, Unk_ov67_0225D3F4[v0]); } Heap_FreeToHeap(param0->unk_0C); @@ -624,7 +624,7 @@ static void ov67_0225D154(UnkStruct_ov67_0225D154 *param0) static void ov67_0225D17C(UnkStruct_ov67_0225D154 *param0) { - sub_0201C2B8(param0->unk_0C); + Bg_RunScheduledUpdates(param0->unk_0C); } static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *param9, u32 param10) @@ -637,7 +637,7 @@ static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BgConfig *param1, u32 param0->unk_28 = Options_TextFrameDelay(SaveData_Options(param9)); param0->unk_2C = 0; - BGL_AddWindow(param1, ¶m0->unk_08, Unk_ov67_0225D3F4[1], param4, param5, param6, param7, 11, param8); + Window_Add(param1, ¶m0->unk_08, Unk_ov67_0225D3F4[1], param4, param5, param6, param7, 11, param8); } static void ov67_0225D210(UnkStruct_ov67_0225D210 *param0, u32 param1) @@ -646,7 +646,7 @@ static void ov67_0225D210(UnkStruct_ov67_0225D210 *param0, u32 param1) Text_RemovePrinter(param0->unk_2C); } - BGL_FillWindow(¶m0->unk_08, 15); + Window_FillTilemap(¶m0->unk_08, 15); MessageLoader_GetStrbuf(param0->unk_04, param1, param0->unk_1C); StringTemplate_Format(param0->unk_00, param0->unk_18, param0->unk_1C); Text_AddPrinterWithParams(¶m0->unk_08, FONT_MESSAGE, param0->unk_18, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); @@ -657,7 +657,7 @@ static void ov67_0225D210(UnkStruct_ov67_0225D210 *param0, u32 param1) sub_0200E060(¶m0->unk_08, 1, 1, 13); } - sub_0201A9A4(¶m0->unk_08); + Window_ScheduleCopyToVRAM(¶m0->unk_08); } static void ov67_0225D294(UnkStruct_ov67_0225D210 *param0) @@ -668,14 +668,14 @@ static void ov67_0225D294(UnkStruct_ov67_0225D210 *param0) if (param0->unk_20 == 0) { Window_Clear(¶m0->unk_08, 1); - sub_0201AD10(¶m0->unk_08); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08); } else { if (param0->unk_24) { ov67_0225D310(param0); } sub_0200E084(¶m0->unk_08, 1); - sub_0201AD10(¶m0->unk_08); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08); } } @@ -706,7 +706,7 @@ static void ov67_0225D330(UnkStruct_ov67_0225D210 *param0) ov67_0225D310(param0); } - BGL_DeleteWindow(¶m0->unk_08); + Window_Remove(¶m0->unk_08); Strbuf_Free(param0->unk_1C); Strbuf_Free(param0->unk_18); MessageLoader_Free(param0->unk_04); @@ -715,7 +715,7 @@ static void ov67_0225D330(UnkStruct_ov67_0225D210 *param0) static void ov67_0225D37C(UnkStruct_ov67_0225D210 *param0, u32 param1) { - BGL_FillWindow(¶m0->unk_08, 0); + Window_FillTilemap(¶m0->unk_08, 0); MessageLoader_GetStrbuf(param0->unk_04, param1, param0->unk_1C); StringTemplate_Format(param0->unk_00, param0->unk_18, param0->unk_1C); Text_AddPrinterWithParamsAndColor(¶m0->unk_08, FONT_MESSAGE, param0->unk_18, Font_CalcCenterAlignment(FONT_SYSTEM, param0->unk_18, 0, 0xB0), 0, TEXT_SPEED_INSTANT, TEXT_COLOR(15, 14, 0), 0); diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index 2992d67039..36ad28c69c 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -463,16 +463,16 @@ static void ov68_0225C980(UnkStruct_ov68_0225C91C *param0) static void ov68_0225C98C(UnkStruct_ov68_0225C91C *param0) { - sub_0201C2B8(param0->unk_00); + Bg_RunScheduledUpdates(param0->unk_00); sub_0200A858(); sub_0201DCAC(); } static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 param2) { - sub_02018368(&Unk_ov68_0225DD48); + SetAllGraphicsModes(&Unk_ov68_0225DD48); - param0->unk_00 = sub_02018340(param2); + param0->unk_00 = BgConfig_New(param2); gCoreSys.unk_65 = 0; GXLayers_SwapDisplay(); @@ -481,9 +481,9 @@ static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 int v0; for (v0 = 0; v0 < 4; v0++) { - sub_020183C4(param0->unk_00, Unk_ov68_0225DD68[v0], &Unk_ov68_0225DE18[v0], 0); - sub_02019690(Unk_ov68_0225DD68[v0], 32, 0, param2); - sub_02019EBC(param0->unk_00, Unk_ov68_0225DD68[v0]); + Bg_InitFromTemplate(param0->unk_00, Unk_ov68_0225DD68[v0], &Unk_ov68_0225DE18[v0], 0); + Bg_ClearTilesRange(Unk_ov68_0225DD68[v0], 32, 0, param2); + Bg_ClearTilemap(param0->unk_00, Unk_ov68_0225DD68[v0]); } } @@ -509,7 +509,7 @@ static void ov68_0225CA8C(UnkStruct_ov68_0225C91C *param0) int v0; for (v0 = 0; v0 < 4; v0++) { - sub_02019044(param0->unk_00, Unk_ov68_0225DD68[v0]); + Bg_FreeTilemapBuffer(param0->unk_00, Unk_ov68_0225DD68[v0]); } } @@ -708,7 +708,7 @@ static void ov68_0225CCD0(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB int v3; for (v3 = 0; v3 < 1; v3++) { - sub_0201A8D4(param2->unk_00, ¶m0->unk_00[v3], &Unk_ov68_0225DD40[v3]); + Window_AddFromTemplate(param2->unk_00, ¶m0->unk_00[v3], &Unk_ov68_0225DD40[v3]); } } @@ -852,7 +852,7 @@ static void ov68_0225D02C(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB int v0; for (v0 = 0; v0 < 1; v0++) { - BGL_DeleteWindow(¶m0->unk_00[v0]); + Window_Remove(¶m0->unk_00[v0]); } } @@ -876,7 +876,7 @@ static void ov68_0225D06C(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB { Strbuf *v0; - BGL_FillWindow(¶m0->unk_00[0], 0); + Window_FillTilemap(¶m0->unk_00[0], 0); v0 = ov68_0225DC58(¶m0->unk_2C, param1, 0); Text_AddPrinterWithParamsAndColor(¶m0->unk_00[0], FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); @@ -886,7 +886,7 @@ static void ov68_0225D06C(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB v0 = ov68_0225DC58(¶m0->unk_2C, param1, 2); Text_AddPrinterWithParamsAndColor(¶m0->unk_00[0], FONT_MESSAGE, v0, 0, 48, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A9A4(¶m0->unk_00[0]); + Window_ScheduleCopyToVRAM(¶m0->unk_00[0]); } static void ov68_0225D0F8(UnkStruct_ov68_0225D0F8 *param0) @@ -902,8 +902,8 @@ static void ov68_0225D11C(UnkStruct_ov68_0225D0F8 *param0) static void ov68_0225D128(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C91C *param1, SaveData *param2, u32 param3) { - BGL_AddWindow(param1->unk_00, ¶m0->unk_08, 1, 2, 19, 27, 4, 4, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_08, 15); + Window_Add(param1->unk_00, ¶m0->unk_08, 1, 2, 19, 27, 4, 4, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_08, 15); param0->unk_18 = Strbuf_Init(256, param3); @@ -924,7 +924,7 @@ static void ov68_0225D178(UnkStruct_ov68_0225D128 *param0, u32 param1) ov68_0225D2A0(param0); Strbuf_Free(param0->unk_18); - BGL_DeleteWindow(¶m0->unk_08); + Window_Remove(¶m0->unk_08); ov68_0225D348(param0, param1); } @@ -935,7 +935,7 @@ static void ov68_0225D1B4(UnkStruct_ov68_0225D128 *param0, const Strbuf *param1) Text_RemovePrinter(param0->unk_00); } - BGL_FillWindow(¶m0->unk_08, 15); + Window_FillTilemap(¶m0->unk_08, 15); Strbuf_Copy(param0->unk_18, param1); param0->unk_00 = Text_AddPrinterWithParamsAndColor(¶m0->unk_08, FONT_MESSAGE, param0->unk_18, 0, 0, param0->unk_04, TEXT_COLOR(1, 2, 15), NULL); sub_0200E060(¶m0->unk_08, 1, 1, 5); @@ -947,11 +947,11 @@ static void ov68_0225D218(UnkStruct_ov68_0225D128 *param0, const Strbuf *param1) Text_RemovePrinter(param0->unk_00); } - BGL_FillWindow(¶m0->unk_08, 15); + Window_FillTilemap(¶m0->unk_08, 15); Strbuf_Copy(param0->unk_18, param1); Text_AddPrinterWithParamsAndColor(¶m0->unk_08, FONT_MESSAGE, param0->unk_18, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); sub_0200E060(¶m0->unk_08, 1, 1, 5); - sub_0201A9A4(¶m0->unk_08); + Window_ScheduleCopyToVRAM(¶m0->unk_08); } static void ov68_0225D284(UnkStruct_ov68_0225D128 *param0) @@ -986,7 +986,7 @@ static void ov68_0225D2CC(UnkStruct_ov68_0225D128 *param0) ov68_0225D2A0(param0); sub_0200E084(¶m0->unk_08, 1); - sub_0201AD10(¶m0->unk_08); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08); } static void ov68_0225D304(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C91C *param1, u32 param2) @@ -1043,7 +1043,7 @@ static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB int v0; for (v0 = 0; v0 < 6; v0++) { - sub_0201A8D4(param2->unk_00, ¶m0->unk_00[v0], &Unk_ov68_0225DDE8[v0]); + Window_AddFromTemplate(param2->unk_00, ¶m0->unk_00[v0], &Unk_ov68_0225DDE8[v0]); } } @@ -1291,7 +1291,7 @@ static void ov68_0225D868(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB int v0; for (v0 = 0; v0 < 6; v0++) { - BGL_DeleteWindow(¶m0->unk_00[v0]); + Window_Remove(¶m0->unk_00[v0]); } } } @@ -1302,22 +1302,22 @@ static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB u32 v1; s32 v2; - BGL_FillWindow(¶m0->unk_00[0], 0); + Window_FillTilemap(¶m0->unk_00[0], 0); v0 = ov68_0225CBEC(param1, 0, param2); v1 = Font_CalcStrbufWidth(FONT_MESSAGE, v0, 0); v2 = ((18 * 8) - v1) / 2; Text_AddPrinterWithParamsAndColor(¶m0->unk_00[0], FONT_MESSAGE, v0, v2, 4, TEXT_SPEED_NO_TRANSFER, param3, NULL); - sub_0201A9A4(¶m0->unk_00[0]); + Window_ScheduleCopyToVRAM(¶m0->unk_00[0]); } static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, u32 param5, u32 param6, u32 param7, BOOL param8) { Strbuf *v0; - BGL_FillWindow(¶m0->unk_00[1], 0); - BGL_FillWindow(¶m0->unk_00[5], 0); + Window_FillTilemap(¶m0->unk_00[1], 0); + Window_FillTilemap(¶m0->unk_00[5], 0); v0 = ov68_0225DC58(param1, param2, 0); Text_AddPrinterWithParamsAndColor(¶m0->unk_00[1], FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, param6, NULL); @@ -1354,8 +1354,8 @@ static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_ Text_AddPrinterWithParamsAndColor(¶m0->unk_00[5], FONT_MESSAGE, v0, (12 * 8) + v2, 0, TEXT_SPEED_NO_TRANSFER, param6, NULL); } - sub_0201A9A4(¶m0->unk_00[5]); - sub_0201A9A4(¶m0->unk_00[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_00[5]); + Window_ScheduleCopyToVRAM(¶m0->unk_00[1]); } static void ov68_0225DA30(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DC74 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3) @@ -1368,8 +1368,8 @@ static void ov68_0225DA30(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_ param0->unk_68[v0] = 0; param0->unk_74[v0] = ov68_0225DCA4(param1, v0, 80); - sub_0201C2B4(¶m0->unk_00[2 + v0], param3); - BGL_FillWindow(¶m0->unk_00[2 + v0], 0); + Window_SetPalette(¶m0->unk_00[2 + v0], param3); + Window_FillTilemap(¶m0->unk_00[2 + v0], 0); } } @@ -1407,10 +1407,10 @@ static BOOL ov68_0225DA74(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225C9 } for (v4 = 0; v4 < v2; v4++) { - sub_0201ADDC(¶m0->unk_00[2 + v3], param0->unk_84->pRawData, 247, 16, 256, 32, 4 + v1 + v4, 0, 1, 16); + Window_BlitBitmapRect(¶m0->unk_00[2 + v3], param0->unk_84->pRawData, 247, 16, 256, 32, 4 + v1 + v4, 0, 1, 16); } - sub_0201A9A4(¶m0->unk_00[2 + v3]); + Window_ScheduleCopyToVRAM(¶m0->unk_00[2 + v3]); } if (v5 == 3) { @@ -1430,8 +1430,8 @@ static void ov68_0225DB3C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB int v0; for (v0 = 0; v0 < 6; v0++) { - BGL_FillWindow(¶m0->unk_00[v0], 0); - sub_0201A954(¶m0->unk_00[v0]); + Window_FillTilemap(¶m0->unk_00[v0], 0); + Window_CopyToVRAM(¶m0->unk_00[v0]); } } diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index 29cdee0246..c923f574ec 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -1400,16 +1400,16 @@ static void ov69_0225D384(UnkStruct_ov69_0225D35C *param0) static void ov69_0225D390(UnkStruct_ov69_0225D35C *param0) { - sub_0201C2B8(param0->unk_00); + Bg_RunScheduledUpdates(param0->unk_00); sub_0200A858(); sub_0201DCAC(); } static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2) { - sub_02018368(&Unk_ov69_0225F040); + SetAllGraphicsModes(&Unk_ov69_0225F040); - param0->unk_00 = sub_02018340(param2); + param0->unk_00 = BgConfig_New(param2); gCoreSys.unk_65 = 1; GXLayers_SwapDisplay(); @@ -1418,9 +1418,9 @@ static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 int v0; for (v0 = 0; v0 < 5; v0++) { - sub_020183C4(param0->unk_00, Unk_ov69_0225F060[v0], &Unk_ov69_0225F154[v0], 0); - sub_02019690(Unk_ov69_0225F060[v0], 32, 0, param2); - sub_02019EBC(param0->unk_00, Unk_ov69_0225F060[v0]); + Bg_InitFromTemplate(param0->unk_00, Unk_ov69_0225F060[v0], &Unk_ov69_0225F154[v0], 0); + Bg_ClearTilesRange(Unk_ov69_0225F060[v0], 32, 0, param2); + Bg_ClearTilemap(param0->unk_00, Unk_ov69_0225F060[v0]); } } @@ -1448,7 +1448,7 @@ static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 sub_0200DD0C(param0->unk_00, 1, 1, 2, v1, param2); } - sub_0201975C(0, 0x72ca); + Bg_MaskPalette(0, 0x72ca); } static void ov69_0225D504(UnkStruct_ov69_0225D35C *param0) @@ -1457,7 +1457,7 @@ static void ov69_0225D504(UnkStruct_ov69_0225D35C *param0) int v0; for (v0 = 0; v0 < 5; v0++) { - sub_02019044(param0->unk_00, Unk_ov69_0225F060[v0]); + Bg_FreeTilemapBuffer(param0->unk_00, Unk_ov69_0225F060[v0]); } } @@ -1827,8 +1827,8 @@ static void ov69_0225DBB4(UnkStruct_ov69_0225DC48 *param0, UnkStruct_ov69_0225D3 { memset(param0, 0, sizeof(UnkStruct_ov69_0225DC48)); - BGL_AddWindow(param1->unk_00, ¶m0->unk_1C, 1, 25, 21, 6, 2, 1, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_1C, 15); + Window_Add(param1->unk_00, ¶m0->unk_1C, 1, 25, 21, 6, 2, 1, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_1C, 15); { Strbuf *v0; @@ -1849,7 +1849,7 @@ static void ov69_0225DBB4(UnkStruct_ov69_0225DC48 *param0, UnkStruct_ov69_0225D3 static void ov69_0225DC48(UnkStruct_ov69_0225DC48 *param0) { - BGL_DeleteWindow(¶m0->unk_1C); + Window_Remove(¶m0->unk_1C); } static void ov69_0225DC54(UnkStruct_ov69_0225DC48 *param0) @@ -1928,12 +1928,12 @@ static int ov69_0225DD10(const UnkStruct_ov69_0225DC48 *param0, u32 param1) static void ov69_0225DD2C(UnkStruct_ov69_0225DC48 *param0) { Window_Clear(¶m0->unk_1C, 1); - sub_0201AD10(¶m0->unk_1C); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_1C); } static void ov69_0225DD44(UnkStruct_ov69_0225DC48 *param0) { - sub_0201A9A4(¶m0->unk_1C); + Window_ScheduleCopyToVRAM(¶m0->unk_1C); Window_Show(¶m0->unk_1C, 0, (1 + (18 + 12)), 0); } @@ -1950,8 +1950,8 @@ static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D3 param0->unk_0C = Strbuf_Init(128, param4); - BGL_AddWindow(param1->unk_00, ¶m0->unk_10, 1, 2, 1, 27, 4, 1, (((1 + (18 + 12)) + 9) + (6 * 2))); - BGL_FillWindow(¶m0->unk_10, 15); + Window_Add(param1->unk_00, ¶m0->unk_10, 1, 2, 1, 27, 4, 1, (((1 + (18 + 12)) + 9) + (6 * 2))); + Window_FillTilemap(¶m0->unk_10, 15); ov69_0225EF84(param2, 5, param0->unk_0C); @@ -1966,14 +1966,14 @@ static void ov69_0225DDC8(UnkStruct_ov69_0225DDC8 *param0) Strbuf_Free(param0->unk_0C); sub_02015938(param0->unk_20); - BGL_DeleteWindow(¶m0->unk_10); + Window_Remove(¶m0->unk_10); } static void ov69_0225DDFC(UnkStruct_ov69_0225DDC8 *param0) { - BGL_FillWindow(¶m0->unk_10, 15); + Window_FillTilemap(¶m0->unk_10, 15); sub_0200E060(¶m0->unk_10, 1, 1, 2); - sub_0201A9A4(¶m0->unk_10); + Window_ScheduleCopyToVRAM(¶m0->unk_10); param0->unk_04 = Text_AddPrinterWithParams(¶m0->unk_10, FONT_MESSAGE, param0->unk_0C, 0, 0, param0->unk_08, NULL); param0->unk_00 = 0; @@ -1991,7 +1991,7 @@ static u32 ov69_0225DE40(UnkStruct_ov69_0225DDC8 *param0) UnkStruct_02015958 v1; v1 = Unk_ov69_0225F074; - v1.unk_00 = sub_0201C28C(¶m0->unk_10); + v1.unk_00 = Window_GetBgConfig(¶m0->unk_10); sub_02015958(param0->unk_20, &v1); param0->unk_00++; } @@ -2008,7 +2008,7 @@ static void ov69_0225DEA0(UnkStruct_ov69_0225DDC8 *param0) { sub_02015A54(param0->unk_20); sub_0200E084(¶m0->unk_10, 1); - sub_0201AD10(¶m0->unk_10); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_10); } static void ov69_0225DEC0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, u32 param3) @@ -2028,8 +2028,8 @@ static void ov69_0225DEC0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D3 { Strbuf *v1; - BGL_AddWindow(param1->unk_00, ¶m0->unk_1A8, 4, 2, 19, 27, 4, 11, (10 + (18 + 12))); - BGL_FillWindow(¶m0->unk_1A8, 15); + Window_Add(param1->unk_00, ¶m0->unk_1A8, 4, 2, 19, 27, 4, 11, (10 + (18 + 12))); + Window_FillTilemap(¶m0->unk_1A8, 15); v1 = ov69_0225EF74(param2, 0); @@ -2054,7 +2054,7 @@ static void ov69_0225DFBC(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D3 Heap_FreeToHeap(param0->unk_94); ov69_0225E61C(param0); - BGL_DeleteWindow(¶m0->unk_1A8); + Window_Remove(¶m0->unk_1A8); ov69_0225E148(param0); { @@ -2104,12 +2104,12 @@ static void ov69_0225E00C(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225EF static void ov69_0225E084(UnkStruct_ov69_0225E084 *param0) { sub_0200E084(¶m0->unk_1A8, 1); - sub_0201AD10(¶m0->unk_1A8); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_1A8); } static void ov69_0225E0A0(UnkStruct_ov69_0225E084 *param0) { - sub_0201A9A4(¶m0->unk_1A8); + Window_ScheduleCopyToVRAM(¶m0->unk_1A8); sub_0200E060(¶m0->unk_1A8, 1, 10, 10); } @@ -2374,8 +2374,8 @@ static BOOL ov69_0225E374(UnkStruct_ov69_0225E084 *param0, u32 param1, UnkStruct static void ov69_0225E430(UnkStruct_ov69_0225E084 *param0, u32 param1, UnkStruct_ov69_0225D35C *param2) { - sub_020198E8(param2->unk_00, 6, 0, 0 + param1, 32, 1, param0->unk_98->rawData, 0, 0 + param1, param0->unk_98->screenWidth / 8, param0->unk_98->screenHeight / 8); - sub_0201C3C0(param2->unk_00, 6); + Bg_CopyToTilemapRect(param2->unk_00, 6, 0, 0 + param1, 32, 1, param0->unk_98->rawData, 0, 0 + param1, param0->unk_98->screenWidth / 8, param0->unk_98->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param2->unk_00, 6); } static void ov69_0225E478(UnkStruct_ov69_0225E478 *param0) @@ -2450,16 +2450,16 @@ static void ov69_0225E590(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D3 v1 = ((10 + (18 + 12)) + (27 * 4)); for (v0 = 0; v0 < 3; v0++) { - BGL_AddWindow(param1->unk_00, ¶m0->unk_168[v0], 5, 0, 0 + (6 * v0), 27, 6, 14, v1); + Window_Add(param1->unk_00, ¶m0->unk_168[v0], 5, 0, 0 + (6 * v0), 27, 6, 14, v1); v1 += (27 * 6); - BGL_FillWindow(¶m0->unk_168[v0], 0); - sub_0201A954(¶m0->unk_168[v0]); + Window_FillTilemap(¶m0->unk_168[v0], 0); + Window_CopyToVRAM(¶m0->unk_168[v0]); } - BGL_AddWindow(param1->unk_00, ¶m0->unk_198, 5, 0, 0, 27, 6, 14, ((10 + (18 + 12)) + (27 * 4))); - BGL_FillWindow(¶m0->unk_198, 0); + Window_Add(param1->unk_00, ¶m0->unk_198, 5, 0, 0, 27, 6, 14, ((10 + (18 + 12)) + (27 * 4))); + Window_FillTilemap(¶m0->unk_198, 0); } static void ov69_0225E61C(UnkStruct_ov69_0225E084 *param0) @@ -2467,10 +2467,10 @@ static void ov69_0225E61C(UnkStruct_ov69_0225E084 *param0) int v0; for (v0 = 0; v0 < 3; v0++) { - BGL_DeleteWindow(¶m0->unk_168[v0]); + Window_Remove(¶m0->unk_168[v0]); } - BGL_DeleteWindow(¶m0->unk_198); + Window_Remove(¶m0->unk_198); } static void ov69_0225E644(UnkStruct_ov69_0225E084 *param0, u32 param1, const UnkStruct_ov69_0225E0C0 *param2, UnkStruct_ov69_0225EF54 *param3) @@ -2482,7 +2482,7 @@ static void ov69_0225E644(UnkStruct_ov69_0225E084 *param0, u32 param1, const Unk GF_ASSERT(param1 < 3); v1 = ¶m0->unk_168[param1]; - BGL_FillWindow(v1, 0); + Window_FillTilemap(v1, 0); v2 = ov69_0225EEEC(param2->unk_00); { @@ -2523,7 +2523,7 @@ static void ov69_0225E71C(UnkStruct_ov69_0225E084 *param0, u32 param1, u32 param { u16 v0; - v0 = sub_0201C2A4(¶m0->unk_168[param1]); + v0 = Window_GetBaseTile(¶m0->unk_168[param1]); v0 += (27 * param2); sub_0201DC68(NNS_GFD_DST_2D_BG1_CHAR_SUB, v0 * 32, (void *)param3, 27 * 32); @@ -2582,8 +2582,8 @@ static void ov69_0225E810(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D3 for (v0 = 0; v0 < 3; v0++) { if (param0->unk_04[v0] == 1) { - sub_020198E8(param1->unk_00, 6, 0, 0 + (6 * v0), 32, 6, param0->unk_10[param0->unk_1A]->rawData, 0, 0 + (6 * v0), param0->unk_10[param0->unk_1A]->screenWidth / 8, param0->unk_10[param0->unk_1A]->screenHeight / 8); - sub_0201C3C0(param1->unk_00, 6); + Bg_CopyToTilemapRect(param1->unk_00, 6, 0, 0 + (6 * v0), 32, 6, param0->unk_10[param0->unk_1A]->rawData, 0, 0 + (6 * v0), param0->unk_10[param0->unk_1A]->screenWidth / 8, param0->unk_10[param0->unk_1A]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param1->unk_00, 6); } } } @@ -2614,8 +2614,8 @@ static void ov69_0225E904(UnkStruct_ov69_0225E7DC *param0) static void ov69_0225E910(UnkStruct_ov69_0225E7DC *param0, u32 param1, UnkStruct_ov69_0225D35C *param2) { if (param0->unk_18 > 0) { - sub_020198E8(param2->unk_00, 6, 0, 0 + param1, 32, 1, param0->unk_10[param0->unk_1A]->rawData, 0, 0 + param1, param0->unk_10[param0->unk_1A]->screenWidth / 8, param0->unk_10[param0->unk_1A]->screenHeight / 8); - sub_0201C3C0(param2->unk_00, 6); + Bg_CopyToTilemapRect(param2->unk_00, 6, 0, 0 + param1, 32, 1, param0->unk_10[param0->unk_1A]->rawData, 0, 0 + param1, param0->unk_10[param0->unk_1A]->screenWidth / 8, param0->unk_10[param0->unk_1A]->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param2->unk_00, 6); } } diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index e3d8fddd26..668ed71290 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -1273,19 +1273,19 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 GXLayers_SwapDisplay(); { - sub_0201975C(0, 0); + Bg_MaskPalette(0, 0); } { int v0; - sub_02018368(&Unk_ov70_0226D5BC); - param0->unk_00 = sub_02018340(param2); + SetAllGraphicsModes(&Unk_ov70_0226D5BC); + param0->unk_00 = BgConfig_New(param2); for (v0 = 0; v0 < 4; v0++) { - sub_020183C4(param0->unk_00, Unk_ov70_0226D5CC[v0], &Unk_ov70_0226D6B4[v0], 0); - sub_02019690(Unk_ov70_0226D5CC[v0], 32, 0, param2); - sub_02019EBC(param0->unk_00, Unk_ov70_0226D5CC[v0]); + Bg_InitFromTemplate(param0->unk_00, Unk_ov70_0226D5CC[v0], &Unk_ov70_0226D6B4[v0], 0); + Bg_ClearTilesRange(Unk_ov70_0226D5CC[v0], 32, 0, param2); + Bg_ClearTilemap(param0->unk_00, Unk_ov70_0226D5CC[v0]); } } @@ -1354,7 +1354,7 @@ static void ov70_0225E6D0(UnkStruct_ov70_0225E4EC *param0) int v0; for (v0 = 0; v0 < 4; v0++) { - sub_02019044(param0->unk_00, Unk_ov70_0226D5CC[v0]); + Bg_FreeTilemapBuffer(param0->unk_00, Unk_ov70_0226D5CC[v0]); } Heap_FreeToHeap(param0->unk_00); @@ -1383,7 +1383,7 @@ static void ov70_0225E6D0(UnkStruct_ov70_0225E4EC *param0) static void ov70_0225E740(UnkStruct_ov70_0225E4EC *param0) { - sub_0201C2B8(param0->unk_00); + Bg_RunScheduledUpdates(param0->unk_00); sub_0200A858(); sub_0201DCAC(); } @@ -1519,8 +1519,8 @@ static void ov70_0225E970(UnkStruct_ov70_0225DEE8 *param0) static void ov70_0225E9C8(UnkStruct_ov70_0225E9C8 *param0, UnkStruct_ov70_0225E4EC *param1, SaveData *param2, u32 param3) { - BGL_AddWindow(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], 2, 19, 27, 4, 4, (((1 + (18 + 12)) + ((18 + 12) + 24)) + 9)); - BGL_FillWindow(¶m0->unk_00, 15); + Window_Add(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], 2, 19, 27, 4, 4, (((1 + (18 + 12)) + ((18 + 12) + 24)) + 9)); + Window_FillTilemap(¶m0->unk_00, 15); param0->unk_18 = Strbuf_Init(384, param3); @@ -1541,7 +1541,7 @@ static void ov70_0225EA14(UnkStruct_ov70_0225E9C8 *param0) ov70_0225EB38(param0); Strbuf_Free(param0->unk_18); - BGL_DeleteWindow(¶m0->unk_00); + Window_Remove(¶m0->unk_00); } static void ov70_0225EA44(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1) @@ -1550,7 +1550,7 @@ static void ov70_0225EA44(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1) Text_RemovePrinter(param0->unk_10); } - BGL_FillWindow(¶m0->unk_00, 15); + Window_FillTilemap(¶m0->unk_00, 15); Strbuf_Copy(param0->unk_18, param1); param0->unk_10 = Text_AddPrinterWithParamsAndColor(¶m0->unk_00, FONT_MESSAGE, param0->unk_18, 0, 0, param0->unk_14, TEXT_COLOR(1, 2, 15), NULL); @@ -1564,11 +1564,11 @@ static void ov70_0225EAA4(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1) Text_RemovePrinter(param0->unk_10); } - BGL_FillWindow(¶m0->unk_00, 15); + Window_FillTilemap(¶m0->unk_00, 15); Strbuf_Copy(param0->unk_18, param1); Text_AddPrinterWithParamsAndColor(¶m0->unk_00, FONT_MESSAGE, param0->unk_18, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); sub_0200E060(¶m0->unk_00, 1, 1, 1); - sub_0201A9A4(¶m0->unk_00); + Window_ScheduleCopyToVRAM(¶m0->unk_00); } static void ov70_0225EB08(UnkStruct_ov70_0225E9C8 *param0) @@ -1620,13 +1620,13 @@ static void ov70_0225EB74(UnkStruct_ov70_0225E9C8 *param0) ov70_0225EB38(param0); sub_0200E084(¶m0->unk_00, 1); - sub_0201AD10(¶m0->unk_00); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_00); } static void ov70_0225EBA8(UnkStruct_ov70_0225E9C8 *param0, UnkStruct_ov70_0225E4EC *param1, SaveData *param2, u32 param3) { ov70_0225E9C8(param0, param1, param2, param3); - sub_0201C2B4(¶m0->unk_00, 2); + Window_SetPalette(¶m0->unk_00, 2); } static void ov70_0225EBBC(UnkStruct_ov70_0225E9C8 *param0) @@ -1640,7 +1640,7 @@ static void ov70_0225EBC4(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1) Text_RemovePrinter(param0->unk_10); } - BGL_FillWindow(¶m0->unk_00, 15); + Window_FillTilemap(¶m0->unk_00, 15); Strbuf_Copy(param0->unk_18, param1); param0->unk_10 = Text_AddPrinterWithParams(¶m0->unk_00, FONT_MESSAGE, param0->unk_18, 0, 0, param0->unk_14, NULL); @@ -1763,13 +1763,13 @@ static void ov70_0225EE30(UnkStruct_ov70_0225EC20 *param0, const UnkStruct_ov84_ param0->unk_3A = param1->unk_10; param0->unk_00.unk_04 = ov70_0225EF58; - BGL_AddWindow(param2->unk_00, ¶m0->unk_20, Unk_ov70_0226D5CC[0], param6, param7, param8, param1->unk_12 * 2, 5, ((((1 + (18 + 12)) + ((18 + 12) + 24)) + 9) + (27 * 4))); - BGL_FillWindow(¶m0->unk_20, 15); + Window_Add(param2->unk_00, ¶m0->unk_20, Unk_ov70_0226D5CC[0], param6, param7, param8, param1->unk_12 * 2, 5, ((((1 + (18 + 12)) + ((18 + 12) + 24)) + 9) + (27 * 4))); + Window_FillTilemap(¶m0->unk_20, 15); Window_Show(¶m0->unk_20, 1, ((1 + (18 + 12)) + ((18 + 12) + 24)), 3); param0->unk_30 = sub_0200112C(¶m0->unk_00, param3, param4, param5); - sub_0201A9A4(¶m0->unk_20); + Window_ScheduleCopyToVRAM(¶m0->unk_20); } static u32 ov70_0225EED8(UnkStruct_ov70_0225EC20 *param0) @@ -1808,8 +1808,8 @@ static void ov70_0225EF14(UnkStruct_ov70_0225EC20 *param0, u16 *param1, u16 *par param0->unk_30 = NULL; Window_Clear(¶m0->unk_20, 1); - sub_0201AD10(¶m0->unk_20); - BGL_DeleteWindow(¶m0->unk_20); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_20); + Window_Remove(¶m0->unk_20); param0->unk_3C = 0; @@ -1867,30 +1867,30 @@ static void ov70_0225EFD8(UnkStruct_ov70_0225EFD4 *param0) static void ov70_0225EFE0(UnkStruct_ov70_0225EFD4 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u8 param3, u8 param4, u8 param5, u8 param6) { - BGL_AddWindow(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], param3, param4, param5, param6, 5, ((((1 + (18 + 12)) + ((18 + 12) + 24)) + 9) + (27 * 4))); + Window_Add(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], param3, param4, param5, param6, 5, ((((1 + (18 + 12)) + ((18 + 12) + 24)) + 9) + (27 * 4))); Window_Show(¶m0->unk_00, 1, ((1 + (18 + 12)) + ((18 + 12) + 24)), 3); - BGL_FillWindow(¶m0->unk_00, 15); - sub_0201A9A4(¶m0->unk_00); + Window_FillTilemap(¶m0->unk_00, 15); + Window_ScheduleCopyToVRAM(¶m0->unk_00); } static void ov70_0225F024(UnkStruct_ov70_0225EFD4 *param0) { - if (BGL_WindowAdded(¶m0->unk_00) == 1) { + if (Window_IsInUse(¶m0->unk_00) == 1) { Window_Clear(¶m0->unk_00, 1); - sub_0201AD10(¶m0->unk_00); - BGL_DeleteWindow(¶m0->unk_00); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_00); + Window_Remove(¶m0->unk_00); } } static void ov70_0225F048(UnkStruct_ov70_0225EFD4 *param0, const Strbuf *param1, u8 param2, u8 param3) { Text_AddPrinterWithParamsAndColor(¶m0->unk_00, FONT_SYSTEM, param1, param2, param3, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); - sub_0201A9A4(¶m0->unk_00); + Window_ScheduleCopyToVRAM(¶m0->unk_00); } static void ov70_0225F078(UnkStruct_ov70_0225EFD4 *param0, u16 param1, u16 param2, u16 param3, u16 param4) { - BGL_WindowColor(¶m0->unk_00, 15, param1, param2, param3, param4); + Window_FillRectWithColor(¶m0->unk_00, 15, param1, param2, param3, param4); } static void ov70_0225F098(UnkStruct_ov70_0225F098 *param0, UnkStruct_ov70_0225F208 *param1, u32 param2) @@ -1920,20 +1920,20 @@ static void ov70_0225F100(UnkStruct_ov70_0225F098 *param0) static void ov70_0225F114(UnkStruct_ov70_0225F114 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2) { - BGL_AddWindow(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], 4, 4, 23, 16, 5, (((1 + (18 + 12)) + ((18 + 12) + 24)) + 9)); - BGL_FillWindow(¶m0->unk_00, 15); + Window_Add(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], 4, 4, 23, 16, 5, (((1 + (18 + 12)) + ((18 + 12) + 24)) + 9)); + Window_FillTilemap(¶m0->unk_00, 15); } static void ov70_0225F144(UnkStruct_ov70_0225F114 *param0) { - BGL_DeleteWindow(¶m0->unk_00); + Window_Remove(¶m0->unk_00); } static void ov70_0225F14C(UnkStruct_ov70_0225F114 *param0, const Strbuf *param1) { Text_AddPrinterWithParamsAndColor(¶m0->unk_00, FONT_SYSTEM, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); Window_Show(¶m0->unk_00, 1, ((1 + (18 + 12)) + ((18 + 12) + 24)), 3); - sub_0201A9A4(¶m0->unk_00); + Window_ScheduleCopyToVRAM(¶m0->unk_00); } static void ov70_0225F184(UnkStruct_ov70_0225F114 *param0, UnkStruct_ov70_0225F208 *param1) @@ -2077,7 +2077,7 @@ static void ov70_0225F350(UnkStruct_ov70_0225F350 *param0, const UnkStruct_ov70_ if (param1->unk_06 == 0) { param0->unk_00 = 0; - sub_0201975C(4, 0); + Bg_MaskPalette(4, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); @@ -2488,8 +2488,8 @@ static void ov70_0225FA14(UnkStruct_ov70_0225E4EC *param0, NARC *param1, u32 par } } - sub_020198C0(param0->unk_00, param3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); - sub_0201C3C0(param0->unk_00, param3); + Bg_LoadToTilemapRect(param0->unk_00, param3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param0->unk_00, param3); Heap_FreeToHeap(v0); } @@ -2499,7 +2499,7 @@ static void ov70_0225FA84(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4 int v0; for (v0 = 0; v0 < 5; v0++) { - sub_0201A8D4(param1->unk_00, ¶m0->unk_04[v0], &Unk_ov70_0226D68C[v0]); + Window_AddFromTemplate(param1->unk_00, ¶m0->unk_04[v0], &Unk_ov70_0226D68C[v0]); } } } @@ -2514,7 +2514,7 @@ static void ov70_0225FAA8(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9 int v0; for (v0 = 0; v0 < 5; v0++) { - BGL_DeleteWindow(¶m0->unk_04[v0]); + Window_Remove(¶m0->unk_04[v0]); } } } @@ -2549,9 +2549,9 @@ static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9 } } - sub_02019F04(param3->unk_00, Unk_ov70_0226D5CC[1], 0); - sub_02019F04(param3->unk_00, Unk_ov70_0226D5CC[2], 0); - sub_02019F04(param3->unk_00, Unk_ov70_0226D5CC[3], 0); + Bg_ScheduleFillTilemap(param3->unk_00, Unk_ov70_0226D5CC[1], 0); + Bg_ScheduleFillTilemap(param3->unk_00, Unk_ov70_0226D5CC[2], 0); + Bg_ScheduleFillTilemap(param3->unk_00, Unk_ov70_0226D5CC[3], 0); ov70_022602C0(param2); ov70_0225FA14(param3, param6, 92, Unk_ov70_0226D5CC[1], 0, param7); @@ -2643,11 +2643,11 @@ static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA NNS_G2dGetUnpackedCharacterData(v3, &v4); - sub_0201958C(param2->unk_00, Unk_ov70_0226D5CC[3], v4->pRawData, 4 * 2 * 32, Unk_ov70_0226D590[v1]); + Bg_LoadTiles(param2->unk_00, Unk_ov70_0226D5CC[3], v4->pRawData, 4 * 2 * 32, Unk_ov70_0226D590[v1]); Heap_FreeToHeap(v3); - sub_020198E8(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, Unk_ov70_0226D624[v1], 0, 0, 4, 2); - sub_02019E2C(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, 11 + sub_0207C92C(v2)); - sub_0201C3C0(param2->unk_00, Unk_ov70_0226D5CC[3]); + Bg_CopyToTilemapRect(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, Unk_ov70_0226D624[v1], 0, 0, 4, 2); + Bg_ChangeTilemapRectPalette(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, 11 + sub_0207C92C(v2)); + Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov70_0226D5CC[3]); } } } @@ -2663,9 +2663,9 @@ static void ov70_0225FE80(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9 ov70_02260048(param0, param2); ov70_02260228(param0, param2); - sub_02019EBC(param2->unk_00, Unk_ov70_0226D5CC[1]); - sub_02019EBC(param2->unk_00, Unk_ov70_0226D5CC[2]); - sub_02019EBC(param2->unk_00, Unk_ov70_0226D5CC[3]); + Bg_ClearTilemap(param2->unk_00, Unk_ov70_0226D5CC[1]); + Bg_ClearTilemap(param2->unk_00, Unk_ov70_0226D5CC[2]); + Bg_ClearTilemap(param2->unk_00, Unk_ov70_0226D5CC[3]); } static void ov70_0225FEC4(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4) @@ -2852,7 +2852,7 @@ static void ov70_022602C0(UnkStruct_ov70_0225FA84 *param0) int v0; for (v0 = 0; v0 < 5; v0++) { - BGL_FillWindow(¶m0->unk_04[v0], 0); + Window_FillTilemap(¶m0->unk_04[v0], 0); } } @@ -2883,7 +2883,7 @@ static void ov70_02260314(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F2 static void ov70_02260360(UnkStruct_ov70_0225FA84 *param0, u32 param1) { - sub_0201A9A4(¶m0->unk_04[param1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[param1]); } static void ov70_02260370(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, const TrainerInfo *param2) @@ -3064,7 +3064,7 @@ static void ov70_02260744(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 { int v0; - sub_0201A8D4(param1->unk_00, ¶m0->unk_0C, &Unk_ov70_0226D5A4); + Window_AddFromTemplate(param1->unk_00, ¶m0->unk_0C, &Unk_ov70_0226D5A4); for (v0 = 0; v0 < 3; v0++) { param0->unk_20[v0] = sub_020071D0(param2, 56 + v0, 0, ¶m0->unk_2C[v0], param3); @@ -3083,7 +3083,7 @@ static void ov70_022607A8(UnkStruct_ov70_02260744 *param0) int v0; sub_02024034(param0->unk_1C); - BGL_DeleteWindow(¶m0->unk_0C); + Window_Remove(¶m0->unk_0C); for (v0 = 0; v0 < 3; v0++) { Heap_FreeToHeap(param0->unk_20[v0]); @@ -3152,7 +3152,7 @@ static void ov70_02260870(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 v0 = ov70_0225F288(param2, 1, 63); - BGL_FillWindow(¶m0->unk_0C, 0); + Window_FillTilemap(¶m0->unk_0C, 0); Text_AddPrinterWithParamsAndColor(¶m0->unk_0C, FONT_SYSTEM, v0, 0, 4, TEXT_SPEED_INSTANT, TEXT_COLOR(15, 14, 0), NULL); } @@ -3185,10 +3185,10 @@ static void ov70_02260930(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 static void ov70_022609A8(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1) { - sub_02019EBC(param1->unk_00, Unk_ov70_0226D5CC[1]); - sub_02019EBC(param1->unk_00, Unk_ov70_0226D5CC[2]); - sub_02019EBC(param1->unk_00, Unk_ov70_0226D5CC[3]); - sub_02019184(param1->unk_00, Unk_ov70_0226D5CC[3], 3, 0); + Bg_ClearTilemap(param1->unk_00, Unk_ov70_0226D5CC[1]); + Bg_ClearTilemap(param1->unk_00, Unk_ov70_0226D5CC[2]); + Bg_ClearTilemap(param1->unk_00, Unk_ov70_0226D5CC[3]); + Bg_SetOffset(param1->unk_00, Unk_ov70_0226D5CC[3], 3, 0); } static void ov70_022609D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, NARC *param3, u32 param4) @@ -3197,8 +3197,8 @@ static void ov70_022609D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 0, 9, 6 }; - sub_020198E8(param1->unk_00, Unk_ov70_0226D5CC[2], 0, 3, 32, 21, (const void *)param0->unk_2C[param2]->rawData, 0, 3, 32, 32); - sub_0201C3C0(param1->unk_00, Unk_ov70_0226D5CC[2]); + Bg_CopyToTilemapRect(param1->unk_00, Unk_ov70_0226D5CC[2], 0, 3, 32, 21, (const void *)param0->unk_2C[param2]->rawData, 0, 3, 32, 32); + Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov70_0226D5CC[2]); if (param0->unk_08 == 1) { static const u8 v1[3] = { @@ -3210,7 +3210,7 @@ static void ov70_022609D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 ov70_0225FA14(param1, param3, 96 + v2, Unk_ov70_0226D5CC[3], 320, param4); } - sub_0201C63C(param1->unk_00, Unk_ov70_0226D5CC[3], 3, v0[param2]); + Bg_ScheduleScroll(param1->unk_00, Unk_ov70_0226D5CC[3], 3, v0[param2]); } static void ov70_02260A50(u32 param0, u32 param1, void *param2) diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index 49d584ad20..722e906a6e 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -160,7 +160,7 @@ int ov71_0223B140(OverlayManager *param0, int *param1) memset(v0, 0, sizeof(UnkStruct_ov71_0223B620)); v0->unk_B4 = OverlayManager_Args(param0); - v0->unk_00 = sub_02018340(25); + v0->unk_00 = BgConfig_New(25); ov71_0223B620(v0); ov71_0223B688(); @@ -200,7 +200,7 @@ int ov71_0223B140(OverlayManager *param0, int *param1) } } - sub_02019448(v0->unk_00, 3); + Bg_CopyTilemapBufferToVRAM(v0->unk_00, 3); } ov71_0223C6F0(v0->unk_04, v0->unk_B4); @@ -545,7 +545,7 @@ static void ov71_0223B858(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -565,8 +565,8 @@ static void ov71_0223B858(BgConfig *param0) 0 }; - sub_020183C4(param0, 7, &v1, 2); - sub_02019EBC(param0, 7); + Bg_InitFromTemplate(param0, 7, &v1, 2); + Bg_ClearTilemap(param0, 7); } { @@ -586,8 +586,8 @@ static void ov71_0223B858(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v2, 0); - sub_02019EBC(param0, 5); + Bg_InitFromTemplate(param0, 5, &v2, 0); + Bg_ClearTilemap(param0, 5); } { @@ -607,8 +607,8 @@ static void ov71_0223B858(BgConfig *param0) 0 }; - sub_020183C4(param0, 6, &v3, 1); - sub_02019EBC(param0, 6); + Bg_InitFromTemplate(param0, 6, &v3, 1); + Bg_ClearTilemap(param0, 6); } { @@ -628,8 +628,8 @@ static void ov71_0223B858(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v4, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v4, 0); + Bg_ClearTilemap(param0, 2); } { @@ -649,8 +649,8 @@ static void ov71_0223B858(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v5, 1); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v5, 1); + Bg_ClearTilemap(param0, 3); } } @@ -755,11 +755,11 @@ static void ov71_0223BBDC(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 7); - sub_02019044(param0, 6); - sub_02019044(param0, 5); - sub_02019044(param0, 2); - sub_02019044(param0, 3); + Bg_FreeTilemapBuffer(param0, 7); + Bg_FreeTilemapBuffer(param0, 6); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 3); Heap_FreeToHeap(param0); } @@ -803,14 +803,14 @@ static BOOL ov71_0223BC20(UnkStruct_ov71_0223B620 *param0) sub_02006E60(51, 36, param0->unk_00, 6, 0, 0, 0, 25); ov71_0223CD44(param0->unk_04, 0, 6); ov71_0223C3E8(param0); - sub_02019EBC(param0->unk_00, 7); + Bg_ClearTilemap(param0->unk_00, 7); ov71_0223CA28(param0->unk_04, param0->unk_B4); ov71_0223C530(param0->unk_00, 7, param0->unk_B8); } else { param0->unk_30C0 = 0; sub_02006E60(51, 35, param0->unk_00, 6, 0, 0, 0, 25); ov71_0223CD44(param0->unk_04, 7, 10); - sub_02019EBC(param0->unk_00, 7); + Bg_ClearTilemap(param0->unk_00, 7); ov71_0223C390(param0); ov71_0223C6F0(param0->unk_04, param0->unk_B4); } @@ -1029,7 +1029,7 @@ static void ov71_0223C0D8(UnkStruct_ov71_0223B620 *param0, const u8 param1) u16 v1; u8 v2, v3; - v0 = (u16 *)sub_02019FE4(param0->unk_00, 2); + v0 = (u16 *)Bg_GetTilemapBuffer(param0->unk_00, 2); v1 = (4 * 32) + (4 * param1); for (v3 = 0; v3 < 4; v3++) { @@ -1038,7 +1038,7 @@ static void ov71_0223C0D8(UnkStruct_ov71_0223B620 *param0, const u8 param1) } } - sub_02019448(param0->unk_00, 2); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 2); } static void ov71_0223C128(UnkStruct_ov71_0223B620 *param0, const u8 param1) @@ -1057,7 +1057,7 @@ static void ov71_0223C128(UnkStruct_ov71_0223B620 *param0, const u8 param1) v4 += (v5 * 7); v6 += (v7 * 7); - v0 = (u8 *)sub_02019FE4(param0->unk_00, 3); + v0 = (u8 *)Bg_GetTilemapBuffer(param0->unk_00, 3); v1 = (5 * 32 + 26); for (v3 = 0; v3 < 5; v3++) { @@ -1181,18 +1181,18 @@ static void ov71_0223C390(UnkStruct_ov71_0223B620 *param0) v0 = param0->unk_3360->szByte; - sub_0201958C(param0->unk_00, 7, param0->unk_30BC->pRawData, param0->unk_30BC->szByte, 0); + Bg_LoadTiles(param0->unk_00, 7, param0->unk_30BC->pRawData, param0->unk_30BC->szByte, 0); - if (sub_02019FE4(param0->unk_00, 7) != NULL) { - sub_02019574(param0->unk_00, 7, param0->unk_3360->rawData, v0); + if (Bg_GetTilemapBuffer(param0->unk_00, 7) != NULL) { + Bg_LoadTilemapBuffer(param0->unk_00, 7, param0->unk_3360->rawData, v0); } - sub_02019460(param0->unk_00, 7, param0->unk_3360->rawData, v0, 0); + Bg_CopyTilemapBufferRangeToVRAM(param0->unk_00, 7, param0->unk_3360->rawData, v0, 0); } static void ov71_0223C3E8(UnkStruct_ov71_0223B620 *param0) { - sub_02019CB8(param0->unk_00, 7, 0, 20, 6, 6, 9, 16); + Bg_FillTilemapRect(param0->unk_00, 7, 0, 20, 6, 6, 9, 16); } static const u8 ov71_0223C40C(const int param0) @@ -1274,9 +1274,9 @@ static void ov71_0223C530(BgConfig *param0, const int param1, const u8 *param2) u8 v1, v2; u16 v3; - sub_0201958C(param0, param1, param2, (24 * 8 * 64), 1); + Bg_LoadTiles(param0, param1, param2, (24 * 8 * 64), 1); - v0 = (u16 *)sub_02019FE4(param0, param1); + v0 = (u16 *)Bg_GetTilemapBuffer(param0, param1); v3 = 0; for (v2 = 0; v2 < 8; v2++) { @@ -1286,7 +1286,7 @@ static void ov71_0223C530(BgConfig *param0, const int param1, const u8 *param2) } } - sub_02019448(param0, param1); + Bg_CopyTilemapBufferToVRAM(param0, param1); } static void ov71_0223C594(const int param0) @@ -1325,7 +1325,7 @@ static int ov71_0223C60C(BgConfig *param0, const TouchScreenRect *rect) if (v0 != 0) { u16 v1 = 0x40; - if (sub_0201C784(param0, 2, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0, 2, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { return 0xffffffff; } } else { @@ -1344,7 +1344,7 @@ static int ov71_0223C654(BgConfig *param0, const TouchScreenRect *rect) if (v0 != 0) { u16 v1 = 0x40; - if (sub_0201C784(param0, 2, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0, 2, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { return 0xffffffff; } } else { diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index 4fe1808cbd..f17806f2ed 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -36,10 +36,10 @@ void ov71_0223C69C(BgConfig *param0, Window *param1) const WindowTemplate *v1 = Unk_ov71_0223D670; for (v0 = 0; v0 < 11; v0++) { - sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); + Window_AddFromTemplate(param0, ¶m1[v0], &v1[v0]); } - sub_020196C0(param0, 7, 0, 1, 0); + Bg_FillTilesRange(param0, 7, 0, 1, 0); } void ov71_0223C6D4 (Window * param0) @@ -47,7 +47,7 @@ void ov71_0223C6D4 (Window * param0) u16 v0; for (v0 = 0; v0 < 11; v0++) { - BGL_DeleteWindow(¶m0[v0]); + Window_Remove(¶m0[v0]); } } @@ -71,13 +71,13 @@ void ov71_0223C6F0 (Window * param0, const TrainerCard * param1) MessageLoader * v1; Strbuf* v2; - BGL_WindowColor(¶m0[0], 0, 0, 0, 17 * 8, 2 * 8); - BGL_WindowColor(¶m0[1], 0, 0, 0, 17 * 8, 2 * 8); - BGL_WindowColor(¶m0[2], 0, 0, 0, 17 * 8, 2 * 8); - BGL_WindowColor(¶m0[3], 0, 0, 0, 17 * 8, 2 * 8); - BGL_WindowColor(¶m0[4], 0, 0, 0, 17 * 8, 2 * 8); - BGL_WindowColor(¶m0[5], 0, 0, 0, 28 * 8, 2 * 8); - BGL_WindowColor(¶m0[6], 0, 0, 0, 28 * 8, 2 * 8); + Window_FillRectWithColor(¶m0[0], 0, 0, 0, 17 * 8, 2 * 8); + Window_FillRectWithColor(¶m0[1], 0, 0, 0, 17 * 8, 2 * 8); + Window_FillRectWithColor(¶m0[2], 0, 0, 0, 17 * 8, 2 * 8); + Window_FillRectWithColor(¶m0[3], 0, 0, 0, 17 * 8, 2 * 8); + Window_FillRectWithColor(¶m0[4], 0, 0, 0, 17 * 8, 2 * 8); + Window_FillRectWithColor(¶m0[5], 0, 0, 0, 28 * 8, 2 * 8); + Window_FillRectWithColor(¶m0[6], 0, 0, 0, 28 * 8, 2 * 8); v1 = MessageLoader_Init(0, 26, 616, 25); v2 = Strbuf_Init(32, 25); @@ -179,7 +179,7 @@ asm void ov71_0223CA28 (Window * param0, const TrainerCard * param1) add r0, #0x70 add r2, r1, #0 add r3, r1, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor mov r1, #0 mov r0, #0xe0 str r0, [sp] @@ -189,7 +189,7 @@ asm void ov71_0223CA28 (Window * param0, const TrainerCard * param1) add r0, #0x80 add r2, r1, #0 add r3, r1, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor mov r1, #0 mov r0, #0xe0 str r0, [sp] @@ -199,7 +199,7 @@ asm void ov71_0223CA28 (Window * param0, const TrainerCard * param1) add r0, #0x90 add r2, r1, #0 add r3, r1, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor mov r1, #0 mov r0, #0xe0 str r0, [sp] @@ -209,7 +209,7 @@ asm void ov71_0223CA28 (Window * param0, const TrainerCard * param1) add r0, #0xa0 add r2, r1, #0 add r3, r1, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor mov r2, #0x9a mov r0, #0 mov r1, #0x1a @@ -524,7 +524,7 @@ void ov71_0223CD44 (Window * param0, const u8 param1, const u8 param2) u8 v0; for (v0 = param1; v0 <= param2; v0++) { - sub_0201ACF4(¶m0[v0]); + Window_ClearAndCopyToVRAM(¶m0[v0]); } } @@ -557,7 +557,7 @@ void ov71_0223CDE8 (Window * param0, const TrainerCard * param1, Strbuf *param2) v0 = 999; } - BGL_WindowColor(¶m0[5], 0, 184, 0, 40, 2 * 8); + Window_FillRectWithColor(¶m0[5], 0, 184, 0, 40, 2 * 8); { u32 v1; @@ -585,7 +585,7 @@ void ov71_0223CECC (Window * param0, const BOOL param1, Strbuf *param2) if (param1) { Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, param2, (207 - 2), 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); } else { - BGL_WindowColor(param0, 0, (207 - 2), 0, 5, 2 * 8); - sub_0201A954(param0); + Window_FillRectWithColor(param0, 0, (207 - 2), 0, 5, 2 * 8); + Window_CopyToVRAM(param0); } } diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 707dcbaa41..81b2e0fc5e 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -127,7 +127,7 @@ int ov72_0223D7A0(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov72_0223DB98), 39); memset(v0, 0, sizeof(UnkStruct_ov72_0223DB98)); - v0->unk_00 = sub_02018340(39); + v0->unk_00 = BgConfig_New(39); v1 = NARC_ctor(NARC_INDEX_GRAPHIC__MYSIGN, 39); v0->unk_10 = StringTemplate_Default(39); v0->unk_14 = MessageLoader_Init(0, 26, 425, 39); @@ -246,7 +246,7 @@ static void ov72_0223DA48(void *param0) { sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8((BgConfig *)param0); + Bg_RunScheduledUpdates((BgConfig *)param0); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -279,7 +279,7 @@ static void ov72_0223DA90(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -299,8 +299,8 @@ static void ov72_0223DA90(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { @@ -320,8 +320,8 @@ static void ov72_0223DA90(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilemap(param0, 1); } { @@ -341,7 +341,7 @@ static void ov72_0223DA90(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); + Bg_InitFromTemplate(param0, 2, &v3, 0); } { @@ -361,8 +361,8 @@ static void ov72_0223DA90(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v4, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v4, 0); + Bg_ClearTilemap(param0, 4); } { @@ -382,11 +382,11 @@ static void ov72_0223DA90(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v5, 0); + Bg_InitFromTemplate(param0, 5, &v5, 0); } - sub_02019690(0, 32, 0, 39); - sub_02019690(4, 32, 0, 39); + Bg_ClearTilesRange(0, 32, 0, 39); + Bg_ClearTilesRange(4, 32, 0, 39); } static void ov72_0223DB98(UnkStruct_ov72_0223DB98 *param0) @@ -430,12 +430,12 @@ static void ov72_0223DC34(UnkStruct_ov72_0223DB98 *param0) static void ov72_0223DC6C(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); Heap_FreeToHeap(param0); } @@ -447,7 +447,7 @@ static void ov72_0223DCA8(UnkStruct_ov72_0223DB98 *param0, NARC *param1) sub_02007130(param1, 2, 4, 0, 16 * 2 * 2, 39); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 39); Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, 39); - sub_02019690(1, 32, 0, 39); + Bg_ClearTilesRange(1, 32, 0, 39); sub_020070E8(param1, 3, v0, 2, 0, 32 * 8 * 0x20, 1, 39); sub_0200710C(param1, 5, v0, 2, 0, 32 * 24 * 2, 1, 39); sub_020070E8(param1, 4, v0, 5, 0, 32 * 8 * 0x20, 1, 39); @@ -561,12 +561,12 @@ static void *ov72_0223E060(Window *param0, Strbuf *param1, int param2, u8 param3 static void ov72_0223E0A0(UnkStruct_ov72_0223DB98 *param0, OverlayManager *param1) { - BGL_AddWindow(param0->unk_00, ¶m0->unk_338, 0, 2, 1, 27, 4, 13, 1 + (18 + 12) + 9); - BGL_FillWindow(¶m0->unk_338, 0xf0f); - BGL_AddWindow(param0->unk_00, ¶m0->unk_328, 1, 4, 9, 24, 8, 1, 1); - BGL_FillWindow(¶m0->unk_328, 0x202); - BGL_AddWindow(param0->unk_00, ¶m0->unk_348, 1, 26, 21, 8, 2, 2, 1 + 24 * 8); - BGL_FillWindow(¶m0->unk_348, 0x0); + Window_Add(param0->unk_00, ¶m0->unk_338, 0, 2, 1, 27, 4, 13, 1 + (18 + 12) + 9); + Window_FillTilemap(¶m0->unk_338, 0xf0f); + Window_Add(param0->unk_00, ¶m0->unk_328, 1, 4, 9, 24, 8, 1, 1); + Window_FillTilemap(¶m0->unk_328, 0x202); + Window_Add(param0->unk_00, ¶m0->unk_348, 1, 26, 21, 8, 2, 2, 1 + 24 * 8); + Window_FillTilemap(¶m0->unk_348, 0x0); { void *v0; @@ -583,13 +583,13 @@ static void ov72_0223E0A0(UnkStruct_ov72_0223DB98 *param0, OverlayManager *param } } - BGL_AddWindow(param0->unk_00, ¶m0->unk_358, 1, 2, 2, 28, 2, 13, ((1 + 24 * 8) + 8 * 2)); + Window_Add(param0->unk_00, ¶m0->unk_358, 1, 2, 2, 28, 2, 13, ((1 + 24 * 8) + 8 * 2)); { int v2 = Font_CalcStrbufWidth(FONT_MESSAGE, param0->unk_30, 0); int v3 = (28 * 8 - v2) / 2; - BGL_FillWindow(¶m0->unk_358, 0x0); + Window_FillTilemap(¶m0->unk_358, 0x0); Text_AddPrinterWithParamsAndColor(¶m0->unk_358, FONT_MESSAGE, param0->unk_30, v3, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); } @@ -597,8 +597,8 @@ static void ov72_0223E0A0(UnkStruct_ov72_0223DB98 *param0, OverlayManager *param int v4; for (v4 = 0; v4 < 5; v4++) { - BGL_AddWindow(param0->unk_00, ¶m0->unk_2D8[v4], 4, 24 / 8 + 2, 32 / 8 + v4 * 4 - 1, 10, 2, 13, 1 + v4 * (10 * 2)); - BGL_FillWindow(¶m0->unk_2D8[v4], 0); + Window_Add(param0->unk_00, ¶m0->unk_2D8[v4], 4, 24 / 8 + 2, 32 / 8 + v4 * 4 - 1, 10, 2, 13, 1 + v4 * (10 * 2)); + Window_FillTilemap(¶m0->unk_2D8[v4], 0); } ov72_0223E910(param0->unk_2D8, 0, TEXT_COLOR(14, 13, 15), param0); @@ -610,13 +610,13 @@ static void ov72_0223E260(UnkStruct_ov72_0223DB98 *param0) int v0; for (v0 = 0; v0 < 5; v0++) { - BGL_DeleteWindow(¶m0->unk_2D8[v0]); + Window_Remove(¶m0->unk_2D8[v0]); } - BGL_DeleteWindow(¶m0->unk_358); - BGL_DeleteWindow(¶m0->unk_348); - BGL_DeleteWindow(¶m0->unk_328); - BGL_DeleteWindow(¶m0->unk_338); + Window_Remove(¶m0->unk_358); + Window_Remove(¶m0->unk_348); + Window_Remove(¶m0->unk_328); + Window_Remove(¶m0->unk_338); } static void ov72_0223E2A4(UnkStruct_ov72_0223DB98 *param0) @@ -795,8 +795,8 @@ static int ov72_0223E528(UnkStruct_ov72_0223DB98 *param0, int param1) sub_0200E084(¶m0->unk_338, 1); sub_02015A54(param0->unk_5D00); - BGL_FillWindow(¶m0->unk_328, 0x202); - sub_0201A954(¶m0->unk_328); + Window_FillTilemap(¶m0->unk_328, 0x202); + Window_CopyToVRAM(¶m0->unk_328); break; case 2: param0->unk_370 = 1; @@ -935,7 +935,7 @@ static void ov72_0223E5E0(Window *param0, void *param1, int param2, int param3, param9 -= v1; } - sub_0201ADDC(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9); + Window_BlitBitmapRect(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9); } static void ov72_0223E660(Window *param0, const u8 *param1, int param2, int param3, int *param4, int *param5, int param6, int param7) @@ -1042,7 +1042,7 @@ static void ov72_0223E80C(Window *param0, UnkStruct_ov72_0223E7D8 *param1, UnkSt } if (v4 && param3) { - sub_0201A954(param0); + Window_CopyToVRAM(param0); } ov72_0223E7D8(param1, param2); @@ -1084,12 +1084,12 @@ static void ov72_0223E910(Window *param0, int param1, u32 param2, UnkStruct_ov72 return; for (v0 = 0; v0 < 5; v0++) { - BGL_WindowColor(¶m0[v0], 0, 0, 0, 10 * 8, 2 * 8); + Window_FillRectWithColor(¶m0[v0], 0, 0, 0, 10 * 8, 2 * 8); } for (v0 = 0; v0 < 5; v0++) { Text_AddPrinterWithParamsAndColor(¶m0[v0], FONT_MESSAGE, param3->unk_18[v0], 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 15), NULL); - sub_0201A954(¶m0[v0]); + Window_CopyToVRAM(¶m0[v0]); } } @@ -1107,7 +1107,7 @@ static void ov72_0223E930(UnkStruct_ov72_0223DB98 *param0, int param1) MessageLoader_GetStrbuf(param0->unk_14, param1, v0); StringTemplate_Format(param0->unk_10, param0->unk_34, v0); Strbuf_Free(v0); - BGL_FillWindow(¶m0->unk_338, 0xf0f); + Window_FillTilemap(¶m0->unk_338, 0xf0f); sub_0200E060(¶m0->unk_338, 0, 1, 10); param0->unk_38 = Text_AddPrinterWithParams(¶m0->unk_338, FONT_MESSAGE, param0->unk_34, 0, 0, Options_TextFrameDelay(param0->unk_0C), NULL); diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 53e8d318b6..1bdb6a2af0 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -262,7 +262,7 @@ int ov73_021D0F7C(OverlayManager *param0, int *param1) static void ov73_021D0FF0(void *param0) { UnkStruct_ov73_021D1058 *v0 = param0; - sub_0201C2B8(v0->unk_18); + Bg_RunScheduledUpdates(v0->unk_18); } static BOOL ov73_021D0FFC(void) @@ -313,7 +313,7 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) } { - param0->unk_18 = sub_02018340(param0->unk_00); + param0->unk_18 = BgConfig_New(param0->unk_00); } { @@ -324,7 +324,7 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) GX_BG0_AS_2D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { BgTemplate v2 = { @@ -345,23 +345,23 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) v2.screenBase = GX_BG_SCRBASE_0x7800; v2.charBase = GX_BG_CHARBASE_0x18000; - sub_020183C4(param0->unk_18, 0, &v2, 0); - sub_02019EBC(param0->unk_18, 0); + Bg_InitFromTemplate(param0->unk_18, 0, &v2, 0); + Bg_ClearTilemap(param0->unk_18, 0); v2.screenBase = GX_BG_SCRBASE_0x7000; v2.charBase = GX_BG_CHARBASE_0x14000; - sub_020183C4(param0->unk_18, 1, &v2, 0); - sub_02019EBC(param0->unk_18, 1); + Bg_InitFromTemplate(param0->unk_18, 1, &v2, 0); + Bg_ClearTilemap(param0->unk_18, 1); v2.screenBase = GX_BG_SCRBASE_0x6800; v2.charBase = GX_BG_CHARBASE_0x10000; - sub_020183C4(param0->unk_18, 2, &v2, 0); - sub_02019EBC(param0->unk_18, 2); + Bg_InitFromTemplate(param0->unk_18, 2, &v2, 0); + Bg_ClearTilemap(param0->unk_18, 2); v2.screenBase = GX_BG_SCRBASE_0x6000; v2.charBase = GX_BG_CHARBASE_0x0c000; - sub_020183C4(param0->unk_18, 3, &v2, 0); - sub_02019EBC(param0->unk_18, 3); + Bg_InitFromTemplate(param0->unk_18, 3, &v2, 0); + Bg_ClearTilemap(param0->unk_18, 3); sub_0200DD0C(param0->unk_18, 0, (0x400 - (18 + 12)), 4, 0, param0->unk_00); sub_0200DAA4(param0->unk_18, 0, ((0x400 - (18 + 12)) - 9), 3, 0, param0->unk_00); @@ -387,33 +387,33 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) v2.screenBase = GX_BG_SCRBASE_0x7800; v2.charBase = GX_BG_CHARBASE_0x18000; - sub_020183C4(param0->unk_18, 4, &v2, 0); - sub_02019EBC(param0->unk_18, 4); + Bg_InitFromTemplate(param0->unk_18, 4, &v2, 0); + Bg_ClearTilemap(param0->unk_18, 4); v2.screenBase = GX_BG_SCRBASE_0x7000; v2.charBase = GX_BG_CHARBASE_0x14000; - sub_020183C4(param0->unk_18, 5, &v2, 0); - sub_02019EBC(param0->unk_18, 5); + Bg_InitFromTemplate(param0->unk_18, 5, &v2, 0); + Bg_ClearTilemap(param0->unk_18, 5); v2.screenBase = GX_BG_SCRBASE_0x6800; v2.charBase = GX_BG_CHARBASE_0x10000; - sub_020183C4(param0->unk_18, 6, &v2, 0); - sub_02019EBC(param0->unk_18, 6); + Bg_InitFromTemplate(param0->unk_18, 6, &v2, 0); + Bg_ClearTilemap(param0->unk_18, 6); v2.screenBase = GX_BG_SCRBASE_0x6000; v2.charBase = GX_BG_CHARBASE_0x0c000; - sub_020183C4(param0->unk_18, 7, &v2, 0); - sub_02019EBC(param0->unk_18, 7); + Bg_InitFromTemplate(param0->unk_18, 7, &v2, 0); + Bg_ClearTilemap(param0->unk_18, 7); } - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); ov73_021D1930(param0); @@ -422,25 +422,25 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) static void ov73_021D1238(UnkStruct_ov73_021D1058 *param0) { - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); - sub_02019044(param0->unk_18, 0); + Bg_FreeTilemapBuffer(param0->unk_18, 0); - sub_02019044(param0->unk_18, 1); - sub_02019044(param0->unk_18, 2); - sub_02019044(param0->unk_18, 3); + Bg_FreeTilemapBuffer(param0->unk_18, 1); + Bg_FreeTilemapBuffer(param0->unk_18, 2); + Bg_FreeTilemapBuffer(param0->unk_18, 3); - sub_02019044(param0->unk_18, 4); - sub_02019044(param0->unk_18, 5); - sub_02019044(param0->unk_18, 6); - sub_02019044(param0->unk_18, 7); + Bg_FreeTilemapBuffer(param0->unk_18, 4); + Bg_FreeTilemapBuffer(param0->unk_18, 5); + Bg_FreeTilemapBuffer(param0->unk_18, 6); + Bg_FreeTilemapBuffer(param0->unk_18, 7); Heap_FreeToHeap(param0->unk_18); } @@ -522,7 +522,7 @@ static BOOL ov73_021D1334(UnkStruct_ov73_021D1058 *param0, int param1, int param G2S_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); } - sub_02019120(param1, 1); + Bg_ToggleLayer(param1, 1); } else { param0->unk_7C = 16; param0->unk_80 = 0; @@ -555,7 +555,7 @@ static BOOL ov73_021D1334(UnkStruct_ov73_021D1058 *param0, int param1, int param } } else { param0->unk_78 = 3; - sub_02019120(param1, 0); + Bg_ToggleLayer(param1, 0); } break; case 3: @@ -582,8 +582,8 @@ static BOOL ov73_021D14B8(UnkStruct_ov73_021D1058 *param0, int param1) static void ov73_021D14DC(UnkStruct_ov73_021D1058 *param0, int param1, int param2) { - sub_02019E2C(param0->unk_18, param1, 0, 0, 32, 24, param2); - sub_02019448(param0->unk_18, param1); + Bg_ChangeTilemapRectPalette(param0->unk_18, param1, 0, 0, 32, 24, param2); + Bg_CopyTilemapBufferToVRAM(param0->unk_18, param1); } typedef struct UnkStruct_ov72_021D3840_t { @@ -700,8 +700,8 @@ static BOOL ov73_021D1510(UnkStruct_ov73_021D1058 *param0, u32 param1, int param switch (param0->unk_50) { case 0: - sub_0201A8D4(param0->unk_18, ¶m0->unk_1C, &Unk_ov72_021D37EC); - BGL_WindowColor(¶m0->unk_1C, 15, 0, 0, 27 * 8, 4 * 8); + Window_AddFromTemplate(param0->unk_18, ¶m0->unk_1C, &Unk_ov72_021D37EC); + Window_FillRectWithColor(¶m0->unk_1C, 15, 0, 0, 27 * 8, 4 * 8); sub_0200E060(¶m0->unk_1C, 0, (0x400 - (18 + 12)), 4); RenderControlFlags_SetCanABSpeedUpPrint(1); RenderControlFlags_SetAutoScrollFlags(0); @@ -729,7 +729,7 @@ static BOOL ov73_021D1510(UnkStruct_ov73_021D1058 *param0, u32 param1, int param break; case 2: if ((param2 != 0) || ((gCoreSys.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A)) { - BGL_DeleteWindow(¶m0->unk_1C); + Window_Remove(¶m0->unk_1C); param0->unk_50 = 0; v0 = 1; } @@ -780,7 +780,7 @@ static BOOL ov73_021D1648(UnkStruct_ov73_021D1058 *param0, int param1, int param break; } - sub_0201A8D4(param0->unk_18, ¶m0->unk_30, v2); + Window_AddFromTemplate(param0->unk_18, ¶m0->unk_30, v2); param0->unk_44 = sub_02013A04(v5, param0->unk_00); @@ -798,7 +798,7 @@ static BOOL ov73_021D1648(UnkStruct_ov73_021D1058 *param0, int param1, int param param0->unk_40 = sub_0200112C(&v1, 0, 0, param0->unk_00); Window_Show(v1.unk_0C, 1, ((0x400 - (18 + 12)) - 9), 3); - sub_0201A954(¶m0->unk_30); + Window_CopyToVRAM(¶m0->unk_30); param0->unk_2C = 1; break; @@ -814,7 +814,7 @@ static BOOL ov73_021D1648(UnkStruct_ov73_021D1058 *param0, int param1, int param } Window_Clear(¶m0->unk_30, 0); - BGL_DeleteWindow(¶m0->unk_30); + Window_Remove(¶m0->unk_30); sub_02001384(param0->unk_40, NULL, NULL); sub_02013A3C(param0->unk_44); Sound_PlayEffect(1500); @@ -834,7 +834,7 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param switch (param0->unk_54) { case 0: - sub_02019120(0, 0); + Bg_ToggleLayer(0, 0); param0->unk_5C = Strbuf_Init(0x400, param0->unk_00); MessageLoader_GetStrbuf(param0->unk_4C, param1, param0->unk_5C); @@ -848,8 +848,8 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param v1.height = v2 * 2; } - sub_0201A8D4(param0->unk_18, ¶m0->unk_1C, &v1); - BGL_WindowColor(¶m0->unk_1C, 0, 0, 0, 24 * 8, 24 * 8); + Window_AddFromTemplate(param0->unk_18, ¶m0->unk_1C, &v1); + Window_FillRectWithColor(¶m0->unk_1C, 0, 0, 0, 24 * 8, 24 * 8); Text_AddPrinterWithParamsAndColor(¶m0->unk_1C, FONT_SYSTEM, param0->unk_5C, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); } else { v1 = Unk_ov72_021D37E4; @@ -864,8 +864,8 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param v1.height = param4; } - sub_0201A8D4(param0->unk_18, ¶m0->unk_1C, &v1); - BGL_WindowColor(¶m0->unk_1C, 0, 0, 0, 24 * 8, 24 * 8); + Window_AddFromTemplate(param0->unk_18, ¶m0->unk_1C, &v1); + Window_FillRectWithColor(¶m0->unk_1C, 0, 0, 0, 24 * 8, 24 * 8); Text_AddPrinterWithParamsAndColor(¶m0->unk_1C, FONT_SYSTEM, param0->unk_5C, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(15, 2, 0), NULL); } @@ -873,7 +873,7 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param param0->unk_54 = 1; break; case 1: - sub_0201A954(¶m0->unk_1C); + Window_CopyToVRAM(¶m0->unk_1C); param0->unk_54 = 2; break; case 2: @@ -893,8 +893,8 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param } break; case 5: - BGL_DeleteWindow(¶m0->unk_1C); - sub_02019EBC(param0->unk_18, 0); + Window_Remove(¶m0->unk_1C); + Bg_ClearTilemap(param0->unk_18, 0); param0->unk_54 = 0; v0 = 1; break; @@ -906,7 +906,7 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param static void ov73_021D1930(UnkStruct_ov73_021D1058 *param0) { sub_02006E3C(125, 0, param0->unk_18, 3, 0, 0, 0, param0->unk_00); - sub_02019690(0, 32, 0, param0->unk_00); + Bg_ClearTilesRange(0, 32, 0, param0->unk_00); sub_02006E3C(125, 24, param0->unk_18, 7, 0, 0, 0, param0->unk_00); { @@ -931,8 +931,8 @@ static void ov73_021D1930(UnkStruct_ov73_021D1058 *param0) ov73_021D1A20(param0); ov73_021D1B14(param0); - sub_0201975C(0, 0x0); - sub_0201975C(4, 0x0); + Bg_MaskPalette(0, 0x0); + Bg_MaskPalette(4, 0x0); } static void ov73_021D19DC(UnkStruct_ov73_021D1058 *param0) @@ -1126,22 +1126,22 @@ static void ov73_021D1B80(UnkStruct_ov73_021D1058 *param0) MI_CpuCopy32(v3, param0->unk_B8, 0x20); sub_020039F8(param0->unk_B8, v3, 1, 16, 0x6a3c); - sub_02019CB8(param0->unk_18, v4, 0, 0, 0, 32, 24, v6); - sub_020198C0(param0->unk_18, v4, v1, 11, 9, 10, 10); + Bg_FillTilemapRect(param0->unk_18, v4, 0, 0, 0, 32, 24, v6); + Bg_LoadToTilemapRect(param0->unk_18, v4, v1, 11, 9, 10, 10); ov73_021D14DC(param0, v4, v6); - sub_02019690(v4, 32, 0, param0->unk_00); - sub_0201958C(param0->unk_18, v4, v2, (10 * 10) * 0x20, 1); - sub_0201972C(v4, v3, (2 * 16), (2 * 16) * v6); - sub_02019CB8(param0->unk_18, v5, 0, 0, 0, 32, 24, v7); - sub_020198C0(param0->unk_18, v5, v1, 11, 7, 10, 10); + Bg_ClearTilesRange(v4, 32, 0, param0->unk_00); + Bg_LoadTiles(param0->unk_18, v4, v2, (10 * 10) * 0x20, 1); + Bg_LoadPalette(v4, v3, (2 * 16), (2 * 16) * v6); + Bg_FillTilemapRect(param0->unk_18, v5, 0, 0, 0, 32, 24, v7); + Bg_LoadToTilemapRect(param0->unk_18, v5, v1, 11, 7, 10, 10); ov73_021D14DC(param0, v5, v7); - sub_02019690(v5, 32, 0, param0->unk_00); - sub_0201958C(param0->unk_18, v5, v2, (10 * 10) * 0x20, 1); - sub_0201972C(v5, v3, (2 * 16), (2 * 16) * v7); + Bg_ClearTilesRange(v5, 32, 0, param0->unk_00); + Bg_LoadTiles(param0->unk_18, v5, v2, (10 * 10) * 0x20, 1); + Bg_LoadPalette(v5, v3, (2 * 16), (2 * 16) * v7); Heap_FreeToHeap(v3); Heap_FreeToHeap(v2); Heap_FreeToHeap(v1); @@ -1153,7 +1153,7 @@ static void ov73_021D1CE0(UnkStruct_ov73_021D1058 *param0) ov73_021D14DC(param0, 6, 9); sub_02006E84(125, 41, 4, 7 * (2 * 16), (2 * 16) * 3, param0->unk_00); - sub_02019690(6, 32, 0, param0->unk_00); + Bg_ClearTilesRange(6, 32, 0, param0->unk_00); sub_02006E3C(125, 32, param0->unk_18, 6, 0x20, 0, 0, param0->unk_00); } @@ -1164,27 +1164,27 @@ static BOOL ov73_021D1D44(UnkStruct_ov73_021D1058 *param0, int param1, int param if (param2 == 0) { { - int v2 = sub_020192EC(param0->unk_18, param1); + int v2 = Bg_GetXOffset(param0->unk_18, param1); if (v2 != 0) { if (v2 > 0) { - sub_02019184(param0->unk_18, param1, 2, 4); + Bg_SetOffset(param0->unk_18, param1, 2, 4); } else { - sub_02019184(param0->unk_18, param1, 1, 4); + Bg_SetOffset(param0->unk_18, param1, 1, 4); } } else { v0 = 1; } } } else if (param2 == 1) { - if (sub_020192EC(param0->unk_18, param1) != -8 * 6) { - sub_02019184(param0->unk_18, param1, 2, 4); + if (Bg_GetXOffset(param0->unk_18, param1) != -8 * 6) { + Bg_SetOffset(param0->unk_18, param1, 2, 4); } else { v0 = 1; } } else if (param2 == 2) { - if (sub_020192EC(param0->unk_18, param1) != 0) { - sub_02019184(param0->unk_18, param1, 1, 4); + if (Bg_GetXOffset(param0->unk_18, param1) != 0) { + Bg_SetOffset(param0->unk_18, param1, 1, 4); } else { v0 = 1; } @@ -1286,8 +1286,8 @@ static void ov73_021D1FA0(UnkStruct_ov73_021D1058 *param0) param0->unk_94[8]--; sub_020039F8(param0->unk_B8, param0->unk_BC, 1, param0->unk_94[8] / 3, 0x6a3c); - sub_0201972C(2, param0->unk_BC, (2 * 16), (2 * 16) * 8); - sub_0201972C(5, param0->unk_BC, (2 * 16), (2 * 16) * 10); + Bg_LoadPalette(2, param0->unk_BC, (2 * 16), (2 * 16) * 8); + Bg_LoadPalette(5, param0->unk_BC, (2 * 16), (2 * 16) * 10); } } @@ -1297,10 +1297,10 @@ static BOOL ov73_021D200C(UnkStruct_ov73_021D1058 *param0, int *param1) switch (*param1) { case 0: - sub_02019184(param0->unk_18, 2, 0, 0); - sub_02019184(param0->unk_18, 2, 3, (-8 * 13)); - BGL_SetPriority(2, 0); - sub_02019120(5, 1); + Bg_SetOffset(param0->unk_18, 2, 0, 0); + Bg_SetOffset(param0->unk_18, 2, 3, (-8 * 13)); + Bg_SetPriority(2, 0); + Bg_ToggleLayer(5, 1); param0->unk_94[5] = 0; param0->unk_94[6] = 8; @@ -1309,19 +1309,19 @@ static BOOL ov73_021D200C(UnkStruct_ov73_021D1058 *param0, int *param1) *param1 = 1; break; case 1: { - int v1 = sub_020192EC(param0->unk_18, 2); - int v2 = sub_020192F8(param0->unk_18, 5); + int v1 = Bg_GetXOffset(param0->unk_18, 2); + int v2 = Bg_GetYOffset(param0->unk_18, 5); int v3 = param0->unk_94[6] * 9 * param0->unk_94[7]; int v4 = 9 * param0->unk_94[7] * param0->unk_94[7] / 2; int v5 = v3 - v4; if (v2 < 8 * 11) { param0->unk_94[7]++; - sub_02019184(param0->unk_18, 2, 1, 2); - sub_02019184(param0->unk_18, 5, 1, 2); - sub_02019184(param0->unk_18, 5, 3, v5); + Bg_SetOffset(param0->unk_18, 2, 1, 2); + Bg_SetOffset(param0->unk_18, 5, 1, 2); + Bg_SetOffset(param0->unk_18, 5, 3, v5); } else { - sub_02019120(5, 0); + Bg_ToggleLayer(5, 0); param0->unk_94[7] = 0; *param1 = 2; } @@ -1330,7 +1330,7 @@ static BOOL ov73_021D200C(UnkStruct_ov73_021D1058 *param0, int *param1) if (param0->unk_94[7]) { param0->unk_94[7]--; } else { - sub_02019120(2, 1); + Bg_ToggleLayer(2, 1); param0->unk_94[5] = 0; param0->unk_94[6] = 9; param0->unk_94[7] = 0; @@ -1338,14 +1338,14 @@ static BOOL ov73_021D200C(UnkStruct_ov73_021D1058 *param0, int *param1) } break; case 3: { - int v6 = sub_020192EC(param0->unk_18, 2); - int v7 = sub_020192F8(param0->unk_18, 2); + int v6 = Bg_GetXOffset(param0->unk_18, 2); + int v7 = Bg_GetYOffset(param0->unk_18, 2); int v8 = param0->unk_94[6] * 9 * param0->unk_94[7]; int v9 = 9 * param0->unk_94[7] * param0->unk_94[7] / 2; int v10 = (-8 * 13) + v8 - v9; if ((param0->unk_94[5] > 0) && (v10 <= 0)) { - sub_02019184(param0->unk_18, 2, 3, 0); + Bg_SetOffset(param0->unk_18, 2, 3, 0); param0->unk_94[5] = 0; param0->unk_94[6] = 3; param0->unk_94[7] = 0; @@ -1353,50 +1353,50 @@ static BOOL ov73_021D200C(UnkStruct_ov73_021D1058 *param0, int *param1) } else { param0->unk_94[7]++; param0->unk_94[5] = v10; - sub_02019184(param0->unk_18, 2, 1, 1); + Bg_SetOffset(param0->unk_18, 2, 1, 1); v10 = v10 >> 1; if (v10 > 8 * 18) { v10 = 8 * 18; } - sub_02019184(param0->unk_18, 2, 3, v10); + Bg_SetOffset(param0->unk_18, 2, 3, v10); } } break; case 4: { - int v11 = sub_020192EC(param0->unk_18, 2); - int v12 = sub_020192F8(param0->unk_18, 2); + int v11 = Bg_GetXOffset(param0->unk_18, 2); + int v12 = Bg_GetYOffset(param0->unk_18, 2); int v13 = param0->unk_94[6] * 9 * param0->unk_94[7]; int v14 = 9 * param0->unk_94[7] * param0->unk_94[7] / 3; int v15 = v13 - v14; if ((param0->unk_94[5] > 0) && (v15 <= 0)) { - sub_02019184(param0->unk_18, 2, 3, 0); + Bg_SetOffset(param0->unk_18, 2, 3, 0); param0->unk_94[5] = 0; param0->unk_94[6] = 3; param0->unk_94[7] = 0; *param1 = 5; } else { param0->unk_94[7]++; - sub_02019184(param0->unk_18, 2, 2, 2); - sub_02019184(param0->unk_18, 2, 3, v15); + Bg_SetOffset(param0->unk_18, 2, 2, 2); + Bg_SetOffset(param0->unk_18, 2, 3, v15); param0->unk_94[5] = v15; } } break; case 5: { - int v16 = sub_020192EC(param0->unk_18, 2); - int v17 = sub_020192F8(param0->unk_18, 2); + int v16 = Bg_GetXOffset(param0->unk_18, 2); + int v17 = Bg_GetYOffset(param0->unk_18, 2); int v18 = param0->unk_94[6] * 9 * param0->unk_94[7]; int v19 = 9 * param0->unk_94[7] * param0->unk_94[7] / 3; int v20 = v18 - v19; if ((param0->unk_94[5] > 0) && (v20 <= 0)) { - sub_02019184(param0->unk_18, 2, 3, 0); + Bg_SetOffset(param0->unk_18, 2, 3, 0); *param1 = 6; } else { param0->unk_94[7]++; - sub_02019184(param0->unk_18, 2, 1, 4); - sub_02019184(param0->unk_18, 2, 3, v20); + Bg_SetOffset(param0->unk_18, 2, 1, 4); + Bg_SetOffset(param0->unk_18, 2, 3, v20); param0->unk_94[5] = v20; } } break; @@ -1413,7 +1413,7 @@ static BOOL ov73_021D200C(UnkStruct_ov73_021D1058 *param0, int *param1) static void ov73_021D230C(UnkStruct_ov73_021D1058 *param0) { - BGL_SetPriority(2, 1); + Bg_SetPriority(2, 1); } static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) @@ -1424,8 +1424,8 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) case 0: sub_02004550(2, 1029, 1); sub_020055D0(1029, 0); - sub_02019120(0, 1); - sub_02019120(7, 1); + Bg_ToggleLayer(0, 1); + Bg_ToggleLayer(7, 1); sub_0200F174(0, 1, 1, 0x0, 6, 1, param0->unk_00); param0->unk_0C = 1; break; @@ -1440,7 +1440,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) if (ov73_021D1510(param0, 0, 1) == 1) { param0->unk_0C = 3; { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } } break; @@ -1449,8 +1449,8 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) param0->unk_89 = 1; param0->unk_8A = 0; ov73_021D1A20(param0); - sub_02019120(3, 1); - sub_02019120(1, 1); + Bg_ToggleLayer(3, 1); + Bg_ToggleLayer(1, 1); sub_0200F174(3, 1, 1, 0x0, 16, 4, param0->unk_00); param0->unk_0C = 4; break; @@ -1480,7 +1480,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) param0->unk_10 = 31; param0->unk_0C = 8; { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } break; case 3: @@ -1496,9 +1496,9 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) case 9: if (ScreenWipe_Done() == 1) { { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } - sub_02019120(1, 0); + Bg_ToggleLayer(1, 0); { param0->unk_0C = param0->unk_10; } @@ -1551,12 +1551,12 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) if (ov73_021D1784(param0, 5, 2, 4, 10) == 1) { param0->unk_0C = 19; { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } } break; case 19: - sub_02019120(0, 1); + Bg_ToggleLayer(0, 1); param0->unk_0C = 20; break; case 20: @@ -1569,7 +1569,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) v1.unk_00 = param0->unk_18; sub_02015958(param0->unk_68, &v1); - sub_02019120(6, 1); + Bg_ToggleLayer(6, 1); } param0->unk_8B = 3; ov73_021D1B14(param0); @@ -1609,7 +1609,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) case 25: if (ScreenWipe_Done() == 1) { { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } param0->unk_0C = 28; } @@ -1617,7 +1617,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) case 26: if (ov73_021D1334(param0, 6, 1) == 1) { { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } sub_02015A54(param0->unk_68); param0->unk_88 = 1; @@ -1637,8 +1637,8 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) ov73_021D19DC(param0); param0->unk_8B = 0; ov73_021D1B14(param0); - sub_02019120(1, 1); - sub_02019184(param0->unk_18, 1, 0, 0); + Bg_ToggleLayer(1, 1); + Bg_SetOffset(param0->unk_18, 1, 0, 0); sub_0200F174(0, 1, 1, 0x0, 6, 1, param0->unk_00); param0->unk_0C = 29; break; @@ -1702,9 +1702,9 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) case 40: if (ScreenWipe_Done() == 1) { { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } - sub_02019120(0, 1); + Bg_ToggleLayer(0, 1); param0->unk_0C = 28; } break; @@ -1727,7 +1727,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) ov73_021D1CE0(param0); param0->unk_8B = 4; ov73_021D1B14(param0); - sub_02019120(6, 1); + Bg_ToggleLayer(6, 1); sub_0200F174(4, 1, 1, 0x0, 6, 1, param0->unk_00); param0->unk_0C = 45; } @@ -1747,7 +1747,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) param0->unk_94[0] = 0; param0->unk_94[1] = 0; { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } param0->unk_0C = 48; } else if (gCoreSys.pressedKeys) { @@ -1804,7 +1804,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) break; case 54: ov73_021D1B80(param0); - sub_02019120(6, 0); + Bg_ToggleLayer(6, 0); param0->unk_94[0] = 0; ov73_021D200C(param0, ¶m0->unk_94[0]); param0->unk_8B = 0; @@ -1833,7 +1833,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) case 58: if (ov73_021D1510(param0, 19, 1) == 1) { { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } param0->unk_0C = 59; } @@ -1864,8 +1864,8 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) param0->unk_89 = 2; param0->unk_8A = 6; ov73_021D1A20(param0); - sub_02019184(param0->unk_18, 1, 0, -8 * 6); - sub_02019184(param0->unk_18, 2, 0, 8 * 6); + Bg_SetOffset(param0->unk_18, 1, 0, -8 * 6); + Bg_SetOffset(param0->unk_18, 2, 0, 8 * 6); param0->unk_0C = 64; break; case 64: @@ -1953,7 +1953,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) break; case 2: case 0xfffffffe: { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } param0->unk_0C = 74; break; @@ -1984,16 +1984,16 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) param0->unk_0C = 77; break; case 77: - sub_02019120(0, 1); - sub_02019120(3, 1); - sub_02019120(7, 1); + Bg_ToggleLayer(0, 1); + Bg_ToggleLayer(3, 1); + Bg_ToggleLayer(7, 1); if (param0->unk_84 == 0) { - sub_02019120(1, 1); - sub_02019184(param0->unk_18, 1, 0, 0); + Bg_ToggleLayer(1, 1); + Bg_SetOffset(param0->unk_18, 1, 0, 0); } else { - sub_02019120(2, 1); - sub_02019184(param0->unk_18, 2, 0, 0); + Bg_ToggleLayer(2, 1); + Bg_SetOffset(param0->unk_18, 2, 0, 0); } sub_0200F174(0, 1, 1, 0x0, 6, 1, param0->unk_00); @@ -2021,7 +2021,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) case 80: if (ov73_021D1648(param0, 0, 0) == 1) { { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } switch (param0->unk_48) { @@ -2135,11 +2135,11 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) param0->unk_0C = 93; break; case 93: - sub_02019120(0, 1); - sub_02019120(3, 1); - sub_02019120(7, 1); - sub_02019120(1, 1); - sub_02019184(param0->unk_18, 1, 0, 0); + Bg_ToggleLayer(0, 1); + Bg_ToggleLayer(3, 1); + Bg_ToggleLayer(7, 1); + Bg_ToggleLayer(1, 1); + Bg_SetOffset(param0->unk_18, 1, 0, 0); sub_0200F174(0, 1, 1, 0x0, 6, 1, param0->unk_00); param0->unk_0C = 94; break; @@ -2157,7 +2157,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) if (ov73_021D1648(param0, 0, 0) == 1) { switch (param0->unk_48) { case 1: { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } param0->unk_0C = 97; break; @@ -2199,7 +2199,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) case 102: if (ov73_021D1334(param0, 1, 1) == 1) { { - sub_02019EBC(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 0); } param0->unk_0C = 103; } diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c index 077dd61bd7..0c2ab848ef 100644 --- a/src/overlay073/ov73_021D3250.c +++ b/src/overlay073/ov73_021D3250.c @@ -157,7 +157,7 @@ int ov73_021D3404 (OverlayManager * param0, int * param1) static void ov73_021D3420 (void * param0) { UnkStruct_ov73_021D342C * v0 = param0; - sub_0201C2B8(v0->unk_04); + Bg_RunScheduledUpdates(v0->unk_04); } static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) @@ -180,7 +180,7 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) } { - param0->unk_04 = sub_02018340(param0->unk_00); + param0->unk_04 = BgConfig_New(param0->unk_00); } { GraphicsModes v1 = { @@ -190,7 +190,7 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) GX_BG0_AS_2D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { int v2, v3, v4; @@ -213,9 +213,9 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) v2 = 2; - sub_020183C4(param0->unk_04, v2, &v5, 0); - sub_02019690(v2, 32, 0, param0->unk_00); - sub_02019EBC(param0->unk_04, v2); + Bg_InitFromTemplate(param0->unk_04, v2, &v5, 0); + Bg_ClearTilesRange(v2, 32, 0, param0->unk_00); + Bg_ClearTilemap(param0->unk_04, v2); } { BgTemplate v6 = { @@ -238,7 +238,7 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) v3 = 1; v4 = 4; - sub_020183C4(param0->unk_04, v2, &v6, 0); + Bg_InitFromTemplate(param0->unk_04, v2, &v6, 0); sub_02006E3C(136, v3, param0->unk_04, v2, 0, 0, 0, param0->unk_00); sub_02006E60(136, v4, param0->unk_04, v2, 0, 0, 0, param0->unk_00); } @@ -263,7 +263,7 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) v3 = 2; v4 = 5; - sub_020183C4(param0->unk_04, v2, &v7, 0); + Bg_InitFromTemplate(param0->unk_04, v2, &v7, 0); sub_02006E3C(136, v3, param0->unk_04, v2, 0, 0, 0, param0->unk_00); sub_02006E60(136, v4, param0->unk_04, v2, 0, 0, 0, param0->unk_00); } @@ -288,7 +288,7 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) v3 = 8; v4 = 7; - sub_020183C4(param0->unk_04, v2, &v8, 0); + Bg_InitFromTemplate(param0->unk_04, v2, &v8, 0); sub_02006E3C(136, v3, param0->unk_04, v2, 0, 0, 0, param0->unk_00); sub_02006E60(136, v4, param0->unk_04, v2, 0, 0, 0, param0->unk_00); } @@ -296,29 +296,29 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) sub_02006E84(136, 6, 0, 0, 0, param0->unk_00); sub_02006E9C(136, 9, 0, 0x20 * 2, 0x20 * 2, 0x20 * 14, param0->unk_00); Font_LoadTextPalette(0, 1 * (2 * 16), param0->unk_00); - sub_0201975C(0, 0x0); - sub_0201975C(4, 0x0); + Bg_MaskPalette(0, 0x0); + Bg_MaskPalette(4, 0x0); G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, (GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3), 0x4, 0xc); } static void ov73_021D35F4 (UnkStruct_ov73_021D342C * param0) { - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); G2_BlendNone(); - sub_02019044(param0->unk_04, 3); - sub_02019044(param0->unk_04, 1); - sub_02019044(param0->unk_04, 0); - sub_02019044(param0->unk_04, 2); + Bg_FreeTilemapBuffer(param0->unk_04, 3); + Bg_FreeTilemapBuffer(param0->unk_04, 1); + Bg_FreeTilemapBuffer(param0->unk_04, 0); + Bg_FreeTilemapBuffer(param0->unk_04, 2); Heap_FreeToHeap(param0->unk_04); } @@ -368,7 +368,7 @@ asm static BOOL ov73_021D3698 (UnkStruct_ov73_021D342C * param0, int param1, int _021D36BC: mov r0, #2 add r1, r6, #0 - bl sub_02019120 + bl Bg_ToggleLayer mov r0, #1 ldr r1, [r4, #0] lsl r0, r0, #0xa @@ -382,7 +382,7 @@ asm static BOOL ov73_021D3698 (UnkStruct_ov73_021D342C * param0, int param1, int ldr r0, [r4, #4] ldr r2, = Unk_ov72_021D3A38 add r1, #0x10 - bl sub_0201A8D4 + bl Window_AddFromTemplate add r1, r6, #0 mov r0, #1 lsl r0, r0, #8 @@ -393,7 +393,7 @@ asm static BOOL ov73_021D3698 (UnkStruct_ov73_021D342C * param0, int param1, int add r0, #0x10 add r2, r1, #0 add r3, r1, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor add r0, r6, #0 add r1, r5, #0 add r2, r0, #0 @@ -423,10 +423,10 @@ asm static BOOL ov73_021D3698 (UnkStruct_ov73_021D342C * param0, int param1, int bl Strbuf_Free add r0, r4, #0 add r0, #0x10 - bl sub_0201A954 + bl Window_CopyToVRAM mov r0, #2 mov r1, #1 - bl sub_02019120 + bl Bg_ToggleLayer mov r0, #0xf0 str r0, [r4, #0x24] mov r0, #1 @@ -461,10 +461,10 @@ asm static BOOL ov73_021D3698 (UnkStruct_ov73_021D342C * param0, int param1, int _021D3782: add r0, r4, #0 add r0, #0x10 - bl BGL_DeleteWindow + bl Window_Remove ldr r0, [r4, #4] mov r1, #2 - bl sub_02019EBC + bl Bg_ClearTilemap add r0, r6, #0 str r0, [r4, #0xc] mov r6, #1 @@ -479,5 +479,5 @@ asm static BOOL ov73_021D3698 (UnkStruct_ov73_021D342C * param0, int param1, int static void ov73_021D37AC (UnkStruct_ov73_021D342C * param0) { param0->unk_20 += 0x4; - sub_02019184(param0->unk_04, 1, 3, param0->unk_20 >> 4); + Bg_SetOffset(param0->unk_04, 1, 3, param0->unk_20 >> 4); } diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index 5eac69f734..14bf05bea1 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -252,7 +252,7 @@ static void ov74_021D1118(void *param0) sub_0200C800(); NNS_GfdDoVramTransfer(); - sub_0201C2B8(v0->unk_14); + Bg_RunScheduledUpdates(v0->unk_14); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -332,7 +332,7 @@ static void ov74_021D12D4(UnkStruct_ov74_021D0D80 *param0) { int v0; - param0->unk_14 = sub_02018340(param0->unk_00); + param0->unk_14 = BgConfig_New(param0->unk_00); { GraphicsModes v1 = { @@ -342,7 +342,7 @@ static void ov74_021D12D4(UnkStruct_ov74_021D0D80 *param0) GX_BG0_AS_2D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -429,21 +429,21 @@ static void ov74_021D12D4(UnkStruct_ov74_021D0D80 *param0) 0, 1, 2, 3, 4 }; - sub_020183C4(param0->unk_14, v3[v0], &(v2[v0]), 0); - sub_02019EBC(param0->unk_14, v3[v0]); + Bg_InitFromTemplate(param0->unk_14, v3[v0], &(v2[v0]), 0); + Bg_ClearTilemap(param0->unk_14, v3[v0]); } } - sub_02019690(0, 32, 0, param0->unk_00); - sub_02019690(4, 32, 0, param0->unk_00); + Bg_ClearTilesRange(0, 32, 0, param0->unk_00); + Bg_ClearTilesRange(4, 32, 0, param0->unk_00); } static void ov74_021D135C(UnkStruct_ov74_021D0D80 *param0) { - sub_02019044(param0->unk_14, 4); - sub_02019044(param0->unk_14, 3); - sub_02019044(param0->unk_14, 2); - sub_02019044(param0->unk_14, 1); - sub_02019044(param0->unk_14, 0); + Bg_FreeTilemapBuffer(param0->unk_14, 4); + Bg_FreeTilemapBuffer(param0->unk_14, 3); + Bg_FreeTilemapBuffer(param0->unk_14, 2); + Bg_FreeTilemapBuffer(param0->unk_14, 1); + Bg_FreeTilemapBuffer(param0->unk_14, 0); Heap_FreeToHeap(param0->unk_14); } @@ -462,8 +462,8 @@ static void ov74_021D1390(UnkStruct_ov74_021D0D80 *param0) NARC_ReadWholeMember(v2, 1, (void *)v3); NNS_G2dGetUnpackedCharacterData(v3, &v4); - sub_0201958C(param0->unk_14, 0, v4->pRawData, v4->szByte, 0); - sub_0201958C(param0->unk_14, 4, v4->pRawData, v4->szByte, 0); + Bg_LoadTiles(param0->unk_14, 0, v4->pRawData, v4->szByte, 0); + Bg_LoadTiles(param0->unk_14, 4, v4->pRawData, v4->szByte, 0); Heap_FreeToHeap(v3); v1 = NARC_GetMemberSize(v2, 0); @@ -471,8 +471,8 @@ static void ov74_021D1390(UnkStruct_ov74_021D0D80 *param0) NARC_ReadWholeMember(v2, 0, (void *)v3); NNS_G2dGetUnpackedPaletteData(v3, &v5); - sub_0201972C(0, v5->pRawData, 0x20 * 1, 0); - sub_0201972C(4, v5->pRawData, 0x20 * 1, 0); + Bg_LoadPalette(0, v5->pRawData, 0x20 * 1, 0); + Bg_LoadPalette(4, v5->pRawData, 0x20 * 1, 0); Heap_FreeToHeap(v3); v1 = NARC_GetMemberSize(v2, 2); @@ -481,13 +481,13 @@ static void ov74_021D1390(UnkStruct_ov74_021D0D80 *param0) NARC_ReadWholeMember(v2, 2, (void *)param0->unk_24); NNS_G2dGetUnpackedScreenData(param0->unk_24, &(param0->unk_28)); NARC_dtor(v2); - sub_02019CB8(param0->unk_14, 2, 0x1, 0, 0, 32, 32, 17); - sub_02019CB8(param0->unk_14, 4, 0x1, 0, 0, 32, 32, 17); - sub_02019964(param0->unk_14, 0, 0, 0, 32, 2, param0->unk_28->rawData, 0, 0, param0->unk_28->screenWidth / 8, param0->unk_28->screenHeight / 8); - sub_02019184(param0->unk_14, 0, 3, -24); - sub_0201C3C0(param0->unk_14, 2); - sub_0201C3C0(param0->unk_14, 0); - sub_0201C3C0(param0->unk_14, 4); + Bg_FillTilemapRect(param0->unk_14, 2, 0x1, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(param0->unk_14, 4, 0x1, 0, 0, 32, 32, 17); + Bg_CopyRectToTilemapRect(param0->unk_14, 0, 0, 0, 32, 2, param0->unk_28->rawData, 0, 0, param0->unk_28->screenWidth / 8, param0->unk_28->screenHeight / 8); + Bg_SetOffset(param0->unk_14, 0, 3, -24); + Bg_ScheduleTilemapTransfer(param0->unk_14, 2); + Bg_ScheduleTilemapTransfer(param0->unk_14, 0); + Bg_ScheduleTilemapTransfer(param0->unk_14, 4); } static void ov74_021D14E8(UnkStruct_ov74_021D0D80 *param0) @@ -497,9 +497,9 @@ static void ov74_021D14E8(UnkStruct_ov74_021D0D80 *param0) static void ov74_021D14F4(UnkStruct_ov74_021D0D80 *param0) { - BGL_AddWindow(param0->unk_14, ¶m0->unk_2C[0], 1, 1, 0, 12, 2, 13, 10); - BGL_AddWindow(param0->unk_14, ¶m0->unk_2C[1], 1, 1, 3, 30, 14, 13, (10 + 12 * 2)); - BGL_AddWindow(param0->unk_14, ¶m0->unk_2C[2], 1, 2, 19, 27, 4, 12, ((10 + 12 * 2) + 30 * 14)); + Window_Add(param0->unk_14, ¶m0->unk_2C[0], 1, 1, 0, 12, 2, 13, 10); + Window_Add(param0->unk_14, ¶m0->unk_2C[1], 1, 1, 3, 30, 14, 13, (10 + 12 * 2)); + Window_Add(param0->unk_14, ¶m0->unk_2C[2], 1, 2, 19, 27, 4, 12, ((10 + 12 * 2) + 30 * 14)); sub_0200DAA4(param0->unk_14, 1, (((10 + 12 * 2) + 30 * 14) + 27 * 4), 14, 0, param0->unk_00); sub_0200DD0C(param0->unk_14, 1, ((((10 + 12 * 2) + 30 * 14) + 27 * 4) + 9), 15, param0->unk_18.unk_00_10, param0->unk_00); @@ -508,12 +508,12 @@ static void ov74_021D14F4(UnkStruct_ov74_021D0D80 *param0) Font_LoadScreenIndicatorsPalette(0, 12 * 32, param0->unk_00); Font_LoadScreenIndicatorsPalette(4, 12 * 32, param0->unk_00); - BGL_FillWindow(&(param0->unk_2C[0]), WINCLR_COL(0)); - BGL_FillWindow(&(param0->unk_2C[1]), WINCLR_COL(15)); - BGL_FillWindow(&(param0->unk_2C[2]), WINCLR_COL(15)); - sub_0201AA3C(&(param0->unk_2C[2])); - sub_0201AA3C(&(param0->unk_2C[1])); - sub_0201AA3C(&(param0->unk_2C[0])); + Window_FillTilemap(&(param0->unk_2C[0]), WINCLR_COL(0)); + Window_FillTilemap(&(param0->unk_2C[1]), WINCLR_COL(15)); + Window_FillTilemap(&(param0->unk_2C[2]), WINCLR_COL(15)); + Window_ClearTilemap(&(param0->unk_2C[2])); + Window_ClearTilemap(&(param0->unk_2C[1])); + Window_ClearTilemap(&(param0->unk_2C[0])); Window_Show(¶m0->unk_2C[1], 1, (((10 + 12 * 2) + 30 * 14) + 27 * 4), 14); sub_0200E060(¶m0->unk_2C[2], 1, ((((10 + 12 * 2) + 30 * 14) + 27 * 4) + 9), 15); @@ -527,10 +527,10 @@ static void ov74_021D1624(UnkStruct_ov74_021D0D80 *param0) sub_0200E084(&(param0->unk_2C[2]), 0); for (v0 = 0; v0 < 3; v0++) { - sub_0201ACF4(&(param0->unk_2C[v0])); - BGL_FillWindow(&(param0->unk_2C[v0]), 0); - sub_0201AA3C(&(param0->unk_2C[v0])); - BGL_DeleteWindow(¶m0->unk_2C[v0]); + Window_ClearAndCopyToVRAM(&(param0->unk_2C[v0])); + Window_FillTilemap(&(param0->unk_2C[v0]), 0); + Window_ClearTilemap(&(param0->unk_2C[v0])); + Window_Remove(¶m0->unk_2C[v0]); } } @@ -575,8 +575,8 @@ static void ov74_021D1668(UnkStruct_ov74_021D0D80 *param0) ov74_021D1BE4(param0, 0, 1); - sub_0201A954(¶m0->unk_2C[0]); - sub_0201A954(¶m0->unk_2C[1]); + Window_CopyToVRAM(¶m0->unk_2C[0]); + Window_CopyToVRAM(¶m0->unk_2C[1]); Strbuf_Free(v6); } @@ -624,11 +624,11 @@ static void ov74_021D17CC(UnkStruct_ov74_021D0D80 *param0, u16 param1) v0 = TEXT_COLOR(1, 2, 15); v1 = TEXT_COLOR(3, 4, 15); - BGL_WindowColor(&(param0->unk_2C[1]), WINCLR_COL(15), (12 * 8 + 4) + v6[param1], 0 + param1 * 16, (48 * 8), 16); + Window_FillRectWithColor(&(param0->unk_2C[1]), WINCLR_COL(15), (12 * 8 + 4) + v6[param1], 0 + param1 * 16, (48 * 8), 16); if (param1 == 5) { Text_AddPrinterWithParamsAndColor(¶m0->unk_2C[1], FONT_SYSTEM, param0->unk_5C[param1].unk_04[param0->unk_5C[param1].unk_02], 1 * 48 + (12 * 8 + 4), 16 * param1 + 0, TEXT_SPEED_NO_TRANSFER, v1, NULL); - sub_0201A954(¶m0->unk_2C[1]); + Window_CopyToVRAM(¶m0->unk_2C[1]); param0->unk_10_21 = 1; return; } @@ -665,7 +665,7 @@ static void ov74_021D17CC(UnkStruct_ov74_021D0D80 *param0, u16 param1) } } - sub_0201A954(¶m0->unk_2C[1]); + Window_CopyToVRAM(¶m0->unk_2C[1]); } static void ov74_021D1968(UnkStruct_ov74_021D0D80 *param0, u16 param1, BOOL param2) @@ -680,7 +680,7 @@ static void ov74_021D1968(UnkStruct_ov74_021D0D80 *param0, u16 param1, BOOL para v2 = Options_TextFrameDelay(param0->unk_1C); - BGL_FillWindow(&(param0->unk_2C[2]), 15); + Window_FillTilemap(&(param0->unk_2C[2]), 15); v0 = TEXT_COLOR(1, 2, 15); v1 = Strbuf_Init(256, param0->unk_00); @@ -691,7 +691,7 @@ static void ov74_021D1968(UnkStruct_ov74_021D0D80 *param0, u16 param1, BOOL para param0->unk_2AC = Text_AddPrinterWithParamsAndColor(¶m0->unk_2C[2], FONT_MESSAGE, v1, 4, 0, v2, v0, NULL); } else { Text_AddPrinterWithParamsAndColor(¶m0->unk_2C[2], FONT_MESSAGE, v1, 4, 0, TEXT_SPEED_NO_TRANSFER, v0, NULL); - sub_0201A9A4(¶m0->unk_2C[2]); + Window_ScheduleCopyToVRAM(¶m0->unk_2C[2]); } Strbuf_Free(v1); @@ -726,12 +726,12 @@ static void ov74_021D1A24(UnkStruct_ov74_021D0D80 *param0) if (gCoreSys.pressedKeys & PAD_KEY_UP) { param0->unk_10_2 = (param0->unk_10_2 + 7 - 1) % 7; - sub_0201C63C(param0->unk_14, 0, 3, -(param0->unk_10_2 * 16 + 24)); + Bg_ScheduleScroll(param0->unk_14, 0, 3, -(param0->unk_10_2 * 16 + 24)); ov74_021D1BE4(param0, param0->unk_10_2, 1); Sound_PlayEffect(1500); } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { param0->unk_10_2 = (param0->unk_10_2 + 1) % 7; - sub_0201C63C(param0->unk_14, 0, 3, -(param0->unk_10_2 * 16 + 24)); + Bg_ScheduleScroll(param0->unk_14, 0, 3, -(param0->unk_10_2 * 16 + 24)); ov74_021D1BE4(param0, param0->unk_10_2, 1); Sound_PlayEffect(1500); } diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 74983e1348..728893c604 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -269,7 +269,7 @@ static int ov75_021D0FA0(UnkStruct_ov75_021D1184 *param0) switch (param0->unk_08) { case 0: sub_0200E060(¶m0->unk_44[5], 1, 1 + 9, UnkEnum_ov75_021D1598_06); - BGL_FillWindow(&(param0->unk_44[5]), ((15 << 4) | 15)); + Window_FillTilemap(&(param0->unk_44[5]), ((15 << 4) | 15)); v0 = Strbuf_Init((19 * 2 * 2), param0->unk_00); @@ -284,7 +284,7 @@ static int ov75_021D0FA0(UnkStruct_ov75_021D1184 *param0) } sub_0200E084(¶m0->unk_44[5], 1); - sub_0201ACF4(&(param0->unk_44[5])); + Window_ClearAndCopyToVRAM(&(param0->unk_44[5])); param0->unk_08 = 0; param0->unk_0C = param0->unk_0D; @@ -327,7 +327,7 @@ static int ov75_021D108C(UnkStruct_ov75_021D1184 *param0) param0->unk_13 = 1; sub_0200E060(¶m0->unk_44[5], 1, 1 + 9, UnkEnum_ov75_021D1598_06); - BGL_FillWindow(&(param0->unk_44[5]), ((15 << 4) | 15)); + Window_FillTilemap(&(param0->unk_44[5]), ((15 << 4) | 15)); v1 = Strbuf_Init((19 * 2 * 2), param0->unk_00); MessageLoader_GetStrbuf(param0->unk_20, 3, v1); @@ -355,7 +355,7 @@ static int ov75_021D108C(UnkStruct_ov75_021D1184 *param0) } sub_0200E084(¶m0->unk_44[5], 1); - sub_0201ACF4(&(param0->unk_44[5])); + Window_ClearAndCopyToVRAM(&(param0->unk_44[5])); param0->unk_08 = 0; if (v0) { @@ -472,7 +472,7 @@ static void ov75_021D131C(void *param0) } NNS_GfdDoVramTransfer(); - sub_0201C2B8(v0->unk_18); + Bg_RunScheduledUpdates(v0->unk_18); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -572,7 +572,7 @@ static void ov75_021D1480(UnkStruct_ov75_021D1184 *param0) ov75_021D1460(); - param0->unk_18 = sub_02018340(param0->unk_00); + param0->unk_18 = BgConfig_New(param0->unk_00); { GraphicsModes v2 = { @@ -582,7 +582,7 @@ static void ov75_021D1480(UnkStruct_ov75_021D1184 *param0) GX_BG0_AS_2D }; - sub_02018368(&v2); + SetAllGraphicsModes(&v2); } { @@ -664,32 +664,32 @@ static void ov75_021D1480(UnkStruct_ov75_021D1184 *param0) }, }; - sub_020183C4(param0->unk_18, 0, &(v3[0]), 0); - sub_020183C4(param0->unk_18, 1, &(v3[1]), 0); - sub_020183C4(param0->unk_18, 2, &(v3[2]), 0); - sub_020183C4(param0->unk_18, 3, &(v3[3]), 0); - sub_020183C4(param0->unk_18, 4, &(v3[4]), 0); + Bg_InitFromTemplate(param0->unk_18, 0, &(v3[0]), 0); + Bg_InitFromTemplate(param0->unk_18, 1, &(v3[1]), 0); + Bg_InitFromTemplate(param0->unk_18, 2, &(v3[2]), 0); + Bg_InitFromTemplate(param0->unk_18, 3, &(v3[3]), 0); + Bg_InitFromTemplate(param0->unk_18, 4, &(v3[4]), 0); } - sub_02019EBC(param0->unk_18, 0); - sub_02019EBC(param0->unk_18, 1); - sub_02019EBC(param0->unk_18, 2); - sub_02019EBC(param0->unk_18, 3); - sub_02019EBC(param0->unk_18, 4); - sub_02019690(0, 32, 0, param0->unk_00); - sub_02019690(1, 32, 0, param0->unk_00); - sub_02019690(2, 32, 0, param0->unk_00); - sub_02019690(3, 32, 0, param0->unk_00); - sub_02019690(4, 32, 0, param0->unk_00); + Bg_ClearTilemap(param0->unk_18, 0); + Bg_ClearTilemap(param0->unk_18, 1); + Bg_ClearTilemap(param0->unk_18, 2); + Bg_ClearTilemap(param0->unk_18, 3); + Bg_ClearTilemap(param0->unk_18, 4); + Bg_ClearTilesRange(0, 32, 0, param0->unk_00); + Bg_ClearTilesRange(1, 32, 0, param0->unk_00); + Bg_ClearTilesRange(2, 32, 0, param0->unk_00); + Bg_ClearTilesRange(3, 32, 0, param0->unk_00); + Bg_ClearTilesRange(4, 32, 0, param0->unk_00); } static void ov75_021D1564(UnkStruct_ov75_021D1184 *param0) { - sub_02019044(param0->unk_18, 4); - sub_02019044(param0->unk_18, 3); - sub_02019044(param0->unk_18, 2); - sub_02019044(param0->unk_18, 1); - sub_02019044(param0->unk_18, 0); + Bg_FreeTilemapBuffer(param0->unk_18, 4); + Bg_FreeTilemapBuffer(param0->unk_18, 3); + Bg_FreeTilemapBuffer(param0->unk_18, 2); + Bg_FreeTilemapBuffer(param0->unk_18, 1); + Bg_FreeTilemapBuffer(param0->unk_18, 0); Heap_FreeToHeap(param0->unk_18); } @@ -716,8 +716,8 @@ static void ov75_021D1598(UnkStruct_ov75_021D1184 *param0) NARC_ReadWholeMember(v5, v6, (void *)v2); NNS_G2dGetUnpackedCharacterData(v2, &v3); - sub_0201958C(param0->unk_18, 1, v3->pRawData, v3->szByte, 0); - sub_0201958C(param0->unk_18, 4, v3->pRawData, v3->szByte, 0); + Bg_LoadTiles(param0->unk_18, 1, v3->pRawData, v3->szByte, 0); + Bg_LoadTiles(param0->unk_18, 4, v3->pRawData, v3->szByte, 0); Heap_FreeToHeap(v2); v1 = NARC_GetMemberSize(v5, v8); @@ -725,7 +725,7 @@ static void ov75_021D1598(UnkStruct_ov75_021D1184 *param0) NARC_ReadWholeMember(v5, v8, (void *)v2); NNS_G2dGetUnpackedPaletteData(v2, &v4); - sub_0201972C(4, v4->pRawData, v4->szByte, 0); + Bg_LoadPalette(4, v4->pRawData, v4->szByte, 0); param0->unk_30 = sub_02002F38(param0->unk_00); @@ -759,14 +759,14 @@ static void ov75_021D1598(UnkStruct_ov75_021D1184 *param0) NNS_G2dGetUnpackedScreenData(param0->unk_38, &(param0->unk_40)); NARC_dtor(v5); - sub_02019CB8(param0->unk_18, 4, 0x2001, 0, 0, 32, 32, 17); - sub_020198E8(param0->unk_18, 3, 0, 0, 32, 24, param0->unk_3C->rawData, 0, 0, param0->unk_3C->screenWidth / 8, param0->unk_3C->screenHeight / 8); - sub_0201C3C0(param0->unk_18, 3); - sub_0201C3C0(param0->unk_18, 4); + Bg_FillTilemapRect(param0->unk_18, 4, 0x2001, 0, 0, 32, 32, 17); + Bg_CopyToTilemapRect(param0->unk_18, 3, 0, 0, 32, 24, param0->unk_3C->rawData, 0, 0, param0->unk_3C->screenWidth / 8, param0->unk_3C->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param0->unk_18, 3); + Bg_ScheduleTilemapTransfer(param0->unk_18, 4); if (param0->unk_0C == 1) { - sub_020198E8(param0->unk_18, 2, 0, 0, 32, 24, param0->unk_40->rawData, 0, 0, param0->unk_40->screenWidth / 8, param0->unk_40->screenHeight / 8); - sub_0201C3C0(param0->unk_18, 2); + Bg_CopyToTilemapRect(param0->unk_18, 2, 0, 0, 32, 24, param0->unk_40->rawData, 0, 0, param0->unk_40->screenWidth / 8, param0->unk_40->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param0->unk_18, 2); param0->unk_14 = 0; param0->unk_15 = 0; @@ -792,18 +792,18 @@ static void ov75_021D18A8(UnkStruct_ov75_021D1184 *param0) { int v0 = 0; - BGL_AddWindow(param0->unk_18, ¶m0->unk_44[0], 1, 3, 3, 26, 4, 1, 1023 - 26 * 4); - BGL_AddWindow(param0->unk_18, ¶m0->unk_44[1], 1, 3, 3 + 4 + 1, 26, 4, 1, ((1023 - 26 * 4) - (26 * 4))); - BGL_AddWindow(param0->unk_18, ¶m0->unk_44[2], 1, 3, (3 + 4 + 1 + 4 + 1), 26, 4, 1, (((1023 - 26 * 4) - (26 * 4)) - (26 * 4))); - BGL_AddWindow(param0->unk_18, ¶m0->unk_44[3], 1, 21, 20, 8, 2, (UnkEnum_ov75_021D1598_01), ((((1023 - 26 * 4) - (26 * 4)) - (26 * 4)) - 8 * 2)); - BGL_AddWindow(param0->unk_18, ¶m0->unk_44[4], 1, 3, 20, 8, 2, (UnkEnum_ov75_021D1598_01), (((((1023 - 26 * 4) - (26 * 4)) - (26 * 4)) - 8 * 2) - 8 * 2)); - BGL_AddWindow(param0->unk_18, ¶m0->unk_44[5], 0, 2, 19, 27, 4, (UnkEnum_ov75_021D1598_04), ((((((1023 - 26 * 4) - (26 * 4)) - (26 * 4)) - 8 * 2) - 8 * 2) - 8 * 2)); + Window_Add(param0->unk_18, ¶m0->unk_44[0], 1, 3, 3, 26, 4, 1, 1023 - 26 * 4); + Window_Add(param0->unk_18, ¶m0->unk_44[1], 1, 3, 3 + 4 + 1, 26, 4, 1, ((1023 - 26 * 4) - (26 * 4))); + Window_Add(param0->unk_18, ¶m0->unk_44[2], 1, 3, (3 + 4 + 1 + 4 + 1), 26, 4, 1, (((1023 - 26 * 4) - (26 * 4)) - (26 * 4))); + Window_Add(param0->unk_18, ¶m0->unk_44[3], 1, 21, 20, 8, 2, (UnkEnum_ov75_021D1598_01), ((((1023 - 26 * 4) - (26 * 4)) - (26 * 4)) - 8 * 2)); + Window_Add(param0->unk_18, ¶m0->unk_44[4], 1, 3, 20, 8, 2, (UnkEnum_ov75_021D1598_01), (((((1023 - 26 * 4) - (26 * 4)) - (26 * 4)) - 8 * 2) - 8 * 2)); + Window_Add(param0->unk_18, ¶m0->unk_44[5], 0, 2, 19, 27, 4, (UnkEnum_ov75_021D1598_04), ((((((1023 - 26 * 4) - (26 * 4)) - (26 * 4)) - 8 * 2) - 8 * 2) - 8 * 2)); for (v0 = 0; v0 < 6; v0++) { - BGL_FillWindow(&(param0->unk_44[v0]), 0); + Window_FillTilemap(&(param0->unk_44[v0]), 0); if (v0 < 5) { - sub_0201A954(¶m0->unk_44[v0]); + Window_CopyToVRAM(¶m0->unk_44[v0]); } } } @@ -813,8 +813,8 @@ static void ov75_021D19A8(UnkStruct_ov75_021D1184 *param0) int v0 = 0; for (v0 = 0; v0 < 6; v0++) { - sub_0201ACF4(¶m0->unk_44[v0]); - BGL_DeleteWindow(¶m0->unk_44[v0]); + Window_ClearAndCopyToVRAM(¶m0->unk_44[v0]); + Window_Remove(¶m0->unk_44[v0]); } } @@ -832,7 +832,7 @@ static void ov75_021D19C8(UnkStruct_ov75_021D1184 *param0) Text_AddPrinterWithParamsAndColor(¶m0->unk_44[0 + v0], FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); - sub_0201A954(¶m0->unk_44[0 + v0]); + Window_CopyToVRAM(¶m0->unk_44[0 + v0]); } if (param0->unk_0C == 1) { @@ -851,13 +851,13 @@ static void ov75_021D19C8(UnkStruct_ov75_021D1184 *param0) v3 /= 2; Text_AddPrinterWithParamsAndColor(¶m0->unk_44[3 + v0], FONT_MESSAGE, v2, v3, 2, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A954(¶m0->unk_44[3 + v0]); + Window_CopyToVRAM(¶m0->unk_44[3 + v0]); } Strbuf_Free(v2); } else { Text_AddPrinterWithParamsAndColor(¶m0->unk_44[3], FONT_MESSAGE, param0->unk_1C->unk_10, 0, 2, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A954(¶m0->unk_44[3]); + Window_CopyToVRAM(¶m0->unk_44[3]); } } diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index 4a70d082a3..5c6fad409d 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -155,7 +155,7 @@ void ov76_0223B98C(UnkStruct_ov76_0223DE00 *param0, int param1, int param2, int { Window_Init(&v5); - BGL_AddFramelessWindow(param0->unk_D4.unk_10, &v5, 10, 2, 0, 0); + Window_AddToTopLeftCorner(param0->unk_D4.unk_10, &v5, 10, 2, 0, 0); Text_AddPrinterWithParamsAndColor(&v5, FONT_SUBSCREEN, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 2), NULL); } @@ -180,7 +180,7 @@ void ov76_0223B98C(UnkStruct_ov76_0223DE00 *param0, int param1, int param2, int sub_02012AC0(param0->unk_D4.unk_164[param1], param4); Strbuf_Free(v1); MessageLoader_Free(v4); - BGL_DeleteWindow(&v5); + Window_Remove(&v5); } void ov76_0223BA90(UnkStruct_ov76_0223DE00 *param0, int param1) @@ -334,8 +334,8 @@ static void ov76_0223BCA0(SysTask *param0, void *param1) if (ov12_02225C14(&v0->unk_00[8]) == 1) { v1 = 1; - sub_02019184(v0->unk_164, 5, 0, v0->unk_00[8].unk_00); - sub_02019184(v0->unk_164, 5, 3, v0->unk_00[8].unk_02); + Bg_SetOffset(v0->unk_164, 5, 0, v0->unk_00[8].unk_00); + Bg_SetOffset(v0->unk_164, 5, 3, v0->unk_00[8].unk_02); } } @@ -373,8 +373,8 @@ void ov76_0223BD30(UnkStruct_ov76_0223DE00 *param0, s8 param1, int param2) } { - int v4 = sub_020192EC(v0->unk_164, 5); - int v5 = sub_020192F8(v0->unk_164, 5); + int v4 = Bg_GetXOffset(v0->unk_164, 5); + int v5 = Bg_GetYOffset(v0->unk_164, 5); ov12_02225BC8(&v0->unk_00[8], v4, v4 + (((+7 * 8) * param1) * -1), v5, v5 + (((-2 * 8) * param1) * -1), param2); } @@ -492,7 +492,7 @@ void ov76_0223BF74(BgConfig *param0, Window *param1, int param2, UnkStruct_ov76_ v7 = (v5 / 2); Window_Init(param1); - BGL_AddWindow(param0, param1, param2, v2, v3, v4, v5, 14, v6); + Window_Add(param0, param1, param2, v2, v3, v4, v5, 14, v6); param3->unk_D4.unk_C8 = sub_02013A04(v7, 53); @@ -948,17 +948,17 @@ void ov76_0223CA30(Window *param0, int param1) Strbuf *v1; if (param1 == 0xFFFF) { - BGL_FillWindow(param0, 15); - sub_0201A954(param0); + Window_FillTilemap(param0, 15); + Window_CopyToVRAM(param0); return; } v0 = MessageLoader_Init(0, 26, 8, 53); v1 = MessageLoader_GetNewStrbuf(v0, param1); - BGL_FillWindow(param0, 15); + Window_FillTilemap(param0, 15); Text_AddPrinterWithParams(param0, FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_INSTANT, NULL); - sub_0201A954(param0); + Window_CopyToVRAM(param0); Strbuf_Free(v1); MessageLoader_Free(v0); } @@ -966,18 +966,18 @@ void ov76_0223CA30(Window *param0, int param1) void ov76_0223CA98(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7) { Window_Init(param1); - BGL_AddWindow(param0, param1, param2, param3, param4, param5, param6, 14, param7); + Window_Add(param0, param1, param2, param3, param4, param5, param6, 14, param7); sub_0200E060(param1, 1, 1, 12); - BGL_FillWindow(param1, 15); - sub_0201A954(param1); + Window_FillTilemap(param1, 15); + Window_CopyToVRAM(param1); } static void ov76_0223CAFC(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { Window_Init(param1); - BGL_AddWindow(param0, param1, param2, param3, param4, param5, param6, param8, param7); - BGL_FillWindow(param1, 15); - sub_0201A954(param1); + Window_Add(param0, param1, param2, param3, param4, param5, param6, param8, param7); + Window_FillTilemap(param1, 15); + Window_CopyToVRAM(param1); } void ov76_0223CB58(UnkStruct_ov76_0223DE00 *param0) @@ -1007,19 +1007,19 @@ void ov76_0223CC8C(UnkStruct_ov76_0223DE00 *param0) v2 = param0->unk_418.unk_08[v1]; if (v2 == 0) { - BGL_FillWindow(v5, 0xEE); - sub_0201A954(v5); + Window_FillTilemap(v5, 0xEE); + Window_CopyToVRAM(v5); continue; } - BGL_FillWindow(v5, 0x0); + Window_FillTilemap(v5, 0x0); v4 = Strbuf_Init(100, 53); v3 = sub_0202CA90(param0->unk_64, v2 - 1); Strbuf_FormatInt(v4, v3, 3, 1, 1); Text_AddPrinterWithParamsAndColor(v5, FONT_SYSTEM, v4, (-1 + 8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A954(v5); + Window_CopyToVRAM(v5); Strbuf_Free(v4); } } @@ -1038,19 +1038,19 @@ void ov76_0223CD20(UnkStruct_ov76_0223DE00 *param0, int param1) v2 = param0->unk_418.unk_08[v1]; if (v2 == 0) { - BGL_FillWindow(v5, 0xEE); - sub_0201A954(v5); + Window_FillTilemap(v5, 0xEE); + Window_CopyToVRAM(v5); return; } - BGL_FillWindow(v5, 0x0); + Window_FillTilemap(v5, 0x0); v4 = Strbuf_Init(100, 53); v3 = sub_0202CA90(param0->unk_64, v2 - 1); Strbuf_FormatInt(v4, v3, 3, 1, 1); Text_AddPrinterWithParamsAndColor(v5, FONT_MESSAGE, v4, (-1 + 8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A954(v5); + Window_CopyToVRAM(v5); Strbuf_Free(v4); } @@ -1059,8 +1059,8 @@ void ov76_0223CDA4(UnkStruct_ov76_0223DE00 *param0) int v0; for (v0 = 3; v0 < 11; v0++) { - sub_0201ACF4(¶m0->unk_D4.unk_18[v0]); - BGL_DeleteWindow(¶m0->unk_D4.unk_18[v0]); + Window_ClearAndCopyToVRAM(¶m0->unk_D4.unk_18[v0]); + Window_Remove(¶m0->unk_D4.unk_18[v0]); } } @@ -1070,17 +1070,17 @@ void ov76_0223CDC4(Window *param0, int param1) Strbuf *v1; if (param1 == 0xFFFF) { - BGL_FillWindow(param0, 15); - sub_0201A954(param0); + Window_FillTilemap(param0, 15); + Window_CopyToVRAM(param0); return; } v0 = MessageLoader_Init(0, 26, 12, 53); v1 = MessageLoader_GetNewStrbuf(v0, param1); - BGL_FillWindow(param0, 15); + Window_FillTilemap(param0, 15); Text_AddPrinterWithParams(param0, FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_INSTANT, NULL); - sub_0201A954(param0); + Window_CopyToVRAM(param0); Strbuf_Free(v1); MessageLoader_Free(v0); } diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index d7834cdcda..83f24aeb61 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -187,10 +187,10 @@ static void ov76_0223D494(UnkStruct_ov76_0223DE00 *param0, int param1, int param static int ov76_0223D4C4(UnkStruct_ov76_0223DE00 *param0) { Window_Clear(¶m0->unk_D4.unk_18[1], 1); - sub_0201ACF4(¶m0->unk_D4.unk_18[1]); + Window_ClearAndCopyToVRAM(¶m0->unk_D4.unk_18[1]); sub_02001BC4(param0->unk_D4.unk_CC, NULL); sub_02013A3C(param0->unk_D4.unk_C8); - BGL_DeleteWindow(¶m0->unk_D4.unk_18[1]); + Window_Remove(¶m0->unk_D4.unk_18[1]); return 1; } @@ -433,7 +433,7 @@ static BOOL ov76_0223D674(UnkStruct_ov76_0223DE00 *param0) if (ScreenWipe_Done() != 1) { break; } - BGL_DeleteWindow(¶m0->unk_D4.unk_18[0]); + Window_Remove(¶m0->unk_D4.unk_18[0]); ov76_0223C8BC(param0); ov76_0223C32C(param0); ov76_0223D31C(param0); @@ -797,7 +797,7 @@ static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0) sub_02003178(param0->unk_D4.unk_14, 0x4, 0xFFFF, 0, 0, 16, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers((GX_PLANEMASK_BG2), 1); - BGL_SetPriority(7, 1); + Bg_SetPriority(7, 1); ov76_0223D2F4(param0, 1); ov76_0223C568(param0, 1); ov76_0223B96C(param0, 1); @@ -807,7 +807,7 @@ static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0) if (sub_0200384C(param0->unk_D4.unk_14) != 0) { break; } - BGL_SetPriority(3, 1); + Bg_SetPriority(3, 1); sub_02003178(param0->unk_D4.unk_14, 0x1, (1 << 1), 0, 16, 0, 0); param0->unk_3D4++; break; @@ -1053,8 +1053,8 @@ static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0) sub_02015A54(param0->unk_D4.unk_150); sub_02015938(param0->unk_D4.unk_150); sub_0200E084(¶m0->unk_D4.unk_18[2], 1); - sub_0201ACF4(¶m0->unk_D4.unk_18[2]); - BGL_DeleteWindow(¶m0->unk_D4.unk_18[2]); + Window_ClearAndCopyToVRAM(¶m0->unk_D4.unk_18[2]); + Window_Remove(¶m0->unk_D4.unk_18[2]); param0->unk_3DC++; break; case 0: @@ -1107,8 +1107,8 @@ static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0) sub_02003178(param0->unk_D4.unk_14, 0x1, (1 << 0), 0, 16, 0, 0); sub_02003178(param0->unk_D4.unk_14, 0x4, 0xFFFF, 0, 16, 0, 0); - BGL_SetPriority(3, 3); - BGL_SetPriority(7, 3); + Bg_SetPriority(3, 3); + Bg_SetPriority(7, 3); GXLayers_EngineBToggleLayers((GX_PLANEMASK_BG2), 0); ov76_0223D2F4(param0, 0); ov76_0223C568(param0, 0); @@ -1192,7 +1192,7 @@ static BOOL ov76_0223E8A4(UnkStruct_ov76_0223DE00 *param0) break; } - BGL_DeleteWindow(¶m0->unk_D4.unk_18[0]); + Window_Remove(¶m0->unk_D4.unk_18[0]); ov76_0223C8BC(param0); ov76_0223C32C(param0); ov76_0223D31C(param0); @@ -1359,7 +1359,7 @@ void ov76_0223EB64(BgConfig *param0) GX_BG0_AS_3D, }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -1411,12 +1411,12 @@ void ov76_0223EB64(BgConfig *param0) }, }; - sub_020183C4(param0, 1, &v2[0], 0); - sub_020183C4(param0, 2, &v2[1], 0); - sub_020183C4(param0, 3, &v2[2], 0); - sub_02019EBC(param0, 1); - sub_02019EBC(param0, 2); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 1, &v2[0], 0); + Bg_InitFromTemplate(param0, 2, &v2[1], 0); + Bg_InitFromTemplate(param0, 3, &v2[2], 0); + Bg_ClearTilemap(param0, 1); + Bg_ClearTilemap(param0, 2); + Bg_ClearTilemap(param0, 3); G2_SetBG0Priority(1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -1486,14 +1486,14 @@ void ov76_0223EB64(BgConfig *param0) }, }; - sub_020183C4(param0, 4, &v3[0], 0); - sub_020183C4(param0, 5, &v3[1], 0); - sub_020183C4(param0, 6, &v3[2], 0); - sub_020183C4(param0, 7, &v3[3], 0); - sub_02019EBC(param0, 4); - sub_02019EBC(param0, 5); - sub_02019EBC(param0, 6); - sub_02019EBC(param0, 7); + Bg_InitFromTemplate(param0, 4, &v3[0], 0); + Bg_InitFromTemplate(param0, 5, &v3[1], 0); + Bg_InitFromTemplate(param0, 6, &v3[2], 0); + Bg_InitFromTemplate(param0, 7, &v3[3], 0); + Bg_ClearTilemap(param0, 4); + Bg_ClearTilemap(param0, 5); + Bg_ClearTilemap(param0, 6); + Bg_ClearTilemap(param0, 7); GXLayers_EngineBToggleLayers((GX_PLANEMASK_BG2), 0); } } @@ -1506,7 +1506,7 @@ void ov76_0223ECB0(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_D4.unk_14); - sub_0201C2B8(v0->unk_D4.unk_10); + Bg_RunScheduledUpdates(v0->unk_D4.unk_10); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index a267e6a9c6..8b4a8014ea 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -349,7 +349,7 @@ static int ov77_021D10FC(OverlayManager *param0, int *param1) static void ov77_021D1178(void *param0) { UnkStruct_ov77_021D17B4 *v0 = param0; - sub_0201C2B8(v0->unk_04); + Bg_RunScheduledUpdates(v0->unk_04); } static void ov77_021D1184(void) @@ -624,7 +624,7 @@ static void ov77_021D1704(UnkStruct_ov77_021D1208 *param0) static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) { - param0->unk_04 = sub_02018340(param0->unk_00); + param0->unk_04 = BgConfig_New(param0->unk_00); { GraphicsModes v0 = { @@ -634,7 +634,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) GX_BG0_AS_3D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -654,7 +654,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) 0 }; - sub_020183C4(param0->unk_04, 4, &v1, 0); + Bg_InitFromTemplate(param0->unk_04, 4, &v1, 0); } { BgTemplate v2 = { @@ -673,7 +673,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) 0 }; - sub_020183C4(param0->unk_04, 5, &v2, 0); + Bg_InitFromTemplate(param0->unk_04, 5, &v2, 0); } { BgTemplate v3 = { @@ -692,7 +692,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) 0 }; - sub_020183C4(param0->unk_04, 6, &v3, 0); + Bg_InitFromTemplate(param0->unk_04, 6, &v3, 0); } { BgTemplate v4 = { @@ -711,7 +711,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) 0 }; - sub_020183C4(param0->unk_04, 1, &v4, 0); + Bg_InitFromTemplate(param0->unk_04, 1, &v4, 0); } { @@ -731,7 +731,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) 0 }; - sub_020183C4(param0->unk_04, 3, &v5, 0); + Bg_InitFromTemplate(param0->unk_04, 3, &v5, 0); } { BgTemplate v6 = { @@ -750,7 +750,7 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) 0 }; - sub_020183C4(param0->unk_04, 7, &v6, 0); + Bg_InitFromTemplate(param0->unk_04, 7, &v6, 0); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); @@ -761,8 +761,8 @@ static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); - sub_0201975C(0, 0x0); - sub_0201975C(4, 0x0); + Bg_MaskPalette(0, 0x0); + Bg_MaskPalette(4, 0x0); } static void ov77_021D1908(UnkStruct_ov77_021D17B4 *param0) @@ -775,12 +775,12 @@ static void ov77_021D1908(UnkStruct_ov77_021D17B4 *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); - sub_02019044(param0->unk_04, 4); - sub_02019044(param0->unk_04, 5); - sub_02019044(param0->unk_04, 6); - sub_02019044(param0->unk_04, 1); - sub_02019044(param0->unk_04, 3); - sub_02019044(param0->unk_04, 7); + Bg_FreeTilemapBuffer(param0->unk_04, 4); + Bg_FreeTilemapBuffer(param0->unk_04, 5); + Bg_FreeTilemapBuffer(param0->unk_04, 6); + Bg_FreeTilemapBuffer(param0->unk_04, 1); + Bg_FreeTilemapBuffer(param0->unk_04, 3); + Bg_FreeTilemapBuffer(param0->unk_04, 7); Heap_FreeToHeap(param0->unk_04); } @@ -928,7 +928,7 @@ static void ov77_021D1C10(UnkStruct_ov77_021D1568 *param0) static void ov77_021D1CC0(BgConfig *param0, int param1) { - sub_02019044(param0, 5); + Bg_FreeTilemapBuffer(param0, 5); { BgTemplate v0 = { 0, @@ -946,7 +946,7 @@ static void ov77_021D1CC0(BgConfig *param0, int param1) 0 }; - sub_020183C4(param0, 5, &v0, 0); + Bg_InitFromTemplate(param0, 5, &v0, 0); } sub_02006E3C(48, 23, param0, 5, 0, 0, 0, param1); @@ -960,7 +960,7 @@ static void ov77_021D1CC0(BgConfig *param0, int param1) static void ov77_021D1D48(BgConfig *param0, int param1) { - sub_02019044(param0, 4); + Bg_FreeTilemapBuffer(param0, 4); { BgTemplate v0 = { @@ -979,7 +979,7 @@ static void ov77_021D1D48(BgConfig *param0, int param1) 0 }; - sub_020183C4(param0, 4, &v0, 0); + Bg_InitFromTemplate(param0, 4, &v0, 0); } sub_02006E60(48, 22, param0, 4, 0, 0, 0, param1); @@ -989,8 +989,8 @@ static void ov77_021D1D48(BgConfig *param0, int param1) G2S_SetBG2Priority(0); G2S_SetBG3Priority(2); - sub_02019184(param0, 6, 0, 0); - sub_02019184(param0, 6, 3, +1); + Bg_SetOffset(param0, 6, 0, 0); + Bg_SetOffset(param0, 6, 3, +1); G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1, GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 26, 10); @@ -1249,21 +1249,21 @@ static void ov77_021D2214(BgConfig *param0, int param1, UnkStruct_ov77_021D1568 sub_02006E84(48, 4, 0, 32 * 1, 32 * 3, param1); } - sub_0201975C(0, 0x0); - sub_0201975C(4, 0x0); + Bg_MaskPalette(0, 0x0); + Bg_MaskPalette(4, 0x0); { MessageLoader *v4; Strbuf *v5; u32 v6; - sub_02019690(4, 32, 0, param1); + Bg_ClearTilesRange(4, 32, 0, param1); v4 = MessageLoader_Init(1, 26, 609, param1); v5 = Strbuf_Init(64, param1); - sub_0201A8D4(param0, ¶m2->unk_22C, &Unk_ov77_021D72D0); - BGL_WindowColor(¶m2->unk_22C, 0, 0, 0, 28 * 8, 2 * 8); + Window_AddFromTemplate(param0, ¶m2->unk_22C, &Unk_ov77_021D72D0); + Window_FillRectWithColor(¶m2->unk_22C, 0, 0, 0, 28 * 8, 2 * 8); MessageLoader_GetStrbuf(v4, 0, v5); v6 = Font_CalcCenterAlignment(FONT_SYSTEM, v5, 1, param2->unk_22C.width * 8); @@ -1276,15 +1276,15 @@ static void ov77_021D2214(BgConfig *param0, int param1, UnkStruct_ov77_021D1568 u16 v7 = 0x15; u16 v8 = 0x15; - sub_0201972C(4, &v7, 2, (16 * 2) * 2 + 2 * 1); - sub_0201972C(4, &v8, 2, (16 * 2) * 2 + 2 * 2); + Bg_LoadPalette(4, &v7, 2, (16 * 2) * 2 + 2 * 1); + Bg_LoadPalette(4, &v8, 2, (16 * 2) * 2 + 2 * 2); } } } static void ov77_021D2428(BgConfig *param0, int param1, UnkStruct_ov77_021D1568 *param2) { - BGL_DeleteWindow(¶m2->unk_22C); + Window_Remove(¶m2->unk_22C); } static void ov77_021D2438(UnkStruct_ov77_021D1568 *param0) diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c index a9b35b6d51..34ae6409ab 100644 --- a/src/overlay077/ov77_021D25B0.c +++ b/src/overlay077/ov77_021D25B0.c @@ -289,7 +289,7 @@ static void ov77_021D25F0(void) static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) { - param0->unk_0C = sub_02018340(param0->unk_00); + param0->unk_0C = BgConfig_New(param0->unk_00); { GraphicsModes v0 = { @@ -299,7 +299,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -319,7 +319,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 1, &v1, 0); + Bg_InitFromTemplate(param0->unk_0C, 1, &v1, 0); } { @@ -339,7 +339,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 2, &v2, 0); + Bg_InitFromTemplate(param0->unk_0C, 2, &v2, 0); } { @@ -359,7 +359,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 3, &v3, 0); + Bg_InitFromTemplate(param0->unk_0C, 3, &v3, 0); } { @@ -379,7 +379,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 5, &v4, 0); + Bg_InitFromTemplate(param0->unk_0C, 5, &v4, 0); } { @@ -399,7 +399,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 6, &v5, 0); + Bg_InitFromTemplate(param0->unk_0C, 6, &v5, 0); } { @@ -419,16 +419,16 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 7, &v6, 0); + Bg_InitFromTemplate(param0->unk_0C, 7, &v6, 0); } - sub_0201975C(0, 0x0); - sub_0201975C(4, 0x0); + Bg_MaskPalette(0, 0x0); + Bg_MaskPalette(4, 0x0); } static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) { - param0->unk_0C = sub_02018340(param0->unk_00); + param0->unk_0C = BgConfig_New(param0->unk_00); { GraphicsModes v0 = { @@ -438,7 +438,7 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) GX_BG0_AS_3D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -458,7 +458,7 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 1, &v1, 0); + Bg_InitFromTemplate(param0->unk_0C, 1, &v1, 0); } { @@ -478,7 +478,7 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 2, &v2, 0); + Bg_InitFromTemplate(param0->unk_0C, 2, &v2, 0); } { @@ -498,7 +498,7 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 3, &v3, 0); + Bg_InitFromTemplate(param0->unk_0C, 3, &v3, 0); } { @@ -518,7 +518,7 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 4, &v4, 0); + Bg_InitFromTemplate(param0->unk_0C, 4, &v4, 0); } { @@ -570,13 +570,13 @@ static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) }, }; - sub_020183C4(param0->unk_0C, 5, &v5[0], 0); - sub_020183C4(param0->unk_0C, 6, &v5[1], 0); - sub_020183C4(param0->unk_0C, 7, &v5[2], 0); + Bg_InitFromTemplate(param0->unk_0C, 5, &v5[0], 0); + Bg_InitFromTemplate(param0->unk_0C, 6, &v5[1], 0); + Bg_InitFromTemplate(param0->unk_0C, 7, &v5[2], 0); } - sub_0201975C(1, 0x0); - sub_0201975C(4, 0x0); + Bg_MaskPalette(1, 0x0); + Bg_MaskPalette(4, 0x0); } static void ov77_021D2828(UnkStruct_ov77_021D2E9C *param0) @@ -600,7 +600,7 @@ static void ov77_021D2828(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 3, &v0, 0); + Bg_InitFromTemplate(param0->unk_0C, 3, &v0, 0); } { @@ -620,7 +620,7 @@ static void ov77_021D2828(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 1, &v1, 0); + Bg_InitFromTemplate(param0->unk_0C, 1, &v1, 0); } { @@ -640,7 +640,7 @@ static void ov77_021D2828(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 2, &v2, 0); + Bg_InitFromTemplate(param0->unk_0C, 2, &v2, 0); } { @@ -692,13 +692,13 @@ static void ov77_021D2828(UnkStruct_ov77_021D2E9C *param0) }, }; - sub_020183C4(param0->unk_0C, 5, &v3[0], 0); - sub_020183C4(param0->unk_0C, 6, &v3[1], 0); - sub_020183C4(param0->unk_0C, 7, &v3[2], 0); + Bg_InitFromTemplate(param0->unk_0C, 5, &v3[0], 0); + Bg_InitFromTemplate(param0->unk_0C, 6, &v3[1], 0); + Bg_InitFromTemplate(param0->unk_0C, 7, &v3[2], 0); } - sub_0201975C(1, 0x0); - sub_0201975C(4, 0x0); + Bg_MaskPalette(1, 0x0); + Bg_MaskPalette(4, 0x0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); param0->unk_34.unk_25A = 1; @@ -717,7 +717,7 @@ static void ov77_021D2900(UnkStruct_ov77_021D2E9C *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -737,7 +737,7 @@ static void ov77_021D2900(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 0, &v1, 0); + Bg_InitFromTemplate(param0->unk_0C, 0, &v1, 0); } { @@ -757,13 +757,13 @@ static void ov77_021D2900(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 4, &v2, 0); + Bg_InitFromTemplate(param0->unk_0C, 4, &v2, 0); } - sub_02019184(param0->unk_0C, 0, 0, 0); - sub_02019184(param0->unk_0C, 0, 3, 0); - sub_02019184(param0->unk_0C, 4, 0, 0); - sub_02019184(param0->unk_0C, 4, 3, 0); + Bg_SetOffset(param0->unk_0C, 0, 0, 0); + Bg_SetOffset(param0->unk_0C, 0, 3, 0); + Bg_SetOffset(param0->unk_0C, 4, 0, 0); + Bg_SetOffset(param0->unk_0C, 4, 3, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); @@ -781,7 +781,7 @@ static void ov77_021D2900(UnkStruct_ov77_021D2E9C *param0) static void ov77_021D2A00(UnkStruct_ov77_021D2E9C *param0) { - param0->unk_0C = sub_02018340(param0->unk_00); + param0->unk_0C = BgConfig_New(param0->unk_00); { GraphicsModes v0 = { @@ -791,7 +791,7 @@ static void ov77_021D2A00(UnkStruct_ov77_021D2E9C *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -811,10 +811,10 @@ static void ov77_021D2A00(UnkStruct_ov77_021D2E9C *param0) 0 }; - sub_020183C4(param0->unk_0C, 2, &v1, 0); + Bg_InitFromTemplate(param0->unk_0C, 2, &v1, 0); } - sub_0201975C(2, 0x0); + Bg_MaskPalette(2, 0x0); } static void ov77_021D2A58(UnkStruct_ov77_021D2E9C *param0) @@ -875,16 +875,16 @@ static void ov77_021D2B38(void *param0) } if (v1->unk_0C != NULL) { - sub_0201C2B8(v1->unk_0C); + Bg_RunScheduledUpdates(v1->unk_0C); } for (v0 = 0; v0 < 7 + 1; v0++) { if (v2->unk_247 & 1) { - sub_02019120(v0, 1); + Bg_ToggleLayer(v0, 1); } if (v2->unk_248 & 1) { - sub_02019120(v0, 0); + Bg_ToggleLayer(v0, 0); } v2->unk_247 >>= 1; @@ -1174,12 +1174,12 @@ static void ov77_021D3234(UnkStruct_ov77_021D2E9C *param0) if (param0->unk_18.unk_02) { ov77_021D67B0(param0->unk_18.unk_14); - sub_02019044(param0->unk_0C, 1); - sub_02019044(param0->unk_0C, 2); - sub_02019044(param0->unk_0C, 6); - sub_02019044(param0->unk_0C, 3); - sub_02019044(param0->unk_0C, 7); - sub_02019044(param0->unk_0C, 5); + Bg_FreeTilemapBuffer(param0->unk_0C, 1); + Bg_FreeTilemapBuffer(param0->unk_0C, 2); + Bg_FreeTilemapBuffer(param0->unk_0C, 6); + Bg_FreeTilemapBuffer(param0->unk_0C, 3); + Bg_FreeTilemapBuffer(param0->unk_0C, 7); + Bg_FreeTilemapBuffer(param0->unk_0C, 5); Heap_FreeToHeap(param0->unk_0C); param0->unk_18.unk_02 = 0; @@ -1388,30 +1388,30 @@ static void ov77_021D361C(UnkStruct_ov77_021D2E9C *param0, BOOL param1) { if (param0->unk_34.unk_02 && (param0->unk_0C != NULL)) { if (param0->unk_34.unk_25A == 0) { - sub_02019044(param0->unk_0C, 3); - sub_02019044(param0->unk_0C, 1); - sub_02019044(param0->unk_0C, 2); - sub_02019044(param0->unk_0C, 4); - sub_02019044(param0->unk_0C, 5); - sub_02019044(param0->unk_0C, 6); - sub_02019044(param0->unk_0C, 7); + Bg_FreeTilemapBuffer(param0->unk_0C, 3); + Bg_FreeTilemapBuffer(param0->unk_0C, 1); + Bg_FreeTilemapBuffer(param0->unk_0C, 2); + Bg_FreeTilemapBuffer(param0->unk_0C, 4); + Bg_FreeTilemapBuffer(param0->unk_0C, 5); + Bg_FreeTilemapBuffer(param0->unk_0C, 6); + Bg_FreeTilemapBuffer(param0->unk_0C, 7); } else if (param0->unk_34.unk_25A == 1) { - sub_02019044(param0->unk_0C, 3); - sub_02019044(param0->unk_0C, 1); - sub_02019044(param0->unk_0C, 2); + Bg_FreeTilemapBuffer(param0->unk_0C, 3); + Bg_FreeTilemapBuffer(param0->unk_0C, 1); + Bg_FreeTilemapBuffer(param0->unk_0C, 2); - sub_02019044(param0->unk_0C, 5); - sub_02019044(param0->unk_0C, 6); - sub_02019044(param0->unk_0C, 7); + Bg_FreeTilemapBuffer(param0->unk_0C, 5); + Bg_FreeTilemapBuffer(param0->unk_0C, 6); + Bg_FreeTilemapBuffer(param0->unk_0C, 7); } else { - sub_02019044(param0->unk_0C, 0); - sub_02019044(param0->unk_0C, 3); - sub_02019044(param0->unk_0C, 1); - sub_02019044(param0->unk_0C, 2); - sub_02019044(param0->unk_0C, 4); - sub_02019044(param0->unk_0C, 5); - sub_02019044(param0->unk_0C, 6); - sub_02019044(param0->unk_0C, 7); + Bg_FreeTilemapBuffer(param0->unk_0C, 0); + Bg_FreeTilemapBuffer(param0->unk_0C, 3); + Bg_FreeTilemapBuffer(param0->unk_0C, 1); + Bg_FreeTilemapBuffer(param0->unk_0C, 2); + Bg_FreeTilemapBuffer(param0->unk_0C, 4); + Bg_FreeTilemapBuffer(param0->unk_0C, 5); + Bg_FreeTilemapBuffer(param0->unk_0C, 6); + Bg_FreeTilemapBuffer(param0->unk_0C, 7); } if (param1 == 1) { @@ -1537,11 +1537,11 @@ static void ov77_021D3A10(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 u8 v0; NARC *v1; - sub_02018898(param1->unk_10, 2, 0, GX_BG_COLORMODE_16); - sub_02018898(param1->unk_10, 3, 0, GX_BG_COLORMODE_16); + Bg_SetControlParam(param1->unk_10, 2, 0, GX_BG_COLORMODE_16); + Bg_SetControlParam(param1->unk_10, 3, 0, GX_BG_COLORMODE_16); G2_SetBG0Priority(0); - BGL_SetPriority(1, 3); + Bg_SetPriority(1, 3); v1 = NARC_ctor(NARC_INDEX_DEMO__TITLE__OP_DEMO, 76); @@ -1557,12 +1557,12 @@ static void ov77_021D3A10(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 MI_CpuClear16((void *)HW_BG_PLTT, 2); MI_CpuClear16((void *)HW_DB_BG_PLTT, 2); - sub_02019184(param1->unk_10, 1, 0, 0); - sub_02019184(param1->unk_10, 2, 0, 0); - sub_02019184(param1->unk_10, 3, 0, 0); - sub_02019184(param1->unk_10, 5, 0, 0); - sub_02019184(param1->unk_10, 6, 0, 0); - sub_02019184(param1->unk_10, 7, 0, 0); + Bg_SetOffset(param1->unk_10, 1, 0, 0); + Bg_SetOffset(param1->unk_10, 2, 0, 0); + Bg_SetOffset(param1->unk_10, 3, 0, 0); + Bg_SetOffset(param1->unk_10, 5, 0, 0); + Bg_SetOffset(param1->unk_10, 6, 0, 0); + Bg_SetOffset(param1->unk_10, 7, 0, 0); NARC_dtor(v1); } @@ -1602,12 +1602,12 @@ static void ov77_021D3B5C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 MI_CpuClear16((void *)HW_BG_PLTT, 2); MI_CpuClear16((void *)HW_DB_BG_PLTT, 2); - sub_02019184(param1->unk_10, 1, 0, -128); - sub_02019184(param1->unk_10, 2, 0, -200); - sub_02019184(param1->unk_10, 3, 0, -152); - sub_02019184(param1->unk_10, 5, 0, 128); - sub_02019184(param1->unk_10, 6, 0, 0x18 * 8); - sub_02019184(param1->unk_10, 7, 0, 0x16 * 8); + Bg_SetOffset(param1->unk_10, 1, 0, -128); + Bg_SetOffset(param1->unk_10, 2, 0, -200); + Bg_SetOffset(param1->unk_10, 3, 0, -152); + Bg_SetOffset(param1->unk_10, 5, 0, 128); + Bg_SetOffset(param1->unk_10, 6, 0, 0x18 * 8); + Bg_SetOffset(param1->unk_10, 7, 0, 0x16 * 8); NARC_dtor(v1); } @@ -1632,33 +1632,33 @@ static void ov77_021D3D4C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 static void ov77_021D3DC4(UnkStruct_ov77_021D37C0 *param0) { if (gCoreSys.unk_65 == 0) { - sub_02019184(param0->unk_10, 1, 3, 0); - sub_02019184(param0->unk_10, 2, 3, 0); - sub_02019184(param0->unk_10, 3, 3, 0); - sub_02019184(param0->unk_10, 5, 3, 256); - sub_02019184(param0->unk_10, 6, 3, 256); - sub_02019184(param0->unk_10, 7, 3, 256); + Bg_SetOffset(param0->unk_10, 1, 3, 0); + Bg_SetOffset(param0->unk_10, 2, 3, 0); + Bg_SetOffset(param0->unk_10, 3, 3, 0); + Bg_SetOffset(param0->unk_10, 5, 3, 256); + Bg_SetOffset(param0->unk_10, 6, 3, 256); + Bg_SetOffset(param0->unk_10, 7, 3, 256); - BGL_SetPriority(1, 1); - BGL_SetPriority(2, 2); - BGL_SetPriority(3, 0); - BGL_SetPriority(5, 1); - BGL_SetPriority(6, 2); - BGL_SetPriority(7, 0); + Bg_SetPriority(1, 1); + Bg_SetPriority(2, 2); + Bg_SetPriority(3, 0); + Bg_SetPriority(5, 1); + Bg_SetPriority(6, 2); + Bg_SetPriority(7, 0); } else { - sub_02019184(param0->unk_10, 1, 3, 256); - sub_02019184(param0->unk_10, 2, 3, 256); - sub_02019184(param0->unk_10, 3, 3, 256); - sub_02019184(param0->unk_10, 5, 3, 0); - sub_02019184(param0->unk_10, 6, 3, 0); - sub_02019184(param0->unk_10, 7, 3, 0); + Bg_SetOffset(param0->unk_10, 1, 3, 256); + Bg_SetOffset(param0->unk_10, 2, 3, 256); + Bg_SetOffset(param0->unk_10, 3, 3, 256); + Bg_SetOffset(param0->unk_10, 5, 3, 0); + Bg_SetOffset(param0->unk_10, 6, 3, 0); + Bg_SetOffset(param0->unk_10, 7, 3, 0); - BGL_SetPriority(1, 1); - BGL_SetPriority(2, 2); - BGL_SetPriority(3, 0); - BGL_SetPriority(5, 1); - BGL_SetPriority(6, 2); - BGL_SetPriority(7, 0); + Bg_SetPriority(1, 1); + Bg_SetPriority(2, 2); + Bg_SetPriority(3, 0); + Bg_SetPriority(5, 1); + Bg_SetPriority(6, 2); + Bg_SetPriority(7, 0); } ov77_021D636C(param0->unk_14, 0); @@ -1853,14 +1853,14 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 } if (param2 >= 640) { - sub_02019120(3, 1); + Bg_ToggleLayer(3, 1); sub_0200AAE0(8, 0, -16, GX_BLEND_PLANEMASK_BG3, 1); (*v0)++; } break; case 1: if ((sub_0200AC1C(1) == 1) && (param2 == 700)) { - sub_02019120(0, 1); + Bg_ToggleLayer(0, 1); ov77_021D6CD0(param1->unk_1C, 9); ov77_021D6CD0(param1->unk_1C, 10); ov77_021D6CD0(param1->unk_1C, 11); @@ -1932,31 +1932,31 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 ov77_021D61B8(param1->unk_14, param2); if (ScreenWipe_Done() && (param2 >= 1600)) { - sub_02019120(4, 0); + Bg_ToggleLayer(4, 0); ov77_021D6000(param1->unk_14, param1->unk_18); param1->unk_244 = 1; ov77_021D3A10(param0, param1); ov77_021D603C(param1->unk_14, 1, 1); ov77_021D603C(param1->unk_14, 2, 1); - sub_02019120(1, 1); - sub_02019120(2, 1); - sub_02019120(3, 1); - sub_02019120(5, 1); - sub_02019120(6, 1); - sub_02019120(7, 1); - sub_02019184(param1->unk_10, 1, 0, 256); - sub_02019184(param1->unk_10, 1, 3, 0); - sub_02019184(param1->unk_10, 2, 0, 0); - sub_02019184(param1->unk_10, 2, 3, 256); - sub_02019184(param1->unk_10, 3, 0, 0); - sub_02019184(param1->unk_10, 3, 3, 0); - sub_02019184(param1->unk_10, 5, 0, 256); - sub_02019184(param1->unk_10, 5, 3, 0); - sub_02019184(param1->unk_10, 6, 0, 0); - sub_02019184(param1->unk_10, 6, 3, 256); - sub_02019184(param1->unk_10, 7, 0, 0); - sub_02019184(param1->unk_10, 7, 3, 0); + Bg_ToggleLayer(1, 1); + Bg_ToggleLayer(2, 1); + Bg_ToggleLayer(3, 1); + Bg_ToggleLayer(5, 1); + Bg_ToggleLayer(6, 1); + Bg_ToggleLayer(7, 1); + Bg_SetOffset(param1->unk_10, 1, 0, 256); + Bg_SetOffset(param1->unk_10, 1, 3, 0); + Bg_SetOffset(param1->unk_10, 2, 0, 0); + Bg_SetOffset(param1->unk_10, 2, 3, 256); + Bg_SetOffset(param1->unk_10, 3, 0, 0); + Bg_SetOffset(param1->unk_10, 3, 3, 0); + Bg_SetOffset(param1->unk_10, 5, 0, 256); + Bg_SetOffset(param1->unk_10, 5, 3, 0); + Bg_SetOffset(param1->unk_10, 6, 0, 0); + Bg_SetOffset(param1->unk_10, 6, 3, 256); + Bg_SetOffset(param1->unk_10, 7, 0, 0); + Bg_SetOffset(param1->unk_10, 7, 3, 0); param1->unk_264 += 0; param1->unk_260 = 256 << FX32_SHIFT; @@ -1983,14 +1983,14 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 if (ScreenWipe_Done()) { if (param2 >= (62 * 30 - 15 - 15)) { - sub_0201C63C(param1->unk_10, 3, 0, 0); - sub_0201C63C(param1->unk_10, 3, 3, 256); - sub_0201C63C(param1->unk_10, 7, 0, 0); - sub_0201C63C(param1->unk_10, 7, 3, 256); - sub_0201C63C(param1->unk_10, 2, 0, 0); - sub_0201C63C(param1->unk_10, 2, 3, 0); - sub_0201C63C(param1->unk_10, 6, 0, 0); - sub_0201C63C(param1->unk_10, 6, 3, 0); + Bg_ScheduleScroll(param1->unk_10, 3, 0, 0); + Bg_ScheduleScroll(param1->unk_10, 3, 3, 256); + Bg_ScheduleScroll(param1->unk_10, 7, 0, 0); + Bg_ScheduleScroll(param1->unk_10, 7, 3, 256); + Bg_ScheduleScroll(param1->unk_10, 2, 0, 0); + Bg_ScheduleScroll(param1->unk_10, 2, 3, 0); + Bg_ScheduleScroll(param1->unk_10, 6, 0, 0); + Bg_ScheduleScroll(param1->unk_10, 6, 3, 0); param1->unk_248 = (1 << 1) | (1 << 5); param1->unk_246 = 1; @@ -2017,10 +2017,10 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 if (ScreenWipe_Done()) { param1->unk_247 = (1 << 1) | (1 << 5); param1->unk_248 = (1 << 2) | (1 << 6); - sub_0201C63C(param1->unk_10, 1, 0, 0); - sub_0201C63C(param1->unk_10, 1, 3, 0); - sub_0201C63C(param1->unk_10, 5, 0, 0); - sub_0201C63C(param1->unk_10, 5, 3, 0); + Bg_ScheduleScroll(param1->unk_10, 1, 0, 0); + Bg_ScheduleScroll(param1->unk_10, 1, 3, 0); + Bg_ScheduleScroll(param1->unk_10, 5, 0, 0); + Bg_ScheduleScroll(param1->unk_10, 5, 3, 0); sub_0200F174(0, 1, 1, 0x0, 4, 1, 76); (*v0)++; } @@ -2032,10 +2032,10 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 if (ScreenWipe_Done()) { if (param2 == (65 * 30 - 15 - 15 - 45 - 15)) { - sub_0201C63C(param1->unk_10, 1, 0, 0); - sub_0201C63C(param1->unk_10, 1, 3, 256); - sub_0201C63C(param1->unk_10, 5, 0, 0); - sub_0201C63C(param1->unk_10, 5, 3, 256); + Bg_ScheduleScroll(param1->unk_10, 1, 0, 0); + Bg_ScheduleScroll(param1->unk_10, 1, 3, 256); + Bg_ScheduleScroll(param1->unk_10, 5, 0, 0); + Bg_ScheduleScroll(param1->unk_10, 5, 3, 256); ov77_021D603C(param1->unk_14, 11, 1); ov77_021D603C(param1->unk_14, 12, 1); } else if (param2 >= (1935 - 15)) { @@ -2138,12 +2138,12 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 ov77_021D3DC4(param1); ov77_021D636C(param1->unk_14, 1); - sub_0201C63C(param1->unk_10, 1, 0, -60); - sub_0201C63C(param1->unk_10, 2, 0, -60); - sub_0201C63C(param1->unk_10, 3, 0, -60); - sub_0201C63C(param1->unk_10, 5, 0, 60); - sub_0201C63C(param1->unk_10, 6, 0, 60); - sub_0201C63C(param1->unk_10, 7, 0, 60); + Bg_ScheduleScroll(param1->unk_10, 1, 0, -60); + Bg_ScheduleScroll(param1->unk_10, 2, 0, -60); + Bg_ScheduleScroll(param1->unk_10, 3, 0, -60); + Bg_ScheduleScroll(param1->unk_10, 5, 0, 60); + Bg_ScheduleScroll(param1->unk_10, 6, 0, 60); + Bg_ScheduleScroll(param1->unk_10, 7, 0, 60); sub_0200F174(3, 1, 1, 0x0, 16, 1, 76); (*v0)++; } @@ -2195,19 +2195,19 @@ static void ov77_021D4B70(UnkStruct_ov77_021D37C0 *param0) param0->unk_260 += 0x280; param0->unk_264 += 0x110; - sub_02019184(param0->unk_10, 1, 3, -(param0->unk_264 >> FX32_SHIFT)); - sub_02019184(param0->unk_10, 2, 3, -(param0->unk_260 >> FX32_SHIFT)); + Bg_SetOffset(param0->unk_10, 1, 3, -(param0->unk_264 >> FX32_SHIFT)); + Bg_SetOffset(param0->unk_10, 2, 3, -(param0->unk_260 >> FX32_SHIFT)); - sub_02019184(param0->unk_10, 5, 3, -(param0->unk_264 >> FX32_SHIFT)); - sub_02019184(param0->unk_10, 6, 3, -(param0->unk_260 >> FX32_SHIFT)); + Bg_SetOffset(param0->unk_10, 5, 3, -(param0->unk_264 >> FX32_SHIFT)); + Bg_SetOffset(param0->unk_10, 6, 3, -(param0->unk_260 >> FX32_SHIFT)); param0->unk_0C = 0; } static void ov77_021D4BE4(UnkStruct_ov77_021D37C0 *param0) { - sub_0201C63C(param0->unk_10, 3, 1, 16); - sub_0201C63C(param0->unk_10, 7, 1, -16); + Bg_ScheduleScroll(param0->unk_10, 3, 1, 16); + Bg_ScheduleScroll(param0->unk_10, 7, 1, -16); } static void ov77_021D4C04(UnkStruct_ov77_021D37C0 *param0, int param1) @@ -2236,18 +2236,18 @@ static void ov77_021D4C04(UnkStruct_ov77_021D37C0 *param0, int param1) G2S_SetWnd1Position(1, param0->unk_256, 0, param0->unk_258); GXS_SetVisibleWnd(GX_WNDMASK_W0 | GX_WNDMASK_W1); } else if (param1 > (65 * 30 - 15 - 15 - 45 - 15)) { - if (sub_02019FF0(param0->unk_10, 1) >= 256) { + if (Bg_GetXOffset2(param0->unk_10, 1) >= 256) { param0->unk_248 |= (1 << 1); } - if (sub_02019FF0(param0->unk_10, 5) <= -256) { + if (Bg_GetXOffset2(param0->unk_10, 5) <= -256) { param0->unk_248 |= (1 << 5); } - sub_0201C63C(param0->unk_10, 1, 1, 12); - sub_0201C63C(param0->unk_10, 1, 4, -1); - sub_0201C63C(param0->unk_10, 5, 1, -12); - sub_0201C63C(param0->unk_10, 5, 4, -1); + Bg_ScheduleScroll(param0->unk_10, 1, 1, 12); + Bg_ScheduleScroll(param0->unk_10, 1, 4, -1); + Bg_ScheduleScroll(param0->unk_10, 5, 1, -12); + Bg_ScheduleScroll(param0->unk_10, 5, 4, -1); } } @@ -2256,54 +2256,54 @@ static void ov77_021D4DC8(UnkStruct_ov77_021D37C0 *param0, int param1) int v0, v1; if (param1 > ((1935 - 15) + 8)) { - v0 = sub_020192EC(param0->unk_10, 1) + 20; + v0 = Bg_GetXOffset(param0->unk_10, 1) + 20; if (v0 > 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 1, 0, v0); - v0 = sub_020192EC(param0->unk_10, 5) - 20; + Bg_ScheduleScroll(param0->unk_10, 1, 0, v0); + v0 = Bg_GetXOffset(param0->unk_10, 5) - 20; if (v0 < 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 5, 0, v0); + Bg_ScheduleScroll(param0->unk_10, 5, 0, v0); } if (param1 >= ((1935 - 15) + 14)) { - v0 = sub_020192EC(param0->unk_10, 2) + 20; + v0 = Bg_GetXOffset(param0->unk_10, 2) + 20; if (v0 > 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 2, 0, v0); - v0 = sub_020192EC(param0->unk_10, 6) - 20; + Bg_ScheduleScroll(param0->unk_10, 2, 0, v0); + v0 = Bg_GetXOffset(param0->unk_10, 6) - 20; if (v0 < 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 6, 0, v0); + Bg_ScheduleScroll(param0->unk_10, 6, 0, v0); } if (param1 >= ((1935 - 15) + 20)) { - v0 = sub_020192EC(param0->unk_10, 3) + 20; + v0 = Bg_GetXOffset(param0->unk_10, 3) + 20; if (v0 > 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 3, 0, v0); - v0 = sub_020192EC(param0->unk_10, 7) - 20; + Bg_ScheduleScroll(param0->unk_10, 3, 0, v0); + v0 = Bg_GetXOffset(param0->unk_10, 7) - 20; if (v0 < 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 7, 0, v0); + Bg_ScheduleScroll(param0->unk_10, 7, 0, v0); } } @@ -2311,48 +2311,48 @@ static void ov77_021D4E90(UnkStruct_ov77_021D37C0 *param0) { int v0, v1; - v0 = sub_020192EC(param0->unk_10, 1) + 12; + v0 = Bg_GetXOffset(param0->unk_10, 1) + 12; if (v0 > 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 1, 0, v0); - v0 = sub_020192EC(param0->unk_10, 5) - 12; + Bg_ScheduleScroll(param0->unk_10, 1, 0, v0); + v0 = Bg_GetXOffset(param0->unk_10, 5) - 12; if (v0 < 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 5, 0, v0); - v0 = sub_020192EC(param0->unk_10, 2) + 12; + Bg_ScheduleScroll(param0->unk_10, 5, 0, v0); + v0 = Bg_GetXOffset(param0->unk_10, 2) + 12; if (v0 > 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 2, 0, v0); - v0 = sub_020192EC(param0->unk_10, 6) - 12; + Bg_ScheduleScroll(param0->unk_10, 2, 0, v0); + v0 = Bg_GetXOffset(param0->unk_10, 6) - 12; if (v0 < 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 6, 0, v0); - v0 = sub_020192EC(param0->unk_10, 3) + 12; + Bg_ScheduleScroll(param0->unk_10, 6, 0, v0); + v0 = Bg_GetXOffset(param0->unk_10, 3) + 12; if (v0 > 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 3, 0, v0); - v0 = sub_020192EC(param0->unk_10, 7) - 12; + Bg_ScheduleScroll(param0->unk_10, 3, 0, v0); + v0 = Bg_GetXOffset(param0->unk_10, 7) - 12; if (v0 < 0) { v0 = 0; } - sub_0201C63C(param0->unk_10, 7, 0, v0); + Bg_ScheduleScroll(param0->unk_10, 7, 0, v0); } static void ov77_021D4F38(UnkStruct_ov77_021D37C0 *param0, const int param1) @@ -2402,13 +2402,13 @@ static void ov77_021D4F38(UnkStruct_ov77_021D37C0 *param0, const int param1) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BD, 7, 16 - 7); - BGL_SetPriority(1, 0); - sub_02019120(1, 1); + Bg_SetPriority(1, 0); + Bg_ToggleLayer(1, 1); } } else if (param1 < ((47 * 30 - 15) + 6)) { v0.x += FX32_ONE * 4; Camera_Move(&v0, param0->unk_20.camera); - sub_0201C63C(param0->unk_10, 1, 1, 4); + Bg_ScheduleScroll(param0->unk_10, 1, 1, 4); } else if (param1 == ((47 * 30 - 15) + 6)) { VecFx32 v6 = { FX32_ONE * 16 * 30, 0, FX32_ONE * 0 - 0x70000 }; Camera_InitWithTarget(&v6, Unk_ov77_021D74FC.unk_00, &Unk_ov77_021D74FC.cameraAngle, Unk_ov77_021D74FC.unk_0E, Unk_ov77_021D74FC.unk_0C, 0, param0->unk_20.camera); @@ -2429,7 +2429,7 @@ static void ov77_021D4F38(UnkStruct_ov77_021D37C0 *param0, const int param1) { G2_BlendNone(); - sub_02019120(1, 0); + Bg_ToggleLayer(1, 0); } } else { if (param1 >= 1560) { @@ -2543,8 +2543,8 @@ static void ov77_021D5308(UnkStruct_ov77_021D5308 *param0) param0->unk_04 = -24 * FX32_ONE; - sub_02019184(param0->unk_08, 2, 0, 0); - sub_02019184(param0->unk_08, 2, 3, param0->unk_04 / FX32_ONE); + Bg_SetOffset(param0->unk_08, 2, 0, 0); + Bg_SetOffset(param0->unk_08, 2, 3, param0->unk_04 / FX32_ONE); param0->unk_03 = 1; } @@ -2586,7 +2586,7 @@ static BOOL ov77_021D5390(UnkStruct_ov77_021D5308 *param0, const int param1) } param0->unk_04 += 0x400; - sub_02019184(param0->unk_08, 2, 3, param0->unk_04 / FX32_ONE); + Bg_SetOffset(param0->unk_08, 2, 3, param0->unk_04 / FX32_ONE); return 0; } @@ -2594,7 +2594,7 @@ static BOOL ov77_021D5390(UnkStruct_ov77_021D5308 *param0, const int param1) static void ov77_021D5478(UnkStruct_ov77_021D2E9C *param0) { if (param0->unk_298.unk_02) { - sub_02019044(param0->unk_0C, 2); + Bg_FreeTilemapBuffer(param0->unk_0C, 2); Heap_FreeToHeap(param0->unk_0C); param0->unk_298.unk_02 = 0; } diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index 1c34fefd29..b853fb89dc 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -203,7 +203,7 @@ static void ov79_021D0F7C(void *param0) } sub_0201DCAC(); - sub_0201C2B8(v0->unk_24); + Bg_RunScheduledUpdates(v0->unk_24); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -383,7 +383,7 @@ static int ov79_021D11C0(UnkStruct_ov79_021D0E1C *param0) } sub_0200E084(¶m0->unk_E8[2], 1); - sub_0201ACF4(¶m0->unk_E8[2]); + Window_ClearAndCopyToVRAM(¶m0->unk_E8[2]); param0->unk_20->unk_1C[param0->unk_1A].unk_04_val1_6 = 1; param0->unk_20->unk_02 = 1; @@ -483,7 +483,7 @@ static void ov79_021D132C(UnkStruct_ov79_021D0E1C *param0) ov79_021D130C(); - param0->unk_24 = sub_02018340(param0->unk_00); + param0->unk_24 = BgConfig_New(param0->unk_00); { GraphicsModes v2 = { @@ -493,7 +493,7 @@ static void ov79_021D132C(UnkStruct_ov79_021D0E1C *param0) GX_BG0_AS_2D }; - sub_02018368(&v2); + SetAllGraphicsModes(&v2); } { @@ -593,9 +593,9 @@ static void ov79_021D132C(UnkStruct_ov79_021D0E1C *param0) v1 = 0; for (v0 = 0; v0 < 6; v0++) { - sub_020183C4(param0->unk_24, v1, &(v3[v0]), 0); - sub_02019EBC(param0->unk_24, v1); - sub_02019690(v1, 32, 0, param0->unk_00); + Bg_InitFromTemplate(param0->unk_24, v1, &(v3[v0]), 0); + Bg_ClearTilemap(param0->unk_24, v1); + Bg_ClearTilesRange(v1, 32, 0, param0->unk_00); ++v1; } } @@ -606,7 +606,7 @@ static void ov79_021D13A4(UnkStruct_ov79_021D0E1C *param0) int v0; for (v0 = 0; v0 < 6; v0++) { - sub_02019044(param0->unk_24, v0); + Bg_FreeTilemapBuffer(param0->unk_24, v0); } Heap_FreeToHeap(param0->unk_24); @@ -625,8 +625,8 @@ static void ov79_021D13C4(UnkStruct_ov79_021D0E1C *param0) sub_0208C210(param0->unk_24, param0->unk_00, v0, 83, 10, 3, 1, 0, 0); sub_0208C210(param0->unk_24, param0->unk_00, v0, 83, 11, 5, 1, 0, 0); NARC_dtor(v0); - sub_0201C3C0(param0->unk_24, 3); - sub_0201C3C0(param0->unk_24, 5); + Bg_ScheduleTilemapTransfer(param0->unk_24, 3); + Bg_ScheduleTilemapTransfer(param0->unk_24, 5); } static void ov79_021D14A0(UnkStruct_ov79_021D0E1C *param0) @@ -663,8 +663,8 @@ static void ov79_021D14A4(UnkStruct_ov79_021D0E1C *param0) Font_LoadTextPalette(4, 13 * 32, param0->unk_00); for (v0 = 0; v0 < 13; v0++) { - BGL_AddWindow(param0->unk_24, ¶m0->unk_E8[v0], v1[v0].unk_00, v1[v0].unk_01, v1[v0].unk_02, v1[v0].unk_03, v1[v0].unk_04, v1[v0].unk_05, v1[v0].unk_06); - BGL_FillWindow(&(param0->unk_E8[v0]), 0); + Window_Add(param0->unk_24, ¶m0->unk_E8[v0], v1[v0].unk_00, v1[v0].unk_01, v1[v0].unk_02, v1[v0].unk_03, v1[v0].unk_04, v1[v0].unk_05, v1[v0].unk_06); + Window_FillTilemap(&(param0->unk_E8[v0]), 0); } ov79_021D2078(param0); @@ -675,8 +675,8 @@ static void ov79_021D1548(UnkStruct_ov79_021D0E1C *param0) int v0 = 0; for (v0 = 0; v0 < 13; v0++) { - sub_0201ACF4(¶m0->unk_E8[v0]); - BGL_DeleteWindow(¶m0->unk_E8[v0]); + Window_ClearAndCopyToVRAM(¶m0->unk_E8[v0]); + Window_Remove(¶m0->unk_E8[v0]); } } diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c index f45d77a26a..463dcc2721 100644 --- a/src/overlay079/ov79_021D183C.c +++ b/src/overlay079/ov79_021D183C.c @@ -88,7 +88,7 @@ static void ov79_021D1850(UnkStruct_ov79_021D0E1C *param0, Strbuf *param1, u8 pa sub_0200E060(¶m0->unk_E8[2], 1, 1, 14); } - BGL_WindowColor(&(param0->unk_E8[2]), ((15 << 4) | 15), 0, 0, 27 * 8, 4 * 8); + Window_FillRectWithColor(&(param0->unk_E8[2]), ((15 << 4) | 15), 0, 0, 27 * 8, 4 * 8); RenderControlFlags_SetCanABSpeedUpPrint(1); RenderControlFlags_SetAutoScrollFlags(0); @@ -194,10 +194,10 @@ void ov79_021D196C(UnkStruct_ov79_021D0E1C *param0) void ov79_021D1AB8(UnkStruct_ov79_021D0E1C *param0, BOOL param1) { - BGL_WindowColor(&(param0->unk_E8[0]), ((0 << 4) | 0), 0, 0, 22 * 8, 12 * 8); + Window_FillRectWithColor(&(param0->unk_E8[0]), ((0 << 4) | 0), 0, 0, 22 * 8, 12 * 8); if (param1) { - sub_0201ACF4(¶m0->unk_E8[0]); + Window_ClearAndCopyToVRAM(¶m0->unk_E8[0]); } sub_02001384(param0->unk_C4, &(param0->unk_80), &(param0->unk_82)); @@ -216,34 +216,34 @@ void ov79_021D1B24(UnkStruct_ov79_021D0E1C *param0, u8 param1, u8 param2) case 0: CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3); CellActor_SetAnimateFlag(param0->unk_1E0[param1], 0); - sub_0201C04C( + Window_Scroll( ¶m0->unk_E8[7 + param1], 1, 2, ((0 << 4) | 0)); break; case 1: CellActor_RestartAnim(param0->unk_1E0[param1]); CellActor_SetAnimateFlag(param0->unk_1E0[param1], 1); - sub_0201C04C(¶m0->unk_E8[7 + param1], 0, 4, ((0 << 4) | 0)); + Window_Scroll(¶m0->unk_E8[7 + param1], 0, 4, ((0 << 4) | 0)); param0->unk_14 = 1; break; case 2: CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1); - sub_0201C04C(¶m0->unk_E8[7 + param1], 1, 2, ((0 << 4) | 0)); + Window_Scroll(¶m0->unk_E8[7 + param1], 1, 2, ((0 << 4) | 0)); param0->unk_14 = 0; break; case 3: CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3 + 2); - sub_0201C04C(¶m0->unk_E8[7 + param1], 0, 2, ((0 << 4) | 0)); + Window_Scroll(¶m0->unk_E8[7 + param1], 0, 2, ((0 << 4) | 0)); param0->unk_14 = 1; break; case 4: CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1); CellActor_SetAnimateFlag(param0->unk_1E0[param1], 1); - sub_0201C04C(¶m0->unk_E8[7 + param1], 0, 2, ((0 << 4) | 0)); + Window_Scroll(¶m0->unk_E8[7 + param1], 0, 2, ((0 << 4) | 0)); param0->unk_14 = 0; break; } - sub_0201A954(¶m0->unk_E8[7 + param1]); + Window_CopyToVRAM(¶m0->unk_E8[7 + param1]); } void ov79_021D1C44(UnkStruct_ov79_021D0E1C *param0, u8 param1) @@ -270,10 +270,10 @@ void ov79_021D1C44(UnkStruct_ov79_021D0E1C *param0, u8 param1) param0->unk_20->unk_04 = param0->unk_20->unk_06 = 0; ov79_021D196C(param0); - BGL_WindowColor(&(param0->unk_E8[6]), ((0 << 4) | 0), 0, 0, 20 * 8, 3 * 8); + Window_FillRectWithColor(&(param0->unk_E8[6]), ((0 << 4) | 0), 0, 0, 20 * 8, 3 * 8); if (param0->unk_1B == 5) { - sub_0201A954(¶m0->unk_E8[6]); + Window_CopyToVRAM(¶m0->unk_E8[6]); return; } @@ -340,11 +340,11 @@ static void ov79_021D1D94(BmpList *param0, u32 param1, u8 param2) CellActor_SetDrawFlag(v0->unk_1C0[2], 0); } - BGL_WindowColor(&(v0->unk_E8[1]), ((0 << 4) | 0), 0, 0, 10 * 8, 2 * 8); + Window_FillRectWithColor(&(v0->unk_E8[1]), ((0 << 4) | 0), 0, 0, 10 * 8, 2 * 8); if (param1 == 0xFF) { ov79_021D1D20(v0, NULL); - sub_0201A954(&v0->unk_E8[1]); + Window_CopyToVRAM(&v0->unk_E8[1]); SpriteActor_EnableObject(v0->unk_1FC->unk_04, 0); return; } @@ -392,7 +392,7 @@ void ov79_021D1F60(UnkStruct_ov79_021D0E1C *param0) u16 v0, v1; Window_Clear(&(param0->unk_E8[3]), 0); - sub_0201ACF4(¶m0->unk_E8[3]); + Window_ClearAndCopyToVRAM(¶m0->unk_E8[3]); sub_02001384(param0->unk_C8, &v1, &v0); sub_02013A3C(param0->unk_D0); diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index 21c6a49114..e969502b0e 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -330,7 +330,7 @@ static void ov79_021D252C(void *param0) { UnkStruct_ov79_021D2928 *v0 = param0; - sub_0201C2B8(v0->unk_68); + Bg_RunScheduledUpdates(v0->unk_68); sub_02008A94(v0->unk_40.unk_04); sub_0200C800(); @@ -363,7 +363,7 @@ static void ov79_021D257C(UnkStruct_ov79_021D2928 *param0) ov79_021D255C(); - param0->unk_68 = sub_02018340(param0->unk_00); + param0->unk_68 = BgConfig_New(param0->unk_00); { GraphicsModes v2 = { @@ -373,7 +373,7 @@ static void ov79_021D257C(UnkStruct_ov79_021D2928 *param0) GX_BG0_AS_3D }; - sub_02018368(&v2); + SetAllGraphicsModes(&v2); } { @@ -428,9 +428,9 @@ static void ov79_021D257C(UnkStruct_ov79_021D2928 *param0) for (v0 = 0; v0 < 3; v0++) { v1 = v4[v0]; - sub_020183C4(param0->unk_68, v1, &(v3[v0]), 0); - sub_02019EBC(param0->unk_68, v1); - sub_02019690(v1, 32, 0, param0->unk_00); + Bg_InitFromTemplate(param0->unk_68, v1, &(v3[v0]), 0); + Bg_ClearTilemap(param0->unk_68, v1); + Bg_ClearTilesRange(v1, 32, 0, param0->unk_00); } } } @@ -440,10 +440,10 @@ static void ov79_021D260C(UnkStruct_ov79_021D2928 *param0) int v0; for (v0 = 1; v0 < 3; v0++) { - sub_02019044(param0->unk_68, v0); + Bg_FreeTilemapBuffer(param0->unk_68, v0); } - sub_02019044(param0->unk_68, 4); + Bg_FreeTilemapBuffer(param0->unk_68, 4); Heap_FreeToHeap(param0->unk_68); } @@ -464,8 +464,8 @@ static void ov79_021D2634(UnkStruct_ov79_021D2928 *param0) NARC_dtor(v0); - sub_0201C3C0(param0->unk_68, 2); - sub_0201C3C0(param0->unk_68, 4); + Bg_ScheduleTilemapTransfer(param0->unk_68, 2); + Bg_ScheduleTilemapTransfer(param0->unk_68, 4); } static void ov79_021D270C(UnkStruct_ov79_021D2928 *param0) @@ -474,16 +474,16 @@ static void ov79_021D270C(UnkStruct_ov79_021D2928 *param0) 1, 2, 19, 27, 4, 15, (1 + (18 + 12)) }; - sub_0201A8D4(param0->unk_68, &(param0->unk_6C), &v0); - BGL_FillWindow(¶m0->unk_6C, ((0 << 4) | 0)); + Window_AddFromTemplate(param0->unk_68, &(param0->unk_6C), &v0); + Window_FillTilemap(¶m0->unk_6C, ((0 << 4) | 0)); sub_0200DD0C(param0->unk_68, 1, 1, 14, param0->unk_10->unk_0B, param0->unk_00); Font_LoadScreenIndicatorsPalette(0, 15 * 32, param0->unk_00); } static void ov79_021D2754(UnkStruct_ov79_021D2928 *param0) { - sub_0201ACF4(¶m0->unk_6C); - BGL_DeleteWindow(¶m0->unk_6C); + Window_ClearAndCopyToVRAM(¶m0->unk_6C); + Window_Remove(¶m0->unk_6C); } static void ov79_021D2768(UnkStruct_ov79_021D2928 *param0) @@ -734,7 +734,7 @@ static int ov79_021D2B84(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B static int ov79_021D2B94(UnkStruct_ov79_021D2928 *param0) { sub_0200E060(¶m0->unk_6C, 1, 1, 14); - BGL_FillWindow(¶m0->unk_6C, ((15 << 4) | 15)); + Window_FillTilemap(¶m0->unk_6C, ((15 << 4) | 15)); Strbuf_Clear(param0->unk_1C.unk_04); StringTemplate_SetStrbuf(param0->unk_1C.unk_00, 0, param0->unk_30.unk_0C, 2, 1, GAME_LANGUAGE); StringTemplate_Format(param0->unk_1C.unk_00, param0->unk_1C.unk_04, param0->unk_1C.unk_08[param0->unk_30.unk_09]); @@ -756,7 +756,7 @@ static int ov79_021D2C08(UnkStruct_ov79_021D2928 *param0) } sub_0200E084(¶m0->unk_6C, 1); - sub_0201ACF4(¶m0->unk_6C); + Window_ClearAndCopyToVRAM(¶m0->unk_6C); return 8; } diff --git a/src/overlay080/ov80_021D0D80.c b/src/overlay080/ov80_021D0D80.c index fd25a9e564..342c883b0c 100644 --- a/src/overlay080/ov80_021D0D80.c +++ b/src/overlay080/ov80_021D0D80.c @@ -174,7 +174,7 @@ static void ov80_021D0E68(void *param0) NNS_GfdDoVramTransfer(); ov80_021D2AEC(v0); - sub_0201C2B8(v0->unk_28); + Bg_RunScheduledUpdates(v0->unk_28); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -227,7 +227,7 @@ static int ov80_021D0EC8(UnkStruct_ov80_021D2A08 *param0) break; case 1: ov80_021D0EA8(); - param0->unk_28 = sub_02018340(param0->unk_04); + param0->unk_28 = BgConfig_New(param0->unk_04); ov80_021D1088(param0, param0->unk_28); ov80_021D1158(param0); sub_0201E3D8(); @@ -259,7 +259,7 @@ static void ov80_021D0FF4(UnkStruct_ov80_021D2A08 *param0) ov80_021D12D8(param0); for (v0 = 0; v0 < 8; v0++) { - sub_02019044(param0->unk_28, v0); + Bg_FreeTilemapBuffer(param0->unk_28, v0); } Heap_FreeToHeap(param0->unk_28); @@ -288,7 +288,7 @@ static void ov80_021D1088(UnkStruct_ov80_021D2A08 *param0, BgConfig *param1) GX_BG0_AS_2D }; - sub_02018368(&v2); + SetAllGraphicsModes(&v2); } { @@ -418,19 +418,19 @@ static void ov80_021D1088(UnkStruct_ov80_021D2A08 *param0, BgConfig *param1) v1 = 0; for (v0 = 0; v0 < 8; v0++) { - sub_020183C4(param1, v1, &(v3[v0]), 0); - sub_02019EBC(param1, v1++); + Bg_InitFromTemplate(param1, v1, &(v3[v0]), 0); + Bg_ClearTilemap(param1, v1++); } } - sub_02019690(0, 32, 0, param0->unk_04); - sub_02019690(1, 32, 0, param0->unk_04); - sub_02019690(2, 32, 0, param0->unk_04); - sub_02019690(3, 32, 0, param0->unk_04); - sub_02019690(4, 32, 0, param0->unk_04); - sub_02019690(5, 32, 0, param0->unk_04); - sub_02019690(6, 32, 0, param0->unk_04); - sub_02019690(7, 32, 0, param0->unk_04); + Bg_ClearTilesRange(0, 32, 0, param0->unk_04); + Bg_ClearTilesRange(1, 32, 0, param0->unk_04); + Bg_ClearTilesRange(2, 32, 0, param0->unk_04); + Bg_ClearTilesRange(3, 32, 0, param0->unk_04); + Bg_ClearTilesRange(4, 32, 0, param0->unk_04); + Bg_ClearTilesRange(5, 32, 0, param0->unk_04); + Bg_ClearTilesRange(6, 32, 0, param0->unk_04); + Bg_ClearTilesRange(7, 32, 0, param0->unk_04); } static void ov80_021D1158(UnkStruct_ov80_021D2A08 *param0) diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c index 1909c4c506..f0e703661f 100644 --- a/src/overlay080/ov80_021D1458.c +++ b/src/overlay080/ov80_021D1458.c @@ -365,10 +365,10 @@ int ov80_021D1758(UnkStruct_ov80_021D2A08 *param0) v0->unk_15_4 = v2->unk_04; sub_0200E69C(v1, 1, (((((1023 - (21 * 4)) - (28 * 4)) - (28 * 14)) - (10 * 2)) - 100), (15 - 1), v2->unk_04); - BGL_FillWindow(v1, 15); + Window_FillTilemap(v1, 15); Text_AddPrinterWithParams(v1, FONT_MESSAGE, param0->unk_88, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A954(v1); - sub_0201A954(&v0->unk_28[3]); + Window_CopyToVRAM(v1); + Window_CopyToVRAM(&v0->unk_28[3]); return 0; } @@ -391,7 +391,7 @@ static int ov80_021D1848(UnkStruct_ov80_021D2A08 *param0, int param1) v1 = 0x12; - if (sub_0201C784(param0->unk_28, 5, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0->unk_28, 5, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { return v0; } @@ -497,8 +497,8 @@ static void ov80_021D19E4(UnkStruct_ov80_021D2A08 *param0) if (v0->unk_10 == 1) { ov80_021D1D24(param0, v0->unk_A0, v0->unk_20); - sub_0201C3C0(param0->unk_28, 4); - sub_0201C3C0(param0->unk_28, 5); + Bg_ScheduleTilemapTransfer(param0->unk_28, 4); + Bg_ScheduleTilemapTransfer(param0->unk_28, 5); } } @@ -555,7 +555,7 @@ static void ov80_021D1AB0(UnkStruct_ov80_021D2A08 *param0, Window *param1, int p UnkStruct_ov80_021D1478 *v2 = param0->unk_34; Strbuf_Clear(param0->unk_88); - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); v1 = TEXT_COLOR(1, 2, 0); @@ -579,7 +579,7 @@ static void ov80_021D1AB0(UnkStruct_ov80_021D2A08 *param0, Window *param1, int p Strbuf_Free(v3); } - sub_0201A954(param1); + Window_CopyToVRAM(param1); } static void ov80_021D1B5C(UnkStruct_ov80_021D2A08 *param0, Window *param1, UnkStruct_ov80_021D2AF4 *param2) @@ -590,14 +590,14 @@ static void ov80_021D1B5C(UnkStruct_ov80_021D2A08 *param0, Window *param1, UnkSt Strbuf *v3; if (param2 == NULL) { - BGL_FillWindow(param1, 0); - sub_0201A954(param1); - sub_0201ACF4(param1); + Window_FillTilemap(param1, 0); + Window_CopyToVRAM(param1); + Window_ClearAndCopyToVRAM(param1); return; } v1 = TEXT_COLOR(1, 2, 0); - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); if ((param2->unk_08 != 0xFFFF) && ((param0->unk_2C->unk_5C[param2->unk_16].val1_0 == 0) || param0->unk_2C->unk_5C[param2->unk_16].val1_2)) { v2 = MessageLoader_GetNewStrbuf(param0->unk_84, param2->unk_08); @@ -686,10 +686,10 @@ static void ov80_021D1D38(UnkStruct_ov80_021D2A08 *param0) return; } - BGL_FillWindow(v1, 0); - sub_0201ACF4(v1); + Window_FillTilemap(v1, 0); + Window_ClearAndCopyToVRAM(v1); sub_0200E744(v1, v0->unk_15_4, 0); - sub_0201C3C0(param0->unk_28, 4); + Bg_ScheduleTilemapTransfer(param0->unk_28, 4); } static void ov80_021D1D6C(UnkStruct_ov80_021D2A08 *param0, Window *param1) @@ -698,16 +698,16 @@ static void ov80_021D1D6C(UnkStruct_ov80_021D2A08 *param0, Window *param1) TextColor v1; Strbuf *v2; - sub_02019964(param0->unk_28, 5, 10, 0, 12, 2, param0->unk_CC->rawData, 0, 7, param0->unk_CC->screenWidth / 8, param0->unk_CC->screenHeight / 8); + Bg_CopyRectToTilemapRect(param0->unk_28, 5, 10, 0, 12, 2, param0->unk_CC->rawData, 0, 7, param0->unk_CC->screenWidth / 8, param0->unk_CC->screenHeight / 8); v2 = MessageLoader_GetNewStrbuf(param0->unk_84, 1); v0 = (10 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0); v0 /= 2; v1 = TEXT_COLOR(1, 2, 0); - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, v2, v0, 0, TEXT_SPEED_NO_TRANSFER, v1, NULL); - sub_0201A954(param1); + Window_CopyToVRAM(param1); Strbuf_Free(v2); } @@ -715,21 +715,21 @@ static void ov80_021D1DF8(UnkStruct_ov80_021D2A08 *param0) { UnkStruct_ov80_021D1478 *v0 = param0->unk_34; - BGL_AddWindow(param0->unk_28, &v0->unk_28[0], 1, 3, 21, 29, 3, 15, 1023 - 29 * 3); - BGL_AddWindow(param0->unk_28, &v0->unk_28[1], 4, 9, 3, 21, 4, (15 - 1), (1023 - (21 * 4))); - BGL_AddWindow(param0->unk_28, &v0->unk_28[2], 4, 2, 3, 28, 4, (15 - 1), ((1023 - (21 * 4)) - (28 * 4))); - BGL_AddWindow(param0->unk_28, &v0->unk_28[3], 4, 1, 8, 28, 14, (15 - 1), (((1023 - (21 * 4)) - (28 * 4)) - (28 * 14))); - BGL_AddWindow(param0->unk_28, &v0->unk_28[4], 4, 11, 0, 10, 2, 15, ((((1023 - (21 * 4)) - (28 * 4)) - (28 * 14)) - (10 * 2))); - BGL_FillWindow(&(v0->unk_28[0]), 0); - BGL_FillWindow(&(v0->unk_28[1]), 0); - BGL_FillWindow(&(v0->unk_28[2]), 0); - BGL_FillWindow(&(v0->unk_28[3]), 0); - BGL_FillWindow(&(v0->unk_28[4]), 0); - sub_0201A954(&v0->unk_28[0]); - sub_0201ACF4(&v0->unk_28[1]); - sub_0201ACF4(&v0->unk_28[2]); - sub_0201ACF4(&v0->unk_28[3]); - sub_0201ACF4(&v0->unk_28[4]); + Window_Add(param0->unk_28, &v0->unk_28[0], 1, 3, 21, 29, 3, 15, 1023 - 29 * 3); + Window_Add(param0->unk_28, &v0->unk_28[1], 4, 9, 3, 21, 4, (15 - 1), (1023 - (21 * 4))); + Window_Add(param0->unk_28, &v0->unk_28[2], 4, 2, 3, 28, 4, (15 - 1), ((1023 - (21 * 4)) - (28 * 4))); + Window_Add(param0->unk_28, &v0->unk_28[3], 4, 1, 8, 28, 14, (15 - 1), (((1023 - (21 * 4)) - (28 * 4)) - (28 * 14))); + Window_Add(param0->unk_28, &v0->unk_28[4], 4, 11, 0, 10, 2, 15, ((((1023 - (21 * 4)) - (28 * 4)) - (28 * 14)) - (10 * 2))); + Window_FillTilemap(&(v0->unk_28[0]), 0); + Window_FillTilemap(&(v0->unk_28[1]), 0); + Window_FillTilemap(&(v0->unk_28[2]), 0); + Window_FillTilemap(&(v0->unk_28[3]), 0); + Window_FillTilemap(&(v0->unk_28[4]), 0); + Window_CopyToVRAM(&v0->unk_28[0]); + Window_ClearAndCopyToVRAM(&v0->unk_28[1]); + Window_ClearAndCopyToVRAM(&v0->unk_28[2]); + Window_ClearAndCopyToVRAM(&v0->unk_28[3]); + Window_ClearAndCopyToVRAM(&v0->unk_28[4]); } static void ov80_021D1F14(UnkStruct_ov80_021D2A08 *param0) @@ -738,17 +738,17 @@ static void ov80_021D1F14(UnkStruct_ov80_021D2A08 *param0) u16 v1; for (v1 = 0; v1 < 5; v1++) { - BGL_DeleteWindow(&v0->unk_28[v1]); + Window_Remove(&v0->unk_28[v1]); } } static void ov80_021D1F30(UnkStruct_ov80_021D2A08 *param0, u8 param1, u8 param2) { if (param2) { - sub_020198E8(param0->unk_28, 5, 0, 0, 32, 24, param0->unk_D0->rawData, 0, 0, param0->unk_D0->screenWidth / 8, param0->unk_D0->screenHeight / 8); + Bg_CopyToTilemapRect(param0->unk_28, 5, 0, 0, 32, 24, param0->unk_D0->rawData, 0, 0, param0->unk_D0->screenWidth / 8, param0->unk_D0->screenHeight / 8); } - sub_02019964(param0->unk_28, 5, 13, 10, 6, 7, param0->unk_CC->rawData, param1 * 6 + 0, 0, param0->unk_CC->screenWidth / 8, param0->unk_CC->screenHeight / 8); + Bg_CopyRectToTilemapRect(param0->unk_28, 5, 13, 10, 6, 7, param0->unk_CC->rawData, param1 * 6 + 0, 0, param0->unk_CC->screenWidth / 8, param0->unk_CC->screenHeight / 8); } static void ov80_021D1FB0(UnkStruct_ov80_021D2A08 *param0, int param1) @@ -779,15 +779,15 @@ static void ov80_021D1FB0(UnkStruct_ov80_021D2A08 *param0, int param1) v4 = (UnkStruct_ov80_021D1FB0 *)&(v1[param1 * 4 + 2]); v5 = (UnkStruct_ov80_021D1FB0 *)&(v1[param1 * 4 + 3]); - sub_020198E8(param0->unk_28, 2, v3->unk_02, v3->unk_03, v3->unk_04, v3->unk_05, param0->unk_C0->rawData, v3->unk_00, v3->unk_01, ((param0->unk_C0)->screenWidth / 8), ((param0->unk_C0)->screenHeight / 8)); - sub_02019964(param0->unk_28, 6, v5->unk_02, v5->unk_03, v5->unk_04, v5->unk_05, param0->unk_D4->rawData, v5->unk_00, v5->unk_01, ((param0->unk_D4)->screenWidth / 8), ((param0->unk_D4)->screenHeight / 8)); + Bg_CopyToTilemapRect(param0->unk_28, 2, v3->unk_02, v3->unk_03, v3->unk_04, v3->unk_05, param0->unk_C0->rawData, v3->unk_00, v3->unk_01, ((param0->unk_C0)->screenWidth / 8), ((param0->unk_C0)->screenHeight / 8)); + Bg_CopyRectToTilemapRect(param0->unk_28, 6, v5->unk_02, v5->unk_03, v5->unk_04, v5->unk_05, param0->unk_D4->rawData, v5->unk_00, v5->unk_01, ((param0->unk_D4)->screenWidth / 8), ((param0->unk_D4)->screenHeight / 8)); if (param1 == 2) { return; } - sub_020198E8(param0->unk_28, 3, v2->unk_02, v2->unk_03, v2->unk_04, v2->unk_05, param0->unk_C0->rawData, v2->unk_00, v2->unk_01, ((param0->unk_C0)->screenWidth / 8), ((param0->unk_C0)->screenHeight / 8)); - sub_02019964(param0->unk_28, 7, v4->unk_02, v4->unk_03, v4->unk_04, v4->unk_05, param0->unk_D4->rawData, v4->unk_00, v4->unk_01, ((param0->unk_D4)->screenWidth / 8), ((param0->unk_D4)->screenHeight / 8)); + Bg_CopyToTilemapRect(param0->unk_28, 3, v2->unk_02, v2->unk_03, v2->unk_04, v2->unk_05, param0->unk_C0->rawData, v2->unk_00, v2->unk_01, ((param0->unk_C0)->screenWidth / 8), ((param0->unk_C0)->screenHeight / 8)); + Bg_CopyRectToTilemapRect(param0->unk_28, 7, v4->unk_02, v4->unk_03, v4->unk_04, v4->unk_05, param0->unk_D4->rawData, v4->unk_00, v4->unk_01, ((param0->unk_D4)->screenWidth / 8), ((param0->unk_D4)->screenHeight / 8)); } static void ov80_021D20DC(UnkStruct_ov80_021D2A08 *param0) @@ -795,18 +795,18 @@ static void ov80_021D20DC(UnkStruct_ov80_021D2A08 *param0) UnkStruct_ov80_021D1478 *v0 = param0->unk_34; int v1 = 0; - sub_020198E8(param0->unk_28, 2, 0, 0, 32, 24, param0->unk_B8->rawData, 0, 0, ((param0->unk_B8)->screenWidth / 8), ((param0->unk_B8)->screenHeight / 8)); - sub_020198E8(param0->unk_28, 3, 0, 0, 32, 24, param0->unk_BC->rawData, 0, 0, ((param0->unk_BC)->screenWidth / 8), ((param0->unk_BC)->screenHeight / 8)); + Bg_CopyToTilemapRect(param0->unk_28, 2, 0, 0, 32, 24, param0->unk_B8->rawData, 0, 0, ((param0->unk_B8)->screenWidth / 8), ((param0->unk_B8)->screenHeight / 8)); + Bg_CopyToTilemapRect(param0->unk_28, 3, 0, 0, 32, 24, param0->unk_BC->rawData, 0, 0, ((param0->unk_BC)->screenWidth / 8), ((param0->unk_BC)->screenHeight / 8)); if (param0->unk_00 != 1) { v1 = 3; - sub_020198E8(param0->unk_28, 3, 16, 21, 2, 3, param0->unk_BC->rawData, 0, 21, ((param0->unk_BC)->screenWidth / 8), ((param0->unk_BC)->screenHeight / 8)); + Bg_CopyToTilemapRect(param0->unk_28, 3, 16, 21, 2, 3, param0->unk_BC->rawData, 0, 21, ((param0->unk_BC)->screenWidth / 8), ((param0->unk_BC)->screenHeight / 8)); } ov80_021D1F30(param0, 0, 1); - sub_02019964(param0->unk_28, 6, 0, 0, 64, 64, param0->unk_C8->rawData, 0, 0, param0->unk_C8->screenWidth / 8, param0->unk_C8->screenHeight / 8); - sub_02019964(param0->unk_28, 7, 0, 0, 64, 64, param0->unk_C4->rawData, 0, 0, param0->unk_C4->screenWidth / 8, param0->unk_C4->screenHeight / 8); + Bg_CopyRectToTilemapRect(param0->unk_28, 6, 0, 0, 64, 64, param0->unk_C8->rawData, 0, 0, param0->unk_C8->screenWidth / 8, param0->unk_C8->screenHeight / 8); + Bg_CopyRectToTilemapRect(param0->unk_28, 7, 0, 0, 64, 64, param0->unk_C4->rawData, 0, 0, param0->unk_C4->screenWidth / 8, param0->unk_C4->screenHeight / 8); if (param0->unk_02 & 0x1) { ov80_021D1FB0(param0, 0); @@ -824,40 +824,40 @@ static void ov80_021D20DC(UnkStruct_ov80_021D2A08 *param0) ov80_021D1FB0(param0, 3); } - sub_0201C3C0(param0->unk_28, 2); - sub_0201C3C0(param0->unk_28, 3); - sub_0201C3C0(param0->unk_28, 5); - sub_0201C3C0(param0->unk_28, 6); - sub_0201C3C0(param0->unk_28, 7); + Bg_ScheduleTilemapTransfer(param0->unk_28, 2); + Bg_ScheduleTilemapTransfer(param0->unk_28, 3); + Bg_ScheduleTilemapTransfer(param0->unk_28, 5); + Bg_ScheduleTilemapTransfer(param0->unk_28, 6); + Bg_ScheduleTilemapTransfer(param0->unk_28, 7); } static void ov80_021D225C(UnkStruct_ov80_021D2A08 *param0) { UnkStruct_ov80_021D1478 *v0 = param0->unk_34; - sub_02019184(param0->unk_28, 6, 3, 0); - sub_02019184(param0->unk_28, 7, 3, 0); - sub_02019184(param0->unk_28, 6, 0, 0); - sub_02019184(param0->unk_28, 7, 0, 0); + Bg_SetOffset(param0->unk_28, 6, 3, 0); + Bg_SetOffset(param0->unk_28, 7, 3, 0); + Bg_SetOffset(param0->unk_28, 6, 0, 0); + Bg_SetOffset(param0->unk_28, 7, 0, 0); - sub_02019CB8(param0->unk_28, 0, 0x0, 0, 0, 32, 32, 17); - sub_02019CB8(param0->unk_28, 1, 0x0, 0, 0, 32, 32, 17); - sub_02019CB8(param0->unk_28, 2, 0x0, 0, 0, 32, 32, 17); - sub_02019CB8(param0->unk_28, 3, 0x0, 0, 0, 32, 32, 17); - sub_02019CB8(param0->unk_28, 4, 0x0, 0, 0, 32, 32, 17); - sub_02019CB8(param0->unk_28, 5, 0x0, 0, 0, 32, 32, 17); - sub_02019CB8(param0->unk_28, 6, 0x0, 0, 0, 32, 32, 17); - sub_02019CB8(param0->unk_28, 7, 0x0, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(param0->unk_28, 0, 0x0, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(param0->unk_28, 1, 0x0, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(param0->unk_28, 2, 0x0, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(param0->unk_28, 3, 0x0, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(param0->unk_28, 4, 0x0, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(param0->unk_28, 5, 0x0, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(param0->unk_28, 6, 0x0, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(param0->unk_28, 7, 0x0, 0, 0, 32, 32, 17); - sub_0201C3C0(param0->unk_28, 0); - sub_0201C3C0(param0->unk_28, 1); - sub_0201C3C0(param0->unk_28, 2); - sub_0201C3C0(param0->unk_28, 3); + Bg_ScheduleTilemapTransfer(param0->unk_28, 0); + Bg_ScheduleTilemapTransfer(param0->unk_28, 1); + Bg_ScheduleTilemapTransfer(param0->unk_28, 2); + Bg_ScheduleTilemapTransfer(param0->unk_28, 3); - sub_0201C3C0(param0->unk_28, 4); - sub_0201C3C0(param0->unk_28, 5); - sub_0201C3C0(param0->unk_28, 6); - sub_0201C3C0(param0->unk_28, 7); + Bg_ScheduleTilemapTransfer(param0->unk_28, 4); + Bg_ScheduleTilemapTransfer(param0->unk_28, 5); + Bg_ScheduleTilemapTransfer(param0->unk_28, 6); + Bg_ScheduleTilemapTransfer(param0->unk_28, 7); } static const UnkStruct_ov7_0224F358 Unk_ov80_021D30E8[] = { @@ -939,25 +939,25 @@ static void ov80_021D2398(UnkStruct_ov80_021D2A08 *param0) static void ov80_021D24BC(UnkStruct_ov80_021D2A08 *param0, int param1, int param2) { if (param1 < 8) { - sub_0201C63C(param0->unk_28, 6, 0, 8); - sub_0201C63C(param0->unk_28, 7, 0, 8); + Bg_ScheduleScroll(param0->unk_28, 6, 0, 8); + Bg_ScheduleScroll(param0->unk_28, 7, 0, 8); } else if (param1 > 248) { - sub_0201C63C(param0->unk_28, 6, 0, 248); - sub_0201C63C(param0->unk_28, 7, 0, 248); + Bg_ScheduleScroll(param0->unk_28, 6, 0, 248); + Bg_ScheduleScroll(param0->unk_28, 7, 0, 248); } else { - sub_0201C63C(param0->unk_28, 6, 0, param1); - sub_0201C63C(param0->unk_28, 7, 0, param1); + Bg_ScheduleScroll(param0->unk_28, 6, 0, param1); + Bg_ScheduleScroll(param0->unk_28, 7, 0, param1); } if (param2 < (72 + 8)) { - sub_0201C63C(param0->unk_28, 6, 3, (72 + 8)); - sub_0201C63C(param0->unk_28, 7, 3, (72 + 8)); + Bg_ScheduleScroll(param0->unk_28, 6, 3, (72 + 8)); + Bg_ScheduleScroll(param0->unk_28, 7, 3, (72 + 8)); } else if (param2 > 304) { - sub_0201C63C(param0->unk_28, 6, 3, 304); - sub_0201C63C(param0->unk_28, 7, 3, 304); + Bg_ScheduleScroll(param0->unk_28, 6, 3, 304); + Bg_ScheduleScroll(param0->unk_28, 7, 3, 304); } else { - sub_0201C63C(param0->unk_28, 6, 3, param2); - sub_0201C63C(param0->unk_28, 7, 3, param2); + Bg_ScheduleScroll(param0->unk_28, 6, 3, param2); + Bg_ScheduleScroll(param0->unk_28, 7, 3, param2); } } @@ -1101,7 +1101,7 @@ static void ov80_021D2774(SysTask *param0, void *param1) case 1: if (v1->unk_08 % 2) { ov80_021D1F30(v0, v2[v1->unk_08 / 2], 0); - sub_0201C3C0(v0->unk_28, 5); + Bg_ScheduleTilemapTransfer(v0->unk_28, 5); } if (v1->unk_08++ > 7) { @@ -1124,8 +1124,8 @@ static void ov80_021D2774(SysTask *param0, void *param1) v1->unk_10 = 1; - sub_02019CB8(v0->unk_28, 4, 0x0, 0, 0, 32, 32, 17); - sub_02019CB8(v0->unk_28, 5, 0x0, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(v0->unk_28, 4, 0x0, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(v0->unk_28, 5, 0x0, 0, 0, 32, 32, 17); ov80_021D1D6C(v0, &(v1->unk_28[4])); ov80_021D1A30(v0); @@ -1168,10 +1168,10 @@ static void ov80_021D28EC(SysTask *param0, void *param1) return; } - sub_02019CB8(v0->unk_28, 4, 0x0, 0, 0, 32, 32, 17); + Bg_FillTilemapRect(v0->unk_28, 4, 0x0, 0, 0, 32, 32, 17); ov80_021D1F30(v0, 0, 1); - sub_0201C3C0(v0->unk_28, 4); - sub_0201C3C0(v0->unk_28, 5); + Bg_ScheduleTilemapTransfer(v0->unk_28, 4); + Bg_ScheduleTilemapTransfer(v0->unk_28, 5); v0->unk_14 = 0; sub_0200F174(4, 13, 5, 0x0, 8, 1, v0->unk_04); v1->unk_04++; diff --git a/src/overlay081/ov81_021D0D80.c b/src/overlay081/ov81_021D0D80.c index 835b0e2097..58f20248c8 100644 --- a/src/overlay081/ov81_021D0D80.c +++ b/src/overlay081/ov81_021D0D80.c @@ -84,7 +84,7 @@ int ov81_021D0D80(OverlayManager *param0, int *param1) v1 = OverlayManager_Args(param0); v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov81_021D1610), 42); memset(v0, 0, sizeof(UnkStruct_ov81_021D1610)); - v0->unk_00 = sub_02018340(42); + v0->unk_00 = BgConfig_New(42); v0->unk_4C = v1; v0->unk_44 = SaveData_GetJournal(v1); @@ -157,7 +157,7 @@ static void ov81_021D0F00(void *param0) { UnkStruct_ov81_021D1610 *v0 = param0; - sub_0201C2B8(v0->unk_00); + Bg_RunScheduledUpdates(v0->unk_00); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -189,7 +189,7 @@ static void ov81_021D0F40(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -209,8 +209,8 @@ static void ov81_021D0F40(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { BgTemplate v2 = { @@ -229,8 +229,8 @@ static void ov81_021D0F40(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilemap(param0, 1); } { BgTemplate v3 = { @@ -249,7 +249,7 @@ static void ov81_021D0F40(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); + Bg_InitFromTemplate(param0, 2, &v3, 0); } { BgTemplate v4 = { @@ -268,20 +268,20 @@ static void ov81_021D0F40(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v4, 0); + Bg_InitFromTemplate(param0, 3, &v4, 0); } - sub_02019690(0, 32, 0, 42); - sub_02019690(1, 32, 0, 42); + Bg_ClearTilesRange(0, 32, 0, 42); + Bg_ClearTilesRange(1, 32, 0, 42); } static void ov81_021D101C(BgConfig *param0) { GXLayers_DisableEngineALayers(); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); Heap_FreeToHeapExplicit(42, param0); } @@ -304,12 +304,12 @@ static void ov81_021D1050(UnkStruct_ov81_021D1610 *param0) NARC_dtor(v1); - v0 = sub_02019FE4(param0->unk_00, 2); + v0 = Bg_GetTilemapBuffer(param0->unk_00, 2); MI_CpuCopy16(v0, param0->unk_5C, 0x800); - sub_02019574(param0->unk_00, 3, param0->unk_5C, 0x800); + Bg_LoadTilemapBuffer(param0->unk_00, 3, param0->unk_5C, 0x800); Font_LoadTextPalette(0, 15 * 32, 42); - sub_0201975C(4, 0); + Bg_MaskPalette(4, 0); } static void ov81_021D1130(UnkStruct_ov81_021D1610 *param0) @@ -389,10 +389,10 @@ static int ov81_021D120C(UnkStruct_ov81_021D1610 *param0) param0->unk_105E = 0; param0->unk_1060 ^= 1; - sub_020198C0(param0->unk_00, param0->unk_1062, param0->unk_85C, 0, 0, 32, 32); - sub_020198C0(param0->unk_00, param0->unk_1061, param0->unk_5C, 0, 0, 32, 32); - sub_0201C3C0(param0->unk_00, param0->unk_1062); - sub_0201C3C0(param0->unk_00, param0->unk_1061); + Bg_LoadToTilemapRect(param0->unk_00, param0->unk_1062, param0->unk_85C, 0, 0, 32, 32); + Bg_LoadToTilemapRect(param0->unk_00, param0->unk_1061, param0->unk_5C, 0, 0, 32, 32); + Bg_ScheduleTilemapTransfer(param0->unk_00, param0->unk_1062); + Bg_ScheduleTilemapTransfer(param0->unk_00, param0->unk_1061); return 1; } @@ -478,15 +478,15 @@ static u8 ov81_021D13CC(UnkStruct_ov81_021D1610 *param0, s8 param1) static void ov81_021D140C(UnkStruct_ov81_021D1610 *param0, u8 param1, u8 param2) { - sub_02019E2C(param0->unk_00, param1, 0, 0, 32, 32, param2); - sub_0201C3C0(param0->unk_00, param1); + Bg_ChangeTilemapRectPalette(param0->unk_00, param1, 0, 0, 32, 32, param2); + Bg_ScheduleTilemapTransfer(param0->unk_00, param1); } static void ov81_021D1434(UnkStruct_ov81_021D1610 *param0) { u16 *v0; - v0 = sub_02019FE4(param0->unk_00, 0); + v0 = Bg_GetTilemapBuffer(param0->unk_00, 0); MI_CpuCopy16(v0, param0->unk_85C, 0x800); } @@ -495,11 +495,11 @@ static void ov81_021D1450(UnkStruct_ov81_021D1610 *param0, u16 *param1, u16 para u16 *v0; u16 v1, v2; - v0 = sub_02019FE4(param0->unk_00, param2); + v0 = Bg_GetTilemapBuffer(param0->unk_00, param2); for (v2 = 0; v2 < 32; v2++) { if (Unk_ov81_021D33E8[param3][v2] == 0xff) { - sub_02019CB8(param0->unk_00, param2, 0, v2, 0, 1, 32, 0); + Bg_FillTilemapRect(param0->unk_00, param2, 0, v2, 0, 1, 32, 0); continue; } @@ -508,7 +508,7 @@ static void ov81_021D1450(UnkStruct_ov81_021D1610 *param0, u16 *param1, u16 para } } - sub_0201C3C0(param0->unk_00, param2); + Bg_ScheduleTilemapTransfer(param0->unk_00, param2); } static u8 ov81_021D14E0(UnkStruct_ov81_021D1610 *param0) @@ -520,10 +520,10 @@ static u8 ov81_021D14E0(UnkStruct_ov81_021D1610 *param0) param0->unk_105F++; if (param0->unk_105F == 9) { - BGL_SetPriority(param0->unk_1064, 0); - BGL_SetPriority(param0->unk_1063, 1); - BGL_SetPriority(param0->unk_1062, 2); - BGL_SetPriority(param0->unk_1061, 3); + Bg_SetPriority(param0->unk_1064, 0); + Bg_SetPriority(param0->unk_1063, 1); + Bg_SetPriority(param0->unk_1062, 2); + Bg_SetPriority(param0->unk_1061, 3); return 1; } @@ -537,10 +537,10 @@ static u8 ov81_021D156C(UnkStruct_ov81_021D1610 *param0) ov81_021D140C(param0, param0->unk_1063, param0->unk_105C); if (param0->unk_105F == 1) { - BGL_SetPriority(param0->unk_1064, 0); - BGL_SetPriority(param0->unk_1063, 1); - BGL_SetPriority(param0->unk_1062, 2); - BGL_SetPriority(param0->unk_1061, 3); + Bg_SetPriority(param0->unk_1064, 0); + Bg_SetPriority(param0->unk_1063, 1); + Bg_SetPriority(param0->unk_1062, 2); + Bg_SetPriority(param0->unk_1061, 3); } param0->unk_105F++; diff --git a/src/overlay081/ov81_021D1610.c b/src/overlay081/ov81_021D1610.c index e1ec4a57e0..3d61a8616b 100644 --- a/src/overlay081/ov81_021D1610.c +++ b/src/overlay081/ov81_021D1610.c @@ -101,7 +101,7 @@ void ov81_021D1610(UnkStruct_ov81_021D1610 *param0) u32 v0; for (v0 = 0; v0 < 4; v0++) { - sub_0201A8D4(param0->unk_00, ¶m0->unk_04[v0], &Unk_ov81_021D3508[v0]); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_04[v0], &Unk_ov81_021D3508[v0]); } } @@ -110,7 +110,7 @@ void ov81_021D1634(UnkStruct_ov81_021D1610 *param0) u32 v0; for (v0 = 0; v0 < 4; v0++) { - BGL_DeleteWindow(¶m0->unk_04[v0]); + Window_Remove(¶m0->unk_04[v0]); } } @@ -127,8 +127,8 @@ void ov81_021D164C(UnkStruct_ov81_021D1610 *param0, u32 param1) v1 = ¶m0->unk_04[3]; } - BGL_FillWindow(v0, 0); - BGL_FillWindow(v1, 0); + Window_FillTilemap(v0, 0); + Window_FillTilemap(v1, 0); if (ov81_021D16B0(param0, v0, v1) == 1) { ov81_021D17C8(param0, v1); @@ -137,8 +137,8 @@ void ov81_021D164C(UnkStruct_ov81_021D1610 *param0, u32 param1) ov81_021D1C10(param0, v1); } - sub_0201A9A4(v0); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v0); + Window_ScheduleCopyToVRAM(v1); } static u8 ov81_021D16B0(UnkStruct_ov81_021D1610 *param0, Window *param1, Window *param2) diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index f0f5700c60..31886d4202 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -141,7 +141,7 @@ void ov83_0223CBFC(UnkStruct_ov83_0223B784 *param0) sub_0200A858(); if (param0->unk_20) { - sub_0201C2B8(param0->unk_20); + Bg_RunScheduledUpdates(param0->unk_20); } } @@ -169,7 +169,7 @@ static void ov83_0223CC30(BgConfig **param0, int param1) ov83_0223CC10(); - *param0 = sub_02018340(param1); + *param0 = BgConfig_New(param1); { GraphicsModes v2 = { @@ -179,11 +179,11 @@ static void ov83_0223CC30(BgConfig **param0, int param1) GX_BG0_AS_3D }; - sub_02018368(&v2); + SetAllGraphicsModes(&v2); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); - BGL_SetPriority(0, 2); + Bg_SetPriority(0, 2); { BgTemplate v3[] = { @@ -252,19 +252,19 @@ static void ov83_0223CC30(BgConfig **param0, int param1) for (v0 = 0; v0 < 4; v0++) { const u8 v4[4] = { 1, 2, 4, 5 }; - sub_020183C4(*param0, v4[v0], &(v3[v0]), 0); - sub_02019EBC(*param0, v4[v0]); - sub_02019690(v4[v0], 32, 0, param1); + Bg_InitFromTemplate(*param0, v4[v0], &(v3[v0]), 0); + Bg_ClearTilemap(*param0, v4[v0]); + Bg_ClearTilesRange(v4[v0], 32, 0, param1); } } } static void ov83_0223CCCC(BgConfig **param0) { - sub_02019044(*param0, 5); - sub_02019044(*param0, 4); - sub_02019044(*param0, 2); - sub_02019044(*param0, 1); + Bg_FreeTilemapBuffer(*param0, 5); + Bg_FreeTilemapBuffer(*param0, 4); + Bg_FreeTilemapBuffer(*param0, 2); + Bg_FreeTilemapBuffer(*param0, 1); Heap_FreeToHeap(*param0); } diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c index 41787f40d6..7e18772426 100644 --- a/src/overlay083/ov83_0223D6A8.c +++ b/src/overlay083/ov83_0223D6A8.c @@ -567,20 +567,20 @@ void ov83_0223DF30(UnkStruct_ov83_0223E138 *param0, int param1) { StringTemplate_SetItemName(param0->unk_18->unk_04, 0, param1); StringTemplate_Format(param0->unk_18->unk_04, param0->unk_18->unk_08, param0->unk_18->unk_10); - BGL_FillWindow(param0->unk_08, 15); + Window_FillTilemap(param0->unk_08, 15); ov83_0223E21C(param0->unk_08, param0->unk_18->unk_08, 0, 0); sub_0200E060(param0->unk_08, 0, 1, 0); } void ov83_0223DF70(UnkStruct_ov83_0223E138 *param0) { - sub_0201ACF4(param0->unk_08); - sub_02019EBC(param0->unk_04, 4); + Window_ClearAndCopyToVRAM(param0->unk_08); + Bg_ClearTilemap(param0->unk_04, 4); } void ov83_0223DF84(UnkStruct_ov83_0223E138 *param0) { - BGL_FillWindow(param0->unk_08, 15); + Window_FillTilemap(param0->unk_08, 15); ov83_0223E21C(param0->unk_08, param0->unk_18->unk_0C, 0, 0); sub_0200E060(param0->unk_08, 0, 1, 0); } @@ -607,8 +607,8 @@ void ov83_0223DFAC(UnkStruct_ov83_0223E138 *param0) v1 *= 10; v2 *= 4; - sub_020198E8(param0->unk_04, 5, 5 + v3, 13 + v4, 10, 4, param0->unk_2C->rawData, v1, v2, 10 * 2, 4 * 2); - sub_02019E2C(param0->unk_04, 5, 5 + v3, 13 + v4, 10, 4, 2); + Bg_CopyToTilemapRect(param0->unk_04, 5, 5 + v3, 13 + v4, 10, 4, param0->unk_2C->rawData, v1, v2, 10 * 2, 4 * 2); + Bg_ChangeTilemapRectPalette(param0->unk_04, 5, 5 + v3, 13 + v4, 10, 4, 2); v5 = param0->unk_1C->unk_130[v0]; StringTemplate_SetPlayerName(param0->unk_18->unk_04, 0, param0->unk_1C->unk_134[v5]); @@ -619,19 +619,19 @@ void ov83_0223DFAC(UnkStruct_ov83_0223E138 *param0) ov83_0223E21C(param0->unk_0C, param0->unk_18->unk_08, v6, v7); } - sub_0201A9A4(param0->unk_0C); - sub_0201C3C0(param0->unk_04, 5); + Window_ScheduleCopyToVRAM(param0->unk_0C); + Bg_ScheduleTilemapTransfer(param0->unk_04, 5); } static void ov83_0223E09C(UnkStruct_ov83_0223E138 *param0, u32 param1) { - param0->unk_08 = sub_0201A778(param1, 1); - param0->unk_0C = sub_0201A778(param1, 1); + param0->unk_08 = Window_New(param1, 1); + param0->unk_0C = Window_New(param1, 1); - BGL_AddWindow(param0->unk_04, param0->unk_08, 4, 4, 19, 23, 4, 1, (18 + 12) + 1); - BGL_AddWindow(param0->unk_04, param0->unk_0C, 4, 6, 13, 20, 8, 1, (18 + 12) + 1); - BGL_FillWindow(param0->unk_08, 15); - BGL_FillWindow(param0->unk_0C, 0); + Window_Add(param0->unk_04, param0->unk_08, 4, 4, 19, 23, 4, 1, (18 + 12) + 1); + Window_Add(param0->unk_04, param0->unk_0C, 4, 6, 13, 20, 8, 1, (18 + 12) + 1); + Window_FillTilemap(param0->unk_08, 15); + Window_FillTilemap(param0->unk_0C, 0); sub_0200DD0C(param0->unk_04, 4, 1, 0, param0->unk_10, param1); Font_LoadScreenIndicatorsPalette(4, 1 * 32, param1); sub_0200E060(param0->unk_08, 1, 1, 0); @@ -639,10 +639,10 @@ static void ov83_0223E09C(UnkStruct_ov83_0223E138 *param0, u32 param1) static void ov83_0223E138(UnkStruct_ov83_0223E138 *param0) { - BGL_DeleteWindow(param0->unk_08); - sub_0201A928(param0->unk_08, 1); - BGL_DeleteWindow(param0->unk_0C); - sub_0201A928(param0->unk_0C, 1); + Window_Remove(param0->unk_08); + Windows_Delete(param0->unk_08, 1); + Window_Remove(param0->unk_0C); + Windows_Delete(param0->unk_0C, 1); } static void ov83_0223E15C(UnkStruct_ov83_0223E138 *param0, u32 param1, NARC *param2) @@ -660,12 +660,12 @@ static void ov83_0223E15C(UnkStruct_ov83_0223E138 *param0, u32 param1, NARC *par param0->unk_20 = sub_020071D0(param2, v0, 0, ¶m0->unk_24, param1); - sub_020198C0(param0->unk_04, 5, param0->unk_24->rawData, 0, 0, param0->unk_24->screenWidth / 8, param0->unk_24->screenHeight / 8); - sub_02019E2C(param0->unk_04, 5, 0, 0, param0->unk_24->screenWidth / 8, param0->unk_24->screenHeight / 8, 2 + 1); + Bg_LoadToTilemapRect(param0->unk_04, 5, param0->unk_24->rawData, 0, 0, param0->unk_24->screenWidth / 8, param0->unk_24->screenHeight / 8); + Bg_ChangeTilemapRectPalette(param0->unk_04, 5, 0, 0, param0->unk_24->screenWidth / 8, param0->unk_24->screenHeight / 8, 2 + 1); param0->unk_28 = sub_020071D0(param2, 4, 0, ¶m0->unk_2C, param1); - sub_0201C3C0(param0->unk_04, 5); + Bg_ScheduleTilemapTransfer(param0->unk_04, 5); } static void ov83_0223E208(UnkStruct_ov83_0223E138 *param0) @@ -1065,9 +1065,9 @@ static void ov83_0223E77C(UnkStruct_ov83_0223E824 *param0, u32 param1) Font_LoadTextPalette(0, 3 * 32, param1); for (v0 = 0; v0 < 4; v0++) { - param0->unk_08[v0] = sub_0201A778(param1, 1); - BGL_AddWindow(param0->unk_04, param0->unk_08[v0], 2, v1[v0][0], v1[v0][1], v1[v0][2], v1[v0][3], v1[v0][4], v1[v0][5]); - BGL_FillWindow(param0->unk_08[v0], 0); + param0->unk_08[v0] = Window_New(param1, 1); + Window_Add(param0->unk_04, param0->unk_08[v0], 2, v1[v0][0], v1[v0][1], v1[v0][2], v1[v0][3], v1[v0][4], v1[v0][5]); + Window_FillTilemap(param0->unk_08[v0], 0); } } @@ -1076,8 +1076,8 @@ static void ov83_0223E824(UnkStruct_ov83_0223E824 *param0) int v0; for (v0 = 0; v0 < 4; v0++) { - BGL_DeleteWindow(param0->unk_08[v0]); - sub_0201A928(param0->unk_08[v0], 1); + Window_Remove(param0->unk_08[v0]); + Windows_Delete(param0->unk_08[v0], 1); } } @@ -1091,10 +1091,10 @@ static void ov83_0223E844(UnkStruct_ov83_0223E824 *param0, u32 param1, NARC *par v0 = sub_020071D0(param2, 7, 0, &v1, param1); - sub_020198C0(param0->unk_04, 1, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); - sub_02019E2C(param0->unk_04, 1, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8, 4); + Bg_LoadToTilemapRect(param0->unk_04, 1, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Bg_ChangeTilemapRectPalette(param0->unk_04, 1, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8, 4); Heap_FreeToHeap(v0); - sub_0201C3C0(param0->unk_04, 1); + Bg_ScheduleTilemapTransfer(param0->unk_04, 1); } static void ov83_0223E8DC(SysTask *param0, void *param1) @@ -1118,14 +1118,14 @@ void ov83_0223E908(UnkStruct_ov83_0223E824 *param0, u32 param1) param0->unk_2C = SysTask_Start(ov83_0223E8DC, param0, 1024); param0->unk_30 = 0; - BGL_FillWindow(param0->unk_08[0], 0); + Window_FillTilemap(param0->unk_08[0], 0); { u32 v0 = Font_CalcCenterAlignment(FONT_MESSAGE, param0->unk_1C->unk_38[param1], 0, 128); Text_AddPrinterWithParamsAndColor(param0->unk_08[0], FONT_MESSAGE, param0->unk_1C->unk_38[param1], v0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); } - sub_0201A954(param0->unk_08[0]); + Window_CopyToVRAM(param0->unk_08[0]); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); } @@ -1168,8 +1168,8 @@ void ov83_0223E9D0(UnkStruct_ov83_0223E824 *param0) static void ov83_0223E9E4(UnkStruct_ov83_0223E824 *param0) { - sub_02019EBC(param0->unk_04, 2); - BGL_FillWindow(param0->unk_08[1], 15); + Bg_ClearTilemap(param0->unk_04, 2); + Window_FillTilemap(param0->unk_08[1], 15); { u32 v0 = Font_CalcCenterAlignment(FONT_SYSTEM, param0->unk_1C->unk_34, 0, 224); @@ -1177,11 +1177,11 @@ static void ov83_0223E9E4(UnkStruct_ov83_0223E824 *param0) } Window_Show(param0->unk_08[1], 0, (1 + (18 + 12)), 1); - BGL_FillWindow(param0->unk_08[2], 15); + Window_FillTilemap(param0->unk_08[2], 15); Text_AddPrinterWithParamsAndColor(param0->unk_08[2], FONT_SYSTEM, param0->unk_1C->unk_4C[6], 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); Window_Show(param0->unk_08[2], 0, (1 + (18 + 12)), 1); - sub_0201A9A4(param0->unk_08[1]); - sub_0201A9A4(param0->unk_08[2]); + Window_ScheduleCopyToVRAM(param0->unk_08[1]); + Window_ScheduleCopyToVRAM(param0->unk_08[2]); } static void ov83_0223EA6C(UnkStruct_ov83_0223E824 *param0) @@ -1210,7 +1210,7 @@ static void ov83_0223EA6C(UnkStruct_ov83_0223E824 *param0) } Text_AddPrinterWithParamsAndColor(param0->unk_08[1], FONT_SYSTEM, param0->unk_1C->unk_08, 160, 68, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); - sub_0201A9A4(param0->unk_08[1]); + Window_ScheduleCopyToVRAM(param0->unk_08[1]); } static void ov83_0223EBD8(UnkStruct_ov83_0223E824 *param0) @@ -1220,7 +1220,7 @@ static void ov83_0223EBD8(UnkStruct_ov83_0223E824 *param0) StringTemplate_SetNumber(param0->unk_1C->unk_04, 2, param0->unk_20, 2, 2, 1); StringTemplate_Format(param0->unk_1C->unk_04, param0->unk_1C->unk_08, param0->unk_1C->unk_4C[7]); Text_AddPrinterWithParamsAndColor(param0->unk_08[2], FONT_SYSTEM, param0->unk_1C->unk_08, 16, 24, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); - sub_0201A9A4(param0->unk_08[2]); + Window_ScheduleCopyToVRAM(param0->unk_08[2]); } void ov83_0223EC4C(UnkStruct_ov83_0223E824 *param0, u32 param1) @@ -1240,9 +1240,9 @@ void ov83_0223EC4C(UnkStruct_ov83_0223E824 *param0, u32 param1) void ov83_0223EC70(UnkStruct_ov83_0223E824 *param0) { - sub_02019EBC(param0->unk_04, 2); - sub_0201ACF4(param0->unk_08[1]); - sub_0201ACF4(param0->unk_08[2]); + Bg_ClearTilemap(param0->unk_04, 2); + Window_ClearAndCopyToVRAM(param0->unk_08[1]); + Window_ClearAndCopyToVRAM(param0->unk_08[2]); } void ov83_0223EC8C(UnkStruct_ov83_0223E824 *param0, u32 param1) @@ -1251,7 +1251,7 @@ void ov83_0223EC8C(UnkStruct_ov83_0223E824 *param0, u32 param1) int v1; ov83_0223E9D0(param0); - BGL_FillWindow(param0->unk_08[3], 15); + Window_FillTilemap(param0->unk_08[3], 15); switch (param1) { case 0: @@ -1281,7 +1281,7 @@ void ov83_0223EC8C(UnkStruct_ov83_0223E824 *param0, u32 param1) Text_AddPrinterWithParamsAndColor(param0->unk_08[3], FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); sub_0200E060(param0->unk_08[3], 0, 1, 0); - sub_0201A9A4(param0->unk_08[3]); + Window_ScheduleCopyToVRAM(param0->unk_08[3]); } static const UnkStruct_ov83_022404B0 Unk_ov83_022404B0[8] = { diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index 2f28113a5b..66a087d433 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -407,7 +407,7 @@ int ov84_0223B5A0(OverlayManager *param0, int *param1) ov84_0223B9AC(v0); - v0->unk_00 = sub_02018340(6); + v0->unk_00 = BgConfig_New(6); v0->unk_425 = TrainerInfo_Gender(v0->unk_CC); sub_0200F174(1, 3, 3, 0x0, 6, 1, 6); @@ -626,7 +626,7 @@ static void ov84_0223BA14(void *param0) { UnkStruct_ov84_0223B5A0 *v0 = param0; - sub_0201C2B8(v0->unk_00); + Bg_RunScheduledUpdates(v0->unk_00); sub_0201DCAC(); sub_0200C800(); OS_SetIrqCheckFlag(OS_IE_V_BLANK); @@ -659,7 +659,7 @@ static void ov84_0223BA5C(BgConfig *param0) GX_BGMODE_1, GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { BgTemplate v1 = { @@ -677,8 +677,8 @@ static void ov84_0223BA5C(BgConfig *param0) 0x0, 0x0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { BgTemplate v2 = { @@ -696,7 +696,7 @@ static void ov84_0223BA5C(BgConfig *param0) 0x0, 0x0 }; - sub_020183C4(param0, 1, &v2, 0); + Bg_InitFromTemplate(param0, 1, &v2, 0); } { BgTemplate v3 = { @@ -715,8 +715,8 @@ static void ov84_0223BA5C(BgConfig *param0) 0x0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilemap(param0, 2); } { BgTemplate v4 = { @@ -734,7 +734,7 @@ static void ov84_0223BA5C(BgConfig *param0) 0x0, 0x0 }; - sub_020183C4(param0, 3, &v4, 0); + Bg_InitFromTemplate(param0, 3, &v4, 0); } { BgTemplate v5 = { @@ -752,8 +752,8 @@ static void ov84_0223BA5C(BgConfig *param0) 0x0, 0x0 }; - sub_020183C4(param0, 4, &v5, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v5, 0); + Bg_ClearTilemap(param0, 4); } { BgTemplate v6 = { @@ -771,7 +771,7 @@ static void ov84_0223BA5C(BgConfig *param0) 0x0, 0x0 }; - sub_020183C4(param0, 5, &v6, 0); + Bg_InitFromTemplate(param0, 5, &v6, 0); } { BgTemplate v7 = { @@ -789,26 +789,26 @@ static void ov84_0223BA5C(BgConfig *param0) 0x0, 0x0 }; - sub_020183C4(param0, 7, &v7, 1); - sub_0201C718(param0, 7, 9, 128); - sub_0201C718(param0, 7, 12, 80); + Bg_InitFromTemplate(param0, 7, &v7, 1); + Bg_ScheduleAffineRotationCenter(param0, 7, 9, 128); + Bg_ScheduleAffineRotationCenter(param0, 7, 12, 80); } - sub_02019690(0, 32, 0, 6); - sub_02019690(4, 32, 0, 6); + Bg_ClearTilesRange(0, 32, 0, 6); + Bg_ClearTilesRange(4, 32, 0, 6); } static void ov84_0223BBC4(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 7); - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 7); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); Heap_FreeToHeapExplicit(6, param0); } @@ -1084,7 +1084,7 @@ static void ov84_0223C224(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u16 param } param0->unk_15C = sub_0200112C(&v0, param1, param2, 6); - sub_0201A9A4(¶m0->unk_04[0]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[0]); } static void ov84_0223C2AC(BmpList *param0, u32 param1, u8 param2) @@ -1116,7 +1116,7 @@ static void ov84_0223C2AC(BmpList *param0, u32 param1, u8 param2) return; } - BGL_FillWindow(&v0->unk_04[1], 0); + Window_FillTilemap(&v0->unk_04[1], 0); if (param1 != 0xfffffffe) { UnkStruct_ov84_0223BE5C *v1; @@ -1130,7 +1130,7 @@ static void ov84_0223C2AC(BmpList *param0, u32 param1, u8 param2) } if (v0->unk_479 == 0) { - sub_0201A9A4(&v0->unk_04[1]); + Window_ScheduleCopyToVRAM(&v0->unk_04[1]); } } @@ -1202,8 +1202,8 @@ static int ov84_0223C51C(UnkStruct_ov84_0223B5A0 *param0) if (v0 == 1) { ov84_02240B34(param0, 2); - BGL_FillWindow(¶m0->unk_04[1], 0); - sub_0201ACF4(¶m0->unk_04[1]); + Window_FillTilemap(¶m0->unk_04[1], 0); + Window_ClearAndCopyToVRAM(¶m0->unk_04[1]); ov84_0223D5AC(param0); if (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08 == 3) { @@ -1312,7 +1312,7 @@ static u8 ov84_0223C750(UnkStruct_ov84_0223B5A0 *param0) ov84_02240B68(param0); param0->unk_429.unk_01 = 0; ov84_0223C848(param0); - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); return 1; } @@ -1334,7 +1334,7 @@ static u8 ov84_0223C750(UnkStruct_ov84_0223B5A0 *param0) ov84_02240B68(param0); param0->unk_429.unk_01 = 1; ov84_0223C848(param0); - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); return 1; } @@ -1372,10 +1372,10 @@ static void ov84_0223C89C(UnkStruct_ov84_0223B5A0 *param0) v0->unk_07_4 = 0; ov84_0223C4E0(param0); - BGL_FillWindow(¶m0->unk_04[0], 0); - BGL_FillWindow(¶m0->unk_04[1], 0); - sub_0201A9A4(¶m0->unk_04[0]); - sub_0201A9A4(¶m0->unk_04[1]); + Window_FillTilemap(¶m0->unk_04[0], 0); + Window_FillTilemap(¶m0->unk_04[1], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_04[0]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); SpriteActor_EnableObject(param0->unk_E0[4], 0); SpriteActor_EnableObject(param0->unk_E0[7], 0); ov84_0223F3AC(param0, param0->unk_C4->unk_64, 0); @@ -1437,7 +1437,7 @@ static u8 ov84_0223C920(UnkStruct_ov84_0223B5A0 *param0) if ((v2 == 1) && (v3 == 1) && (v0->unk_07_0 == 1) && (ov84_02240B50(param0) == 1)) { if (v0->unk_07_7 == 1) { ov84_0223CF20(param0, v0->unk_00, 1); - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); } SpriteActor_EnableObject(param0->unk_E0[7], 1); @@ -1459,7 +1459,7 @@ static u8 ov84_0223CA5C(UnkStruct_ov84_0223B5A0 *param0) Sound_PlayEffect(1738); sub_0200D364(param0->unk_E0[0], param0->unk_C4->unk_04[v0->unk_00].unk_08); ov84_0223CF20(param0, v0->unk_00, 0); - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); param0->unk_C4->unk_64 = v0->unk_00; @@ -1492,7 +1492,7 @@ static u8 ov84_0223CA5C(UnkStruct_ov84_0223B5A0 *param0) Sound_PlayEffect(1738); sub_0200D364(param0->unk_E0[0], param0->unk_C4->unk_04[v0->unk_00].unk_08); ov84_0223CF20(param0, v0->unk_00, 0); - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); param0->unk_C4->unk_64 = v0->unk_00; @@ -1600,7 +1600,7 @@ static int ov84_0223CDB0(UnkStruct_ov84_0223B5A0 *param0) if (v0 != 0xffffffff) { u16 v1 = 0xfffe; - if (sub_0201C784(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { return 0xffffffff; } } @@ -1615,7 +1615,7 @@ static int ov84_0223CE08(UnkStruct_ov84_0223B5A0 *param0) if (v0 != 0xffffffff) { u16 v1 = 0xfffe; - if (sub_0201C784(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { return 0xffffffff; } } @@ -1641,7 +1641,7 @@ static u8 ov84_0223CE60(UnkStruct_ov84_0223B5A0 *param0) Sound_PlayEffect(1508); ov84_0223CF20(param0, v0->unk_06, 2); - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); ov84_02240E24(param0, Unk_ov84_022410C8[param0->unk_424].unk_00[v0->unk_06 * 2] * 8 + 20, Unk_ov84_022410C8[param0->unk_424].unk_00[v0->unk_06 * 2 + 1] * 8 + 20); v0->unk_04++; @@ -1672,7 +1672,7 @@ static void ov84_0223CF20(UnkStruct_ov84_0223B5A0 *param0, u8 param1, u8 param2) u8 v3; u8 v4, v5; - v0 = (u16 *)sub_02019FE4(param0->unk_00, 4); + v0 = (u16 *)Bg_GetTilemapBuffer(param0->unk_00, 4); v1 = &Unk_ov84_022410C8[param0->unk_424].unk_00[param1 * 2]; v3 = param0->unk_C4->unk_04[param1].unk_08; v2 = (v3 / 2) * (30 * 5) + (v3 & 1) * 15 + 30 + param2 * 5; @@ -1692,7 +1692,7 @@ static void ov84_0223CFB0(UnkStruct_ov84_0223B5A0 *param0, u8 param1) u8 v3; u8 v4, v5; - v0 = (u16 *)sub_02019FE4(param0->unk_00, 4); + v0 = (u16 *)Bg_GetTilemapBuffer(param0->unk_00, 4); v2 = 0x276 + 6 * param1; for (v4 = 0; v4 < 6; v4++) { @@ -1701,7 +1701,7 @@ static void ov84_0223CFB0(UnkStruct_ov84_0223B5A0 *param0, u8 param1) } } - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); } static void ov84_0223D014(UnkStruct_ov84_0223B5A0 *param0) @@ -1751,7 +1751,7 @@ static void ov84_0223D0BC(UnkStruct_ov84_0223B5A0 *param0) } } - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); } static void ov84_0223D0FC(UnkStruct_ov84_0223B5A0 *param0) @@ -1797,7 +1797,7 @@ static BOOL ov84_0223D1F4(UnkStruct_ov84_0223B5A0 *param0) if (v0 != 0xffffffff) { u16 v1 = 0xfffe; - if (sub_0201C784(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { return 0; } @@ -2081,14 +2081,14 @@ static int ov84_0223D730(UnkStruct_ov84_0223B5A0 *param0) static void ov84_0223D7E8(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { if (param1 == 0) { - sub_020198C0(param0->unk_00, 1, Unk_ov84_02241064, 0, 18, 5, 5); + Bg_LoadToTilemapRect(param0->unk_00, 1, Unk_ov84_02241064, 0, 18, 5, 5); SpriteActor_EnableObject(param0->unk_E0[7], 1); } else { - sub_020198C0(param0->unk_00, 1, Unk_ov84_02241096, 0, 18, 5, 5); + Bg_LoadToTilemapRect(param0->unk_00, 1, Unk_ov84_02241096, 0, 18, 5, 5); SpriteActor_EnableObject(param0->unk_E0[7], 0); } - sub_0201C3C0(param0->unk_00, 1); + Bg_ScheduleTilemapTransfer(param0->unk_00, 1); } const u32 ov84_0223D84C(u32 param0) @@ -2111,7 +2111,7 @@ static int ov84_0223D858(UnkStruct_ov84_0223B5A0 *param0) if (v2 != 0) { sub_0207CD34(param0->unk_CC, param0->unk_3F8, param0->unk_C4->unk_66, v2, 6); - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); sub_0200E060(¶m0->unk_04[6], 0, 1024 - 9 - (18 + 12), 12); param0->unk_426 = ov84_022400A0(param0); @@ -2127,7 +2127,7 @@ static int ov84_0223D8EC(UnkStruct_ov84_0223B5A0 *param0) if (Text_IsPrinterActive(param0->unk_426) == 0) { if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { sub_0200E084(¶m0->unk_04[6], 0); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); if (param0->unk_C4->unk_65 == 3) { @@ -2153,7 +2153,7 @@ static int ov84_0223D94C(UnkStruct_ov84_0223B5A0 *param0) } if (sub_0207CC10(param0->unk_C4->unk_00, param0->unk_3F8, param0->unk_C4->unk_66, 6) == 1) { - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); sub_0200E060(¶m0->unk_04[6], 0, 1024 - 9 - (18 + 12), 12); param0->unk_426 = ov84_022400A0(param0); return 12; @@ -2190,7 +2190,7 @@ static int ov84_0223DA14(UnkStruct_ov84_0223B5A0 *param0) MessageLoader_GetStrbuf(param0->unk_114, 58, param0->unk_3F8); } } - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); sub_0200E060(¶m0->unk_04[6], 0, 1024 - 9 - (18 + 12), 12); param0->unk_426 = ov84_022400A0(param0); @@ -2204,7 +2204,7 @@ static int ov84_0223DA14(UnkStruct_ov84_0223B5A0 *param0) if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { Strbuf *v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 60); - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); StringTemplate_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); @@ -2251,7 +2251,7 @@ static int ov84_0223DA14(UnkStruct_ov84_0223B5A0 *param0) } break; case 0xfffffffe: sub_0200E084(¶m0->unk_04[6], 0); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); ov84_0223D7E8(param0, 0); return 1; @@ -2322,7 +2322,7 @@ static int ov84_0223DDD0(UnkStruct_ov84_0223B5A0 *param0) { switch (param0->unk_483) { case 0: - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); sub_0200E060(¶m0->unk_04[6], 0, 1024 - 9 - (18 + 12), 12); param0->unk_426 = ov84_022400A0(param0); param0->unk_483 = 1; @@ -2343,7 +2343,7 @@ static int ov84_0223DDD0(UnkStruct_ov84_0223B5A0 *param0) ov84_0223DCF8(param0); } - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); return 1; @@ -2470,7 +2470,7 @@ static int ov84_0223E01C(UnkStruct_ov84_0223B5A0 *param0) StringTemplate_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); } - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); param0->unk_426 = ov84_022400A0(param0); return 10; @@ -2485,7 +2485,7 @@ static int ov84_0223E01C(UnkStruct_ov84_0223B5A0 *param0) } break; case 0xfffffffe: sub_0200E084(¶m0->unk_04[6], 0); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); return 1; } @@ -2501,7 +2501,7 @@ static int ov84_0223E158(UnkStruct_ov84_0223B5A0 *param0) param0->unk_479 = 1; ov84_0223DCF8(param0); - sub_0201A9A4(¶m0->unk_04[6]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[6]); return 11; } @@ -2512,7 +2512,7 @@ static int ov84_0223E18C(UnkStruct_ov84_0223B5A0 *param0) if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { param0->unk_479 = 0; sub_0200E084(¶m0->unk_04[6], 0); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); return 1; @@ -2527,7 +2527,7 @@ static int ov84_0223E1E4(UnkStruct_ov84_0223B5A0 *param0) Bag_RegisterItem(param0->unk_C8, param0->unk_C4->unk_66); sub_020013AC(param0->unk_15C); ov84_0223FD84(param0); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); return 1; @@ -2538,7 +2538,7 @@ static int ov84_0223E220(UnkStruct_ov84_0223B5A0 *param0) Bag_RegisterItem(param0->unk_C8, 0); sub_020013AC(param0->unk_15C); ov84_0223FD84(param0); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); return 1; @@ -2576,7 +2576,7 @@ static int ov84_0223E27C(UnkStruct_ov84_0223B5A0 *param0) if (Item_LoadParam(param0->unk_C4->unk_66, 3, 6) != 0) { Strbuf *v1; - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); sub_0200E060(¶m0->unk_04[6], 0, 1024 - 9 - (18 + 12), 12); StringTemplate_SetItemName(param0->unk_118, 0, param0->unk_C4->unk_66); @@ -2607,7 +2607,7 @@ static int ov84_0223E36C(UnkStruct_ov84_0223B5A0 *param0) if (Text_IsPrinterActive(param0->unk_426) == 0) { if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { sub_0200E084(¶m0->unk_04[6], 0); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); return 14; @@ -2639,7 +2639,7 @@ static int ov84_0223E3BC(UnkStruct_ov84_0223B5A0 *param0) Strbuf *v1; ov84_02240248(param0, 0); - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); sub_0200E060(¶m0->unk_04[6], 0, 1024 - 9 - (18 + 12), 12); StringTemplate_SetItemName(param0->unk_118, 0, param0->unk_C4->unk_66); ov84_02240B34(param0, 2); @@ -2708,7 +2708,7 @@ static int ov84_0223E5C4(UnkStruct_ov84_0223B5A0 *param0) ov84_02240D3C(param0, 0); Window_Clear(¶m0->unk_04[7], 1); - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); v0 = MessageLoader_GetNewStrbuf(param0->unk_114, 76); StringTemplate_SetNumber(param0->unk_118, 0, param0->unk_488 * param0->unk_48C, 6, 0, 1); StringTemplate_Format(param0->unk_118, param0->unk_3F8, v0); @@ -2738,7 +2738,7 @@ static int ov84_0223E5C4(UnkStruct_ov84_0223B5A0 *param0) ov84_02240D3C(param0, 0); Window_Clear(¶m0->unk_04[7], 1); - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 76); @@ -2757,7 +2757,7 @@ static int ov84_0223E5C4(UnkStruct_ov84_0223B5A0 *param0) Window_Clear(¶m0->unk_04[8], 1); Window_Clear(¶m0->unk_04[7], 1); sub_0200E084(¶m0->unk_04[6], 0); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); Sound_PlayEffect(1500); @@ -2807,7 +2807,7 @@ static int ov84_0223E7CC(UnkStruct_ov84_0223B5A0 *param0) StringTemplate_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); } - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); param0->unk_426 = ov84_022400A0(param0); return 21; case 0xffffffff: { @@ -2823,7 +2823,7 @@ static int ov84_0223E7CC(UnkStruct_ov84_0223B5A0 *param0) param0->unk_48C = 0; Window_Clear(¶m0->unk_04[8], 1); sub_0200E084(¶m0->unk_04[6], 0); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); return 16; @@ -2852,7 +2852,7 @@ static int ov84_0223E920(UnkStruct_ov84_0223B5A0 *param0) ov84_02240248(param0, 1); param0->unk_479 = 1; ov84_0223DCF8(param0); - sub_0201A9A4(¶m0->unk_04[6]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[6]); return 22; } @@ -2866,7 +2866,7 @@ static int ov84_0223E9B0(UnkStruct_ov84_0223B5A0 *param0) Window_Clear(¶m0->unk_04[8], 1); sub_0200E084(¶m0->unk_04[6], 0); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); return 16; @@ -2899,7 +2899,7 @@ static int ov84_0223EA18(UnkStruct_ov84_0223B5A0 *param0) if (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08 == 0) { if (Item_LoadParam(param0->unk_C4->unk_66, 6, 6) != 13) { sub_0207CD34(param0->unk_CC, param0->unk_3F8, param0->unk_C4->unk_66, -1, 6); - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); sub_0200E060(¶m0->unk_04[6], 0, 1024 - 9 - (18 + 12), 12); param0->unk_426 = ov84_022400A0(param0); @@ -2920,7 +2920,7 @@ static int ov84_0223EA18(UnkStruct_ov84_0223B5A0 *param0) static void ov84_0223EB08(UnkStruct_ov84_0223B5A0 *param0, s8 param1) { - s16 v0 = sub_02019FFC(param0->unk_00, 7); + s16 v0 = Bg_GetRotation(param0->unk_00, 7); v0 += param1; @@ -2930,7 +2930,7 @@ static void ov84_0223EB08(UnkStruct_ov84_0223B5A0 *param0, s8 param1) v0 += 360; } - sub_0201C660(param0->unk_00, 7, 0, v0); + Bg_ScheduleAffineRotation(param0->unk_00, 7, 0, v0); param0->unk_49A = v0; } @@ -2981,7 +2981,7 @@ static BOOL ov84_0223EB84(UnkStruct_ov84_0223B5A0 *param0, u16 param1) param0->unk_49A -= 360; } - sub_0201C660(param0->unk_00, 7, 0, param0->unk_49A); + Bg_ScheduleAffineRotation(param0->unk_00, 7, 0, param0->unk_49A); { s32 v2; s32 v3; diff --git a/src/overlay084/ov84_0223F040.c b/src/overlay084/ov84_0223F040.c index 642d00bd56..b3157e6ac9 100644 --- a/src/overlay084/ov84_0223F040.c +++ b/src/overlay084/ov84_0223F040.c @@ -48,17 +48,17 @@ static const WindowTemplate Unk_ov84_02241150 = { void ov84_0223F040(UnkStruct_ov84_0223B5A0 *param0) { - BGL_AddWindow(param0->unk_00, ¶m0->unk_04[0], 2, 14, 0, 17, 18, 3, 1); - BGL_AddWindow(param0->unk_00, ¶m0->unk_04[1], 0, 0, 18, 32, 6, 3, 1 + 17 * 18); - BGL_AddWindow(param0->unk_00, ¶m0->unk_04[2], 2, 0, 13, 12 * 3, 3, 3, 499); - BGL_AddWindow(param0->unk_00, ¶m0->unk_04[3], 0, 6, 19, 14, 4, 11, 607); - BGL_AddWindow(param0->unk_00, ¶m0->unk_04[4], 0, 6, 19, 13, 4, 11, 607); - BGL_AddWindow(param0->unk_00, ¶m0->unk_04[5], 0, 0, 11, 12, 2, 13, 663); - BGL_AddWindow(param0->unk_00, ¶m0->unk_04[6], 0, 2, 19, 27, 4, 11, 687); - BGL_AddWindow(param0->unk_00, ¶m0->unk_04[7], 0, 19, 13, 12, 4, 3, 823); - BGL_AddWindow(param0->unk_00, ¶m0->unk_04[8], 0, 1, 1, 10, 4, 3, 871); - BGL_AddWindow(param0->unk_00, ¶m0->unk_04[9], 0, 24, 19, 7, 4, 3, 903); - BGL_AddWindow(param0->unk_00, ¶m0->unk_04[10], 0, 1, 12, 11, 4, 3, 903); + Window_Add(param0->unk_00, ¶m0->unk_04[0], 2, 14, 0, 17, 18, 3, 1); + Window_Add(param0->unk_00, ¶m0->unk_04[1], 0, 0, 18, 32, 6, 3, 1 + 17 * 18); + Window_Add(param0->unk_00, ¶m0->unk_04[2], 2, 0, 13, 12 * 3, 3, 3, 499); + Window_Add(param0->unk_00, ¶m0->unk_04[3], 0, 6, 19, 14, 4, 11, 607); + Window_Add(param0->unk_00, ¶m0->unk_04[4], 0, 6, 19, 13, 4, 11, 607); + Window_Add(param0->unk_00, ¶m0->unk_04[5], 0, 0, 11, 12, 2, 13, 663); + Window_Add(param0->unk_00, ¶m0->unk_04[6], 0, 2, 19, 27, 4, 11, 687); + Window_Add(param0->unk_00, ¶m0->unk_04[7], 0, 19, 13, 12, 4, 3, 823); + Window_Add(param0->unk_00, ¶m0->unk_04[8], 0, 1, 1, 10, 4, 3, 871); + Window_Add(param0->unk_00, ¶m0->unk_04[9], 0, 24, 19, 7, 4, 3, 903); + Window_Add(param0->unk_00, ¶m0->unk_04[10], 0, 1, 12, 11, 4, 3, 903); } void ov84_0223F1DC(Window *param0) @@ -66,7 +66,7 @@ void ov84_0223F1DC(Window *param0) u16 v0; for (v0 = 0; v0 < 11; v0++) { - BGL_DeleteWindow(¶m0[v0]); + Window_Remove(¶m0[v0]); } } @@ -101,8 +101,8 @@ void ov84_0223F25C(UnkStruct_ov84_0223B5A0 *param0) v1 = (12 * 3) / 3; for (v0 = 0; v0 < v1; v0++) { - sub_02019CB8(param0->unk_00, 2, ((1 + 17 * 18) + 32 * 6) + v1 + v0, 0 + v0, 13, 1, 1, 3); - sub_02019CB8(param0->unk_00, 2, ((1 + 17 * 18) + 32 * 6) + (12 * 3) + v1 + v0, 0 + v0, 13 + 1, 1, 1, 3); + Bg_FillTilemapRect(param0->unk_00, 2, ((1 + 17 * 18) + 32 * 6) + v1 + v0, 0 + v0, 13, 1, 1, 3); + Bg_FillTilemapRect(param0->unk_00, 2, ((1 + 17 * 18) + 32 * 6) + (12 * 3) + v1 + v0, 0 + v0, 13 + 1, 1, 1, 3); } } @@ -121,7 +121,7 @@ void ov84_0223F2FC(UnkStruct_ov84_0223B5A0 *param0) Strbuf *v2; u16 v3; - BGL_FillWindow(¶m0->unk_04[2], 0); + Window_FillTilemap(¶m0->unk_04[2], 0); v0 = ¶m0->unk_429; v2 = param0->unk_404[param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08]; @@ -136,7 +136,7 @@ void ov84_0223F2FC(UnkStruct_ov84_0223B5A0 *param0) } ov84_0223F2C0(param0, v2, v3); - sub_0201ACCC(¶m0->unk_04[2]); + Window_LoadTiles(¶m0->unk_04[2]); } static void *ov84_0223F390(UnkStruct_ov84_0223B5A0 *param0, NNSG2dCharacterData **param1) @@ -161,8 +161,8 @@ void ov84_0223F3AC(UnkStruct_ov84_0223B5A0 *param0, u8 param1, u8 param2) v2 = param0->unk_C4->unk_04[param1].unk_08 * 32; } - sub_0201ADDC(¶m0->unk_04[5], v0->pRawData, v2, 0, 32 * 8, 16, param0->unk_427 + param0->unk_428 * param1, 3, 10, 10); - sub_0201A9A4(¶m0->unk_04[5]); + Window_BlitBitmapRect(¶m0->unk_04[5], v0->pRawData, v2, 0, 32 * 8, 16, param0->unk_427 + param0->unk_428 * param1, 3, 10, 10); + Window_ScheduleCopyToVRAM(¶m0->unk_04[5]); Heap_FreeToHeapExplicit(6, v1); } @@ -174,7 +174,7 @@ void ov84_0223F438(UnkStruct_ov84_0223B5A0 *param0) u8 v3; v1 = ov84_0223F390(param0, &v0); - BGL_FillWindow(¶m0->unk_04[5], 0); + Window_FillTilemap(¶m0->unk_04[5], 0); for (v2 = 0; v2 < param0->unk_424; v2++) { if (v2 == param0->unk_C4->unk_64) { @@ -183,10 +183,10 @@ void ov84_0223F438(UnkStruct_ov84_0223B5A0 *param0) v3 = param0->unk_C4->unk_04[v2].unk_08 * 32; } - sub_0201ADDC(¶m0->unk_04[5], v0->pRawData, v3, 0, 32 * 8, 16, param0->unk_427 + param0->unk_428 * v2, 3, 10, 10); + Window_BlitBitmapRect(¶m0->unk_04[5], v0->pRawData, v3, 0, 32 * 8, 16, param0->unk_427 + param0->unk_428 * v2, 3, 10, 10); } - sub_0201A9A4(¶m0->unk_04[5]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[5]); Heap_FreeToHeapExplicit(6, v1); } @@ -349,7 +349,7 @@ static void ov84_0223F9B0(UnkStruct_ov84_0223B5A0 *param0, u32 param1) u8 v2; v1 = ov84_0223F994(param0, &v0); - sub_0201ADDC(¶m0->unk_04[0], v0->pRawData, 40, 0, 64, 16, 0, param1, 24, 16); + Window_BlitBitmapRect(¶m0->unk_04[0], v0->pRawData, 40, 0, 64, 16, 0, param1, 24, 16); Heap_FreeToHeapExplicit(6, v1); } @@ -357,7 +357,7 @@ void ov84_0223F9F0(UnkStruct_ov84_0223B5A0 *param0, u32 param1) { Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_114, 41); - BGL_WindowColor(¶m0->unk_04[0], 0, 0, param1, 17 * 8, 16); + Window_FillRectWithColor(¶m0->unk_04[0], 0, 0, param1, 17 * 8, 16); Text_AddPrinterWithParamsAndColor(¶m0->unk_04[0], FONT_SYSTEM, v0, 0, param1, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v0); } @@ -369,7 +369,7 @@ void ov84_0223FA44(UnkStruct_ov84_0223B5A0 *param0, u32 param1) u8 v2; v1 = ov84_0223F994(param0, &v0); - sub_0201ADDC(¶m0->unk_04[0], v0->pRawData, 0, 0, 64, 16, 96, param1, 40, 16); + Window_BlitBitmapRect(¶m0->unk_04[0], v0->pRawData, 0, 0, 64, 16, 96, param1, 40, 16); Heap_FreeToHeapExplicit(6, v1); } @@ -408,10 +408,10 @@ void ov84_0223FB70(UnkStruct_ov84_0223B5A0 *param0, u8 *param1, u8 param2) u16 v5; if (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08 == 4) { - BGL_AddWindow(param0->unk_00, ¶m0->unk_B4[0], 0, 23, 23 - param2 * 2, 8, param2 * 2, 3, 823); + Window_Add(param0->unk_00, ¶m0->unk_B4[0], 0, 23, 23 - param2 * 2, 8, param2 * 2, 3, 823); v5 = 4; } else { - BGL_AddWindow(param0->unk_00, ¶m0->unk_B4[0], 0, 23 + 1, 23 - param2 * 2, 8 - 1, param2 * 2, 3, 823); + Window_Add(param0->unk_00, ¶m0->unk_B4[0], 0, 23 + 1, 23 - param2 * 2, 8 - 1, param2 * 2, 3, 823); v5 = 3; } @@ -438,13 +438,13 @@ void ov84_0223FB70(UnkStruct_ov84_0223B5A0 *param0, u8 *param1, u8 param2) param0->unk_158 = sub_02001AF4(&v0, 8, 0, 0, 6, PAD_BUTTON_B); if (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08 == 3) { - BGL_FillWindow(¶m0->unk_04[1], 0); + Window_FillTilemap(¶m0->unk_04[1], 0); ov84_0223F584(param0, param0->unk_C4->unk_66); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240D5C(param0, param0->unk_C4->unk_66, 1); } else { sub_0200E060(¶m0->unk_04[v5], 1, 1024 - 9 - (18 + 12), 12); - BGL_FillWindow(¶m0->unk_04[v5], 15); + Window_FillTilemap(¶m0->unk_04[v5], 15); v2 = MessageLoader_GetNewStrbuf(param0->unk_114, 42); v3 = Strbuf_Init((14 * 2 * 2), 6); @@ -455,11 +455,11 @@ void ov84_0223FB70(UnkStruct_ov84_0223B5A0 *param0, u8 *param1, u8 param2) Text_AddPrinterWithParams(¶m0->unk_04[v5], FONT_MESSAGE, v3, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); Strbuf_Free(v3); Strbuf_Free(v2); - sub_0201A9A4(¶m0->unk_04[v5]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[v5]); } Window_Show(¶m0->unk_B4[0], 1, 1024 - 9, 14); - sub_0201A9A4(¶m0->unk_B4[0]); + Window_ScheduleCopyToVRAM(¶m0->unk_B4[0]); } void ov84_0223FD84(UnkStruct_ov84_0223B5A0 *param0) @@ -474,17 +474,17 @@ void ov84_0223FD84(UnkStruct_ov84_0223B5A0 *param0) if (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08 != 3) { sub_0200E084(¶m0->unk_04[v0], 1); - sub_0201AD10(¶m0->unk_04[v0]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_04[v0]); } Window_Clear(¶m0->unk_B4[0], 1); - sub_0201AD10(¶m0->unk_B4[0]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_B4[0]); sub_02001BC4(param0->unk_158, NULL); sub_02013A3C(param0->unk_154); - BGL_DeleteWindow(¶m0->unk_B4[0]); - BGL_FillWindow(¶m0->unk_04[1], 0); + Window_Remove(¶m0->unk_B4[0]); + Window_FillTilemap(¶m0->unk_04[1], 0); ov84_0223F528(param0, param0->unk_C4->unk_66); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240D5C(param0, 0, 0); } @@ -493,7 +493,7 @@ void ov84_0223FE18(UnkStruct_ov84_0223B5A0 *param0) Strbuf *v0; Strbuf *v1; - BGL_FillWindow(¶m0->unk_04[1], 0); + Window_FillTilemap(¶m0->unk_04[1], 0); v0 = MessageLoader_GetNewStrbuf(param0->unk_114, 45); v1 = Strbuf_Init(130, 6); @@ -502,7 +502,7 @@ void ov84_0223FE18(UnkStruct_ov84_0223B5A0 *param0) StringTemplate_Format(param0->unk_118, v1, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_04[1], FONT_SYSTEM, v1, 40, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); Strbuf_Free(v1); Strbuf_Free(v0); } @@ -517,7 +517,7 @@ void ov84_0223FE94(UnkStruct_ov84_0223B5A0 *param0) Window_Show(¶m0->unk_04[9], 1, 1024 - 9, 14); ov84_0223FF44(param0); sub_0200E060(¶m0->unk_04[3], 1, 1024 - 9 - (18 + 12), 12); - BGL_FillWindow(¶m0->unk_04[3], 15); + Window_FillTilemap(¶m0->unk_04[3], 15); v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 52); v2 = Strbuf_Init(14 * 2 * 2, 6); @@ -527,7 +527,7 @@ void ov84_0223FE94(UnkStruct_ov84_0223B5A0 *param0) StringTemplate_Format(param0->unk_118, v2, v1); Text_AddPrinterWithParams(¶m0->unk_04[3], FONT_MESSAGE, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A9A4(¶m0->unk_04[3]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[3]); Strbuf_Free(v2); Strbuf_Free(v1); } @@ -539,13 +539,13 @@ void ov84_0223FF44(UnkStruct_ov84_0223B5A0 *param0) u32 v2; v0 = ¶m0->unk_04[9]; - BGL_FillWindow(v0, 15); + Window_FillTilemap(v0, 15); v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 84); StringTemplate_SetNumber(param0->unk_118, 0, param0->unk_488, 3, 2, 1); StringTemplate_Format(param0->unk_118, param0->unk_3F8, v1); Text_AddPrinterWithParams(v0, FONT_SYSTEM, param0->unk_3F8, 16, 8, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); Strbuf_Free(v1); } @@ -553,9 +553,9 @@ void ov84_0223FFC0(UnkStruct_ov84_0223B5A0 *param0) { sub_0200E084(¶m0->unk_04[3], 1); Window_Clear(¶m0->unk_04[9], 1); - sub_0201AD10(¶m0->unk_04[3]); - sub_0201AD10(¶m0->unk_04[9]); - sub_0201A9A4(¶m0->unk_04[1]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_04[3]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_04[9]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); } void ov84_0223FFF0(UnkStruct_ov84_0223B5A0 *param0) @@ -565,7 +565,7 @@ void ov84_0223FFF0(UnkStruct_ov84_0223B5A0 *param0) u16 v2; sub_0200E060(¶m0->unk_04[6], 1, 1024 - 9 - (18 + 12), 12); - BGL_FillWindow(¶m0->unk_04[6], 15); + Window_FillTilemap(¶m0->unk_04[6], 15); v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 54); v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; @@ -628,7 +628,7 @@ void ov84_02240148(UnkStruct_ov84_0223B5A0 *param0, u8 param1) Window_Show(v0, 1, 1024 - 9, 14); } - BGL_FillWindow(v0, 15); + Window_FillTilemap(v0, 15); v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 80); @@ -645,7 +645,7 @@ void ov84_02240148(UnkStruct_ov84_0223B5A0 *param0, u8 param1) v2 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_3F8, 0); Text_AddPrinterWithParams(v0, FONT_SYSTEM, param0->unk_3F8, (12 * 8) - v2, 8, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); Strbuf_Free(v1); } @@ -658,7 +658,7 @@ void ov84_02240248(UnkStruct_ov84_0223B5A0 *param0, u8 param1) v0 = ¶m0->unk_04[8]; if (param1 == 0) { - BGL_FillWindow(v0, 15); + Window_FillTilemap(v0, 15); Window_Show(v0, 1, 1024 - 9, 14); v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 78); @@ -666,7 +666,7 @@ void ov84_02240248(UnkStruct_ov84_0223B5A0 *param0, u8 param1) Text_AddPrinterWithParams(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); Strbuf_Free(v1); } else { - BGL_WindowColor(v0, 15, 0, 16, (10 * 8), 16); + Window_FillRectWithColor(v0, 15, 0, 16, (10 * 8), 16); } v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 79); @@ -677,7 +677,7 @@ void ov84_02240248(UnkStruct_ov84_0223B5A0 *param0, u8 param1) v2 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_3F8, 0); Text_AddPrinterWithParams(v0, FONT_SYSTEM, param0->unk_3F8, (10 * 8) - v2, 16, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); Strbuf_Free(v1); } @@ -688,7 +688,7 @@ void ov84_02240328(UnkStruct_ov84_0223B5A0 *param0) u32 v2; v0 = ¶m0->unk_04[10]; - BGL_FillWindow(v0, 15); + Window_FillTilemap(v0, 15); Window_Show(v0, 1, 1024 - 9, 14); v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 108); @@ -702,5 +702,5 @@ void ov84_02240328(UnkStruct_ov84_0223B5A0 *param0) v2 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_3F8, 0); Text_AddPrinterWithParams(v0, FONT_SYSTEM, param0->unk_3F8, 11 * 8 - v2, 16, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index 03f4b17e80..21de8396a1 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -223,7 +223,7 @@ int ov85_02241440(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov85_022417E4), 36); memset(v0, 0, sizeof(UnkStruct_ov85_022417E4)); v0->unk_1F8 = OverlayManager_Args(param0); - v0->unk_00 = sub_02018340(36); + v0->unk_00 = BgConfig_New(36); v0->unk_1FC = BerryData_LoadDataByNarcMemberIndex(v0->unk_1F8->unk_08, 36); sub_0208C120(0, 36); @@ -306,7 +306,7 @@ static void ov85_022415F4(void *param0) { UnkStruct_ov85_022417E4 *v0 = param0; - sub_0201C2B8(v0->unk_00); + Bg_RunScheduledUpdates(v0->unk_00); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -339,7 +339,7 @@ static void ov85_02241634(BgConfig *param0) GX_BG0_AS_3D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } ov85_02241F5C(); @@ -361,8 +361,8 @@ static void ov85_02241634(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v1, 0); + Bg_ClearTilemap(param0, 1); } { @@ -382,8 +382,8 @@ static void ov85_02241634(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v2, 0); - sub_0201C63C(param0, 2, 3, 8); + Bg_InitFromTemplate(param0, 2, &v2, 0); + Bg_ScheduleScroll(param0, 2, 3, 8); } { @@ -403,18 +403,18 @@ static void ov85_02241634(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v3, 0); + Bg_InitFromTemplate(param0, 3, &v3, 0); } - sub_02019690(1, 32, 0, 36); + Bg_ClearTilesRange(1, 32, 0, 36); } static void ov85_022416E8(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 0); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); Heap_FreeToHeapExplicit(36, param0); } @@ -435,9 +435,9 @@ static void ov85_02241718(UnkStruct_ov85_022417E4 *param0, NARC *param1) v0[v1] = (3 << 12) + 1 + v1; } - sub_020198C0(param0->unk_00, 1, v0, 2, 5, 8, 8); + Bg_LoadToTilemapRect(param0->unk_00, 1, v0, 2, 5, 8, 8); Heap_FreeToHeap(v0); - sub_02019448(param0->unk_00, 1); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 1); } Font_LoadTextPalette(0, 15 * 0x20, 36); @@ -467,7 +467,7 @@ static void ov85_0224183C(UnkStruct_ov85_022417E4 *param0) u32 v0; for (v0 = 0; v0 < 12; v0++) { - sub_0201A8D4(param0->unk_00, ¶m0->unk_04[v0], &Unk_ov85_022428D8[v0]); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_04[v0], &Unk_ov85_022428D8[v0]); } } @@ -476,7 +476,7 @@ static void ov85_02241860(Window *param0) u32 v0; for (v0 = 0; v0 < 12; v0++) { - BGL_DeleteWindow(¶m0[v0]); + Window_Remove(¶m0[v0]); } } @@ -490,44 +490,44 @@ static void ov85_02241878(UnkStruct_ov85_022417E4 *param0, u32 param1, u32 param v1 = MessageLoader_GetNewStrbuf(param0->unk_C4, param2); v2 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0); - Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, (sub_0201C294(v0) * 8 - v2) / 2, 0, TEXT_SPEED_NO_TRANSFER, param3, NULL); + Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, (Window_GetWidth(v0) * 8 - v2) / 2, 0, TEXT_SPEED_NO_TRANSFER, param3, NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov85_022418CC(UnkStruct_ov85_022417E4 *param0) { - BGL_FillWindow(¶m0->unk_04[0], 4); + Window_FillTilemap(¶m0->unk_04[0], 4); ov85_02241878(param0, 0, 0, TEXT_COLOR(1, 2, 4)); } static void ov85_022418EC(UnkStruct_ov85_022417E4 *param0) { - BGL_FillWindow(¶m0->unk_04[2], 0); + Window_FillTilemap(¶m0->unk_04[2], 0); ov85_02241878(param0, 2, 1, TEXT_COLOR(15, 2, 0)); } static void ov85_0224190C(UnkStruct_ov85_022417E4 *param0) { - BGL_FillWindow(¶m0->unk_04[3], 0); + Window_FillTilemap(¶m0->unk_04[3], 0); ov85_02241878(param0, 3, 2, TEXT_COLOR(15, 2, 0)); } static void ov85_0224192C(UnkStruct_ov85_022417E4 *param0) { - BGL_FillWindow(¶m0->unk_04[4], 0); + Window_FillTilemap(¶m0->unk_04[4], 0); ov85_02241878(param0, 4, 3, TEXT_COLOR(15, 2, 0)); } static void ov85_0224194C(UnkStruct_ov85_022417E4 *param0) { - BGL_FillWindow(¶m0->unk_04[5], 0); + Window_FillTilemap(¶m0->unk_04[5], 0); ov85_02241878(param0, 5, 4, TEXT_COLOR(15, 2, 0)); } static void ov85_0224196C(UnkStruct_ov85_022417E4 *param0) { - BGL_FillWindow(¶m0->unk_04[6], 0); + Window_FillTilemap(¶m0->unk_04[6], 0); ov85_02241878(param0, 6, 5, TEXT_COLOR(15, 2, 0)); } @@ -539,7 +539,7 @@ static void ov85_0224198C(UnkStruct_ov85_022417E4 *param0) v0 = ¶m0->unk_04[1]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); sub_0200C578(param0->unk_CC, 2, v0, 0, 5); v1 = MessageLoader_GetNewStrbuf(param0->unk_C4, 6); @@ -555,7 +555,7 @@ static void ov85_0224198C(UnkStruct_ov85_022417E4 *param0) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 40, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 2, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov85_02241A58(UnkStruct_ov85_022417E4 *param0) @@ -565,13 +565,13 @@ static void ov85_02241A58(UnkStruct_ov85_022417E4 *param0) v0 = ¶m0->unk_04[11]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); v1 = BerryData_AllocAndGetDescription(param0->unk_1F8->unk_08, 36); Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov85_02241AA8(UnkStruct_ov85_022417E4 *param0) @@ -580,12 +580,12 @@ static void ov85_02241AA8(UnkStruct_ov85_022417E4 *param0) Strbuf *v1; v0 = ¶m0->unk_04[9]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); v1 = MessageLoader_GetNewStrbuf(param0->unk_C4, 10); Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 2, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov85_02241AF4(UnkStruct_ov85_022417E4 *param0) @@ -596,7 +596,7 @@ static void ov85_02241AF4(UnkStruct_ov85_022417E4 *param0) v0 = ¶m0->unk_04[10]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); v2 = BerryData_GetAttribute(param0->unk_1FC, 1); @@ -608,7 +608,7 @@ static void ov85_02241AF4(UnkStruct_ov85_022417E4 *param0) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 2, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov85_02241B50(UnkStruct_ov85_022417E4 *param0) @@ -617,12 +617,12 @@ static void ov85_02241B50(UnkStruct_ov85_022417E4 *param0) Strbuf *v1; v0 = ¶m0->unk_04[7]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); v1 = MessageLoader_GetNewStrbuf(param0->unk_C4, 8); Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 2, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov85_02241B9C(UnkStruct_ov85_022417E4 *param0) @@ -634,7 +634,7 @@ static void ov85_02241B9C(UnkStruct_ov85_022417E4 *param0) v0 = ¶m0->unk_04[8]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); v3 = BerryData_GetAttribute(param0->unk_1FC, 0); v3 = (((v3 * 1000) / 254 + 5) / 10); @@ -647,7 +647,7 @@ static void ov85_02241B9C(UnkStruct_ov85_022417E4 *param0) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 2, 0), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void ov85_02241C64(UnkStruct_ov85_022417E4 *param0, u8 param1) @@ -862,7 +862,7 @@ static void ov85_02241F0C(UnkStruct_ov85_022417E4 *param0) ov85_02241E60(param0, v0); NARC_dtor(v0); ov85_02242578(param0); - sub_02019448(param0->unk_00, 1); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 1); } static void ov85_02241F5C(void) diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index ae18ecbc59..9f8b064fb7 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -673,21 +673,21 @@ static void ov86_0223B74C(UnkStruct_ov86_0223B3C8 *param0) 0 }; - param0->unk_10 = sub_02018340(63); + param0->unk_10 = BgConfig_New(63); GXLayers_SetBanks(&v1); GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN); - sub_02018368(&v2); - sub_020183C4(param0->unk_10, 1, &v3, 0); - sub_020183C4(param0->unk_10, 2, &v4, 0); - sub_020183C4(param0->unk_10, 3, &v5, 0); - sub_020196C0(param0->unk_10, 1, 0x0, 1, 0); - sub_02019CB8(param0->unk_10, 1, 0x0, 0, 0, 32, 32, 0); - BGL_AddWindow(param0->unk_10, &(param0->unk_14), 1, 0, 0, 32, 24, 1, 1); - BGL_FillWindow(&(param0->unk_14), 0); - sub_0201ACCC(&(param0->unk_14)); - sub_0201A9F4(¶m0->unk_14); + SetAllGraphicsModes(&v2); + Bg_InitFromTemplate(param0->unk_10, 1, &v3, 0); + Bg_InitFromTemplate(param0->unk_10, 2, &v4, 0); + Bg_InitFromTemplate(param0->unk_10, 3, &v5, 0); + Bg_FillTilesRange(param0->unk_10, 1, 0x0, 1, 0); + Bg_FillTilemapRect(param0->unk_10, 1, 0x0, 0, 0, 32, 32, 0); + Window_Add(param0->unk_10, &(param0->unk_14), 1, 0, 0, 32, 24, 1, 1); + Window_FillTilemap(&(param0->unk_14), 0); + Window_LoadTiles(&(param0->unk_14)); + Window_PutToTilemap(¶m0->unk_14); v0 = NARC_ctor(NARC_INDEX_GRAPHIC__DENDOU_DEMO, 63); @@ -695,7 +695,7 @@ static void ov86_0223B74C(UnkStruct_ov86_0223B3C8 *param0) sub_0200710C(v0, 0, param0->unk_10, 3, 0, 0, 1, 63); sub_02007130(v0, 4, 0, 0, 0x60, 63); sub_0200710C(v0, 2, param0->unk_10, 2, 0, 0, 1, 63); - sub_02019448(param0->unk_10, 1); + Bg_CopyTilemapBufferToVRAM(param0->unk_10, 1); G2_SetWnd0Position(0, 0, 0, 0); G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_ALL ^ GX_WND_PLANEMASK_BG2, 1); @@ -709,10 +709,10 @@ static void ov86_0223B8C4(UnkStruct_ov86_0223B3C8 *param0) { GX_SetVisibleWnd(GX_WNDMASK_NONE); - BGL_DeleteWindow(&(param0->unk_14)); - sub_02019044(param0->unk_10, 1); - sub_02019044(param0->unk_10, 2); - sub_02019044(param0->unk_10, 3); + Window_Remove(&(param0->unk_14)); + Bg_FreeTilemapBuffer(param0->unk_10, 1); + Bg_FreeTilemapBuffer(param0->unk_10, 2); + Bg_FreeTilemapBuffer(param0->unk_10, 3); Heap_FreeToHeap(param0->unk_10); } @@ -1333,7 +1333,7 @@ static void ov86_0223C58C(SysTask *param0, void *param1) case 0: MessageLoader_GetStrbuf(v0->unk_20, 0, v0->unk_1C); ov86_0223C47C(v0, 16); - sub_0201ACCC(v0->unk_10); + Window_LoadTiles(v0->unk_10); v0->unk_30 = 20; v0->unk_34++; break; @@ -1342,7 +1342,7 @@ static void ov86_0223C58C(SysTask *param0, void *param1) ov86_0223C47C(v0, 48); ov86_0223C4DC(v0); ov86_0223C47C(v0, 64); - sub_0201ACCC(v0->unk_10); + Window_LoadTiles(v0->unk_10); v0->unk_30 = 20; v0->unk_34++; break; @@ -1353,7 +1353,7 @@ static void ov86_0223C58C(SysTask *param0, void *param1) ov86_0223C47C(v0, 96); ov86_0223C54C(v0); ov86_0223C47C(v0, 112); - sub_0201ACCC(v0->unk_10); + Window_LoadTiles(v0->unk_10); v0->unk_34++; break; case 3: @@ -1390,19 +1390,19 @@ static void ov86_0223C6B4(SysTask *param0, void *param1) case 0: { int v1 = ov86_0223D284(&v0->unk_14) >> FX32_SHIFT; - sub_02019184(v0->unk_0C, v0->unk_2C, 3, v1); + Bg_SetOffset(v0->unk_0C, v0->unk_2C, 3, v1); if (ov86_0223D2A4(&v0->unk_14)) { v0->unk_28++; } } break; case 1: - BGL_FillWindow(v0->unk_10, 0); - sub_0201ACCC(v0->unk_10); + Window_FillTilemap(v0->unk_10, 0); + Window_LoadTiles(v0->unk_10); v0->unk_28++; break; case 2: - sub_02019184(v0->unk_0C, v0->unk_2C, 3, 0); + Bg_SetOffset(v0->unk_0C, v0->unk_2C, 3, 0); ov86_0223BDCC(&v0->unk_00); SysTask_Done(param0); break; @@ -1427,7 +1427,7 @@ static void ov86_0223C72C(UnkStruct_ov86_0223B3C8 *param0) v0 = (256 - Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_1C48, 0)) / 2; Text_AddPrinterWithParamsAndColor(¶m0->unk_14, FONT_SYSTEM, param0->unk_1C48, v0, 172, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201ACCC(¶m0->unk_14); + Window_LoadTiles(¶m0->unk_14); } static void ov86_0223C840(UnkStruct_ov86_0223B3C8 *param0, int param1) diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index 37796b1f8d..d9e4088720 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -90,7 +90,7 @@ UnkStruct_ov87_021D106C *ov87_021D106C(UnkStruct_ov87_021D0D80 *param0, const Un if (v0) { v0->unk_00 = param0; v0->unk_04 = param1; - v0->unk_10 = sub_02018340(61); + v0->unk_10 = BgConfig_New(61); NNS_G2dInitOamManagerModule(); sub_0200A784(0, 128, 0, 32, 0, 128, 0, 32, 61); @@ -300,14 +300,14 @@ static void ov87_021D139C(UnkStruct_ov87_021D106C *param0) GXLayers_SetBanks(&v0); GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); - sub_02018368(&v1); - sub_020183C4(param0->unk_10, 1, &v2, 0); - sub_020183C4(param0->unk_10, 2, &v3, 0); + SetAllGraphicsModes(&v1); + Bg_InitFromTemplate(param0->unk_10, 1, &v2, 0); + Bg_InitFromTemplate(param0->unk_10, 2, &v3, 0); sub_02006E3C(101, 1, param0->unk_10, 2, 0, 0, 1, 61); sub_02006E60(101, 0, param0->unk_10, 2, 0, 0, 1, 61); sub_02006E84(101, 2, 0, 0, 0x40, 61); - sub_020196C0(param0->unk_10, 1, 0x0, 1, 0); - sub_02019CB8(param0->unk_10, 1, 0x0, 0, 0, 32, 32, 0); + Bg_FillTilesRange(param0->unk_10, 1, 0x0, 1, 0); + Bg_FillTilemapRect(param0->unk_10, 1, 0x0, 0, 0, 32, 32, 0); v4 = ov87_021D14D4(param0, 1); @@ -315,7 +315,7 @@ static void ov87_021D139C(UnkStruct_ov87_021D106C *param0) sub_0200DAA4(param0->unk_10, 1, v4, 2, 0, 61); Window_Show(&(param0->unk_14[0]), 0, v4, 2); Window_Show(&(param0->unk_14[1]), 0, v4, 2); - sub_02019448(param0->unk_10, 1); + Bg_CopyTilemapBufferToVRAM(param0->unk_10, 1); G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG1, 8, 8); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -323,23 +323,23 @@ static void ov87_021D139C(UnkStruct_ov87_021D106C *param0) static void ov87_021D14B8(UnkStruct_ov87_021D106C *param0) { - sub_02019044(param0->unk_10, 1); - sub_02019044(param0->unk_10, 2); + Bg_FreeTilemapBuffer(param0->unk_10, 1); + Bg_FreeTilemapBuffer(param0->unk_10, 2); ov87_021D1540(param0); } static u32 ov87_021D14D4(UnkStruct_ov87_021D106C *param0, u32 param1) { - BGL_AddWindow(param0->unk_10, &(param0->unk_14[0]), 1, 1, 1, 30, 2, 0, param1); + Window_Add(param0->unk_10, &(param0->unk_14[0]), 1, 1, 1, 30, 2, 0, param1); param1 += (30 * 2); - BGL_AddWindow(param0->unk_10, &(param0->unk_14[1]), 1, 1, 19, 30, 4, 0, param1); + Window_Add(param0->unk_10, &(param0->unk_14[1]), 1, 1, 19, 30, 4, 0, param1); param1 += (30 * 4); - sub_0201A9F4(&(param0->unk_14[0])); - sub_0201A9F4(&(param0->unk_14[1])); + Window_PutToTilemap(&(param0->unk_14[0])); + Window_PutToTilemap(&(param0->unk_14[1])); return param1; } @@ -349,7 +349,7 @@ static void ov87_021D1540(UnkStruct_ov87_021D106C *param0) int v0; for (v0 = 0; v0 < 2; v0++) { - BGL_DeleteWindow(&(param0->unk_14[v0])); + Window_Remove(&(param0->unk_14[v0])); } } @@ -361,10 +361,10 @@ static void ov87_021D1558(UnkStruct_ov87_021D106C *param0) static void ov87_021D1568(UnkStruct_ov87_021D106C *param0) { - BGL_FillWindow(&(param0->unk_14[0]), 15); - BGL_FillWindow(&(param0->unk_14[1]), 15); - sub_0201ACCC(&(param0->unk_14[0])); - sub_0201ACCC(&(param0->unk_14[1])); + Window_FillTilemap(&(param0->unk_14[0]), 15); + Window_FillTilemap(&(param0->unk_14[1]), 15); + Window_LoadTiles(&(param0->unk_14[0])); + Window_LoadTiles(&(param0->unk_14[1])); } static void ov87_021D1590(UnkStruct_ov87_021D106C *param0) @@ -378,9 +378,9 @@ static void ov87_021D1590(UnkStruct_ov87_021D106C *param0) StringTemplate_SetNumber(param0->unk_1F0, 3, v0->unk_04.day, 2, 0, 1); MessageLoader_GetStrbuf(param0->unk_1E4, 0, param0->unk_1F4); StringTemplate_Format(param0->unk_1F0, param0->unk_1F8, param0->unk_1F4); - BGL_FillWindow(v1, 15); + Window_FillTilemap(v1, 15); Text_AddPrinterWithParams(v1, FONT_SYSTEM, param0->unk_1F8, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201ACCC(v1); + Window_LoadTiles(v1); } static void ov87_021D1640(UnkStruct_ov87_021D106C *param0) @@ -389,7 +389,7 @@ static void ov87_021D1640(UnkStruct_ov87_021D106C *param0) const UnkStruct_ov87_021D1640 *v1 = &(v0->unk_20[v0->unk_18]); Window *v2 = &(param0->unk_14[1]); - BGL_FillWindow(v2, 15); + Window_FillTilemap(v2, 15); switch (v0->unk_1C) { case UnkEnum_ov87_021D12C0_0: @@ -434,7 +434,7 @@ static void ov87_021D1640(UnkStruct_ov87_021D106C *param0) } break; } - sub_0201ACCC(v2); + Window_LoadTiles(v2); } static void ov87_021D1818(UnkStruct_ov87_021D106C *param0) diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index d883bea8dc..f2b742f564 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -296,7 +296,7 @@ int ov88_0223B140(OverlayManager *param0, int *param1) MI_CpuClearFast(v0, sizeof(UnkStruct_02095E80)); - v0->unk_174 = sub_02018340(26); + v0->unk_174 = BgConfig_New(26); v0->unk_178 = StringTemplate_New(12, (10 + 1) * 2, 26); v0->unk_17C = StringTemplate_Default(26); v0->unk_180 = StringTemplate_Default(26); @@ -320,7 +320,7 @@ int ov88_0223B140(OverlayManager *param0, int *param1) sub_02095E60(v0->fieldSystem, v0); ov88_0223ECBC(&v0->unk_49C[23], 20, FONT_MESSAGE, v0->unk_184, v0->unk_178); sub_02095CD4(v0->fieldSystem); - sub_02019120(0, 1); + Bg_ToggleLayer(0, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); sub_02038A1C(26, v0->unk_174); sub_02039734(); @@ -383,15 +383,15 @@ static void ov88_0223B3C0(UnkStruct_02095E80 *param0) ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178); - sub_02019120(4, 1); - sub_02019120(5, 1); - sub_02019120(6, 1); + Bg_ToggleLayer(4, 1); + Bg_ToggleLayer(5, 1); + Bg_ToggleLayer(6, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); - sub_02019120(0, 1); - sub_02019120(1, 1); - sub_02019120(2, 1); - sub_02019120(3, 1); + Bg_ToggleLayer(0, 1); + Bg_ToggleLayer(1, 1); + Bg_ToggleLayer(2, 1); + Bg_ToggleLayer(3, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); ov88_0223C63C(); @@ -710,9 +710,9 @@ static int ov88_0223B914(UnkStruct_02095E80 *param0) break; case 16: sub_0200AAE0(8, 0, -16, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ, 1); - sub_02019120(1, 1); - sub_02019120(2, 1); - sub_02019120(3, 1); + Bg_ToggleLayer(1, 1); + Bg_ToggleLayer(2, 1); + Bg_ToggleLayer(3, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); param0->unk_4C++; @@ -728,9 +728,9 @@ static int ov88_0223B914(UnkStruct_02095E80 *param0) break; case 18: sub_0200AAE0(8, 0, -16, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_OBJ, 2); - sub_02019120(4, 1); - sub_02019120(5, 1); - sub_02019120(6, 1); + Bg_ToggleLayer(4, 1); + Bg_ToggleLayer(5, 1); + Bg_ToggleLayer(6, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); param0->unk_4C++; @@ -739,7 +739,7 @@ static int ov88_0223B914(UnkStruct_02095E80 *param0) case 19: if (sub_0200AC1C(2)) { sub_0200E084(¶m0->unk_49C[23], 0); - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178); ResetUnlock(2); @@ -904,7 +904,7 @@ static void ov88_0223C0E0(void *param0) { UnkStruct_02095E80 *v0 = (UnkStruct_02095E80 *)param0; - sub_0201C2B8(v0->unk_174); + Bg_RunScheduledUpdates(v0->unk_174); if (v0->unk_2168) { int v1 = v0->unk_2168 - 1; @@ -949,7 +949,7 @@ static void ov88_0223C17C(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -969,8 +969,8 @@ static void ov88_0223C17C(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { @@ -990,8 +990,8 @@ static void ov88_0223C17C(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilemap(param0, 1); } { @@ -1011,8 +1011,8 @@ static void ov88_0223C17C(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilemap(param0, 2); } { @@ -1032,7 +1032,7 @@ static void ov88_0223C17C(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v4, 0); + Bg_InitFromTemplate(param0, 3, &v4, 0); } { @@ -1052,8 +1052,8 @@ static void ov88_0223C17C(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v5, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v5, 0); + Bg_ClearTilemap(param0, 4); } { @@ -1073,7 +1073,7 @@ static void ov88_0223C17C(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v6, 0); + Bg_InitFromTemplate(param0, 5, &v6, 0); } { @@ -1093,31 +1093,31 @@ static void ov88_0223C17C(BgConfig *param0) 0 }; - sub_020183C4(param0, 6, &v7, 0); + Bg_InitFromTemplate(param0, 6, &v7, 0); } - sub_02019690(0, 32, 0, 26); - sub_02019690(1, 32, 0, 26); - sub_02019690(4, 32, 0, 26); + Bg_ClearTilesRange(0, 32, 0, 26); + Bg_ClearTilesRange(1, 32, 0, 26); + Bg_ClearTilesRange(4, 32, 0, 26); { int v8; for (v8 = 0; v8 < 4; v8++) { - sub_02019184(param0, 0 + v8, 0, 0); - sub_02019184(param0, 0 + v8, 3, 0); - sub_02019184(param0, 4 + v8, 0, 0); - sub_02019184(param0, 4 + v8, 3, 0); + Bg_SetOffset(param0, 0 + v8, 0, 0); + Bg_SetOffset(param0, 0 + v8, 3, 0); + Bg_SetOffset(param0, 4 + v8, 0, 0); + Bg_SetOffset(param0, 4 + v8, 3, 0); } } - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); GX_SetVisibleWnd(GX_WNDMASK_NONE); } @@ -1163,14 +1163,14 @@ static void ov88_0223C370(UnkStruct_02095E80 *param0, OverlayManager *param1) static void ov88_0223C44C(BgConfig *param0) { - sub_02019044(param0, 6); - sub_02019044(param0, 5); - sub_02019044(param0, 4); + Bg_FreeTilemapBuffer(param0, 6); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); } static void ov88_0223C488(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) @@ -1185,8 +1185,8 @@ static void ov88_0223C488(NARC *param0, u32 param1, BgConfig *param2, u32 param3 param5 = v1->szByte; } - if (sub_02019FE4(param2, param3) != NULL) { - sub_02019574(param2, param3, v1->rawData, param5); + if (Bg_GetTilemapBuffer(param2, param3) != NULL) { + Bg_LoadTilemapBuffer(param2, param3, v1->rawData, param5); } } @@ -1197,7 +1197,7 @@ static void ov88_0223C488(NARC *param0, u32 param1, BgConfig *param2, u32 param3 static void ov88_0223C4E0(BgConfig *param0, int param1, int param2) { int v0; - sub_02019460(param0, 2, sub_02019FE4(param0, 2), 32 * 24 * 2, 0); + Bg_CopyTilemapBufferRangeToVRAM(param0, 2, Bg_GetTilemapBuffer(param0, 2), 32 * 24 * 2, 0); } static void ov88_0223C504(UnkStruct_02095E80 *param0, NARC *param1) @@ -1206,8 +1206,8 @@ static void ov88_0223C504(UnkStruct_02095E80 *param0, NARC *param1) sub_02007130(param1, 0, 4, 0, 16 * 9 * 2, 26); sub_02007130(param1, 0, 0, 0, 16 * 9 * 2, 26); - sub_0201975C(0, 0); - sub_0201975C(4, 0); + Bg_MaskPalette(0, 0); + Bg_MaskPalette(4, 0); Font_LoadScreenIndicatorsPalette(0, 13 * 32, 26); sub_020070E8(param1, 1, v0, 2, 0, 16 * 18 * 0x20, 1, 26); @@ -1221,7 +1221,7 @@ static void ov88_0223C504(UnkStruct_02095E80 *param0, NARC *param1) sub_0200710C(param1, 6, v0, 6, 0, 32 * 24 * 2, 1, 26); Font_LoadScreenIndicatorsPalette(4, 2 * 32, 26); Font_LoadTextPalette(4, 3 * 32, 26); - sub_02019EBC(v0, 4); + Bg_ClearTilemap(v0, 4); } static void ov88_0223C63C(void) @@ -1291,7 +1291,7 @@ static void ov88_0223C860(Window *param0, Party *param1, int param2, int param3, v0 = Strbuf_Init(20, 26); Pokemon_GetValue(Party_GetPokemonBySlotIndex(param1, param2), MON_DATA_NICKNAME_STRBUF, v0); - BGL_FillWindow(param0, 0); + Window_FillTilemap(param0, 0); ov88_0223EC78(param0, v0, param3, TEXT_SPEED_INSTANT, param4, 1); Strbuf_Free(v0); } @@ -1357,7 +1357,7 @@ static void ov88_0223C8D8(Window *param0, int param1, Party *param2, int param3, if (!param4->unk_6F4[param1 * 6 + param3].unk_05) { v0 = Strbuf_Init(10, 26); - BGL_FillWindow(¶m0[28 + param1], 0); + Window_FillTilemap(¶m0[28 + param1], 0); MessageLoader_GetStrbuf(param4->unk_184, 41, v0); ov88_0223EC78(¶m0[28 + param1], v0, 9, TEXT_SPEED_NO_TRANSFER, 6, 0); @@ -1366,13 +1366,13 @@ static void ov88_0223C8D8(Window *param0, int param1, Party *param2, int param3, ov88_0223EC78(¶m0[28 + param1], v0, 9, TEXT_SPEED_INSTANT, 24 + 6, 0); Strbuf_Free(v0); } else { - sub_0201ACF4(¶m0[28 + param1]); + Window_ClearAndCopyToVRAM(¶m0[28 + param1]); } ov88_0223EC78(¶m0[30 + param1], param4->unk_190, 7, TEXT_SPEED_INSTANT, 3, 0); v2 = Pokemon_GetValue(Party_GetPokemonBySlotIndex(param2, param3), MON_DATA_HELD_ITEM, NULL); - BGL_FillWindow(¶m0[32 + param1], 0); + Window_FillTilemap(¶m0[32 + param1], 0); v1 = Strbuf_Init(20, 26); Item_LoadName(v1, v2, 26); @@ -1385,10 +1385,10 @@ static void ov88_0223CB34(Window *param0, int param1, UnkStruct_02095E80 *param2 CellActor_SetDrawFlag(param2->unk_464[param1], 0); CellActor_SetDrawFlag(param2->unk_464[2 + param1], 0); CellActor_SetDrawFlag(param2->unk_464[4 + param1], 0); - sub_0201ACF4(¶m0[26 + param1]); - sub_0201ACF4(¶m0[28 + param1]); - sub_0201ACF4(¶m0[30 + param1]); - sub_0201ACF4(¶m0[32 + param1]); + Window_ClearAndCopyToVRAM(¶m0[26 + param1]); + Window_ClearAndCopyToVRAM(¶m0[28 + param1]); + Window_ClearAndCopyToVRAM(¶m0[30 + param1]); + Window_ClearAndCopyToVRAM(¶m0[32 + param1]); } static void ov88_0223CBA0(UnkStruct_02095E80 *param0) @@ -1760,7 +1760,7 @@ static void ov88_0223D1EC(UnkStruct_02095E80 *param0, int param1) static int ov88_0223D2C4(UnkStruct_02095E80 *param0) { - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 25, FONT_MESSAGE, param0->unk_184, param0->unk_178); param0->unk_226C = ov88_0223D318; @@ -1772,14 +1772,14 @@ static int ov88_0223D318(UnkStruct_02095E80 *param0) { switch (ov88_0223ED2C(param0->unk_174, ¶m0->unk_6BC, ¶m0->unk_6C8)) { case 0: - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 28, FONT_MESSAGE, param0->unk_184, param0->unk_178); ov88_0223D058(param0, 24, 1); param0->unk_226C = ov88_0223DA00; param0->unk_5C = 0; break; case 0xfffffffe: - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178); param0->unk_226C = ov88_0223D150; break; @@ -1792,7 +1792,7 @@ static int ov88_0223D318(UnkStruct_02095E80 *param0) static int ov88_0223D3E0(UnkStruct_02095E80 *param0) { - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], param0->unk_68, FONT_MESSAGE, param0->unk_184, param0->unk_178); param0->unk_226C = ov88_0223D434; @@ -1802,7 +1802,7 @@ static int ov88_0223D3E0(UnkStruct_02095E80 *param0) static int ov88_0223D434(UnkStruct_02095E80 *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_A) { - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178); param0->unk_226C = ov88_0223D150; ov88_0223DFF4(param0); @@ -1895,7 +1895,7 @@ static int ov88_0223D5B8(UnkStruct_02095E80 *param0) } Window_Clear(¶m0->unk_36DC, 0); - BGL_DeleteWindow(¶m0->unk_36DC); + Window_Remove(¶m0->unk_36DC); sub_02001384(param0->unk_36D8, NULL, NULL); sub_02013A3C(param0->unk_36D4); @@ -2088,7 +2088,7 @@ static int ov88_0223DA3C(UnkStruct_02095E80 *param0) v0.unk_0B_6 = 0; StringTemplate_SetNickname(param0->unk_17C, 0, Pokemon_GetBoxPokemon(Party_GetPokemonBySlotIndex(param0->unk_2270, param0->unk_88[0]))); - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[22], 16, FONT_MESSAGE, param0->unk_184, param0->unk_17C); param0->unk_6C0 = sub_02013A04(3, 26); @@ -2112,7 +2112,7 @@ static int ov88_0223DB48(UnkStruct_02095E80 *param0) { switch (sub_02001BE0(param0->unk_6C4)) { case 0: - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178); sub_02001BC4(param0->unk_6C4, NULL); sub_02013A3C(param0->unk_6C0); @@ -2120,7 +2120,7 @@ static int ov88_0223DB48(UnkStruct_02095E80 *param0) return 3; break; case 1: - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 20, FONT_MESSAGE, param0->unk_184, param0->unk_178); sub_02001BC4(param0->unk_6C4, NULL); sub_02013A3C(param0->unk_6C0); @@ -2128,7 +2128,7 @@ static int ov88_0223DB48(UnkStruct_02095E80 *param0) break; case 2: case 0xfffffffe: - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178); sub_02001BC4(param0->unk_6C4, NULL); sub_02013A3C(param0->unk_6C0); @@ -2141,7 +2141,7 @@ static int ov88_0223DB48(UnkStruct_02095E80 *param0) static int ov88_0223DC84(UnkStruct_02095E80 *param0) { - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 20, FONT_MESSAGE, param0->unk_184, param0->unk_178); ov88_0223D058(param0, 24, 2); @@ -2184,7 +2184,7 @@ static int ov88_0223DD1C(UnkStruct_02095E80 *param0) } } - sub_0201AD10(¶m0->unk_49C[7 + v0]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_49C[7 + v0]); if (v0 != (param0->unk_88[1] - 6)) { CellActor_SetDrawFlag(param0->unk_3D4[v0 + 6], 0); @@ -2198,7 +2198,7 @@ static int ov88_0223DD1C(UnkStruct_02095E80 *param0) } } - sub_0201AD10(¶m0->unk_49C[13 + v0]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_49C[13 + v0]); } CellActor_SetDrawFlag(param0->unk_39C[0], 0); @@ -2266,8 +2266,8 @@ static void ov88_0223DFF4(UnkStruct_02095E80 *param0) int v0; VecFx32 v1; - sub_0201AD10(¶m0->unk_49C[19]); - sub_0201AD10(¶m0->unk_49C[20]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_49C[19]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_49C[20]); for (v0 = 0; v0 < 12; v0++) { if (param0->unk_6F4[v0].unk_00 != 0) { @@ -2284,7 +2284,7 @@ static void ov88_0223DFF4(UnkStruct_02095E80 *param0) CellActor_SetDrawFlag(param0->unk_434[v0], 1); } - sub_0201A9A4(¶m0->unk_49C[7 + v0]); + Window_ScheduleCopyToVRAM(¶m0->unk_49C[7 + v0]); } } @@ -2297,7 +2297,7 @@ static void ov88_0223DFF4(UnkStruct_02095E80 *param0) static int ov88_0223E110(UnkStruct_02095E80 *param0) { - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); StringTemplate_SetNickname(param0->unk_17C, 0, Pokemon_GetBoxPokemon(Party_GetPokemonBySlotIndex(param0->unk_2270, param0->unk_88[0]))); StringTemplate_SetNickname(param0->unk_17C, 1, Pokemon_GetBoxPokemon(Party_GetPokemonBySlotIndex(param0->unk_2274, param0->unk_88[1] - 6))); @@ -2315,7 +2315,7 @@ static void ov88_0223E1AC(UnkStruct_02095E80 *param0) static void ov88_0223E1C0(UnkStruct_02095E80 *param0, int param1, int param2) { - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[param1], param2, FONT_MESSAGE, param0->unk_184, param0->unk_178); } @@ -2353,7 +2353,7 @@ static int ov88_0223E20C(UnkStruct_02095E80 *param0) break; case 0xfffffffe: - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 20, FONT_MESSAGE, param0->unk_184, param0->unk_178); param0->unk_226C = ov88_0223E41C; ov88_0223D058(param0, 24, 4); @@ -2367,7 +2367,7 @@ static int ov88_0223E20C(UnkStruct_02095E80 *param0) static int ov88_0223E330(UnkStruct_02095E80 *param0) { - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 36, FONT_MESSAGE, param0->unk_184, param0->unk_17C); param0->unk_226C = ov88_0223E384; return 0; @@ -2382,7 +2382,7 @@ static int ov88_0223E384(UnkStruct_02095E80 *param0) param0->unk_226C = ov88_0223E41C; break; case 0xfffffffe: - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 20, FONT_MESSAGE, param0->unk_184, param0->unk_178); param0->unk_226C = ov88_0223E41C; ov88_0223D058(param0, 24, 4); @@ -2437,7 +2437,7 @@ static int ov88_0223E4BC(UnkStruct_02095E80 *param0) v0.unk_0B_6 = 0; StringTemplate_SetNickname(param0->unk_17C, 0, Pokemon_GetBoxPokemon(Party_GetPokemonBySlotIndex(param0->unk_2274, param0->unk_88[0] - 6))); - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[22], 16, FONT_MESSAGE, param0->unk_184, param0->unk_17C); param0->unk_6C0 = sub_02013A04(2, 26); @@ -2460,7 +2460,7 @@ static int ov88_0223E5B8(UnkStruct_02095E80 *param0) { switch (sub_02001BE0(param0->unk_6C4)) { case 0: - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178); param0->unk_226C = ov88_0223D150; sub_02001BC4(param0->unk_6C4, NULL); @@ -2470,7 +2470,7 @@ static int ov88_0223E5B8(UnkStruct_02095E80 *param0) case 1: case 0xfffffffe: - sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); + Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178); sub_02001BC4(param0->unk_6C4, NULL); sub_02013A3C(param0->unk_6C0); @@ -2544,8 +2544,8 @@ static void ov88_0223E7F0(Journal *param0, Pokemon *param1) static void ov88_0223E848(UnkStruct_02095E80 *param0) { param0->unk_2310 += 2; - sub_02019184(param0->unk_174, 6, 0, param0->unk_2310); - sub_02019184(param0->unk_174, 3, 0, param0->unk_2310); + Bg_SetOffset(param0->unk_174, 6, 0, param0->unk_2310); + Bg_SetOffset(param0->unk_174, 3, 0, param0->unk_2310); } static void ov88_0223E87C(CellActor *param0, int param1, int param2) diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c index 95bc61dcb5..80242916ca 100644 --- a/src/overlay088/ov88_0223E9C4.c +++ b/src/overlay088/ov88_0223E9C4.c @@ -56,38 +56,38 @@ void ov88_0223E9C4(BgConfig *param0, Window *param1, Options *param2) { int v0; - BGL_AddWindow(param0, ¶m1[0], 1, 2, 1, 10, 2, 8, 1); - BGL_FillWindow(¶m1[0], 0); + Window_Add(param0, ¶m1[0], 1, 2, 1, 10, 2, 8, 1); + Window_FillTilemap(¶m1[0], 0); - BGL_AddWindow(param0, ¶m1[1], 1, 20, 1, 10, 2, 8, (1 + (10 * 2))); - BGL_FillWindow(¶m1[1], 0); + Window_Add(param0, ¶m1[1], 1, 20, 1, 10, 2, 8, (1 + (10 * 2))); + Window_FillTilemap(¶m1[1], 0); - BGL_AddWindow(param0, ¶m1[6], 1, 26, 21, 5, 2, 8, ((1 + (10 * 2)) + (10 * 2))); - BGL_FillWindow(¶m1[6], 0); + Window_Add(param0, ¶m1[6], 1, 26, 21, 5, 2, 8, ((1 + (10 * 2)) + (10 * 2))); + Window_FillTilemap(¶m1[6], 0); sub_0200DD0C(param0, 0, (512 - (9 + (18 + 12))), 10, Options_Frame(param2), 26); sub_0200DAA4(param0, 0, (512 - 9), 11, 0, 26); - BGL_AddWindow(param0, ¶m1[21], 0, 2, 21, 20, 2, 13, 1); - BGL_FillWindow(¶m1[21], 0); - BGL_AddWindow(param0, ¶m1[22], 0, 2, 19, 14, 4, 13, (20 * 2)); - BGL_FillWindow(¶m1[22], 0); - BGL_AddWindow(param0, ¶m1[23], 0, 2, 19, 27, 4, 13, (14 * 4)); - BGL_FillWindow(¶m1[23], 0); + Window_Add(param0, ¶m1[21], 0, 2, 21, 20, 2, 13, 1); + Window_FillTilemap(¶m1[21], 0); + Window_Add(param0, ¶m1[22], 0, 2, 19, 14, 4, 13, (20 * 2)); + Window_FillTilemap(¶m1[22], 0); + Window_Add(param0, ¶m1[23], 0, 2, 19, 27, 4, 13, (14 * 4)); + Window_FillTilemap(¶m1[23], 0); - BGL_AddWindow(param0, ¶m1[24], 0, 20, 17, 11, 6, 13, ((14 * 4) + (27 * 4))); - BGL_FillWindow(¶m1[24], 0); - BGL_AddWindow(param0, ¶m1[25], 0, 20, 19, 11, 4, 13, (((14 * 4) + (27 * 4)) + (11 * 6))); - BGL_FillWindow(¶m1[25], 0); + Window_Add(param0, ¶m1[24], 0, 20, 17, 11, 6, 13, ((14 * 4) + (27 * 4))); + Window_FillTilemap(¶m1[24], 0); + Window_Add(param0, ¶m1[25], 0, 20, 19, 11, 4, 13, (((14 * 4) + (27 * 4)) + (11 * 6))); + Window_FillTilemap(¶m1[25], 0); for (v0 = 0; v0 < 14; v0++) { - BGL_AddWindow(param0, ¶m1[7 + v0], 1, Unk_ov88_0223F170[v0][0], Unk_ov88_0223F170[v0][1], 8, 2, 8, (((1 + (10 * 2)) + (10 * 2)) + (5 * 2)) + v0 * (8 * 2)); - BGL_FillWindow(¶m1[7 + v0], 0); + Window_Add(param0, ¶m1[7 + v0], 1, Unk_ov88_0223F170[v0][0], Unk_ov88_0223F170[v0][1], 8, 2, 8, (((1 + (10 * 2)) + (10 * 2)) + (5 * 2)) + v0 * (8 * 2)); + Window_FillTilemap(¶m1[7 + v0], 0); } for (v0 = 0; v0 < 8; v0++) { - BGL_AddWindow(param0, ¶m1[26 + v0], 4, Unk_ov88_0223F1A8[v0][0], Unk_ov88_0223F1A8[v0][1], Unk_ov88_0223F1A8[v0][2], Unk_ov88_0223F1A8[v0][3], 8, Unk_ov88_0223F1A8[v0][4]); - BGL_FillWindow(¶m1[26 + v0], 0); + Window_Add(param0, ¶m1[26 + v0], 4, Unk_ov88_0223F1A8[v0][0], Unk_ov88_0223F1A8[v0][1], Unk_ov88_0223F1A8[v0][2], Unk_ov88_0223F1A8[v0][3], 8, Unk_ov88_0223F1A8[v0][4]); + Window_FillTilemap(¶m1[26 + v0], 0); } } @@ -96,22 +96,22 @@ void ov88_0223EC04(Window *param0) int v0; for (v0 = 0; v0 < 14; v0++) { - BGL_DeleteWindow(¶m0[7 + v0]); + Window_Remove(¶m0[7 + v0]); } for (v0 = 0; v0 < 8; v0++) { - BGL_DeleteWindow(¶m0[26 + v0]); + Window_Remove(¶m0[26 + v0]); } - BGL_DeleteWindow(¶m0[0]); - BGL_DeleteWindow(¶m0[1]); - BGL_DeleteWindow(¶m0[6]); + Window_Remove(¶m0[0]); + Window_Remove(¶m0[1]); + Window_Remove(¶m0[6]); - BGL_DeleteWindow(¶m0[21]); - BGL_DeleteWindow(¶m0[22]); - BGL_DeleteWindow(¶m0[23]); - BGL_DeleteWindow(¶m0[24]); - BGL_DeleteWindow(¶m0[25]); + Window_Remove(¶m0[21]); + Window_Remove(¶m0[22]); + Window_Remove(¶m0[23]); + Window_Remove(¶m0[24]); + Window_Remove(¶m0[25]); } void ov88_0223EC78(Window *param0, Strbuf *param1, int param2, u32 param3, int param4, int param5) @@ -143,7 +143,7 @@ int ov88_0223ECBC(Window *param0, int param1, int param2, MessageLoader *param3, Window_Show(param0, 0, (512 - 9), 11); } - BGL_FillWindow(param0, 15); + Window_FillTilemap(param0, 15); v1 = Text_AddPrinterWithParamsAndColor(param0, param2, v0, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); Strbuf_Free(v0); @@ -213,7 +213,7 @@ BmpList *ov88_0223ED94(ResourceMetadata *param0, int param1, Window *param2, BgC UnkStruct_ov84_02240FA8 v1; int v2 = 5; - BGL_AddWindow(param3, param2, 0, 19, 1, 12, v2 * 2, 13, (512 - (9 + (18 + 12))) - (10 * (v2 + 2) * 2)); + Window_Add(param3, param2, 0, 19, 1, 12, v2 * 2, 13, (512 - (9 + (18 + 12))) - (10 * (v2 + 2) * 2)); Window_Show(param2, 0, (512 - 9), 11); v1 = Unk_ov88_0223F150; diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index be65587837..663b2ab4d5 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -315,7 +315,7 @@ static void ov90_021D1034(void *param0) ov90_021D1BA4(); NNS_GfdDoVramTransfer(); - sub_0201C2B8(v0->unk_10); + Bg_RunScheduledUpdates(v0->unk_10); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -445,7 +445,7 @@ static void ov90_021D11EC(UnkStruct_ov90_021D0ECC *param0) { int v0, v1; - param0->unk_10 = sub_02018340(param0->unk_00); + param0->unk_10 = BgConfig_New(param0->unk_00); { GraphicsModes v2 = { @@ -455,7 +455,7 @@ static void ov90_021D11EC(UnkStruct_ov90_021D0ECC *param0) GX_BG0_AS_2D }; - sub_02018368(&v2); + SetAllGraphicsModes(&v2); } { @@ -510,15 +510,15 @@ static void ov90_021D11EC(UnkStruct_ov90_021D0ECC *param0) v1 = 0; for (v0 = 0; v0 < 2 + param0->unk_08; v0++) { - sub_020183C4(param0->unk_10, v1, &(v3[v0]), 0); - sub_02019EBC(param0->unk_10, v1); + Bg_InitFromTemplate(param0->unk_10, v1, &(v3[v0]), 0); + Bg_ClearTilemap(param0->unk_10, v1); v1++; } } - sub_02019690(0, 32, 0, param0->unk_00); + Bg_ClearTilesRange(0, 32, 0, param0->unk_00); if (param0->unk_08) { - sub_02019690(2, 32, 0, param0->unk_00); + Bg_ClearTilesRange(2, 32, 0, param0->unk_00); } } @@ -529,7 +529,7 @@ static void ov90_021D1280(UnkStruct_ov90_021D0ECC *param0) v1 = 0; for (v0 = 0; v0 < 2 + param0->unk_08; v0++) { - sub_02019044(param0->unk_10, v1++); + Bg_FreeTilemapBuffer(param0->unk_10, v1++); } Heap_FreeToHeap(param0->unk_10); @@ -557,7 +557,7 @@ static void ov90_021D12B0(UnkStruct_ov90_021D0ECC *param0) sub_0208C210(param0->unk_10, param0->unk_00, v1, 123, v0, 1, 1, 0, 0); NARC_dtor(v1); - sub_0201C3C0(param0->unk_10, 1); + Bg_ScheduleTilemapTransfer(param0->unk_10, 1); } static void ov90_021D1340(UnkStruct_ov90_021D0ECC *param0) @@ -579,13 +579,13 @@ static void ov90_021D1340(UnkStruct_ov90_021D0ECC *param0) if (param0->unk_08 == 0) { for (v0 = 0; v0 < 5; v0++) { - sub_0201A8D4(param0->unk_10, &(param0->unk_6C[v0]), &(v1[v0])); - BGL_FillWindow(¶m0->unk_6C[v0], ((0 << 4) | 0)); + Window_AddFromTemplate(param0->unk_10, &(param0->unk_6C[v0]), &(v1[v0])); + Window_FillTilemap(¶m0->unk_6C[v0], ((0 << 4) | 0)); } } else { for (v0 = 0; v0 < 3; v0++) { - sub_0201A8D4(param0->unk_10, &(param0->unk_6C[v0]), &(v2[v0])); - BGL_FillWindow(¶m0->unk_6C[v0], ((0 << 4) | 0)); + Window_AddFromTemplate(param0->unk_10, &(param0->unk_6C[v0]), &(v2[v0])); + Window_FillTilemap(¶m0->unk_6C[v0], ((0 << 4) | 0)); } } @@ -603,8 +603,8 @@ static void ov90_021D13A8(UnkStruct_ov90_021D0ECC *param0) } for (v0 = 0; v0 < v1; v0++) { - sub_0201ACF4(¶m0->unk_6C[v0]); - BGL_DeleteWindow(¶m0->unk_6C[v0]); + Window_ClearAndCopyToVRAM(¶m0->unk_6C[v0]); + Window_Remove(¶m0->unk_6C[v0]); } } @@ -675,7 +675,7 @@ static void ov90_021D14C8(UnkStruct_ov90_021D0ECC *param0, Window *param1, u8 pa v3 = 21 * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_28.unk_08, 0) - 4; Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, param0->unk_28.unk_08, v3, param4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A954(param1); + Window_CopyToVRAM(param1); } static void ov90_021D15D0(UnkStruct_ov90_021D0ECC *param0) @@ -762,7 +762,7 @@ static void ov90_021D17F8(UnkStruct_ov90_021D17F8 *param0, Window *param1, Strbu int v1, v2, v3, v4, v5; u32 v6; - BGL_FillWindow(param1, ((0 << 4) | 0)); + Window_FillTilemap(param1, ((0 << 4) | 0)); if (param3 >= (10 - 2)) { v4 = 2; @@ -788,7 +788,7 @@ static void ov90_021D17F8(UnkStruct_ov90_021D17F8 *param0, Window *param1, Strbu } } - sub_0201A954(param1); + Window_CopyToVRAM(param1); } static void ov90_021D18BC(UnkStruct_ov90_021D0ECC *param0) @@ -815,7 +815,7 @@ static void ov90_021D1984(UnkStruct_ov90_021D0ECC *param0) { UnkStruct_ov90_021D17F8 *v0 = &(param0->unk_BC[param0->unk_0B * 3 + param0->unk_0C]); - BGL_FillWindow(¶m0->unk_6C[2], ((0 << 4) | 0)); + Window_FillTilemap(¶m0->unk_6C[2], ((0 << 4) | 0)); if (v0->unk_05 == 0) { Text_AddPrinterWithParamsAndColor(¶m0->unk_6C[2], FONT_SYSTEM, param0->unk_28.unk_20, 0, 4, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); @@ -830,7 +830,7 @@ static void ov90_021D1984(UnkStruct_ov90_021D0ECC *param0) Text_AddPrinterWithParamsAndColor(¶m0->unk_6C[2], FONT_SYSTEM, param0->unk_28.unk_08, 0, 4, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); } - sub_0201A954(¶m0->unk_6C[2]); + Window_CopyToVRAM(¶m0->unk_6C[2]); ov90_021D1C44(param0, 0); } @@ -841,15 +841,15 @@ static void ov90_021D1A48(UnkStruct_ov90_021D0ECC *param0) v0 = sub_02014B34(&v1->unk_08, param0->unk_00); - BGL_FillWindow(¶m0->unk_6C[2], ((0 << 4) | 0)); + Window_FillTilemap(¶m0->unk_6C[2], ((0 << 4) | 0)); Text_AddPrinterWithParamsAndColor(¶m0->unk_6C[2], FONT_SYSTEM, v0, 0, 4, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); Strbuf_Free(v0); } static void ov90_021D1A9C(UnkStruct_ov90_021D0ECC *param0) { - BGL_FillWindow(¶m0->unk_6C[2], ((0 << 4) | 0)); - sub_0201ACF4(¶m0->unk_6C[2]); + Window_FillTilemap(¶m0->unk_6C[2], ((0 << 4) | 0)); + Window_ClearAndCopyToVRAM(¶m0->unk_6C[2]); ov90_021D1C44(param0, 1); } diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 7fc8a6a38b..49d08f978d 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -371,7 +371,7 @@ int ov91_021D0D80(OverlayManager *param0, int *param1) v0->unk_180 = 1; - sub_0201A9A4(&v0->unk_08[12]); + Window_ScheduleCopyToVRAM(&v0->unk_08[12]); ov91_021D2594(v0); SetMainCallback(ov91_021D0F9C, v0); @@ -454,7 +454,7 @@ static void ov91_021D0ED8(UnkStruct_ov91_021D0ED8 *param0) GX_SetVisiblePlane(0); GXS_SetVisiblePlane(0); - param0->unk_04 = sub_02018340(67); + param0->unk_04 = BgConfig_New(67); sub_0208C120(0, 67); @@ -489,7 +489,7 @@ static void ov91_021D0F9C(void *param0) { UnkStruct_ov91_021D0ED8 *v0 = param0; - sub_0201C2B8(v0->unk_04); + Bg_RunScheduledUpdates(v0->unk_04); sub_0201DCAC(); sub_0200C800(); @@ -524,7 +524,7 @@ static void ov91_021D0FE4(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -544,8 +544,8 @@ static void ov91_021D0FE4(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { @@ -565,8 +565,8 @@ static void ov91_021D0FE4(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilemap(param0, 1); } { @@ -586,19 +586,19 @@ static void ov91_021D0FE4(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilemap(param0, 2); } - sub_02019690(0, 32, 0, 67); + Bg_ClearTilesRange(0, 32, 0, 67); } static void ov91_021D1098(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); Heap_FreeToHeapExplicit(67, param0); } @@ -617,13 +617,13 @@ static void ov91_021D1154(UnkStruct_ov91_021D0ED8 *param0) u32 v0; for (v0 = 0; v0 < 15; v0++) { - sub_0201A8D4(param0->unk_04, ¶m0->unk_08[v0], &Unk_ov91_021D2884[v0]); - BGL_FillWindow(¶m0->unk_08[v0], 0); + Window_AddFromTemplate(param0->unk_04, ¶m0->unk_08[v0], &Unk_ov91_021D2884[v0]); + Window_FillTilemap(¶m0->unk_08[v0], 0); } ov91_021D1664(param0); - BGL_FillWindow(¶m0->unk_08[12], 15); + Window_FillTilemap(¶m0->unk_08[12], 15); sub_0200E060(¶m0->unk_08[12], 0, (1 + 9), 13); } @@ -632,7 +632,7 @@ static void ov91_021D11A0(UnkStruct_ov91_021D0ED8 *param0) u32 v0; for (v0 = 0; v0 < 15; v0++) { - BGL_DeleteWindow(¶m0->unk_08[v0]); + Window_Remove(¶m0->unk_08[v0]); } } @@ -795,11 +795,11 @@ static void ov91_021D1498(UnkStruct_ov91_021D0ED8 *param0) v0 = ov91_021D1DD0(param0); if (param0->unk_00->unk_14 == 0) { - sub_0201C63C(param0->unk_04, 2, 0, 0); - sub_0201AD10(¶m0->unk_08[1]); - sub_0201AD10(¶m0->unk_08[6]); - sub_0201AD10(¶m0->unk_08[11]); - sub_0201A9A4(¶m0->unk_08[0]); + Bg_ScheduleScroll(param0->unk_04, 2, 0, 0); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[1]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[6]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[11]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[0]); if (v0 != 0xffff) { ov91_021D18C8(param0, v0); @@ -807,17 +807,17 @@ static void ov91_021D1498(UnkStruct_ov91_021D0ED8 *param0) ov91_021D18C8(param0, 0xfffffffe); } } else { - sub_0201C63C(param0->unk_04, 2, 0, 256); - sub_0201AD10(¶m0->unk_08[0]); - sub_0201AD10(¶m0->unk_08[2]); - sub_0201AD10(¶m0->unk_08[3]); - sub_0201AD10(¶m0->unk_08[4]); - sub_0201AD10(¶m0->unk_08[5]); - sub_0201AD10(¶m0->unk_08[10]); - sub_0201AD10(¶m0->unk_08[7]); - sub_0201AD10(¶m0->unk_08[8]); - sub_0201AD10(¶m0->unk_08[9]); - sub_0201A9A4(¶m0->unk_08[1]); + Bg_ScheduleScroll(param0->unk_04, 2, 0, 256); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[0]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[2]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[3]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[4]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[10]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[7]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[8]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[9]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[1]); if (v0 != 0xffff) { ov91_021D1A68(param0, v0); @@ -843,12 +843,12 @@ static void ov91_021D1580(UnkStruct_ov91_021D0ED8 *param0, u32 param1, u32 param break; case 1: v0 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_100, 0); - v1 = sub_0201C294(¶m0->unk_08[param1]) * 8; + v1 = Window_GetWidth(¶m0->unk_08[param1]) * 8; v2 = v1 - v0; break; case 2: v0 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_100, 0); - v1 = sub_0201C294(¶m0->unk_08[param1]) * 8; + v1 = Window_GetWidth(¶m0->unk_08[param1]) * 8; v2 = (v1 - v0) / 2; break; } @@ -938,7 +938,7 @@ static void ov91_021D1784(UnkStruct_ov91_021D0ED8 *param0) param0->unk_104 = sub_0200112C(&v1, param0->unk_00->unk_12, param0->unk_00->unk_10, 67); - sub_0201A9A4(¶m0->unk_08[13]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[13]); } static void ov91_021D1868(UnkStruct_ov91_021D0ED8 *param0) @@ -969,10 +969,10 @@ static void ov91_021D18C4(BmpList *param0, u32 param1, u8 param2) static void ov91_021D18C8(UnkStruct_ov91_021D0ED8 *param0, u32 param1) { - BGL_FillWindow(¶m0->unk_08[10], 0); - BGL_FillWindow(¶m0->unk_08[7], 0); - BGL_FillWindow(¶m0->unk_08[8], 0); - BGL_FillWindow(¶m0->unk_08[9], 0); + Window_FillTilemap(¶m0->unk_08[10], 0); + Window_FillTilemap(¶m0->unk_08[7], 0); + Window_FillTilemap(¶m0->unk_08[8], 0); + Window_FillTilemap(¶m0->unk_08[9], 0); SpriteActor_EnableObject(param0->unk_118[5], 0); if (param1 != 0xfffffffe) { @@ -1009,26 +1009,26 @@ static void ov91_021D18C8(UnkStruct_ov91_021D0ED8 *param0, u32 param1) MessageLoader_Free(v0); ov91_021D24B4(param0, param1); SpriteActor_EnableObject(param0->unk_118[5], 1); - sub_0201A9A4(¶m0->unk_08[2]); - sub_0201A9A4(¶m0->unk_08[3]); - sub_0201A9A4(¶m0->unk_08[4]); - sub_0201A9A4(¶m0->unk_08[5]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[2]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[3]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[4]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[5]); } else { - sub_0201AD10(¶m0->unk_08[2]); - sub_0201AD10(¶m0->unk_08[3]); - sub_0201AD10(¶m0->unk_08[4]); - sub_0201AD10(¶m0->unk_08[5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[2]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[3]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[4]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[5]); } - sub_0201A9A4(¶m0->unk_08[10]); - sub_0201A9A4(¶m0->unk_08[7]); - sub_0201A9A4(¶m0->unk_08[8]); - sub_0201A9A4(¶m0->unk_08[9]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[10]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[7]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[8]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[9]); } static void ov91_021D1A68(UnkStruct_ov91_021D0ED8 *param0, u32 param1) { - BGL_FillWindow(¶m0->unk_08[11], 0); + Window_FillTilemap(¶m0->unk_08[11], 0); if (param1 != 0xfffffffe) { MessageLoader *v0; @@ -1043,21 +1043,21 @@ static void ov91_021D1A68(UnkStruct_ov91_021D0ED8 *param0, u32 param1) Text_AddPrinterWithParamsAndColor(¶m0->unk_08[11], FONT_SYSTEM, param0->unk_100, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); MessageLoader_Free(v0); ov91_021D1BBC(param0, (u16)param1); - sub_0201A9A4(¶m0->unk_08[6]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[6]); } else { ov91_021D1BBC(param0, 0xffff); - sub_0201AD10(¶m0->unk_08[6]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_08[6]); } - sub_0201A9A4(¶m0->unk_08[11]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[11]); } static void ov91_021D1B00(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u8 param2) { - sub_02019CB8(param0->unk_04, 2, param1, 34 + param2 * 2, 5, 1, 1, 16); - sub_02019CB8(param0->unk_04, 2, param1 + 1, 34 + param2 * 2 + 1, 5, 1, 1, 16); - sub_02019CB8(param0->unk_04, 2, param1 + 32, 34 + param2 * 2, 5 + 1, 1, 1, 16); - sub_02019CB8(param0->unk_04, 2, param1 + 33, 34 + param2 * 2 + 1, 5 + 1, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_04, 2, param1, 34 + param2 * 2, 5, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_04, 2, param1 + 1, 34 + param2 * 2 + 1, 5, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_04, 2, param1 + 32, 34 + param2 * 2, 5 + 1, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_04, 2, param1 + 33, 34 + param2 * 2 + 1, 5 + 1, 1, 1, 16); } static void ov91_021D1B94(UnkStruct_ov91_021D0ED8 *param0) @@ -1068,7 +1068,7 @@ static void ov91_021D1B94(UnkStruct_ov91_021D0ED8 *param0) ov91_021D1B00(param0, 0x12, v0); } - sub_0201C3C0(param0->unk_04, 2); + Bg_ScheduleTilemapTransfer(param0->unk_04, 2); } static void ov91_021D1BBC(UnkStruct_ov91_021D0ED8 *param0, u16 param1) @@ -1088,7 +1088,7 @@ static void ov91_021D1BBC(UnkStruct_ov91_021D0ED8 *param0, u16 param1) } } - sub_0201C3C0(param0->unk_04, 2); + Bg_ScheduleTilemapTransfer(param0->unk_04, 2); } static void ov91_021D1C10(UnkStruct_ov91_021D0ED8 *param0, u32 param1) @@ -1153,7 +1153,7 @@ static u16 ov91_021D1DE0(UnkStruct_ov91_021D0ED8 *param0) static void ov91_021D1DF8(UnkStruct_ov91_021D0ED8 *param0, u32 param1) { - BGL_FillWindow(¶m0->unk_08[12], 15); + Window_FillTilemap(¶m0->unk_08[12], 15); ov91_021D1C10(param0, param1); RenderControlFlags_SetCanABSpeedUpPrint(1); RenderControlFlags_SetAutoScrollFlags(0); @@ -1206,12 +1206,12 @@ static int ov91_021D1EC8(UnkStruct_ov91_021D0ED8 *param0) static int ov91_021D1EE8(UnkStruct_ov91_021D0ED8 *param0) { - BGL_FillWindow(¶m0->unk_08[12], 15); + Window_FillTilemap(¶m0->unk_08[12], 15); ov91_021D1C10(param0, 0); ov91_021D1580(param0, 12, FONT_MESSAGE, TEXT_COLOR(1, 2, 15), 0); - sub_0201A9A4(¶m0->unk_08[12]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[12]); ov91_021D2548(param0, param0->unk_00->unk_10, 0); ov91_021D2574(param0, 1); @@ -1227,12 +1227,12 @@ static int ov91_021D1F38(UnkStruct_ov91_021D0ED8 *param0) static int ov91_021D1F44(UnkStruct_ov91_021D0ED8 *param0) { - BGL_FillWindow(¶m0->unk_08[12], 15); + Window_FillTilemap(¶m0->unk_08[12], 15); ov91_021D1C10(param0, 0); ov91_021D1580(param0, 12, FONT_MESSAGE, TEXT_COLOR(1, 2, 15), 0); - sub_0201A9A4(¶m0->unk_08[12]); + Window_ScheduleCopyToVRAM(¶m0->unk_08[12]); ov91_021D2548(param0, param0->unk_00->unk_10, 0); ov91_021D2574(param0, 1); diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 947101da7f..9aa5187b7a 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -343,7 +343,7 @@ int ov92_021D0D80(OverlayManager *param0, int *param1) ov92_021D1510(); Easy3D_Init(v0->unk_00); - v0->unk_B810 = sub_02018340(v0->unk_00); + v0->unk_B810 = BgConfig_New(v0->unk_00); GXLayers_TurnBothDispOn(); Text_ResetAllPrinters(); @@ -574,7 +574,7 @@ int ov92_021D0EB8(OverlayManager *param0, int *param1) ov92_021D22B0(v0); ov92_021D2334(v0); - BGL_WindowColor(&v0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); + Window_FillRectWithColor(&v0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); Window_Show(&v0->unk_B834, 0, ((512 - (18 + 12)) - 9), 7); if (v0->unk_BB14 != 0) { @@ -594,7 +594,7 @@ int ov92_021D0EB8(OverlayManager *param0, int *param1) if ((gCoreSys.pressedKeys & PAD_BUTTON_B) || (v0->unk_BAF8 & PAD_BUTTON_B)) { Window_Clear(&v0->unk_B834, 0); Sound_PlayEffect(1501); - BGL_WindowColor(&v0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); + Window_FillRectWithColor(&v0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); if (v0->unk_BB14 == 0) { v0->unk_BAE8 = 2; @@ -721,7 +721,7 @@ static void ov92_021D1510(void) GX_BG0_AS_3D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } static void ov92_021D1530(UnkStruct_ov92_021D1B24 *param0) @@ -917,33 +917,33 @@ static void ov92_021D1818(int param0, int param1, int *param2, int *param3, int static void ov92_021D1888(UnkStruct_ov92_021D1B24 *param0, NARC *param1) { - sub_020183C4(param0->unk_B810, 6, &Unk_ov92_021D2970, 0); - sub_02019EBC(param0->unk_B810, 6); - sub_020183C4(param0->unk_B810, 7, &Unk_ov92_021D298C, 0); + Bg_InitFromTemplate(param0->unk_B810, 6, &Unk_ov92_021D2970, 0); + Bg_ClearTilemap(param0->unk_B810, 6); + Bg_InitFromTemplate(param0->unk_B810, 7, &Unk_ov92_021D298C, 0); sub_020070E8(param1, 5, param0->unk_B810, 7, 0, 0, 0, param0->unk_00); sub_02007130(param1, 6, 4, 0 * (2 * 16), (2 * 16) * 4, param0->unk_00); sub_0200710C(param1, 7, param0->unk_B810, 7, 0, 0, 0, param0->unk_00); sub_0200DD0C(param0->unk_B810, 6, (512 - (18 + 12)), 6, Options_Frame(param0->unk_08), param0->unk_00); sub_0200DAA4(param0->unk_B810, 6, ((512 - (18 + 12)) - 9), 7, 0, param0->unk_00); Font_LoadTextPalette(4, 4 * (2 * 16), param0->unk_00); - sub_02019690(6, 32, 0, param0->unk_00); - sub_0201975C(6, 0x4753); - sub_0201A8D4(param0->unk_B810, ¶m0->unk_B814, &Unk_ov92_021D2934); - BGL_WindowColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); + Bg_ClearTilesRange(6, 32, 0, param0->unk_00); + Bg_MaskPalette(6, 0x4753); + Window_AddFromTemplate(param0->unk_B810, ¶m0->unk_B814, &Unk_ov92_021D2934); + Window_FillRectWithColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); sub_0200E060(¶m0->unk_B814, 0, (512 - (18 + 12)), 6); param0->unk_B864 = 0; - sub_020183C4(param0->unk_B810, 2, &Unk_ov92_021D2970, 0); - sub_02019EBC(param0->unk_B810, 2); - sub_020183C4(param0->unk_B810, 3, &Unk_ov92_021D298C, 0); + Bg_InitFromTemplate(param0->unk_B810, 2, &Unk_ov92_021D2970, 0); + Bg_ClearTilemap(param0->unk_B810, 2); + Bg_InitFromTemplate(param0->unk_B810, 3, &Unk_ov92_021D298C, 0); sub_020070E8(param1, 5, param0->unk_B810, 3, 0, 0, 0, param0->unk_00); sub_02007130(param1, 6, 0, 0 * (2 * 16), (2 * 16) * 4, param0->unk_00); sub_0200710C(param1, 7, param0->unk_B810, 3, 0, 0, 0, param0->unk_00); sub_0200DAA4(param0->unk_B810, 2, ((512 - (18 + 12)) - 9), 7, 0, param0->unk_00); Font_LoadTextPalette(0, 4 * (2 * 16), param0->unk_00); - sub_02019690(2, 32, 0, param0->unk_00); - sub_0201975C(2, 0x0); + Bg_ClearTilesRange(2, 32, 0, param0->unk_00); + Bg_MaskPalette(2, 0x0); { Strbuf *v0 = Strbuf_Init(16, param0->unk_00); @@ -955,14 +955,14 @@ static void ov92_021D1888(UnkStruct_ov92_021D1B24 *param0, NARC *param1) u16 v3 = 0x208c; u16 v4 = 0x7fff; - sub_0201972C(2, &v1, 2, 4 * (2 * 16) + 1 * 2); - sub_0201972C(2, &v2, 2, 4 * (2 * 16) + 2 * 2); - sub_0201972C(2, &v3, 2, 4 * (2 * 16) + 3 * 2); - sub_0201972C(2, &v4, 2, 4 * (2 * 16) + 15 * 2); + Bg_LoadPalette(2, &v1, 2, 4 * (2 * 16) + 1 * 2); + Bg_LoadPalette(2, &v2, 2, 4 * (2 * 16) + 2 * 2); + Bg_LoadPalette(2, &v3, 2, 4 * (2 * 16) + 3 * 2); + Bg_LoadPalette(2, &v4, 2, 4 * (2 * 16) + 15 * 2); } - sub_0201A8D4(param0->unk_B810, ¶m0->unk_B834, &Unk_ov92_021D2924); - BGL_WindowColor(¶m0->unk_B834, 15, 0, 0, 27 * 8, 4 * 8); + Window_AddFromTemplate(param0->unk_B810, ¶m0->unk_B834, &Unk_ov92_021D2924); + Window_FillRectWithColor(¶m0->unk_B834, 15, 0, 0, 27 * 8, 4 * 8); MessageLoader_GetStrbuf(param0->unk_B860, 12, v0); { @@ -979,12 +979,12 @@ static void ov92_021D1888(UnkStruct_ov92_021D1B24 *param0, NARC *param1) static void ov92_021D1B24(UnkStruct_ov92_021D1B24 *param0) { - BGL_DeleteWindow(¶m0->unk_B834); - BGL_DeleteWindow(¶m0->unk_B814); - sub_02019044(param0->unk_B810, 2); - sub_02019044(param0->unk_B810, 6); - sub_02019044(param0->unk_B810, 3); - sub_02019044(param0->unk_B810, 7); + Window_Remove(¶m0->unk_B834); + Window_Remove(¶m0->unk_B814); + Bg_FreeTilemapBuffer(param0->unk_B810, 2); + Bg_FreeTilemapBuffer(param0->unk_B810, 6); + Bg_FreeTilemapBuffer(param0->unk_B810, 3); + Bg_FreeTilemapBuffer(param0->unk_B810, 7); } static BOOL ov92_021D1B70(UnkStruct_ov92_021D1B24 *param0, u32 param1, int param2) @@ -993,7 +993,7 @@ static BOOL ov92_021D1B70(UnkStruct_ov92_021D1B24 *param0, u32 param1, int param switch (param0->unk_B864) { case 0: - BGL_WindowColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); + Window_FillRectWithColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); param0->unk_B86C = Strbuf_Init(0x400, param0->unk_00); MessageLoader_GetStrbuf(param0->unk_B860, param1, param0->unk_B86C); param0->unk_B868 = Text_AddPrinterWithParams(¶m0->unk_B814, FONT_MESSAGE, param0->unk_B86C, 0, 0, Options_TextFrameDelay(param0->unk_08), NULL); @@ -1027,7 +1027,7 @@ static void ov92_021D1C4C(UnkStruct_ov92_021D1B24 *param0, Window *param1, const UnkStruct_ov84_02240FA8 v0; int v1; - sub_0201A8D4(param0->unk_B810, param1, param2); + Window_AddFromTemplate(param0->unk_B810, param1, param2); param0->unk_B858 = sub_02013A04(param3->unk_10, param0->unk_00); for (v1 = 0; v1 < param3->unk_10; v1++) { @@ -1041,7 +1041,7 @@ static void ov92_021D1C4C(UnkStruct_ov92_021D1B24 *param0, Window *param1, const param0->unk_B854 = sub_0200112C(&v0, 0, 0, param0->unk_00); Window_Show(v0.unk_0C, 1, ((512 - (18 + 12)) - 9), 7); - sub_0201A954(param1); + Window_CopyToVRAM(param1); } static void ov92_021D1CF4(UnkStruct_ov92_021D1B24 *param0, Window *param1, const WindowTemplate *param2, const UnkStruct_ov84_02240FA8 *param3, u32 param4, const u8 *param5, u32 param6) @@ -1050,7 +1050,7 @@ static void ov92_021D1CF4(UnkStruct_ov92_021D1B24 *param0, Window *param1, const MessageLoader *v1; int v2; - sub_0201A8D4(param0->unk_B810, param1, param2); + Window_AddFromTemplate(param0->unk_B810, param1, param2); v1 = MessageLoader_Init(0, 26, param4, param0->unk_00); param0->unk_B858 = sub_02013A04(param6, param0->unk_00); @@ -1069,13 +1069,13 @@ static void ov92_021D1CF4(UnkStruct_ov92_021D1B24 *param0, Window *param1, const param0->unk_B854 = sub_0200112C(&v0, 0, 0, param0->unk_00); Window_Show(v0.unk_0C, 1, ((512 - (18 + 12)) - 9), 7); - sub_0201A954(param1); + Window_CopyToVRAM(param1); } static void ov92_021D1DB4(UnkStruct_ov92_021D1B24 *param0) { Window_Clear(¶m0->unk_B824, 0); - BGL_DeleteWindow(¶m0->unk_B824); + Window_Remove(¶m0->unk_B824); sub_02001384(param0->unk_B854, NULL, NULL); sub_02013A3C(param0->unk_B858); } @@ -1085,8 +1085,8 @@ static void ov92_021D1DEC(UnkStruct_ov92_021D1B24 *param0) Strbuf *v0 = Strbuf_Init(0x400, param0->unk_00); Strbuf *v1 = Strbuf_Init(0x400, param0->unk_00); - sub_0201A8D4(param0->unk_B810, ¶m0->unk_B844, &Unk_ov92_021D291C); - BGL_WindowColor(¶m0->unk_B844, 15, 0, 0, 27 * 8, 6 * 8); + Window_AddFromTemplate(param0->unk_B810, ¶m0->unk_B844, &Unk_ov92_021D291C); + Window_FillRectWithColor(¶m0->unk_B844, 15, 0, 0, 27 * 8, 6 * 8); Window_Show(¶m0->unk_B844, 0, ((512 - (18 + 12)) - 9), 7); StringTemplate_SetCountryName(param0->unk_B870, 0, param0->unk_BB14); @@ -1100,7 +1100,7 @@ static void ov92_021D1DEC(UnkStruct_ov92_021D1B24 *param0) Strbuf_Free(v1); Strbuf_Free(v0); - sub_0201A954(¶m0->unk_B844); + Window_CopyToVRAM(¶m0->unk_B844); } static void ov92_021D1EBC(UnkStruct_ov92_021D1B24 *param0, int param1, int param2) @@ -1108,8 +1108,8 @@ static void ov92_021D1EBC(UnkStruct_ov92_021D1B24 *param0, int param1, int param Strbuf *v0 = Strbuf_Init(64, param0->unk_00); Strbuf *v1 = Strbuf_Init(64, param0->unk_00); - sub_0201A8D4(param0->unk_B810, ¶m0->unk_B844, &Unk_ov92_021D291C); - BGL_WindowColor(¶m0->unk_B844, 15, 0, 0, 27 * 8, 6 * 8); + Window_AddFromTemplate(param0->unk_B810, ¶m0->unk_B844, &Unk_ov92_021D291C); + Window_FillRectWithColor(¶m0->unk_B844, 15, 0, 0, 27 * 8, 6 * 8); Window_Show(¶m0->unk_B844, 0, ((512 - (18 + 12)) - 9), 7); ov92_021D27E8(param1, param2, v0, v1, param0->unk_00); @@ -1121,13 +1121,13 @@ static void ov92_021D1EBC(UnkStruct_ov92_021D1B24 *param0, int param1, int param Text_AddPrinterWithParams(¶m0->unk_B844, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_INSTANT, NULL); Strbuf_Free(v1); Strbuf_Free(v0); - sub_0201A954(¶m0->unk_B844); + Window_CopyToVRAM(¶m0->unk_B844); } static void ov92_021D1F74(UnkStruct_ov92_021D1B24 *param0) { Window_Clear(¶m0->unk_B844, 0); - BGL_DeleteWindow(¶m0->unk_B844); + Window_Remove(¶m0->unk_B844); } static void ov92_021D1F90(UnkStruct_ov92_021D1B24 *param0) @@ -1136,7 +1136,7 @@ static void ov92_021D1F90(UnkStruct_ov92_021D1B24 *param0) { Strbuf *v0 = Strbuf_Init(0x400, param0->unk_00); - BGL_WindowColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); + Window_FillRectWithColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); MessageLoader_GetStrbuf(param0->unk_B860, 14, v0); Text_AddPrinterWithParams(¶m0->unk_B814, FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_INSTANT, NULL); Strbuf_Free(v0); @@ -1179,7 +1179,7 @@ static void ov92_021D1F90(UnkStruct_ov92_021D1B24 *param0) Strbuf *v12 = Strbuf_Init(64, param0->unk_00); Strbuf *v13 = Strbuf_Init(64, param0->unk_00); - BGL_WindowColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); + Window_FillRectWithColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); ov92_021D27E8(param0->unk_0C.unk_04[v8].unk_2A, param0->unk_0C.unk_04[v8].unk_2C, v12, v13, param0->unk_00); if (param0->unk_0C.unk_04[v8].unk_2C != 0) { diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index 3576c6d48f..d31ee760f7 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -102,7 +102,7 @@ int ov94_0223BCB0(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov94_0223FD4C), 62); memset(v0, 0, sizeof(UnkStruct_ov94_0223FD4C)); - v0->unk_04 = sub_02018340(62); + v0->unk_04 = BgConfig_New(62); Unk_ov94_02246C08 = v0; { @@ -113,7 +113,7 @@ int ov94_0223BCB0(OverlayManager *param0, int *param1) GX_BG0_AS_2D, }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } v0->unk_B8C = StringTemplate_New(11, 64, 62); diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index 9527463b83..77e8efe032 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -142,7 +142,7 @@ static void ov94_0223C720(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -162,8 +162,8 @@ static void ov94_0223C720(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { @@ -183,7 +183,7 @@ static void ov94_0223C720(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); + Bg_InitFromTemplate(param0, 1, &v2, 0); } { @@ -203,7 +203,7 @@ static void ov94_0223C720(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); + Bg_InitFromTemplate(param0, 2, &v3, 0); } { @@ -223,8 +223,8 @@ static void ov94_0223C720(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v4, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v4, 0); + Bg_ClearTilemap(param0, 4); } { @@ -244,11 +244,11 @@ static void ov94_0223C720(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v5, 0); + Bg_InitFromTemplate(param0, 5, &v5, 0); } - sub_02019690(0, 32, 0, 62); - sub_02019690(4, 32, 0, 62); + Bg_ClearTilesRange(0, 32, 0, 62); + Bg_ClearTilesRange(4, 32, 0, 62); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -256,11 +256,11 @@ static void ov94_0223C720(BgConfig *param0) static void ov94_0223C830(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); } static void ov94_0223C85C(UnkStruct_ov94_0223FD4C *param0) @@ -319,37 +319,37 @@ static void ov94_0223C9B0(UnkStruct_ov94_0223FD4C *param0) static void ov94_0223C9C0(UnkStruct_ov94_0223FD4C *param0) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_F7C, 0, 1, 1, 28, 2, 13, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_F7C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F7C, 0, 1, 1, 28, 2, 13, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_F7C, 0x0); Text_AddPrinterWithParamsAndColor(¶m0->unk_F7C, FONT_MESSAGE, param0->unk_BB0, 0, 2, TEXT_SPEED_INSTANT, TEXT_COLOR(15, 4, 0), NULL); { int v0; for (v0 = 0; v0 < 3; v0++) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[v0], 1, 9, 6 + v0 * 5, 15, 2, 13, (16 * 6 + 1) + (15 * 2) * v0); - BGL_FillWindow(¶m0->unk_F9C[v0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[v0], 1, 9, 6 + v0 * 5, 15, 2, 13, (16 * 6 + 1) + (15 * 2) * v0); + Window_FillTilemap(¶m0->unk_F9C[v0], 0x0); } } - BGL_AddWindow(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, (((1 + (18 + 12)) + 9) + 28 * 2)); - BGL_FillWindow(¶m0->unk_F5C, 0xf0f); - BGL_AddWindow(param0->unk_04, ¶m0->unk_109C, 0, 2, 19, 27, 4, 13, ((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2)); - BGL_FillWindow(¶m0->unk_109C, 0xf0f); + Window_Add(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, (((1 + (18 + 12)) + 9) + 28 * 2)); + Window_FillTilemap(¶m0->unk_F5C, 0xf0f); + Window_Add(param0->unk_04, ¶m0->unk_109C, 0, 2, 19, 27, 4, 13, ((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2)); + Window_FillTilemap(¶m0->unk_109C, 0xf0f); } static void ov94_0223CAC8(UnkStruct_ov94_0223FD4C *param0) { int v0; - BGL_DeleteWindow(¶m0->unk_109C); - BGL_DeleteWindow(¶m0->unk_F5C); + Window_Remove(¶m0->unk_109C); + Window_Remove(¶m0->unk_F5C); for (v0 = 0; v0 < 3; v0++) { - BGL_DeleteWindow(¶m0->unk_F9C[v0]); + Window_Remove(¶m0->unk_F9C[v0]); } - BGL_DeleteWindow(¶m0->unk_F7C); + Window_Remove(¶m0->unk_F7C); } static void ov94_0223CB0C(UnkStruct_ov94_0223FD4C *param0) @@ -527,12 +527,12 @@ static int ov94_0223CE7C(UnkStruct_ov94_0223FD4C *param0) if (v0 != 0xffffffff) { if (v0 == 0xfffffffe) { sub_0200E084(¶m0->unk_109C, 1); - sub_0201ACF4(¶m0->unk_109C); + Window_ClearAndCopyToVRAM(¶m0->unk_109C); CellActor_SetAnimateFlag(param0->unk_E20, 1); param0->unk_2C = 5; } else { sub_0200E084(¶m0->unk_109C, 1); - sub_0201ACF4(¶m0->unk_109C); + Window_ClearAndCopyToVRAM(¶m0->unk_109C); ov94_0223C4C0(param0, 0, 0); param0->unk_2C = 7; } @@ -576,7 +576,7 @@ static void ov94_0223CF3C(UnkStruct_ov94_0223FD4C *param0) for (v0 = 0; v0 < 3; v0++) { ov94_0223D030(¶m0->unk_F9C[v0], param0->unk_B90, Unk_ov94_02245A64[v1][v0], 0xf0f); - sub_0201A954(¶m0->unk_F9C[v0]); + Window_CopyToVRAM(¶m0->unk_F9C[v0]); } } @@ -585,7 +585,7 @@ static void ov94_0223CF80(UnkStruct_ov94_0223FD4C *param0, int param1, int param Strbuf *v0; MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); - BGL_FillWindow(¶m0->unk_F5C, 0xf0f); + Window_FillTilemap(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); param0->unk_BE0 = Text_AddPrinterWithParams(¶m0->unk_F5C, FONT_MESSAGE, param0->unk_BAC, 0, 0, param2, NULL); @@ -596,7 +596,7 @@ static void ov94_0223CFD8(UnkStruct_ov94_0223FD4C *param0, int param1, int param Strbuf *v0; MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); - BGL_FillWindow(¶m0->unk_109C, 0xf0f); + Window_FillTilemap(¶m0->unk_109C, 0xf0f); sub_0200E060(¶m0->unk_109C, 0, 1, 10); param0->unk_BE0 = Text_AddPrinterWithParams(¶m0->unk_109C, FONT_MESSAGE, param0->unk_BAC, 0, 0, param2, NULL); @@ -608,7 +608,7 @@ void ov94_0223D030(Window *param0, MessageLoader *param1, int param2, u16 param3 v0 = MessageLoader_GetNewStrbuf(param1, param2); - BGL_FillWindow(param0, param3); + Window_FillTilemap(param0, param3); Text_AddPrinterWithParams(param0, FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_INSTANT, NULL); Strbuf_Free(v0); } diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index 0f011f6fb6..019daa2c15 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -135,8 +135,8 @@ static void ov94_0223D1D4(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v0, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v0, 0); + Bg_ClearTilemap(param0, 0); } { @@ -156,7 +156,7 @@ static void ov94_0223D1D4(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); + Bg_InitFromTemplate(param0, 1, &v1, 0); } { @@ -176,7 +176,7 @@ static void ov94_0223D1D4(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v2, 0); + Bg_InitFromTemplate(param0, 2, &v2, 0); } { @@ -196,8 +196,8 @@ static void ov94_0223D1D4(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v3, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v3, 0); + Bg_ClearTilemap(param0, 4); } { @@ -217,20 +217,20 @@ static void ov94_0223D1D4(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v4, 0); + Bg_InitFromTemplate(param0, 5, &v4, 0); } - sub_02019690(0, 32, 0, 62); - sub_02019690(4, 32, 0, 62); + Bg_ClearTilesRange(0, 32, 0, 62); + Bg_ClearTilesRange(4, 32, 0, 62); } static void ov94_0223D2BC(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); } static void ov94_0223D2E8(UnkStruct_ov94_0223FD4C *param0) @@ -288,9 +288,9 @@ static const int Unk_ov94_02245B94[][4] = { static void ov94_0223D438(UnkStruct_ov94_0223FD4C *param0) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_F5C, 0x0); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 15, (5 * 2), 4, 13, (((1 + (18 + 12)) + 9) + 27 * 2)); + Window_Add(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_F5C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 15, (5 * 2), 4, 13, (((1 + (18 + 12)) + 9) + 27 * 2)); { int v0, v1; @@ -298,8 +298,8 @@ static void ov94_0223D438(UnkStruct_ov94_0223FD4C *param0) v1 = ((((1 + (18 + 12)) + 9) + 27 * 2) + (5 * 2) * 4); for (v0 = 0; v0 < 10 + 2; v0++) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_FCC[v0], 0, Unk_ov94_02245B94[v0][0], Unk_ov94_02245B94[v0][1], Unk_ov94_02245B94[v0][2], Unk_ov94_02245B94[v0][3], 13, v1); - BGL_FillWindow(¶m0->unk_FCC[v0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_FCC[v0], 0, Unk_ov94_02245B94[v0][0], Unk_ov94_02245B94[v0][1], Unk_ov94_02245B94[v0][2], Unk_ov94_02245B94[v0][3], 13, v1); + Window_FillTilemap(¶m0->unk_FCC[v0], 0x0); v1 += Unk_ov94_02245B94[v0][2] * Unk_ov94_02245B94[v0][3]; } @@ -308,14 +308,14 @@ static void ov94_0223D438(UnkStruct_ov94_0223FD4C *param0) static void ov94_0223D504(UnkStruct_ov94_0223FD4C *param0) { - BGL_DeleteWindow(¶m0->unk_F5C); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F5C); + Window_Remove(¶m0->unk_F9C[0]); { int v0; for (v0 = 0; v0 < 10 + 2; v0++) { - BGL_DeleteWindow(¶m0->unk_FCC[v0]); + Window_Remove(¶m0->unk_FCC[v0]); } } } @@ -499,7 +499,7 @@ static void ov94_0223D88C(UnkStruct_ov94_0223FD4C *param0, int param1, int param StringTemplate_SetSpeciesName(param0->unk_B8C, 0, Pokemon_GetBoxPokemon(param5)); v0 = MessageLoader_GetNewStrbuf(param0->unk_B90, param1); StringTemplate_Format(param0->unk_B8C, param0->unk_BAC, v0); - BGL_FillWindow(¶m0->unk_F5C, 0xf0f); + Window_FillTilemap(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); param0->unk_BE0 = Text_AddPrinterWithParams(¶m0->unk_F5C, FONT_MESSAGE, param0->unk_BAC, 0, 0, param2, NULL); @@ -537,7 +537,7 @@ void ov94_0223D910(MessageLoader *param0, MessageLoader *param1, StringTemplate Item_LoadName(v5, v8, 62); for (v9 = 0; v9 < 5; v9++) { - BGL_FillWindow(¶m3[v9], 0x0); + Window_FillTilemap(¶m3[v9], 0x0); } ov94_02245900(¶m3[0], v4, 0, 0, 0, TEXT_COLOR(15, 2, 0)); diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index 067fee0da6..57ebbe905d 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -125,8 +125,8 @@ static void ov94_0223DD1C(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v0, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v0, 0); + Bg_ClearTilemap(param0, 0); } { @@ -146,7 +146,7 @@ static void ov94_0223DD1C(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); + Bg_InitFromTemplate(param0, 1, &v1, 0); } { @@ -166,8 +166,8 @@ static void ov94_0223DD1C(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v2, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v2, 0); + Bg_ClearTilemap(param0, 4); } { @@ -187,19 +187,19 @@ static void ov94_0223DD1C(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v3, 0); + Bg_InitFromTemplate(param0, 5, &v3, 0); } - sub_02019690(0, 32, 0, 62); - sub_02019690(4, 32, 0, 62); + Bg_ClearTilesRange(0, 32, 0, 62); + Bg_ClearTilesRange(4, 32, 0, 62); } static void ov94_0223DDE0(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); } static void ov94_0223DE04(UnkStruct_ov94_0223FD4C *param0) @@ -251,9 +251,9 @@ static const int Unk_ov94_02245CC4[][4] = { static void ov94_0223DED8(UnkStruct_ov94_0223FD4C *param0) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_F5C, 0x0); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 15, (5 * 2), 4, 13, (((1 + (18 + 12)) + 9) + 27 * 2)); + Window_Add(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_F5C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 15, (5 * 2), 4, 13, (((1 + (18 + 12)) + 9) + 27 * 2)); { int v0, v1; @@ -261,8 +261,8 @@ static void ov94_0223DED8(UnkStruct_ov94_0223FD4C *param0) v1 = ((((1 + (18 + 12)) + 9) + 27 * 2) + (5 * 2) * 4); for (v0 = 0; v0 < NELEMS(Unk_ov94_02245CC4); v0++) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_FCC[v0], 0, Unk_ov94_02245CC4[v0][0], Unk_ov94_02245CC4[v0][1], Unk_ov94_02245CC4[v0][2], Unk_ov94_02245CC4[v0][3], 13, v1); - BGL_FillWindow(¶m0->unk_FCC[v0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_FCC[v0], 0, Unk_ov94_02245CC4[v0][0], Unk_ov94_02245CC4[v0][1], Unk_ov94_02245CC4[v0][2], Unk_ov94_02245CC4[v0][3], 13, v1); + Window_FillTilemap(¶m0->unk_FCC[v0], 0x0); v1 += Unk_ov94_02245CC4[v0][2] * Unk_ov94_02245CC4[v0][3]; } @@ -271,14 +271,14 @@ static void ov94_0223DED8(UnkStruct_ov94_0223FD4C *param0) static void ov94_0223DFA4(UnkStruct_ov94_0223FD4C *param0) { - BGL_DeleteWindow(¶m0->unk_F5C); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F5C); + Window_Remove(¶m0->unk_F9C[0]); { int v0; for (v0 = 0; v0 < NELEMS(Unk_ov94_02245CC4); v0++) { - BGL_DeleteWindow(¶m0->unk_FCC[v0]); + Window_Remove(¶m0->unk_FCC[v0]); } } } @@ -431,7 +431,7 @@ static void ov94_0223E300(UnkStruct_ov94_0223FD4C *param0, int param1, int param Strbuf *v0; MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); - BGL_FillWindow(¶m0->unk_F5C, 0xf0f); + Window_FillTilemap(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); param0->unk_BE0 = Text_AddPrinterWithParams(¶m0->unk_F5C, FONT_MESSAGE, param0->unk_BAC, 0, 0, param2, NULL); @@ -453,7 +453,7 @@ static void ov94_0223E358(MessageLoader *param0, Window param1[]) static void ov94_0223E3B0(Window *param0, MessageLoader *param1, MessageLoader *param2, UnkStruct_ov94_0223BA88_sub3 *param3) { - BGL_FillWindow(param0, 0x0); + Window_FillTilemap(param0, 0x0); ov94_02242158(param0, param2, param3->unk_00, 0, 3, TEXT_COLOR(15, 2, 0)); ov94_02242204(param0, param1, param3->unk_02, 0, 3, 70, TEXT_COLOR(15, 2, 0)); @@ -462,7 +462,7 @@ static void ov94_0223E3B0(Window *param0, MessageLoader *param1, MessageLoader * static void ov94_0223E424(Window *param0, Strbuf *param1, Strbuf *param2) { - BGL_FillWindow(param0, 0x0); + Window_FillTilemap(param0, 0x0); if (param1 != NULL) { ov94_02245900(param0, param1, 0, 3, 0, TEXT_COLOR(15, 2, 0)); diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 6236157702..3089968fef 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -187,8 +187,8 @@ static void ov94_0223E598(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v0, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v0, 0); + Bg_ClearTilemap(param0, 0); } { @@ -208,8 +208,8 @@ static void ov94_0223E598(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v1, 0); + Bg_ClearTilemap(param0, 1); } { @@ -229,8 +229,8 @@ static void ov94_0223E598(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v2, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v2, 0); + Bg_ClearTilemap(param0, 2); } { @@ -250,24 +250,24 @@ static void ov94_0223E598(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v3, 0); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v3, 0); + Bg_ClearTilemap(param0, 3); } - sub_02019690(2, 32, 0, 62); - sub_02019690(0, 32, 0, 62); - sub_02019690(3, 32, 0, 62); - sub_02019690(4, 32, 0, 62); + Bg_ClearTilesRange(2, 32, 0, 62); + Bg_ClearTilesRange(0, 32, 0, 62); + Bg_ClearTilesRange(3, 32, 0, 62); + Bg_ClearTilesRange(4, 32, 0, 62); } static void ov94_0223E684(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); - sub_02019044(param0, 3); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); + Bg_FreeTilemapBuffer(param0, 3); } static void ov94_0223E6B8(UnkStruct_ov94_0223FD4C *param0) @@ -328,48 +328,48 @@ static const u16 Unk_ov94_02245D8C[][2] = { static void ov94_0223E7D4(UnkStruct_ov94_0223FD4C *param0) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_F7C, 0, 1, 1, 28, 2, 13, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_F7C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F7C, 0, 1, 1, 28, 2, 13, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_F7C, 0x0); ov94_022458CC(¶m0->unk_F7C, param0->unk_BB0, 0, 1, 0, TEXT_COLOR(15, 13, 0)); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, (((1 + (18 + 12)) + 9) + 28 * 2)); - BGL_FillWindow(¶m0->unk_F5C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, (((1 + (18 + 12)) + 9) + 28 * 2)); + Window_FillTilemap(¶m0->unk_F5C, 0x0); { int v0, v1; for (v0 = 0; v0 < 6; v0++) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_FCC[v0], 3, Unk_ov94_02245D94[v0][0], Unk_ov94_02245D94[v0][1], 11, 2, 13, 1 + (11 * 2) * v0); - BGL_FillWindow(¶m0->unk_FCC[v0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_FCC[v0], 3, Unk_ov94_02245D94[v0][0], Unk_ov94_02245D94[v0][1], 11, 2, 13, 1 + (11 * 2) * v0); + Window_FillTilemap(¶m0->unk_FCC[v0], 0x0); } for (v0 = 0; v0 < 2; v0++) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_FCC[6 + v0], 2, Unk_ov94_02245D84[v0][0], Unk_ov94_02245D84[v0][1], 8, 2, 13, ((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + (8 * 2) * v0); - BGL_FillWindow(¶m0->unk_FCC[6 + v0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_FCC[6 + v0], 2, Unk_ov94_02245D84[v0][0], Unk_ov94_02245D84[v0][1], 8, 2, 13, ((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + (8 * 2) * v0); + Window_FillTilemap(¶m0->unk_FCC[6 + v0], 0x0); } for (v0 = 0; v0 < 2; v0++) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_10AC[v0], 3, Unk_ov94_02245D8C[v0][0], Unk_ov94_02245D8C[v0][1], 28, 2, 13, (1 + 11 * 2 * 6) + (28 * 2) * v0); - BGL_FillWindow(¶m0->unk_10AC[v0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_10AC[v0], 3, Unk_ov94_02245D8C[v0][0], Unk_ov94_02245D8C[v0][1], 28, 2, 13, (1 + 11 * 2 * 6) + (28 * 2) * v0); + Window_FillTilemap(¶m0->unk_10AC[v0], 0x0); } } } static void ov94_0223E968(UnkStruct_ov94_0223FD4C *param0) { - BGL_DeleteWindow(¶m0->unk_F5C); - BGL_DeleteWindow(¶m0->unk_F7C); + Window_Remove(¶m0->unk_F5C); + Window_Remove(¶m0->unk_F7C); { int v0; for (v0 = 0; v0 < 8; v0++) { - BGL_DeleteWindow(¶m0->unk_FCC[v0]); + Window_Remove(¶m0->unk_FCC[v0]); } for (v0 = 0; v0 < 2; v0++) { - BGL_DeleteWindow(¶m0->unk_10AC[v0]); + Window_Remove(¶m0->unk_10AC[v0]); } } } @@ -747,11 +747,11 @@ static int ov94_0223F0D0(UnkStruct_ov94_0223FD4C *param0) ov94_0223F9A4(param0, 9, TEXT_SPEED_FAST, 0, 0xf0f); ov94_0223C3F4(param0, 23, 4); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 4, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)); - BGL_FillWindow(¶m0->unk_F9C[0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 4, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)); + Window_FillTilemap(¶m0->unk_F9C[0], 0x0); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[1], 0, 21, 5, 10, 13, 13, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2) + 4 * 13)); - BGL_FillWindow(¶m0->unk_F9C[1], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[1], 0, 21, 5, 10, 13, 13, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2) + 4 * 13)); + Window_FillTilemap(¶m0->unk_F9C[1], 0x0); return 3; } @@ -787,8 +787,8 @@ static int ov94_0223F190(UnkStruct_ov94_0223FD4C *param0) sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); sub_0200E084(¶m0->unk_F5C, 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); - BGL_DeleteWindow(¶m0->unk_F9C[1]); + Window_Remove(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[1]); Sound_PlayEffect(1500); param0->unk_2C = 0; break; @@ -826,21 +826,21 @@ static int ov94_0223F2B0(UnkStruct_ov94_0223FD4C *param0) sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); Window_Clear(¶m0->unk_F9C[1], 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); - BGL_DeleteWindow(¶m0->unk_F9C[1]); + Window_Remove(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[1]); param0->unk_B7A.unk_00 = v0; param0->unk_2C = 0; Sound_PlayEffect(1500); - BGL_FillWindow(¶m0->unk_FCC[1], 0x0); + Window_FillTilemap(¶m0->unk_FCC[1], 0x0); ov94_02242158(¶m0->unk_FCC[1], param0->unk_B94, v0, 0, 0, TEXT_COLOR(1, 2, 0)); param0->unk_10E4->unk_20 = PokemonPersonalData_GetSpeciesValue(v0, 18); ov94_02242AC4(¶m0->unk_111C, param0->unk_10E4->unk_06 + param0->unk_10E4->unk_04, param0->unk_10E4->unk_0A, param0->unk_10E4->unk_08); if (ov94_02241B80(¶m0->unk_B7A, param0->unk_10E4->unk_20)) { - BGL_FillWindow(¶m0->unk_FCC[3], 0x0); + Window_FillTilemap(¶m0->unk_FCC[3], 0x0); ov94_02242204(¶m0->unk_FCC[3], param0->unk_B90, param0->unk_B7A.unk_02, 1, 0, 0, TEXT_COLOR(1, 2, 0)); } break; @@ -854,8 +854,8 @@ static int ov94_0223F41C(UnkStruct_ov94_0223FD4C *param0) ov94_0223F9A4(param0, 10, TEXT_SPEED_FAST, 0, 0xf0f); ov94_0223C3F4(param0, 23, 9); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 10, 10, 8, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)); - BGL_FillWindow(¶m0->unk_F9C[0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 10, 10, 8, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)); + Window_FillTilemap(¶m0->unk_F9C[0], 0x0); return 3; } @@ -879,7 +879,7 @@ static int ov94_0223F4B0(UnkStruct_ov94_0223FD4C *param0) sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); sub_0200E084(¶m0->unk_F5C, 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[0]); Sound_PlayEffect(1500); param0->unk_2C = 0; break; @@ -889,13 +889,13 @@ static int ov94_0223F4B0(UnkStruct_ov94_0223FD4C *param0) sub_02001384(param0->unk_10D8, NULL, NULL); sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[0]); Sound_PlayEffect(1500); param0->unk_B7A.unk_02 = v0 + 1; param0->unk_2C = 0; - BGL_FillWindow(¶m0->unk_FCC[3], 0x0); + Window_FillTilemap(¶m0->unk_FCC[3], 0x0); ov94_02242204(¶m0->unk_FCC[3], param0->unk_B90, param0->unk_B7A.unk_02, 1, 0, 0, TEXT_COLOR(1, 2, 0)); break; } @@ -908,8 +908,8 @@ static int ov94_0223F5A0(UnkStruct_ov94_0223FD4C *param0) ov94_0223F9A4(param0, 11, TEXT_SPEED_FAST, 0, 0xf0f); ov94_0223C3F4(param0, 23, 12); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 16, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)); - BGL_FillWindow(¶m0->unk_F9C[0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 16, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)); + Window_FillTilemap(¶m0->unk_F9C[0], 0x0); return 3; } @@ -936,7 +936,7 @@ static int ov94_0223F638(UnkStruct_ov94_0223FD4C *param0) sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); sub_0200E084(¶m0->unk_F5C, 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[0]); Sound_PlayEffect(1500); param0->unk_2C = 0; break; @@ -944,13 +944,13 @@ static int ov94_0223F638(UnkStruct_ov94_0223FD4C *param0) sub_02001384(param0->unk_10D8, NULL, NULL); sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[0]); Sound_PlayEffect(1500); ov94_02242934(¶m0->unk_B7A, v0, 1); param0->unk_2C = 0; - BGL_FillWindow(¶m0->unk_FCC[5], 0x0); + Window_FillTilemap(¶m0->unk_FCC[5], 0x0); ov94_022422B8(¶m0->unk_FCC[5], param0->unk_B90, v0, 0, 0, TEXT_COLOR(1, 2, 0), 1); break; } @@ -963,8 +963,8 @@ static int ov94_0223F728(UnkStruct_ov94_0223FD4C *param0) ov94_0223F9A4(param0, 169, TEXT_SPEED_FAST, 0, 0xf0f); ov94_0223C3F4(param0, 23, 15); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 2, 5, 28, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)); - BGL_FillWindow(¶m0->unk_F9C[0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[0], 0, 2, 5, 28, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)); + Window_FillTilemap(¶m0->unk_F9C[0], 0x0); return 3; } @@ -991,19 +991,19 @@ static int ov94_0223F7C0(UnkStruct_ov94_0223FD4C *param0) sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); sub_0200E084(¶m0->unk_F5C, 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[0]); Sound_PlayEffect(1500); param0->unk_2C = 0; } else { sub_02001384(param0->unk_10D8, NULL, NULL); sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[0]); Sound_PlayEffect(1500); ov94_02242A44(param0, v0); param0->unk_2C = 0; - BGL_FillWindow(¶m0->unk_10AC[1], 0x0); + Window_FillTilemap(¶m0->unk_10AC[1], 0x0); ov94_0224218C(¶m0->unk_10AC[1], param0->unk_BA0, param0->unk_B90, param0->unk_11B0, 0, 0, TEXT_COLOR(1, 2, 0)); } @@ -1078,7 +1078,7 @@ static void ov94_0223F9A4(UnkStruct_ov94_0223FD4C *param0, int param1, int param Strbuf *v0; MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); - BGL_FillWindow(¶m0->unk_F5C, 0xf0f); + Window_FillTilemap(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); param0->unk_BE0 = Text_AddPrinterWithParams(¶m0->unk_F5C, FONT_MESSAGE, param0->unk_BAC, 0, 0, param2, NULL); diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 8bcf1cc5d4..a7c24b0373 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -170,7 +170,7 @@ static void ov94_0223FC08(BgConfig *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -190,8 +190,8 @@ static void ov94_0223FC08(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { @@ -211,7 +211,7 @@ static void ov94_0223FC08(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); + Bg_InitFromTemplate(param0, 1, &v2, 0); } { @@ -231,8 +231,8 @@ static void ov94_0223FC08(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilemap(param0, 2); } { @@ -252,8 +252,8 @@ static void ov94_0223FC08(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v4, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v4, 0); + Bg_ClearTilemap(param0, 4); } { @@ -273,22 +273,22 @@ static void ov94_0223FC08(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v5, 0); + Bg_InitFromTemplate(param0, 5, &v5, 0); } - sub_02019690(0, 32, 0, 62); - sub_02019690(4, 32, 0, 62); + Bg_ClearTilesRange(0, 32, 0, 62); + Bg_ClearTilesRange(4, 32, 0, 62); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } static void ov94_0223FD20(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); } static void ov94_0223FD4C(UnkStruct_ov94_0223FD4C *param0) @@ -435,34 +435,34 @@ static void ov94_0223FFC8(UnkStruct_ov94_0223FD4C *param0) static void ov94_02240028(UnkStruct_ov94_0223FD4C *param0) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_F7C, 0, 1, 1, 28, 2, 13, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_F7C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F7C, 0, 1, 1, 28, 2, 13, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_F7C, 0x0); ov94_02245900(¶m0->unk_F7C, param0->unk_BB0, 0, 1, 0, TEXT_COLOR(15, 14, 0)); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F8C, 0, 5, 3, 13, 3, 13, (((1 + (18 + 12)) + 9) + 28 * 2)); - BGL_FillWindow(¶m0->unk_F8C, 0x0); - sub_0201A954(¶m0->unk_F8C); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, ((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13)); - BGL_FillWindow(¶m0->unk_F5C, 0x0); - BGL_AddWindow(param0->unk_04, ¶m0->unk_109C, 0, 2, 19, 27, 4, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13) + 27 * 2)); - BGL_FillWindow(¶m0->unk_109C, 0x0); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[1], 1, 25, 21, 6, 2, 0, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13) + 27 * 2) + 2 * 19)); - BGL_FillWindow(¶m0->unk_F9C[1], 0x606); + Window_Add(param0->unk_04, ¶m0->unk_F8C, 0, 5, 3, 13, 3, 13, (((1 + (18 + 12)) + 9) + 28 * 2)); + Window_FillTilemap(¶m0->unk_F8C, 0x0); + Window_CopyToVRAM(¶m0->unk_F8C); + Window_Add(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, ((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13)); + Window_FillTilemap(¶m0->unk_F5C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_109C, 0, 2, 19, 27, 4, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13) + 27 * 2)); + Window_FillTilemap(¶m0->unk_109C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[1], 1, 25, 21, 6, 2, 0, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13) + 27 * 2) + 2 * 19)); + Window_FillTilemap(¶m0->unk_F9C[1], 0x606); ov94_02245900(¶m0->unk_F9C[1], param0->unk_BA8, 0, 1, 1, TEXT_COLOR(1, 3, 6)); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 13, (5 * 2), 6, 13, (((((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13) + 27 * 2) + 2 * 19) + 6 * 2)); + Window_Add(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 13, (5 * 2), 6, 13, (((((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13) + 27 * 2) + 2 * 19) + 6 * 2)); } static void ov94_02240190(UnkStruct_ov94_0223FD4C *param0) { - BGL_DeleteWindow(¶m0->unk_109C); - BGL_DeleteWindow(¶m0->unk_F9C[1]); - BGL_DeleteWindow(¶m0->unk_F9C[0]); - BGL_DeleteWindow(¶m0->unk_F5C); - BGL_DeleteWindow(¶m0->unk_F8C); - BGL_DeleteWindow(¶m0->unk_F7C); + Window_Remove(¶m0->unk_109C); + Window_Remove(¶m0->unk_F9C[1]); + Window_Remove(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F5C); + Window_Remove(¶m0->unk_F8C); + Window_Remove(¶m0->unk_F7C); } static void ov94_022401E0(UnkStruct_ov94_0223FD4C *param0) @@ -785,7 +785,7 @@ static int ov94_02240830(UnkStruct_ov94_0223FD4C *param0) v0.unk_00 = param0->unk_10CC; v0.unk_04 = ¶m0->unk_F9C[0]; - BGL_FillWindow(v0.unk_04, 0xf0f); + Window_FillTilemap(v0.unk_04, 0xf0f); Window_Show(¶m0->unk_F9C[0], 1, (1 + (18 + 12)), 11); param0->unk_10D4 = sub_02001B7C(&v0, 9, 0, 0, 62, PAD_BUTTON_B); @@ -1017,7 +1017,7 @@ static void ov94_02240D58(UnkStruct_ov94_0223FD4C *param0, int param1, int param v0 = ¶m0->unk_109C; } - BGL_FillWindow(v0, 0xf0f); + Window_FillTilemap(v0, 0xf0f); sub_0200E060(v0, 0, 1, 10); param0->unk_BE0 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, param0->unk_BAC, 0, 0, param2, NULL); @@ -1183,7 +1183,7 @@ static void ov94_02240FA0(UnkStruct_ov94_0223FD4C *param0, int param1) } NARC_dtor(v6); - BGL_FillWindow(¶m0->unk_F8C, 0x0); + Window_FillTilemap(¶m0->unk_F8C, 0x0); ov94_02245900(¶m0->unk_F8C, param0->unk_BA4, 0, 5, 1, TEXT_COLOR(1, 2, 0)); diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 865c97b16f..fe60e8abc3 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -327,7 +327,7 @@ static void ov94_0224158C(UnkStruct_ov94_0223FD4C *param0, int param1, int param v0 = MessageLoader_GetNewStrbuf(param0->unk_B90, param1); StringTemplate_Format(param0->unk_B8C, param0->unk_BAC, v0); - BGL_FillWindow(¶m0->unk_F5C, 0xf0f); + Window_FillTilemap(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); param0->unk_BE0 = Text_AddPrinterWithParams(¶m0->unk_F5C, FONT_MESSAGE, param0->unk_BAC, 0, 0, param2, NULL); @@ -354,8 +354,8 @@ static void ov94_022415F8(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v0, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v0, 0); + Bg_ClearTilemap(param0, 0); } { @@ -375,7 +375,7 @@ static void ov94_022415F8(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); + Bg_InitFromTemplate(param0, 1, &v1, 0); } { @@ -395,7 +395,7 @@ static void ov94_022415F8(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v2, 0); + Bg_InitFromTemplate(param0, 2, &v2, 0); } { @@ -415,8 +415,8 @@ static void ov94_022415F8(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v3, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v3, 0); + Bg_ClearTilemap(param0, 4); } { @@ -436,20 +436,20 @@ static void ov94_022415F8(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v4, 0); + Bg_InitFromTemplate(param0, 5, &v4, 0); } - sub_02019690(0, 32, 0, 62); - sub_02019690(4, 32, 0, 62); + Bg_ClearTilesRange(0, 32, 0, 62); + Bg_ClearTilesRange(4, 32, 0, 62); } static void ov94_022416E0(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); } static void ov94_0224170C(UnkStruct_ov94_0223FD4C *param0) @@ -468,18 +468,18 @@ static void ov94_022417A0(UnkStruct_ov94_0223FD4C *param0) { int v0; - BGL_AddWindow(param0->unk_04, ¶m0->unk_F7C, 0, 1, 1, 28, 2, 13, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_F7C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F7C, 0, 1, 1, 28, 2, 13, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_F7C, 0x0); ov94_022458CC(¶m0->unk_F7C, param0->unk_BB0, 0, 1, 0, TEXT_COLOR(15, 14, 0)); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, (((1 + (18 + 12)) + 9) + 28 * 2)); - BGL_FillWindow(¶m0->unk_F5C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, (((1 + (18 + 12)) + 9) + 28 * 2)); + Window_FillTilemap(¶m0->unk_F5C, 0x0); for (v0 = 0; v0 < 6; v0++) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_FCC[v0], 0, Unk_ov94_02245FE8[v0][0], Unk_ov94_02245FE8[v0][1], 11, 2, 13, ((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + (11 * 2) * v0); - BGL_FillWindow(¶m0->unk_FCC[v0], 0x0); - sub_0201A954(¶m0->unk_FCC[v0]); + Window_Add(param0->unk_04, ¶m0->unk_FCC[v0], 0, Unk_ov94_02245FE8[v0][0], Unk_ov94_02245FE8[v0][1], 11, 2, 13, ((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + (11 * 2) * v0); + Window_FillTilemap(¶m0->unk_FCC[v0], 0x0); + Window_CopyToVRAM(¶m0->unk_FCC[v0]); } } @@ -488,11 +488,11 @@ static void ov94_02241880(UnkStruct_ov94_0223FD4C *param0) int v0; for (v0 = 0; v0 < 6; v0++) { - BGL_DeleteWindow(¶m0->unk_FCC[v0]); + Window_Remove(¶m0->unk_FCC[v0]); } - BGL_DeleteWindow(¶m0->unk_F5C); - BGL_DeleteWindow(¶m0->unk_F7C); + Window_Remove(¶m0->unk_F5C); + Window_Remove(¶m0->unk_F7C); } static void ov94_022418B8(UnkStruct_ov94_0223FD4C *param0) @@ -535,11 +535,11 @@ static int ov94_02241990(UnkStruct_ov94_0223FD4C *param0) param0->unk_2C = 2; } - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 4, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6)); - BGL_FillWindow(¶m0->unk_F9C[0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 4, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6)); + Window_FillTilemap(¶m0->unk_F9C[0], 0x0); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[1], 0, 21, 5, 10, 13, 13, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6) + 4 * 13)); - BGL_FillWindow(¶m0->unk_F9C[1], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[1], 0, 21, 5, 10, 13, 13, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6) + 4 * 13)); + Window_FillTilemap(¶m0->unk_F9C[1], 0x0); param0->unk_2C = 3; @@ -577,8 +577,8 @@ static int ov94_02241A58(UnkStruct_ov94_0223FD4C *param0) sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); sub_0200E084(¶m0->unk_F5C, 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); - BGL_DeleteWindow(¶m0->unk_F9C[1]); + Window_Remove(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[1]); ov94_0223C4C0(param0, 5, 5); param0->unk_2C = 2; Sound_PlayEffect(1500); @@ -629,8 +629,8 @@ static int ov94_02241BAC(UnkStruct_ov94_0223FD4C *param0) sub_02001384(param0->unk_10D8, ¶m0->unk_10E4->unk_0A, ¶m0->unk_10E4->unk_08); sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[1], 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); - BGL_DeleteWindow(¶m0->unk_F9C[1]); + Window_Remove(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[1]); param0->unk_2C = 0; Sound_PlayEffect(1500); ov94_02242AC4(¶m0->unk_111C, param0->unk_10E4->unk_06 + param0->unk_10E4->unk_04, param0->unk_10E4->unk_0A, param0->unk_10E4->unk_08); @@ -640,8 +640,8 @@ static int ov94_02241BAC(UnkStruct_ov94_0223FD4C *param0) sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); Window_Clear(¶m0->unk_F9C[1], 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); - BGL_DeleteWindow(¶m0->unk_F9C[1]); + Window_Remove(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[1]); param0->unk_B74.unk_00 = v0; Sound_PlayEffect(1500); param0->unk_10E4->unk_20 = PokemonPersonalData_GetSpeciesValue(v0, 18); @@ -667,8 +667,8 @@ static int ov94_02241D08(UnkStruct_ov94_0223FD4C *param0) ov94_0224158C(param0, 10, TEXT_SPEED_FAST, 0, 0xf0f); ov94_0223C3F4(param0, 16, 8); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 10, 10, 8, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6)); - BGL_FillWindow(¶m0->unk_F9C[0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 10, 10, 8, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6)); + Window_FillTilemap(¶m0->unk_F9C[0], 0x0); return 3; } @@ -692,7 +692,7 @@ static int ov94_02241DA0(UnkStruct_ov94_0223FD4C *param0) sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); sub_0200E084(¶m0->unk_F5C, 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[0]); Sound_PlayEffect(1500); param0->unk_2C = 0; break; @@ -703,7 +703,7 @@ static int ov94_02241DA0(UnkStruct_ov94_0223FD4C *param0) sub_02001384(param0->unk_10D8, NULL, NULL); sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[0]); Sound_PlayEffect(1500); param0->unk_B74.unk_02 = v0 + 1; param0->unk_2C = 10; @@ -719,8 +719,8 @@ static int ov94_02241E8C(UnkStruct_ov94_0223FD4C *param0) ov94_0224158C(param0, 11, TEXT_SPEED_FAST, 0, 0xf0f); ov94_0223C3F4(param0, 16, 11); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 16, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6)); - BGL_FillWindow(¶m0->unk_F9C[0], 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 16, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6)); + Window_FillTilemap(¶m0->unk_F9C[0], 0x0); return 3; } @@ -747,7 +747,7 @@ static int ov94_02241F28(UnkStruct_ov94_0223FD4C *param0) sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); sub_0200E084(¶m0->unk_F5C, 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[0]); Sound_PlayEffect(1500); if (ov94_02241B80(¶m0->unk_B74, param0->unk_10E4->unk_20)) { @@ -761,7 +761,7 @@ static int ov94_02241F28(UnkStruct_ov94_0223FD4C *param0) sub_02001384(param0->unk_10D8, NULL, NULL); sub_02013A3C(param0->unk_10CC); Window_Clear(¶m0->unk_F9C[0], 0); - BGL_DeleteWindow(¶m0->unk_F9C[0]); + Window_Remove(¶m0->unk_F9C[0]); ov94_02242934(¶m0->unk_B74, v0, 0); param0->unk_2C = 13; ov94_022422D4(param0->unk_B90, param0->unk_B94, param0->unk_B8C, ¶m0->unk_FCC[0], param0->unk_B74.unk_00, param0->unk_B74.unk_02, ov94_02242970(param0->unk_B74.unk_03, param0->unk_B74.unk_04, 0)); @@ -927,7 +927,7 @@ void ov94_022422D4(MessageLoader *param0, MessageLoader *param1, StringTemplate ov94_02245900(¶m3[0], v0, 0, 0, 0, TEXT_COLOR(15, 2, 0)); for (v1 = 1; v1 < 3; v1++) { - BGL_FillWindow(¶m3[v1], 0x0); + Window_FillTilemap(¶m3[v1], 0x0); } ov94_02242158(¶m3[1], param1, param4, 0, 0, TEXT_COLOR(15, 2, 0)); @@ -951,7 +951,7 @@ void ov94_02242368(MessageLoader *param0, MessageLoader *param1, StringTemplate ov94_02245900(¶m3[0], v0, 0, 0, 0, TEXT_COLOR(15, 2, 0)); for (v1 = 1; v1 < 3; v1++) { - BGL_FillWindow(¶m3[v1], 0x0); + Window_FillTilemap(¶m3[v1], 0x0); } ov94_02242158(¶m3[1], param1, param4, 0, 0, TEXT_COLOR(15, 2, 0)); @@ -987,7 +987,7 @@ static void ov94_022423FC(MessageLoader *param0, StringTemplate *param1, Window } for (v6 = 0; v6 < 3; v6++) { - BGL_FillWindow(¶m2[v6], 0x0); + Window_FillTilemap(¶m2[v6], 0x0); } ov94_02245900(¶m2[0], v0, 0, 0, 0, TEXT_COLOR(15, 2, 0)); @@ -1176,7 +1176,7 @@ BmpList *ov94_022427C0(UnkStruct_ov94_0223FD4C *param0, ResourceMetadata **param UnkStruct_ov84_02240FA8 v0; int v1, v2, v3; - BGL_FillWindow(param2, 0xf0f); + Window_FillTilemap(param2, 0xf0f); v3 = param5->unk_06 + param5->unk_04; v2 = ov94_02242718(param1, param4, param3, param5->unk_18, param5->unk_14, param5->unk_1C, v3, param6); diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index 0bb70a2cf7..60df3cc2a1 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -198,7 +198,7 @@ static void ov94_02242B54(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -218,8 +218,8 @@ static void ov94_02242B54(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { @@ -239,8 +239,8 @@ static void ov94_02242B54(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilemap(param0, 1); } { @@ -260,8 +260,8 @@ static void ov94_02242B54(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilemap(param0, 2); } { @@ -281,8 +281,8 @@ static void ov94_02242B54(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v4, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v4, 0); + Bg_ClearTilemap(param0, 4); } { @@ -302,12 +302,12 @@ static void ov94_02242B54(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v5, 0); + Bg_InitFromTemplate(param0, 5, &v5, 0); } - sub_02019690(0, 32, 0, 62); - sub_02019690(1, 32, 0, 62); - sub_02019690(4, 32, 0, 62); + Bg_ClearTilesRange(0, 32, 0, 62); + Bg_ClearTilesRange(1, 32, 0, 62); + Bg_ClearTilesRange(4, 32, 0, 62); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -315,11 +315,11 @@ static void ov94_02242B54(BgConfig *param0) static void ov94_02242C80(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); } static void ov94_02242CAC(UnkStruct_ov94_0223FD4C *param0) @@ -332,8 +332,8 @@ static void ov94_02242CAC(UnkStruct_ov94_0223FD4C *param0) sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); if (param0->unk_10F0 == 0) { - sub_02019120(4, 0); - sub_02019120(5, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 0); } @@ -344,13 +344,13 @@ static void ov94_02242CAC(UnkStruct_ov94_0223FD4C *param0) static void ov94_02242D38(UnkStruct_ov94_0223FD4C *param0) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_F5C, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_F5C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F5C, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_F5C, 0x0); } static void ov94_02242D74(UnkStruct_ov94_0223FD4C *param0) { - BGL_DeleteWindow(¶m0->unk_F5C); + Window_Remove(¶m0->unk_F5C); } static void ov94_02242D84(UnkStruct_ov94_0223FD4C *param0) diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index c25982a821..cf75020579 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -185,9 +185,9 @@ static void ov94_02244A7C(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v0, 0); + Bg_InitFromTemplate(param0, 0, &v0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); - sub_02019EBC(param0, 0); + Bg_ClearTilemap(param0, 0); } { @@ -207,7 +207,7 @@ static void ov94_02244A7C(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); + Bg_InitFromTemplate(param0, 1, &v1, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); } @@ -228,9 +228,9 @@ static void ov94_02244A7C(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v2, 0); + Bg_InitFromTemplate(param0, 4, &v2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); - sub_02019EBC(param0, 4); + Bg_ClearTilemap(param0, 4); } { @@ -250,21 +250,21 @@ static void ov94_02244A7C(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v3, 0); + Bg_InitFromTemplate(param0, 5, &v3, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); } - sub_02019690(0, 32, 0, 62); - sub_02019690(4, 32, 0, 62); + Bg_ClearTilesRange(0, 32, 0, 62); + Bg_ClearTilesRange(4, 32, 0, 62); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 0); } static void ov94_02244B68(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); } static void ov94_02244B8C(UnkStruct_ov94_0223FD4C *param0) @@ -284,8 +284,8 @@ static void ov94_02244B8C(UnkStruct_ov94_0223FD4C *param0) sub_0200710C(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, 62); sub_020070E8(v1, 10, v0, 5, 0, 0, 0, 62); sub_0200710C(v1, 11, v0, 5, 0, 32 * 24 * 2, 0, 62); - sub_0201975C(0, 0); - sub_0201975C(4, 0); + Bg_MaskPalette(0, 0); + Bg_MaskPalette(4, 0); inline_ov61_0222C3B0(¶m0->unk_11B4, v1, 4, 62); @@ -294,22 +294,22 @@ static void ov94_02244B8C(UnkStruct_ov94_0223FD4C *param0) static void ov94_02244E48(UnkStruct_ov94_0223FD4C *param0) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_F8C, 0, 4, 4, 23, 16, 13, (((1 + (18 + 12)) + 9) + 27 * 4)); - BGL_FillWindow(¶m0->unk_F8C, 0x0); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F7C, 0, 4, 1, 24, 2, 13, ((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16)); - BGL_FillWindow(¶m0->unk_F7C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F8C, 0, 4, 4, 23, 16, 13, (((1 + (18 + 12)) + 9) + 27 * 4)); + Window_FillTilemap(¶m0->unk_F8C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F7C, 0, 4, 1, 24, 2, 13, ((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16)); + Window_FillTilemap(¶m0->unk_F7C, 0x0); ov94_022458CC(¶m0->unk_F7C, param0->unk_BB0, 0, 1, 1, TEXT_COLOR(15, 14, 0)); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F5C, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_F5C, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_F5C, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_F5C, 0x0); } static void ov94_02244F00(UnkStruct_ov94_0223FD4C *param0) { - BGL_DeleteWindow(¶m0->unk_F5C); - BGL_DeleteWindow(¶m0->unk_F7C); - BGL_DeleteWindow(¶m0->unk_F8C); + Window_Remove(¶m0->unk_F5C); + Window_Remove(¶m0->unk_F7C); + Window_Remove(¶m0->unk_F8C); } static void ov94_02244F2C(UnkStruct_ov94_0223FD4C *param0) @@ -905,7 +905,7 @@ void ov94_02245824(UnkStruct_ov94_0223FD4C *param0, MessageLoader *param1, int p StringTemplate_Format(param0->unk_B8C, param0->unk_BAC, v0); Strbuf_Free(v0); - BGL_FillWindow(¶m0->unk_F5C, 0xf0f); + Window_FillTilemap(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); param0->unk_BE0 = Text_AddPrinterWithParams(¶m0->unk_F5C, FONT_MESSAGE, param0->unk_BAC, 0, 0, param3, NULL); @@ -955,7 +955,7 @@ static void ov94_0224593C(UnkStruct_ov94_0223FD4C *param0, int param1) MessageLoader_GetStrbuf(param0->unk_B9C, param1, v0); StringTemplate_Format(param0->unk_B8C, param0->unk_BDC, v0); - BGL_FillWindow(¶m0->unk_F8C, 15); + Window_FillTilemap(¶m0->unk_F8C, 15); Window_Show(¶m0->unk_F8C, 1, (1 + (18 + 12)), 11); param0->unk_BE0 = Text_AddPrinterWithParams(¶m0->unk_F8C, FONT_MESSAGE, param0->unk_BDC, 0, 0, TEXT_SPEED_INSTANT, NULL); diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index 589a2b6fbd..2c17fc00d6 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -140,7 +140,7 @@ int ov95_02246C20(OverlayManager *param0, int *param1) if (v0) { v0->unk_00 = OverlayManager_Args(param0); v0->unk_04 = 0; - v0->unk_08 = sub_02018340(57); + v0->unk_08 = BgConfig_New(57); v0->unk_14 = Strbuf_Init(400, 57); v0->unk_10 = MessageLoader_Init(0, 26, 350, 57); v0->unk_0C = StringTemplate_Default(57); @@ -541,8 +541,8 @@ static void ov95_022473A0(UnkStruct_ov95_022472C4 *param0) v1._10 = 0; v1._11 = param0->unk_08; - sub_02019348(param0->unk_00, 2, &v1, 128, v0[param0->unk_1C]); - sub_02019348(param0->unk_00, 6, &v1, 128, v0[param0->unk_1C]); + Bg_SetAffineParams(param0->unk_00, 2, &v1, 128, v0[param0->unk_1C]); + Bg_SetAffineParams(param0->unk_00, 6, &v1, 128, v0[param0->unk_1C]); } void ov95_022473E8(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 param3, BOOL param4) @@ -581,7 +581,7 @@ void ov95_022473E8(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 sub_02013720(v0.archive, v0.character, 57, &v4, v3, v7, param4, 2, v8); DC_FlushRange(v3, v2); - sub_0201958C(param0->unk_08, param2, v3, v2, 0); + Bg_LoadTiles(param0->unk_08, param2, v3, v2, 0); BoxPokemon_ExitDecryptionContext(v5, v6); Heap_FreeToHeap(v3); @@ -606,8 +606,8 @@ void ov95_022474D4(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 v0 = sub_02006F6C(7, v2, 0, &v1, 57); if (v0) { - sub_020198E8(param0->unk_08, param2, param4, param5, 10, 10, v1->rawData, 0, 0, 32, 32); - sub_02019E2C(param0->unk_08, param2, param4, param5, 10, 10, param3); + Bg_CopyToTilemapRect(param0->unk_08, param2, param4, param5, 10, 10, v1->rawData, 0, 0, 32, 32); + Bg_ChangeTilemapRectPalette(param0->unk_08, param2, param4, param5, 10, 10, param3); Heap_FreeToHeap(v0); } } diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 06184758bd..9db0db36c6 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -134,10 +134,10 @@ void ov95_02247BC8(void *param0) ov95_0224773C(v0->unk_70); - sub_02019044(v0->unk_54, 1); - sub_02019044(v0->unk_54, 2); - sub_02019044(v0->unk_54, 6); - BGL_DeleteWindow(&(v0->unk_58)); + Bg_FreeTilemapBuffer(v0->unk_54, 1); + Bg_FreeTilemapBuffer(v0->unk_54, 2); + Bg_FreeTilemapBuffer(v0->unk_54, 6); + Window_Remove(&(v0->unk_58)); NARC_dtor(v0->unk_80); if (v0->unk_10) { @@ -246,20 +246,20 @@ static int ov95_02247CB4(UnkStruct_ov95_02247C6C *param0, int *param1) GXLayers_SetBanks(&v0); GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN); - sub_02018368(&v1); + SetAllGraphicsModes(&v1); - sub_020183C4(param0->unk_54, 1, &v2, 0); - sub_020183C4(param0->unk_54, 2, &v3, 0); - sub_020183C4(param0->unk_54, 6, &v3, 0); + Bg_InitFromTemplate(param0->unk_54, 1, &v2, 0); + Bg_InitFromTemplate(param0->unk_54, 2, &v3, 0); + Bg_InitFromTemplate(param0->unk_54, 6, &v3, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); G2_SetBG0Priority(1); - sub_020196C0(param0->unk_54, 1, 0x0, 1, 0); - sub_02019CB8(param0->unk_54, 1, 0x0, 0, 0, 32, 32, 0); + Bg_FillTilesRange(param0->unk_54, 1, 0x0, 1, 0); + Bg_FillTilemapRect(param0->unk_54, 1, 0x0, 0, 0, 32, 32, 0); sub_0200DD0C(param0->unk_54, 1, 109, 2, ov95_02247674(param0->unk_00), 58); - BGL_AddWindow(param0->unk_54, &(param0->unk_58), 1, 2, 19, 27, 4, 1, 1); - BGL_FillWindow(&(param0->unk_58), 0xf); + Window_Add(param0->unk_54, &(param0->unk_58), 1, 2, 19, 27, 4, 1, 1); + Window_FillTilemap(&(param0->unk_58), 0xf); sub_02006E84(14, 7, 0, 1 * 0x20, 0x20, 58); sub_02006E3C(93, 22, param0->unk_54, 2, 0, 0, 1, 58); @@ -269,7 +269,7 @@ static int ov95_02247CB4(UnkStruct_ov95_02247C6C *param0, int *param1) sub_02006E60(93, 21, param0->unk_54, 6, 0, 0, 1, 58); sub_02006E84(93, 23, 4, 0 * 0x20, 0x20, 58); - sub_02019448(param0->unk_54, 1); + Bg_CopyTilemapBufferToVRAM(param0->unk_54, 1); ov95_02248174(param0); param0->unk_70 = ov95_022476F0(1, 0, 0, 0); @@ -334,7 +334,7 @@ static int ov95_02247F04(UnkStruct_ov95_02247C6C *param0, int *param1) StringTemplate_Format(v1, param0->unk_6C, param0->unk_68); Text_AddPrinterWithParams(&(param0->unk_58), FONT_MESSAGE, param0->unk_6C, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); sub_0200E010(&(param0->unk_58), 109, 2); - sub_0201A954(&(param0->unk_58)); + Window_CopyToVRAM(&(param0->unk_58)); param0->unk_08 = 0; (*param1) = v3; } @@ -358,9 +358,9 @@ static int ov95_02247F04(UnkStruct_ov95_02247C6C *param0, int *param1) sub_0200590C(ov95_0224764C(param0->unk_00), v7, ov95_02247654(param0->unk_00)); } - BGL_FillWindow(&(param0->unk_58), 0xf); + Window_FillTilemap(&(param0->unk_58), 0xf); Text_AddPrinterWithParams(&(param0->unk_58), FONT_MESSAGE, param0->unk_6C, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201ACCC(&(param0->unk_58)); + Window_LoadTiles(&(param0->unk_58)); param0->unk_08 = 0; (*param1)++; } diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c index c60d8baf46..750a84c960 100644 --- a/src/overlay095/ov95_02248590.c +++ b/src/overlay095/ov95_02248590.c @@ -467,16 +467,16 @@ static void ov95_022488A4(UnkStruct_ov95_02248688 *param0) GXLayers_SetBanks(&v0); GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN); - sub_02018368(&v1); + SetAllGraphicsModes(&v1); - sub_020183C4(param0->unk_C0, 2, &v2, 1); - sub_020183C4(param0->unk_C0, 6, &v2, 1); + Bg_InitFromTemplate(param0->unk_C0, 2, &v2, 1); + Bg_InitFromTemplate(param0->unk_C0, 6, &v2, 1); { OSIntrMode v6 = OS_DisableInterrupts(); - sub_020183C4(param0->unk_C0, 3, &v3, 2); - sub_020183C4(param0->unk_C0, 7, &v3, 2); + Bg_InitFromTemplate(param0->unk_C0, 3, &v3, 2); + Bg_InitFromTemplate(param0->unk_C0, 7, &v3, 2); OS_RestoreInterrupts(v6); } @@ -516,11 +516,11 @@ static void ov95_022488A4(UnkStruct_ov95_02248688 *param0) } } - sub_02019184(param0->unk_C0, 6, 3, -256); - sub_02019120(7, 0); + Bg_SetOffset(param0->unk_C0, 6, 3, -256); + Bg_ToggleLayer(7, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); - sub_02019184(param0->unk_C0, 3, 3, 0); + Bg_SetOffset(param0->unk_C0, 3, 3, 0); param0->unk_C4 = ov95_02246F30(&(param0->unk_C8), 1); param0->unk_CC = ov95_022472C4(param0->unk_C0, UnkEnum_ov95_022488A4_00, 0x1000, UnkEnum_ov95_022488A4_01, UnkEnum_ov95_022488A4_02, 0, &(param0->unk_D0)); @@ -532,10 +532,10 @@ static void ov95_02248B3C(UnkStruct_ov95_02248688 *param0) ov95_02247018(param0->unk_C4); } - sub_02019044(param0->unk_C0, 2); - sub_02019044(param0->unk_C0, 6); - sub_02019044(param0->unk_C0, 3); - sub_02019044(param0->unk_C0, 7); + Bg_FreeTilemapBuffer(param0->unk_C0, 2); + Bg_FreeTilemapBuffer(param0->unk_C0, 6); + Bg_FreeTilemapBuffer(param0->unk_C0, 3); + Bg_FreeTilemapBuffer(param0->unk_C0, 7); } static void ov95_02248B84(UnkStruct_ov95_02248688 *param0) @@ -657,10 +657,10 @@ static void ov95_02248E00(SysTask *param0, void *param1) if (v0->unk_168) { v0->unk_168 = 0; - sub_02019184(v0->unk_C0, 2, 3, -256); - sub_02019184(v0->unk_C0, 6, 3, 0); - sub_02019120(3, 0); - sub_02019120(7, 1); + Bg_SetOffset(v0->unk_C0, 2, 3, -256); + Bg_SetOffset(v0->unk_C0, 6, 3, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(7, 1); GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); SysTask_Done(param0); } @@ -740,8 +740,8 @@ static void ov95_02248FAC(UnkStruct_ov95_02248688 *param0, SysTask **param1) if (v0) { v0->unk_00 = param0; v0->unk_154 = param0->unk_C0; - v0->unk_158 = sub_020192F8(v0->unk_154, 2) << 12; - v0->unk_15C = sub_020192F8(v0->unk_154, 6) << 12; + v0->unk_158 = Bg_GetYOffset(v0->unk_154, 2) << 12; + v0->unk_15C = Bg_GetYOffset(v0->unk_154, 6) << 12; v0->unk_160 = 0; v0->unk_164 = 0; v0->unk_168 = param1; @@ -763,8 +763,8 @@ static void ov95_02249020(SysTask *param0, void *param1) v0->unk_160 += UnkEnum_ov95_02249020_00; v0->unk_164 += v0->unk_160; - sub_02019184(v0->unk_154, 2, 3, (v0->unk_158 - v0->unk_164) >> 12); - sub_02019184(v0->unk_154, 6, 3, (v0->unk_15C - v0->unk_164) >> 12); + Bg_SetOffset(v0->unk_154, 2, 3, (v0->unk_158 - v0->unk_164) >> 12); + Bg_SetOffset(v0->unk_154, 6, 3, (v0->unk_15C - v0->unk_164) >> 12); if (v0->unk_164 >= (128 << 12)) { if (v0->unk_16C == NULL) { diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c index 16403d8304..6b15d2b1ca 100644 --- a/src/overlay095/ov95_02249740.c +++ b/src/overlay095/ov95_02249740.c @@ -277,9 +277,9 @@ static void ov95_02249910(UnkStruct_ov95_022497D8 *param0) GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN); - sub_02018368(&v1); - sub_020183C4(param0->unk_24, 3, &v2, 0); - sub_020183C4(param0->unk_24, 7, &v2, 0); + SetAllGraphicsModes(&v1); + Bg_InitFromTemplate(param0->unk_24, 3, &v2, 0); + Bg_InitFromTemplate(param0->unk_24, 7, &v2, 0); switch (ov95_02247644(param0->unk_00)) { case 0: @@ -318,8 +318,8 @@ static void ov95_02249910(UnkStruct_ov95_022497D8 *param0) sub_02006E9C(93, v5, 0, v6, 0, 0x20, 58); sub_02006E9C(93, v5, 4, v6, 0, 0x20, 58); - sub_02019184(param0->unk_24, 3, 3, 256); - sub_02019184(param0->unk_24, 7, 3, 0); + Bg_SetOffset(param0->unk_24, 3, 3, 256); + Bg_SetOffset(param0->unk_24, 7, 3, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -327,8 +327,8 @@ static void ov95_02249910(UnkStruct_ov95_022497D8 *param0) static void ov95_02249A68(UnkStruct_ov95_022497D8 *param0) { - sub_02019044(param0->unk_24, 3); - sub_02019044(param0->unk_24, 7); + Bg_FreeTilemapBuffer(param0->unk_24, 3); + Bg_FreeTilemapBuffer(param0->unk_24, 7); } static void ov95_02249A80(UnkStruct_ov95_022497D8 *param0) @@ -601,8 +601,8 @@ static void ov95_02249F38(SysTask *param0, void *param1) v1.y = 0; v1.z = 0; - sub_02019184(v0->unk_24, 3, 3, 0); - sub_02019184(v0->unk_24, 7, 3, 256); + Bg_SetOffset(v0->unk_24, 3, 3, 0); + Bg_SetOffset(v0->unk_24, 7, 3, 256); ov95_02247AC0(v0->unk_28, &v1); GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); diff --git a/src/overlay095/ov95_02249F90.c b/src/overlay095/ov95_02249F90.c index 8050e17833..905dc5feaf 100644 --- a/src/overlay095/ov95_02249F90.c +++ b/src/overlay095/ov95_02249F90.c @@ -218,13 +218,13 @@ static void ov95_0224A10C(UnkStruct_ov95_02249FF8 *param0) GXLayers_SetBanks(&v0); GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); - sub_02018368(&v1); + SetAllGraphicsModes(&v1); - sub_020183C4(param0->unk_0C, 1, &v2, 0); - sub_020183C4(param0->unk_0C, 5, &v2, 0); - sub_020183C4(param0->unk_0C, 2, &v3, 0); - sub_020183C4(param0->unk_0C, 3, &v4, 0); - sub_020183C4(param0->unk_0C, 7, &v4, 0); + Bg_InitFromTemplate(param0->unk_0C, 1, &v2, 0); + Bg_InitFromTemplate(param0->unk_0C, 5, &v2, 0); + Bg_InitFromTemplate(param0->unk_0C, 2, &v3, 0); + Bg_InitFromTemplate(param0->unk_0C, 3, &v4, 0); + Bg_InitFromTemplate(param0->unk_0C, 7, &v4, 0); sub_02006E3C(93, 19, param0->unk_0C, 3, 0, 0, 1, 58); sub_02006E3C(93, 19, param0->unk_0C, 7, 0, 0, 1, 58); @@ -234,25 +234,25 @@ static void ov95_0224A10C(UnkStruct_ov95_02249FF8 *param0) sub_02006E84(93, 20, 0, 0, 0x20, 58); sub_02006E84(93, 20, 4, 0, 0x20, 58); - sub_020196C0(param0->unk_0C, 1, 0x0, 1, 200); - sub_020196C0(param0->unk_0C, 5, 0x0, 1, 200); - sub_020196C0(param0->unk_0C, 2, 0x0, 1, 200); + Bg_FillTilesRange(param0->unk_0C, 1, 0x0, 1, 200); + Bg_FillTilesRange(param0->unk_0C, 5, 0x0, 1, 200); + Bg_FillTilesRange(param0->unk_0C, 2, 0x0, 1, 200); ov95_022473E8(param0->unk_00, 0, 1, 14, 0); ov95_022473E8(param0->unk_00, 0, 5, 14, 0); ov95_022473E8(param0->unk_00, 1, 2, 15, 0); - sub_02019CB8(param0->unk_0C, 1, 200, 0, 0, 32, 64, 0); - sub_02019CB8(param0->unk_0C, 5, 200, 0, 0, 32, 64, 0); - sub_02019CB8(param0->unk_0C, 2, 200, 0, 0, 32, 64, 0); + Bg_FillTilemapRect(param0->unk_0C, 1, 200, 0, 0, 32, 64, 0); + Bg_FillTilemapRect(param0->unk_0C, 5, 200, 0, 0, 32, 64, 0); + Bg_FillTilemapRect(param0->unk_0C, 2, 200, 0, 0, 32, 64, 0); ov95_022474D4(param0->unk_00, 0, 1, 14, 20, 0); ov95_022474D4(param0->unk_00, 0, 5, 14, 20, 0); ov95_022474D4(param0->unk_00, 1, 2, 15, 2, 0); - sub_02019448(param0->unk_0C, 1); - sub_02019448(param0->unk_0C, 5); - sub_02019448(param0->unk_0C, 2); + Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 1); + Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 5); + Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 2); ov95_0224A358(param0->unk_0C, UnkEnum_ov95_0224A020_00, UnkEnum_ov95_0224A020_02); @@ -262,12 +262,12 @@ static void ov95_0224A10C(UnkStruct_ov95_02249FF8 *param0) static void ov95_0224A320(UnkStruct_ov95_02249FF8 *param0) { - sub_02019044(param0->unk_0C, 3); - sub_02019044(param0->unk_0C, 7); - sub_02019044(param0->unk_0C, 2); - sub_02019044(param0->unk_0C, 6); - sub_02019044(param0->unk_0C, 1); - sub_02019044(param0->unk_0C, 5); + Bg_FreeTilemapBuffer(param0->unk_0C, 3); + Bg_FreeTilemapBuffer(param0->unk_0C, 7); + Bg_FreeTilemapBuffer(param0->unk_0C, 2); + Bg_FreeTilemapBuffer(param0->unk_0C, 6); + Bg_FreeTilemapBuffer(param0->unk_0C, 1); + Bg_FreeTilemapBuffer(param0->unk_0C, 5); } static void ov95_0224A358(BgConfig *param0, int param1, int param2) @@ -275,7 +275,7 @@ static void ov95_0224A358(BgConfig *param0, int param1, int param2) param2 &= 0x1ff; param1 &= 0x1ff; - sub_02019184(param0, 2, 3, param2); - sub_02019184(param0, 1, 3, param1); - sub_02019184(param0, 5, 3, param1 + 192); + Bg_SetOffset(param0, 2, 3, param2); + Bg_SetOffset(param0, 1, 3, param1); + Bg_SetOffset(param0, 5, 3, param1 + 192); } diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c index 2097208d65..46d8df5bb1 100644 --- a/src/overlay095/ov95_0224A390.c +++ b/src/overlay095/ov95_0224A390.c @@ -255,10 +255,10 @@ static void ov95_0224A518(UnkStruct_ov95_0224A42C *param0) GXLayers_SetBanks(&v0); GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); - sub_02018368(&v1); + SetAllGraphicsModes(&v1); - sub_020183C4(param0->unk_24, 3, &v2, 0); - sub_020183C4(param0->unk_24, 7, &v2, 0); + Bg_InitFromTemplate(param0->unk_24, 3, &v2, 0); + Bg_InitFromTemplate(param0->unk_24, 7, &v2, 0); switch (ov95_02247644(param0->unk_00)) { case 0: @@ -297,8 +297,8 @@ static void ov95_0224A518(UnkStruct_ov95_0224A42C *param0) sub_02006E9C(93, v5, 0, v6, 0, 0x20, 58); sub_02006E9C(93, v5, 4, v6, 0, 0x20, 58); - sub_02019184(param0->unk_24, 3, 3, 0); - sub_02019184(param0->unk_24, 7, 3, 256); + Bg_SetOffset(param0->unk_24, 3, 3, 0); + Bg_SetOffset(param0->unk_24, 7, 3, 256); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -309,8 +309,8 @@ static void ov95_0224A518(UnkStruct_ov95_0224A42C *param0) static void ov95_0224A678(UnkStruct_ov95_0224A42C *param0) { - sub_02019044(param0->unk_24, 3); - sub_02019044(param0->unk_24, 7); + Bg_FreeTilemapBuffer(param0->unk_24, 3); + Bg_FreeTilemapBuffer(param0->unk_24, 7); } static void ov95_0224A690(UnkStruct_ov95_0224A42C *param0) @@ -592,8 +592,8 @@ static void ov95_0224AB50(void *param0) v1.y = 0; v1.z = 0; - sub_02019184(v0->unk_24, 3, 3, 256); - sub_02019184(v0->unk_24, 7, 3, 0); + Bg_SetOffset(v0->unk_24, 3, 3, 256); + Bg_SetOffset(v0->unk_24, 7, 3, 0); ov95_02247AC0(v0->unk_28, &v1); GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN); diff --git a/src/overlay095/ov95_0224ABC0.c b/src/overlay095/ov95_0224ABC0.c index 43af0821c4..c16223c6a7 100644 --- a/src/overlay095/ov95_0224ABC0.c +++ b/src/overlay095/ov95_0224ABC0.c @@ -345,15 +345,15 @@ static void ov95_0224AE1C(UnkStruct_ov95_0224AC64 *param0) GXLayers_SetBanks(&v0); GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); - sub_02018368(&v1); - sub_020183C4(param0->unk_0C, 2, &v2, 1); - sub_020183C4(param0->unk_0C, 6, &v2, 1); + SetAllGraphicsModes(&v1); + Bg_InitFromTemplate(param0->unk_0C, 2, &v2, 1); + Bg_InitFromTemplate(param0->unk_0C, 6, &v2, 1); { OSIntrMode v6 = OS_DisableInterrupts(); - sub_020183C4(param0->unk_0C, 3, &v3, 2); - sub_020183C4(param0->unk_0C, 7, &v3, 2); + Bg_InitFromTemplate(param0->unk_0C, 3, &v3, 2); + Bg_InitFromTemplate(param0->unk_0C, 7, &v3, 2); OS_RestoreInterrupts(v6); } @@ -393,11 +393,11 @@ static void ov95_0224AE1C(UnkStruct_ov95_0224AC64 *param0) } } - sub_02019184(param0->unk_0C, 2, 3, UnkEnum_ov95_0224AE1C_00); - sub_02019184(param0->unk_0C, 6, 3, UnkEnum_ov95_0224AE1C_01); - sub_02019184(param0->unk_0C, 3, 3, 67); + Bg_SetOffset(param0->unk_0C, 2, 3, UnkEnum_ov95_0224AE1C_00); + Bg_SetOffset(param0->unk_0C, 6, 3, UnkEnum_ov95_0224AE1C_01); + Bg_SetOffset(param0->unk_0C, 3, 3, 67); - sub_02019120(7, 0); + Bg_ToggleLayer(7, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -409,10 +409,10 @@ static void ov95_0224B050(UnkStruct_ov95_0224AC64 *param0) ov95_02247018(param0->unk_10); } - sub_02019044(param0->unk_0C, 2); - sub_02019044(param0->unk_0C, 6); - sub_02019044(param0->unk_0C, 3); - sub_02019044(param0->unk_0C, 7); + Bg_FreeTilemapBuffer(param0->unk_0C, 2); + Bg_FreeTilemapBuffer(param0->unk_0C, 6); + Bg_FreeTilemapBuffer(param0->unk_0C, 3); + Bg_FreeTilemapBuffer(param0->unk_0C, 7); } static void ov95_0224B084(UnkStruct_ov95_0224AC64 *param0) @@ -501,12 +501,12 @@ static void ov95_0224B1F8(SysTask *param0, void *param1) if (v0->unk_08) { v0->unk_0C += v0->unk_14; v0->unk_10 += v0->unk_14; - sub_02019184(v0->unk_04, 2, 3, (v0->unk_0C >> 12)); - sub_02019184(v0->unk_04, 6, 3, (v0->unk_10 >> 12)); + Bg_SetOffset(v0->unk_04, 2, 3, (v0->unk_0C >> 12)); + Bg_SetOffset(v0->unk_04, 6, 3, (v0->unk_10 >> 12)); v0->unk_08--; } else { - sub_02019184(v0->unk_04, 2, 3, UnkEnum_ov95_0224B1A8_00); - sub_02019184(v0->unk_04, 6, 3, UnkEnum_ov95_0224B1F8_00); + Bg_SetOffset(v0->unk_04, 2, 3, UnkEnum_ov95_0224B1A8_00); + Bg_SetOffset(v0->unk_04, 6, 3, UnkEnum_ov95_0224B1F8_00); ov95_0224B258(param0); } } diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 911be9a514..46524c361c 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -161,8 +161,8 @@ void ov95_0224B438(void *param0) ov95_0224773C(v0->unk_74); } - sub_02019044(v0->unk_58, 1); - BGL_DeleteWindow(&(v0->unk_5C)); + Bg_FreeTilemapBuffer(v0->unk_58, 1); + Window_Remove(&(v0->unk_5C)); if (v0->unk_14) { sub_02007DC8(v0->unk_14); @@ -275,22 +275,22 @@ static int ov95_0224B520(UnkStruct_ov95_0224B4D4 *param0, int *param1) GXLayers_SetBanks(&v0); GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); - sub_02018368(&v1); + SetAllGraphicsModes(&v1); - sub_020183C4(param0->unk_58, 1, &v2, 0); - sub_020183C4(param0->unk_58, 2, &v3, 0); + Bg_InitFromTemplate(param0->unk_58, 1, &v2, 0); + Bg_InitFromTemplate(param0->unk_58, 2, &v3, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); G2_SetBG0Priority(1); - sub_020196C0(param0->unk_58, 1, 0x0, 1, 0); - sub_02019CB8(param0->unk_58, 1, 0x0, 0, 0, 32, 32, 0); + Bg_FillTilesRange(param0->unk_58, 1, 0x0, 1, 0); + Bg_FillTilemapRect(param0->unk_58, 1, 0x0, 0, 0, 32, 32, 0); sub_0200DD0C(param0->unk_58, 1, 109, 2, ov95_02247674(param0->unk_00), 58); - BGL_AddWindow(param0->unk_58, &(param0->unk_5C), 1, 2, 19, 27, 4, 1, 1); - BGL_FillWindow(&(param0->unk_5C), 0xf); + Window_Add(param0->unk_58, &(param0->unk_5C), 1, 2, 19, 27, 4, 1, 1); + Window_FillTilemap(&(param0->unk_5C), 0xf); sub_02006E84(14, 7, 0, 1 * 0x20, 0x20, 58); - sub_02019448(param0->unk_58, 1); + Bg_CopyTilemapBufferToVRAM(param0->unk_58, 1); sub_02006E3C(93, 22, param0->unk_58, 2, 0, 0, 1, 58); sub_02006E60(93, 21, param0->unk_58, 2, 0, 0, 1, 58); @@ -409,7 +409,7 @@ static int ov95_0224B81C(UnkStruct_ov95_0224B4D4 *param0, int *param1) Text_AddPrinterWithParams(&(param0->unk_5C), FONT_MESSAGE, param0->unk_70, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); sub_0200E010(&(param0->unk_5C), 109, 2); - sub_0201A954(&(param0->unk_5C)); + Window_CopyToVRAM(&(param0->unk_5C)); sub_02006150(1156); param0->unk_08 = 0; @@ -424,9 +424,9 @@ static int ov95_0224B81C(UnkStruct_ov95_0224B4D4 *param0, int *param1) MessageLoader_GetStrbuf(v4, 3, param0->unk_6C); StringTemplate_Format(v5, param0->unk_70, param0->unk_6C); - BGL_FillWindow(&(param0->unk_5C), 0xf); + Window_FillTilemap(&(param0->unk_5C), 0xf); Text_AddPrinterWithParams(&(param0->unk_5C), FONT_MESSAGE, param0->unk_70, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201ACCC(&(param0->unk_5C)); + Window_LoadTiles(&(param0->unk_5C)); param0->unk_08 = 0; (*param1)++; } diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c index 69c6c15d1a..e62eb45089 100644 --- a/src/overlay096/ov96_0223B6A0.c +++ b/src/overlay096/ov96_0223B6A0.c @@ -77,7 +77,7 @@ int ov96_0223B6A0(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov96_0223BF40), 68); memset(v0, 0, sizeof(UnkStruct_ov96_0223BF40)); - v0->unk_04 = sub_02018340(68); + v0->unk_04 = BgConfig_New(68); Unk_ov96_0223DEEC = v0; { @@ -88,7 +88,7 @@ int ov96_0223B6A0(OverlayManager *param0, int *param1) GX_BG0_AS_2D, }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } v0->unk_BCC = StringTemplate_New(11, 32, 68); diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index 62686fa8b5..e7552990b1 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -266,9 +266,9 @@ static void ov96_0223BE38(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v0, 0); + Bg_InitFromTemplate(param0, 0, &v0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); - sub_02019EBC(param0, 0); + Bg_ClearTilemap(param0, 0); } { @@ -288,7 +288,7 @@ static void ov96_0223BE38(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); + Bg_InitFromTemplate(param0, 1, &v1, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); } @@ -309,9 +309,9 @@ static void ov96_0223BE38(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v2, 0); + Bg_InitFromTemplate(param0, 4, &v2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); - sub_02019EBC(param0, 4); + Bg_ClearTilemap(param0, 4); } { @@ -331,20 +331,20 @@ static void ov96_0223BE38(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v3, 0); + Bg_InitFromTemplate(param0, 5, &v3, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); } - sub_02019690(0, 32, 0, 68); - sub_02019690(4, 32, 0, 68); + Bg_ClearTilesRange(0, 32, 0, 68); + Bg_ClearTilesRange(4, 32, 0, 68); } static void ov96_0223BF1C(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); } static void ov96_0223BF40(UnkStruct_ov96_0223BF40 *param0) @@ -362,8 +362,8 @@ static void ov96_0223BF40(UnkStruct_ov96_0223BF40 *param0) sub_0200710C(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, 68); sub_020070E8(v1, 10, v0, 5, 0, 0, 0, 68); sub_0200710C(v1, 11, v0, 5, 0, 32 * 24 * 2, 0f, 68); - sub_0201975C(0, 0); - sub_0201975C(4, 0); + Bg_MaskPalette(0, 0); + Bg_MaskPalette(4, 0); inline_ov61_0222C3B0(¶m0->unk_FF8, v1, 4, 68); @@ -372,26 +372,26 @@ static void ov96_0223BF40(UnkStruct_ov96_0223BF40 *param0) static void ov96_0223C1FC(UnkStruct_ov96_0223BF40 *param0) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_E78, 0, 4, 4, 23, 16, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 4 * 2) + 4 * 2)); - BGL_FillWindow(¶m0->unk_E78, 0x0); - BGL_AddWindow(param0->unk_04, ¶m0->unk_E58, 0, 26, 14, 4, 2, 13, (((1 + (18 + 12)) + 9) + 27 * 4)); - BGL_FillWindow(¶m0->unk_E58, 0xf0f); - BGL_AddWindow(param0->unk_04, ¶m0->unk_E48, 0, 26, 14, 4, 2, 13, ((((1 + (18 + 12)) + 9) + 27 * 4) + 4 * 2)); - BGL_FillWindow(¶m0->unk_E48, 0xf0f); - BGL_AddWindow(param0->unk_04, ¶m0->unk_E68, 0, 4, 1, 24, 2, 13, ((((((1 + (18 + 12)) + 9) + 27 * 4) + 4 * 2) + 4 * 2) + 23 * 16)); - BGL_FillWindow(¶m0->unk_E68, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_E78, 0, 4, 4, 23, 16, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 4 * 2) + 4 * 2)); + Window_FillTilemap(¶m0->unk_E78, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_E58, 0, 26, 14, 4, 2, 13, (((1 + (18 + 12)) + 9) + 27 * 4)); + Window_FillTilemap(¶m0->unk_E58, 0xf0f); + Window_Add(param0->unk_04, ¶m0->unk_E48, 0, 26, 14, 4, 2, 13, ((((1 + (18 + 12)) + 9) + 27 * 4) + 4 * 2)); + Window_FillTilemap(¶m0->unk_E48, 0xf0f); + Window_Add(param0->unk_04, ¶m0->unk_E68, 0, 4, 1, 24, 2, 13, ((((((1 + (18 + 12)) + 9) + 27 * 4) + 4 * 2) + 4 * 2) + 23 * 16)); + Window_FillTilemap(¶m0->unk_E68, 0x0); ov96_0223D8A4(¶m0->unk_E68, param0->unk_BE0, 0, 1, 1, TEXT_COLOR(15, 14, 0)); - BGL_AddWindow(param0->unk_04, ¶m0->unk_E38, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_E38, 0xf0f); + Window_Add(param0->unk_04, ¶m0->unk_E38, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_E38, 0xf0f); } static void ov96_0223C314(UnkStruct_ov96_0223BF40 *param0) { - BGL_DeleteWindow(¶m0->unk_E38); - BGL_DeleteWindow(¶m0->unk_E68); - BGL_DeleteWindow(¶m0->unk_E48); - BGL_DeleteWindow(¶m0->unk_E58); - BGL_DeleteWindow(¶m0->unk_E78); + Window_Remove(¶m0->unk_E38); + Window_Remove(¶m0->unk_E68); + Window_Remove(¶m0->unk_E48); + Window_Remove(¶m0->unk_E58); + Window_Remove(¶m0->unk_E78); } static void ov96_0223C358(UnkStruct_ov96_0223BF40 *param0) @@ -873,7 +873,7 @@ static int ov96_0223CA28(UnkStruct_ov96_0223BF40 *param0) Window_Show(¶m0->unk_E58, 0, (1 + (18 + 12)), 14); ov96_0223D90C(¶m0->unk_E58, param0->unk_BE4, param0->unk_98, 3); ov96_0223D950(param0, 0, 1); - sub_0201A954(¶m0->unk_E58); + Window_CopyToVRAM(¶m0->unk_E58); param0->unk_1C = 15; @@ -1138,7 +1138,7 @@ static int ov96_0223CF5C(UnkStruct_ov96_0223BF40 *param0) Window_Show(¶m0->unk_E48, 0, (1 + (18 + 12)), 14); ov96_0223D90C(¶m0->unk_E48, param0->unk_BE8, param0->unk_90, 2); ov96_0223D950(param0, 1, 1); - sub_0201A954(¶m0->unk_E48); + Window_CopyToVRAM(¶m0->unk_E48); param0->unk_1C = 31; @@ -1193,7 +1193,7 @@ static int ov96_0223D0B0(UnkStruct_ov96_0223BF40 *param0) Window_Show(¶m0->unk_E58, 0, (1 + (18 + 12)), 14); ov96_0223D90C(¶m0->unk_E58, param0->unk_BE4, param0->unk_98, 3); ov96_0223D950(param0, 0, 1); - sub_0201A954(¶m0->unk_E58); + Window_CopyToVRAM(¶m0->unk_E58); param0->unk_1C = 34; @@ -1559,7 +1559,7 @@ static void ov96_0223D750(UnkStruct_ov96_0223BF40 *param0, MessageLoader *param1 Strbuf *v0 = MessageLoader_GetNewStrbuf(param1, param2); StringTemplate_Format(param0->unk_BCC, param0->unk_BDC, v0); - BGL_FillWindow(¶m0->unk_E38, 0xf0f); + Window_FillTilemap(¶m0->unk_E38, 0xf0f); sub_0200E060(¶m0->unk_E38, 0, 1, 14); param0->unk_BF0 = Text_AddPrinterWithParams(¶m0->unk_E38, FONT_MESSAGE, param0->unk_BDC, 0, 0, param3, NULL); @@ -1592,7 +1592,7 @@ static int ov96_0223D7E4(UnkStruct_ov96_0223BF40 *param0) static void ov96_0223D814(UnkStruct_ov96_0223BF40 *param0, MessageLoader *param1, int param2, int param3, u16 param4) { MessageLoader_GetStrbuf(param1, param2, param0->unk_BDC); - BGL_FillWindow(¶m0->unk_E38, 0xf0f); + Window_FillTilemap(¶m0->unk_E38, 0xf0f); sub_0200E060(¶m0->unk_E38, 0, 1, 14); param0->unk_BF0 = Text_AddPrinterWithParams(¶m0->unk_E38, FONT_MESSAGE, param0->unk_BDC, 0, 0, param3, NULL); @@ -1630,7 +1630,7 @@ void ov96_0223D8D8(Window *param0, Strbuf *param1, int param2, int param3, int p static void ov96_0223D90C(Window *param0, Strbuf *param1, int param2, int param3) { - BGL_FillWindow(param0, 0xf0f); + Window_FillTilemap(param0, 0xf0f); Strbuf_FormatInt(param1, param2, param3, 2, 1); ov96_0223D8D8(param0, param1, 0, 1, 1, TEXT_COLOR(1, 2, 0)); } @@ -1669,7 +1669,7 @@ static void ov96_0223D9B8(UnkStruct_ov96_0223BF40 *param0, int param1) MessageLoader_GetStrbuf(param0->unk_BD8, param1, v0); StringTemplate_Format(param0->unk_BCC, param0->unk_BEC, v0); - BGL_FillWindow(¶m0->unk_E78, 15); + Window_FillTilemap(¶m0->unk_E78, 15); Window_Show(¶m0->unk_E78, 1, (1 + (18 + 12)), 11); param0->unk_BF0 = Text_AddPrinterWithParams(¶m0->unk_E78, FONT_MESSAGE, param0->unk_BEC, 0, 0, TEXT_SPEED_INSTANT, NULL); diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 9a6e3755f5..3e198bc98c 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -183,7 +183,7 @@ static BOOL ov97_0222AE64(UnkStruct_0222AE60 *param0) UnkStruct_ov97_0223DF54 *v1; UnkStruct_ov97_02237808 v2; - if (BGL_WindowAdded(¶m0->unk_158) == 0) { + if (Window_IsInUse(¶m0->unk_158) == 0) { for (v0 = 0; v0 < 1; v0++) { if (param0->unk_154[v0] == 1) { param0->unk_154[v0] = 0; @@ -199,7 +199,7 @@ static BOOL ov97_0222AE64(UnkStruct_0222AE60 *param0) if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); Window_Clear(¶m0->unk_158, 0); - BGL_DeleteWindow(¶m0->unk_158); + Window_Remove(¶m0->unk_158); } return 1; @@ -337,7 +337,7 @@ static BOOL ov97_0222B07C(UnkStruct_0222AE60 *param0) return 1; case 16: sub_0200DAA4(param0->unk_00, 1, 1, 2, 0, 81); - sub_02019EBC(param0->unk_00, 1); + Bg_ClearTilemap(param0->unk_00, 1); *((u16 *)HW_BG_PLTT + 33) = ((26 & 31) << 10 | (26 & 31) << 5 | (26 & 31)); param0->unk_12C = 17; break; @@ -369,7 +369,7 @@ static BOOL ov97_0222B07C(UnkStruct_0222AE60 *param0) v0.unk_2C = 1; ov97_0223795C(param0->unk_00, &v0, v1->unk_00, v1->unk_04, v1->unk_10); - sub_02019E2C(param0->unk_00, 1, sub_0201C29C(v0.unk_10), sub_0201C2A0(v0.unk_10), sub_0201C294(v0.unk_10), sub_0201C298(v0.unk_10), 0); + Bg_ChangeTilemapRectPalette(param0->unk_00, 1, Window_GetXPos(v0.unk_10), Window_GetYPos(v0.unk_10), Window_GetWidth(v0.unk_10), Window_GetHeight(v0.unk_10), 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); @@ -382,7 +382,7 @@ static BOOL ov97_0222B07C(UnkStruct_0222AE60 *param0) param0->unk_134--; } else { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - BGL_DeleteWindow(¶m0->unk_13C); + Window_Remove(¶m0->unk_13C); param0->unk_12C = 19; param0->unk_138 = gCoreSys.pressedKeys; Sound_PlayEffect(1500); @@ -422,8 +422,8 @@ static void ov97_0222B25C(UnkStruct_0222AE60 *param0) param0->unk_11C = param0->unk_120; } - sub_0201C63C(param0->unk_00, 0, 3, param0->unk_11C / FX32_ONE); - sub_0201C63C(param0->unk_00, 2, 3, param0->unk_11C / FX32_ONE); + Bg_ScheduleScroll(param0->unk_00, 0, 3, param0->unk_11C / FX32_ONE); + Bg_ScheduleScroll(param0->unk_00, 2, 3, param0->unk_11C / FX32_ONE); } } @@ -449,19 +449,19 @@ static void ov97_0222B2EC(UnkStruct_0222AE60 *param0) }; GXLayers_SetBanks(&v0); - sub_02018368(&v1); + SetAllGraphicsModes(&v1); ov97_022376FC(param0->unk_00, 0, 2, 0xF000, 0x0); G2_SetBG0Priority(2); - sub_02019690(0, 32, 0, 81); + Bg_ClearTilesRange(0, 32, 0, 81); ov97_022376FC(param0->unk_00, 1, 1, 0xD800, 0x8000); G2_SetBG1Priority(1); - sub_02019690(1, 32, 0, 81); + Bg_ClearTilesRange(1, 32, 0, 81); ov97_022376FC(param0->unk_00, 2, 2, 0xE000, 0x0); G2_SetBG2Priority(0); - sub_02019690(2, 32, 0, 81); + Bg_ClearTilesRange(2, 32, 0, 81); Text_ResetAllPrinters(); Font_LoadTextPalette(0, 1 * 32, 81); @@ -497,7 +497,7 @@ static void ov97_0222B46C(UnkStruct_0222AE60 *param0) static void ov97_0222B4AC(UnkStruct_0222AE60 *param0, int param1, int param2, int param3) { - u16 *v0 = (u16 *)sub_02019FE4(param0->unk_00, 2); + u16 *v0 = (u16 *)Bg_GetTilemapBuffer(param0->unk_00, 2); int v1 = ((4 << 12) + 0x380 + 0); if (param3 == 2) { @@ -512,12 +512,12 @@ static void ov97_0222B4AC(UnkStruct_0222AE60 *param0, int param1, int param2, in v0[param2 * 32 + param1 + 0] = v1 + 8; v0[param2 * 32 + param1 + 1] = v1 + 9; - sub_02019448(param0->unk_00, 2); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 2); } static void ov97_0222B4FC(UnkStruct_0222AE60 *param0, int param1, int param2) { - u16 *v0 = (u16 *)sub_02019FE4(param0->unk_00, 2); + u16 *v0 = (u16 *)Bg_GetTilemapBuffer(param0->unk_00, 2); v0[param2 * 32 + param1 + 0] = ((4 << 12) + 0x380 + 0) + 4; v0[param2 * 32 + param1 + 1] = ((4 << 12) + 0x380 + 0) + 4; @@ -527,7 +527,7 @@ static void ov97_0222B4FC(UnkStruct_0222AE60 *param0, int param1, int param2) v0[param2 * 32 + param1 + 0] = ((4 << 12) + 0x380 + 0) + 4; v0[param2 * 32 + param1 + 1] = ((4 << 12) + 0x380 + 0) + 4; - sub_02019448(param0->unk_00, 2); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 2); } static void ov97_0222B53C(Window *param0, MessageLoader *param1, StringTemplate *param2, TextColor param3, u32 param4, int param5) @@ -537,7 +537,7 @@ static void ov97_0222B53C(Window *param0, MessageLoader *param1, StringTemplate v2 = MessageUtil_ExpandedStrbuf(param2, param1, param4, 81); v0 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, Font_GetAttribute(FONT_SYSTEM, FONTATTR_LETTER_SPACING)); - v1 = sub_0201C294(param0) * 8 - (v0 + 32); + v1 = Window_GetWidth(param0) * 8 - (v0 + 32); Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v2, v1, param5, TEXT_SPEED_NO_TRANSFER, param3, NULL); Strbuf_Free(v2); @@ -771,8 +771,8 @@ static BOOL ov97_0222B9BC(UnkStruct_0222AE60 *param0) if (v0->unk_0C) { if (param0->unk_DC[v2]) { - sub_0201C2AC(v1.unk_10, 3); - sub_0201C2B0(v1.unk_10, v3); + Window_SetXPos(v1.unk_10, 3); + Window_SetYPos(v1.unk_10, v3); Window_Show(v1.unk_10, 0, v1.unk_38, v1.unk_3C); if (param0->unk_FC[v2]) { @@ -804,20 +804,20 @@ static void ov97_0222BAD8(UnkStruct_0222AE60 *param0, int param1) int v0; for (v0 = 0; v0 < sizeof(Unk_ov97_0223E014) / sizeof(UnkStruct_ov97_0223E014); v0++) { - if (BGL_WindowAdded(¶m0->unk_5C[v0]) == 0) { + if (Window_IsInUse(¶m0->unk_5C[v0]) == 0) { continue; } if (v0 == param1) { Window_Show(¶m0->unk_5C[v0], 1, (1 + 9), 3); - sub_02019E2C(param0->unk_00, 0, sub_0201C29C(¶m0->unk_5C[v0]), sub_0201C2A0(¶m0->unk_5C[v0]), sub_0201C294(¶m0->unk_5C[v0]), sub_0201C298(¶m0->unk_5C[v0]), 0); + Bg_ChangeTilemapRectPalette(param0->unk_00, 0, Window_GetXPos(¶m0->unk_5C[v0]), Window_GetYPos(¶m0->unk_5C[v0]), Window_GetWidth(¶m0->unk_5C[v0]), Window_GetHeight(¶m0->unk_5C[v0]), 0); } else { Window_Show(¶m0->unk_5C[v0], 1, 1, 2); - sub_02019E2C(param0->unk_00, 0, sub_0201C29C(¶m0->unk_5C[v0]), sub_0201C2A0(¶m0->unk_5C[v0]), sub_0201C294(¶m0->unk_5C[v0]), sub_0201C298(¶m0->unk_5C[v0]), 1); + Bg_ChangeTilemapRectPalette(param0->unk_00, 0, Window_GetXPos(¶m0->unk_5C[v0]), Window_GetYPos(¶m0->unk_5C[v0]), Window_GetWidth(¶m0->unk_5C[v0]), Window_GetHeight(¶m0->unk_5C[v0]), 1); } } - sub_02019448(param0->unk_00, 0); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 0); } static void ov97_0222BB88(UnkStruct_0222AE60 *param0, int param1) @@ -852,8 +852,8 @@ static void ov97_0222BBC8(UnkStruct_0222AE60 *param0) { int v0, v1, v2; - v0 = (sub_0201C2A0(¶m0->unk_5C[param0->unk_54]) - 1) * 8; - v1 = (sub_0201C298(¶m0->unk_5C[param0->unk_54]) + 2) * 8; + v0 = (Window_GetYPos(¶m0->unk_5C[param0->unk_54]) - 1) * 8; + v1 = (Window_GetHeight(¶m0->unk_5C[param0->unk_54]) + 2) * 8; v2 = param0->unk_120 / FX32_ONE; if (v2 > v0) { @@ -874,12 +874,12 @@ static void ov97_0222BC1C(UnkStruct_0222AE60 *param0) v5 = param0->unk_120 / FX32_ONE; for (v0 = 0; v0 < (sizeof(Unk_ov97_0223E014) / sizeof(UnkStruct_ov97_0223E014)); v0++) { - if (BGL_WindowAdded(¶m0->unk_5C[v0]) == 0) { + if (Window_IsInUse(¶m0->unk_5C[v0]) == 0) { continue; } - v3 = (sub_0201C2A0(¶m0->unk_5C[v0]) - 1) * 8; - v4 = (sub_0201C298(¶m0->unk_5C[v0]) + 2) * 8; + v3 = (Window_GetYPos(¶m0->unk_5C[v0]) - 1) * 8; + v4 = (Window_GetHeight(¶m0->unk_5C[v0]) + 2) * 8; if (v5 > v3) { v1 = 1; @@ -907,14 +907,14 @@ static void ov97_0222BC9C(OverlayManager *param0) for (v0 = 0; v0 < (sizeof(Unk_ov97_0223E014) / sizeof(UnkStruct_ov97_0223E014)); v0++) { if (v1->unk_5C[v0].bgConfig) { - sub_0201ACF4(&v1->unk_5C[v0]); - BGL_DeleteWindow(&v1->unk_5C[v0]); + Window_ClearAndCopyToVRAM(&v1->unk_5C[v0]); + Window_Remove(&v1->unk_5C[v0]); } } - sub_02019044(v1->unk_00, 0); - sub_02019044(v1->unk_00, 1); - sub_02019044(v1->unk_00, 2); + Bg_FreeTilemapBuffer(v1->unk_00, 0); + Bg_FreeTilemapBuffer(v1->unk_00, 1); + Bg_FreeTilemapBuffer(v1->unk_00, 2); Heap_FreeToHeap(v1->unk_00); SetMainCallback(NULL, NULL); } @@ -968,7 +968,7 @@ static void ov97_0222BD48(void *param0) { sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8((BgConfig *)param0); + Bg_RunScheduledUpdates((BgConfig *)param0); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -981,7 +981,7 @@ static int ov97_0222BD70(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_0222AE60), 81); memset(v0, 0, sizeof(UnkStruct_0222AE60)); - v0->unk_00 = sub_02018340(81); + v0->unk_00 = BgConfig_New(81); sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 4c8f8ffbd9..1b25de200d 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -534,7 +534,7 @@ static void ov97_0222C254(UnkStruct_ov97_0222C388 *param0) GXLayers_SetBanks(&v1); - sub_02018368(&v2); + SetAllGraphicsModes(&v2); ov97_022376FC(param0->unk_04, 0, 1, 0xF000, 0x0); ov97_022376FC(param0->unk_04, 1, 1, 0xF800, 0x4000); ov97_022376FC(param0->unk_04, 4, 1, 0x7800, 0x0); @@ -550,8 +550,8 @@ static void ov97_0222C254(UnkStruct_ov97_0222C388 *param0) sub_02006E84(116, 0, 0, 16 * 2 * 8, 16 * 2, param0->unk_00); sub_02006E3C(116, 1, param0->unk_04, 1, 0, 10 * 16 * 0x20, 1, param0->unk_00); sub_02006E60(116, 2, param0->unk_04, 1, 0, 32 * 24 * 2, 1, param0->unk_00); - sub_02019E2C(param0->unk_04, 1, 0, 0, 32, 24, 8); - sub_02019448(param0->unk_04, 1); + Bg_ChangeTilemapRectPalette(param0->unk_04, 1, 0, 0, 32, 24, 8); + Bg_CopyTilemapBufferToVRAM(param0->unk_04, 1); ov97_0222C388(param0); } @@ -561,15 +561,15 @@ static void ov97_0222C388(UnkStruct_ov97_0222C388 *param0) sub_02006E84(116, 0, 4, 16 * 2 * 8, 16 * 2, param0->unk_00); sub_02006E3C(116, 1, param0->unk_04, 4, 0, 10 * 16 * 0x20, 1, param0->unk_00); sub_02006E60(116, 2, param0->unk_04, 4, 0, 32 * 24 * 2, 1, param0->unk_00); - sub_02019E2C(param0->unk_04, 4, 0, 0, 32, 24, 8); - sub_02019448(param0->unk_04, 4); + Bg_ChangeTilemapRectPalette(param0->unk_04, 4, 0, 0, 32, 24, 8); + Bg_CopyTilemapBufferToVRAM(param0->unk_04, 4); } static BOOL ov97_0222C404(UnkStruct_ov97_0222C388 *param0) { UnkStruct_ov97_02237808 v0; - if (BGL_WindowAdded(¶m0->unk_18) == 0) { + if (Window_IsInUse(¶m0->unk_18) == 0) { ov97_02237808(&v0, ¶m0->unk_18, 0, 14, 1, 1); ov97_02237858(&v0, 22, 16, param0->unk_144); ov97_0223795C(param0->unk_04, &v0, 5, 4, 2); @@ -577,7 +577,7 @@ static BOOL ov97_0222C404(UnkStruct_ov97_0222C388 *param0) } else { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Window_Clear(¶m0->unk_18, 0); - BGL_DeleteWindow(¶m0->unk_18); + Window_Remove(¶m0->unk_18); return 0; } } @@ -656,19 +656,19 @@ static void ov97_0222C688(OverlayManager *param0) ov97_02237DA0(); - if (BGL_WindowAdded(&v1->unk_18) == 1) { - sub_0201ACF4(&v1->unk_18); - BGL_DeleteWindow(&v1->unk_18); - sub_0201ACF4(&v1->unk_28); - BGL_DeleteWindow(&v1->unk_28); - sub_0201ACF4(&v1->unk_38); - BGL_DeleteWindow(&v1->unk_38); + if (Window_IsInUse(&v1->unk_18) == 1) { + Window_ClearAndCopyToVRAM(&v1->unk_18); + Window_Remove(&v1->unk_18); + Window_ClearAndCopyToVRAM(&v1->unk_28); + Window_Remove(&v1->unk_28); + Window_ClearAndCopyToVRAM(&v1->unk_38); + Window_Remove(&v1->unk_38); } - sub_02019044(v1->unk_04, 0); - sub_02019044(v1->unk_04, 1); - sub_02019044(v1->unk_04, 4); - sub_02019044(v1->unk_04, 5); + Bg_FreeTilemapBuffer(v1->unk_04, 0); + Bg_FreeTilemapBuffer(v1->unk_04, 1); + Bg_FreeTilemapBuffer(v1->unk_04, 4); + Bg_FreeTilemapBuffer(v1->unk_04, 5); Heap_FreeToHeap(v1->unk_04); } @@ -679,7 +679,7 @@ static int ov97_0222C6F8(OverlayManager *param0, int *param1) v0 = ov97_022376C4(param0, 85, sizeof(UnkStruct_ov97_0222C388), 0x20000); v0->unk_00 = 85; - v0->unk_04 = sub_02018340(v0->unk_00); + v0->unk_04 = BgConfig_New(v0->unk_00); v0->unk_08 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; v0->unk_10 = SaveData_GetTrainerInfo(v0->unk_08); v0->unk_0C = SaveData_Pokedex(v0->unk_08); diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index b4acd7f474..92829ea6eb 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -243,25 +243,25 @@ static void ov97_0222D34C(OverlayManager *param0) sub_02001384(v1->unk_78, NULL, NULL); } - sub_0201ACF4(&v1->unk_18); - BGL_DeleteWindow(&v1->unk_18); + Window_ClearAndCopyToVRAM(&v1->unk_18); + Window_Remove(&v1->unk_18); - if (BGL_WindowAdded(&v1->unk_58)) { - sub_0201ACF4(&v1->unk_58); - BGL_DeleteWindow(&v1->unk_58); + if (Window_IsInUse(&v1->unk_58)) { + Window_ClearAndCopyToVRAM(&v1->unk_58); + Window_Remove(&v1->unk_58); } for (v0 = 0; v0 < 3; v0++) { if (v1->unk_28[v0].bgConfig) { - sub_0201ACF4(&v1->unk_28[v0]); - BGL_DeleteWindow(&v1->unk_28[v0]); + Window_ClearAndCopyToVRAM(&v1->unk_28[v0]); + Window_Remove(&v1->unk_28[v0]); } } - sub_02019044(v1->unk_00, 0); - sub_02019044(v1->unk_00, 1); - sub_02019044(v1->unk_00, 4); - sub_02019044(v1->unk_00, 5); + Bg_FreeTilemapBuffer(v1->unk_00, 0); + Bg_FreeTilemapBuffer(v1->unk_00, 1); + Bg_FreeTilemapBuffer(v1->unk_00, 4); + Bg_FreeTilemapBuffer(v1->unk_00, 5); Heap_FreeToHeap(v1->unk_00); } @@ -283,14 +283,14 @@ static void ov97_0222D40C(UnkStruct_ov97_0222D04C *param0, int param1) static void ov97_0222D444(Window *param0, u8 param1) { - if (BGL_WindowAdded(param0) == 1) { + if (Window_IsInUse(param0) == 1) { Window_Clear(param0, param1); } } static void ov97_0222D45C(Window *param0, u8 param1) { - if (BGL_WindowAdded(param0) == 1) { + if (Window_IsInUse(param0) == 1) { sub_0200E084(param0, param1); } } @@ -479,7 +479,7 @@ static void ov97_0222D6F8(OverlayManager *param0, int param1) v1 = &v2->unk_28[2]; if (v1->bgConfig == NULL) { - BGL_AddWindow(v2->unk_00, v1, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); + Window_Add(v2->unk_00, v1, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); } Window_Show(v1, 1, (1 + (18 + 12)), 3); @@ -518,7 +518,7 @@ static int ov97_0222D798(OverlayManager *param0) v0 = &v1->unk_28[2]; if (v0->bgConfig == NULL) { - BGL_AddWindow(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); + Window_Add(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); } Window_Show(v0, 1, (1 + (18 + 12)), 3); @@ -539,7 +539,7 @@ static int ov97_0222D814(OverlayManager *param0) v0 = &v1->unk_28[2]; if (v0->bgConfig == NULL) { - BGL_AddWindow(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); + Window_Add(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); } Window_Show(v0, 1, (1 + (18 + 12)), 3); @@ -560,7 +560,7 @@ static int ov97_0222D884(OverlayManager *param0) v0 = &v1->unk_28[2]; if (v0->bgConfig == NULL) { - BGL_AddWindow(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); + Window_Add(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); } Window_Show(v0, 1, (1 + (18 + 12)), 3); @@ -577,7 +577,7 @@ static void ov97_0222D8F4(OverlayManager *param0) v0 = &v1->unk_28[2]; if (v0->bgConfig == NULL) { - BGL_AddWindow(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); + Window_Add(v1->unk_00, v0, 0, 23, 10, 6, 4, 0, (((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8)); } Window_Show(v0, 1, (1 + (18 + 12)), 3); @@ -678,7 +678,7 @@ static int ov97_0222DA84(OverlayManager *param0) v0 = &v2->unk_28[1]; if (v0->bgConfig == NULL) { - BGL_AddWindow(v2->unk_00, v0, 0, 15, 9, 16, 8, 0, ((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6)); + Window_Add(v2->unk_00, v0, 0, 15, 9, 16, 8, 0, ((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6)); } Window_Show(v0, 1, (1 + (18 + 12)), 3); @@ -735,8 +735,8 @@ static void ov97_0222DB78(BgConfig *param0, int param1, u32 param2, u32 param3) v0.screenBase = param2 / 0x800; v0.charBase = param3 / 0x4000; - sub_020183C4(param0, param1, &v0, 0); - sub_02019EBC(param0, param1); + Bg_InitFromTemplate(param0, param1, &v0, 0); + Bg_ClearTilemap(param0, param1); } static void ov97_0222DBC4(BgConfig *param0) @@ -748,7 +748,7 @@ static void ov97_0222DBC4(BgConfig *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); ov97_0222DB78(param0, 0, 0xF000, 0x0); ov97_0222DB78(param0, 1, 0xF800, 0x8000); @@ -761,8 +761,8 @@ static void ov97_0222DC20(BgConfig *param0) sub_02006E84(116, 0, 4, 16 * 2 * 8, 16 * 2, 86); sub_02006E3C(116, 1, param0, 5, 0, 10 * 16 * 0x20, 1, 86); sub_02006E60(116, 2, param0, 5, 0, 32 * 24 * 2, 1, 86); - sub_02019E2C(param0, 5, 0, 0, 32, 24, 8); - sub_02019448(param0, 5); + Bg_ChangeTilemapRectPalette(param0, 5, 0, 0, 32, 24, 8); + Bg_CopyTilemapBufferToVRAM(param0, 5); } static void ov97_0222DC9C(BgConfig *param0) @@ -770,8 +770,8 @@ static void ov97_0222DC9C(BgConfig *param0) sub_02006E84(116, 0, 0, 16 * 2 * 8, 16 * 2, 86); sub_02006E3C(116, 1, param0, 1, 0, 10 * 16 * 0x20, 1, 86); sub_02006E60(116, 2, param0, 1, 0, 32 * 24 * 2, 1, 86); - sub_02019E2C(param0, 1, 0, 0, 32, 24, 8); - sub_02019448(param0, 1); + Bg_ChangeTilemapRectPalette(param0, 1, 0, 0, 32, 24, 8); + Bg_CopyTilemapBufferToVRAM(param0, 1); ov97_0222DC20(param0); } @@ -830,7 +830,7 @@ static void ov97_0222DDD0(OverlayManager *param0, int param1, u32 param2) v2[v4++] = Unk_ov97_0223E5B8[2]; if (v1->bgConfig == NULL) { - BGL_AddWindow(v0->unk_00, v1, 0, 8, 7, 16, v4 * 2, 0, param1); + Window_Add(v0->unk_00, v1, 0, 8, 7, 16, v4 * 2, 0, param1); } Window_Show(v1, 1, (1 + (18 + 12)), 3); @@ -845,7 +845,7 @@ static void ov97_0222DE78(OverlayManager *param0, Window *param1, u32 param2) v1->unk_10 = MessageLoader_Init(1, 26, 421, 86); v1->unk_0C = StringTemplate_Default(86); - BGL_FillWindow(param1, Font_GetAttribute(FONT_MESSAGE, FONTATTR_BG_COLOR)); + Window_FillTilemap(param1, Font_GetAttribute(FONT_MESSAGE, FONTATTR_BG_COLOR)); if (v1->unk_14) { v0 = v1->unk_14; @@ -874,7 +874,7 @@ static void ov97_0222DF10(OverlayManager *param0, Window *param1, u16 *param2) v0 = Strbuf_Init(36 + 1, 86); Strbuf_CopyNumChars(v0, param2, 36); - BGL_FillWindow(param1, Font_GetAttribute(FONT_SYSTEM, FONTATTR_BG_COLOR)); + Window_FillTilemap(param1, Font_GetAttribute(FONT_SYSTEM, FONTATTR_BG_COLOR)); Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); Window_Show(param1, 0, (1 + (18 + 12)), 3); Strbuf_Free(v0); @@ -933,8 +933,8 @@ static BOOL ov97_0222DFD4(OverlayManager *param0, UnkStruct_ov97_0222D04C *param *((u16 *)HW_BG_PLTT) = ((31 & 31) << 10 | (12 & 31) << 5 | (12 & 31)); - if (!BGL_WindowAdded(¶m1->unk_18)) { - BGL_AddWindow(param1->unk_00, ¶m1->unk_18, 0, 2, 19, 27, 4, 0, ((1 + (18 + 12)) + 9)); + if (!Window_IsInUse(¶m1->unk_18)) { + Window_Add(param1->unk_00, ¶m1->unk_18, 0, 2, 19, 27, 4, 0, ((1 + (18 + 12)) + 9)); } ov97_0222DE78(param0, ¶m1->unk_18, 0); @@ -965,9 +965,9 @@ static void ov97_0222E080(OverlayManager *param0, int *param1) *param1 = 17; break; case 4: - sub_0201ACF4(&v0->unk_26E0); - BGL_DeleteWindow(&v0->unk_26E0); - sub_02019EBC(v0->unk_00, 0); + Window_ClearAndCopyToVRAM(&v0->unk_26E0); + Window_Remove(&v0->unk_26E0); + Bg_ClearTilemap(v0->unk_00, 0); Sound_PlayEffect(1500); ov97_0222DDD0(param0, (((1 + (18 + 12)) + 9) + 26 * 6), 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -990,7 +990,7 @@ void ov97_0222E13C(UnkStruct_ov97_0222D04C *param0) ov97_0222D30C(param0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 0); - sub_02019EBC(param0->unk_00, 0); + Bg_ClearTilemap(param0->unk_00, 0); v0 = StringTemplate_Default(86); StringTemplate_SetNumber(v0, 0, param0->unk_26D0, 5, 2, 1); @@ -1082,7 +1082,7 @@ static int ov97_0222E2DC(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov97_0222D04C), 86); memset(v0, 0, sizeof(UnkStruct_ov97_0222D04C)); - v0->unk_00 = sub_02018340(86); + v0->unk_00 = BgConfig_New(86); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -1681,8 +1681,8 @@ static void ov97_0222F378(UnkStruct_ov97_0222E398 *param0) static void ov97_0222F388(void) { - sub_0201975C(1, 0x0); - sub_0201975C(5, 0x0); + Bg_MaskPalette(1, 0x0); + Bg_MaskPalette(5, 0x0); } static BOOL ov97_0222F39C(UnkStruct_ov97_0222E398 *param0, int param1, s8 param2) @@ -2024,8 +2024,8 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1) ov97_0222D30C(v3, 0); *param1 = 49; } else { - if (!BGL_WindowAdded(&v3->unk_58)) { - BGL_AddWindow(v3->unk_00, &v3->unk_58, 0, 3, 2, 26, 4, 0, ((((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8) + 6 * 4)); + if (!Window_IsInUse(&v3->unk_58)) { + Window_Add(v3->unk_00, &v3->unk_58, 0, 3, 2, 26, 4, 0, ((((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8) + 6 * 4)); } ov97_0222DF10(param0, &v3->unk_58, ov97_02238D54()); @@ -2095,7 +2095,7 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1) ov97_0222D40C(v3, -1); ov97_0222D45C(&v3->unk_18, 0); - sub_02019EBC(v3->unk_00, 0); + Bg_ClearTilemap(v3->unk_00, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); v2 = &v3->unk_8C.unk_50.val1; @@ -2133,8 +2133,8 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1) v3->unk_80 = ov97_02232148(v3->unk_04, &v3->unk_8C); - if (!BGL_WindowAdded(&v3->unk_58)) { - BGL_AddWindow(v3->unk_00, &v3->unk_58, 0, 3, 2, 26, 4, 0, ((((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8) + 6 * 4)); + if (!Window_IsInUse(&v3->unk_58)) { + Window_Add(v3->unk_00, &v3->unk_58, 0, 3, 2, 26, 4, 0, ((((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8) + 6 * 4)); } ov97_0222DF10(param0, &v3->unk_58, v3->unk_8C.unk_00.unk_00); @@ -2297,8 +2297,8 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1) ov97_0222D30C(v3, 0); *param1 = 49; } else { - if (!BGL_WindowAdded(&v3->unk_58)) { - BGL_AddWindow(v3->unk_00, &v3->unk_58, 0, 3, 2, 26, 4, 0, ((((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8) + 6 * 4)); + if (!Window_IsInUse(&v3->unk_58)) { + Window_Add(v3->unk_00, &v3->unk_58, 0, 3, 2, 26, 4, 0, ((((((1 + (18 + 12)) + 9) + 26 * 6) + 16 * 6) + 17 * 8) + 6 * 4)); } ov97_0222DF10(param0, &v3->unk_58, v3->unk_8C.unk_00.unk_00); diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index 6e9b249863..ed0fbac916 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -279,14 +279,14 @@ static void ov97_022304AC(UnkStruct_ov97_02230868 *param0) static void ov97_02230500(Window *param0, u8 param1) { - if (BGL_WindowAdded(param0) == 1) { + if (Window_IsInUse(param0) == 1) { Window_Clear(param0, param1); } } static void ov97_02230518(Window *param0, u8 param1) { - if (BGL_WindowAdded(param0) == 1) { + if (Window_IsInUse(param0) == 1) { sub_0200E084(param0, param1); } } @@ -328,11 +328,11 @@ static void ov97_022305EC(Window *param0, int param1) MessageLoader *v1 = MessageLoader_Init(1, 26, 421, 87); StringTemplate *v2 = StringTemplate_Default(87); - BGL_FillWindow(param0, Font_GetAttribute(FONT_MESSAGE, FONTATTR_BG_COLOR)); + Window_FillTilemap(param0, Font_GetAttribute(FONT_MESSAGE, FONTATTR_BG_COLOR)); v0 = MessageUtil_ExpandedStrbuf(v2, v1, param1, 87); Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A954(param0); + Window_CopyToVRAM(param0); Strbuf_Free(v0); MessageLoader_Free(v1); @@ -345,8 +345,8 @@ static void ov97_02230664(BgConfig *param0) sub_02006E84(116, 16, 0, 16 * 2 * 12, 16 * 2, 87); sub_02006E3C(116, 17, param0, 1, 0, 6 * 16 * 0x20, 1, 87); sub_02006E60(116, 18, param0, 1, 0, 32 * 24 * 2, 1, 87); - sub_02019E2C(param0, 1, 0, 0, 32, 24, 12); - sub_02019448(param0, 1); + Bg_ChangeTilemapRectPalette(param0, 1, 0, 0, 32, 24, 12); + Bg_CopyTilemapBufferToVRAM(param0, 1); } static int ov97_022306F4(OverlayManager *param0) @@ -425,8 +425,8 @@ static void ov97_02230868(UnkStruct_ov97_02230868 *param0) sub_02001384(param0->unk_2C28, NULL, NULL); param0->unk_2C28 = NULL; ov97_02230500(¶m0->unk_2C40, 0); - sub_0201ACF4(¶m0->unk_2C40); - BGL_DeleteWindow(¶m0->unk_2C40); + Window_ClearAndCopyToVRAM(¶m0->unk_2C40); + Window_Remove(¶m0->unk_2C40); } static BOOL ov97_022308B0(UnkStruct_ov97_02230868 *param0, Window *param1, TextColor param2) @@ -531,9 +531,9 @@ static BOOL ov97_02230AB0(UnkStruct_ov97_02230868 *param0, Window *param1, u32 p v1 = param0->unk_2BFC; - sub_0201ACF4(param1); - BGL_DeleteWindow(param1); - BGL_AddWindow(param0->unk_2A5C, param1, 2, v1->unk_04, v1->unk_08 + (4 - v2) * 2, v1->unk_0C, v1->unk_10 - (4 - v2) * 2, 15, param0->unk_2BF8); + Window_ClearAndCopyToVRAM(param1); + Window_Remove(param1); + Window_Add(param0->unk_2A5C, param1, 2, v1->unk_04, v1->unk_08 + (4 - v2) * 2, v1->unk_0C, v1->unk_10 - (4 - v2) * 2, 15, param0->unk_2BF8); ov97_02230530(param0, v0, v2, param1, 0); return 1; @@ -592,8 +592,8 @@ static void ov97_02230C44(UnkStruct_ov97_02230868 *param0, int param1, int param for (v0 = 0; v0 < sizeof(Unk_ov97_0223E680) / sizeof(UnkStruct_ov97_0223E680); v0++) { if ((v4[v0].unk_00 != param2) && (v4[v0].unk_00 != 2)) { if (param0->unk_2A68[v0].bgConfig) { - sub_0201ACF4(¶m0->unk_2A68[v0]); - BGL_DeleteWindow(¶m0->unk_2A68[v0]); + Window_ClearAndCopyToVRAM(¶m0->unk_2A68[v0]); + Window_Remove(¶m0->unk_2A68[v0]); } } } @@ -604,10 +604,10 @@ static void ov97_02230C44(UnkStruct_ov97_02230868 *param0, int param1, int param if (v4[v0].unk_00 == param2) { if (param0->unk_2A68[v0].bgConfig == NULL) { param0->unk_2BA8[v0] = v1; - BGL_AddWindow(param0->unk_2A5C, ¶m0->unk_2A68[v0], 0, v4[v0].unk_04, v4[v0].unk_08, v4[v0].unk_0C, v4[v0].unk_10, 15, v1); + Window_Add(param0->unk_2A5C, ¶m0->unk_2A68[v0], 0, v4[v0].unk_04, v4[v0].unk_08, v4[v0].unk_0C, v4[v0].unk_10, 15, v1); } - BGL_FillWindow(¶m0->unk_2A68[v0], Font_GetAttribute(v4[v0].unk_14, v4[v0].unk_1C)); + Window_FillTilemap(¶m0->unk_2A68[v0], Font_GetAttribute(v4[v0].unk_14, v4[v0].unk_1C)); v3 = v4[v0].unk_18; if (v4[v0].unk_24(param0, ¶m0->unk_2A68[v0], v3) == 1) { @@ -623,7 +623,7 @@ static void ov97_02230C44(UnkStruct_ov97_02230868 *param0, int param1, int param } } - sub_0201A954(¶m0->unk_2A68[v0]); + Window_CopyToVRAM(¶m0->unk_2A68[v0]); v1 += v4[v0].unk_0C * v4[v0].unk_10; } } @@ -643,10 +643,10 @@ static int ov97_02230E04(UnkStruct_ov97_02230868 *param0, Window *param1, int pa UnkStruct_ov97_0223E680 *v2 = Unk_ov97_0223E680 + param2; if (param1->bgConfig == NULL) { - BGL_AddWindow(param0->unk_2A5C, param1, 2, v2->unk_04, v2->unk_08, v2->unk_0C, v2->unk_10, 15, param3); + Window_Add(param0->unk_2A5C, param1, 2, v2->unk_04, v2->unk_08, v2->unk_0C, v2->unk_10, 15, param3); } - BGL_FillWindow(param1, v2->unk_1C); + Window_FillTilemap(param1, v2->unk_1C); if (v2->unk_20) { param0->unk_2A64 = MessageLoader_Init(1, 26, 421, 87); @@ -710,7 +710,7 @@ static void ov97_02230F58(UnkStruct_ov97_02230868 *param0, u32 param1, u32 param NNS_G2dGetUnpackedScreenData(v1, &v0); - sub_02019574(param0->unk_2A5C, param2, v0->rawData, param3); + Bg_LoadTilemapBuffer(param0->unk_2A5C, param2, v0->rawData, param3); Heap_FreeToHeap(v1); } @@ -733,8 +733,8 @@ static void ov97_02230F98(UnkStruct_ov97_02230868 *param0, int param1) ov97_02230F58(param0, 2, 3, 32 * 24 * 2); - sub_02019E2C(param0->unk_2A5C, 3, 0, 0, 32, 24, 11); - sub_02019448(param0->unk_2A5C, 3); + Bg_ChangeTilemapRectPalette(param0->unk_2A5C, 3, 0, 0, 32, 24, 11); + Bg_CopyTilemapBufferToVRAM(param0->unk_2A5C, 3); } static void ov97_02231088(OverlayManager *param0, int *param1, int (*param2)(OverlayManager *)) @@ -831,7 +831,7 @@ static int ov97_02231224(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov97_02230868), 87); memset(v0, 0, sizeof(UnkStruct_ov97_02230868)); - v0->unk_2A5C = sub_02018340(87); + v0->unk_2A5C = BgConfig_New(87); v0->unk_00 = 87; sub_0200F344(0, 0x0); @@ -1143,8 +1143,8 @@ static int ov97_0223161C(OverlayManager *param0, int *param1) case 11: ov97_02230868(v4); ov97_02230518(&v4->unk_2C30, 0); - sub_0201ACF4(&v4->unk_2C30); - BGL_DeleteWindow(&v4->unk_2C30); + Window_ClearAndCopyToVRAM(&v4->unk_2C30); + Window_Remove(&v4->unk_2C30); *param1 = 3; break; case 12: @@ -1163,8 +1163,8 @@ static int ov97_0223161C(OverlayManager *param0, int *param1) case 16: ov97_02230868(v4); ov97_02230518(&v4->unk_2C30, 0); - sub_0201ACF4(&v4->unk_2C30); - BGL_DeleteWindow(&v4->unk_2C30); + Window_ClearAndCopyToVRAM(&v4->unk_2C30); + Window_Remove(&v4->unk_2C30); ov97_02230C44(v4, 0, 3); ov97_02230664(v4->unk_2A5C); ov97_02230410(v4); @@ -1185,8 +1185,8 @@ static int ov97_0223161C(OverlayManager *param0, int *param1) v3 = ov97_02231CA0(v4, &v4->unk_2A68[16]); if ((v3 == 0) && v4->unk_2C90) { - BGL_FillWindow(&v4->unk_2A68[16], 0); - sub_0201A954(&v4->unk_2A68[16]); + Window_FillTilemap(&v4->unk_2A68[16], 0); + Window_CopyToVRAM(&v4->unk_2A68[16]); v4->unk_2C90 = 0; } @@ -1371,7 +1371,7 @@ static int ov97_02231CA0(UnkStruct_ov97_02230868 *param0, Window *param1) v8 = MessageLoader_Init(1, 26, 421, 87); v2 = 0; - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); for (v0 = 0; v0 < v1; v0++) { v5 = CommInfo_TrainerInfo(v10[v0]); @@ -1399,7 +1399,7 @@ static int ov97_02231CA0(UnkStruct_ov97_02230868 *param0, Window *param1) } if (v1) { - sub_0201A954(param1); + Window_CopyToVRAM(param1); } MessageLoader_Free(v8); @@ -1416,13 +1416,13 @@ static void ov97_02231E78(UnkStruct_ov97_02230868 *param0, Window *param1, int p param0->unk_2A64 = MessageLoader_Init(1, 26, 421, 87); param0->unk_2A60 = StringTemplate_Default(87); - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); StringTemplate_SetNumber(param0->unk_2A60, 0, param0->unk_2C54, 1, 1, 1); v0 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, 56, 87); Text_AddPrinterWithParamsAndColor(param1, FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A954(param1); + Window_CopyToVRAM(param1); Strbuf_Free(v0); MessageLoader_Free(param0->unk_2A64); @@ -1446,25 +1446,25 @@ static int ov97_02231F38(OverlayManager *param0, int *param1) for (v0 = 0; v0 < sizeof(Unk_ov97_0223E680) / sizeof(UnkStruct_ov97_0223E680); v0++) { if (v1->unk_2A68[v0].bgConfig) { - sub_0201ACF4(&v1->unk_2A68[v0]); - BGL_DeleteWindow(&v1->unk_2A68[v0]); + Window_ClearAndCopyToVRAM(&v1->unk_2A68[v0]); + Window_Remove(&v1->unk_2A68[v0]); } } if (v1->unk_2C30.bgConfig) { - sub_0201ACF4(&v1->unk_2C30); - BGL_DeleteWindow(&v1->unk_2C30); + Window_ClearAndCopyToVRAM(&v1->unk_2C30); + Window_Remove(&v1->unk_2C30); } if (v1->unk_2C40.bgConfig) { - sub_0201ACF4(&v1->unk_2C40); - BGL_DeleteWindow(&v1->unk_2C40); + Window_ClearAndCopyToVRAM(&v1->unk_2C40); + Window_Remove(&v1->unk_2C40); } - sub_02019044(v1->unk_2A5C, 0); - sub_02019044(v1->unk_2A5C, 1); - sub_02019044(v1->unk_2A5C, 2); - sub_02019044(v1->unk_2A5C, 3); + Bg_FreeTilemapBuffer(v1->unk_2A5C, 0); + Bg_FreeTilemapBuffer(v1->unk_2A5C, 1); + Bg_FreeTilemapBuffer(v1->unk_2A5C, 2); + Bg_FreeTilemapBuffer(v1->unk_2A5C, 3); Heap_FreeToHeap(v1->unk_2A5C); sub_02000EC4(FS_OVERLAY_ID(overlay97), &Unk_ov97_0223D71C); Heap_Destroy(91); diff --git a/src/overlay097/ov97_02232054.c b/src/overlay097/ov97_02232054.c index 6990cae836..96f99cafc9 100644 --- a/src/overlay097/ov97_02232054.c +++ b/src/overlay097/ov97_02232054.c @@ -42,7 +42,7 @@ void ov97_02232074(BgConfig *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -62,8 +62,8 @@ void ov97_02232074(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { @@ -83,8 +83,8 @@ void ov97_02232074(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilemap(param0, 1); } { @@ -104,8 +104,8 @@ void ov97_02232074(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilemap(param0, 2); } { @@ -125,8 +125,8 @@ void ov97_02232074(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v4, 0); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v4, 0); + Bg_ClearTilemap(param0, 3); } } diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 25e6456ba5..0b65813487 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -427,11 +427,11 @@ static void ov97_02233DD0(UnkStruct_ov97_02234A2C *param0, UnkStruct_ov97_02233D } if (param1->unk_00->bgConfig == NULL) { - BGL_AddWindow(param0->unk_20, param1->unk_00, param1->unk_24, param1->unk_08, param1->unk_0C, param1->unk_10, param1->unk_14, 15, param1->unk_20); + Window_Add(param0->unk_20, param1->unk_00, param1->unk_24, param1->unk_08, param1->unk_0C, param1->unk_10, param1->unk_14, 15, param1->unk_20); } if (!(param2 & 0x2)) { - BGL_FillWindow(param1->unk_00, param1->unk_30); + Window_FillTilemap(param1->unk_00, param1->unk_30); } if (param1->unk_34 != -1) { @@ -478,7 +478,7 @@ static void ov97_02233DD0(UnkStruct_ov97_02234A2C *param0, UnkStruct_ov97_02233D } if (!(param2 & 0x4)) { - sub_0201A954(param1->unk_00); + Window_CopyToVRAM(param1->unk_00); } if (param2 & 0x8) { @@ -1137,7 +1137,7 @@ static void ov97_02234A2C(UnkStruct_ov97_02234A2C *param0, int param1) static void ov97_02234AB4(UnkStruct_ov97_02234A2C *param0, BoxPokemonGBA *param1) { - u16 *v0 = sub_02019FE4(param0->unk_20, 2); + u16 *v0 = Bg_GetTilemapBuffer(param0->unk_20, 2); u8 v1; int v2; @@ -1157,7 +1157,7 @@ static void ov97_02234AB4(UnkStruct_ov97_02234A2C *param0, BoxPokemonGBA *param1 v1 >>= 1; } - sub_02019448(param0->unk_20, 2); + Bg_CopyTilemapBufferToVRAM(param0->unk_20, 2); } static void ov97_02234B0C(UnkStruct_ov97_02234A2C *param0, BoxPokemonGBA *param1) @@ -1197,7 +1197,7 @@ static void ov97_02234B0C(UnkStruct_ov97_02234A2C *param0, BoxPokemonGBA *param1 ov97_02234AB4(param0, param1); if (param1 == NULL) { - sub_0201A954(v4.unk_00); + Window_CopyToVRAM(v4.unk_00); return; } @@ -1292,7 +1292,7 @@ static void ov97_02234D28(BgConfig *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -1312,8 +1312,8 @@ static void ov97_02234D28(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { @@ -1333,8 +1333,8 @@ static void ov97_02234D28(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilemap(param0, 1); } { @@ -1354,8 +1354,8 @@ static void ov97_02234D28(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilemap(param0, 2); } { @@ -1375,8 +1375,8 @@ static void ov97_02234D28(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v4, 0); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v4, 0); + Bg_ClearTilemap(param0, 3); } } @@ -1412,8 +1412,8 @@ static void ov97_02234DFC(UnkStruct_ov97_02234A2C *param0) static void ov97_02234E7C(UnkStruct_ov97_02234A2C *param0) { sub_02006E60(116, 20, param0->unk_20, 2, 0, 32 * 24 * 2, 1, 78); - sub_02019E2C(param0->unk_20, 2, 0, 0, 32, 24, Unk_ov97_0223EA60[param0->unk_00]); - sub_02019448(param0->unk_20, 2); + Bg_ChangeTilemapRectPalette(param0->unk_20, 2, 0, 0, 32, 24, Unk_ov97_0223EA60[param0->unk_00]); + Bg_CopyTilemapBufferToVRAM(param0->unk_20, 2); } static void ov97_02234ECC(UnkStruct_ov97_02234A2C *param0) @@ -1479,8 +1479,8 @@ static void ov97_02234F88(UnkStruct_ov97_02234A2C *param0) } sub_02006E60(116, 21, param0->unk_20, 2, 0, 32 * 24 * 2, 1, 78); - sub_02019E2C(param0->unk_20, 2, 0, 0, 32, 24, Unk_ov97_0223EA60[param0->unk_00]); - sub_02019448(param0->unk_20, 2); + Bg_ChangeTilemapRectPalette(param0->unk_20, 2, 0, 0, 32, 24, Unk_ov97_0223EA60[param0->unk_00]); + Bg_CopyTilemapBufferToVRAM(param0->unk_20, 2); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); Font_LoadTextPalette(0, 14 * 32, 78); sub_0200DAA4(param0->unk_20, 0, 0x3F0, 14, 0, 78); @@ -1495,8 +1495,8 @@ static void ov97_02235158(Window *param0) { if (param0->bgConfig) { sub_0200E084(param0, 0); - sub_0201ACF4(param0); - BGL_DeleteWindow(param0); + Window_ClearAndCopyToVRAM(param0); + Window_Remove(param0); } } @@ -1580,10 +1580,10 @@ static void ov97_022351F0(UnkStruct_ov97_02234A2C *param0) gCoreSys.unk_65 = 0; GXLayers_SwapDisplay(); - sub_02019044(param0->unk_20, 0); - sub_02019044(param0->unk_20, 1); - sub_02019044(param0->unk_20, 2); - sub_02019044(param0->unk_20, 3); + Bg_FreeTilemapBuffer(param0->unk_20, 0); + Bg_FreeTilemapBuffer(param0->unk_20, 1); + Bg_FreeTilemapBuffer(param0->unk_20, 2); + Bg_FreeTilemapBuffer(param0->unk_20, 3); } static void ov97_02235310(UnkStruct_ov97_02234A2C *param0) @@ -1639,7 +1639,7 @@ static void ov97_022353CC(void *param0) sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8(v0->unk_20); + Bg_RunScheduledUpdates(v0->unk_20); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -1775,7 +1775,7 @@ static int ov97_02235624(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov97_02234A2C), 78); memset(v0, 0, sizeof(UnkStruct_ov97_02234A2C)); - v0->unk_20 = sub_02018340(78); + v0->unk_20 = BgConfig_New(78); v0->unk_E8EC = sub_02015920(78); sub_0200F344(0, 0x0); diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index 67fd6e73b3..0d7fe690ac 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -134,8 +134,8 @@ void ov97_022376FC(BgConfig *param0, int param1, u8 param2, u32 param3, u32 para v0.screenBase = param3 / 0x800; v0.charBase = param4 / 0x4000; - sub_020183C4(param0, param1, &v0, 0); - sub_02019EBC(param0, param1); + Bg_InitFromTemplate(param0, param1, &v0, 0); + Bg_ClearTilemap(param0, param1); } void ov97_02237784(int param0) @@ -223,7 +223,7 @@ static int ov97_02237870(UnkStruct_ov97_02237808 *param0, int param1) param0->unk_4C = param1; if (param0->unk_08 == 1) { - BGL_FillWindow(param0->unk_10, param0->unk_48); + Window_FillTilemap(param0->unk_10, param0->unk_48); } if (param0->unk_4C != -1) { @@ -243,7 +243,7 @@ static int ov97_02237870(UnkStruct_ov97_02237808 *param0, int param1) int v5, v6; v5 = Font_CalcStrbufWidth(param0->unk_40, v1, Font_GetAttribute(param0->unk_40, 2)); - v6 = sub_0201C294(param0->unk_10) * 8 - v5; + v6 = Window_GetWidth(param0->unk_10) * 8 - v5; v0 = Text_AddPrinterWithParamsAndColor(param0->unk_10, param0->unk_40, v1, v6, param0->unk_24, param0->unk_50, param0->unk_44, NULL); param0->unk_0C = 0; @@ -268,15 +268,15 @@ int ov97_0223795C(BgConfig *param0, UnkStruct_ov97_02237808 *param1, int param2, int v0; if (param1->unk_10->bgConfig == NULL) { - BGL_AddWindow(param0, param1->unk_10, param1->unk_2C, param2, param3, param1->unk_18, param1->unk_1C, param1->unk_30, param1->unk_28); + Window_Add(param0, param1->unk_10, param1->unk_2C, param2, param3, param1->unk_18, param1->unk_1C, param1->unk_30, param1->unk_28); v0 = ov97_02237870(param1, param4); } else { if (param2 != -1) { - sub_0201C2AC(param1->unk_10, param2); + Window_SetXPos(param1->unk_10, param2); } if (param3 != -1) { - sub_0201C2B0(param1->unk_10, param3); + Window_SetYPos(param1->unk_10, param3); } v0 = ov97_02237870(param1, param4); @@ -528,7 +528,7 @@ static void ov97_02237E58(void *param0) sub_0200A858(); if (v0->unk_00) { - sub_0201C2B8(v0->unk_00); + Bg_RunScheduledUpdates(v0->unk_00); } OS_SetIrqCheckFlag(OS_IE_V_BLANK); @@ -680,12 +680,12 @@ void ov97_02238194(BgConfig *param0, UnkStruct_0202DF40 *param1) NNS_G2dGetUnpackedScreenData(v4, &v3); - sub_02019574(param0, 5, v3->rawData, 32 * 24 * 2); + Bg_LoadTilemapBuffer(param0, 5, v3->rawData, 32 * 24 * 2); Heap_FreeToHeap(v4); } - sub_02019E2C(param0, 5, 0, 0, 32, 24, 8 + v0); - sub_0201C3C0(param0, 5); + Bg_ChangeTilemapRectPalette(param0, 5, 0, 0, 32, 24, 8 + v0); + Bg_ScheduleTilemapTransfer(param0, 5); v2->unk_F08 = ov97_02238174; v2->unk_00 = param0; diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index a604227c02..f32f85b40a 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -307,7 +307,7 @@ int ov98_022471C8 (OverlayManager * param0, int * param1) MI_CpuClear8(v0, sizeof(UnkStruct_ov98_02247704)); v0->unk_00 = OverlayManager_Args(param0); - v0->unk_04 = sub_02018340(109); + v0->unk_04 = BgConfig_New(109); sub_0201DBEC(64, 109); SetAutorepeat(4, 8); @@ -445,7 +445,7 @@ static void ov98_022474E8 (void * param0) sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8(v0->unk_04); + Bg_RunScheduledUpdates(v0->unk_04); inline_ov61_0222C1FC(&v0->unk_EC); OS_SetIrqCheckFlag(OS_IE_V_BLANK); @@ -486,7 +486,7 @@ static void ov98_02247510(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -545,25 +545,25 @@ static void ov98_02247510(BgConfig *param0) 0 }, }; - sub_020183C4(param0, 0, &v2[0], 0); - sub_02019EBC(param0, 0); - sub_02019184(param0, 0, 0, 0); - sub_02019184(param0, 0, 3, 0); + Bg_InitFromTemplate(param0, 0, &v2[0], 0); + Bg_ClearTilemap(param0, 0); + Bg_SetOffset(param0, 0, 0, 0); + Bg_SetOffset(param0, 0, 3, 0); - sub_020183C4(param0, 1, &v2[1], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 1, &v2[1], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); - sub_020183C4(param0, 2, &v2[2], 0); - sub_02019EBC(param0, 2); - sub_02019184(param0, 2, 0, 0); - sub_02019184(param0, 2, 3, 0); + Bg_InitFromTemplate(param0, 2, &v2[2], 0); + Bg_ClearTilemap(param0, 2); + Bg_SetOffset(param0, 2, 0, 0); + Bg_SetOffset(param0, 2, 3, 0); - sub_020183C4(param0, 3, &v2[3], 0); - sub_02019EBC(param0, 3); - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_InitFromTemplate(param0, 3, &v2[3], 0); + Bg_ClearTilemap(param0, 3); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); } { @@ -596,29 +596,29 @@ static void ov98_02247510(BgConfig *param0) 0 }, }; - sub_020183C4(param0, 4, &v3[0], 0); - sub_02019EBC(param0, 4); - sub_02019184(param0, 4, 0, 0); - sub_02019184(param0, 4, 3, 0); + Bg_InitFromTemplate(param0, 4, &v3[0], 0); + Bg_ClearTilemap(param0, 4); + Bg_SetOffset(param0, 4, 0, 0); + Bg_SetOffset(param0, 4, 3, 0); - sub_020183C4(param0, 5, &v3[1], 0); - sub_02019EBC(param0, 5); - sub_02019184(param0, 5, 0, 0); - sub_02019184(param0, 5, 3, 0); + Bg_InitFromTemplate(param0, 5, &v3[1], 0); + Bg_ClearTilemap(param0, 5); + Bg_SetOffset(param0, 5, 0, 0); + Bg_SetOffset(param0, 5, 3, 0); } - sub_02019690(0, 32, 0, 109); - sub_02019690(4, 32, 0, 109); + Bg_ClearTilesRange(0, 32, 0, 109); + Bg_ClearTilesRange(4, 32, 0, 109); } static void ov98_022476D0(BgConfig *param0) { - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); } static void ov98_02247704 (UnkStruct_ov98_02247704 * param0) @@ -639,8 +639,8 @@ static void ov98_02247704 (UnkStruct_ov98_02247704 * param0) sub_0200710C(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, 109); sub_020070E8(v1, 10, v0, 5, 0, 0, 0, 109); sub_0200710C(v1, 11, v0, 5, 0, 32 * 24 * 2, 0, 109); - sub_0201975C(0, 0); - sub_0201975C(4, 0); + Bg_MaskPalette(0, 0); + Bg_MaskPalette(4, 0); inline_ov61_0222C3B0(¶m0->unk_EC, v1, 4, 109); @@ -661,22 +661,22 @@ static void ov98_02247704 (UnkStruct_ov98_02247704 * param0) static void ov98_02247A24 (UnkStruct_ov98_02247704 * param0) { - BGL_AddWindow(param0->unk_04, ¶m0->unk_68, 0, 4, 4, 23, 16, 13, (((1 + (18 + 12)) + 9) + 27 * 4)); - BGL_FillWindow(¶m0->unk_68, 0x0); - BGL_AddWindow(param0->unk_04, ¶m0->unk_58, 0, 4, 1, 24, 2, 13, ((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16)); - BGL_FillWindow(¶m0->unk_58, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_68, 0, 4, 4, 23, 16, 13, (((1 + (18 + 12)) + 9) + 27 * 4)); + Window_FillTilemap(¶m0->unk_68, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_58, 0, 4, 1, 24, 2, 13, ((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16)); + Window_FillTilemap(¶m0->unk_58, 0x0); ov98_022498CC(¶m0->unk_58, param0->unk_3C, 0, 1, 1, TEXT_COLOR(15, 14, 0)); - BGL_AddWindow(param0->unk_04, ¶m0->unk_48, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9)); - BGL_FillWindow(¶m0->unk_48, 0x0); + Window_Add(param0->unk_04, ¶m0->unk_48, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9)); + Window_FillTilemap(¶m0->unk_48, 0x0); } static void ov98_02247ACC (UnkStruct_ov98_02247704 * param0) { - BGL_DeleteWindow(¶m0->unk_48); - BGL_DeleteWindow(¶m0->unk_58); - BGL_DeleteWindow(¶m0->unk_68); + Window_Remove(¶m0->unk_48); + Window_Remove(¶m0->unk_58); + Window_Remove(¶m0->unk_68); } static void ov98_02247AE8 (UnkStruct_ov98_02247704 * param0, int param1, int param2) @@ -747,7 +747,7 @@ static int ov98_02247B98 (UnkStruct_ov98_02247704 * param0) v2 = Unk_ov98_02249C2C; } - BGL_AddWindow(param0->unk_04, ¶m0->unk_78, 0, v3[0], v3[1], v3[2], v3[3], 13, ((((1 + (18 + 12)) + 9) + 27 * 4))); + Window_Add(param0->unk_04, ¶m0->unk_78, 0, v3[0], v3[1], v3[2], v3[3], 13, (((1 + (18 + 12)) + 9) + 27 * 4)); param0->unk_A0 = sub_02013A04(v5, 109); @@ -761,7 +761,7 @@ static int ov98_02247B98 (UnkStruct_ov98_02247704 * param0) Window_Show(¶m0->unk_78, 1, (1 + (18 + 12)), 11); sub_0200E084(¶m0->unk_48, 1); - sub_0201A954(¶m0->unk_78); + Window_CopyToVRAM(¶m0->unk_78); } param0->unk_94++; @@ -789,8 +789,8 @@ static int ov98_02247B98 (UnkStruct_ov98_02247704 * param0) sub_02013A3C(param0->unk_A0); sub_02001384(param0->unk_A4, NULL, NULL); Window_Clear(¶m0->unk_78, 1); - sub_0201ACF4(¶m0->unk_78); - BGL_DeleteWindow(¶m0->unk_78); + Window_ClearAndCopyToVRAM(¶m0->unk_78); + Window_Remove(¶m0->unk_78); param0->unk_08 = param0->unk_9C; break; } @@ -908,7 +908,7 @@ static void ov98_02247F08 (UnkStruct_ov98_02247704 * param0) { Strbuf* v0; - BGL_FillWindow(¶m0->unk_D4, 0xf0f); + Window_FillTilemap(¶m0->unk_D4, 0xf0f); v0 = MessageLoader_GetNewStrbuf(param0->unk_34, 42); Text_AddPrinterWithParams(¶m0->unk_D4, FONT_SYSTEM, v0, Unk_ov98_02249D60[0][0] + 12, Unk_ov98_02249D60[0][1], TEXT_SPEED_NO_TRANSFER, NULL); @@ -918,13 +918,13 @@ static void ov98_02247F08 (UnkStruct_ov98_02247704 * param0) Text_AddPrinterWithParams(¶m0->unk_D4, FONT_SYSTEM, v0, Unk_ov98_02249D60[1][0] + 12, Unk_ov98_02249D60[1][1], TEXT_SPEED_NO_TRANSFER, NULL); Strbuf_Free(v0); ColoredArrow_Print(param0->unk_E4, ¶m0->unk_D4, Unk_ov98_02249D60[param0->unk_B0][0], Unk_ov98_02249D60[param0->unk_B0][1]); - sub_0201A954(¶m0->unk_D4); + Window_CopyToVRAM(¶m0->unk_D4); } static void ov98_02247FA4 (UnkStruct_ov98_02247704 * param0) { - BGL_FillWindow(¶m0->unk_D4, 0xf0f); - sub_0201A954(¶m0->unk_D4); + Window_FillTilemap(¶m0->unk_D4, 0xf0f); + Window_CopyToVRAM(¶m0->unk_D4); } static void ov98_02247FBC (UnkStruct_ov98_02247704 * param0) @@ -934,32 +934,32 @@ static void ov98_02247FBC (UnkStruct_ov98_02247704 * param0) param0->unk_BC = 0; if (param0->unk_AC + 6 != param0->unk_B4) { - sub_02019CB8(param0->unk_04, 3, 1 + (param0->unk_C0 * 20), 14, 17, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 2 + (param0->unk_C0 * 20), 15, 17, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 3 + (param0->unk_C0 * 20), 16, 17, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 4 + (param0->unk_C0 * 20), 17, 17, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 11 + (param0->unk_C0 * 20), 14, 18, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 12 + (param0->unk_C0 * 20), 15, 18, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 13 + (param0->unk_C0 * 20), 16, 18, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 14 + (param0->unk_C0 * 20), 17, 18, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 1 + (param0->unk_C0 * 20), 14, 17, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 2 + (param0->unk_C0 * 20), 15, 17, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 3 + (param0->unk_C0 * 20), 16, 17, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 4 + (param0->unk_C0 * 20), 17, 17, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 11 + (param0->unk_C0 * 20), 14, 18, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 12 + (param0->unk_C0 * 20), 15, 18, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 13 + (param0->unk_C0 * 20), 16, 18, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 14 + (param0->unk_C0 * 20), 17, 18, 1, 1, 9); } else { - sub_02019CB8(param0->unk_04, 3, 0, 14, 17, 4, 2, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 0, 14, 17, 4, 2, 9); } if (param0->unk_AC != 0) { - sub_02019CB8(param0->unk_04, 3, 5 + (param0->unk_C0 * 20), 14, 3, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 6 + (param0->unk_C0 * 20), 15, 3, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 7 + (param0->unk_C0 * 20), 16, 3, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 8 + (param0->unk_C0 * 20), 17, 3, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 15 + (param0->unk_C0 * 20), 14, 4, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 16 + (param0->unk_C0 * 20), 15, 4, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 17 + (param0->unk_C0 * 20), 16, 4, 1, 1, 9); - sub_02019CB8(param0->unk_04, 3, 18 + (param0->unk_C0 * 20), 17, 4, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 5 + (param0->unk_C0 * 20), 14, 3, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 6 + (param0->unk_C0 * 20), 15, 3, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 7 + (param0->unk_C0 * 20), 16, 3, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 8 + (param0->unk_C0 * 20), 17, 3, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 15 + (param0->unk_C0 * 20), 14, 4, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 16 + (param0->unk_C0 * 20), 15, 4, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 17 + (param0->unk_C0 * 20), 16, 4, 1, 1, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 18 + (param0->unk_C0 * 20), 17, 4, 1, 1, 9); } else { - sub_02019CB8(param0->unk_04, 3, 0, 14, 3, 4, 2, 9); + Bg_FillTilemapRect(param0->unk_04, 3, 0, 14, 3, 4, 2, 9); } - sub_0201C3C0(param0->unk_04, 3); + Bg_ScheduleTilemapTransfer(param0->unk_04, 3); } } @@ -969,8 +969,8 @@ static void ov98_022482CC (UnkStruct_ov98_02247704 * param0) int v1 = 0; Strbuf* v2; Strbuf* v3; - - BGL_FillWindow(¶m0->unk_C4, 0x0f0f); + + Window_FillTilemap(¶m0->unk_C4, 0x0f0f); v2 = MessageLoader_GetNewStrbuf(param0->unk_34, 44); v3 = Strbuf_Init(Strbuf_Length(v2), 109); for (v0 = param0->unk_AC; v0 < param0->unk_AC + 6; v0++) { @@ -980,7 +980,7 @@ static void ov98_022482CC (UnkStruct_ov98_02247704 * param0) } Strbuf_Free(v2); Strbuf_Free(v3); - sub_0201A954(¶m0->unk_C4); + Window_CopyToVRAM(¶m0->unk_C4); } // clang-format off @@ -1037,7 +1037,7 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) add r1, #0xc4 mov r2, #2 mov r3, #1 - bl BGL_AddWindow + bl Window_Add mov r0, #0x13 str r0, [sp] mov r0, #0x1e @@ -1054,11 +1054,11 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) add r1, #0xd4 mov r2, #2 mov r3, #1 - bl BGL_AddWindow + bl Window_Add add r0, r5, #0 add r0, #0xc4 mov r1, #0xf - bl BGL_FillWindow + bl Window_FillTilemap ldr r0, [sp, #0x14] bl Strbuf_Length mov r1, #0x6d @@ -1101,11 +1101,11 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) bl Window_Show add r0, r5, #0 add r0, #0xc4 - bl sub_0201A954 + bl Window_CopyToVRAM add r0, r5, #0 add r0, #0xd4 mov r1, #0xf - bl BGL_FillWindow + bl Window_FillTilemap add r0, r5, #0 add r0, #0xd4 mov r1, #1 @@ -1114,7 +1114,7 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) bl Window_Show add r0, r5, #0 add r0, #0xd4 - bl sub_0201A954 + bl Window_CopyToVRAM mov r0, #0x6d bl ColoredArrow_New add r1, r5, #0 @@ -1123,14 +1123,14 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) add r0, r5, #0 add r0, #0x48 mov r1, #0xf - bl BGL_FillWindow + bl Window_FillTilemap add r0, r5, #0 add r0, #0x48 mov r1, #1 bl sub_0200E084 add r0, r5, #0 add r0, #0x48 - bl sub_0201ACF4 + bl Window_ClearAndCopyToVRAM mov r0, #8 mov r1, #1 bl GXLayers_EngineAToggleLayers @@ -1327,27 +1327,27 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) bl Window_Clear add r0, r5, #0 add r0, #0xc4 - bl sub_0201ACF4 + bl Window_ClearAndCopyToVRAM add r0, r5, #0 add r0, #0xc4 - bl BGL_DeleteWindow + bl Window_Remove add r0, r5, #0 add r0, #0xd4 mov r1, #0 bl Window_Clear add r0, r5, #0 add r0, #0xd4 - bl sub_0201ACF4 + bl Window_ClearAndCopyToVRAM add r0, r5, #0 add r0, #0xd4 - bl BGL_DeleteWindow + bl Window_Remove add r0, r5, #0 add r0, #0xe4 ldr r0, [r0, #0] bl ColoredArrow_Free ldr r0, [r5, #4] mov r1, #3 - bl sub_02019EBC + bl Bg_ClearTilemap mov r0, #8 mov r1, #0 bl GXLayers_EngineAToggleLayers @@ -2389,7 +2389,7 @@ static void ov98_02249714 (UnkStruct_ov98_02247704 * param0, MessageLoader * par StringTemplate_Format(param0->unk_20, param0->unk_38, v0); Strbuf_Free(v0); - BGL_FillWindow(¶m0->unk_48, 0xf0f); + Window_FillTilemap(¶m0->unk_48, 0xf0f); sub_0200E060(¶m0->unk_48, 0, 1, 10); param0->unk_44 = Text_AddPrinterWithParams(¶m0->unk_48, FONT_MESSAGE, param0->unk_38, 0, 0, param3, NULL); @@ -2490,7 +2490,7 @@ static void ov98_02249900 (UnkStruct_ov98_02247704 * param0, int param1) MessageLoader_GetStrbuf(param0->unk_30, param1, v0); StringTemplate_Format(param0->unk_20, param0->unk_40, v0); - BGL_FillWindow(¶m0->unk_68, 15); + Window_FillTilemap(¶m0->unk_68, 15); Window_Show(¶m0->unk_68, 1, (1 + (18 + 12)), 11); param0->unk_44 = Text_AddPrinterWithParams(¶m0->unk_68, FONT_MESSAGE, param0->unk_40, 0, 0, TEXT_SPEED_INSTANT, NULL); diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index 938743e3af..936c2f94b1 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -118,7 +118,7 @@ int ov99_021D0D80(OverlayManager *param0, int *param1) sub_02002F70(v0->unk_0C, 3, 0x200, 75); sub_02003858(v0->unk_0C, 1); - v0->unk_08 = sub_02018340(75); + v0->unk_08 = BgConfig_New(75); sub_0201DBEC(64, 75); SetAutorepeat(4, 8); @@ -175,8 +175,8 @@ int ov99_021D0D80(OverlayManager *param0, int *param1) sub_0200F44C(0, 0); sub_0200F44C(1, 0); - sub_02019120(1, 1); - sub_02019120(5, 1); + Bg_ToggleLayer(1, 1); + Bg_ToggleLayer(5, 1); return 1; } @@ -313,14 +313,14 @@ static void ov99_021D1270(UnkStruct_ov99_021D2CB0 *param0) param0->unk_110C = NULL; param0->unk_1108 = NULL; - sub_02019120(1, 0); - sub_02019120(5, 0); - sub_02019044(param0->unk_08, 7); - sub_02019044(param0->unk_08, 5); - sub_02019044(param0->unk_08, 6); - sub_02019044(param0->unk_08, 3); - sub_02019044(param0->unk_08, 2); - sub_02019044(param0->unk_08, 1); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(5, 0); + Bg_FreeTilemapBuffer(param0->unk_08, 7); + Bg_FreeTilemapBuffer(param0->unk_08, 5); + Bg_FreeTilemapBuffer(param0->unk_08, 6); + Bg_FreeTilemapBuffer(param0->unk_08, 3); + Bg_FreeTilemapBuffer(param0->unk_08, 2); + Bg_FreeTilemapBuffer(param0->unk_08, 1); Heap_FreeToHeap(param0->unk_08); ov99_021D1A4C(param0->unk_10); @@ -334,7 +334,7 @@ void ov99_021D12F0(UnkStruct_ov99_021D2CB0 *param0) ov99_021D1270(param0); - param0->unk_08 = sub_02018340(75); + param0->unk_08 = BgConfig_New(75); ov99_021D1580(param0->unk_08); } @@ -342,10 +342,10 @@ static void ov99_021D1314(UnkStruct_ov99_021D2CB0 *param0) { GF_ASSERT(param0->unk_1108 == NULL); - sub_02019044(param0->unk_08, 1); - sub_02019044(param0->unk_08, 2); - sub_02019044(param0->unk_08, 3); - sub_02019044(param0->unk_08, 7); + Bg_FreeTilemapBuffer(param0->unk_08, 1); + Bg_FreeTilemapBuffer(param0->unk_08, 2); + Bg_FreeTilemapBuffer(param0->unk_08, 3); + Bg_FreeTilemapBuffer(param0->unk_08, 7); Heap_FreeToHeap(param0->unk_08); } @@ -356,7 +356,7 @@ static void ov99_021D1350(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_0C); - sub_0201C2B8(v0->unk_08); + Bg_RunScheduledUpdates(v0->unk_08); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -396,7 +396,7 @@ static void ov99_021D1380(BgConfig *param0) GX_BG0_AS_3D, }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -448,19 +448,19 @@ static void ov99_021D1380(BgConfig *param0) }, }; - sub_020183C4(param0, 1, &v2[0], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 1, &v2[0], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); - sub_020183C4(param0, 2, &v2[1], 0); - sub_02019EBC(param0, 2); - sub_02019184(param0, 2, 0, 0); - sub_02019184(param0, 2, 3, 0); + Bg_InitFromTemplate(param0, 2, &v2[1], 0); + Bg_ClearTilemap(param0, 2); + Bg_SetOffset(param0, 2, 0, 0); + Bg_SetOffset(param0, 2, 3, 0); - sub_020183C4(param0, 3, &v2[2], 2); - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_InitFromTemplate(param0, 3, &v2[2], 2); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); G2_SetBG0Priority(1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -515,29 +515,29 @@ static void ov99_021D1380(BgConfig *param0) }, }; - sub_020183C4(param0, 5, &v3[0], 0); - sub_02019EBC(param0, 5); - sub_02019184(param0, 5, 0, 0); - sub_02019184(param0, 5, 3, 0); + Bg_InitFromTemplate(param0, 5, &v3[0], 0); + Bg_ClearTilemap(param0, 5); + Bg_SetOffset(param0, 5, 0, 0); + Bg_SetOffset(param0, 5, 3, 0); - sub_020183C4(param0, 6, &v3[1], 0); - sub_02019EBC(param0, 6); - sub_02019184(param0, 6, 0, 0); - sub_02019184(param0, 6, 3, 0); + Bg_InitFromTemplate(param0, 6, &v3[1], 0); + Bg_ClearTilemap(param0, 6); + Bg_SetOffset(param0, 6, 0, 0); + Bg_SetOffset(param0, 6, 3, 0); - sub_020183C4(param0, 7, &v3[2], 0); - sub_02019EBC(param0, 7); - sub_02019184(param0, 7, 0, 0); - sub_02019184(param0, 7, 3, 0); + Bg_InitFromTemplate(param0, 7, &v3[2], 0); + Bg_ClearTilemap(param0, 7); + Bg_SetOffset(param0, 7, 0, 0); + Bg_SetOffset(param0, 7, 3, 0); } - sub_02019690(1, 32, 0, 75); - sub_02019690(5, 32, 0, 75); - sub_02019690(6, 32, 0, 75); - sub_02019690(7, 32, 0, 75); + Bg_ClearTilesRange(1, 32, 0, 75); + Bg_ClearTilesRange(5, 32, 0, 75); + Bg_ClearTilesRange(6, 32, 0, 75); + Bg_ClearTilesRange(7, 32, 0, 75); - sub_02019120(3, 0); - sub_02019120(6, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(6, 0); } static void ov99_021D1580(BgConfig *param0) @@ -575,7 +575,7 @@ static void ov99_021D1580(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -627,20 +627,20 @@ static void ov99_021D1580(BgConfig *param0) }, }; - sub_020183C4(param0, 1, &v2[0], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 1, &v2[0], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); - sub_020183C4(param0, 2, &v2[1], 2); - sub_02019EBC(param0, 2); - sub_02019184(param0, 2, 0, 0); - sub_02019184(param0, 2, 3, 0); + Bg_InitFromTemplate(param0, 2, &v2[1], 2); + Bg_ClearTilemap(param0, 2); + Bg_SetOffset(param0, 2, 0, 0); + Bg_SetOffset(param0, 2, 3, 0); - sub_020183C4(param0, 3, &v2[2], 2); - sub_02019EBC(param0, 3); - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_InitFromTemplate(param0, 3, &v2[2], 2); + Bg_ClearTilemap(param0, 3); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); } { @@ -662,13 +662,13 @@ static void ov99_021D1580(BgConfig *param0) }, }; - sub_020183C4(param0, 7, &v3[0], 0); - sub_02019EBC(param0, 7); - sub_02019184(param0, 7, 0, 0); - sub_02019184(param0, 7, 3, 0); + Bg_InitFromTemplate(param0, 7, &v3[0], 0); + Bg_ClearTilemap(param0, 7); + Bg_SetOffset(param0, 7, 0, 0); + Bg_SetOffset(param0, 7, 3, 0); } - sub_02019690(7, 32, 0, 75); + Bg_ClearTilesRange(7, 32, 0, 75); } static void ov99_021D16E4(UnkStruct_ov99_021D2CB0 *param0) diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c index 6045d40cea..4063be4f79 100644 --- a/src/overlay099/ov99_021D1A54.c +++ b/src/overlay099/ov99_021D1A54.c @@ -461,24 +461,24 @@ static void ov99_021D1D68(UnkStruct_ov99_021D2CB0 *param0) sub_020070E8(param0->unk_10F8, 12, param0->unk_08, 7, 0, 0, 0, 75); sub_0200710C(param0->unk_10F8, 6, param0->unk_08, 7, 0, 0, 0, 75); - sub_02019184(v0, 2, 0, 0); - sub_02019184(v0, 2, 3, 0); - sub_02019184(v0, 7, 0, 0); - sub_02019184(v0, 7, 3, 0); + Bg_SetOffset(v0, 2, 0, 0); + Bg_SetOffset(v0, 2, 3, 0); + Bg_SetOffset(v0, 7, 0, 0); + Bg_SetOffset(v0, 7, 3, 0); - sub_02019120(2, 1); - sub_02019120(7, 1); + Bg_ToggleLayer(2, 1); + Bg_ToggleLayer(7, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); - sub_0201C3C0(param0->unk_08, 2); - sub_0201C3C0(param0->unk_08, 7); + Bg_ScheduleTilemapTransfer(param0->unk_08, 2); + Bg_ScheduleTilemapTransfer(param0->unk_08, 7); } static void ov99_021D1E6C(UnkStruct_ov99_021D2CB0 *param0) { - sub_02019120(2, 0); - sub_02019120(7, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(7, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 0); } @@ -599,13 +599,13 @@ static void ov99_021D211C(UnkStruct_ov99_021D2CB0 *param0) ov99_021D439C(param0, param0->unk_1105, 3, 0); param0->unk_1105++; - sub_02019120(3, 1); - sub_0201C3C0(param0->unk_08, 2); + Bg_ToggleLayer(3, 1); + Bg_ScheduleTilemapTransfer(param0->unk_08, 2); } static void ov99_021D214C(UnkStruct_ov99_021D2CB0 *param0) { - sub_02019120(3, 0); + Bg_ToggleLayer(3, 0); } static void ov99_021D2158(UnkStruct_ov99_021D2CB0 *param0) @@ -679,24 +679,24 @@ static void ov99_021D2180(UnkStruct_ov99_021D2CB0 *param0) Heap_FreeToHeap(v2); } - sub_02019184(v0, 2, 0, 0); - sub_02019184(v0, 2, 3, 0); - sub_02019184(v0, 7, 0, 0); - sub_02019184(v0, 7, 3, 0); + Bg_SetOffset(v0, 2, 0, 0); + Bg_SetOffset(v0, 2, 3, 0); + Bg_SetOffset(v0, 7, 0, 0); + Bg_SetOffset(v0, 7, 3, 0); - sub_02019120(2, 1); - sub_02019120(7, 1); + Bg_ToggleLayer(2, 1); + Bg_ToggleLayer(7, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); - sub_0201C3C0(param0->unk_08, 2); - sub_0201C3C0(param0->unk_08, 7); + Bg_ScheduleTilemapTransfer(param0->unk_08, 2); + Bg_ScheduleTilemapTransfer(param0->unk_08, 7); } static void ov99_021D22AC(UnkStruct_ov99_021D2CB0 *param0) { - sub_02019120(2, 0); - sub_02019120(7, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(7, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 0); } @@ -822,24 +822,24 @@ static void ov99_021D24F0(UnkStruct_ov99_021D2CB0 *param0) sub_02002FBC(param0->unk_0C, param0->unk_FA4.unk_08_val3.unk_08, 1, 16 * 1, 0x20); } - sub_02019184(v0, 2, 0, 0); - sub_02019184(v0, 2, 3, 0); - sub_02019184(v0, 7, 0, 0); - sub_02019184(v0, 7, 3, 0); + Bg_SetOffset(v0, 2, 0, 0); + Bg_SetOffset(v0, 2, 3, 0); + Bg_SetOffset(v0, 7, 0, 0); + Bg_SetOffset(v0, 7, 3, 0); - sub_02019120(2, 1); - sub_02019120(7, 1); + Bg_ToggleLayer(2, 1); + Bg_ToggleLayer(7, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); - sub_0201C3C0(param0->unk_08, 2); - sub_0201C3C0(param0->unk_08, 7); + Bg_ScheduleTilemapTransfer(param0->unk_08, 2); + Bg_ScheduleTilemapTransfer(param0->unk_08, 7); } static void ov99_021D2640(UnkStruct_ov99_021D2CB0 *param0) { - sub_02019120(2, 0); - sub_02019120(7, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(7, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 0); } @@ -997,14 +997,14 @@ static void ov99_021D2A38(UnkStruct_ov99_021D2CB0 *param0) ov99_021D439C(param0, param0->unk_1105, 2, 1); param0->unk_1105++; - sub_02019120(2, 1); - sub_0201C3C0(param0->unk_08, 2); + Bg_ToggleLayer(2, 1); + Bg_ScheduleTilemapTransfer(param0->unk_08, 2); } static void ov99_021D2A70(UnkStruct_ov99_021D2CB0 *param0) { - sub_02019120(2, 0); - sub_02019120(3, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); } static void ov99_021D2A84(UnkStruct_ov99_021D2CB0 *param0) @@ -1070,23 +1070,23 @@ static void ov99_021D2AAC(UnkStruct_ov99_021D2CB0 *param0) Strbuf *v1; int v2; - param0->unk_24 = sub_0201A778(75, 1); + param0->unk_24 = Window_New(75, 1); - BGL_AddWindow(v0, param0->unk_24, 7, 0, 0, 32, 32, 15, 0); - BGL_FillWindow(param0->unk_24, 15); - sub_0201A9F4(param0->unk_24); + Window_Add(v0, param0->unk_24, 7, 0, 0, 32, 32, 15, 0); + Window_FillTilemap(param0->unk_24, 15); + Window_PutToTilemap(param0->unk_24); v1 = MessageLoader_GetNewStrbuf(param0->unk_20, ov99_021D4130()); v2 = (256 - Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0)) / 2; Text_AddPrinterWithParamsColorAndSpacing(param0->unk_24, FONT_SYSTEM, v1, v2, 80, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), 3, 0, NULL); - sub_0201ACCC(param0->unk_24); + Window_LoadTiles(param0->unk_24); Strbuf_Free(v1); } - sub_02019184(v0, 7, 0, 0); - sub_02019184(v0, 7, 3, 0); - sub_02019120(7, 1); + Bg_SetOffset(v0, 7, 0, 0); + Bg_SetOffset(v0, 7, 3, 0); + Bg_ToggleLayer(7, 1); GX_SetVisibleWnd(GX_WNDMASK_NONE); GXS_SetVisibleWnd(GX_WNDMASK_NONE); @@ -1094,15 +1094,15 @@ static void ov99_021D2AAC(UnkStruct_ov99_021D2CB0 *param0) sub_0200F44C(0, -16); sub_0200F44C(1, -16); sub_0200AB4C(0, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), 3); - sub_0201C3C0(param0->unk_08, 7); + Bg_ScheduleTilemapTransfer(param0->unk_08, 7); } static void ov99_021D2BBC(UnkStruct_ov99_021D2CB0 *param0) { - sub_02019120(7, 0); + Bg_ToggleLayer(7, 0); if (param0->unk_24 != NULL) { - BGL_DeleteWindow(param0->unk_24); + Window_Remove(param0->unk_24); Heap_FreeToHeap(param0->unk_24); param0->unk_24 = NULL; } diff --git a/src/overlay099/ov99_021D2C08.c b/src/overlay099/ov99_021D2C08.c index 779e82a663..ab667c0024 100644 --- a/src/overlay099/ov99_021D2C08.c +++ b/src/overlay099/ov99_021D2C08.c @@ -165,6 +165,6 @@ static void ov99_021D2DF4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C { param1->unk_00 += -0x40; - sub_02019184(param0->unk_08, 2, 0, param1->unk_00 / FX32_ONE); - sub_02019184(param0->unk_08, 7, 0, param1->unk_00 / FX32_ONE); + Bg_SetOffset(param0->unk_08, 2, 0, param1->unk_00 / FX32_ONE); + Bg_SetOffset(param0->unk_08, 7, 0, param1->unk_00 / FX32_ONE); } diff --git a/src/overlay099/ov99_021D2E28.c b/src/overlay099/ov99_021D2E28.c index 360151cbff..0272b2b815 100644 --- a/src/overlay099/ov99_021D2E28.c +++ b/src/overlay099/ov99_021D2E28.c @@ -265,8 +265,8 @@ static void ov99_021D32D8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E { param1->unk_04 += 0x60; - sub_02019184(param0->unk_08, 2, 3, param1->unk_04 / FX32_ONE); - sub_02019184(param0->unk_08, 7, 3, param1->unk_04 / FX32_ONE); + Bg_SetOffset(param0->unk_08, 2, 3, param1->unk_04 / FX32_ONE); + Bg_SetOffset(param0->unk_08, 7, 3, param1->unk_04 / FX32_ONE); } static void ov99_021D330C(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1) diff --git a/src/overlay099/ov99_021D3C18.c b/src/overlay099/ov99_021D3C18.c index f9d2294ba1..56cb200e86 100644 --- a/src/overlay099/ov99_021D3C18.c +++ b/src/overlay099/ov99_021D3C18.c @@ -74,10 +74,10 @@ static void ov99_021D3CF8(UnkStruct_ov99_021D3C18 *param0, u32 param1) if (param1 == (GX_BLEND_PLANEMASK_BG2)) { G2_SetBlendAlpha((GX_BLEND_PLANEMASK_BG2), (GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD), param0->unk_05, param0->unk_06); - sub_02019120(3, 1); + Bg_ToggleLayer(3, 1); } else { G2_SetBlendAlpha((GX_BLEND_PLANEMASK_BG3), (GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BD), param0->unk_05, param0->unk_06); - sub_02019120(2, 1); + Bg_ToggleLayer(2, 1); } } @@ -101,13 +101,13 @@ static BOOL ov99_021D3D50(UnkStruct_ov99_021D3C18 *param0) if ((param0->unk_05 == 0) && (param0->unk_06 == 16)) { if (param0->unk_08 == (GX_BLEND_PLANEMASK_BG2)) { - sub_02019120(2, 0); - BGL_SetPriority(2, 3); - BGL_SetPriority(3, 2); + Bg_ToggleLayer(2, 0); + Bg_SetPriority(2, 3); + Bg_SetPriority(3, 2); } else { - sub_02019120(3, 0); - BGL_SetPriority(2, 2); - BGL_SetPriority(3, 3); + Bg_ToggleLayer(3, 0); + Bg_SetPriority(2, 2); + Bg_SetPriority(3, 3); } return 1; diff --git a/src/overlay099/ov99_021D3E78.c b/src/overlay099/ov99_021D3E78.c index 2719c3972a..73e9100251 100644 --- a/src/overlay099/ov99_021D3E78.c +++ b/src/overlay099/ov99_021D3E78.c @@ -293,15 +293,15 @@ UnkStruct_ov99_021D3E78 *ov99_021D3E78(BgConfig *param0, int param1, int param2, v0->unk_18 = 0; v0->unk_1C = 0; v0->unk_30 = Strbuf_Init(256, 75); - v0->unk_24 = sub_0201A778(75, 1); + v0->unk_24 = Window_New(75, 1); - BGL_AddWindow(param0, v0->unk_24, param2, 0, 0, 32, 32, param3, 0); - BGL_FillWindow(v0->unk_24, 0x0); - sub_0201A9F4(v0->unk_24); - sub_0201A954(v0->unk_24); + Window_Add(param0, v0->unk_24, param2, 0, 0, 32, 32, param3, 0); + Window_FillTilemap(v0->unk_24, 0x0); + Window_PutToTilemap(v0->unk_24); + Window_CopyToVRAM(v0->unk_24); - v0->unk_28 = sub_0201A778(75, 1); - BGL_AddWindow(param0, v0->unk_28, param2, 0, 0, 32, 2, param3, 0); + v0->unk_28 = Window_New(75, 1); + Window_Add(param0, v0->unk_28, param2, 0, 0, 32, 2, param3, 0); v0->unk_34 = SysTask_ExecuteAfterVBlank(ov99_021D4104, v0, 0); } @@ -315,8 +315,8 @@ void ov99_021D3F38(UnkStruct_ov99_021D3E78 *param0) } Strbuf_Free(param0->unk_30); - BGL_DeleteWindow(param0->unk_24); - BGL_DeleteWindow(param0->unk_28); + Window_Remove(param0->unk_24); + Window_Remove(param0->unk_28); Heap_FreeToHeap(param0->unk_24); Heap_FreeToHeap(param0->unk_28); Heap_FreeToHeap(param0); @@ -345,11 +345,11 @@ BOOL ov99_021D3F6C(UnkStruct_ov99_021D3E78 *param0, int param1) Text_AddPrinterWithParamsAndColor(param0->unk_24, FONT_SYSTEM, param0->unk_30, v1, v2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); if (v2 > (256 - 16)) { - BGL_FillWindow(param0->unk_28, 0x0); + Window_FillTilemap(param0->unk_28, 0x0); Text_AddPrinterWithParamsAndColor(param0->unk_28, FONT_SYSTEM, param0->unk_30, v1, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); v2 = 16 - (v2 - (256 - 16)); - sub_0201ADDC(param0->unk_24, param0->unk_28->pixels, 0, v2, param0->unk_28->width * 8, param0->unk_28->height * 8, 0, 0, 32 * 8, (16 - v2)); + Window_BlitBitmapRect(param0->unk_24, param0->unk_28->pixels, 0, v2, param0->unk_28->width * 8, param0->unk_28->height * 8, 0, 0, 32 * 8, (16 - v2)); } param0->unk_18 = 1; @@ -366,15 +366,15 @@ BOOL ov99_021D3F6C(UnkStruct_ov99_021D3E78 *param0, int param1) int v3 = Unk_ov99_021D4CE4[param0->unk_10].unk_02 & 0xff; if (v3 <= (256 - 16)) { - BGL_WindowColor(param0->unk_24, 0x0, 0, v3, 32 * 8, 16); + Window_FillRectWithColor(param0->unk_24, 0x0, 0, v3, 32 * 8, 16); } else { int v4, v5; v4 = 16 - (v3 - (256 - 16)); v5 = 16 - v4; - BGL_WindowColor(param0->unk_24, 0x0, 0, v3, 32 * 8, v4); - BGL_WindowColor(param0->unk_24, 0x0, 0, 0, 32 * 8, v5); + Window_FillRectWithColor(param0->unk_24, 0x0, 0, v3, 32 * 8, v4); + Window_FillRectWithColor(param0->unk_24, 0x0, 0, 0, 32 * 8, v5); } param0->unk_18 = 1; @@ -395,13 +395,13 @@ static void ov99_021D4104(SysTask *param0, void *param1) UnkStruct_ov99_021D3E78 *v0 = param1; if (v0->unk_18) { - sub_0201ACCC(v0->unk_24); + Window_LoadTiles(v0->unk_24); v0->unk_18 = 0; } { int v1 = v0->unk_00 & 255; - sub_02019184(v0->unk_20, v0->unk_08, 3, v1); + Bg_SetOffset(v0->unk_20, v0->unk_08, 3, v1); } } diff --git a/src/overlay099/ov99_021D4134.c b/src/overlay099/ov99_021D4134.c index 07a20d95b5..8ecc9627fa 100644 --- a/src/overlay099/ov99_021D4134.c +++ b/src/overlay099/ov99_021D4134.c @@ -200,8 +200,8 @@ void ov99_021D439C(UnkStruct_ov99_021D2CB0 *param0, int param1, int param2, int sub_020038B0(param0->unk_0C, 1, 2, 0x0, 0, 1); sub_020070E8(param0->unk_10F8, v3->unk_00, param0->unk_08, param2, 0, 0, 0, 75); sub_0200710C(param0->unk_10F8, v3->unk_02, param0->unk_08, param2, 0, 0, 0, 75); - sub_02019184(v0, param2, 0, v3->unk_06); - sub_02019184(v0, param2, 3, v3->unk_08); + Bg_SetOffset(v0, param2, 0, v3->unk_06); + Bg_SetOffset(v0, param2, 3, v3->unk_08); } void ov99_021D44CC(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1) diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index c6afa1ce4b..c9a8381f5f 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -71,9 +71,9 @@ int ov100_021D0D80(OverlayManager *param0, int *param1) int v2 = Options_Frame(v0->unk_D0->unk_04); Window_Init(v1); - BGL_AddWindow(v0->unk_0C.unk_0C, v1, 1, 2, 19, 27, 4, 14, 1); - BGL_FillWindow(v1, 0xFF); - sub_0201A954(v1); + Window_Add(v0->unk_0C.unk_0C, v1, 1, 2, 19, 27, 4, 14, 1); + Window_FillTilemap(v1, 0xFF); + Window_CopyToVRAM(v1); sub_0200DD0C(v0->unk_0C.unk_0C, 1, 500, 15, v2, 111); PaletteSys_LoadPalette(v0->unk_0C.unk_10, 38, sub_0200DD08(v2), 111, 0, 0x20, 15 * 16); @@ -145,8 +145,8 @@ int ov100_021D0F44(OverlayManager *param0, int *param1) SetMainCallback(NULL, NULL); DisableHBlank(); sub_0200E084(&v0->unk_0C.unk_30, 1); - sub_0201ACF4(&v0->unk_0C.unk_30); - BGL_DeleteWindow(&v0->unk_0C.unk_30); + Window_ClearAndCopyToVRAM(&v0->unk_0C.unk_30); + Window_Remove(&v0->unk_0C.unk_30); ov100_021D111C(&v0->unk_0C); gCoreSys.unk_65 = 0; @@ -217,7 +217,7 @@ static void ov100_021D1034(UnkStruct_ov100_021D46C8 *param0) GXS_SetVisiblePlane(0); param0->unk_00 = NARC_ctor(NARC_INDEX_ARC__DEMO_TENGAN_GRA, 111); - param0->unk_0C = sub_02018340(111); + param0->unk_0C = BgConfig_New(111); param0->unk_10 = sub_02002F38(111); param0->unk_14 = sub_02024220(111, 0, 1, 0, 4, NULL); param0->camera = Camera_Alloc(111); @@ -246,14 +246,14 @@ static void ov100_021D111C(UnkStruct_ov100_021D46C8 *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); - sub_02019044(param0->unk_0C, 0); - sub_02019044(param0->unk_0C, 1); - sub_02019044(param0->unk_0C, 2); - sub_02019044(param0->unk_0C, 3); - sub_02019044(param0->unk_0C, 4); - sub_02019044(param0->unk_0C, 5); - sub_02019044(param0->unk_0C, 6); - sub_02019044(param0->unk_0C, 7); + Bg_FreeTilemapBuffer(param0->unk_0C, 0); + Bg_FreeTilemapBuffer(param0->unk_0C, 1); + Bg_FreeTilemapBuffer(param0->unk_0C, 2); + Bg_FreeTilemapBuffer(param0->unk_0C, 3); + Bg_FreeTilemapBuffer(param0->unk_0C, 4); + Bg_FreeTilemapBuffer(param0->unk_0C, 5); + Bg_FreeTilemapBuffer(param0->unk_0C, 6); + Bg_FreeTilemapBuffer(param0->unk_0C, 7); Heap_FreeToHeap(param0->unk_0C); sub_02002FA0(param0->unk_10, 0); @@ -284,7 +284,7 @@ static void ov100_021D1208(BgConfig *param0) GX_BG0_AS_3D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -373,18 +373,18 @@ static void ov100_021D1208(BgConfig *param0) }, }; - sub_02019690(0, 32, 0, 111); - sub_02019690(1, 32, 0, 111); - sub_02019690(2, 32, 0, 111); - sub_02019690(3, 32, 0, 111); - sub_020183C4(param0, 0, &v2[0], 0); - sub_020183C4(param0, 1, &v2[1], 0); - sub_020183C4(param0, 2, &v2[2], 0); - sub_020183C4(param0, 3, &v2[3], 0); - sub_02019EBC(param0, 0); - sub_02019EBC(param0, 1); - sub_02019EBC(param0, 2); - sub_02019EBC(param0, 3); + Bg_ClearTilesRange(0, 32, 0, 111); + Bg_ClearTilesRange(1, 32, 0, 111); + Bg_ClearTilesRange(2, 32, 0, 111); + Bg_ClearTilesRange(3, 32, 0, 111); + Bg_InitFromTemplate(param0, 0, &v2[0], 0); + Bg_InitFromTemplate(param0, 1, &v2[1], 0); + Bg_InitFromTemplate(param0, 2, &v2[2], 0); + Bg_InitFromTemplate(param0, 3, &v2[3], 0); + Bg_ClearTilemap(param0, 0); + Bg_ClearTilemap(param0, 1); + Bg_ClearTilemap(param0, 2); + Bg_ClearTilemap(param0, 3); } { @@ -421,14 +421,14 @@ static void ov100_021D1208(BgConfig *param0) }, }; - sub_020183C4(param0, 4, &v3[0], 0); - sub_020183C4(param0, 5, &v3[1], 0); - sub_02019EBC(param0, 4); - sub_02019EBC(param0, 5); + Bg_InitFromTemplate(param0, 4, &v3[0], 0); + Bg_InitFromTemplate(param0, 5, &v3[1], 0); + Bg_ClearTilemap(param0, 4); + Bg_ClearTilemap(param0, 5); } - sub_02019690(4, 32, 0, 111); - sub_02019690(5, 32, 0, 111); + Bg_ClearTilesRange(4, 32, 0, 111); + Bg_ClearTilesRange(5, 32, 0, 111); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); @@ -449,7 +449,7 @@ static void ov100_021D13B4(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_0C.unk_10); - sub_0201C2B8(v0->unk_0C.unk_0C); + Bg_RunScheduledUpdates(v0->unk_0C.unk_0C); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index 2f6ce46cb4..79e6d64717 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -51,10 +51,10 @@ int ov100_021D46C8(UnkStruct_ov100_021D46C8 *param0, UnkStruct_020985E4 *param1, } v4 = Options_TextFrameDelay(param1->unk_04); - BGL_FillWindow(¶m0->unk_30, 0xFF); + Window_FillTilemap(¶m0->unk_30, 0xFF); v0 = Text_AddPrinterWithParams(¶m0->unk_30, FONT_MESSAGE, v3, 0, 0, v4, NULL); - sub_0201A954(¶m0->unk_30); + Window_CopyToVRAM(¶m0->unk_30); sub_0200E060(¶m0->unk_30, 0, 500, 15); Strbuf_Free(v2); @@ -68,7 +68,7 @@ int ov100_021D46C8(UnkStruct_ov100_021D46C8 *param0, UnkStruct_020985E4 *param1, void ov100_021D4788(UnkStruct_ov100_021D46C8 *param0) { sub_0200E084(¶m0->unk_30, 1); - sub_0201ACF4(¶m0->unk_30); + Window_ClearAndCopyToVRAM(¶m0->unk_30); } void ov100_021D47A0(UnkStruct_ov100_021D46C8 *param0) diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index 31aa62d9bd..07a78952db 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -205,7 +205,7 @@ static void ov101_021D0F94(UnkStruct_ov101_021D13C8 *param0) static void ov101_021D0F9C(UnkStruct_ov101_021D13C8 *param0) { - param0->unk_43C = sub_02018340(79); + param0->unk_43C = BgConfig_New(79); ov101_021D1098(); ov101_021D10B8(param0->unk_43C); @@ -272,7 +272,7 @@ static void ov101_021D10B8(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -292,9 +292,9 @@ static void ov101_021D10B8(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); - sub_02019690(0, 32, 0, 79); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); + Bg_ClearTilesRange(0, 32, 0, 79); } { @@ -314,8 +314,8 @@ static void ov101_021D10B8(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilemap(param0, 1); } { @@ -335,8 +335,8 @@ static void ov101_021D10B8(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilemap(param0, 2); } { @@ -356,17 +356,17 @@ static void ov101_021D10B8(BgConfig *param0) 0 }; - sub_020183C4(param0, 7, &v4, 0); - sub_02019EBC(param0, 7); + Bg_InitFromTemplate(param0, 7, &v4, 0); + Bg_ClearTilemap(param0, 7); } } static void ov101_021D11A4(BgConfig *param0) { - sub_02019044(param0, 0); - sub_02019044(param0, 1); - sub_02019044(param0, 2); - sub_02019044(param0, 7); + Bg_FreeTilemapBuffer(param0, 0); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 7); Heap_FreeToHeap(param0); } @@ -383,45 +383,45 @@ static void ov101_021D121C(UnkStruct_ov101_021D13C8 *param0) void *v0 = ov101_021D19E4(param0, 3, 0); NNS_G2dGetUnpackedPaletteData(v0, ¶m0->unk_448); - sub_0201972C(1, param0->unk_448->pRawData, (32 * 13), (32 * 0)); + Bg_LoadPalette(1, param0->unk_448->pRawData, (32 * 13), (32 * 0)); Heap_FreeToHeap(v0); v0 = ov101_021D19E4(param0, 0, 0); NNS_G2dGetUnpackedCharacterData(v0, ¶m0->unk_444); - sub_0201958C(param0->unk_43C, 1, param0->unk_444->pRawData, param0->unk_444->szByte, (32 * 0)); + Bg_LoadTiles(param0->unk_43C, 1, param0->unk_444->pRawData, param0->unk_444->szByte, (32 * 0)); Heap_FreeToHeap(v0); v0 = ov101_021D19E4(param0, 1, 0); NNS_G2dGetUnpackedScreenData(v0, ¶m0->unk_440); - sub_02019574(param0->unk_43C, 1, (void *)param0->unk_440->rawData, param0->unk_440->szByte); - sub_02019448(param0->unk_43C, 1); + Bg_LoadTilemapBuffer(param0->unk_43C, 1, (void *)param0->unk_440->rawData, param0->unk_440->szByte); + Bg_CopyTilemapBufferToVRAM(param0->unk_43C, 1); Heap_FreeToHeap(v0); v0 = ov101_021D19E4(param0, 8, 0); NNS_G2dGetUnpackedCharacterData(v0, ¶m0->unk_444); - sub_0201958C(param0->unk_43C, 2, param0->unk_444->pRawData, param0->unk_444->szByte, (32 * 0)); + Bg_LoadTiles(param0->unk_43C, 2, param0->unk_444->pRawData, param0->unk_444->szByte, (32 * 0)); Heap_FreeToHeap(v0); v0 = ov101_021D19E4(param0, 9, 0); NNS_G2dGetUnpackedScreenData(v0, ¶m0->unk_440); - sub_02019574(param0->unk_43C, 2, (void *)param0->unk_440->rawData, param0->unk_440->szByte); - sub_02019448(param0->unk_43C, 2); + Bg_LoadTilemapBuffer(param0->unk_43C, 2, (void *)param0->unk_440->rawData, param0->unk_440->szByte); + Bg_CopyTilemapBufferToVRAM(param0->unk_43C, 2); Heap_FreeToHeap(v0); v0 = ov101_021D19E4(param0, 3, 0); NNS_G2dGetUnpackedPaletteData(v0, ¶m0->unk_448); - sub_0201972C(7, param0->unk_448->pRawData, (32 * 13), (32 * 0)); + Bg_LoadPalette(7, param0->unk_448->pRawData, (32 * 13), (32 * 0)); Heap_FreeToHeap(v0); v0 = ov101_021D19E4(param0, 2, 0); NNS_G2dGetUnpackedCharacterData(v0, ¶m0->unk_444); - sub_0201958C(param0->unk_43C, 7, param0->unk_444->pRawData, param0->unk_444->szByte, 0); + Bg_LoadTiles(param0->unk_43C, 7, param0->unk_444->pRawData, param0->unk_444->szByte, 0); Heap_FreeToHeap(v0); v0 = ov101_021D19E4(param0, 4, 0); NNS_G2dGetUnpackedScreenData(v0, ¶m0->unk_440); - sub_02019574(param0->unk_43C, 7, (void *)param0->unk_440->rawData, param0->unk_440->szByte); - sub_02019448(param0->unk_43C, 7); + Bg_LoadTilemapBuffer(param0->unk_43C, 7, (void *)param0->unk_440->rawData, param0->unk_440->szByte); + Bg_CopyTilemapBufferToVRAM(param0->unk_43C, 7); Heap_FreeToHeap(v0); } @@ -438,7 +438,7 @@ void ov101_021D13C8(UnkStruct_ov101_021D13C8 *param0) v1->unk_04 = StringTemplate_Default(79); for (v0 = 0; v0 < 1; v0++) { - sub_0201A8D4(param0->unk_43C, &v1->unk_08[v0], &Unk_ov101_021D8588[v0]); + Window_AddFromTemplate(param0->unk_43C, &v1->unk_08[v0], &Unk_ov101_021D8588[v0]); } v1->unk_18 = Strbuf_Init(256, 79); @@ -450,8 +450,8 @@ void ov101_021D1458(UnkStruct_ov101_021D13C8 *param0) UnkStruct_ov101_021D148C *v1 = ¶m0->unk_408; for (v0 = 0; v0 < 1; v0++) { - sub_0201ACF4(&v1->unk_08[v0]); - BGL_DeleteWindow(&v1->unk_08[v0]); + Window_ClearAndCopyToVRAM(&v1->unk_08[v0]); + Window_Remove(&v1->unk_08[v0]); } MessageLoader_Free(v1->unk_00); @@ -464,10 +464,10 @@ void ov101_021D148C(UnkStruct_ov101_021D13C8 *param0, u32 param1) UnkStruct_ov101_021D148C *v0 = ¶m0->unk_408; sub_0200E060(&v0->unk_08[0], 1, (1 + (18 + 12)), 14); - BGL_FillWindow(&v0->unk_08[0], 15); + Window_FillTilemap(&v0->unk_08[0], 15); MessageLoader_GetStrbuf(v0->unk_00, param1, v0->unk_18); Text_AddPrinterWithParams(&v0->unk_08[0], FONT_MESSAGE, v0->unk_18, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A9A4(&v0->unk_08[0]); + Window_ScheduleCopyToVRAM(&v0->unk_08[0]); } void ov101_021D14E4(UnkStruct_ov101_021D13C8 *param0) @@ -475,8 +475,8 @@ void ov101_021D14E4(UnkStruct_ov101_021D13C8 *param0) UnkStruct_ov101_021D148C *v0 = ¶m0->unk_408; sub_0200E084(&v0->unk_08[0], 1); - BGL_FillWindow(&v0->unk_08[0], 0); - sub_0201A9A4(&v0->unk_08[0]); + Window_FillTilemap(&v0->unk_08[0], 0); + Window_ScheduleCopyToVRAM(&v0->unk_08[0]); } static void ov101_021D150C(void) @@ -661,7 +661,7 @@ static void ov101_021D197C(void *param0) sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8(v0->unk_43C); + Bg_RunScheduledUpdates(v0->unk_43C); } void *ov101_021D1998(u32 param0) diff --git a/src/overlay101/ov101_021D1A28.c b/src/overlay101/ov101_021D1A28.c index 98f7e6232d..12b336fdab 100644 --- a/src/overlay101/ov101_021D1A28.c +++ b/src/overlay101/ov101_021D1A28.c @@ -3813,7 +3813,7 @@ static void ov101_021D4F18(const u16 *param0, const u16 *param1, u16 param2, u16 static void ov101_021D4F40(UnkStruct_ov101_021D13C8 *param0, u32 param1, int param2, u16 *param3) { - sub_0201972C(param1, param3, 32, 32 * param2); + Bg_LoadPalette(param1, param3, 32, 32 * param2); } static int Unk_ov101_021D9E60[UnkEnum_ov101_021D4F58_05] = { @@ -4644,16 +4644,16 @@ static void ov101_021D58F4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2 { const int *v0 = Unk_ov101_021D8740[param1]; - sub_02019E2C(param0->unk_43C, 1, v0[0], v0[1], 3, 2, 6); - sub_0201C3C0(param0->unk_43C, 1); + Bg_ChangeTilemapRectPalette(param0->unk_43C, 1, v0[0], v0[1], 3, 2, 6); + Bg_ScheduleTilemapTransfer(param0->unk_43C, 1); } static void ov101_021D5938(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1) { const int *v0 = Unk_ov101_021D8740[param1]; - sub_02019E2C(param0->unk_43C, 1, v0[0], v0[1], 3, 2, 5); - sub_0201C3C0(param0->unk_43C, 1); + Bg_ChangeTilemapRectPalette(param0->unk_43C, 1, v0[0], v0[1], 3, 2, 5); + Bg_ScheduleTilemapTransfer(param0->unk_43C, 1); } static u32 ov101_021D597C(UnkStruct_ov101_021D13C8 *param0) diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index f1dc952adc..447d54bb58 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -102,17 +102,17 @@ int ov102_021D0E2C(OverlayManager *param0, int *param1) ov102_021D1274(v0); ov102_021D1420(v0); - sub_02019120(0, 1); + Bg_ToggleLayer(0, 1); ; - sub_02019120(1, 1); + Bg_ToggleLayer(1, 1); ; - sub_02019120(3, 1); + Bg_ToggleLayer(3, 1); ; - sub_02019120(4, 1); + Bg_ToggleLayer(4, 1); ; - sub_02019120(5, 1); + Bg_ToggleLayer(5, 1); ; - sub_02019120(7, 1); + Bg_ToggleLayer(7, 1); ; sub_0200F174(0, 1, 1, 0x0, 6, 1, v0->unk_00); *param1 = 1; @@ -175,17 +175,17 @@ static void ov102_021D0F80(void *param0) { UnkStruct_ov102_021D0F8C *v0 = param0; - sub_0201C2B8(v0->unk_10); + Bg_RunScheduledUpdates(v0->unk_10); } -#define BGCONTSET(frame, scr, cgx, scrsiz, bufsiz) \ - { \ - v2.unk_12 = scr; \ - v2.unk_13 = cgx; \ - v2.unk_08 = bufsiz; \ - v2.unk_10 = scrsiz; \ - sub_020183C4(param0->unk_10, frame, &v2, 0); \ - sub_02019EBC(param0->unk_10, frame); \ +#define BGCONTSET(frame, scr, cgx, scrsiz, bufsiz) \ + { \ + v2.unk_12 = scr; \ + v2.unk_13 = cgx; \ + v2.unk_08 = bufsiz; \ + v2.unk_10 = scrsiz; \ + Bg_InitFromTemplate(param0->unk_10, frame, &v2, 0); \ + Bg_ClearTilemap(param0->unk_10, frame); \ } static void ov102_021D0F8C(UnkStruct_ov102_021D0F8C *param0) @@ -199,7 +199,7 @@ static void ov102_021D0F8C(UnkStruct_ov102_021D0F8C *param0) } { - param0->unk_10 = sub_02018340(param0->unk_00); + param0->unk_10 = BgConfig_New(param0->unk_00); } { @@ -207,7 +207,7 @@ static void ov102_021D0F8C(UnkStruct_ov102_021D0F8C *param0) GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, GX_BG0_AS_2D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { BgTemplate v2 = { @@ -231,77 +231,77 @@ static void ov102_021D0F8C(UnkStruct_ov102_021D0F8C *param0) v2.bufferSize = 0x1000; v2.screenSize = 2; - sub_020183C4(param0->unk_10, 0, &v2, 0); - sub_02019EBC(param0->unk_10, 0); + Bg_InitFromTemplate(param0->unk_10, 0, &v2, 0); + Bg_ClearTilemap(param0->unk_10, 0); v2.screenBase = GX_BG_SCRBASE_0x1000; v2.charBase = GX_BG_CHARBASE_0x08000; v2.bufferSize = 0x1000; v2.screenSize = 2; - sub_020183C4(param0->unk_10, 1, &v2, 0); - sub_02019EBC(param0->unk_10, 1); + Bg_InitFromTemplate(param0->unk_10, 1, &v2, 0); + Bg_ClearTilemap(param0->unk_10, 1); v2.screenBase = GX_BG_SCRBASE_0x2000; v2.charBase = GX_BG_CHARBASE_0x04000; v2.bufferSize = 0x800; v2.screenSize = 1; - sub_020183C4(param0->unk_10, 3, &v2, 0); - sub_02019EBC(param0->unk_10, 3); + Bg_InitFromTemplate(param0->unk_10, 3, &v2, 0); + Bg_ClearTilemap(param0->unk_10, 3); v2.screenBase = GX_BG_SCRBASE_0x0000; v2.charBase = GX_BG_CHARBASE_0x10000; v2.bufferSize = 0x1000; v2.screenSize = 2; - sub_020183C4(param0->unk_10, 4, &v2, 0); - sub_02019EBC(param0->unk_10, 4); + Bg_InitFromTemplate(param0->unk_10, 4, &v2, 0); + Bg_ClearTilemap(param0->unk_10, 4); v2.screenBase = GX_BG_SCRBASE_0x1000; v2.charBase = GX_BG_CHARBASE_0x08000; v2.bufferSize = 0x1000; v2.screenSize = 2; - sub_020183C4(param0->unk_10, 5, &v2, 0); - sub_02019EBC(param0->unk_10, 5); + Bg_InitFromTemplate(param0->unk_10, 5, &v2, 0); + Bg_ClearTilemap(param0->unk_10, 5); v2.screenBase = GX_BG_SCRBASE_0x2000; v2.charBase = GX_BG_CHARBASE_0x04000; v2.bufferSize = 0x800; v2.screenSize = 1; - sub_020183C4(param0->unk_10, 7, &v2, 0); - sub_02019EBC(param0->unk_10, 7); + Bg_InitFromTemplate(param0->unk_10, 7, &v2, 0); + Bg_ClearTilemap(param0->unk_10, 7); } - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); } static void ov102_021D10F8(UnkStruct_ov102_021D0F8C *param0) { - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); - sub_02019044(param0->unk_10, 0); - sub_02019044(param0->unk_10, 1); - sub_02019044(param0->unk_10, 3); - sub_02019044(param0->unk_10, 4); - sub_02019044(param0->unk_10, 5); - sub_02019044(param0->unk_10, 7); + Bg_FreeTilemapBuffer(param0->unk_10, 0); + Bg_FreeTilemapBuffer(param0->unk_10, 1); + Bg_FreeTilemapBuffer(param0->unk_10, 3); + Bg_FreeTilemapBuffer(param0->unk_10, 4); + Bg_FreeTilemapBuffer(param0->unk_10, 5); + Bg_FreeTilemapBuffer(param0->unk_10, 7); Heap_FreeToHeap(param0->unk_10); } @@ -316,19 +316,19 @@ static void ov102_021D1174(UnkStruct_ov102_021D0F8C *param0) v0.bgLayer = 0; - sub_0201A8D4(param0->unk_10, ¶m0->unk_14, &v0); - BGL_WindowColor(¶m0->unk_14, 0, 0, 0, 32 * 8, 24 * 8); + Window_AddFromTemplate(param0->unk_10, ¶m0->unk_14, &v0); + Window_FillRectWithColor(¶m0->unk_14, 0, 0, 0, 32 * 8, 24 * 8); v0.bgLayer = 4; - sub_0201A8D4(param0->unk_10, ¶m0->unk_24, &v0); - BGL_WindowColor(¶m0->unk_24, 0, 0, 0, 32 * 8, 24 * 8); + Window_AddFromTemplate(param0->unk_10, ¶m0->unk_24, &v0); + Window_FillRectWithColor(¶m0->unk_24, 0, 0, 0, 32 * 8, 24 * 8); } static void ov102_021D1204(UnkStruct_ov102_021D0F8C *param0) { - BGL_DeleteWindow(¶m0->unk_24); - BGL_DeleteWindow(¶m0->unk_14); + Window_Remove(¶m0->unk_24); + Window_Remove(¶m0->unk_14); StringTemplate_Free(param0->unk_38); MessageLoader_Free(param0->unk_34); } @@ -341,10 +341,10 @@ static void ov102_021D1224(UnkStruct_ov102_021D0F8C *param0) static void ov102_021D1230(UnkStruct_ov102_021D0F8C *param0) { - sub_02019184(param0->unk_10, 1, 3, param0->unk_3C); - sub_02019184(param0->unk_10, 5, 3, param0->unk_3C + (8 * 24)); - sub_02019184(param0->unk_10, 0, 3, param0->unk_3C); - sub_02019184(param0->unk_10, 4, 3, param0->unk_3C + (8 * 24)); + Bg_SetOffset(param0->unk_10, 1, 3, param0->unk_3C); + Bg_SetOffset(param0->unk_10, 5, 3, param0->unk_3C + (8 * 24)); + Bg_SetOffset(param0->unk_10, 0, 3, param0->unk_3C); + Bg_SetOffset(param0->unk_10, 4, 3, param0->unk_3C + (8 * 24)); } static void ov102_021D1274(UnkStruct_ov102_021D0F8C *param0) @@ -376,18 +376,18 @@ static void ov102_021D1274(UnkStruct_ov102_021D0F8C *param0) sub_02006E84(132, v2, 4, 0 * (2 * 16), (2 * 16), param0->unk_00); sub_02006E60(132, v3, param0->unk_10, 1, 0, 0, 0, param0->unk_00); - sub_02019E2C(param0->unk_10, 1, 0, 0, 32, 24, 1); - sub_02019448(param0->unk_10, 1); + Bg_ChangeTilemapRectPalette(param0->unk_10, 1, 0, 0, 32, 24, 1); + Bg_CopyTilemapBufferToVRAM(param0->unk_10, 1); sub_02006E3C(132, v4, param0->unk_10, 1, 0, 0, 0, param0->unk_00); sub_02006E84(132, v5, 0, 1 * (2 * 16), (2 * 16), param0->unk_00); sub_02006E60(132, v3, param0->unk_10, 5, 0, 0, 0, param0->unk_00); - sub_02019E2C(param0->unk_10, 5, 0, 0, 32, 24, 1); - sub_02019448(param0->unk_10, 5); + Bg_ChangeTilemapRectPalette(param0->unk_10, 5, 0, 0, 32, 24, 1); + Bg_CopyTilemapBufferToVRAM(param0->unk_10, 5); sub_02006E3C(132, v4, param0->unk_10, 5, 0, 0, 0, param0->unk_00); sub_02006E84(132, v5, 4, 1 * (2 * 16), (2 * 16), param0->unk_00); - sub_02019690(0, 32, 0, param0->unk_00); - sub_02019690(4, 32, 0, param0->unk_00); + Bg_ClearTilesRange(0, 32, 0, param0->unk_00); + Bg_ClearTilesRange(4, 32, 0, param0->unk_00); Font_LoadTextPalette(0, 2 * (2 * 16), param0->unk_00); Font_LoadTextPalette(4, 2 * (2 * 16), param0->unk_00); } diff --git a/src/overlay104/ov104_0222EA90.c b/src/overlay104/ov104_0222EA90.c index b9a3f89a31..bc7c314ac3 100644 --- a/src/overlay104/ov104_0222EA90.c +++ b/src/overlay104/ov104_0222EA90.c @@ -424,9 +424,9 @@ static void ov104_0222EBD8(UnkStruct_ov104_0223C4CC *param0, void **param1) { *param1 = ov104_0223D9E4(param0->unk_00, param0->unk_04); - BGL_SetPriority(0, 1); - BGL_SetPriority(2, 2); - BGL_SetPriority(3, 3); + Bg_SetPriority(0, 1); + Bg_SetPriority(2, 2); + Bg_SetPriority(3, 3); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); return; @@ -450,9 +450,9 @@ static void ov104_0222EC1C(UnkStruct_ov104_0223C4CC *param0, void **param1) static void ov104_0222EC20(UnkStruct_ov104_0223C4CC *param0, void **param1) { - BGL_SetPriority(0, 1); - BGL_SetPriority(2, 2); - BGL_SetPriority(3, 3); + Bg_SetPriority(0, 1); + Bg_SetPriority(2, 2); + Bg_SetPriority(3, 3); G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD, 20, 20); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); @@ -467,8 +467,8 @@ static void ov104_0222EC58(UnkStruct_ov104_0223C4CC *param0, void **param1) static void ov104_0222EC5C(UnkStruct_ov104_0223C4CC *param0, void **param1) { - BGL_SetPriority(2, 3); - BGL_SetPriority(3, 2); + Bg_SetPriority(2, 3); + Bg_SetPriority(3, 2); return; } @@ -502,10 +502,10 @@ static void ov104_0222ECA0(UnkStruct_ov104_0223C4CC *param0, void **param1) static void ov104_0222ECAC(UnkStruct_ov104_0223C4CC *param0, void **param1) { - BGL_SetPriority(1, 0); - BGL_SetPriority(0, 2); - BGL_SetPriority(2, 2); - BGL_SetPriority(3, 3); + Bg_SetPriority(1, 0); + Bg_SetPriority(0, 2); + Bg_SetPriority(2, 2); + Bg_SetPriority(3, 3); G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD, 20, 20); return; diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index 1a6252e5d4..4bcac71d92 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -2122,12 +2122,12 @@ static BOOL ov104_022311BC(UnkStruct_ov104_02231148 *param0) break; } - param0->unk_28 = sub_0201A778(11, 1); + param0->unk_28 = Window_New(11, 1); - BGL_AddWindow(param0->unk_00->unk_00, param0->unk_28, 1, 0, 0, 32, 32, 0, 0); + Window_Add(param0->unk_00->unk_00, param0->unk_28, 1, 0, 0, 32, 32, 0, 0); sub_020038B0(param0->unk_00->unk_04, 0, 2, 0x0, 0, 16); - BGL_FillWindow(param0->unk_28, 0); - sub_0201A9A4(param0->unk_28); + Window_FillTilemap(param0->unk_28, 0); + Window_ScheduleCopyToVRAM(param0->unk_28); param0->unk_2C = ov104_0223EBA0(11); param0->unk_04++; @@ -2138,7 +2138,7 @@ static BOOL ov104_022311BC(UnkStruct_ov104_02231148 *param0) case 3: { BOOL v0 = ov104_0223EC34(param0->unk_2C); - sub_0201A9A4(param0->unk_28); + Window_ScheduleCopyToVRAM(param0->unk_28); if (v0) { param0->unk_04++; @@ -2148,13 +2148,13 @@ static BOOL ov104_022311BC(UnkStruct_ov104_02231148 *param0) if (ScreenWipe_Done() == 1) { ov104_0223EBD0(param0->unk_2C); - sub_0201ACF4(param0->unk_28); - BGL_DeleteWindow(param0->unk_28); - sub_0201A928(param0->unk_28, 1); + Window_ClearAndCopyToVRAM(param0->unk_28); + Window_Remove(param0->unk_28); + Windows_Delete(param0->unk_28, 1); sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - sub_02019690(1, 32, 0, 11); - sub_02019EBC(param0->unk_00->unk_00, 1); + Bg_ClearTilesRange(1, 32, 0, 11); + Bg_ClearTilemap(param0->unk_00->unk_00, 1); return 0; } @@ -2176,12 +2176,12 @@ static BOOL ov104_022312D8(UnkStruct_ov104_02231148 *param0) break; } - param0->unk_28 = sub_0201A778(11, 1); + param0->unk_28 = Window_New(11, 1); - BGL_AddWindow(param0->unk_00->unk_00, param0->unk_28, 1, 0, 0, 32, 32, 0, 0); + Window_Add(param0->unk_00->unk_00, param0->unk_28, 1, 0, 0, 32, 32, 0, 0); sub_020038B0(param0->unk_00->unk_04, 0, 2, 0x0, 0, 16); - BGL_FillWindow(param0->unk_28, 0); - sub_0201A9A4(param0->unk_28); + Window_FillTilemap(param0->unk_28, 0); + Window_ScheduleCopyToVRAM(param0->unk_28); param0->unk_2C = ov104_0223EBA0(11); param0->unk_04++; @@ -2192,7 +2192,7 @@ static BOOL ov104_022312D8(UnkStruct_ov104_02231148 *param0) case 3: { BOOL v0 = ov104_0223EE44(param0->unk_2C); - sub_0201A9A4(param0->unk_28); + Window_ScheduleCopyToVRAM(param0->unk_28); if (v0) { param0->unk_04++; @@ -2203,15 +2203,15 @@ static BOOL ov104_022312D8(UnkStruct_ov104_02231148 *param0) if (ScreenWipe_Done() == 1) { ov104_0223EBD0(param0->unk_2C); - sub_0201ACF4(param0->unk_28); - BGL_DeleteWindow(param0->unk_28); - sub_0201A928(param0->unk_28, 1); + Window_ClearAndCopyToVRAM(param0->unk_28); + Window_Remove(param0->unk_28); + Windows_Delete(param0->unk_28, 1); sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - sub_02019690(1, 32, 0, 11); - sub_02019EBC(param0->unk_00->unk_00, 1); + Bg_ClearTilesRange(1, 32, 0, 11); + Bg_ClearTilemap(param0->unk_00->unk_00, 1); return 0; } @@ -2235,10 +2235,10 @@ static void ov104_022313FC(SysTask *param0, void *param1) MtxFx22 v5; int v6, v7, v8, v9; - v6 = sub_02019FF0(v3->unk_00->unk_00, 2); - v7 = sub_02019FF0(v3->unk_00->unk_00, 2); - v8 = sub_02019FF0(v3->unk_00->unk_00, 3); - v9 = sub_02019FF0(v3->unk_00->unk_00, 3); + v6 = Bg_GetXOffset2(v3->unk_00->unk_00, 2); + v7 = Bg_GetXOffset2(v3->unk_00->unk_00, 2); + v8 = Bg_GetXOffset2(v3->unk_00->unk_00, 3); + v9 = Bg_GetXOffset2(v3->unk_00->unk_00, 3); if (v3->unk_10 == 1) { v2 = ov104_0223F27C(v4->unk_600); @@ -2411,9 +2411,9 @@ static BOOL ov104_02231720(UnkStruct_ov104_02231148 *param0) param0->unk_10 = 1; - sub_02019120(3, 0); - sub_02019184(param0->unk_00->unk_00, 3, 0, 0); - sub_02019184(param0->unk_00->unk_00, 3, 3, 0); + Bg_ToggleLayer(3, 0); + Bg_SetOffset(param0->unk_00->unk_00, 3, 0, 0); + Bg_SetOffset(param0->unk_00->unk_00, 3, 3, 0); param0->unk_04++; break; @@ -2481,9 +2481,9 @@ static BOOL ov104_02231864(UnkStruct_ov104_02231148 *param0) param0->unk_10 = 1; - sub_02019120(3, 0); - sub_02019184(param0->unk_00->unk_00, 3, 0, 0); - sub_02019184(param0->unk_00->unk_00, 3, 3, 0); + Bg_ToggleLayer(3, 0); + Bg_SetOffset(param0->unk_00->unk_00, 3, 0, 0); + Bg_SetOffset(param0->unk_00->unk_00, 3, 3, 0); param0->unk_04++; break; diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index 7762322a70..3473d1a2f5 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -171,14 +171,14 @@ static void ov104_02231FC4(UnkStruct_ov104_022320B4 *param0) UnkStruct_ov104_0223C4CC *v0 = ov104_0222E924(param0); if (param0->unk_5A == 0) { - BGL_AddWindow( + Window_Add( v0->unk_00, ¶m0->unk_64, 1, 2, 19, 27, 4, 13, (((1024 - (18 + 12)) - 9) - (27 * 4))); - BGL_FillWindow(¶m0->unk_64, 15); + Window_FillTilemap(¶m0->unk_64, 15); sub_0200E060(¶m0->unk_64, 0, (1024 - (18 + 12)), 11); param0->unk_5A = 1; } else { - BGL_FillWindow(¶m0->unk_64, 15); + Window_FillTilemap(¶m0->unk_64, 15); } } @@ -201,7 +201,7 @@ void ov104_02232088(UnkStruct_ov104_022320B4 *param0) GF_ASSERT(param0->unk_5A == 1); sub_0200E084(¶m0->unk_64, 0); - BGL_DeleteWindow(¶m0->unk_64); + Window_Remove(¶m0->unk_64); param0->unk_5A = 0; } @@ -327,7 +327,7 @@ void ov104_022322B0(UnkStruct_ov104_02232B5C *param0) param0->unk_99 -= param0->unk_9B * 2; } - BGL_AddWindow(v1->unk_00, ¶m0->unk_08, 1, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 14, 1); + Window_Add(v1->unk_00, ¶m0->unk_08, 1, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 14, 1); Window_Show(¶m0->unk_08, 1, 985, 12); ov104_02232454(param0); param0->unk_B0 = sub_02001B9C(¶m0->unk_A4, param0->unk_96, param0->unk_00->unk_34); @@ -448,7 +448,7 @@ static void ov104_02232570(UnkStruct_ov104_02232B5C *param0) sub_02001BC4(param0->unk_B0, NULL); Window_Clear(param0->unk_A4.unk_04, 0); - BGL_DeleteWindow(param0->unk_A4.unk_04); + Window_Remove(param0->unk_A4.unk_04); for (v0 = 0; v0 < 28; v0++) { Strbuf_Free(param0->unk_1C[v0]); @@ -507,12 +507,12 @@ void ov104_02232624(UnkStruct_ov104_02232B5C *param0) if (param0->unk_97_7) { param0->unk_99 -= 8 * 2; } - BGL_AddWindow(v1->unk_00, ¶m0->unk_08, 1, param0->unk_98, param0->unk_99, v0, 8 * 2, 14, 1); + Window_Add(v1->unk_00, ¶m0->unk_08, 1, param0->unk_98, param0->unk_99, v0, 8 * 2, 14, 1); } else { if (param0->unk_97_7) { param0->unk_99 -= param0->unk_9B * 2; } - BGL_AddWindow(v1->unk_00, ¶m0->unk_08, 1, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 14, 1); + Window_Add(v1->unk_00, ¶m0->unk_08, 1, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 14, 1); } Window_Show(¶m0->unk_08, 1, 985, 12); ov104_02232830(param0); @@ -688,7 +688,7 @@ static void ov104_02232A58(UnkStruct_ov104_02232B5C *param0, u8 param1) sub_02001384(param0->unk_1B4, NULL, NULL); Window_Clear(param0->unk_194.unk_0C, 0); - BGL_DeleteWindow(¶m0->unk_08); + Window_Remove(¶m0->unk_08); for (v0 = 0; v0 < 28; v0++) { Strbuf_Free(param0->unk_1C[v0]); @@ -708,7 +708,7 @@ static void ov104_02232AC4(UnkStruct_ov104_02232B5C *param0, u16 param1, u32 par Strbuf *v0 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); Strbuf *v1 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); - BGL_FillWindow(param0->unk_18, 15); + Window_FillTilemap(param0->unk_18, 15); MessageLoader_GetStrbuf(param0->unk_8C, param1, v0); diff --git a/src/overlay104/ov104_022332B4.c b/src/overlay104/ov104_022332B4.c index 7f4be3b43d..0b99b0245b 100644 --- a/src/overlay104/ov104_022332B4.c +++ b/src/overlay104/ov104_022332B4.c @@ -380,8 +380,8 @@ BOOL ov104_022334DC(UnkStruct_ov104_0222E930 *param0) *v15 = v4->unk_04; break; case 30: - sub_02019E2C(v1->unk_00, 3, 3, 10, 26, 11, v13); - sub_0201C3C0(v1->unk_00, 3); + Bg_ChangeTilemapRectPalette(v1->unk_00, 3, 3, 10, 26, 11, v13); + Bg_ScheduleTilemapTransfer(v1->unk_00, 3); break; case 31: v4->unk_500 = SysTask_Start(ov104_022338B4, ov104_0222E924(param0->unk_00), 5); @@ -444,12 +444,12 @@ void ov104_022338B4(SysTask *param0, void *param1) int v0; UnkStruct_ov104_0223C4CC *v1 = param1; - v0 = sub_020192F8(v1->unk_00, 2); + v0 = Bg_GetYOffset(v1->unk_00, 2); if (v0 >= 255) { - sub_0201C63C(v1->unk_00, 2, 3, 0); + Bg_ScheduleScroll(v1->unk_00, 2, 3, 0); } else { - sub_0201C63C(v1->unk_00, 2, 4, 1); + Bg_ScheduleScroll(v1->unk_00, 2, 4, 1); } return; diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index d3e37282c6..1a7b0f1b7f 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -709,15 +709,15 @@ void ov104_02236FC0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 * GF_ASSERT(param0->unk_AC == NULL); if (ov104_0223BA14(param1->unk_10) == 0) { - param0->unk_A8 = sub_0201A778(11, 1); - BGL_AddWindow(v0->unk_00, param0->unk_A8, 1, 1, 1, 10, 4, 14, (((((1024 - (18 + 12)) - 9) - (27 * 4)) - (11 * 22)) - (10 * 4))); + param0->unk_A8 = Window_New(11, 1); + Window_Add(v0->unk_00, param0->unk_A8, 1, 1, 1, 10, 4, 14, (((((1024 - (18 + 12)) - 9) - (27 * 4)) - (11 * 22)) - (10 * 4))); ov104_022370C0(v0->unk_00, param0->unk_A8); } else { - param0->unk_A8 = sub_0201A778(11, 1); - param0->unk_AC = sub_0201A778(11, 1); + param0->unk_A8 = Window_New(11, 1); + param0->unk_AC = Window_New(11, 1); - BGL_AddWindow(v0->unk_00, param0->unk_A8, 1, 1, 1, 10, 4, 14, (((((1024 - (18 + 12)) - 9) - (27 * 4)) - (11 * 22)) - (10 * 4))); - BGL_AddWindow(v0->unk_00, param0->unk_AC, 1, 21, 1, 10, 4, 14, ((((((1024 - (18 + 12)) - 9) - (27 * 4)) - (11 * 22)) - (10 * 4)) - (10 * 4))); + Window_Add(v0->unk_00, param0->unk_A8, 1, 1, 1, 10, 4, 14, (((((1024 - (18 + 12)) - 9) - (27 * 4)) - (11 * 22)) - (10 * 4))); + Window_Add(v0->unk_00, param0->unk_AC, 1, 21, 1, 10, 4, 14, ((((((1024 - (18 + 12)) - 9) - (27 * 4)) - (11 * 22)) - (10 * 4)) - (10 * 4))); ov104_022370C0(v0->unk_00, param0->unk_A8); ov104_022370C0(v0->unk_00, param0->unk_AC); @@ -730,7 +730,7 @@ void ov104_02236FC0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 * static void ov104_022370C0(BgConfig *param0, Window *param1) { Window_Show(param1, 1, ((1024 - (18 + 12)) - 9), 12); - BGL_FillWindow(param1, 15); + Window_FillTilemap(param1, 15); return; } @@ -744,7 +744,7 @@ void ov104_022370E0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 * GF_ASSERT(param0->unk_A8 != NULL); v0 = param0->unk_A8; Window_Clear(v0, 0); - sub_0201A928(v0, 1); + Windows_Delete(v0, 1); } else { GF_ASSERT(param0->unk_A8 != NULL); GF_ASSERT(param0->unk_AC != NULL); @@ -758,9 +758,9 @@ void ov104_022370E0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 * } Window_Clear(v0, 0); - sub_0201A928(v0, 1); + Windows_Delete(v0, 1); Window_Clear(v1, 0); - sub_0201A928(v1, 1); + Windows_Delete(v1, 1); } param0->unk_A8 = NULL; @@ -820,7 +820,7 @@ static void ov104_02237284(UnkStruct_ov104_022320B4 *param0, Window *param1, Tra Strbuf_Free(v2); MessageLoader_Free(v0); - sub_0201A954(param1); + Window_CopyToVRAM(param1); return; } diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c index 07a2c0c067..6016818bb6 100644 --- a/src/overlay104/ov104_02237DD8.c +++ b/src/overlay104/ov104_02237DD8.c @@ -655,7 +655,7 @@ void ov104_02238658(void *param0, UnkStruct_ov104_0223C4CC *param1) } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); - sub_0201C3C0(param1->unk_00, 2); + Bg_ScheduleTilemapTransfer(param1->unk_00, 2); NARC_dtor(v0); } else { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); @@ -673,7 +673,7 @@ void ov104_02238728(void *param0, UnkStruct_ov104_0223C4CC *param1) v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 94); sub_0200710C(v0, 53, param1->unk_00, 3, 0, 0, 1, 94); - sub_0201C3C0(param1->unk_00, 3); + Bg_ScheduleTilemapTransfer(param1->unk_00, 3); NARC_dtor(v0); return; diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c index a0ecb8ab53..6e04deb5cf 100644 --- a/src/overlay104/ov104_0223B6F4.c +++ b/src/overlay104/ov104_0223B6F4.c @@ -387,8 +387,8 @@ void ov104_0223BB84(BgConfig *param0, UnkStruct_ov104_0223BA10 *param1, u32 para ov104_0223BBC4(v1, ov104_0223BB60(param1)); - sub_020198C0(param0, param2, v1, 11, 6, 10, 3); - sub_0201C3C0(param0, param2); + Bg_LoadToTilemapRect(param0, param2, v1, 11, 6, 10, 3); + Bg_ScheduleTilemapTransfer(param0, param2); return; } diff --git a/src/overlay104/ov104_0223C164.c b/src/overlay104/ov104_0223C164.c index eb4b5c665b..01e06dd20a 100644 --- a/src/overlay104/ov104_0223C164.c +++ b/src/overlay104/ov104_0223C164.c @@ -68,8 +68,8 @@ static void ov104_0223C1BC(SysTask *param0, void *param1) ov104_0223C208(v1, v2->unk_08); - sub_020198C0(v2->unk_04, 3, v1, 14, 2, 2, 2); - sub_0201C3C0(v2->unk_04, 3); + Bg_LoadToTilemapRect(v2->unk_04, 3, v1, 14, 2, 2, 2); + Bg_ScheduleTilemapTransfer(v2->unk_04, 3); return; } diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index c0e6bf7387..febecc2b87 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -162,7 +162,7 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0) sub_02002F70(v0->unk_04, 2, 0x200 - 0x40, 94); sub_02002F70(v0->unk_04, 3, 0x200, 94); - v0->unk_00 = sub_02018340(94); + v0->unk_00 = BgConfig_New(94); sub_0201DBEC(64, 94); SetAutorepeat(4, 8); @@ -214,12 +214,12 @@ void ov104_0223C4CC(UnkStruct_ov104_0223C4CC *param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); - sub_02019044(param0->unk_00, 1); - sub_02019044(param0->unk_00, 2); - sub_02019044(param0->unk_00, 3); + Bg_FreeTilemapBuffer(param0->unk_00, 1); + Bg_FreeTilemapBuffer(param0->unk_00, 2); + Bg_FreeTilemapBuffer(param0->unk_00, 3); - sub_02019120(4, 0); - sub_02019044(param0->unk_00, 4); + Bg_ToggleLayer(4, 0); + Bg_FreeTilemapBuffer(param0->unk_00, 4); ov104_0223D058(param0); ov104_0223D5F0(param0->unk_10); @@ -327,7 +327,7 @@ static void ov104_0223C6EC(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_04); - sub_0201C2B8(v0->unk_00); + Bg_RunScheduledUpdates(v0->unk_00); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -421,12 +421,12 @@ static void ov104_0223C7EC(UnkStruct_ov104_0223C4CC *param0) v0 = ov63_0222D1B8(¶m0->unk_1C) + param0->unk_A4.unk_04; sub_0200962C(sub_0200C738(param0->unk_34.unk_00), FX32_CONST(v0), FX32_CONST(v1)); - sub_0201C63C(param0->unk_00, 3, 0, v0); - sub_0201C63C(param0->unk_00, 3, 3, v1); + Bg_ScheduleScroll(param0->unk_00, 3, 0, v0); + Bg_ScheduleScroll(param0->unk_00, 3, 3, v1); if ((ov104_0222EA90(v2->unk_24, 9) != 0xffff) && (ov104_0222EA90(v2->unk_24, 13) == 1)) { - sub_0201C63C(param0->unk_00, 2, 0, v0); - sub_0201C63C(param0->unk_00, 2, 3, v1); + Bg_ScheduleScroll(param0->unk_00, 2, 0, v0); + Bg_ScheduleScroll(param0->unk_00, 2, 3, v1); } } @@ -487,7 +487,7 @@ static void ov104_0223C948(BgConfig *param0, int param1) }; v2.mainBgMode = v0; - sub_02018368(&v2); + SetAllGraphicsModes(&v2); } { @@ -555,31 +555,31 @@ static void ov104_0223C948(BgConfig *param0, int param1) } if (v0 == GX_BGMODE_0) { - sub_020183C4(param0, 1, &v3[0], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); - sub_020183C4(param0, 2, &v3[1], 0); - sub_02019EBC(param0, 2); - sub_02019184(param0, 2, 0, 0); - sub_02019184(param0, 2, 3, 0); - sub_020183C4(param0, 3, &v3[2], 0); - sub_02019EBC(param0, 3); - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_InitFromTemplate(param0, 1, &v3[0], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 2, &v3[1], 0); + Bg_ClearTilemap(param0, 2); + Bg_SetOffset(param0, 2, 0, 0); + Bg_SetOffset(param0, 2, 3, 0); + Bg_InitFromTemplate(param0, 3, &v3[2], 0); + Bg_ClearTilemap(param0, 3); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); } else { - sub_020183C4(param0, 1, &v3[0], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); - sub_020183C4(param0, 2, &v3[1], 2); - sub_02019EBC(param0, 2); - sub_02019184(param0, 2, 0, 0); - sub_02019184(param0, 2, 3, 0); - sub_020183C4(param0, 3, &v3[2], 2); - sub_02019EBC(param0, 3); - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_InitFromTemplate(param0, 1, &v3[0], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 2, &v3[1], 2); + Bg_ClearTilemap(param0, 2); + Bg_SetOffset(param0, 2, 0, 0); + Bg_SetOffset(param0, 2, 3, 0); + Bg_InitFromTemplate(param0, 3, &v3[2], 2); + Bg_ClearTilemap(param0, 3); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); } G2_SetBG0Priority(0); @@ -605,10 +605,10 @@ static void ov104_0223C948(BgConfig *param0, int param1) }, }; - sub_020183C4(param0, 4, &v5[0], 0); - sub_02019EBC(param0, 4); - sub_02019184(param0, 4, 0, 0); - sub_02019184(param0, 4, 3, 0); + Bg_InitFromTemplate(param0, 4, &v5[0], 0); + Bg_ClearTilemap(param0, 4); + Bg_SetOffset(param0, 4, 0, 0); + Bg_SetOffset(param0, 4, 3, 0); } } @@ -744,7 +744,7 @@ static void ov104_0223CC74(UnkStruct_ov104_0223C4CC *param0, int param1, const T } } - sub_0201C3C0(param0->unk_00, 3); + Bg_ScheduleTilemapTransfer(param0->unk_00, 3); NARC_dtor(v3); } } diff --git a/src/overlay104/ov104_0223D9E4.c b/src/overlay104/ov104_0223D9E4.c index 87fc4379d7..87166019d1 100644 --- a/src/overlay104/ov104_0223D9E4.c +++ b/src/overlay104/ov104_0223D9E4.c @@ -154,11 +154,11 @@ static void ov104_0223DB48(SysTask *param0, void *param1) v1->unk_22008 = 0; { - sub_0201958C(v1->unk_04, 3, v1->unk_2008[v1->unk_22009], 0x10000, 0); + Bg_LoadTiles(v1->unk_04, 3, v1->unk_2008[v1->unk_22009], 0x10000, 0); } - sub_02019574(v1->unk_04, 3, v1->unk_08[v1->unk_22009], 0x1000); - sub_0201C3C0(v1->unk_04, 3); + Bg_LoadTilemapBuffer(v1->unk_04, 3, v1->unk_08[v1->unk_22009], 0x1000); + Bg_ScheduleTilemapTransfer(v1->unk_04, 3); v1->unk_22009 ^= 1; } diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c index 7315f79011..f1eae8b50c 100644 --- a/src/overlay104/ov104_0223DC7C.c +++ b/src/overlay104/ov104_0223DC7C.c @@ -203,10 +203,10 @@ void ov104_0223DC7C(int param0, BgConfig *param1, SpriteRenderer *param2, Sprite v1->unk_2C = param0 - 1; - MI_CpuClear32(sub_02019F28(1), 0x8000); + MI_CpuClear32(Bg_GetCharPtr(1), 0x8000); - sub_0201C63C(param1, 1, 0, 0); - sub_0201C63C(param1, 1, 3, 0); + Bg_ScheduleScroll(param1, 1, 0, 0); + Bg_ScheduleScroll(param1, 1, 3, 0); ov104_0223E5A8(v1, &Unk_ov104_0224191C[v1->unk_2C]); @@ -446,7 +446,7 @@ static void ov104_0223E29C(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_022 if (param10 == NULL) { Window_Init(&v1); - BGL_AddFramelessWindow(v5, &v1, v8, 16 / 8, 0, 0); + Window_AddToTopLeftCorner(v5, &v1, v8, 16 / 8, 0, 0); Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); } else { v1 = param10->unk_00; @@ -480,7 +480,7 @@ static void ov104_0223E29C(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_022 sub_020128C4(v4, param7, param8); if (param10 == NULL) { - BGL_DeleteWindow(&v1); + Window_Remove(&v1); } param1->unk_00 = v4; @@ -625,8 +625,8 @@ static void ov104_0223E5A8(UnkStruct_ov104_0223DD30 *param0, const UnkStruct_ov1 PaletteSys_LoadPalette(param0->unk_1C, 112, param1->unk_08, 94, 0, 0x20, 12 * 16); sub_020070E8(param0->unk_24, param1->unk_09, param0->unk_10, 1, 0, 0, 0, 94); sub_0200710C(param0->unk_24, param1->unk_0A, param0->unk_10, 1, 0, 0, 0, 94); - sub_02019E2C(param0->unk_10, 1, 0, 0, 32, 32, 12); - sub_0201C3C0(param0->unk_10, 1); + Bg_ChangeTilemapRectPalette(param0->unk_10, 1, 0, 0, 32, 32, 12); + Bg_ScheduleTilemapTransfer(param0->unk_10, 1); { void *v0; diff --git a/src/overlay104/ov104_0223E894.c b/src/overlay104/ov104_0223E894.c index dcffc50b48..6016e19626 100644 --- a/src/overlay104/ov104_0223E894.c +++ b/src/overlay104/ov104_0223E894.c @@ -300,7 +300,7 @@ static void ov104_0223EB44(Window *param0, s32 param1, s32 param2, s32 param3, s param2 = 256; } - BGL_WindowColor(param0, param5, param3, param1, param4 - param3, param2 - param1); + Window_FillRectWithColor(param0, param5, param3, param1, param4 - param3, param2 - param1); } UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(u32 param0) diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 3fb2a16f19..5b304c8120 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -368,7 +368,7 @@ int ov105_02241AE0(OverlayManager *param0, int *param1) memset(v1, 0, sizeof(UnkStruct_ov105_02241FF4)); v1->unk_124 = sub_02024220(93, 0, 2, 0, 2, ov105_02245CD0); - v1->unk_4C = sub_02018340(93); + v1->unk_4C = BgConfig_New(93); v1->unk_00 = param0; v2 = (UnkStruct_ov104_02234130 *)OverlayManager_Args(param0); @@ -645,7 +645,7 @@ static BOOL ov105_02241FF4(UnkStruct_ov105_02241FF4 *param0) ov105_02245F5C(param0->unk_2F4[v0]); } - sub_02019184(param0->unk_4C, 2, 0, (33 * 8)); + Bg_SetOffset(param0->unk_4C, 2, 0, (33 * 8)); sub_02007DEC(param0->unk_12C[0], 6, 1); sub_0200F174(0, 1, 1, 0x0, 6, 1 * 3, 93); param0->unk_08++; @@ -778,13 +778,13 @@ static void ov105_0224227C(UnkStruct_ov105_02241FF4 *param0) if (param0->unk_18 != 0) { for (v0 = 0; v0 < v1; v0++) { - BGL_FillWindow(¶m0->unk_50[8 + v0], 0); + Window_FillTilemap(¶m0->unk_50[8 + v0], 0); if (v0 < param0->unk_18) { ov105_022450DC(param0, ¶m0->unk_50[8 + v0], 0, 0, 15, 2, 0, 0, param0->unk_3B6[v0], param0->unk_3BA[v0]); } - sub_0201A9A4(¶m0->unk_50[8 + v0]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[8 + v0]); } } } @@ -828,7 +828,7 @@ static void ov105_022424CC(UnkStruct_ov105_02241FF4 *param0) ov105_02246260(param0->unk_4C, ¶m0->unk_50[7]); param0->unk_10 = ov105_02244C60(param0, ¶m0->unk_50[7], 19, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_SYSTEM); - sub_0201A9A4(¶m0->unk_50[7]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[7]); param0->unk_10 = ov105_02244D14(param0, 9); if (param0->unk_13_1 == 1) { @@ -1001,11 +1001,11 @@ static BOOL ov105_022426E0(UnkStruct_ov105_02241FF4 *param0) static void ov105_0224296C(UnkStruct_ov105_02241FF4 *param0) { - BGL_FillWindow(¶m0->unk_50[2 + param0->unk_11], 0); - sub_0201A9A4(¶m0->unk_50[2 + param0->unk_11]); + Window_FillTilemap(¶m0->unk_50[2 + param0->unk_11], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_50[2 + param0->unk_11]); param0->unk_11--; - BGL_FillWindow(¶m0->unk_50[2 + param0->unk_11], 0); + Window_FillTilemap(¶m0->unk_50[2 + param0->unk_11], 0); ov105_02244FF8(param0, ¶m0->unk_50[2 + param0->unk_11], ov105_022461A0(param0->unk_30C), 0, 0, 15, 2, 0, 0, param0->unk_31C); ov105_02244EE8(param0, 0, (param0->unk_11 + 1)); @@ -1074,7 +1074,7 @@ static void ov105_02242B54(UnkStruct_ov105_02241FF4 *param0) v0 = ov105_02245508(param0->unk_09); for (v1 = 0; v1 < v0; v1++) { - BGL_FillWindow(¶m0->unk_50[2 + v1], 0); + Window_FillTilemap(¶m0->unk_50[2 + v1], 0); } for (v1 = 0; v1 < param0->unk_11; v1++) { @@ -1084,7 +1084,7 @@ static void ov105_02242B54(UnkStruct_ov105_02241FF4 *param0) ov105_02244FF8(param0, ¶m0->unk_50[2 + param0->unk_11], ov105_022461A0(param0->unk_30C), 0, 0, 15, 2, 0, 0, param0->unk_31C); for (v1 = 0; v1 < v0; v1++) { - sub_0201A9A4(¶m0->unk_50[2 + v1]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[2 + v1]); } ov105_02244EE8(param0, 0, (param0->unk_11 + 1)); @@ -1106,17 +1106,17 @@ static BOOL ov105_02242D04(UnkStruct_ov105_02241FF4 *param0) case 0: ov105_02246074(param0->unk_30C, 0); param0->unk_13_5 = 1; - sub_0201ACF4(¶m0->unk_50[1]); - sub_0201ACF4(¶m0->unk_50[8]); - sub_0201ACF4(¶m0->unk_50[9]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[1]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[8]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[9]); for (v2 = 0; v2 < param0->unk_11; v2++) { - BGL_FillWindow(¶m0->unk_50[2 + v2], 0); - sub_0201A9A4(¶m0->unk_50[2 + v2]); + Window_FillTilemap(¶m0->unk_50[2 + v2], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_50[2 + v2]); } - BGL_FillWindow(¶m0->unk_50[0], 0); - sub_0201A9A4(¶m0->unk_50[0]); + Window_FillTilemap(¶m0->unk_50[0], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_50[0]); ov105_022448F4(param0, 3, ov105_02245538(param0, 1, 0), 21, 11); sub_0200872C(param0->unk_128, 0, 16, 0, 0xffff); @@ -1290,9 +1290,9 @@ static BOOL ov105_02243144(UnkStruct_ov105_02241FF4 *param0) case 0: param0->unk_13_5 = 1; - sub_0201ACF4(¶m0->unk_50[1]); - sub_0201ACF4(¶m0->unk_50[8]); - sub_0201ACF4(¶m0->unk_50[9]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[1]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[8]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[9]); if (ov104_0223AED4(param0->unk_09) == 0) { ov105_022448F4(param0, 3, ov105_02245538(param0, 1, 1), 32, 11); @@ -1487,7 +1487,7 @@ static BOOL ov105_022434BC(UnkStruct_ov105_02241FF4 *param0) param0->unk_310 = NULL; ov105_02246260(param0->unk_4C, ¶m0->unk_50[7]); param0->unk_10 = ov105_02244C60(param0, ¶m0->unk_50[7], 19, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_SYSTEM); - sub_0201A9A4(¶m0->unk_50[7]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[7]); param0->unk_08 = 1; break; } @@ -1533,8 +1533,8 @@ static void ov105_02243738(UnkStruct_ov105_02241FF4 *param0) param0->unk_30C = NULL; param0->unk_13_2 = 1; - BGL_FillWindow(¶m0->unk_50[2], 0); - sub_0201A9A4(¶m0->unk_50[2]); + Window_FillTilemap(¶m0->unk_50[2], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_50[2]); return; } @@ -1547,8 +1547,8 @@ static BOOL ov105_02243818(UnkStruct_ov105_02241FF4 *param0) switch (param0->unk_08) { case 0: - BGL_FillWindow(¶m0->unk_50[2], 0); - sub_0201A9A4(¶m0->unk_50[2 + param0->unk_11]); + Window_FillTilemap(¶m0->unk_50[2], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_50[2 + param0->unk_11]); sub_02007DC8(param0->unk_12C[0]); param0->unk_10 = ov105_02244D14(param0, 10); @@ -1609,7 +1609,7 @@ static void ov105_0224396C(UnkStruct_ov105_02241FF4 *param0) ov105_02246260(param0->unk_4C, ¶m0->unk_50[7]); param0->unk_10 = ov105_02244C60(param0, ¶m0->unk_50[7], 19, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_SYSTEM); - sub_0201A9A4(¶m0->unk_50[7]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[7]); param0->unk_10 = ov105_02244D14(param0, 9); return; @@ -1628,7 +1628,7 @@ static BOOL ov105_02243A3C(UnkStruct_ov105_02241FF4 *param0) param0->unk_10 = ov105_02244C60(param0, ¶m0->unk_50[7], 23, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_SYSTEM); param0->unk_10 = ov105_02244CC0(param0, ¶m0->unk_50[7], 24, 1, 1 + 16, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_SYSTEM); - sub_0201A9A4(¶m0->unk_50[7]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[7]); if (ov104_0223AED4(param0->unk_09) == 0) { param0->unk_30C = ov105_02245FB8(¶m0->unk_144, param0->unk_1B, ((NELEMS(Unk_ov105_02246350)) - 2), 2, 0, Unk_ov105_02246350, Unk_ov105_022462D4); @@ -1724,13 +1724,13 @@ static void ov105_02243D20(UnkStruct_ov105_02241FF4 *param0) param0->unk_30C = NULL; param0->unk_13_2 = 0; - BGL_FillWindow(¶m0->unk_50[2], 0); - sub_0201A9A4(¶m0->unk_50[2]); + Window_FillTilemap(¶m0->unk_50[2], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_50[2]); sub_02007DC8(param0->unk_12C[0]); - BGL_FillWindow(¶m0->unk_50[7], 15); + Window_FillTilemap(¶m0->unk_50[7], 15); sub_0200E084(¶m0->unk_50[7], 1); - sub_0201AD10(¶m0->unk_50[7]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[7]); param0->unk_11--; param0->unk_324[0] = 0; @@ -1748,8 +1748,8 @@ static void ov105_02243D84(UnkStruct_ov105_02241FF4 *param0) param0->unk_310 = NULL; ov105_02246074(param0->unk_30C, 0); - BGL_FillWindow(¶m0->unk_50[2], 0); - sub_0201A9A4(¶m0->unk_50[2]); + Window_FillTilemap(¶m0->unk_50[2], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_50[2]); sub_02007DC8(param0->unk_12C[0]); return; @@ -1765,7 +1765,7 @@ static void ov105_02243DE4(UnkStruct_ov105_02241FF4 *param0) param0->unk_10 = ov105_02244CC0(param0, ¶m0->unk_50[7], 24, 1, 1 + 16, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_SYSTEM); ov105_0224628C(¶m0->unk_50[5], Options_Frame(param0->unk_138)); param0->unk_10 = ov105_02244D14(param0, 13); - sub_0201A9A4(¶m0->unk_50[7]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[7]); } static BOOL ov105_02243E84(UnkStruct_ov105_02241FF4 *param0) @@ -1775,8 +1775,8 @@ static BOOL ov105_02243E84(UnkStruct_ov105_02241FF4 *param0) switch (param0->unk_08) { case 0: - BGL_FillWindow(¶m0->unk_50[2], 0); - sub_0201A9A4(¶m0->unk_50[2]); + Window_FillTilemap(¶m0->unk_50[2], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_50[2]); sub_02007DC8(param0->unk_12C[0]); ov105_0224628C(¶m0->unk_50[5], Options_Frame(param0->unk_138)); @@ -1854,15 +1854,15 @@ static BOOL ov105_0224400C(UnkStruct_ov105_02241FF4 *param0) case 0: param0->unk_13_5 = 1; - sub_0201ACF4(¶m0->unk_50[1]); - sub_0201ACF4(¶m0->unk_50[8]); - sub_0201ACF4(¶m0->unk_50[9]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[1]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[8]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[9]); - BGL_FillWindow(¶m0->unk_50[0], 0); - sub_0201A9A4(¶m0->unk_50[0]); + Window_FillTilemap(¶m0->unk_50[0], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_50[0]); sub_0200E084(¶m0->unk_50[5], 1); - sub_0201AD10(¶m0->unk_50[5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[5]); ov105_02246244(param0->unk_50); ov105_022448F4(param0, 3, ov105_02245538(param0, 1, 0), 21, 11); @@ -1902,7 +1902,7 @@ static BOOL ov105_0224400C(UnkStruct_ov105_02241FF4 *param0) ov105_02244A60(param0, 2); ov105_02244A18(param0, 3); - sub_02019184(param0->unk_4C, 2, 0, param0->unk_0C); + Bg_SetOffset(param0->unk_4C, 2, 0, param0->unk_0C); Sound_PlayEffect(1554); param0->unk_19 = 0; @@ -2106,7 +2106,7 @@ static BOOL ov105_02244424(UnkStruct_ov105_02241FF4 *param0) param0->unk_10 = ov105_02244C60(param0, ¶m0->unk_50[5], 16, 1, 1, Options_TextFrameDelay(SaveData_Options(param0->unk_13C)), 1, 2, 15, FONT_MESSAGE); - sub_0201A9A4(¶m0->unk_50[5]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[5]); param0->unk_19 = 80; param0->unk_08++; @@ -2138,7 +2138,7 @@ static void ov105_0224451C(void *param0) sub_02003694(v0->unk_120); } - sub_0201C2B8(v0->unk_4C); + Bg_RunScheduledUpdates(v0->unk_4C); sub_0201DCAC(); sub_0200A858(); @@ -2174,7 +2174,7 @@ static void ov105_02244584(BgConfig *param0) GX_BG0_AS_3D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -2194,9 +2194,9 @@ static void ov105_02244584(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); - sub_02019690(1, 32, 0, 93); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v1, 0); + Bg_ClearTilesRange(1, 32, 0, 93); + Bg_ClearTilemap(param0, 1); } { @@ -2216,8 +2216,8 @@ static void ov105_02244584(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v2, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v2, 0); + Bg_ClearTilemap(param0, 2); } { @@ -2237,8 +2237,8 @@ static void ov105_02244584(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v3, 0); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v3, 0); + Bg_ClearTilemap(param0, 3); } { @@ -2258,8 +2258,8 @@ static void ov105_02244584(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v4, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v4, 0); + Bg_ClearTilemap(param0, 4); } G2_SetBG0Priority(0); @@ -2292,7 +2292,7 @@ static void ov105_02244678(UnkStruct_ov105_02241FF4 *param0) ov105_022449A4(param0, 3); ov105_02244A60(param0, 2); - sub_02019184(param0->unk_4C, 2, 0, param0->unk_0C); + Bg_SetOffset(param0->unk_4C, 2, 0, param0->unk_0C); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); @@ -2313,10 +2313,10 @@ static void ov105_0224473C(BgConfig *param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 4); Heap_FreeToHeap(param0); return; @@ -2336,8 +2336,8 @@ static BOOL ov105_02244780(UnkStruct_ov105_02241FF4 *param0) v3 = 0; - sub_02019184(param0->unk_4C, 2, 1, 8); - param0->unk_0C = sub_020192EC(param0->unk_4C, 2); + Bg_SetOffset(param0->unk_4C, 2, 1, 8); + param0->unk_0C = Bg_GetXOffset(param0->unk_4C, 2); for (v0 = 0; v0 < param0->unk_12; v0++) { v4 = ov105_02245F2C(param0->unk_2F4[v0]); @@ -2368,8 +2368,8 @@ static BOOL ov105_02244830(UnkStruct_ov105_02241FF4 *param0) v3 = 0; - sub_02019184(param0->unk_4C, 2, 1, 8); - param0->unk_0C = sub_020192EC(param0->unk_4C, 2); + Bg_SetOffset(param0->unk_4C, 2, 1, 8); + param0->unk_0C = Bg_GetXOffset(param0->unk_4C, 2); for (v0 = 0; v0 < param0->unk_12; v0++) { v4 = ov105_02245F2C(param0->unk_2F4[v0]); @@ -2407,8 +2407,8 @@ static void ov105_022448BC(UnkStruct_ov105_02241FF4 *param0) static void ov105_022448F4(UnkStruct_ov105_02241FF4 *param0, u32 param1, u8 param2, u8 param3, u8 param4) { - sub_02019E2C(param0->unk_4C, param1, 0, 0, param3, param4, param2); - sub_0201C3C0(param0->unk_4C, param1); + Bg_ChangeTilemapRectPalette(param0->unk_4C, param1, 0, 0, param3, param4, param2); + Bg_ScheduleTilemapTransfer(param0->unk_4C, param1); return; } @@ -2478,7 +2478,7 @@ static void ov105_02244AA8(UnkStruct_ov105_02241FF4 *param0, u32 param1) { sub_020070E8(param0->unk_338, 4, param0->unk_4C, param1, 0, 0, 1, 93); sub_0200710C(param0->unk_338, 9, param0->unk_4C, param1, 0, 0, 1, 93); - BGL_SetPriority(1, 2); + Bg_SetPriority(1, 2); return; } @@ -2536,7 +2536,7 @@ static void ov105_02244C0C(UnkStruct_ov105_02241FF4 *param0, u32 param1) static u8 ov105_02244C60(UnkStruct_ov105_02241FF4 *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { - BGL_FillWindow(param1, param8); + Window_FillTilemap(param1, param8); MessageLoader_GetStrbuf(param0->unk_1C, param2, param0->unk_28); StringTemplate_Format(param0->unk_20, param0->unk_24, param0->unk_28); @@ -2556,7 +2556,7 @@ static u8 ov105_02244D14(UnkStruct_ov105_02241FF4 *param0, int param1) u8 v0; v0 = ov105_02244C60(param0, ¶m0->unk_50[5], param1, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_MESSAGE); - sub_0201A9A4(¶m0->unk_50[5]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[5]); return v0; } @@ -2649,7 +2649,7 @@ static void ov105_02244F0C(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 v1 = SaveData_GetTrainerInfo(param0->unk_13C); v2 = Strbuf_Init((7 + 1), 93); - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); Strbuf_CopyChars(v2, TrainerInfo_Name(v1)); if (TrainerInfo_Gender(v1) == 0) { @@ -2660,7 +2660,7 @@ static void ov105_02244F0C(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 Text_AddPrinterWithParamsAndColor(param1, param4, v2, param2, param3, TEXT_SPEED_NO_TRANSFER, v0, NULL); Strbuf_Free(v2); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -2674,7 +2674,7 @@ static void ov105_02244F84(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 v2 = CommInfo_TrainerInfo(1 - CommSys_CurNetId()); v1 = Strbuf_Init((7 + 1), 93); - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); TrainerInfo_NameStrbuf(v2, v1); if (TrainerInfo_Gender(v2) == 0) { @@ -2685,7 +2685,7 @@ static void ov105_02244F84(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 Text_AddPrinterWithParamsAndColor(param1, param4, v1, param2, param3, TEXT_SPEED_NO_TRANSFER, v0, NULL); Strbuf_Free(v1); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -2701,13 +2701,13 @@ static void ov105_02244FF8(UnkStruct_ov105_02241FF4 *param0, Window *param1, u8 v5 = Party_GetPokemonBySlotIndex(param9, param2); Pokemon_GetValue(v5, MON_DATA_SPECIES_NAME, v6); - BGL_FillWindow(param1, param7); + Window_FillTilemap(param1, param7); v4 = Strbuf_Init((10 + 1), 93); Strbuf_CopyChars(v4, v6); Text_AddPrinterWithParamsAndColor(param1, param8, v4, param3, param4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(param5, param6, param7), NULL); - v0 = sub_0201C294(param1) - 1; + v0 = Window_GetWidth(param1) - 1; v1 = Pokemon_GetValue(v5, MON_DATA_GENDER, NULL); v2 = (v1 == 0) ? 25 : 26; v3 = (v1 == 0) ? TEXT_COLOR(7, 8, 0) : TEXT_COLOR(3, 4, 0); @@ -2720,7 +2720,7 @@ static void ov105_02244FF8(UnkStruct_ov105_02241FF4 *param0, Window *param1, u8 } Strbuf_Free(v4); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -2735,7 +2735,7 @@ static void ov105_022450DC(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 Pokemon *v5; u16 v6[(10 + 1)]; - BGL_FillWindow(param1, param6); + Window_FillTilemap(param1, param6); v3 = MessageLoader_Init(1, 26, 412, 93); v4 = MessageLoader_GetNewStrbuf(v3, param8); @@ -2743,7 +2743,7 @@ static void ov105_022450DC(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 MessageLoader_Free(v3); Text_AddPrinterWithParamsAndColor(param1, param7, v4, param2, param3, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(param4, param5, param6), NULL); - v0 = sub_0201C294(param1) - 1; + v0 = Window_GetWidth(param1) - 1; v1 = (param9 == 0) ? 25 : 26; v2 = (param9 == 0) ? TEXT_COLOR(7, 8, 0) : TEXT_COLOR(3, 4, 0); @@ -2816,7 +2816,7 @@ static void ov105_022452A0(UnkStruct_ov105_02241FF4 *param0) ov105_022452E4(); param0->unk_124 = sub_02024220(93, 0, 2, 0, 2, ov105_02245CD0); - param0->unk_4C = sub_02018340(93); + param0->unk_4C = BgConfig_New(93); ov105_0224531C(param0); ov105_02246214(param0->unk_4C, param0->unk_50); @@ -3164,21 +3164,21 @@ static void ov105_022457C0(UnkStruct_ov105_02241FF4 *param0) v1 = ov104_0223AA50(param0->unk_09); if (param0->unk_13_5 == 1) { - sub_0201ACF4(¶m0->unk_50[1]); - sub_0201ACF4(¶m0->unk_50[8]); - sub_0201ACF4(¶m0->unk_50[9]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[1]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[8]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[9]); return; } if (param0->unk_3BF == 1) { for (v0 = 0; v0 < v1; v0++) { - BGL_FillWindow(¶m0->unk_50[8 + v0], 0); + Window_FillTilemap(¶m0->unk_50[8 + v0], 0); if (v0 < param0->unk_18) { ov105_022450DC(param0, ¶m0->unk_50[8 + v0], 0, 0, 15, 2, 0, 0, param0->unk_3B6[v0], param0->unk_3BA[v0]); } - sub_0201A9A4(¶m0->unk_50[8 + v0]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[8 + v0]); } ov105_02244F84(param0, ¶m0->unk_50[1], 0, 0, 0); @@ -3324,9 +3324,9 @@ static void ov105_02245A30(UnkStruct_ov105_02241FF4 *param0) static void ov105_02245A64(UnkStruct_ov105_02241FF4 *param0) { - BGL_SetPriority(1, 1); - sub_02019690(1, 32, 0, 93); - sub_02019EBC(param0->unk_4C, 1); + Bg_SetPriority(1, 1); + Bg_ClearTilesRange(1, 32, 0, 93); + Bg_ClearTilemap(param0->unk_4C, 1); ov105_02246214(param0->unk_4C, param0->unk_50); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); @@ -3336,7 +3336,7 @@ static void ov105_02245A64(UnkStruct_ov105_02241FF4 *param0) static void ov105_02245A98(Window *param0) { Window_Clear(param0, 1); - sub_0201AD10(param0); + Window_ClearAndScheduleCopyToVRAM(param0); return; } diff --git a/src/overlay105/ov105_02246214.c b/src/overlay105/ov105_02246214.c index 3f4131c001..801f96e61a 100644 --- a/src/overlay105/ov105_02246214.c +++ b/src/overlay105/ov105_02246214.c @@ -30,8 +30,8 @@ void ov105_02246214(BgConfig *param0, Window *param1) const WindowTemplate *v1 = Unk_ov105_02246458; for (v0 = 0; v0 < 10; v0++) { - sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); - BGL_FillWindow(¶m1[v0], 0); + Window_AddFromTemplate(param0, ¶m1[v0], &v1[v0]); + Window_FillTilemap(¶m1[v0], 0); } return; @@ -42,7 +42,7 @@ void ov105_02246244(Window *param0) u16 v0; for (v0 = 0; v0 < 10; v0++) { - BGL_DeleteWindow(¶m0[v0]); + Window_Remove(¶m0[v0]); } return; @@ -58,8 +58,8 @@ void ov105_02246260(BgConfig *param0, Window *param1) void ov105_0224628C(Window *param0, int param1) { - sub_0200DD0C(param0->bgConfig, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 93); - BGL_FillWindow(param0, 15); + sub_0200DD0C(param0->bgConfig, Window_GetBgLayer(param0), ((1024 - 9) - (18 + 12)), 10, param1, 93); + Window_FillTilemap(param0, 15); sub_0200E060(param0, 1, ((1024 - 9) - (18 + 12)), 10); return; diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index fb9c3f6d84..0708752821 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -202,7 +202,7 @@ int ov106_02241AE0(OverlayManager *param0, int *param1) v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov106_02243118), 98); memset(v1, 0, sizeof(UnkStruct_ov106_02243118)); - v1->unk_48 = sub_02018340(98); + v1->unk_48 = BgConfig_New(98); v1->unk_00 = param0; v2 = (UnkStruct_ov104_02235208 *)OverlayManager_Args(param0); @@ -443,7 +443,7 @@ static BOOL ov106_02241E5C(UnkStruct_ov106_02243118 *param0) if (ov104_0223B5B0(param0->unk_09) == 0) { ov106_02242FAC(param0->unk_48, param0->unk_0D, 1); - sub_0201C3C0(param0->unk_48, 3); + Bg_ScheduleTilemapTransfer(param0->unk_48, 3); } param0->unk_14 = 8; @@ -502,7 +502,7 @@ static BOOL ov106_02241E5C(UnkStruct_ov106_02243118 *param0) case 4: ov106_02243758(¶m0->unk_4C[0], Options_Frame(param0->unk_B4)); param0->unk_0A = ov106_02242918(param0, ¶m0->unk_4C[0], 32, 1, 1, Options_TextFrameDelay(SaveData_Options(param0->unk_B8)), 1, 2, 15, FONT_MESSAGE); - sub_0201A954(¶m0->unk_4C[0]); + Window_CopyToVRAM(¶m0->unk_4C[0]); param0->unk_08 = 5; break; case 5: @@ -582,7 +582,7 @@ static BOOL ov106_02242108(UnkStruct_ov106_02243118 *param0) param0->unk_1B = 10; ov106_02242FAC(param0->unk_48, param0->unk_2F8, 2); - sub_0201C3C0(param0->unk_48, 3); + Bg_ScheduleTilemapTransfer(param0->unk_48, 3); param0->unk_08 = 4; break; @@ -598,7 +598,7 @@ static BOOL ov106_02242108(UnkStruct_ov106_02243118 *param0) ov106_022432D4(param0); ov106_02242FAC(param0->unk_48, param0->unk_2F8, 0); - sub_0201C3C0(param0->unk_48, 3); + Bg_ScheduleTilemapTransfer(param0->unk_48, 3); param0->unk_2F8 = 0xff; param0->unk_2F9 = 0; @@ -610,7 +610,7 @@ static BOOL ov106_02242108(UnkStruct_ov106_02243118 *param0) break; case 2: ov106_02242FAC(param0->unk_48, param0->unk_0D, 1); - sub_0201C3C0(param0->unk_48, 3); + Bg_ScheduleTilemapTransfer(param0->unk_48, 3); ov106_02243224(param0); param0->unk_08 = 5; break; @@ -776,7 +776,7 @@ static void ov106_0224248C(UnkStruct_ov106_02243118 *param0) int v0; ov106_022424C8(); - param0->unk_48 = sub_02018340(98); + param0->unk_48 = BgConfig_New(98); ov106_02242500(param0); if (ov104_0223B5A4(param0->unk_0D) == 0xfe) { @@ -874,10 +874,10 @@ static void ov106_022426A4(BgConfig *param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 3); - sub_02019044(param0, 1); - sub_02019044(param0, 0); - sub_02019044(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); + Bg_FreeTilemapBuffer(param0, 4); Heap_FreeToHeap(param0); return; @@ -895,7 +895,7 @@ static void ov106_022426E0(void *param0) sub_02003694(v0->unk_AC); } - sub_0201C2B8(v0->unk_48); + Bg_RunScheduledUpdates(v0->unk_48); sub_0201DCAC(); sub_0200A858(); @@ -931,7 +931,7 @@ static void ov106_0224273C(BgConfig *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -951,9 +951,9 @@ static void ov106_0224273C(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019690(0, 32, 0, 98); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilesRange(0, 32, 0, 98); + Bg_ClearTilemap(param0, 0); } { @@ -973,9 +973,9 @@ static void ov106_0224273C(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019690(1, 32, 0, 98); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilesRange(1, 32, 0, 98); + Bg_ClearTilemap(param0, 1); } { @@ -995,8 +995,8 @@ static void ov106_0224273C(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v3, 0); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v3, 0); + Bg_ClearTilemap(param0, 3); } { @@ -1016,8 +1016,8 @@ static void ov106_0224273C(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v4, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v4, 0); + Bg_ClearTilemap(param0, 4); } G2_SetBG0Priority(0); @@ -1059,7 +1059,7 @@ static void ov106_022428B8(UnkStruct_ov106_02243118 *param0, u32 param1) static u8 ov106_02242918(UnkStruct_ov106_02243118 *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { - BGL_FillWindow(param1, param8); + Window_FillTilemap(param1, param8); MessageLoader_GetStrbuf(param0->unk_20, param2, param0->unk_2C); StringTemplate_Format(param0->unk_24, param0->unk_28, param0->unk_2C); @@ -1071,7 +1071,7 @@ static u8 ov106_02242978(UnkStruct_ov106_02243118 *param0, int param1, u8 param2 u8 v0; v0 = ov106_02242918(param0, ¶m0->unk_4C[0], param1, 1, 1, TEXT_SPEED_INSTANT, 1, 2, 15, param2); - sub_0201A954(¶m0->unk_4C[0]); + Window_CopyToVRAM(¶m0->unk_4C[0]); return v0; } @@ -1139,13 +1139,13 @@ static void ov106_02242AC4(UnkStruct_ov106_02243118 *param0, Window *param1, u32 v5 = Party_GetPokemonBySlotIndex(param0->unk_290, 0); Pokemon_GetValue(v5, MON_DATA_SPECIES_NAME, v6); - BGL_FillWindow(param1, param6); + Window_FillTilemap(param1, param6); v4 = Strbuf_Init((10 + 1), 98); Strbuf_CopyChars(v4, v6); Text_AddPrinterWithParamsAndColor(param1, param7, v4, param2, param3, TEXT_SPEED_INSTANT, TEXT_COLOR(param4, param5, param6), NULL); Strbuf_Free(v4); - sub_0201A954(param1); + Window_CopyToVRAM(param1); return; } @@ -1156,7 +1156,7 @@ static void ov106_02242B38(UnkStruct_ov106_02243118 *param0, Window *param1, u8 Strbuf *v2; MessageLoader *v3; - BGL_FillWindow(param1, param4); + Window_FillTilemap(param1, param4); v3 = MessageLoader_Init(1, 26, 624, 98); v2 = Strbuf_Init((10 + 1), 98); @@ -1173,7 +1173,7 @@ static void ov106_02242B38(UnkStruct_ov106_02243118 *param0, Window *param1, u8 Strbuf_Free(v2); MessageLoader_Free(v3); - sub_0201A954(param1); + Window_CopyToVRAM(param1); return; } @@ -1181,7 +1181,7 @@ static void ov106_02242B38(UnkStruct_ov106_02243118 *param0, Window *param1, u8 static void ov106_02242C04(UnkStruct_ov106_02243118 *param0, Window *param1, u8 param2, u32 param3, u32 param4) { sub_0200C5BC(param0->unk_B0, param2, 2, 0, param1, param3, param4); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -1380,7 +1380,7 @@ static void ov106_02242F4C(UnkStruct_ov106_02243118 *param0, BgConfig *param1) ov106_02242FAC(param1, ((4 * 5) - 1), 3); } - sub_0201C3C0(param1, 3); + Bg_ScheduleTilemapTransfer(param1, 3); return; } @@ -1419,7 +1419,7 @@ static void ov106_02242FAC(BgConfig *param0, u8 param1, u8 param2) v1 = 18; } - sub_02019E2C(param0, 3, v0, v1, v2, v3, v4); + Bg_ChangeTilemapRectPalette(param0, 3, v0, v1, v2, v3, v4); if (param2 == 0) { v4 = 0; @@ -1445,9 +1445,9 @@ static void ov106_02242FAC(BgConfig *param0, u8 param1, u8 param2) } if (param1 < 9) { - sub_02019E2C(param0, 3, v0, v1, v2, v3, 1); + Bg_ChangeTilemapRectPalette(param0, 3, v0, v1, v2, v3, 1); } else { - sub_02019E2C(param0, 3, v0, v1, v2, v3, 2); + Bg_ChangeTilemapRectPalette(param0, 3, v0, v1, v2, v3, 2); } } @@ -1665,7 +1665,7 @@ static void ov106_022432AC(UnkStruct_ov106_02243118 *param0) ov106_022432D4(param0); ov106_02242FAC(param0->unk_48, param0->unk_0D, 0); - sub_0201C3C0(param0->unk_48, 3); + Bg_ScheduleTilemapTransfer(param0->unk_48, 3); ov106_022436B0(param0->unk_280, 1); return; diff --git a/src/overlay106/ov106_022436E0.c b/src/overlay106/ov106_022436E0.c index 667fa4859c..9026a482eb 100644 --- a/src/overlay106/ov106_022436E0.c +++ b/src/overlay106/ov106_022436E0.c @@ -24,8 +24,8 @@ void ov106_022436E0(BgConfig *param0, Window *param1) const WindowTemplate *v1 = Unk_ov106_02243860; for (v0 = 0; v0 < 4; v0++) { - sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); - BGL_FillWindow(¶m1[v0], 0); + Window_AddFromTemplate(param0, ¶m1[v0], &v1[v0]); + Window_FillTilemap(¶m1[v0], 0); } return; @@ -36,7 +36,7 @@ void ov106_02243710(Window *param0) u16 v0; for (v0 = 0; v0 < 4; v0++) { - BGL_DeleteWindow(¶m0[v0]); + Window_Remove(¶m0[v0]); } return; @@ -52,8 +52,8 @@ void ov106_0224372C(BgConfig *param0, Window *param1) void ov106_02243758(Window *param0, int param1) { - sub_0200DD0C(param0->bgConfig, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 98); - BGL_FillWindow(param0, 15); + sub_0200DD0C(param0->bgConfig, Window_GetBgLayer(param0), ((1024 - 9) - (18 + 12)), 10, param1, 98); + Window_FillTilemap(param0, 15); sub_0200E060(param0, 0, ((1024 - 9) - (18 + 12)), 10); return; diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index fccd8b2e81..0d754581f9 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -469,7 +469,7 @@ int ov107_02241AE0 (OverlayManager * param0, int * param1) v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov107_02241D6C), 100); memset(v1, 0, sizeof(UnkStruct_ov107_02241D6C)); - v1->unk_4C = sub_02018340(100); + v1->unk_4C = BgConfig_New(100); v1->unk_00 = param0; v2 = (UnkStruct_ov104_0223597C *)OverlayManager_Args(param0); v1->unk_1CC = v2->unk_00; @@ -663,7 +663,7 @@ static void ov107_02241E70 (UnkStruct_ov107_02241D6C * param0) ov107_02244E14(param0, &v2, &v3, &v4, &v5); v7 = ¶m0->unk_50[0]; - BGL_FillWindow(v7, 0); + Window_FillTilemap(v7, 0); ov107_02245464(param0, v7); ov107_02245780(param0, v7); @@ -1032,7 +1032,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) param0->unk_08 = 8; break; default: - sub_0201AD10(¶m0->unk_50[12]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[12]); ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); ov107_02244A74(param0, 0, ov107_02244D5C(param0, param0->unk_16, param0->unk_13), 3, 0); @@ -1564,11 +1564,11 @@ static void ov107_022433A8(BgConfig *param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 0); - sub_02019044(param0, 1); - sub_02019044(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 0); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 4); Heap_FreeToHeap(param0); return; @@ -1582,7 +1582,7 @@ static void ov107_022433EC (void * param0) sub_02003694(v0->unk_1C0); } - sub_0201C2B8(v0->unk_4C); + Bg_RunScheduledUpdates(v0->unk_4C); sub_0201DCAC(); sub_0200A858(); @@ -1618,7 +1618,7 @@ static void ov107_02243444(BgConfig *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -1638,9 +1638,9 @@ static void ov107_02243444(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); - sub_02019690(1, 32, 0, 100); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v1, 0); + Bg_ClearTilesRange(1, 32, 0, 100); + Bg_ClearTilemap(param0, 1); } { @@ -1660,9 +1660,9 @@ static void ov107_02243444(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v2, 0); - sub_02019690(0, 32, 0, 100); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v2, 0); + Bg_ClearTilesRange(0, 32, 0, 100); + Bg_ClearTilemap(param0, 0); } { @@ -1682,9 +1682,9 @@ static void ov107_02243444(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019690(2, 32, 0, 100); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilesRange(2, 32, 0, 100); + Bg_ClearTilemap(param0, 2); } { @@ -1704,9 +1704,9 @@ static void ov107_02243444(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v4, 0); - sub_02019690(3, 32, 0, 100); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v4, 0); + Bg_ClearTilesRange(3, 32, 0, 100); + Bg_ClearTilemap(param0, 3); } { @@ -1726,8 +1726,8 @@ static void ov107_02243444(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v5, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v5, 0); + Bg_ClearTilemap(param0, 4); } G2_SetBG0Priority(0); @@ -1818,7 +1818,7 @@ static u8 ov107_0224379C (UnkStruct_ov107_02241D6C * param0, Window * param1, in static u8 ov107_022437CC (UnkStruct_ov107_02241D6C * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9, int param10) { u8 v0; - BGL_FillWindow(param1, param8); + Window_FillTilemap(param1, param8); MessageLoader_GetStrbuf(param0->unk_20, param2, param0->unk_2C); StringTemplate_Format(param0->unk_24, param0->unk_28, param0->unk_2C); @@ -1832,8 +1832,8 @@ static u8 ov107_022437CC (UnkStruct_ov107_02241D6C * param0, Window * param1, in } v0 = Text_AddPrinterWithParamsAndColor(param1, param9, param0->unk_28, param3, param4, param5, TEXT_COLOR(param6, param7, param8), NULL); - sub_0201A9A4(param1); - + Window_ScheduleCopyToVRAM(param1); + return v0; } @@ -1858,8 +1858,8 @@ static u8 ov107_02243890 (UnkStruct_ov107_02241D6C * param0, Window * param1, in } v0 = Text_AddPrinterWithParamsAndColor(param1, param9, param0->unk_28, param3, param4, param5, TEXT_COLOR(param6, param7, param8), NULL); - sub_0201A9A4(param1); - + Window_ScheduleCopyToVRAM(param1); + return v0; } @@ -1868,11 +1868,12 @@ static u8 ov107_02243918 (UnkStruct_ov107_02241D6C * param0, int param1, u8 para u8 v0; v0 = ov107_0224379C(param0, ¶m0->unk_50[6], param1, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, param2); - sub_0201A9A4(¶m0->unk_50[6]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[6]); return v0; } +// clang-format off asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, Window * param1, Pokemon * param2) { push {r4, r5, r6, lr} @@ -1882,7 +1883,7 @@ asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, Window * para add r6, r2, #0 add r0, r4, #0 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap add r0, r6, #0 mov r1, #6 mov r2, #0 @@ -2099,10 +2100,11 @@ asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, Window * para mov r3, #0x50 bl ov107_02243B5C add r0, r4, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add sp, #8 pop {r4, r5, r6, pc} } +// clang-format on static void ov107_02243B5C (UnkStruct_ov107_02241D6C * param0, Window * param1, int param2, u16 param3, u16 param4, int param5) { @@ -2111,14 +2113,14 @@ static void ov107_02243B5C (UnkStruct_ov107_02241D6C * param0, Window * param1, static void ov107_02243B84 (UnkStruct_ov107_02241D6C * param0, Window * param1, Pokemon * param2) { - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); ov107_02243C18(param0, param1, 0, 88, 92, param2, 54, 58, 66); ov107_02243C18(param0, param1, 1, 89, 92, param2, 55, 59, 67); ov107_02243C18(param0, param1, 2, 90, 92, param2, 56, 60, 68); ov107_02243C18(param0, param1, 3, 91, 92, param2, 57, 61, 69); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -2146,7 +2148,7 @@ static void ov107_02243CC0 (UnkStruct_ov107_02241D6C * param0, Window * param1) int v0; u8 v1; - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); v1 = ov104_0223B7A8(param0->unk_09, 1); @@ -2154,7 +2156,7 @@ static void ov107_02243CC0 (UnkStruct_ov107_02241D6C * param0, Window * param1) ov107_02243CFC(param0, param1, v0, 0); } - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -2205,7 +2207,7 @@ static void ov107_02243DB0 (UnkStruct_ov107_02241D6C * param0, Window * param1) ov107_02243DE4(param0, param1, v0, 0); } - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -2251,13 +2253,13 @@ static void ov107_02243E74 (UnkStruct_ov107_02241D6C * param0, Window * param1) v0 = sub_02030698(param0->unk_04, sub_0205E630(param0->unk_09), sub_0205E6A8(sub_0205E630(param0->unk_09))); ov107_02249D84(param0->unk_4C, param1); - BGL_FillWindow(param1, 15); + Window_FillTilemap(param1, 15); ov107_02244AB4(param0, param1, 1, 1, FONT_SYSTEM); ov107_02244A74(param0, 0, v0, 4, 1); param0->unk_0A = ov107_02243860(param0, param1, 4, 16, 1 * 16, TEXT_SPEED_NO_TRANSFER, 1, 2, 0, FONT_SYSTEM); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -2266,13 +2268,13 @@ static u8 ov107_02243EF8 (UnkStruct_ov107_02241D6C * param0, Window * param1, u1 { u8 v0; - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); MessageLoader_GetStrbuf(param0->unk_1C, param2, param0->unk_2C); StringTemplate_Format(param0->unk_24, param0->unk_28, param0->unk_2C); v0 = Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, param0->unk_28, 0, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return v0; } @@ -2286,9 +2288,9 @@ static void ov107_02243F4C (UnkStruct_ov107_02241D6C * param0, Window * param1, v0 = 4; } - BGL_WindowColor(param1, 0, v0 + (64 * param2), 0, 8 * 3, 9); + Window_FillRectWithColor(param1, 0, v0 + (64 * param2), 0, 8 * 3, 9); sub_0200C5BC(param0->unk_1C4, param3, 3, 1, param1, v0 + (64 * param2), 1); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -2364,13 +2366,13 @@ static void ov107_022440C8 (UnkStruct_ov107_02241D6C * param0, u8 param1) ov107_02245288(¶m0->unk_50[6]); - sub_0201ACF4(¶m0->unk_50[6]); - sub_0201ACF4(¶m0->unk_50[9]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[6]); + Window_ClearAndCopyToVRAM(¶m0->unk_50[9]); ov107_022436F4(param0, 2); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); - sub_0201AD10(¶m0->unk_50[4]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[4]); param0->unk_16 = 0; @@ -2384,7 +2386,7 @@ static void ov107_02244120 (UnkStruct_ov107_02241D6C * param0) { if (param0->unk_0E_3 == 1) { param0->unk_0E_3 = 0; - sub_0201AD10(¶m0->unk_50[12]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[12]); ov107_02245730(param0); ov107_02245660(param0); } @@ -2450,9 +2452,9 @@ static void ov107_02244240 (UnkStruct_ov107_02241D6C * param0, u8 param1) v2 = ov107_02249C98(param0->unk_14, param0->unk_0D); ov107_02243CFC(param0, ¶m0->unk_50[17], v2, 1); - sub_0201A9A4(¶m0->unk_50[17]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[17]); ov107_02243DE4(param0, ¶m0->unk_50[16], v2, 1); - sub_0201A9A4(¶m0->unk_50[16]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[16]); ov107_02249BAC(param0->unk_3F0, 1); ov107_02249BAC(param0->unk_3E8, 1); @@ -2540,8 +2542,8 @@ static void ov107_0224440C (BmpList * param0, u32 param1, u8 param2) } else { ov107_022499BC(&v6->unk_1D8, 0xffff); ov107_022499FC(&v6->unk_1D8, 0xffff); - BGL_FillWindow(&v6->unk_50[12], 0); - sub_0201A9A4(&v6->unk_50[12]); + Window_FillTilemap(&v6->unk_50[12], 0); + Window_ScheduleCopyToVRAM(&v6->unk_50[12]); } return; @@ -2555,7 +2557,7 @@ static void ov107_02244560 (BmpList * param0, u32 param1, u8 param2) ov107_02244A74(v0, 0, ov107_02244D5C(v0, param1, v0->unk_13), 4, 1); v0->unk_0A = ov107_02243890(v0, &v0->unk_50[5], 4, 128, param2, TEXT_SPEED_NO_TRANSFER, 1, 2, 0, FONT_SYSTEM, 2); - sub_0201A9A4(&v0->unk_50[5]); + Window_ScheduleCopyToVRAM(&v0->unk_50[5]); } return; @@ -2568,7 +2570,7 @@ static void ov107_022445C4 (UnkStruct_ov107_02241D6C * param0) int v3; ov107_02249D84(param0->unk_4C, ¶m0->unk_50[10]); - BGL_FillWindow(¶m0->unk_50[10], 15); + Window_FillTilemap(¶m0->unk_50[10], 15); param0->unk_19C = sub_02013A04((NELEMS(Unk_ov107_02249FF0)), 100); @@ -2674,9 +2676,9 @@ static void ov107_02244780 (UnkStruct_ov107_02241D6C * param0) u16 v2; int v3; - sub_02019120(0, 0); + Bg_ToggleLayer(0, 0); ov107_02249D84(param0->unk_4C, ¶m0->unk_50[11]); - BGL_FillWindow(¶m0->unk_50[11], 15); + Window_FillTilemap(¶m0->unk_50[11], 15); param0->unk_19C = sub_02013A04((NELEMS(Unk_ov107_02249F54)), 100); @@ -2697,8 +2699,8 @@ static void ov107_02244780 (UnkStruct_ov107_02241D6C * param0) ov107_02245650(param0, ¶m0->unk_50[11]); - sub_0201A9A4(¶m0->unk_50[11]); - sub_02019120(0, 1); + Window_ScheduleCopyToVRAM(¶m0->unk_50[11]); + Bg_ToggleLayer(0, 1); return; } @@ -2792,7 +2794,7 @@ static void ov107_02244944 (UnkStruct_ov107_02241D6C * param0) int v0; ov107_02249D84(param0->unk_4C, ¶m0->unk_50[9]); - BGL_FillWindow(¶m0->unk_50[9], 15); + Window_FillTilemap(¶m0->unk_50[9], 15); param0->unk_19C = sub_02013A04(5, 100); @@ -2813,7 +2815,7 @@ static void ov107_02244944 (UnkStruct_ov107_02241D6C * param0) param0->unk_198 = sub_0200112C(¶m0->unk_1A0, param0->unk_18, param0->unk_1A, 100); ov107_02245650(param0, ¶m0->unk_50[9]); - sub_0201A9A4(¶m0->unk_50[9]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[9]); return; } @@ -2871,7 +2873,7 @@ static void ov107_02244AB4 (UnkStruct_ov107_02241D6C * param0, Window * param1, } Text_AddPrinterWithParamsAndColor(param1, param4, v2, param2, param3, TEXT_SPEED_NO_TRANSFER, v0, NULL); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); Strbuf_Free(v2); return; @@ -3375,7 +3377,7 @@ static BOOL ov107_02245210 (Pokemon * param0) static void ov107_02245288 (Window * param0) { sub_0200E084(param0, 1); - sub_0201AD10(param0); + Window_ClearAndScheduleCopyToVRAM(param0); return; } @@ -3591,7 +3593,7 @@ static void ov107_02245464 (UnkStruct_ov107_02241D6C * param0, Window * param1) } } - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -3653,7 +3655,7 @@ static void ov107_02245618 (UnkStruct_ov107_02241D6C * param0) param0->unk_0E_4 = 0; sub_02001BC4(param0->unk_17C, NULL); Window_Clear(param0->unk_170.unk_04, 1); - sub_0201AD10(param0->unk_170.unk_04); + Window_ClearAndScheduleCopyToVRAM(param0->unk_170.unk_04); } return; @@ -3673,14 +3675,14 @@ static void ov107_02245660 (UnkStruct_ov107_02241D6C * param0) ov107_02249BAC(param0->unk_434, 0); Window_Clear(¶m0->unk_50[15], 1); - sub_0201AD10(¶m0->unk_50[15]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[15]); ov107_0224503C(param0, param0->unk_0D, 0); - BGL_FillWindow(¶m0->unk_50[17], 0); - sub_0201AD10(¶m0->unk_50[17]); - BGL_FillWindow(¶m0->unk_50[16], 0); - sub_0201AD10(¶m0->unk_50[16]); + Window_FillTilemap(¶m0->unk_50[17], 0); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[17]); + Window_FillTilemap(¶m0->unk_50[16], 0); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[16]); return; } @@ -3708,8 +3710,8 @@ static void ov107_02245730 (UnkStruct_ov107_02241D6C * param0) v0 = (Window *)sub_02001504(param0->unk_198, 18); Window_Clear(v0, 1); - BGL_FillWindow(v0, 0); - sub_0201AD10(v0); + Window_FillTilemap(v0, 0); + Window_ClearAndScheduleCopyToVRAM(v0); sub_02013A3C(param0->unk_19C); sub_02001384(param0->unk_198, NULL, NULL); @@ -3718,6 +3720,7 @@ static void ov107_02245730 (UnkStruct_ov107_02241D6C * param0) return; } +// clang-format off asm static void ov107_02245780 (UnkStruct_ov107_02241D6C * param0, Window * param1) { push {r3, r4, r5, r6, r7, lr} @@ -3753,7 +3756,7 @@ asm static void ov107_02245780 (UnkStruct_ov107_02241D6C * param0, Window * para add r0, r4, #0 lsr r2, r2, #0x10 add r3, r6, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor ldrb r0, [r5, #9] bl sub_0205E630 str r0, [sp, #0x1c] @@ -3809,7 +3812,7 @@ asm static void ov107_02245780 (UnkStruct_ov107_02241D6C * param0, Window * para add r0, r4, #0 lsr r2, r2, #0x10 add r3, r6, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor ldrb r0, [r5, #9] bl sub_0205E630 str r0, [sp, #0x20] @@ -3860,7 +3863,7 @@ asm static void ov107_02245780 (UnkStruct_ov107_02241D6C * param0, Window * para add r0, r4, #0 lsr r2, r2, #0x10 add r3, r6, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor mov r0, #1 str r0, [sp] ldr r2, = 0x436 @@ -3904,7 +3907,7 @@ asm static void ov107_02245780 (UnkStruct_ov107_02241D6C * param0, Window * para add r0, r4, #0 lsr r2, r2, #0x10 add r3, r6, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor mov r0, #1 str r0, [sp] ldr r2, = 0x436 @@ -3947,7 +3950,7 @@ asm static void ov107_02245780 (UnkStruct_ov107_02241D6C * param0, Window * para add r0, r4, #0 lsr r2, r2, #0x10 add r3, r6, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor ldrb r0, [r5, #9] bl sub_0205E630 str r0, [sp, #0x24] @@ -3983,10 +3986,11 @@ asm static void ov107_02245780 (UnkStruct_ov107_02241D6C * param0, Window * para strb r0, [r5, #0xa] _022459C2: add r0, r4, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} } +// clang-format on static void ov107_022459D0 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 param2) { @@ -4071,9 +4075,9 @@ static void ov107_02245B40 (UnkStruct_ov107_02241D6C * param0, u8 param1) ov107_02243630(param0, 2); - sub_0201AD10(¶m0->unk_50[6]); - sub_0201AD10(¶m0->unk_50[5]); - sub_0201AD10(¶m0->unk_50[15]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[6]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[15]); v0 = Party_GetPokemonBySlotIndex(param0->unk_43C, ov107_02249C98(param0->unk_14, param1)); ov107_02243950(param0, ¶m0->unk_50[4], v0); @@ -4088,9 +4092,9 @@ static void ov107_02245B90 (UnkStruct_ov107_02241D6C * param0, u8 param1) ov107_022436AC(param0, 2); - sub_0201AD10(¶m0->unk_50[6]); - sub_0201AD10(¶m0->unk_50[5]); - sub_0201AD10(¶m0->unk_50[15]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[6]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[15]); v0 = Party_GetPokemonBySlotIndex(param0->unk_43C, ov107_02249C98(param0->unk_14, param1)); @@ -4102,8 +4106,8 @@ static void ov107_02245B90 (UnkStruct_ov107_02241D6C * param0, u8 param1) static void ov107_02245BE0 (UnkStruct_ov107_02241D6C * param0) { - BGL_FillWindow(¶m0->unk_50[4], 0); - sub_0201ACF4(¶m0->unk_50[4]); + Window_FillTilemap(¶m0->unk_50[4], 0); + Window_ClearAndCopyToVRAM(¶m0->unk_50[4]); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); return; diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index 1bcb658333..a7bde6c66b 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -256,7 +256,7 @@ int ov107_02245EB0 (OverlayManager * param0, int * param1) v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov107_02246170), 100); memset(v1, 0, sizeof(UnkStruct_ov107_02246170)); - v1->unk_4C = sub_02018340(100); + v1->unk_4C = BgConfig_New(100); v1->unk_00 = param0; v2 = (UnkStruct_ov104_0223597C *)OverlayManager_Args(param0); @@ -459,7 +459,7 @@ static void ov107_02246274 (UnkStruct_ov107_02246170 * param0) ov107_022484DC(param0, &v2, &v3, &v4, &v5); v8 = ¶m0->unk_50[0]; - BGL_FillWindow(v8, 0); + Window_FillTilemap(v8, 0); ov107_02248E84(param0, v8); ov107_02248C08(param0, v8); @@ -1231,11 +1231,11 @@ static void ov107_022472A4(BgConfig *param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 0); - sub_02019044(param0, 1); - sub_02019044(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 0); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 4); Heap_FreeToHeap(param0); return; @@ -1249,7 +1249,7 @@ static void ov107_022472E8 (void * param0) sub_02003694(v0->unk_140); } - sub_0201C2B8(v0->unk_4C); + Bg_RunScheduledUpdates(v0->unk_4C); sub_0201DCAC(); sub_0200A858(); @@ -1285,7 +1285,7 @@ static void ov107_02247340(BgConfig *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -1305,9 +1305,9 @@ static void ov107_02247340(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); - sub_02019690(1, 32, 0, 100); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v1, 0); + Bg_ClearTilesRange(1, 32, 0, 100); + Bg_ClearTilemap(param0, 1); } { @@ -1327,9 +1327,9 @@ static void ov107_02247340(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v2, 0); - sub_02019690(0, 32, 0, 100); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v2, 0); + Bg_ClearTilesRange(0, 32, 0, 100); + Bg_ClearTilemap(param0, 0); } { @@ -1349,9 +1349,9 @@ static void ov107_02247340(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019690(2, 32, 0, 100); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilesRange(2, 32, 0, 100); + Bg_ClearTilemap(param0, 2); } { @@ -1371,9 +1371,9 @@ static void ov107_02247340(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v4, 0); - sub_02019690(3, 32, 0, 100); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v4, 0); + Bg_ClearTilesRange(3, 32, 0, 100); + Bg_ClearTilemap(param0, 3); } { @@ -1393,8 +1393,8 @@ static void ov107_02247340(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v5, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v5, 0); + Bg_ClearTilemap(param0, 4); } G2_SetBG0Priority(0); @@ -1477,7 +1477,7 @@ static u8 ov107_02247650 (UnkStruct_ov107_02246170 * param0, Window * param1, in static u8 ov107_02247680 (UnkStruct_ov107_02246170 * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9, u32 param10) { u8 v0; - BGL_FillWindow(param1, param8); + Window_FillTilemap(param1, param8); MessageLoader_GetStrbuf(param0->unk_20, param2, param0->unk_2C); StringTemplate_Format(param0->unk_24, param0->unk_28, param0->unk_2C); @@ -1491,8 +1491,8 @@ static u8 ov107_02247680 (UnkStruct_ov107_02246170 * param0, Window * param1, in } v0 = Text_AddPrinterWithParamsAndColor(param1, param9, param0->unk_28, param3, param4, param5, TEXT_COLOR(param6, param7, param8), NULL); - sub_0201A9A4(param1); - + Window_ScheduleCopyToVRAM(param1); + return v0; } @@ -1517,8 +1517,8 @@ static u8 ov107_02247744 (UnkStruct_ov107_02246170 * param0, Window * param1, in } v0 = Text_AddPrinterWithParamsAndColor(param1, param9, param0->unk_28, param3, param4, param5, TEXT_COLOR(param6, param7, param8), NULL); - sub_0201A9A4(param1); - + Window_ScheduleCopyToVRAM(param1); + return v0; } @@ -1527,11 +1527,12 @@ static u8 ov107_022477CC (UnkStruct_ov107_02246170 * param0, int param1, u8 para u8 v0; v0 = ov107_02247650(param0, ¶m0->unk_50[7], param1, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, param2); - sub_0201A9A4(¶m0->unk_50[7]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[7]); return v0; } +// clang-format off asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, Window * param1, Pokemon * param2) { push {r4, r5, r6, lr} @@ -1541,7 +1542,7 @@ asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, Window * para add r6, r2, #0 add r0, r4, #0 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap add r0, r6, #0 mov r1, #6 mov r2, #0 @@ -1761,10 +1762,11 @@ asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, Window * para mov r2, #0x3f bl ov107_02247A14 add r0, r4, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add sp, #8 pop {r4, r5, r6, pc} } +// clang-format on static void ov107_02247A14 (UnkStruct_ov107_02246170 * param0, Window * param1, int param2, u16 param3, u16 param4, u32 param5) { @@ -1773,14 +1775,14 @@ static void ov107_02247A14 (UnkStruct_ov107_02246170 * param0, Window * param1, static void ov107_02247A3C (UnkStruct_ov107_02246170 * param0, Window * param1, Pokemon * param2) { - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); ov107_02247AD0(param0, param1, 0, 71, 75, param2, 54, 58, 66); ov107_02247AD0(param0, param1, 1, 72, 75, param2, 55, 59, 67); ov107_02247AD0(param0, param1, 2, 73, 75, param2, 56, 60, 68); ov107_02247AD0(param0, param1, 3, 74, 75, param2, 57, 61, 69); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -1806,7 +1808,7 @@ static void ov107_02247B78 (UnkStruct_ov107_02246170 * param0, Window * param1) int v2; Pokemon * v3; - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); if (ov104_0223BA14(param0->unk_09) == 0) { v0 = 36; @@ -1818,7 +1820,7 @@ static void ov107_02247B78 (UnkStruct_ov107_02246170 * param0, Window * param1) for (v2 = 0; v2 < v1; v2++) { if (param0->unk_3CC[v2] == 0) { - BGL_WindowColor(param1, 0, v0 + (64 * v2), 1, 64, 2 * 8); + Window_FillRectWithColor(param1, 0, v0 + (64 * v2), 1, 64, 2 * 8); continue; } @@ -1830,7 +1832,7 @@ static void ov107_02247B78 (UnkStruct_ov107_02246170 * param0, Window * param1) sub_0200C5BC(param0->unk_144, Pokemon_GetValue(v3, MON_DATA_MAX_HP, NULL), 3, 0, param1, 32 + v0 + (64 * v2), 1); } - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -1842,7 +1844,7 @@ static void ov107_02247C64 (UnkStruct_ov107_02246170 * param0, Window * param1) int v4; Pokemon * v5; - BGL_FillWindow(param1, 0); + Window_FillTilemap(param1, 0); if (ov104_0223BA14(param0->unk_09) == 0) { v1 = 40; @@ -1862,7 +1864,7 @@ static void ov107_02247C64 (UnkStruct_ov107_02246170 * param0, Window * param1) ov107_022481FC(param0, param1, v2 + (64 * v4), 1, 0, v0); } - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -1969,7 +1971,7 @@ static void ov107_02247E5C (UnkStruct_ov107_02246170 * param0) UnkStruct_ov84_02240FA8 v1; ov107_02249D84(param0->unk_4C, ¶m0->unk_50[5]); - BGL_FillWindow(¶m0->unk_50[5], 15); + Window_FillTilemap(¶m0->unk_50[5], 15); param0->unk_13C = sub_02013A04((NELEMS(Unk_ov107_0224A1BC)), 100); @@ -1991,7 +1993,7 @@ static void ov107_02247E5C (UnkStruct_ov107_02246170 * param0) param0->unk_138 = sub_0200112C(&v1, param0->unk_1C, param0->unk_1E, 100); param0->unk_0F_1 = 1; - sub_0201A9A4(¶m0->unk_50[5]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[5]); return; } @@ -2031,7 +2033,7 @@ static void ov107_02247F6C (UnkStruct_ov107_02246170 * param0) UnkStruct_ov84_02240FA8 v1; ov107_02249D84(param0->unk_4C, ¶m0->unk_50[6]); - BGL_FillWindow(¶m0->unk_50[6], 15); + Window_FillTilemap(¶m0->unk_50[6], 15); param0->unk_13C = sub_02013A04((NELEMS(Unk_ov107_0224A19C)), 100); @@ -2053,7 +2055,7 @@ static void ov107_02247F6C (UnkStruct_ov107_02246170 * param0) param0->unk_138 = sub_0200112C(&v1, 0, 0, 100); param0->unk_0F_1 = 1; - sub_0201A9A4(¶m0->unk_50[6]); + Window_ScheduleCopyToVRAM(¶m0->unk_50[6]); return; } @@ -2629,7 +2631,7 @@ static void ov107_0224883C (UnkStruct_ov107_02246170 * param0) static void ov107_02248860 (Window * param0) { sub_0200E084(param0, 1); - sub_0201AD10(param0); + Window_ClearAndScheduleCopyToVRAM(param0); return; } @@ -2813,7 +2815,7 @@ static void ov107_02248A2C (UnkStruct_ov107_02246170 * param0, u8 param1) ov107_0224752C(param0, 2); ov107_02248860(¶m0->unk_50[7]); - sub_0201AD10(¶m0->unk_50[7]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[7]); v0 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1)); ov107_02247804(param0, ¶m0->unk_50[4], v0); @@ -2853,7 +2855,7 @@ static void ov107_02248AF0 (UnkStruct_ov107_02246170 * param0, u8 param1) ov107_022475A8(param0, 2); ov107_02248860(¶m0->unk_50[7]); - sub_0201AD10(¶m0->unk_50[7]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_50[7]); v0 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1)); ov107_02247A3C(param0, ¶m0->unk_50[4], v0); @@ -2892,7 +2894,7 @@ static void ov107_02248BB4 (UnkStruct_ov107_02246170 * param0) param0->unk_0F_2 = 0; sub_02001BC4(param0->unk_11C, NULL); Window_Clear(param0->unk_110.unk_04, 1); - sub_0201AD10(param0->unk_110.unk_04); + Window_ClearAndScheduleCopyToVRAM(param0->unk_110.unk_04); } return; @@ -2904,6 +2906,7 @@ static void ov107_02248BEC (UnkStruct_ov107_02246170 * param0) return; } +// clang-format off asm static void ov107_02248C08 (UnkStruct_ov107_02246170 * param0, Window * param1) { push {r3, r4, r5, r6, r7, lr} @@ -2939,7 +2942,7 @@ asm static void ov107_02248C08 (UnkStruct_ov107_02246170 * param0, Window * para add r0, r4, #0 lsr r2, r2, #0x10 add r3, r6, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor ldrb r0, [r5, #9] bl sub_0205E630 str r0, [sp, #0x1c] @@ -2995,7 +2998,7 @@ asm static void ov107_02248C08 (UnkStruct_ov107_02246170 * param0, Window * para add r0, r4, #0 lsr r2, r2, #0x10 add r3, r6, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor ldrb r0, [r5, #9] bl sub_0205E630 str r0, [sp, #0x20] @@ -3046,7 +3049,7 @@ asm static void ov107_02248C08 (UnkStruct_ov107_02246170 * param0, Window * para add r0, r4, #0 lsr r2, r2, #0x10 add r3, r6, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor mov r0, #1 str r0, [sp] ldr r2, = 0x3D6 @@ -3089,7 +3092,7 @@ asm static void ov107_02248C08 (UnkStruct_ov107_02246170 * param0, Window * para add r0, r4, #0 lsr r2, r2, #0x10 add r3, r6, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor mov r0, #1 str r0, [sp] ldr r2, = 0x3D6 @@ -3131,7 +3134,7 @@ asm static void ov107_02248C08 (UnkStruct_ov107_02246170 * param0, Window * para add r0, r4, #0 lsr r2, r2, #0x10 add r3, r6, #0 - bl BGL_WindowColor + bl Window_FillRectWithColor ldrb r0, [r5, #9] bl sub_0205E630 str r0, [sp, #0x24] @@ -3167,10 +3170,11 @@ asm static void ov107_02248C08 (UnkStruct_ov107_02246170 * param0, Window * para strb r0, [r5, #0xa] _02248E46: add r0, r4, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} } +// clang-format on static void ov107_02248E54 (UnkStruct_ov107_02246170 * param0, u8 param1) { @@ -3217,7 +3221,7 @@ static void ov107_02248E84 (UnkStruct_ov107_02246170 * param0, Window * param1) } } - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); return; } @@ -3356,8 +3360,8 @@ static void ov107_022490E8 (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par static void ov107_02249238 (UnkStruct_ov107_02246170 * param0) { - BGL_FillWindow(¶m0->unk_50[4], 0); - sub_0201ACF4(¶m0->unk_50[4]); + Window_FillTilemap(¶m0->unk_50[4], 0); + Window_ClearAndCopyToVRAM(¶m0->unk_50[4]); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); return; @@ -3373,8 +3377,8 @@ static void ov107_02249258 (UnkStruct_ov107_02246170 * param0) v0 = (Window *)sub_02001504(param0->unk_138, 18); Window_Clear(v0, 1); - BGL_FillWindow(v0, 0); - sub_0201AD10(v0); + Window_FillTilemap(v0, 0); + Window_ClearAndScheduleCopyToVRAM(v0); sub_02013A3C(param0->unk_13C); sub_02001384(param0->unk_138, NULL, NULL); } diff --git a/src/overlay107/ov107_02249D14.c b/src/overlay107/ov107_02249D14.c index 3e0e1ab67b..c3f92c9466 100644 --- a/src/overlay107/ov107_02249D14.c +++ b/src/overlay107/ov107_02249D14.c @@ -64,8 +64,8 @@ void ov107_02249D14(BgConfig *param0, Window *param1, u8 param2) u32 v2 = Unk_ov107_0224A218[param2].unk_04; for (v0 = 0; v0 < v2; v0++) { - sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); - BGL_FillWindow(¶m1[v0], 0); + Window_AddFromTemplate(param0, ¶m1[v0], &v1[v0]); + Window_FillTilemap(¶m1[v0], 0); } return; @@ -77,7 +77,7 @@ void ov107_02249D5C(Window *param0, u8 param1) u32 v1 = Unk_ov107_0224A218[param1].unk_04; for (v0 = 0; v0 < v1; v0++) { - BGL_DeleteWindow(¶m0[v0]); + Window_Remove(¶m0[v0]); } return; @@ -85,7 +85,7 @@ void ov107_02249D5C(Window *param0, u8 param1) void ov107_02249D84(BgConfig *param0, Window *param1) { - sub_0200DAA4(param0, sub_0201C290(param1), (1024 - 9), 11, 0, 100); + sub_0200DAA4(param0, Window_GetBgLayer(param1), (1024 - 9), 11, 0, 100); Window_Show(param1, 1, (1024 - 9), 11); return; @@ -93,10 +93,10 @@ void ov107_02249D84(BgConfig *param0, Window *param1) void ov107_02249DBC(Window *param0, int param1) { - sub_0200DD0C(param0->bgConfig, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 100); - BGL_FillWindow(param0, 15); + sub_0200DD0C(param0->bgConfig, Window_GetBgLayer(param0), ((1024 - 9) - (18 + 12)), 10, param1, 100); + Window_FillTilemap(param0, 15); sub_0200E060(param0, 1, ((1024 - 9) - (18 + 12)), 10); - sub_0201A9A4(param0); + Window_ScheduleCopyToVRAM(param0); return; } diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 31dac45343..c65a253bad 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -290,7 +290,7 @@ int ov108_02241AE0(OverlayManager *param0, int *param1) v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov108_02241DB0), 103); memset(v1, 0, sizeof(UnkStruct_ov108_02241DB0)); - v1->unk_90 = sub_02018340(103); + v1->unk_90 = BgConfig_New(103); v1->unk_00 = param0; v2 = (UnkStruct_ov104_02238240 *)OverlayManager_Args(param0); @@ -900,9 +900,9 @@ static void ov108_022426D4(BgConfig *param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 3); - sub_02019044(param0, 1); - sub_02019044(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 4); Heap_FreeToHeap(param0); return; @@ -916,7 +916,7 @@ static void ov108_02242708(void *param0) sub_02003694(v0->unk_D4); } - sub_0201C2B8(v0->unk_90); + Bg_RunScheduledUpdates(v0->unk_90); sub_0201DCAC(); sub_0200A858(); @@ -952,7 +952,7 @@ static void ov108_02242760(BgConfig *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -972,9 +972,9 @@ static void ov108_02242760(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); - sub_02019690(1, 32, 0, 103); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v1, 0); + Bg_ClearTilesRange(1, 32, 0, 103); + Bg_ClearTilemap(param0, 1); } { @@ -994,8 +994,8 @@ static void ov108_02242760(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v2, 0); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 3, &v2, 0); + Bg_ClearTilemap(param0, 3); } { @@ -1015,8 +1015,8 @@ static void ov108_02242760(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v3, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v3, 0); + Bg_ClearTilemap(param0, 4); } G2_SetBG0Priority(0); diff --git a/src/overlay108/ov108_02243630.c b/src/overlay108/ov108_02243630.c index 35dab0943b..02b784e9c4 100644 --- a/src/overlay108/ov108_02243630.c +++ b/src/overlay108/ov108_02243630.c @@ -19,8 +19,8 @@ void ov108_02243630(BgConfig *param0, Window *param1) const WindowTemplate *v1 = Unk_ov108_02243774; for (v0 = 0; v0 < 2; v0++) { - sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); - BGL_FillWindow(¶m1[v0], 0); + Window_AddFromTemplate(param0, ¶m1[v0], &v1[v0]); + Window_FillTilemap(¶m1[v0], 0); } return; @@ -31,7 +31,7 @@ void ov108_02243660(Window *param0) u16 v0; for (v0 = 0; v0 < 2; v0++) { - BGL_DeleteWindow(¶m0[v0]); + Window_Remove(¶m0[v0]); } return; diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index c8c17ee3eb..feab59b1a7 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -1557,7 +1557,7 @@ static void ov109_021D1C00(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_D9C); - sub_0201C2B8(v0->unk_D84); + Bg_RunScheduledUpdates(v0->unk_D84); } static void ov109_021D1C28(UnkStruct_ov109_021D0F70 *param0) @@ -1688,7 +1688,7 @@ static void ov109_021D1E1C(UnkStruct_ov109_021D0F70 *param0) static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) { - param0->unk_D84 = sub_02018340(95); + param0->unk_D84 = BgConfig_New(95); GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); { @@ -1699,7 +1699,7 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) GX_BG0_AS_3D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -1719,9 +1719,9 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) 0 }; - sub_020183C4(param0->unk_D84, 1, &v1, 0); - sub_02019EBC(param0->unk_D84, 1); - sub_02019690(1, 32, 0, 95); + Bg_InitFromTemplate(param0->unk_D84, 1, &v1, 0); + Bg_ClearTilemap(param0->unk_D84, 1); + Bg_ClearTilesRange(1, 32, 0, 95); } { @@ -1741,8 +1741,8 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) 0 }; - sub_020183C4(param0->unk_D84, 2, &v2, 0); - sub_02019EBC(param0->unk_D84, 2); + Bg_InitFromTemplate(param0->unk_D84, 2, &v2, 0); + Bg_ClearTilemap(param0->unk_D84, 2); } { @@ -1762,8 +1762,8 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) 0 }; - sub_020183C4(param0->unk_D84, 3, &v3, 0); - sub_02019EBC(param0->unk_D84, 3); + Bg_InitFromTemplate(param0->unk_D84, 3, &v3, 0); + Bg_ClearTilemap(param0->unk_D84, 3); } { @@ -1783,8 +1783,8 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) 0 }; - sub_020183C4(param0->unk_D84, 6, &v4, 0); - sub_02019EBC(param0->unk_D84, 6); + Bg_InitFromTemplate(param0->unk_D84, 6, &v4, 0); + Bg_ClearTilemap(param0->unk_D84, 6); } { @@ -1804,8 +1804,8 @@ static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) 0 }; - sub_020183C4(param0->unk_D84, 7, &v5, 0); - sub_02019EBC(param0->unk_D84, 7); + Bg_InitFromTemplate(param0->unk_D84, 7, &v5, 0); + Bg_ClearTilemap(param0->unk_D84, 7); } } @@ -1827,51 +1827,51 @@ static void ov109_021D2004(UnkStruct_ov109_021D0F70 *param0) v0 = ov109_021D3A2C(param0, 16, 0); NNS_G2dGetUnpackedCharacterData(v0, ¶m0->unk_D8C); - sub_0201958C(param0->unk_D84, 3, param0->unk_D8C->pRawData, param0->unk_D8C->szByte, (32 * 0)); + Bg_LoadTiles(param0->unk_D84, 3, param0->unk_D8C->pRawData, param0->unk_D8C->szByte, (32 * 0)); Heap_FreeToHeap(v0); v0 = ov109_021D3A2C(param0, 22, 0); NNS_G2dGetUnpackedCharacterData(v0, ¶m0->unk_D8C); - sub_0201958C(param0->unk_D84, 6, param0->unk_D8C->pRawData, param0->unk_D8C->szByte, (32 * 0)); + Bg_LoadTiles(param0->unk_D84, 6, param0->unk_D8C->pRawData, param0->unk_D8C->szByte, (32 * 0)); Heap_FreeToHeap(v0); v0 = ov109_021D3A2C(param0, 21, 0); NNS_G2dGetUnpackedCharacterData(v0, ¶m0->unk_D8C); - sub_0201958C(param0->unk_D84, 7, param0->unk_D8C->pRawData, param0->unk_D8C->szByte, (32 * 0)); + Bg_LoadTiles(param0->unk_D84, 7, param0->unk_D8C->pRawData, param0->unk_D8C->szByte, (32 * 0)); Heap_FreeToHeap(v0); v0 = ov109_021D3A2C(param0, 19, 0); NNS_G2dGetUnpackedScreenData(v0, ¶m0->unk_D88); - sub_02019574(param0->unk_D84, 2, (void *)param0->unk_D88->rawData, param0->unk_D88->szByte); - sub_02019448(param0->unk_D84, 2); + Bg_LoadTilemapBuffer(param0->unk_D84, 2, (void *)param0->unk_D88->rawData, param0->unk_D88->szByte); + Bg_CopyTilemapBufferToVRAM(param0->unk_D84, 2); Heap_FreeToHeap(v0); v0 = ov109_021D3A2C(param0, 18, 0); NNS_G2dGetUnpackedScreenData(v0, ¶m0->unk_D88); - sub_02019574(param0->unk_D84, 3, (void *)param0->unk_D88->rawData, param0->unk_D88->szByte); - sub_02019448(param0->unk_D84, 3); + Bg_LoadTilemapBuffer(param0->unk_D84, 3, (void *)param0->unk_D88->rawData, param0->unk_D88->szByte); + Bg_CopyTilemapBufferToVRAM(param0->unk_D84, 3); Heap_FreeToHeap(v0); v0 = ov109_021D3A2C(param0, 24, 0); NNS_G2dGetUnpackedScreenData(v0, ¶m0->unk_D88); - sub_02019574(param0->unk_D84, 6, (void *)param0->unk_D88->rawData, param0->unk_D88->szByte); - sub_02019448(param0->unk_D84, 6); + Bg_LoadTilemapBuffer(param0->unk_D84, 6, (void *)param0->unk_D88->rawData, param0->unk_D88->szByte); + Bg_CopyTilemapBufferToVRAM(param0->unk_D84, 6); Heap_FreeToHeap(v0); v0 = ov109_021D3A2C(param0, 23, 0); NNS_G2dGetUnpackedScreenData(v0, ¶m0->unk_D88); - sub_02019574(param0->unk_D84, 7, (void *)param0->unk_D88->rawData, param0->unk_D88->szByte); - sub_02019448(param0->unk_D84, 7); + Bg_LoadTilemapBuffer(param0->unk_D84, 7, (void *)param0->unk_D88->rawData, param0->unk_D88->szByte); + Bg_CopyTilemapBufferToVRAM(param0->unk_D84, 7); Heap_FreeToHeap(v0); } static void ov109_021D2204(UnkStruct_ov109_021D0F70 *param0) { - sub_02019044(param0->unk_D84, 1); - sub_02019044(param0->unk_D84, 2); - sub_02019044(param0->unk_D84, 3); - sub_02019044(param0->unk_D84, 6); - sub_02019044(param0->unk_D84, 7); + Bg_FreeTilemapBuffer(param0->unk_D84, 1); + Bg_FreeTilemapBuffer(param0->unk_D84, 2); + Bg_FreeTilemapBuffer(param0->unk_D84, 3); + Bg_FreeTilemapBuffer(param0->unk_D84, 6); + Bg_FreeTilemapBuffer(param0->unk_D84, 7); Heap_FreeToHeap(param0->unk_D84); } @@ -1882,8 +1882,8 @@ static void ov109_021D2248(UnkStruct_ov109_021D0F70 *param0, u32 param1) v0 = ov109_021D3A2C(param0, param1, 0); NNS_G2dGetUnpackedScreenData(v0, ¶m0->unk_D88); - sub_02019574(param0->unk_D84, 6, (void *)param0->unk_D88->rawData, param0->unk_D88->szByte); - sub_02019448(param0->unk_D84, 6); + Bg_LoadTilemapBuffer(param0->unk_D84, 6, (void *)param0->unk_D88->rawData, param0->unk_D88->szByte); + Bg_CopyTilemapBufferToVRAM(param0->unk_D84, 6); Heap_FreeToHeap(v0); } @@ -2030,7 +2030,7 @@ static void ov109_021D24F8(UnkStruct_ov109_021D0F70 *param0) v1->unk_08 = StringTemplate_Default(95); for (v0 = 0; v0 < 1; v0++) { - sub_0201A8D4(param0->unk_D84, &v1->unk_0C[v0], &Unk_ov109_021D59B8[v0]); + Window_AddFromTemplate(param0->unk_D84, &v1->unk_0C[v0], &Unk_ov109_021D59B8[v0]); } v1->unk_6C = Strbuf_Init(0x100, 95); @@ -2048,8 +2048,8 @@ static void ov109_021D25E8(UnkStruct_ov109_021D0F70 *param0) UnkStruct_ov109_021D24F8 *v1 = ¶m0->unk_C9C; for (v0 = 0; v0 < 1; v0++) { - sub_0201ACF4(&v1->unk_0C[v0]); - BGL_DeleteWindow(&v1->unk_0C[v0]); + Window_ClearAndCopyToVRAM(&v1->unk_0C[v0]); + Window_Remove(&v1->unk_0C[v0]); } ov109_021D27F0(param0); @@ -2068,12 +2068,12 @@ static void ov109_021D2634(UnkStruct_ov109_021D0F70 *param0, u32 param1) UnkStruct_ov109_021D24F8 *v0 = ¶m0->unk_C9C; Window *v1 = &v0->unk_0C[0]; - BGL_FillWindow(v1, 15); + Window_FillTilemap(v1, 15); sub_0200E060(v1, 1, (1 + 9), 14); - BGL_FillWindow(v1, 15); + Window_FillTilemap(v1, 15); MessageLoader_GetStrbuf(v0->unk_04, param1, v0->unk_6C); Text_AddPrinterWithParams(v1, FONT_MESSAGE, v0->unk_6C, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov109_021D268C(UnkStruct_ov109_021D0F70 *param0, u32 param1, const TrainerInfo *param2) @@ -2091,9 +2091,9 @@ static void ov109_021D268C(UnkStruct_ov109_021D0F70 *param0, u32 param1, const T StringTemplate_Format(v1->unk_08, v1->unk_6C, v0); Strbuf_Free(v0); sub_0200E060(v2, 1, (1 + 9), 14); - BGL_FillWindow(v2, 15); + Window_FillTilemap(v2, 15); Text_AddPrinterWithParams(v2, FONT_MESSAGE, v1->unk_6C, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A9A4(v2); + Window_ScheduleCopyToVRAM(v2); } static void ov109_021D2714(UnkStruct_ov109_021D0F70 *param0, u32 param1, u32 param2) @@ -2110,9 +2110,9 @@ static void ov109_021D2714(UnkStruct_ov109_021D0F70 *param0, u32 param1, u32 par StringTemplate_Format(v1->unk_08, v1->unk_6C, v0); Strbuf_Free(v0); sub_0200E060(v2, 1, (1 + 9), 14); - BGL_FillWindow(v2, 15); + Window_FillTilemap(v2, 15); Text_AddPrinterWithParams(v2, FONT_MESSAGE, v1->unk_6C, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A9A4(v2); + Window_ScheduleCopyToVRAM(v2); } static void ov109_021D2788(UnkStruct_ov109_021D0F70 *param0) @@ -2121,8 +2121,8 @@ static void ov109_021D2788(UnkStruct_ov109_021D0F70 *param0) Window *v1 = &v0->unk_0C[0]; sub_0200E084(v1, 1); - BGL_FillWindow(v1, 0); - sub_0201A9A4(v1); + Window_FillTilemap(v1, 0); + Window_ScheduleCopyToVRAM(v1); } static void ov109_021D27AC(UnkStruct_ov109_021D0F70 *param0, int param1) @@ -2134,7 +2134,7 @@ static void ov109_021D27AC(UnkStruct_ov109_021D0F70 *param0, int param1) v1->unk_00 = param1; for (v0 = 0; v0 < param1; v0++) { - sub_0201A8D4(param0->unk_D84, &v1->unk_1C[v0], &v2[v0]); + Window_AddFromTemplate(param0->unk_D84, &v1->unk_1C[v0], &v2[v0]); } } @@ -2144,8 +2144,8 @@ static void ov109_021D27F0(UnkStruct_ov109_021D0F70 *param0) UnkStruct_ov109_021D24F8 *v1 = ¶m0->unk_C9C; for (v0 = 0; v0 < v1->unk_00; v0++) { - sub_0201ACF4(&v1->unk_1C[v0]); - BGL_DeleteWindow(&v1->unk_1C[v0]); + Window_ClearAndCopyToVRAM(&v1->unk_1C[v0]); + Window_Remove(&v1->unk_1C[v0]); } } @@ -2154,9 +2154,9 @@ static void ov109_021D2820(UnkStruct_ov109_021D0F70 *param0, Strbuf *param1, int UnkStruct_ov109_021D24F8 *v0 = ¶m0->unk_C9C; Window *v1 = &v0->unk_1C[param2]; Window_Show(v1, 1, 1, 14); - BGL_FillWindow(v1, 15); + Window_FillTilemap(v1, 15); Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param1, Font_CalcCenterAlignment(FONT_SYSTEM, param1, 0, 8 * 8), 0, TEXT_SPEED_NO_TRANSFER, param3, NULL); - sub_0201A9A4(v1); + Window_ScheduleCopyToVRAM(v1); } static void ov109_021D2874(UnkStruct_ov109_021D0F70 *param0, Strbuf *param1, int param2, int param3) @@ -2176,8 +2176,8 @@ static void ov109_021D28A0(UnkStruct_ov109_021D0F70 *param0, int param1) Window *v1 = &v0->unk_1C[param1]; sub_0200E084(v1, 1); - BGL_FillWindow(v1, 0); - sub_0201A9A4(v1); + Window_FillTilemap(v1, 0); + Window_ScheduleCopyToVRAM(v1); } static void ov109_021D28C4(UnkStruct_ov109_021D0F70 *param0) diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 528ebad1e0..736e99b0fa 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -191,7 +191,7 @@ int ov109_021D3D50(OverlayManager *param0, int *param1) v2->unk_3C = v0; v0->unk_0C = v2; v0->unk_10 = v2->unk_34; - v0->unk_14 = sub_02018340(95); + v0->unk_14 = BgConfig_New(95); v0->unk_34 = StringTemplate_Default(95); v0->unk_38 = MessageLoader_Init(0, 26, 377, 95); @@ -366,7 +366,7 @@ static void ov109_021D40A8(void *param0) { sub_0201DCAC(); sub_0200A858(); - sub_0201C2B8((BgConfig *)param0); + Bg_RunScheduledUpdates((BgConfig *)param0); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -399,7 +399,7 @@ static void ov109_021D40F0(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -419,8 +419,8 @@ static void ov109_021D40F0(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v1, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v1, 0); + Bg_ClearTilemap(param0, 4); } { @@ -440,8 +440,8 @@ static void ov109_021D40F0(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v2, 0); - sub_02019EBC(param0, 5); + Bg_InitFromTemplate(param0, 5, &v2, 0); + Bg_ClearTilemap(param0, 5); } { @@ -461,7 +461,7 @@ static void ov109_021D40F0(BgConfig *param0) 0 }; - sub_020183C4(param0, 6, &v3, 0); + Bg_InitFromTemplate(param0, 6, &v3, 0); } { @@ -481,8 +481,8 @@ static void ov109_021D40F0(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v4, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v4, 0); + Bg_ClearTilemap(param0, 0); } { @@ -502,11 +502,11 @@ static void ov109_021D40F0(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v5, 0); + Bg_InitFromTemplate(param0, 1, &v5, 0); } - sub_02019690(0, 32, 0, 95); - sub_02019690(4, 32, 0, 95); + Bg_ClearTilesRange(0, 32, 0, 95); + Bg_ClearTilesRange(4, 32, 0, 95); } static void ov109_021D41F8(UnkStruct_ov109_021D5140 *param0, NARC *param1) @@ -555,11 +555,11 @@ static void ov109_021D4294(UnkStruct_ov109_021D5140 *param0) static void ov109_021D42CC(BgConfig *param0) { - sub_02019044(param0, 6); - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 6); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); Heap_FreeToHeap(param0); } @@ -670,18 +670,18 @@ static void ov109_021D4518(UnkStruct_ov109_021D5140 *param0) static void ov109_021D45F4(UnkStruct_ov109_021D5140 *param0) { - BGL_AddWindow(param0->unk_14, ¶m0->unk_36C, 5, 26, 20, 6, 2, 13, 1 + 30 * 15); - BGL_FillWindow(¶m0->unk_36C, 0x0); - BGL_AddWindow(param0->unk_14, ¶m0->unk_35C, 0, 2, 19, 27, 4, 13, (1 + (18 + 12) + 9)); - BGL_FillWindow(¶m0->unk_35C, 0xf0f); - BGL_AddWindow(param0->unk_14, ¶m0->unk_37C, 0, 3, 1, 26, 2, 15, ((1 + (18 + 12) + 9) + 27 * 4)); + Window_Add(param0->unk_14, ¶m0->unk_36C, 5, 26, 20, 6, 2, 13, 1 + 30 * 15); + Window_FillTilemap(¶m0->unk_36C, 0x0); + Window_Add(param0->unk_14, ¶m0->unk_35C, 0, 2, 19, 27, 4, 13, (1 + (18 + 12) + 9)); + Window_FillTilemap(¶m0->unk_35C, 0xf0f); + Window_Add(param0->unk_14, ¶m0->unk_37C, 0, 3, 1, 26, 2, 15, ((1 + (18 + 12) + 9) + 27 * 4)); ov109_021D46D8(¶m0->unk_37C, param0->unk_58, TEXT_SPEED_INSTANT); { int v0; - BGL_AddWindow(param0->unk_14, ¶m0->unk_30C[0], 0, 2, 6, 16, 11, 15, (((1 + (18 + 12) + 9) + 27 * 4) + 26 * 2)); - BGL_FillWindow(¶m0->unk_30C[0], 0); + Window_Add(param0->unk_14, ¶m0->unk_30C[0], 0, 2, 6, 16, 11, 15, (((1 + (18 + 12) + 9) + 27 * 4) + 26 * 2)); + Window_FillTilemap(¶m0->unk_30C[0], 0); ov109_021D537C(param0->unk_30C, 0, TEXT_COLOR(1, 3, 0), param0); } } @@ -691,7 +691,7 @@ static void ov109_021D46D8(Window *param0, Strbuf *param1, int param2) int v0 = Font_CalcStrbufWidth(FONT_MESSAGE, param1, 0); int v1 = (26 * 8 - v0) / 2; - BGL_FillWindow(param0, 0x0); + Window_FillTilemap(param0, 0x0); Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, param1, v1, 1, param2, TEXT_COLOR(1, 4, 0), NULL); } @@ -699,10 +699,10 @@ static void ov109_021D471C(UnkStruct_ov109_021D5140 *param0) { int v0; - BGL_DeleteWindow(¶m0->unk_30C[0]); - BGL_DeleteWindow(¶m0->unk_37C); - BGL_DeleteWindow(¶m0->unk_36C); - BGL_DeleteWindow(¶m0->unk_35C); + Window_Remove(¶m0->unk_30C[0]); + Window_Remove(¶m0->unk_37C); + Window_Remove(¶m0->unk_36C); + Window_Remove(¶m0->unk_35C); } static int ov109_021D474C(UnkStruct_ov109_021D5140 *param0, int param1) @@ -1463,7 +1463,7 @@ static BOOL ov109_021D537C(Window *param0, int param1, TextColor param2, UnkStru return 0; } - BGL_FillWindow(¶m0[0], 0x0); + Window_FillTilemap(¶m0[0], 0x0); for (v0 = 0; v0 < 5; v0++) { if (param3->unk_3D8[v0][0] != NULL) { @@ -1485,7 +1485,7 @@ static BOOL ov109_021D537C(Window *param0, int param1, TextColor param2, UnkStru } } - sub_0201A954(¶m0[0]); + Window_CopyToVRAM(¶m0[0]); return 1; } @@ -1573,7 +1573,7 @@ static void ov109_021D55A8(UnkStruct_ov109_021D5140 *param0, int param1, int par MessageLoader_GetStrbuf(param0->unk_38, param1, v0); StringTemplate_Format(param0->unk_34, param0->unk_54, v0); Strbuf_Free(v0); - BGL_FillWindow(¶m0->unk_35C, 0xf0f); + Window_FillTilemap(¶m0->unk_35C, 0xf0f); sub_0200E060(¶m0->unk_35C, 0, 1, 10); if (param2 == 0) { diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index bdff5c8094..6e8b3a5777 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -112,7 +112,7 @@ int ov110_021D0D80 (OverlayManager * param0, int * param1) memset(v1, 0, sizeof(UnkStruct_ov110_021D0F78)); v1->unk_00 = param0; - v1->unk_0C = sub_02018340(114); + v1->unk_0C = BgConfig_New(114); v2 = (UnkStruct_0203E564 *)OverlayManager_Args(param0); @@ -257,7 +257,7 @@ static void ov110_021D1048 (void * param0) sub_02003694(v0->unk_120); } - sub_0201C2B8(v0->unk_0C); + Bg_RunScheduledUpdates(v0->unk_0C); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -291,7 +291,7 @@ static void ov110_021D1098(BgConfig *param0) GX_BG0_AS_2D }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -311,9 +311,9 @@ static void ov110_021D1098(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019690(0, 32, 0, 114); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilesRange(0, 32, 0, 114); + Bg_ClearTilemap(param0, 0); } { @@ -333,9 +333,9 @@ static void ov110_021D1098(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v2, 0); - sub_02019690(2, 32, 0, 114); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v2, 0); + Bg_ClearTilesRange(2, 32, 0, 114); + Bg_ClearTilemap(param0, 2); } { @@ -355,9 +355,9 @@ static void ov110_021D1098(BgConfig *param0) 0 }; - sub_020183C4(param0, 6, &v3, 0); - sub_02019690(6, 32, 0, 114); - sub_02019EBC(param0, 6); + Bg_InitFromTemplate(param0, 6, &v3, 0); + Bg_ClearTilesRange(6, 32, 0, 114); + Bg_ClearTilemap(param0, 6); } G2_SetBG0Priority(0); @@ -390,9 +390,9 @@ static void ov110_021D11CC(BgConfig *param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 0); - sub_02019044(param0, 2); - sub_02019044(param0, 6); + Bg_FreeTilemapBuffer(param0, 0); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 6); Heap_FreeToHeap(param0); return; @@ -477,7 +477,7 @@ static void ov110_021D12C0 (UnkStruct_ov110_021D0F78 * param0, u32 param1) static u8 ov110_021D1324 (UnkStruct_ov110_021D0F78 * param0, Window * param1, int param2, u32 param3, u32 param4, u8 param5, u8 param6, u8 param7, u8 param8, u8 param9, int param10) { if (param9) - BGL_FillWindow(param1, param7); + Window_FillTilemap(param1, param7); MessageLoader_GetStrbuf(param0->unk_110, param2, param0->unk_11C); StringTemplate_Format(param0->unk_114, param0->unk_118, param0->unk_11C); @@ -545,7 +545,7 @@ static void ov110_021D1468 (UnkStruct_ov110_021D0F78 * param0) u32 v3; v0 = 0; - BGL_FillWindow(¶m0->unk_10[v0], 0); + Window_FillTilemap(¶m0->unk_10[v0], 0); ov110_021D1324(param0, ¶m0->unk_10[v0], 22, 8, 0, 1, 2, 0, FONT_SYSTEM, 0, 0); if (param0->unk_05 == 0) { @@ -560,27 +560,28 @@ static void ov110_021D1468 (UnkStruct_ov110_021D0F78 * param0) } ov110_021D1324(param0, ¶m0->unk_10[v0], v2, v3, 0, 1, 2, 0, FONT_SYSTEM, 0, 2); - sub_0201A9A4(¶m0->unk_10[v0]); + Window_ScheduleCopyToVRAM(¶m0->unk_10[v0]); v0 = 1; ov110_021D13CC(param0, ¶m0->unk_10[v0], 34, 1); ov110_021D1324(param0, ¶m0->unk_10[v0], 36, 28 * 8, 0, 1, 2, 0, FONT_SYSTEM, 0, 2); - sub_0201A9A4(¶m0->unk_10[v0]); + Window_ScheduleCopyToVRAM(¶m0->unk_10[v0]); v0 = 2; ov110_021D13CC(param0, ¶m0->unk_10[v0], ov110_021D17AC(param0, 0), 1); ov110_021D13F0(param0, 0, sub_02030698(param0->unk_12C, sub_0205E430(0, param0->unk_05), 0xFF)); ov110_021D1324(param0, ¶m0->unk_10[v0], 38, 14 * 8, 0, 1, 2, 0, FONT_SYSTEM, 0, 1); ov110_021D13F0(param0, 0, sub_02030698(param0->unk_12C, sub_0205E488(0, param0->unk_05), 0xFF)); ov110_021D1324(param0, ¶m0->unk_10[v0], 40, 28 * 8, 0, 1, 2, 0, FONT_SYSTEM, 0, 2); - sub_0201A9A4(¶m0->unk_10[v0]); + Window_ScheduleCopyToVRAM(¶m0->unk_10[v0]); v0 = 3; ov110_021D13CC(param0, ¶m0->unk_10[v0], 31, 1); ov110_021D13F0(param0, 0, sub_02030698(param0->unk_12C, sub_0205E45C(0, param0->unk_05), 0xFF)); ov110_021D1324(param0, ¶m0->unk_10[v0], 38, 14 * 8, 0, 1, 2, 0, FONT_SYSTEM, 0, 1); ov110_021D13F0(param0, 0, sub_02030698(param0->unk_12C, sub_0205E4B4(0, param0->unk_05), 0xFF)); ov110_021D1324(param0, ¶m0->unk_10[v0], 40, 28 * 8, 0, 1, 2, 0, FONT_SYSTEM, 0, 2); - sub_0201A9A4(¶m0->unk_10[v0]); + Window_ScheduleCopyToVRAM(¶m0->unk_10[v0]); } +// clang-format off asm static void ov110_021D1650 (UnkStruct_ov110_021D0F78 * param0) { push {r3, r4, lr} @@ -593,7 +594,7 @@ asm static void ov110_021D1650 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D13CC add r0, r4, #0 add r0, #0x50 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r0, r4, #0 mov r1, #1 bl ov110_021D17AC @@ -663,7 +664,7 @@ asm static void ov110_021D1650 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r4, #0 add r0, #0x60 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r1, r4, #0 add r0, r4, #0 add r1, #0x70 @@ -730,10 +731,11 @@ asm static void ov110_021D1650 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r4, #0x70 add r0, r4, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add sp, #0x1c pop {r3, r4, pc} } +// clang-format on static u32 ov110_021D17AC (UnkStruct_ov110_021D0F78 * param0, u8 param1) { @@ -759,6 +761,7 @@ static u32 ov110_021D17AC (UnkStruct_ov110_021D0F78 * param0, u8 param1) return 29; } +// clang-format off asm static void ov110_021D1808 (UnkStruct_ov110_021D0F78 * param0) { push {r4, r5, r6, lr} @@ -766,7 +769,7 @@ asm static void ov110_021D1808 (UnkStruct_ov110_021D0F78 * param0) add r5, r0, #0 add r0, #0x10 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap mov r1, #0 str r1, [sp] mov r0, #1 @@ -815,7 +818,7 @@ asm static void ov110_021D1808 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r5, #0 add r0, #0x10 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r0, r5, #0 bl ov110_021D19B0 mov r3, #0 @@ -835,7 +838,7 @@ asm static void ov110_021D1808 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r5, #0 add r0, #0x20 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r1, r5, #0 add r0, r5, #0 add r1, #0x30 @@ -894,7 +897,7 @@ asm static void ov110_021D1808 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r5, #0 add r0, #0x30 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r1, r5, #0 add r0, r5, #0 add r1, #0x40 @@ -952,10 +955,11 @@ asm static void ov110_021D1808 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r5, #0x40 add r0, r5, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add sp, #0x20 pop {r4, r5, r6, pc} } +// clang-format on static void ov110_021D19B0 (UnkStruct_ov110_021D0F78 * param0) { @@ -972,6 +976,7 @@ static void ov110_021D19B0 (UnkStruct_ov110_021D0F78 * param0) return; } +// clang-format off asm static void ov110_021D19F4 (UnkStruct_ov110_021D0F78 * param0) { push {r3, r4, r5, r6, lr} @@ -979,7 +984,7 @@ asm static void ov110_021D19F4 (UnkStruct_ov110_021D0F78 * param0) add r5, r0, #0 add r0, #0x10 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap mov r1, #0 str r1, [sp] mov r0, #1 @@ -1028,7 +1033,7 @@ asm static void ov110_021D19F4 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r5, #0 add r0, #0x10 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM mov r2, #0 str r2, [sp] mov r1, #1 @@ -1047,7 +1052,7 @@ asm static void ov110_021D19F4 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r5, #0 add r0, #0x20 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r0, r5, #0 bl ov110_021D1BEC add r1, r5, #0 @@ -1121,7 +1126,7 @@ asm static void ov110_021D19F4 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r5, #0 add r0, #0x30 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r1, r5, #0 add r0, r5, #0 add r1, #0x40 @@ -1193,10 +1198,11 @@ asm static void ov110_021D19F4 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r5, #0x40 add r0, r5, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add sp, #0x1c pop {r3, r4, r5, r6, pc} } +// clang-format on static u32 ov110_021D1BEC (UnkStruct_ov110_021D0F78 * param0) { @@ -1215,6 +1221,7 @@ static u32 ov110_021D1BEC (UnkStruct_ov110_021D0F78 * param0) return 29; } +// clang-format off asm static void ov110_021D1C40 (UnkStruct_ov110_021D0F78 * param0) { push {r3, r4, lr} @@ -1222,7 +1229,7 @@ asm static void ov110_021D1C40 (UnkStruct_ov110_021D0F78 * param0) add r4, r0, #0 add r0, #0x10 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap mov r1, #0 str r1, [sp] mov r0, #1 @@ -1271,7 +1278,7 @@ asm static void ov110_021D1C40 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r4, #0 add r0, #0x10 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r0, r4, #0 bl ov110_021D1D68 add r1, r4, #0 @@ -1310,7 +1317,7 @@ asm static void ov110_021D1C40 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r4, #0 add r0, #0x20 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r1, r4, #0 add r0, r4, #0 add r1, #0x30 @@ -1347,10 +1354,11 @@ asm static void ov110_021D1C40 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r4, #0x30 add r0, r4, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add sp, #0x1c pop {r3, r4, pc} } +// clang-format on static u32 ov110_021D1D68 (UnkStruct_ov110_021D0F78 * param0) { @@ -1369,6 +1377,7 @@ static u32 ov110_021D1D68 (UnkStruct_ov110_021D0F78 * param0) return 29; } +// clang-format off asm static void ov110_021D1DBC (UnkStruct_ov110_021D0F78 * param0) { push {r3, r4, lr} @@ -1376,7 +1385,7 @@ asm static void ov110_021D1DBC (UnkStruct_ov110_021D0F78 * param0) add r4, r0, #0 add r0, #0x10 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap mov r1, #0 str r1, [sp] mov r0, #1 @@ -1418,7 +1427,7 @@ asm static void ov110_021D1DBC (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r4, #0 add r0, #0x10 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM ldrb r1, [r4, #5] add r0, r4, #0 bl ov110_021D20CC @@ -1458,7 +1467,7 @@ asm static void ov110_021D1DBC (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r4, #0 add r0, #0x30 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r1, r4, #0 add r0, r4, #0 add r1, #0x40 @@ -1495,11 +1504,13 @@ asm static void ov110_021D1DBC (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r4, #0x40 add r0, r4, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add sp, #0x1c pop {r3, r4, pc} } +// clang-format on +// clang-format off asm static void ov110_021D1ED8 (UnkStruct_ov110_021D0F78 * param0) { push {r3, r4, lr} @@ -1507,7 +1518,7 @@ asm static void ov110_021D1ED8 (UnkStruct_ov110_021D0F78 * param0) add r4, r0, #0 add r0, #0x10 mov r1, #0 - bl BGL_FillWindow + bl Window_FillTilemap mov r1, #0 str r1, [sp] mov r0, #1 @@ -1542,7 +1553,7 @@ asm static void ov110_021D1ED8 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r4, #0 add r0, #0x10 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r1, r4, #0 add r0, r4, #0 add r1, #0x20 @@ -1551,7 +1562,7 @@ asm static void ov110_021D1ED8 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D13CC add r0, r4, #0 add r0, #0x20 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM ldrb r1, [r4, #5] add r0, r4, #0 bl ov110_021D20CC @@ -1591,7 +1602,7 @@ asm static void ov110_021D1ED8 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r4, #0 add r0, #0x50 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r1, r4, #0 add r0, r4, #0 add r1, #0x60 @@ -1628,7 +1639,7 @@ asm static void ov110_021D1ED8 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r4, #0 add r0, #0x60 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r1, r4, #0 add r0, r4, #0 add r1, #0x70 @@ -1637,7 +1648,7 @@ asm static void ov110_021D1ED8 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D13CC add r0, r4, #0 add r0, #0x70 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r0, r4, #0 mov r1, #3 bl ov110_021D20CC @@ -1677,7 +1688,7 @@ asm static void ov110_021D1ED8 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r0, r4, #0 add r0, #0x80 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add r1, r4, #0 add r0, r4, #0 add r1, #0x90 @@ -1714,10 +1725,11 @@ asm static void ov110_021D1ED8 (UnkStruct_ov110_021D0F78 * param0) bl ov110_021D1324 add r4, #0x90 add r0, r4, #0 - bl sub_0201A9A4 + bl Window_ScheduleCopyToVRAM add sp, #0x1c pop {r3, r4, pc} } +// clang-format on static u32 ov110_021D20CC (UnkStruct_ov110_021D0F78 * param0, u8 param1) { diff --git a/src/overlay110/ov110_021D2124.c b/src/overlay110/ov110_021D2124.c index 99b4a61594..1d267aeca2 100644 --- a/src/overlay110/ov110_021D2124.c +++ b/src/overlay110/ov110_021D2124.c @@ -70,8 +70,8 @@ void ov110_021D2124(BgConfig *param0, Window *param1, u8 param2) u32 v2 = Unk_ov110_021D2278[param2].unk_04; for (v0 = 0; v0 < v2; v0++) { - sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); - BGL_FillWindow(¶m1[v0], 0); + Window_AddFromTemplate(param0, ¶m1[v0], &v1[v0]); + Window_FillTilemap(¶m1[v0], 0); } return; @@ -83,7 +83,7 @@ void ov110_021D216C(Window *param0, u8 param1) u32 v1 = Unk_ov110_021D2278[param1].unk_04; for (v0 = 0; v0 < v1; v0++) { - BGL_DeleteWindow(¶m0[v0]); + Window_Remove(¶m0[v0]); } return; diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index caa1b13c70..3ade770ce2 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -332,7 +332,7 @@ int ov111_021D0D80(OverlayManager *param0, int *param1) v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov111_021D0F7C), 115); memset(v1, 0, sizeof(UnkStruct_ov111_021D0F7C)); - v1->unk_58 = sub_02018340(115); + v1->unk_58 = BgConfig_New(115); v1->unk_00 = param0; v2 = (UnkStruct_0203E608 *)OverlayManager_Args(param0); v1->unk_168 = v2->unk_00; @@ -611,14 +611,14 @@ static BOOL ov111_021D1284(UnkStruct_ov111_021D0F7C *param0) case 0: ov111_021D2EB4(param0); - sub_0201958C(param0->unk_58, 0, param0->unk_3F8, param0->unk_3F4->szByte, 0); - sub_02019448(param0->unk_58, 0); + Bg_LoadTiles(param0->unk_58, 0, param0->unk_3F8, param0->unk_3F4->szByte, 0); + Bg_CopyTilemapBufferToVRAM(param0->unk_58, 0); param0->unk_12 = 256; - sub_02019184(param0->unk_58, 6, 0, param0->unk_12); - sub_02019184(param0->unk_58, 0, 0, param0->unk_12); - sub_02019184(param0->unk_58, 1, 0, param0->unk_12); + Bg_SetOffset(param0->unk_58, 6, 0, param0->unk_12); + Bg_SetOffset(param0->unk_58, 0, 0, param0->unk_12); + Bg_SetOffset(param0->unk_58, 1, 0, param0->unk_12); GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG0), 1); GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG1), 1); @@ -670,9 +670,9 @@ static BOOL ov111_021D1284(UnkStruct_ov111_021D0F7C *param0) param0->unk_08 = 2; break; case 2: - sub_02019184(param0->unk_58, 6, 0, param0->unk_12); - sub_02019184(param0->unk_58, 0, 0, param0->unk_12); - sub_02019184(param0->unk_58, 1, 0, param0->unk_12); + Bg_SetOffset(param0->unk_58, 6, 0, param0->unk_12); + Bg_SetOffset(param0->unk_58, 0, 0, param0->unk_12); + Bg_SetOffset(param0->unk_58, 1, 0, param0->unk_12); param0->unk_12 += -16; @@ -707,12 +707,12 @@ static BOOL ov111_021D1508(UnkStruct_ov111_021D0F7C *param0) switch (param0->unk_08) { case 0: if (param0->unk_0E == (3 - 1)) { - sub_0201ACF4(¶m0->unk_5C[13]); + Window_ClearAndCopyToVRAM(¶m0->unk_5C[13]); ov111_021D263C(param0); ov111_021D3474(param0->unk_3A0, Unk_ov111_021D3600.unk_00, Unk_ov111_021D3600.unk_02); ov111_021D34C4(param0->unk_3A0, 0); } else { - sub_0201ACF4(¶m0->unk_5C[14]); + Window_ClearAndCopyToVRAM(¶m0->unk_5C[14]); ov111_021D2604(param0); } @@ -738,8 +738,8 @@ static BOOL ov111_021D1508(UnkStruct_ov111_021D0F7C *param0) case 2: if (param0->unk_0F == 0) { ov111_021D345C(param0->unk_3A4, 0); - BGL_FillWindow(¶m0->unk_5C[10], 0); - sub_0201A9A4(¶m0->unk_5C[10]); + Window_FillTilemap(¶m0->unk_5C[10], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_5C[10]); param0->unk_08 = 3; } else { param0->unk_0F--; @@ -892,14 +892,14 @@ static BOOL ov111_021D1508(UnkStruct_ov111_021D0F7C *param0) if (v2 == 1) { ov111_021D350C(param0->unk_3A0, 0); Window_Clear(¶m0->unk_5C[0], 0); - sub_0201ACF4(¶m0->unk_5C[0]); + Window_ClearAndCopyToVRAM(¶m0->unk_5C[0]); ov111_021D2E20(param0); ov111_021D1FB4(param0); return 1; } else if (v2 == 2) { ov111_021D350C(param0->unk_3A0, 0); Window_Clear(¶m0->unk_5C[0], 0); - sub_0201ACF4(¶m0->unk_5C[0]); + Window_ClearAndCopyToVRAM(¶m0->unk_5C[0]); ov111_021D1FB4(param0); param0->unk_08 = 11; } @@ -910,14 +910,14 @@ static BOOL ov111_021D1508(UnkStruct_ov111_021D0F7C *param0) if (v2 == 1) { ov111_021D350C(param0->unk_3A0, 0); Window_Clear(¶m0->unk_5C[0], 0); - sub_0201ACF4(¶m0->unk_5C[0]); + Window_ClearAndCopyToVRAM(¶m0->unk_5C[0]); ov111_021D2E18(param0); ov111_021D1FB4(param0); return 1; } else if (v2 == 2) { ov111_021D350C(param0->unk_3A0, 0); Window_Clear(¶m0->unk_5C[0], 0); - sub_0201ACF4(¶m0->unk_5C[0]); + Window_ClearAndCopyToVRAM(¶m0->unk_5C[0]); ov111_021D1FB4(param0); param0->unk_08 = 11; } @@ -953,9 +953,9 @@ static BOOL ov111_021D1980(UnkStruct_ov111_021D0F7C *param0) break; case 1: - sub_02019184(param0->unk_58, 6, 0, param0->unk_12); - sub_02019184(param0->unk_58, 0, 0, param0->unk_12); - sub_02019184(param0->unk_58, 1, 0, param0->unk_12); + Bg_SetOffset(param0->unk_58, 6, 0, param0->unk_12); + Bg_SetOffset(param0->unk_58, 0, 0, param0->unk_12); + Bg_SetOffset(param0->unk_58, 1, 0, param0->unk_12); param0->unk_12 += -16; if (param0->unk_10 >= 256) { @@ -1263,12 +1263,12 @@ static void ov111_021D2044(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 7); - sub_02019044(param0, 6); - sub_02019044(param0, 4); - sub_02019044(param0, 1); - sub_02019044(param0, 0); - sub_02019044(param0, 2); + Bg_FreeTilemapBuffer(param0, 7); + Bg_FreeTilemapBuffer(param0, 6); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); + Bg_FreeTilemapBuffer(param0, 2); Heap_FreeToHeap(param0); return; @@ -1286,7 +1286,7 @@ static void ov111_021D2090(void *param0) sub_02003694(v0->unk_15C); } - sub_0201C2B8(v0->unk_58); + Bg_RunScheduledUpdates(v0->unk_58); sub_0201DCAC(); sub_0200A858(); @@ -1322,7 +1322,7 @@ static void ov111_021D20EC(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -1342,9 +1342,9 @@ static void ov111_021D20EC(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v1, 0); - sub_02019690(4, 32, 0, 115); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v1, 0); + Bg_ClearTilesRange(4, 32, 0, 115); + Bg_ClearTilemap(param0, 4); } { @@ -1364,8 +1364,8 @@ static void ov111_021D20EC(BgConfig *param0) 0 }; - sub_020183C4(param0, 7, &v2, 0); - sub_02019EBC(param0, 7); + Bg_InitFromTemplate(param0, 7, &v2, 0); + Bg_ClearTilemap(param0, 7); } { @@ -1385,8 +1385,8 @@ static void ov111_021D20EC(BgConfig *param0) 0 }; - sub_020183C4(param0, 6, &v3, 0); - sub_02019EBC(param0, 6); + Bg_InitFromTemplate(param0, 6, &v3, 0); + Bg_ClearTilemap(param0, 6); } { @@ -1406,8 +1406,8 @@ static void ov111_021D20EC(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v4, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v4, 0); + Bg_ClearTilemap(param0, 1); } { @@ -1427,8 +1427,8 @@ static void ov111_021D20EC(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v5, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v5, 0); + Bg_ClearTilemap(param0, 0); } { @@ -1448,9 +1448,9 @@ static void ov111_021D20EC(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v6, 0); - sub_02019690(2, 32, 0, 115); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v6, 0); + Bg_ClearTilesRange(2, 32, 0, 115); + Bg_ClearTilemap(param0, 2); } GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG0), 0); @@ -1522,7 +1522,7 @@ static void ov111_021D2380(UnkStruct_ov111_021D0F7C *param0, u32 param1) static u8 ov111_021D23C4(UnkStruct_ov111_021D0F7C *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { - BGL_FillWindow(param1, param8); + Window_FillTilemap(param1, param8); MessageLoader_GetStrbuf(param0->unk_38, param2, param0->unk_44); StringTemplate_Format(param0->unk_3C, param0->unk_40, param0->unk_44); @@ -1531,7 +1531,7 @@ static u8 ov111_021D23C4(UnkStruct_ov111_021D0F7C *param0, Window *param1, int p static u8 ov111_021D2424(UnkStruct_ov111_021D0F7C *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { - BGL_FillWindow(param1, param8); + Window_FillTilemap(param1, param8); MessageLoader_GetStrbuf(param0->unk_38, param2, param0->unk_44); StringTemplate_Format(param0->unk_3C, param0->unk_40, param0->unk_44); param3 -= (Font_CalcStrbufWidth(param9, param0->unk_40, 0) + 1) / 2; @@ -1544,7 +1544,7 @@ static u8 ov111_021D2494(UnkStruct_ov111_021D0F7C *param0) ov111_021D3594(param0->unk_58, ¶m0->unk_5C[0]); v0 = ov111_021D23C4(param0, ¶m0->unk_5C[0], 6, 1, 1, TEXT_SPEED_INSTANT, 1, 2, 15, FONT_SYSTEM); - sub_0201A9A4(¶m0->unk_5C[0]); + Window_ScheduleCopyToVRAM(¶m0->unk_5C[0]); return v0; } @@ -1555,7 +1555,7 @@ static u8 ov111_021D24D4(UnkStruct_ov111_021D0F7C *param0) ov111_021D26CC(param0, 0, (param0->unk_0E + 1)); v0 = ov111_021D23C4(param0, ¶m0->unk_5C[15], 12, 1, 1, TEXT_SPEED_INSTANT, 1, 2, 15, FONT_MESSAGE); - sub_0201A9A4(¶m0->unk_5C[15]); + Window_ScheduleCopyToVRAM(¶m0->unk_5C[15]); return v0; } @@ -1566,7 +1566,7 @@ static u8 ov111_021D2518(UnkStruct_ov111_021D0F7C *param0) ov111_021D26CC(param0, 0, (param0->unk_0E + 1)); v0 = ov111_021D2424(param0, ¶m0->unk_5C[10], 9, 8 * 6, 1 + 4, TEXT_SPEED_INSTANT, 1, 2, 0, FONT_SYSTEM); - sub_0201A9A4(¶m0->unk_5C[10]); + Window_ScheduleCopyToVRAM(¶m0->unk_5C[10]); return v0; } @@ -1596,7 +1596,7 @@ static u8 ov111_021D25BC(UnkStruct_ov111_021D0F7C *param0) Sound_PlayEffect(1523); v0 = ov111_021D2424(param0, ¶m0->unk_5C[12], 11, 8 * 6, 1 + 4, TEXT_SPEED_INSTANT, 1, 2, 0, FONT_SYSTEM); - sub_0201A9A4(¶m0->unk_5C[12]); + Window_ScheduleCopyToVRAM(¶m0->unk_5C[12]); return v0; } @@ -1606,7 +1606,7 @@ static u8 ov111_021D2604(UnkStruct_ov111_021D0F7C *param0) u8 v0; v0 = ov111_021D2424(param0, ¶m0->unk_5C[13], 4, 8 * 6, 1, TEXT_SPEED_INSTANT, 1, 1, 0, FONT_SUBSCREEN); - sub_0201A9A4(¶m0->unk_5C[13]); + Window_ScheduleCopyToVRAM(¶m0->unk_5C[13]); return v0; } @@ -1616,7 +1616,7 @@ static u8 ov111_021D263C(UnkStruct_ov111_021D0F7C *param0) u8 v0; v0 = ov111_021D2424(param0, ¶m0->unk_5C[14], 5, 8 * 3, 1, TEXT_SPEED_INSTANT, 1, 1, 0, FONT_SUBSCREEN); - sub_0201A9A4(¶m0->unk_5C[14]); + Window_ScheduleCopyToVRAM(¶m0->unk_5C[14]); return v0; } @@ -1634,7 +1634,7 @@ static u8 ov111_021D2674(UnkStruct_ov111_021D0F7C *param0, u8 param1) StringTemplate_SetItemName(param0->unk_3C, 0, param0->unk_3CE[param1]); v0 = ov111_021D2424(param0, ¶m0->unk_5C[2 + param1], 1, 8 * 6 - 4, Unk_ov111_021D3814[param1], TEXT_SPEED_INSTANT, 1, 2, 0, FONT_SYSTEM); - sub_0201A9A4(¶m0->unk_5C[2 + param1]); + Window_ScheduleCopyToVRAM(¶m0->unk_5C[2 + param1]); return v0; } @@ -1823,8 +1823,8 @@ static BOOL ov111_021D2868(UnkStruct_ov111_021D0F7C *param0, u8 param1) static void ov111_021D28E8(UnkStruct_ov111_021D0F7C *param0, u32 param1, u8 param2, u8 param3, u8 param4) { - sub_02019E2C(param0->unk_58, param1, 0, 0, param3, param4, param2); - sub_0201C3C0(param0->unk_58, param1); + Bg_ChangeTilemapRectPalette(param0->unk_58, param1, 0, 0, param3, param4, param2); + Bg_ScheduleTilemapTransfer(param0->unk_58, param1); return; } @@ -2118,8 +2118,8 @@ static void ov111_021D2E20(UnkStruct_ov111_021D0F7C *param0) static void ov111_021D2E28(UnkStruct_ov111_021D0F7C *param0) { ov111_021D345C(param0->unk_3A4, 0); - BGL_FillWindow(¶m0->unk_5C[10], 0); - sub_0201A9A4(¶m0->unk_5C[10]); + Window_FillTilemap(¶m0->unk_5C[10], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_5C[10]); return; } @@ -2127,8 +2127,8 @@ static void ov111_021D2E4C(UnkStruct_ov111_021D0F7C *param0) { param0->unk_3F0 = sub_02006F50(184, 7, 0, ¶m0->unk_3F4, 115); - sub_0201958C(param0->unk_58, 0, param0->unk_3F4->pRawData, param0->unk_3F4->szByte, 0); - sub_02019448(param0->unk_58, 0); + Bg_LoadTiles(param0->unk_58, 0, param0->unk_3F4->pRawData, param0->unk_3F4->szByte, 0); + Bg_CopyTilemapBufferToVRAM(param0->unk_58, 0); return; } @@ -2162,8 +2162,8 @@ static void ov111_021D2ECC(UnkStruct_ov111_021D0F7C *param0, int param1, int par } } - sub_0201958C(param0->unk_58, 0, param0->unk_3F8, param0->unk_3F4->szByte, 0); - sub_02019448(param0->unk_58, 0); + Bg_LoadTiles(param0->unk_58, 0, param0->unk_3F8, param0->unk_3F4->szByte, 0); + Bg_CopyTilemapBufferToVRAM(param0->unk_58, 0); return; } diff --git a/src/overlay111/ov111_021D3548.c b/src/overlay111/ov111_021D3548.c index 7da96912fe..c4e1301ad5 100644 --- a/src/overlay111/ov111_021D3548.c +++ b/src/overlay111/ov111_021D3548.c @@ -36,8 +36,8 @@ void ov111_021D3548(BgConfig *param0, Window *param1) const WindowTemplate *v1 = Unk_ov111_021D38B8; for (v0 = 0; v0 < 16; v0++) { - sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); - BGL_FillWindow(¶m1[v0], 0); + Window_AddFromTemplate(param0, ¶m1[v0], &v1[v0]); + Window_FillTilemap(¶m1[v0], 0); } return; @@ -48,7 +48,7 @@ void ov111_021D3578(Window *param0) u16 v0; for (v0 = 0; v0 < 16; v0++) { - BGL_DeleteWindow(¶m0[v0]); + Window_Remove(¶m0[v0]); } return; @@ -64,8 +64,8 @@ void ov111_021D3594(BgConfig *param0, Window *param1) void ov111_021D35C0(Window *param0, int param1) { - sub_0200DD0C(param0->bgConfig, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 115); - BGL_FillWindow(param0, 15); + sub_0200DD0C(param0->bgConfig, Window_GetBgLayer(param0), ((1024 - 9) - (18 + 12)), 10, param1, 115); + Window_FillTilemap(param0, 15); sub_0200E060(param0, 0, ((1024 - 9) - (18 + 12)), 10); return; diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index 48524596b7..37fedea6b1 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -483,16 +483,16 @@ static void ov112_0225CA14(UnkStruct_ov112_0225C9BC *param0) static void ov112_0225CA20(UnkStruct_ov112_0225C9BC *param0) { - sub_0201C2B8(param0->unk_00); + Bg_RunScheduledUpdates(param0->unk_00); sub_0200A858(); sub_0201DCAC(); } static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 param1) { - sub_02018368(&Unk_ov112_0225D834); + SetAllGraphicsModes(&Unk_ov112_0225D834); - param0->unk_00 = sub_02018340(param1); + param0->unk_00 = BgConfig_New(param1); gCoreSys.unk_65 = 0; GXLayers_SwapDisplay(); @@ -501,9 +501,9 @@ static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 param1) int v0; for (v0 = 0; v0 < 5; v0++) { - sub_020183C4(param0->unk_00, Unk_ov112_0225D844[v0], &Unk_ov112_0225D8C0[v0], 0); - sub_02019690(Unk_ov112_0225D844[v0], 32, 0, param1); - sub_02019EBC(param0->unk_00, Unk_ov112_0225D844[v0]); + Bg_InitFromTemplate(param0->unk_00, Unk_ov112_0225D844[v0], &Unk_ov112_0225D8C0[v0], 0); + Bg_ClearTilesRange(Unk_ov112_0225D844[v0], 32, 0, param1); + Bg_ClearTilemap(param0->unk_00, Unk_ov112_0225D844[v0]); } } @@ -528,7 +528,7 @@ static void ov112_0225CB60(UnkStruct_ov112_0225C9BC *param0) int v0; for (v0 = 0; v0 < 5; v0++) { - sub_02019044(param0->unk_00, Unk_ov112_0225D844[v0]); + Bg_FreeTilemapBuffer(param0->unk_00, Unk_ov112_0225D844[v0]); } } @@ -591,8 +591,8 @@ static void ov112_0225CC84(UnkStruct_ov112_0225CC84 *param0) static void ov112_0225CC90(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2, u8 param3, u8 param4) { - sub_020198E8(param1->unk_00, 3, 5 + (param3 * 1), 4 + (param4 * 2), 1, 2, param0->unk_04->rawData, 6 + param2, 0, param0->unk_04->screenWidth / 8, param0->unk_04->screenHeight / 8); - sub_0201C3C0(param1->unk_00, 3); + Bg_CopyToTilemapRect(param1->unk_00, 3, 5 + (param3 * 1), 4 + (param4 * 2), 1, 2, param0->unk_04->rawData, 6 + param2, 0, param0->unk_04->screenWidth / 8, param0->unk_04->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param1->unk_00, 3); } static void ov112_0225CCE8(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u8 param2, u8 param3, u32 param4, u32 param5, BOOL param6, BOOL param7, BOOL param8) @@ -610,17 +610,17 @@ static void ov112_0225CCE8(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_022 v1++; } - sub_020198E8(param1->unk_00, 3, 21 + (param2 * 2), 4 + (param3 * 2), 2, 2, param0->unk_04->rawData, 0 + (v0 * 2), 0 + (v1 * 2), param0->unk_04->screenWidth / 8, param0->unk_04->screenHeight / 8); + Bg_CopyToTilemapRect(param1->unk_00, 3, 21 + (param2 * 2), 4 + (param3 * 2), 2, 2, param0->unk_04->rawData, 0 + (v0 * 2), 0 + (v1 * 2), param0->unk_04->screenWidth / 8, param0->unk_04->screenHeight / 8); if (param8) { - sub_02019E2C(param1->unk_00, 3, 21 + (param2 * 2), 4 + (param3 * 2), 2, 2, 4); + Bg_ChangeTilemapRectPalette(param1->unk_00, 3, 21 + (param2 * 2), 4 + (param3 * 2), 2, 2, 4); } else { if (param6) { - sub_02019E2C(param1->unk_00, 3, 21 + (param2 * 2), 4 + (param3 * 2), 2, 2, 3); + Bg_ChangeTilemapRectPalette(param1->unk_00, 3, 21 + (param2 * 2), 4 + (param3 * 2), 2, 2, 3); } } - sub_0201C3C0(param1->unk_00, 3); + Bg_ScheduleTilemapTransfer(param1->unk_00, 3); } static void ov112_0225CDA8(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_02231428 *param4, const UnkStruct_ov66_0222DFF8 *param5, u32 param6) @@ -716,8 +716,8 @@ static void ov112_0225CE88(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_022 param0->unk_06 = 0; param0->unk_05 = 0; - sub_02019CB8(param2->unk_00, 3, 0, 5, 4, 10 * 1, 4 * 2, 0); - sub_0201C3C0(param2->unk_00, 3); + Bg_FillTilemapRect(param2->unk_00, 3, 0, 5, 4, 10 * 1, 4 * 2, 0); + Bg_ScheduleTilemapTransfer(param2->unk_00, 3); for (v0 = 0; v0 < 4; v0++) { v5 = (4 - 1) - v0; @@ -850,7 +850,7 @@ static void ov112_0225D08C(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_022 u32 v8; u32 v9; - sub_02019CB8(param1->unk_00, 3, 0, 21, 4, 5 * 2, 4 * 2, 0); + Bg_FillTilemapRect(param1->unk_00, 3, 0, 21, 4, 5 * 2, 4 * 2, 0); for (v0 = 0; v0 < 4; v0++) { for (v1 = 0; v1 < 5; v1++) { @@ -952,17 +952,17 @@ static void ov112_0225D1EC(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov112_022 for (v0 = 0; v0 < 3; v0++) { ov112_0225D408(¶m0->unk_00[v0], param1, v0, param2); - BGL_AddWindow(param1->unk_00, ¶m0->unk_60[v0], 3, 1, Unk_ov112_0225D804[v0], 30, 2, 7 + v0, 0x300 + ((30 * 2) * v0)); - BGL_FillWindow(¶m0->unk_60[v0], 0); - sub_0201A9A4(¶m0->unk_60[v0]); + Window_Add(param1->unk_00, ¶m0->unk_60[v0], 3, 1, Unk_ov112_0225D804[v0], 30, 2, 7 + v0, 0x300 + ((30 * 2) * v0)); + Window_FillTilemap(¶m0->unk_60[v0], 0); + Window_ScheduleCopyToVRAM(¶m0->unk_60[v0]); } param0->unk_90 = Strbuf_Init(256, param2); param0->unk_94 = sub_020071EC(param1->unk_1A4, 0, ¶m0->unk_98, param2); - sub_0201972C(0, &((u8 *)param0->unk_98->pRawData)[(7 * 0x20) + (7 * 2)], 0x4, (7 * 0x20) + (13 * 2)); - sub_0201972C(0, &((u8 *)param0->unk_98->pRawData)[(7 * 0x20) + (7 * 2)], 0x4, (8 * 0x20) + (13 * 2)); - sub_0201972C(0, &((u8 *)param0->unk_98->pRawData)[(7 * 0x20) + (7 * 2)], 0x4, (9 * 0x20) + (13 * 2)); + Bg_LoadPalette(0, &((u8 *)param0->unk_98->pRawData)[(7 * 0x20) + (7 * 2)], 0x4, (7 * 0x20) + (13 * 2)); + Bg_LoadPalette(0, &((u8 *)param0->unk_98->pRawData)[(7 * 0x20) + (7 * 2)], 0x4, (8 * 0x20) + (13 * 2)); + Bg_LoadPalette(0, &((u8 *)param0->unk_98->pRawData)[(7 * 0x20) + (7 * 2)], 0x4, (9 * 0x20) + (13 * 2)); } static void ov112_0225D2D0(UnkStruct_ov112_0225D2D0 *param0) @@ -973,7 +973,7 @@ static void ov112_0225D2D0(UnkStruct_ov112_0225D2D0 *param0) Strbuf_Free(param0->unk_90); for (v0 = 0; v0 < 3; v0++) { - BGL_DeleteWindow(¶m0->unk_60[v0]); + Window_Remove(¶m0->unk_60[v0]); ov112_0225D44C(¶m0->unk_00[v0]); } } @@ -1039,13 +1039,13 @@ static void ov112_0225D408(UnkStruct_ov112_0225D44C *param0, UnkStruct_ov112_022 param0->unk_08 = Strbuf_Init(256, param3); param0->unk_01 = 7 + param2; - BGL_AddWindow(param1->unk_00, ¶m0->unk_0C, 3, 0, 0, 180, 2, 7, 0); + Window_Add(param1->unk_00, ¶m0->unk_0C, 3, 0, 0, 180, 2, 7, 0); } static void ov112_0225D44C(UnkStruct_ov112_0225D44C *param0) { Strbuf_Free(param0->unk_08); - BGL_DeleteWindow(¶m0->unk_0C); + Window_Remove(¶m0->unk_0C); } static void ov112_0225D460(UnkStruct_ov112_0225D44C *param0, const Strbuf *param1, u32 param2, const UnkStruct_ov112_0225D180 *param3, const NNSG2dPaletteData *param4) @@ -1060,7 +1060,7 @@ static void ov112_0225D460(UnkStruct_ov112_0225D44C *param0, const Strbuf *param GF_ASSERT((180 * 8) >= param0->unk_06); - BGL_FillWindow(¶m0->unk_0C, 0); + Window_FillTilemap(¶m0->unk_0C, 0); Text_AddPrinterWithParams(¶m0->unk_0C, FONT_MESSAGE, param0->unk_08, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); param0->unk_1C = *param3; @@ -1108,9 +1108,9 @@ static void ov112_0225D4F8(const UnkStruct_ov112_0225D44C *param0, Window *param } } - BGL_WindowColor(param1, 0, 0, 0, 255, 2 * 8); - sub_0201AE08(param1, param0->unk_0C.pixels, v2, 0, 180 * 8, 2 * 8, v1, 0, v3, 2 * 8, 15); - sub_0201A9A4(param1); + Window_FillRectWithColor(param1, 0, 0, 0, 255, 2 * 8); + Window_BlitBitmapRectWithTransparency(param1, param0->unk_0C.pixels, v2, 0, 180 * 8, 2 * 8, v1, 0, v3, 2 * 8, 15); + Window_ScheduleCopyToVRAM(param1); } static void ov112_0225D57C(UnkStruct_ov112_0225D6DC *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2) @@ -1131,9 +1131,9 @@ static void ov112_0225D57C(UnkStruct_ov112_0225D6DC *param0, UnkStruct_ov112_022 for (v0 = 0; v0 < 4; v0++) { ov112_0225D73C(¶m0->unk_40[v0], Unk_ov112_0225D960[v0], Unk_ov112_0225D968[v0]); - BGL_AddWindow(param1->unk_00, ¶m0->unk_00[v0], 0, Unk_ov112_0225D880[v0].unk_00, Unk_ov112_0225D880[v0].unk_01, Unk_ov112_0225D880[v0].unk_02, Unk_ov112_0225D880[v0].unk_03, Unk_ov112_0225D880[v0].unk_06, Unk_ov112_0225D880[v0].unk_04); + Window_Add(param1->unk_00, ¶m0->unk_00[v0], 0, Unk_ov112_0225D880[v0].unk_00, Unk_ov112_0225D880[v0].unk_01, Unk_ov112_0225D880[v0].unk_02, Unk_ov112_0225D880[v0].unk_03, Unk_ov112_0225D880[v0].unk_06, Unk_ov112_0225D880[v0].unk_04); - BGL_FillWindow(¶m0->unk_00[v0], 0); + Window_FillTilemap(¶m0->unk_00[v0], 0); MessageLoader_GetStrbuf(v1, 0 + v0, v2); @@ -1158,7 +1158,7 @@ static void ov112_0225D57C(UnkStruct_ov112_0225D6DC *param0, UnkStruct_ov112_022 } Strbuf_Free(v4); - sub_0201A9A4(¶m0->unk_00[v0]); + Window_ScheduleCopyToVRAM(¶m0->unk_00[v0]); } Strbuf_Free(v2); MessageLoader_Free(v1); @@ -1169,7 +1169,7 @@ static void ov112_0225D6DC(UnkStruct_ov112_0225D6DC *param0) int v0; for (v0 = 0; v0 < 4; v0++) { - BGL_DeleteWindow(¶m0->unk_00[v0]); + Window_Remove(¶m0->unk_00[v0]); ov112_0225D75C(¶m0->unk_40[v0]); } } diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 4e3d7de94c..daf88c889f 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -380,7 +380,7 @@ int ov113_0225C700(OverlayManager *param0, int *param1) sub_02002F70(v0->unk_0C, 3, 0x200, 118); sub_02003858(v0->unk_0C, 1); - v0->unk_08 = sub_02018340(118); + v0->unk_08 = BgConfig_New(118); sub_0201DBEC(64, 118); SetAutorepeat(4, 8); @@ -507,7 +507,7 @@ int ov113_0225CA04(OverlayManager *param0, int *param1) } break; case 3: - BGL_FillWindow(&v0->unk_B4, 0xf); + Window_FillTilemap(&v0->unk_B4, 0xf); sub_0200E060(&v0->unk_B4, 0, 1, 14); MessageLoader_GetStrbuf(v0->unk_30, 2, v0->unk_C4); v0->unk_C8 = Text_AddPrinterWithParams(&v0->unk_B4, FONT_MESSAGE, v0->unk_C4, 0, 0, Options_TextFrameDelay(SaveData_Options(v0->unk_04)), NULL); @@ -557,7 +557,7 @@ int ov113_0225CA04(OverlayManager *param0, int *param1) } break; case 6: - BGL_FillWindow(&v0->unk_B4, 0xf); + Window_FillTilemap(&v0->unk_B4, 0xf); sub_0200E060(&v0->unk_B4, 0, 1, 14); MessageLoader_GetStrbuf(v0->unk_30, 3, v0->unk_C4); v0->unk_C8 = Text_AddPrinterWithParams(&v0->unk_B4, FONT_MESSAGE, v0->unk_C4, 0, 0, Options_TextFrameDelay(SaveData_Options(v0->unk_04)), NULL); @@ -696,7 +696,7 @@ static void ov113_0225CF18(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_0C); - sub_0201C2B8(v0->unk_08); + Bg_RunScheduledUpdates(v0->unk_08); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -736,7 +736,7 @@ static void ov113_0225CF58(BgConfig *param0) GX_BG0_AS_3D, }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -788,20 +788,20 @@ static void ov113_0225CF58(BgConfig *param0) }, }; - sub_020183C4(param0, 1, &v2[0], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 1, &v2[0], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); - sub_020183C4(param0, 2, &v2[1], 0); - sub_02019EBC(param0, 2); - sub_02019184(param0, 2, 0, 0); - sub_02019184(param0, 2, 3, 0); + Bg_InitFromTemplate(param0, 2, &v2[1], 0); + Bg_ClearTilemap(param0, 2); + Bg_SetOffset(param0, 2, 0, 0); + Bg_SetOffset(param0, 2, 3, 0); - sub_020183C4(param0, 3, &v2[2], 0); - sub_02019EBC(param0, 3); - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_InitFromTemplate(param0, 3, &v2[2], 0); + Bg_ClearTilemap(param0, 3); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); G2_SetBG0Priority(2); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -856,33 +856,33 @@ static void ov113_0225CF58(BgConfig *param0) }, }; - sub_020183C4(param0, 5, &v3[0], 0); - sub_02019EBC(param0, 5); - sub_02019184(param0, 5, 0, 0); - sub_02019184(param0, 5, 3, 0); + Bg_InitFromTemplate(param0, 5, &v3[0], 0); + Bg_ClearTilemap(param0, 5); + Bg_SetOffset(param0, 5, 0, 0); + Bg_SetOffset(param0, 5, 3, 0); - sub_020183C4(param0, 6, &v3[1], 0); - sub_02019EBC(param0, 6); - sub_02019184(param0, 6, 0, 0); - sub_02019184(param0, 6, 3, 0); + Bg_InitFromTemplate(param0, 6, &v3[1], 0); + Bg_ClearTilemap(param0, 6); + Bg_SetOffset(param0, 6, 0, 0); + Bg_SetOffset(param0, 6, 3, 0); - sub_020183C4(param0, 7, &v3[2], 0); - sub_02019EBC(param0, 7); - sub_02019184(param0, 7, 0, 0); - sub_02019184(param0, 7, 3, 0); + Bg_InitFromTemplate(param0, 7, &v3[2], 0); + Bg_ClearTilemap(param0, 7); + Bg_SetOffset(param0, 7, 0, 0); + Bg_SetOffset(param0, 7, 3, 0); } - sub_02019690(5, 32, 0, 118); + Bg_ClearTilesRange(5, 32, 0, 118); } static void ov113_0225D12C(BgConfig *param0) { - sub_02019044(param0, 6); - sub_02019044(param0, 5); - sub_02019044(param0, 7); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); + Bg_FreeTilemapBuffer(param0, 6); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 7); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); } static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1) @@ -904,7 +904,7 @@ static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1) sub_0200710C(param1, 21, param0->unk_08, 6, 0, 0, 0, 118); sub_0200710C(param1, 24, param0->unk_08, 7, 0, 0, 0, 118); - v1 = sub_02019FE4(param0->unk_08, 6); + v1 = Bg_GetTilemapBuffer(param0->unk_08, 6); MI_CpuCopy16(v1, param0->unk_9C0, 0x800); MI_CpuClear16(v1, 0x800); @@ -924,7 +924,7 @@ static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1) } } - sub_0201C3C0(param0->unk_08, 6); + Bg_ScheduleTilemapTransfer(param0->unk_08, 6); } static void ov113_0225D304(UnkStruct_ov113_0225DBCC *param0, NARC *param1) @@ -1095,7 +1095,7 @@ static void ov113_0225D7CC(UnkStruct_ov113_0225DBCC *param0) SpriteActor_EnableObject(param0->unk_954[v0], 0); for (v1 = 0; v1 < 4; v1++) { - sub_02019CB8(param0->unk_08, 2, Unk_ov113_022608AC[v1], 0 + 4 * v0, 0x14 + v1, 4, 1, 17); + Bg_FillTilemapRect(param0->unk_08, 2, Unk_ov113_022608AC[v1], 0 + 4 * v0, 0x14 + v1, 4, 1, 17); } } else { ov113_0225D938(param0->unk_8D8[v0].unk_02, param0->unk_8D8[v0].unk_08, param0->unk_954[v0], param0->unk_160, param0->unk_164, NNS_G2D_VRAM_TYPE_2DMAIN, param0->unk_19E0); @@ -1114,7 +1114,7 @@ static void ov113_0225D7CC(UnkStruct_ov113_0225DBCC *param0) } ov113_0225E0D4(param0, 0); - sub_0201C3C0(param0->unk_08, 2); + Bg_ScheduleTilemapTransfer(param0->unk_08, 2); } static BOOL ov113_0225D938(int param0, int param1, CellActorData *param2, NARC *param3, NARC *param4, NNS_G2D_VRAM_TYPE param5, BOOL param6) @@ -1252,12 +1252,12 @@ static void ov113_0225DBCC(UnkStruct_ov113_0225DBCC *param0) { int v0; - BGL_AddWindow(param0->unk_08, ¶m0->unk_B4, 1, 2, 1, 27, 4, 13, ((1 + (18 + 12)) + (29 * 4))); - BGL_FillWindow(¶m0->unk_B4, 0xf); + Window_Add(param0->unk_08, ¶m0->unk_B4, 1, 2, 1, 27, 4, 13, ((1 + (18 + 12)) + (29 * 4))); + Window_FillTilemap(¶m0->unk_B4, 0xf); for (v0 = 0; v0 < 8; v0++) { - BGL_AddWindow(param0->unk_08, ¶m0->unk_34[v0], 5, Unk_ov113_022608C8[v0][0], Unk_ov113_022608C8[v0][1], 8, 2, 13, (0x4000 / 0x20) + (8 * 2) * v0); - BGL_FillWindow(¶m0->unk_34[v0], 0x0); + Window_Add(param0->unk_08, ¶m0->unk_34[v0], 5, Unk_ov113_022608C8[v0][0], Unk_ov113_022608C8[v0][1], 8, 2, 13, (0x4000 / 0x20) + (8 * 2) * v0); + Window_FillTilemap(¶m0->unk_34[v0], 0x0); } } @@ -1265,10 +1265,10 @@ static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0) { int v0; - BGL_DeleteWindow(¶m0->unk_B4); + Window_Remove(¶m0->unk_B4); for (v0 = 0; v0 < 8; v0++) { - BGL_DeleteWindow(¶m0->unk_34[v0]); + Window_Remove(¶m0->unk_34[v0]); } } @@ -1393,13 +1393,13 @@ static int ov113_0225DE98(UnkStruct_ov113_0225DBCC *param0) u16 *v5; int v6, v7; - v5 = sub_02019FE4(param0->unk_08, 6); + v5 = Bg_GetTilemapBuffer(param0->unk_08, 6); for (v7 = Unk_ov113_02260AD4[v1][1]; v7 < Unk_ov113_02260AD4[v1][1] + Unk_ov113_02260AD4[v1][3]; v7++) { MI_CpuCopy16(¶m0->unk_9C0[v7 * 32 + Unk_ov113_02260AD4[v1][0]], &v5[v7 * 32 + Unk_ov113_02260AD4[v1][0]], Unk_ov113_02260AD4[v1][2] * 2); } - sub_0201C3C0(param0->unk_08, 6); + Bg_ScheduleTilemapTransfer(param0->unk_08, 6); } v2++; @@ -1410,8 +1410,8 @@ static int ov113_0225DE98(UnkStruct_ov113_0225DBCC *param0) param0->unk_9AC[v1] = 0; SpriteActor_EnableObject(param0->unk_970[v1], 0); - sub_02019CB8(param0->unk_08, 6, 0, Unk_ov113_02260AD4[v1][0], Unk_ov113_02260AD4[v1][1], Unk_ov113_02260AD4[v1][2], Unk_ov113_02260AD4[v1][3], 16); - sub_0201C3C0(param0->unk_08, 6); + Bg_FillTilemapRect(param0->unk_08, 6, 0, Unk_ov113_02260AD4[v1][0], Unk_ov113_02260AD4[v1][1], Unk_ov113_02260AD4[v1][2], Unk_ov113_02260AD4[v1][3], 16); + Bg_ScheduleTilemapTransfer(param0->unk_08, 6); v3++; } @@ -1522,7 +1522,7 @@ static void ov113_0225E15C(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_022 ov113_0225E264(param2, param3, &v7, &v8); Window_Init(&v1); - BGL_AddFramelessWindow(v5, &v1, v8, 16 / 8, 0, 0); + Window_AddToTopLeftCorner(v5, &v1, v8, 16 / 8, 0, 0); Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); v3 = sub_02012898(&v1, NNS_G2D_VRAM_TYPE_2DMAIN, 118); @@ -1551,7 +1551,7 @@ static void ov113_0225E15C(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_022 sub_02012AC0(v4, param5); sub_020128C4(v4, param7, param8); - BGL_DeleteWindow(&v1); + Window_Remove(&v1); param1->unk_00 = v4; param1->unk_04 = v2; diff --git a/src/overlay113/ov113_02260620.c b/src/overlay113/ov113_02260620.c index 913d4b1255..f182a134d9 100644 --- a/src/overlay113/ov113_02260620.c +++ b/src/overlay113/ov113_02260620.c @@ -94,7 +94,7 @@ void ov113_02260620(MessageLoader *param0, StringTemplate *param1, Window param2 v3 = Strbuf_Init(v5, 118); StringTemplate_Format(param1, v3, v2); - BGL_FillWindow(¶m2[v7], 0x0); + Window_FillTilemap(¶m2[v7], 0x0); if (ov66_0222E924(param3, v8) == 1) { v9 = TEXT_COLOR(7, 8, 0); @@ -103,7 +103,7 @@ void ov113_02260620(MessageLoader *param0, StringTemplate *param1, Window param2 } Text_AddPrinterWithParamsAndColor(¶m2[v7], FONT_SYSTEM, v3, 0, 0, TEXT_SPEED_INSTANT, v9, NULL); - sub_0201A954(¶m2[v7]); + Window_CopyToVRAM(¶m2[v7]); Strbuf_Free(v4); Strbuf_Free(v2); Strbuf_Free(v3); @@ -117,7 +117,7 @@ void ov113_02260714(Window param0[], u32 param1) return; } - sub_0201ACF4(¶m0[param1]); + Window_ClearAndCopyToVRAM(¶m0[param1]); } u16 ov113_0226072C(int param0, u32 param1) diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index c6282f1c21..a10fd92bea 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -1327,9 +1327,9 @@ static void ov114_0225CEB8(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_022 static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 param4) { - sub_02018368(param1); + SetAllGraphicsModes(param1); - param0->unk_00 = sub_02018340(param4); + param0->unk_00 = BgConfig_New(param4); param0->unk_04 = param2; param0->unk_08 = param3; @@ -1340,24 +1340,24 @@ static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes int v0; for (v0 = 0; v0 < param3; v0++) { - sub_020183C4(param0->unk_00, param2[v0].unk_00, ¶m2[v0].unk_04, 0); - sub_02019690(param2[v0].unk_00, 32, 0, param4); - sub_02019EBC(param0->unk_00, param2[v0].unk_00); - sub_02019184(param0->unk_00, param2[v0].unk_00, 0, 0); - sub_02019184(param0->unk_00, param2[v0].unk_00, 3, 0); + Bg_InitFromTemplate(param0->unk_00, param2[v0].unk_00, ¶m2[v0].unk_04, 0); + Bg_ClearTilesRange(param2[v0].unk_00, 32, 0, param4); + Bg_ClearTilemap(param0->unk_00, param2[v0].unk_00); + Bg_SetOffset(param0->unk_00, param2[v0].unk_00, 0, 0); + Bg_SetOffset(param0->unk_00, param2[v0].unk_00, 3, 0); } } } static void ov114_0225CF84(UnkStruct_ov114_0225CEF0 *param0) { - sub_02019184(param0->unk_00, 3, 3, 0); + Bg_SetOffset(param0->unk_00, 3, 3, 0); { int v0; for (v0 = 0; v0 < param0->unk_08; v0++) { - sub_02019044(param0->unk_00, param0->unk_04[v0].unk_00); + Bg_FreeTilemapBuffer(param0->unk_00, param0->unk_04[v0].unk_00); } } @@ -1366,7 +1366,7 @@ static void ov114_0225CF84(UnkStruct_ov114_0225CEF0 *param0) static void ov114_0225CFC0(UnkStruct_ov114_0225CEF0 *param0) { - sub_0201C2B8(param0->unk_00); + Bg_RunScheduledUpdates(param0->unk_00); } static void ov114_0225CFCC(UnkStruct_ov114_0225CFCC *param0, u32 param1, u32 param2, u32 param3, u32 param4) @@ -1539,8 +1539,8 @@ static void ov114_0225D290(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_022 v3 = 1; } - BGL_AddWindow(param1->unk_00, ¶m0->unk_00[v2], v1, 2, v3, 27, 4, 12, (1 + (18 + 12))); - BGL_FillWindow(¶m0->unk_00[v2], 0); + Window_Add(param1->unk_00, ¶m0->unk_00[v2], v1, 2, v3, 27, 4, 12, (1 + (18 + 12))); + Window_FillTilemap(¶m0->unk_00[v2], 0); param0->unk_24[v2] = Strbuf_Init(128, param4); } @@ -1555,7 +1555,7 @@ static void ov114_0225D338(UnkStruct_ov114_0225D338 *param0) for (v0 = 0; v0 < 2; v0++) { ov114_0225D400(param0, v0); Strbuf_Free(param0->unk_24[v0]); - BGL_DeleteWindow(¶m0->unk_00[v0]); + Window_Remove(¶m0->unk_00[v0]); } sub_02095A24(); @@ -1578,10 +1578,10 @@ static void ov114_0225D368(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_022 } ov114_0225D474(param0, param3); - BGL_FillWindow(¶m0->unk_00[param3], 15); + Window_FillTilemap(¶m0->unk_00[param3], 15); param0->unk_20[param3] = ov114_0225D218(param1, param2, ¶m0->unk_00[param3], param0->unk_24[param3], TEXT_SPEED_FAST); sub_0200E060(¶m0->unk_00[param3], 1, 1, 13); - sub_0201A9A4(¶m0->unk_00[param3]); + Window_ScheduleCopyToVRAM(¶m0->unk_00[param3]); } static void ov114_0225D400(UnkStruct_ov114_0225D338 *param0, u32 param1) @@ -1593,7 +1593,7 @@ static void ov114_0225D400(UnkStruct_ov114_0225D338 *param0, u32 param1) } sub_0200E084(¶m0->unk_00[param1], 1); - sub_0201AD10(¶m0->unk_00[param1]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_00[param1]); } static BOOL ov114_0225D43C(const UnkStruct_ov114_0225D338 *param0, u32 param1) @@ -1873,8 +1873,8 @@ static void ov114_0225D688(SysTask *param0, void *param1) ov114_0225D070(&v0->unk_84); - sub_0201C63C(v0->unk_30.unk_00, 3, 4, 2); - sub_0201C63C(v0->unk_30.unk_00, 5, 4, 2); + Bg_ScheduleScroll(v0->unk_30.unk_00, 3, 4, 2); + Bg_ScheduleScroll(v0->unk_30.unk_00, 5, 4, 2); } static void ov114_0225DA0C(SysTask *param0, void *param1) @@ -1952,11 +1952,11 @@ static void ov114_0225DAC0(UnkStruct_ov114_0225DAC0 *param0, u32 param1, u32 par break; } - BGL_SetPriority(1, 2); - BGL_SetPriority(0, 1); - BGL_AddWindow(param4->unk_00, ¶m0->unk_00, 0, 5, 1 + Unk_ov114_02260204[param1 - 1].unk_00[v0], 26, 4, 12, 513 + ((26 * 4) * param5)); - BGL_FillWindow(¶m0->unk_00, 0); - sub_020198E8(param4->unk_00, 1, 0, Unk_ov114_02260204[param1 - 1].unk_00[v0], 32, 6, param3->rawData, 0, Unk_ov114_02260204[param1 - 1].unk_04[param5], param3->screenWidth / 8, param3->screenHeight / 8); + Bg_SetPriority(1, 2); + Bg_SetPriority(0, 1); + Window_Add(param4->unk_00, ¶m0->unk_00, 0, 5, 1 + Unk_ov114_02260204[param1 - 1].unk_00[v0], 26, 4, 12, 513 + ((26 * 4) * param5)); + Window_FillTilemap(¶m0->unk_00, 0); + Bg_CopyToTilemapRect(param4->unk_00, 1, 0, Unk_ov114_02260204[param1 - 1].unk_00[v0], 32, 6, param3->rawData, 0, Unk_ov114_02260204[param1 - 1].unk_04[param5], param3->screenWidth / 8, param3->screenHeight / 8); { u8 v1; @@ -2039,8 +2039,8 @@ static void ov114_0225DD2C(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_022 static void ov114_0225DD80(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_0225CEF0 *param1) { - sub_0201A9A4(¶m0->unk_00); - sub_0201C3C0(param1->unk_00, 1); + Window_ScheduleCopyToVRAM(¶m0->unk_00); + Bg_ScheduleTilemapTransfer(param1->unk_00, 1); } static void ov114_0225DD94(UnkStruct_ov114_0225DAC0 *param0) @@ -2060,8 +2060,8 @@ static void ov114_0225DDA0(UnkStruct_ov114_0225DAC0 *param0) param0->unk_14 = NULL; } - if (BGL_WindowAdded(¶m0->unk_00) == 1) { - BGL_DeleteWindow(¶m0->unk_00); + if (Window_IsInUse(¶m0->unk_00) == 1) { + Window_Remove(¶m0->unk_00); } } @@ -2164,8 +2164,8 @@ static void ov114_0225DF7C(UnkStruct_ov114_0225DFFC *param0, UnkStruct_ov114_022 param0->unk_00 = param1; - sub_02019184(param0->unk_00->unk_00, 0, 0, -255); - sub_02019184(param0->unk_00->unk_00, 1, 0, -255); + Bg_SetOffset(param0->unk_00->unk_00, 0, 0, -255); + Bg_SetOffset(param0->unk_00->unk_00, 1, 0, -255); for (v0 = 0; v0 < 2; v0++) { MI_CpuFill16(¶m0->unk_04[v0], -255, sizeof(s16) * 192); @@ -2235,8 +2235,8 @@ static void ov114_0225E0AC(void *param0) v2 = BufferManager_GetReadBuffer(v0->bufferManager); if (GX_IsHBlank()) { - sub_02019184(v0->unk_00->unk_00, 0, 0, v2[v1]); - sub_02019184(v0->unk_00->unk_00, 1, 0, v2[v1]); + Bg_SetOffset(v0->unk_00->unk_00, 0, 0, v2[v1]); + Bg_SetOffset(v0->unk_00->unk_00, 1, 0, v2[v1]); } } @@ -2289,8 +2289,8 @@ u32 ov114_0225E180(u32 param0) static void ov114_0225E1A4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, NARC *param4, u32 param5) { - BGL_AddWindow(param1->unk_00, ¶m0->unk_00, 1, 6, 11, 20, 10, 8, 513); - BGL_FillWindow(¶m0->unk_00, 0); + Window_Add(param1->unk_00, ¶m0->unk_00, 1, 6, 11, 20, 10, 8, 513); + Window_FillTilemap(¶m0->unk_00, 0); param0->unk_14 = Strbuf_Init(128, param5); ov114_0225D180(param2, param3); @@ -2304,7 +2304,7 @@ static void ov114_0225E1A4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_022 static void ov114_0225E234(UnkStruct_ov114_0225E1A4 *param0) { - BGL_DeleteWindow(¶m0->unk_00); + Window_Remove(¶m0->unk_00); Strbuf_Free(param0->unk_14); } @@ -2397,13 +2397,13 @@ static BOOL ov114_0225E438(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_022 } break; case 1: - sub_0201ACF4(¶m0->unk_00); + Window_ClearAndCopyToVRAM(¶m0->unk_00); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); ov114_0225E4B0(param0, param1, 0); - sub_02019EBC(param1->unk_00, 0); - sub_02019EBC(param1->unk_00, 1); + Bg_ClearTilemap(param1->unk_00, 0); + Bg_ClearTilemap(param1->unk_00, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); return 1; } @@ -2416,12 +2416,12 @@ static void ov114_0225E4B0(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_022 switch (param0->unk_10) { case UnkEnum_ov66_022324D0_00: case UnkEnum_ov66_022324D0_01: - sub_02019184(param1->unk_00, 0, 0, param2); - sub_02019184(param1->unk_00, 1, 0, param2); + Bg_SetOffset(param1->unk_00, 0, 0, param2); + Bg_SetOffset(param1->unk_00, 1, 0, param2); break; case UnkEnum_ov66_022324D0_02: - sub_02019184(param1->unk_00, 0, 3, param2); - sub_02019184(param1->unk_00, 1, 3, param2); + Bg_SetOffset(param1->unk_00, 0, 3, param2); + Bg_SetOffset(param1->unk_00, 1, 3, param2); break; default: GF_ASSERT(0); @@ -2434,12 +2434,12 @@ static void ov114_0225E500(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_022 switch (param0->unk_10) { case UnkEnum_ov66_022324D0_00: case UnkEnum_ov66_022324D0_01: - sub_0201C63C(param1->unk_00, 0, 0, param2); - sub_0201C63C(param1->unk_00, 1, 0, param2); + Bg_ScheduleScroll(param1->unk_00, 0, 0, param2); + Bg_ScheduleScroll(param1->unk_00, 1, 0, param2); break; case UnkEnum_ov66_022324D0_02: - sub_0201C63C(param1->unk_00, 0, 3, param2); - sub_0201C63C(param1->unk_00, 1, 3, param2); + Bg_ScheduleScroll(param1->unk_00, 0, 3, param2); + Bg_ScheduleScroll(param1->unk_00, 1, 3, param2); break; default: GF_ASSERT(0); @@ -2903,8 +2903,8 @@ static void ov114_0225E874(SysTask *param0, void *param1) ov114_0225F19C(v0); ov114_0225D070(&v0->unk_A0); - sub_0201C63C(v0->unk_4C.unk_00, 3, 4, 2); - sub_0201C63C(v0->unk_4C.unk_00, 5, 4, 2); + Bg_ScheduleScroll(v0->unk_4C.unk_00, 3, 4, 2); + Bg_ScheduleScroll(v0->unk_4C.unk_00, 5, 4, 2); } static void ov114_0225ED40(SysTask *param0, void *param1) @@ -3126,8 +3126,8 @@ static void ov114_0225ED40(SysTask *param0, void *param1) ov114_0225F19C(v0); ov114_0225D070(&v0->unk_A0); - sub_0201C63C(v0->unk_4C.unk_00, 3, 4, 2); - sub_0201C63C(v0->unk_4C.unk_00, 5, 4, 2); + Bg_ScheduleScroll(v0->unk_4C.unk_00, 3, 4, 2); + Bg_ScheduleScroll(v0->unk_4C.unk_00, 5, 4, 2); } static void ov114_0225F124(SysTask *param0, void *param1) @@ -3430,9 +3430,9 @@ static BOOL ov114_0225F5AC(UnkStruct_ov114_0225F578 *param0, UnkStruct_ov114_022 case 0: ov114_0225CCB0(param0->unk_04, ((1 + (18 + 12)) + (27 * 4))); - sub_020198C0(param1->unk_00, 2, param0->unk_04->rawData, 0, 0, 32, 20); - sub_02019E2C(param1->unk_00, 2, 0, 0, 32, 20, (13 + 1)); - sub_0201C3C0(param1->unk_00, 2); + Bg_LoadToTilemapRect(param1->unk_00, 2, param0->unk_04->rawData, 0, 0, 32, 20); + Bg_ChangeTilemapRectPalette(param1->unk_00, 2, 0, 0, 32, 20, (13 + 1)); + Bg_ScheduleTilemapTransfer(param1->unk_00, 2); param0->unk_48++; break; case 1: diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index 85af69916d..b2a29e4588 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -983,7 +983,7 @@ BOOL ov115_022610D4(UnkStruct_ov115_02260D78 *param0) void ov115_022611C8(UnkStruct_ov115_02260D78 *param0) { - sub_0201C2B8(param0->unk_1AB4.unk_00); + Bg_RunScheduledUpdates(param0->unk_1AB4.unk_00); sub_0201DCAC(); sub_0200A858(); } @@ -1423,8 +1423,8 @@ static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_022 memset(param0, 0, sizeof(UnkStruct_ov115_022617E8)); - BGL_AddWindow(param1->unk_00, ¶m0->unk_0C, 1, 2, 19, 28, 4, 5, (1 + 9)); - BGL_WindowColor(¶m0->unk_0C, 15, 0, 0, 28 * 8, 4 * 8); + Window_Add(param1->unk_00, ¶m0->unk_0C, 1, 2, 19, 28, 4, 5, (1 + 9)); + Window_FillRectWithColor(¶m0->unk_0C, 15, 0, 0, 28 * 8, 4 * 8); v0 = Strbuf_Init(128, param6); @@ -1446,7 +1446,7 @@ static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_022 u32 v10; Window_Init(&v5); - BGL_AddWindow(param1->unk_00, &v5, 2, 0, 0, 8, 2, 5, 256); + Window_Add(param1->unk_00, &v5, 2, 0, 0, 8, 2, 5, 256); v6 = 256; v7 = Strbuf_Init(128, param6); @@ -1456,8 +1456,8 @@ static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_022 v3 = Unk_ov115_02265CA4[param4][param3 - 1][v2].unk_00; v4 = Unk_ov115_02265CA4[param4][param3 - 1][v2].unk_04; - sub_02019E2C(param1->unk_00, 2, v3 - 1, v4 - 1, 10, 4, 0 + v2); - BGL_FillWindow(&v5, 15); + Bg_ChangeTilemapRectPalette(param1->unk_00, 2, v3 - 1, v4 - 1, 10, 4, 0 + v2); + Window_FillTilemap(&v5, 15); if (param2->unk_18[v2] == 1) { v8 = TEXT_COLOR(5, 6, 15); @@ -1466,8 +1466,8 @@ static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_022 } TrainerInfo_NameStrbuf(param2->unk_08[v2], v7); - sub_0201C2AC(&v5, v3); - sub_0201C2B0(&v5, v4); + Window_SetXPos(&v5, v3); + Window_SetYPos(&v5, v4); v5.baseTile = v6; v9 = Font_CalcStrbufWidth(FONT_SYSTEM, v7, 0); @@ -1478,7 +1478,7 @@ static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_022 } Strbuf_Free(v7); - BGL_DeleteWindow(&v5); + Window_Remove(&v5); } param0->unk_04 = 0; @@ -1489,7 +1489,7 @@ static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_022 static void ov115_02261A04(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1) { - BGL_DeleteWindow(¶m0->unk_0C); + Window_Remove(¶m0->unk_0C); } static void ov115_02261A10(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1) @@ -1516,7 +1516,7 @@ static BOOL ov115_02261A3C(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_022 static void ov115_02261A54(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1) { Window_Clear(¶m0->unk_0C, 1); - sub_0201AD10(¶m0->unk_0C); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_0C); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } @@ -2989,7 +2989,7 @@ static void ov115_0226369C(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov1 static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) { - param0->unk_00 = sub_02018340(param1); + param0->unk_00 = BgConfig_New(param1); { GraphicsModes v0 = { @@ -2999,7 +2999,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) GX_BG0_AS_3D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -3019,9 +3019,9 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) 0 }; - sub_020183C4(param0->unk_00, 1, &v1, 0); - sub_02019690(1, 32, 0, param1); - sub_02019EBC(param0->unk_00, 1); + Bg_InitFromTemplate(param0->unk_00, 1, &v1, 0); + Bg_ClearTilesRange(1, 32, 0, param1); + Bg_ClearTilemap(param0->unk_00, 1); } { @@ -3041,9 +3041,9 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) 0 }; - sub_020183C4(param0->unk_00, 2, &v2, 0); - sub_02019690(2, 32, 0, param1); - sub_02019EBC(param0->unk_00, 2); + Bg_InitFromTemplate(param0->unk_00, 2, &v2, 0); + Bg_ClearTilesRange(2, 32, 0, param1); + Bg_ClearTilemap(param0->unk_00, 2); } { @@ -3063,9 +3063,9 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) 0 }; - sub_020183C4(param0->unk_00, 4, &v3, 0); - sub_02019690(4, 32, 0, param1); - sub_02019EBC(param0->unk_00, 4); + Bg_InitFromTemplate(param0->unk_00, 4, &v3, 0); + Bg_ClearTilesRange(4, 32, 0, param1); + Bg_ClearTilemap(param0->unk_00, 4); } { @@ -3085,9 +3085,9 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) 0 }; - sub_020183C4(param0->unk_00, 5, &v4, 0); - sub_02019690(5, 32, 0, param1); - sub_02019EBC(param0->unk_00, 5); + Bg_InitFromTemplate(param0->unk_00, 5, &v4, 0); + Bg_ClearTilesRange(5, 32, 0, param1); + Bg_ClearTilemap(param0->unk_00, 5); } { @@ -3107,9 +3107,9 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) 0 }; - sub_020183C4(param0->unk_00, 6, &v5, 0); - sub_02019690(6, 32, 0, param1); - sub_02019EBC(param0->unk_00, 6); + Bg_InitFromTemplate(param0->unk_00, 6, &v5, 0); + Bg_ClearTilesRange(6, 32, 0, param1); + Bg_ClearTilemap(param0->unk_00, 6); } { @@ -3129,9 +3129,9 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) 0 }; - sub_020183C4(param0->unk_00, 7, &v6, 0); - sub_02019690(7, 32, 0, param1); - sub_02019EBC(param0->unk_00, 7); + Bg_InitFromTemplate(param0->unk_00, 7, &v6, 0); + Bg_ClearTilesRange(7, 32, 0, param1); + Bg_ClearTilemap(param0->unk_00, 7); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -3150,12 +3150,12 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) static void ov115_02263954(UnkStruct_ov115_02261ADC *param0) { - sub_02019044(param0->unk_00, 1); - sub_02019044(param0->unk_00, 2); - sub_02019044(param0->unk_00, 4); - sub_02019044(param0->unk_00, 5); - sub_02019044(param0->unk_00, 6); - sub_02019044(param0->unk_00, 7); + Bg_FreeTilemapBuffer(param0->unk_00, 1); + Bg_FreeTilemapBuffer(param0->unk_00, 2); + Bg_FreeTilemapBuffer(param0->unk_00, 4); + Bg_FreeTilemapBuffer(param0->unk_00, 5); + Bg_FreeTilemapBuffer(param0->unk_00, 6); + Bg_FreeTilemapBuffer(param0->unk_00, 7); Heap_FreeToHeap(param0->unk_00); } @@ -3308,14 +3308,14 @@ static void ov115_02263CD8(UnkStruct_ov115_02261ADC *param0, NARC *param1, u32 p sub_0200710C(param1, 16, param0->unk_00, 5, 0, 0, 0, param3); sub_0200710C(param1, 17, param0->unk_00, 4, 0, 0, 0, param3); sub_02007130(param1, 13, 4, 0, 12 * 32, param3); - sub_02019E2C(param0->unk_00, 7, 0, 0, 32, 32, v0[param2]); - sub_02019E2C(param0->unk_00, 6, 0, 0, 32, 32, 2 + (param2 * 2)); - sub_02019E2C(param0->unk_00, 5, 0, 0, 32, 32, 1 + (param2 * 2)); - sub_02019E2C(param0->unk_00, 4, 0, 0, 32, 32, 1 + (param2 * 2)); - sub_02019448(param0->unk_00, 4); - sub_02019448(param0->unk_00, 5); - sub_02019448(param0->unk_00, 6); - sub_02019448(param0->unk_00, 7); + Bg_ChangeTilemapRectPalette(param0->unk_00, 7, 0, 0, 32, 32, v0[param2]); + Bg_ChangeTilemapRectPalette(param0->unk_00, 6, 0, 0, 32, 32, 2 + (param2 * 2)); + Bg_ChangeTilemapRectPalette(param0->unk_00, 5, 0, 0, 32, 32, 1 + (param2 * 2)); + Bg_ChangeTilemapRectPalette(param0->unk_00, 4, 0, 0, 32, 32, 1 + (param2 * 2)); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 4); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 5); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 6); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, 7); } static void ov115_02263DF4(UnkStruct_ov115_02261ADC *param0) @@ -4373,15 +4373,15 @@ static void ov115_022653F4(UnkStruct_ov115_02261ADC *param0, s16 param1, u16 par v1 += 4; - BGL_SetPriority(v1, (2 - v0)); + Bg_SetPriority(v1, (2 - v0)); if (v0 == 0) { - sub_02019E2C(param0->unk_00, v1, 0, 0, 32, 32, 2 + (param2 * 2)); + Bg_ChangeTilemapRectPalette(param0->unk_00, v1, 0, 0, 32, 32, 2 + (param2 * 2)); } else { - sub_02019E2C(param0->unk_00, v1, 0, 0, 32, 32, 1 + (param2 * 2)); + Bg_ChangeTilemapRectPalette(param0->unk_00, v1, 0, 0, 32, 32, 1 + (param2 * 2)); } - sub_02019448(param0->unk_00, v1); + Bg_CopyTilemapBufferToVRAM(param0->unk_00, v1); } } @@ -4428,7 +4428,7 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022 UnkStruct_020127E8 v4; param0->unk_5C = Strbuf_Init(16, param3); - BGL_AddFramelessWindow(param1->unk_00, ¶m0->unk_38, 3, 2, 0, 0); + Window_AddToTopLeftCorner(param1->unk_00, ¶m0->unk_38, 3, 2, 0, 0); param0->unk_4C = sub_02012B20(¶m0->unk_38, param3); v2 = sub_02012B58(param0->unk_4C, NNS_G2D_VRAM_TYPE_2DMAIN); @@ -4457,7 +4457,7 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022 param0->unk_48 = sub_02012B60(&v4, param0->unk_4C); sub_020129D0(param0->unk_48, 0); - BGL_DeleteWindow(¶m0->unk_38); + Window_Remove(¶m0->unk_38); } ov115_02261304(¶m0->unk_64, (-FX32_CONST(64)), (FX32_CONST(32)), (FX32_CONST(36)), 8); @@ -4494,10 +4494,10 @@ static void ov115_02265700(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022 { { Strbuf_FormatInt(param0->unk_5C, param2, 2, 2, 1); - BGL_AddFramelessWindow(param1->unk_00, ¶m0->unk_38, 3, 2, 0, 0); + Window_AddToTopLeftCorner(param1->unk_00, ¶m0->unk_38, 3, 2, 0, 0); Text_AddPrinterWithParamsAndColor(¶m0->unk_38, FONT_SYSTEM, param0->unk_5C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); sub_02012BE0(param0->unk_48, param0->unk_4C, ¶m0->unk_38, param0->unk_9C); - BGL_DeleteWindow(¶m0->unk_38); + Window_Remove(¶m0->unk_38); } sub_020129D0(param0->unk_48, 1); @@ -4523,10 +4523,10 @@ static void ov115_022657A8(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022 if (param0->unk_98 != 3) { { Strbuf_FormatInt(param0->unk_5C, param2, 2, 2, 1); - BGL_AddFramelessWindow(param1->unk_00, ¶m0->unk_38, 3, 2, 0, 0); + Window_AddToTopLeftCorner(param1->unk_00, ¶m0->unk_38, 3, 2, 0, 0); Text_AddPrinterWithParamsAndColor(¶m0->unk_38, FONT_SYSTEM, param0->unk_5C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); sub_02012BE0(param0->unk_48, param0->unk_4C, ¶m0->unk_38, param0->unk_9C); - BGL_DeleteWindow(¶m0->unk_38); + Window_Remove(¶m0->unk_38); } param0->unk_96 = 0; diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c index c231dcba12..21ef2aad61 100644 --- a/src/overlay116/ov116_022604C4.c +++ b/src/overlay116/ov116_022604C4.c @@ -762,7 +762,7 @@ static void ov116_022612CC(UnkStruct_ov116_0226139C *param0) { param0->unk_48.unk_00 = NARC_ctor(NARC_INDEX_ARC__MANENE, 106); param0->unk_48.unk_04 = NARC_ctor(NARC_INDEX_GRAPHIC__BUCKET, 106); - param0->unk_48.unk_10 = sub_02018340(106); + param0->unk_48.unk_10 = BgConfig_New(106); param0->unk_48.unk_14 = sub_02002F38(106); param0->unk_48.unk_18 = sub_02024220(106, 0, 1, 0, 4, NULL); param0->unk_48.camera = Camera_Alloc(106); @@ -809,14 +809,14 @@ void ov116_0226139C(UnkStruct_ov116_0226139C *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); - sub_02019044(param0->unk_48.unk_10, 0); - sub_02019044(param0->unk_48.unk_10, 1); - sub_02019044(param0->unk_48.unk_10, 2); - sub_02019044(param0->unk_48.unk_10, 3); - sub_02019044(param0->unk_48.unk_10, 4); - sub_02019044(param0->unk_48.unk_10, 5); - sub_02019044(param0->unk_48.unk_10, 6); - sub_02019044(param0->unk_48.unk_10, 7); + Bg_FreeTilemapBuffer(param0->unk_48.unk_10, 0); + Bg_FreeTilemapBuffer(param0->unk_48.unk_10, 1); + Bg_FreeTilemapBuffer(param0->unk_48.unk_10, 2); + Bg_FreeTilemapBuffer(param0->unk_48.unk_10, 3); + Bg_FreeTilemapBuffer(param0->unk_48.unk_10, 4); + Bg_FreeTilemapBuffer(param0->unk_48.unk_10, 5); + Bg_FreeTilemapBuffer(param0->unk_48.unk_10, 6); + Bg_FreeTilemapBuffer(param0->unk_48.unk_10, 7); Heap_FreeToHeap(param0->unk_48.unk_10); sub_02002FA0(param0->unk_48.unk_14, 0); sub_02002FA0(param0->unk_48.unk_14, 1); @@ -846,7 +846,7 @@ static void ov116_02261494(BgConfig *param0) GX_BGMODE_0, GX_BG0_AS_3D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { UnkStruct_02099F80 v1 = { @@ -932,16 +932,16 @@ static void ov116_02261494(BgConfig *param0) }, }; - sub_02019690(1, 32, 0, 106); - sub_02019690(2, 32, 0, 106); - sub_02019690(3, 32, 0, 106); - sub_020183C4(param0, 1, &v2[1], 0); - sub_020183C4(param0, 2, &v2[2], 0); - sub_020183C4(param0, 3, &v2[3], 0); - sub_02019EBC(param0, 0); - sub_02019EBC(param0, 1); - sub_02019EBC(param0, 2); - sub_02019EBC(param0, 3); + Bg_ClearTilesRange(1, 32, 0, 106); + Bg_ClearTilesRange(2, 32, 0, 106); + Bg_ClearTilesRange(3, 32, 0, 106); + Bg_InitFromTemplate(param0, 1, &v2[1], 0); + Bg_InitFromTemplate(param0, 2, &v2[2], 0); + Bg_InitFromTemplate(param0, 3, &v2[3], 0); + Bg_ClearTilemap(param0, 0); + Bg_ClearTilemap(param0, 1); + Bg_ClearTilemap(param0, 2); + Bg_ClearTilemap(param0, 3); } { BgTemplate v3[] = { @@ -1007,24 +1007,24 @@ static void ov116_02261494(BgConfig *param0) }, }; - sub_02019690(4, 32, 0, 106); - sub_02019690(5, 32, 0, 106); - sub_02019690(6, 32, 0, 106); - sub_02019690(7, 32, 0, 106); - sub_020183C4(param0, 4, &v3[0], 0); - sub_020183C4(param0, 5, &v3[1], 0); - sub_020183C4(param0, 6, &v3[2], 0); - sub_020183C4(param0, 7, &v3[3], 0); - sub_02019EBC(param0, 4); - sub_02019EBC(param0, 5); - sub_02019EBC(param0, 6); - sub_02019EBC(param0, 7); + Bg_ClearTilesRange(4, 32, 0, 106); + Bg_ClearTilesRange(5, 32, 0, 106); + Bg_ClearTilesRange(6, 32, 0, 106); + Bg_ClearTilesRange(7, 32, 0, 106); + Bg_InitFromTemplate(param0, 4, &v3[0], 0); + Bg_InitFromTemplate(param0, 5, &v3[1], 0); + Bg_InitFromTemplate(param0, 6, &v3[2], 0); + Bg_InitFromTemplate(param0, 7, &v3[3], 0); + Bg_ClearTilemap(param0, 4); + Bg_ClearTilemap(param0, 5); + Bg_ClearTilemap(param0, 6); + Bg_ClearTilemap(param0, 7); } - sub_02019690(4, 32, 0, 106); - sub_02019690(5, 32, 0, 106); - sub_02019690(6, 32, 0, 106); - sub_02019690(7, 32, 0, 106); + Bg_ClearTilesRange(4, 32, 0, 106); + Bg_ClearTilesRange(5, 32, 0, 106); + Bg_ClearTilesRange(6, 32, 0, 106); + Bg_ClearTilesRange(7, 32, 0, 106); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); @@ -1110,7 +1110,7 @@ static void ov116_02261794(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_48.unk_14); - sub_0201C2B8(v0->unk_48.unk_10); + Bg_RunScheduledUpdates(v0->unk_48.unk_10); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c index ecb658bf89..7f6d742a50 100644 --- a/src/overlay116/ov116_02261870.c +++ b/src/overlay116/ov116_02261870.c @@ -395,8 +395,8 @@ void ov116_02261F3C(UnkStruct_ov116_02262A8C *param0) void ov116_02261F70(UnkStruct_ov116_02262A8C *param0) { Window_Init(¶m0->unk_1FC8); - BGL_AddWindow(param0->unk_14->unk_10, ¶m0->unk_1FC8, 7, 2, 19, 28, 4, 14, 256 + (16 * 3)); - BGL_FillWindow(¶m0->unk_1FC8, 0xFF); + Window_Add(param0->unk_14->unk_10, ¶m0->unk_1FC8, 7, 2, 19, 28, 4, 14, 256 + (16 * 3)); + Window_FillTilemap(¶m0->unk_1FC8, 0xFF); { MessageLoader *v0; @@ -411,15 +411,15 @@ void ov116_02261F70(UnkStruct_ov116_02262A8C *param0) } Window_Show(¶m0->unk_1FC8, 0, 180, 13); - sub_0201A954(¶m0->unk_1FC8); + Window_CopyToVRAM(¶m0->unk_1FC8); } void ov116_02262004(UnkStruct_ov116_02262A8C *param0) { - if (BGL_WindowAdded(¶m0->unk_1FC8) == 1) { + if (Window_IsInUse(¶m0->unk_1FC8) == 1) { Window_Clear(¶m0->unk_1FC8, 1); - sub_0201ACF4(¶m0->unk_1FC8); - BGL_DeleteWindow(¶m0->unk_1FC8); + Window_ClearAndCopyToVRAM(¶m0->unk_1FC8); + Window_Remove(¶m0->unk_1FC8); } } @@ -465,7 +465,7 @@ void ov116_02262034(UnkStruct_ov116_0226139C *param0, int param1) static int ov116_0226208C(Window *param0, Strbuf *param1) { int v0 = Font_CalcStrbufWidth(FONT_SYSTEM, param1, 0); - int v1 = (sub_0201C294(param0) * 8 - v0) / 2; + int v1 = (Window_GetWidth(param0) * 8 - v0) / 2; return v1; } @@ -527,9 +527,9 @@ void ov116_022620AC(UnkStruct_ov116_0226139C *param0, UnkStruct_ov116_02262A8C * v7 = v4[param1->unk_04 - 2][v1][2]; v8 = v4[param1->unk_04 - 2][v1][3]; - BGL_AddWindow(param1->unk_14->unk_10, v3, 7, v5, v6, v7, v8, 14, v2); + Window_Add(param1->unk_14->unk_10, v3, 7, v5, v6, v7, v8, 14, v2); v2 += (v7 * v8); - BGL_FillWindow(v3, 0xFF); + Window_FillTilemap(v3, 0xFF); { Strbuf *v11; @@ -547,7 +547,7 @@ void ov116_022620AC(UnkStruct_ov116_0226139C *param0, UnkStruct_ov116_02262A8C * Strbuf_Free(v11); } - sub_0201A954(v3); + Window_CopyToVRAM(v3); v1++; } } @@ -563,10 +563,10 @@ void ov116_02262264(UnkStruct_ov116_02262A8C *param0) continue; } - if (BGL_WindowAdded(¶m0->unk_1FD8[v1]) == 1) { + if (Window_IsInUse(¶m0->unk_1FD8[v1]) == 1) { Window_Clear(¶m0->unk_1FD8[v1], 1); - sub_0201ACF4(¶m0->unk_1FD8[v1]); - BGL_DeleteWindow(¶m0->unk_1FD8[v1]); + Window_ClearAndCopyToVRAM(¶m0->unk_1FD8[v1]); + Window_Remove(¶m0->unk_1FD8[v1]); } v1++; diff --git a/src/overlay116/ov116_0226432C.c b/src/overlay116/ov116_0226432C.c index 79c8f202ca..43317e7252 100644 --- a/src/overlay116/ov116_0226432C.c +++ b/src/overlay116/ov116_0226432C.c @@ -972,11 +972,11 @@ static void ov116_022655DC(UnkStruct_ov116_022660A8 *param0) v2[v3] = ov116_02264774(¶m0->unk_34[v3]); } - sub_0201C63C(param0->unk_30->unk_10, 7, 3, param0->unk_34[0].unk_00 >> FX32_SHIFT); - sub_0201C63C(param0->unk_30->unk_10, 5, 0, param0->unk_34[1].unk_00 >> FX32_SHIFT); - sub_0201C63C(param0->unk_30->unk_10, 6, 0, param0->unk_34[2].unk_00 >> FX32_SHIFT); - sub_0201C63C(param0->unk_30->unk_10, 1, 0, param0->unk_34[1].unk_00 >> FX32_SHIFT); - sub_0201C63C(param0->unk_30->unk_10, 2, 0, param0->unk_34[2].unk_00 >> FX32_SHIFT); + Bg_ScheduleScroll(param0->unk_30->unk_10, 7, 3, param0->unk_34[0].unk_00 >> FX32_SHIFT); + Bg_ScheduleScroll(param0->unk_30->unk_10, 5, 0, param0->unk_34[1].unk_00 >> FX32_SHIFT); + Bg_ScheduleScroll(param0->unk_30->unk_10, 6, 0, param0->unk_34[2].unk_00 >> FX32_SHIFT); + Bg_ScheduleScroll(param0->unk_30->unk_10, 1, 0, param0->unk_34[1].unk_00 >> FX32_SHIFT); + Bg_ScheduleScroll(param0->unk_30->unk_10, 2, 0, param0->unk_34[2].unk_00 >> FX32_SHIFT); if (v2[0] && v2[1] && v2[2]) { param0->unk_24++; @@ -1018,11 +1018,11 @@ static void ov116_02265754(UnkStruct_ov116_022660A8 *param0) v2[v3] = ov116_02264774(¶m0->unk_34[v3]); } - sub_0201C63C(param0->unk_30->unk_10, 7, 3, param0->unk_34[0].unk_00 >> FX32_SHIFT); - sub_0201C63C(param0->unk_30->unk_10, 5, 0, param0->unk_34[1].unk_00 >> FX32_SHIFT); - sub_0201C63C(param0->unk_30->unk_10, 6, 0, param0->unk_34[2].unk_00 >> FX32_SHIFT); - sub_0201C63C(param0->unk_30->unk_10, 1, 0, param0->unk_34[1].unk_00 >> FX32_SHIFT); - sub_0201C63C(param0->unk_30->unk_10, 2, 0, param0->unk_34[2].unk_00 >> FX32_SHIFT); + Bg_ScheduleScroll(param0->unk_30->unk_10, 7, 3, param0->unk_34[0].unk_00 >> FX32_SHIFT); + Bg_ScheduleScroll(param0->unk_30->unk_10, 5, 0, param0->unk_34[1].unk_00 >> FX32_SHIFT); + Bg_ScheduleScroll(param0->unk_30->unk_10, 6, 0, param0->unk_34[2].unk_00 >> FX32_SHIFT); + Bg_ScheduleScroll(param0->unk_30->unk_10, 1, 0, param0->unk_34[1].unk_00 >> FX32_SHIFT); + Bg_ScheduleScroll(param0->unk_30->unk_10, 2, 0, param0->unk_34[2].unk_00 >> FX32_SHIFT); if (v2[0] && v2[1] && v2[2]) { param0->unk_24++; diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index 563cc8ec74..3caf4580a8 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -209,7 +209,7 @@ int ov117_02260668(OverlayManager *param0, int *param1) sub_02002F70(v0->unk_8C, 2, (((16 - 2) * 16) * sizeof(u16)), 110); sub_02002F70(v0->unk_8C, 3, 0x200, 110); - v0->unk_2C = sub_02018340(110); + v0->unk_2C = BgConfig_New(110); sub_0201DBEC(64, 110); SetAutorepeat(4, 8); @@ -448,18 +448,18 @@ int ov117_02260C10(OverlayManager *param0, int *param1) ov117_02262760(v0, v0->unk_D4); for (v1 = 0; v1 < 5; v1++) { - BGL_DeleteWindow(&v0->unk_30[v1]); + Window_Remove(&v0->unk_30[v1]); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); - sub_02019044(v0->unk_2C, 1); - sub_02019044(v0->unk_2C, 2); - sub_02019044(v0->unk_2C, 3); - sub_02019044(v0->unk_2C, 4); - sub_02019044(v0->unk_2C, 5); - sub_02019044(v0->unk_2C, 6); - sub_02019044(v0->unk_2C, 7); + Bg_FreeTilemapBuffer(v0->unk_2C, 1); + Bg_FreeTilemapBuffer(v0->unk_2C, 2); + Bg_FreeTilemapBuffer(v0->unk_2C, 3); + Bg_FreeTilemapBuffer(v0->unk_2C, 4); + Bg_FreeTilemapBuffer(v0->unk_2C, 5); + Bg_FreeTilemapBuffer(v0->unk_2C, 6); + Bg_FreeTilemapBuffer(v0->unk_2C, 7); sub_020127BC(v0->unk_90); sub_0200D0B0(v0->unk_24, v0->unk_28); sub_0200C8D4(v0->unk_24); @@ -501,14 +501,14 @@ static void ov117_02260DA0(void *param0) sub_02003694(v0->unk_8C); if (v0->unk_1428.unk_2C == 1) { - sub_02019120(7, 1); + Bg_ToggleLayer(7, 1); v0->unk_1428.unk_2C = 0; } else if (v0->unk_1428.unk_2D == 1) { - sub_02019120(7, 0); + Bg_ToggleLayer(7, 0); v0->unk_1428.unk_2D = 0; } - sub_0201C2B8(v0->unk_2C); + Bg_RunScheduledUpdates(v0->unk_2C); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -668,7 +668,7 @@ static void ov117_022610D8(BgConfig *param0) GX_BG0_AS_3D, }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -716,18 +716,18 @@ static void ov117_022610D8(BgConfig *param0) 0 }, }; - sub_020183C4(param0, 1, &v2[0], 0); - sub_02019EBC(param0, 1); - sub_02019184(param0, 1, 0, 0); - sub_02019184(param0, 1, 3, 0); - sub_020183C4(param0, 2, &v2[1], 0); - sub_02019EBC(param0, 2); - sub_02019184(param0, 2, 0, 0); - sub_02019184(param0, 2, 3, 0); - sub_020183C4(param0, 3, &v2[2], 0); - sub_02019EBC(param0, 3); - sub_02019184(param0, 3, 0, 0); - sub_02019184(param0, 3, 3, 0); + Bg_InitFromTemplate(param0, 1, &v2[0], 0); + Bg_ClearTilemap(param0, 1); + Bg_SetOffset(param0, 1, 0, 0); + Bg_SetOffset(param0, 1, 3, 0); + Bg_InitFromTemplate(param0, 2, &v2[1], 0); + Bg_ClearTilemap(param0, 2); + Bg_SetOffset(param0, 2, 0, 0); + Bg_SetOffset(param0, 2, 3, 0); + Bg_InitFromTemplate(param0, 3, &v2[2], 0); + Bg_ClearTilemap(param0, 3); + Bg_SetOffset(param0, 3, 0, 0); + Bg_SetOffset(param0, 3, 3, 0); G2_SetBG0Priority(2); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -795,18 +795,18 @@ static void ov117_022610D8(BgConfig *param0) for (v3 = 0; v3 < NELEMS(v4); v3++) { if (v3 < 3) { - sub_020183C4(param0, 4 + v3, &v4[v3], 0); + Bg_InitFromTemplate(param0, 4 + v3, &v4[v3], 0); } else { - sub_020183C4(param0, 4 + v3, &v4[v3], 1); + Bg_InitFromTemplate(param0, 4 + v3, &v4[v3], 1); } - sub_02019690(4 + v3, 0x20, 0, 110); - sub_02019EBC(param0, 4 + v3); - sub_02019184(param0, 4 + v3, 0, 0); - sub_02019184(param0, 4 + v3, 3, 0); + Bg_ClearTilesRange(4 + v3, 0x20, 0, 110); + Bg_ClearTilemap(param0, 4 + v3); + Bg_SetOffset(param0, 4 + v3, 0, 0); + Bg_SetOffset(param0, 4 + v3, 3, 0); } - sub_02019120(7, 0); + Bg_ToggleLayer(7, 0); } } @@ -814,15 +814,15 @@ static void ov117_02261280(UnkStruct_ov117_02261280 *param0) { int v0; - BGL_AddWindow(param0->unk_2C, ¶m0->unk_30[0], 1, 11, 0x13, 20, 4, 0xe, ((0x8000 - 0x2000) / 32)); - BGL_AddWindow(param0->unk_2C, ¶m0->unk_30[1], 4, 0x12, 1, 10, 2, 5, (((0x8000 - 0x2000) / 32) + (10 * 2))); - BGL_AddWindow(param0->unk_2C, ¶m0->unk_30[2], 4, 0x15, 0xe, 10, 2, 5, ((((0x8000 - 0x2000) / 32) + (10 * 2)) + (10 * 2))); - BGL_AddWindow(param0->unk_2C, ¶m0->unk_30[3], 4, 1, 14, 10, 2, 5, (((((0x8000 - 0x2000) / 32) + (10 * 2)) + (10 * 2)) + (10 * 2))); - BGL_FillWindow(¶m0->unk_30[1], 0xf); - BGL_FillWindow(¶m0->unk_30[2], 0xf); - BGL_FillWindow(¶m0->unk_30[3], 0xf); - BGL_AddWindow(param0->unk_2C, ¶m0->unk_30[4], 4, 2, 0x13, 0x1c, 4, 5, (((((((0x8000 - 0x2000) / 32) + (10 * 2)) + (10 * 2)) + (10 * 2)) + (10 * 2)) + 9)); - BGL_FillWindow(¶m0->unk_30[4], 0xf); + Window_Add(param0->unk_2C, ¶m0->unk_30[0], 1, 11, 0x13, 20, 4, 0xe, ((0x8000 - 0x2000) / 32)); + Window_Add(param0->unk_2C, ¶m0->unk_30[1], 4, 0x12, 1, 10, 2, 5, (((0x8000 - 0x2000) / 32) + (10 * 2))); + Window_Add(param0->unk_2C, ¶m0->unk_30[2], 4, 0x15, 0xe, 10, 2, 5, ((((0x8000 - 0x2000) / 32) + (10 * 2)) + (10 * 2))); + Window_Add(param0->unk_2C, ¶m0->unk_30[3], 4, 1, 14, 10, 2, 5, (((((0x8000 - 0x2000) / 32) + (10 * 2)) + (10 * 2)) + (10 * 2))); + Window_FillTilemap(¶m0->unk_30[1], 0xf); + Window_FillTilemap(¶m0->unk_30[2], 0xf); + Window_FillTilemap(¶m0->unk_30[3], 0xf); + Window_Add(param0->unk_2C, ¶m0->unk_30[4], 4, 2, 0x13, 0x1c, 4, 5, (((((((0x8000 - 0x2000) / 32) + (10 * 2)) + (10 * 2)) + (10 * 2)) + (10 * 2)) + 9)); + Window_FillTilemap(¶m0->unk_30[4], 0xf); } static void ov117_02261368(UnkStruct_ov117_02261280 *param0) @@ -835,13 +835,13 @@ static void ov117_02261368(UnkStruct_ov117_02261280 *param0) Text_AddPrinterWithParamsAndColor(¶m0->unk_30[4], FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); Strbuf_Free(v0); - sub_0201A9A4(¶m0->unk_30[4]); + Window_ScheduleCopyToVRAM(¶m0->unk_30[4]); } static void ov117_022613B8(UnkStruct_ov117_02261280 *param0) { - sub_02019CB8(param0->unk_2C, 4, 1023, 2 - 1, 0x13 - 1, 0x1c + 2, 4 + 2, 17); - sub_0201C3C0(param0->unk_2C, 4); + Bg_FillTilemapRect(param0->unk_2C, 4, 1023, 2 - 1, 0x13 - 1, 0x1c + 2, 4 + 2, 17); + Bg_ScheduleTilemapTransfer(param0->unk_2C, 4); } static void ov117_022613EC(UnkStruct_ov117_02261280 *param0) @@ -883,22 +883,22 @@ static void ov117_022613EC(UnkStruct_ov117_02261280 *param0) static void ov117_022614AC(UnkStruct_ov117_02261280 *param0, int param1) { if (param1 == 1) { - sub_02019CB8(param0->unk_2C, 4, 1023, 0, 13, 12, 4, 17); - sub_02019CB8(param0->unk_2C, 4, 1023, 0x11, 0, 12, 4, 17); - sub_02019CB8(param0->unk_2C, 4, 1023, 0x14, 13, 12, 4, 17); + Bg_FillTilemapRect(param0->unk_2C, 4, 1023, 0, 13, 12, 4, 17); + Bg_FillTilemapRect(param0->unk_2C, 4, 1023, 0x11, 0, 12, 4, 17); + Bg_FillTilemapRect(param0->unk_2C, 4, 1023, 0x14, 13, 12, 4, 17); } else { switch (param0->unk_00->unk_30) { case 2: - sub_02019CB8(param0->unk_2C, 4, 1023, 0, 13, 12, 4, 17); - sub_02019CB8(param0->unk_2C, 4, 1023, 0x14, 13, 12, 4, 17); + Bg_FillTilemapRect(param0->unk_2C, 4, 1023, 0, 13, 12, 4, 17); + Bg_FillTilemapRect(param0->unk_2C, 4, 1023, 0x14, 13, 12, 4, 17); break; case 3: - sub_02019CB8(param0->unk_2C, 4, 1023, 0x11, 0, 12, 4, 17); + Bg_FillTilemapRect(param0->unk_2C, 4, 1023, 0x11, 0, 12, 4, 17); break; } } - sub_0201C3C0(param0->unk_2C, 4); + Bg_ScheduleTilemapTransfer(param0->unk_2C, 4); } static void ov117_02261574(UnkStruct_ov117_02261280 *param0) diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c index 53e3d67904..c6dcc4ec43 100644 --- a/src/overlay117/ov117_02263AF0.c +++ b/src/overlay117/ov117_02263AF0.c @@ -409,7 +409,7 @@ void ov117_02263AF0(BgConfig *param0, int param1, int param2, UnkStruct_ov117_02 static void ov117_02263B8C(BgConfig *param0, UnkStruct_ov117_02263DAC *param1) { - sub_02019EBC(param0, 7); + Bg_ClearTilemap(param0, 7); param1->unk_00 = 0; param1->unk_2D = 1; } @@ -464,10 +464,10 @@ static void ov117_02263BA4(BgConfig *param0, UnkStruct_ov117_02263DAC *param1, i v5 = FX_Inv(v0); v6 = FX_Inv(v1); - sub_0201C6A8(param0, 7, 3, v5); - sub_0201C6A8(param0, 7, 6, v6); - sub_0201C63C(param0, 7, 0, 0 - v2 + v7); - sub_0201C63C(param0, 7, 3, (256 - 192) / 2 + 7 - v3); + Bg_ScheduleAffineScale(param0, 7, 3, v5); + Bg_ScheduleAffineScale(param0, 7, 6, v6); + Bg_ScheduleScroll(param0, 7, 0, 0 - v2 + v7); + Bg_ScheduleScroll(param0, 7, 3, (256 - 192) / 2 + 7 - v3); } } @@ -1223,8 +1223,8 @@ void ov117_02264AB0(UnkStruct_ov117_02261280 *param0) switch (param0->unk_00->unk_30) { case 3: - sub_02019E2C(param0->unk_2C, 4, 0, 13, 12, 4, 3); - sub_02019E2C(param0->unk_2C, 4, 0x14, 13, 12, 4, 0); + Bg_ChangeTilemapRectPalette(param0->unk_2C, 4, 0, 13, 12, 4, 3); + Bg_ChangeTilemapRectPalette(param0->unk_2C, 4, 0x14, 13, 12, 4, 0); break; } } @@ -2031,7 +2031,7 @@ void ov117_02265DB8(BgConfig *param0, SpriteGfxHandler *param1, UnkStruct_020127 { Window_Init(&v1); - BGL_AddFramelessWindow(param0, &v1, v6, param14, 0, 0); + Window_AddToTopLeftCorner(param0, &v1, v6, param14, 0, 0); Text_AddPrinterWithParamsColorAndSpacing(&v1, param5, param4, 0, 0, TEXT_SPEED_NO_TRANSFER, param6, v7, 0, NULL); } @@ -2064,7 +2064,7 @@ void ov117_02265DB8(BgConfig *param0, SpriteGfxHandler *param1, UnkStruct_020127 } sub_020128C4(v4, param9, param10); - BGL_DeleteWindow(&v1); + Window_Remove(&v1); param3->unk_00 = v4; param3->unk_04 = v2; diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index 2e1aa67464..b88f83a57f 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -147,7 +147,7 @@ void ov119_021D0EB8(BgConfig *param0) GX_BG0_AS_3D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -199,12 +199,12 @@ void ov119_021D0EB8(BgConfig *param0) }, }; - sub_020183C4(param0, 1, &v2[0], 0); - sub_020183C4(param0, 2, &v2[1], 0); - sub_020183C4(param0, 3, &v2[2], 0); - sub_02019EBC(param0, 1); - sub_02019EBC(param0, 2); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 1, &v2[0], 0); + Bg_InitFromTemplate(param0, 2, &v2[1], 0); + Bg_InitFromTemplate(param0, 3, &v2[2], 0); + Bg_ClearTilemap(param0, 1); + Bg_ClearTilemap(param0, 2); + Bg_ClearTilemap(param0, 3); G2_SetBG0Priority(1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -232,8 +232,8 @@ void ov119_021D0EB8(BgConfig *param0) }, }; - sub_020183C4(param0, 4, &v3[0], 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v3[0], 0); + Bg_ClearTilemap(param0, 4); } } @@ -245,7 +245,7 @@ void ov119_021D0FD0(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_04.unk_04); - sub_0201C2B8(v0->unk_04.unk_00); + Bg_RunScheduledUpdates(v0->unk_04.unk_00); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -292,10 +292,10 @@ void ov119_021D1068(BgConfig *param0, PaletteData *param1, int param2) void ov119_021D10F0(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { Window_Init(param1); - BGL_AddWindow(param0, param1, param2, param3, param4, param5, param6, param8, param7); + Window_Add(param0, param1, param2, param3, param4, param5, param6, param8, param7); sub_0200E060(param1, 1, 20, 12); - BGL_FillWindow(param1, 15); - sub_0201A954(param1); + Window_FillTilemap(param1, 15); + Window_CopyToVRAM(param1); } int ov119_021D1158(Window *param0, int param1, Pokemon *param2, int param3) @@ -307,7 +307,7 @@ int ov119_021D1158(Window *param0, int param1, Pokemon *param2, int param3) BoxPokemon *v4; MessageLoader *v5; - BGL_FillWindow(param0, 15); + Window_FillTilemap(param0, 15); v5 = MessageLoader_Init(0, 26, 357, 71); v3 = StringTemplate_Default(71); @@ -333,7 +333,7 @@ void ov119_021D11E4(UnkStruct_ov119_021D0FD0 *param0, BgConfig *param1, Window * UnkStruct_02081CF4 v0; Window_Init(param2); - BGL_AddWindow(param1, param2, param3, param4, param5, param6, param7, param9, param8); + Window_Add(param1, param2, param3, param4, param5, param6, param7, param9, param8); param0->unk_04.unk_44 = sub_02013A04(2, 71); @@ -367,16 +367,16 @@ void ov119_021D11E4(UnkStruct_ov119_021D0FD0 *param0, BgConfig *param1, Window * void ov119_021D12CC(UnkStruct_ov119_021D0FD0 *param0) { Window_Clear(¶m0->unk_04.unk_14[1], 1); - sub_0201ACF4(¶m0->unk_04.unk_14[1]); - BGL_DeleteWindow(¶m0->unk_04.unk_14[1]); + Window_ClearAndCopyToVRAM(¶m0->unk_04.unk_14[1]); + Window_Remove(¶m0->unk_04.unk_14[1]); sub_02001BC4(param0->unk_04.unk_48, NULL); sub_02013A3C(param0->unk_04.unk_44); } void ov119_021D12F8(Window *param0) { - sub_0201ACF4(param0); - BGL_DeleteWindow(param0); + Window_ClearAndCopyToVRAM(param0); + Window_Remove(param0); } void ov119_021D1308(BgConfig *param0, PaletteData *param1) diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c index e80c7da2a8..fe41ff7369 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_app.c @@ -160,7 +160,7 @@ static int sub_0208C330(OverlayManager *param0, int *param1) memset(v0, 0, sizeof(PokemonSummaryApp)); v0->data = OverlayManager_Args(param0); - v0->bgl = sub_02018340(19); + v0->bgl = BgConfig_New(19); v0->monSpriteData.animationSys = sub_02015F84(19, 1, 1); v0->narcPlPokeData = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, 19); @@ -299,7 +299,7 @@ static void sub_0208C604(void *param0) { PokemonSummaryApp *v0 = param0; - sub_0201C2B8(v0->bgl); + Bg_RunScheduledUpdates(v0->bgl); sub_02008A94(v0->monSpriteData.spriteManager); sub_0201DCAC(); sub_0200C800(); @@ -335,7 +335,7 @@ static void sub_0208C658(BgConfig *param0) GX_BG0_AS_3D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -355,8 +355,8 @@ static void sub_0208C658(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v1, 0); + Bg_ClearTilemap(param0, 1); } { @@ -376,9 +376,9 @@ static void sub_0208C658(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v2, 0); - sub_02019EBC(param0, 2); - sub_0201C63C(param0, 2, 0, 136); + Bg_InitFromTemplate(param0, 2, &v2, 0); + Bg_ClearTilemap(param0, 2); + Bg_ScheduleScroll(param0, 2, 0, 136); } { @@ -398,7 +398,7 @@ static void sub_0208C658(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v3, 0); + Bg_InitFromTemplate(param0, 3, &v3, 0); } { @@ -418,8 +418,8 @@ static void sub_0208C658(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v4, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v4, 0); + Bg_ClearTilemap(param0, 4); } { BgTemplate v5 = { @@ -438,11 +438,11 @@ static void sub_0208C658(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v5, 0); + Bg_InitFromTemplate(param0, 5, &v5, 0); } - sub_02019690(1, 32, 0, 19); - sub_02019690(4, 32, 0, 19); + Bg_ClearTilesRange(1, 32, 0, 19); + Bg_ClearTilesRange(4, 32, 0, 19); } static void sub_0208C76C(BgConfig *param0) @@ -450,11 +450,11 @@ static void sub_0208C76C(BgConfig *param0) GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); Heap_FreeToHeapExplicit(19, param0); } @@ -1265,8 +1265,8 @@ static void sub_0208D7EC(PokemonSummaryApp *param0, u8 param1) sub_0208FD40(param0); sub_0208FB54(param0, 0); - sub_02019CB8(param0->bgl, 1, 0, 14, 4, 19, 20, 0); - sub_02019448(param0->bgl, 1); + Bg_FillTilemapRect(param0->bgl, 1, 0, 14, 4, 19, 20, 0); + Bg_CopyTilemapBufferToVRAM(param0->bgl, 1); sub_020904C4(param0); sub_0208D948(param0); sub_020919E8(param0); @@ -1345,8 +1345,8 @@ static void sub_0208D948(PokemonSummaryApp *param0) v1 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_GRAPHIC__PL_PST_GRA, v2, 19); NNS_G2dGetUnpackedScreenData(v1, &v0); - sub_020198C0(param0->bgl, 3, v0->rawData, 0, 0, 32, 32); - sub_0201C3C0(param0->bgl, 3); + Bg_LoadToTilemapRect(param0->bgl, 3, v0->rawData, 0, 0, 32, 32); + Bg_ScheduleTilemapTransfer(param0->bgl, 3); Heap_FreeToHeap(v1); } @@ -1387,7 +1387,7 @@ static void sub_0208D9D0(PokemonSummaryApp *param0) v1 = v0 + v2; } - sub_02019CB8(param0->bgl, 3, v1, 24 + v3, 6, 1, 1, 17); + Bg_FillTilemapRect(param0->bgl, 3, v1, 24 + v3, 6, 1, 1, 17); if (v2 < 8) { v2 = 0; @@ -1396,7 +1396,7 @@ static void sub_0208D9D0(PokemonSummaryApp *param0) } } - sub_0201C3C0(param0->bgl, 3); + Bg_ScheduleTilemapTransfer(param0->bgl, 3); } static void sub_0208DA84(PokemonSummaryApp *param0) @@ -1424,7 +1424,7 @@ static void sub_0208DA84(PokemonSummaryApp *param0) v2 = 0xac + v3; } - sub_02019CB8(param0->bgl, 3, v2, 23 + v4, 23, 1, 1, 17); + Bg_FillTilemapRect(param0->bgl, 3, v2, 23 + v4, 23, 1, 1, 17); if (v3 < 8) { v3 = 0; @@ -1433,7 +1433,7 @@ static void sub_0208DA84(PokemonSummaryApp *param0) } } - sub_0201C3C0(param0->bgl, 3); + Bg_ScheduleTilemapTransfer(param0->bgl, 3); } static void sub_0208DB10(PokemonSummaryApp *param0, s8 param1) @@ -1612,26 +1612,26 @@ static u8 sub_0208DD8C(PokemonSummaryApp *param0) { switch (param0->subscreen) { case 0: - sub_0201C63C(param0->bgl, 2, 0, 136); - sub_0201C63C(param0->bgl, 2, 3, 0); + Bg_ScheduleScroll(param0->bgl, 2, 0, 136); + Bg_ScheduleScroll(param0->bgl, 2, 3, 0); sub_0208EE10(param0, 0); - sub_0201AD10(¶m0->staticWindows[33]); - sub_0201AD10(¶m0->staticWindows[6]); - sub_0201AD10(¶m0->staticWindows[32]); - sub_0201AD10(¶m0->staticWindows[35]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[33]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[6]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[32]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[35]); sub_0208F6DC(param0, NULL); param0->cursor = 0; param0->subscreen = 1; break; case 1: { - int v0 = sub_020192EC(param0->bgl, 2); + int v0 = Bg_GetXOffset(param0->bgl, 2); if (v0 <= 64) { - sub_0201C63C(param0->bgl, 2, 0, 0); + Bg_ScheduleScroll(param0->bgl, 2, 0, 0); param0->subscreen = 2; } else { - sub_0201C63C(param0->bgl, 2, 2, 64); + Bg_ScheduleScroll(param0->bgl, 2, 2, 64); } } break; case 2: @@ -1666,26 +1666,26 @@ static u8 sub_0208DEA4(PokemonSummaryApp *param0) SpriteActor_DrawSprite(param0->unk_41C[18], 0); SpriteActor_DrawSprite(param0->unk_41C[19], 0); CellActor_SetDrawFlag(param0->unk_41C[9], 0); - sub_0201AD10(¶m0->staticWindows[35]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[35]); sub_0208F6DC(param0, NULL); sub_0209145C(param0); sub_020913D8(param0); param0->subscreen = 1; break; case 1: { - int v0 = sub_020192EC(param0->bgl, 2); + int v0 = Bg_GetXOffset(param0->bgl, 2); if (v0 >= 128) { - sub_0201C63C(param0->bgl, 2, 0, 136); + Bg_ScheduleScroll(param0->bgl, 2, 0, 136); param0->subscreen = 2; } else { - sub_0201C63C(param0->bgl, 2, 1, 64); + Bg_ScheduleScroll(param0->bgl, 2, 1, 64); } } break; case 2: - sub_0201A9A4(¶m0->staticWindows[33]); - sub_0201A9A4(¶m0->staticWindows[6]); - sub_0201A9A4(¶m0->staticWindows[32]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[33]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[6]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[32]); sub_02090064(param0, 129); sub_0208EE10(param0, 1); sub_0208F6DC(param0, ¶m0->staticWindows[35]); @@ -1801,11 +1801,11 @@ static void sub_0208E0DC(PokemonSummaryApp *param0) static void sub_0208E190(PokemonSummaryApp *param0) { - sub_0201AD10(¶m0->staticWindows[33]); - sub_0201AD10(¶m0->staticWindows[6]); - sub_0201AD10(¶m0->staticWindows[32]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[33]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[6]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[32]); - sub_0201C63C(param0->bgl, 2, 0, 0); + Bg_ScheduleScroll(param0->bgl, 2, 0, 0); sub_02091420(param0); sub_0208DFF4(param0); @@ -1824,26 +1824,26 @@ static u8 sub_0208E208(PokemonSummaryApp *param0) { switch (param0->subscreen) { case 0: - sub_0201C63C(param0->bgl, 2, 0, 136); - sub_0201C63C(param0->bgl, 2, 3, 256); + Bg_ScheduleScroll(param0->bgl, 2, 0, 136); + Bg_ScheduleScroll(param0->bgl, 2, 3, 256); sub_0208E498(param0, 0xffffffff); sub_0208EE10(param0, 0); - sub_0201AD10(¶m0->staticWindows[33]); - sub_0201AD10(¶m0->staticWindows[6]); - sub_0201AD10(¶m0->staticWindows[32]); - sub_0201AD10(¶m0->staticWindows[35]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[33]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[6]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[32]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[35]); sub_0208F6DC(param0, NULL); param0->cursor = 0; param0->subscreen = 1; break; case 1: { - int v0 = sub_020192EC(param0->bgl, 2); + int v0 = Bg_GetXOffset(param0->bgl, 2); if (v0 <= 64) { - sub_0201C63C(param0->bgl, 2, 0, 0); + Bg_ScheduleScroll(param0->bgl, 2, 0, 0); param0->subscreen = 2; } else { - sub_0201C63C(param0->bgl, 2, 2, 64); + Bg_ScheduleScroll(param0->bgl, 2, 2, 64); } } break; case 2: @@ -1873,26 +1873,26 @@ static u8 sub_0208E308(PokemonSummaryApp *param0) SpriteActor_DrawSprite(param0->unk_41C[19], 0); sub_0208E498(param0, 0xffffffff); CellActor_SetDrawFlag(param0->unk_41C[9], 0); - sub_0201AD10(¶m0->staticWindows[35]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[35]); sub_0208F6DC(param0, NULL); sub_0209145C(param0); sub_020915F4(param0); param0->subscreen = 1; break; case 1: { - int v0 = sub_020192EC(param0->bgl, 2); + int v0 = Bg_GetXOffset(param0->bgl, 2); if (v0 >= 128) { - sub_0201C63C(param0->bgl, 2, 0, 136); + Bg_ScheduleScroll(param0->bgl, 2, 0, 136); param0->subscreen = 2; } else { - sub_0201C63C(param0->bgl, 2, 1, 64); + Bg_ScheduleScroll(param0->bgl, 2, 1, 64); } } break; case 2: - sub_0201A9A4(¶m0->staticWindows[33]); - sub_0201A9A4(¶m0->staticWindows[6]); - sub_0201A9A4(¶m0->staticWindows[32]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[33]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[6]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[32]); sub_02090064(param0, 158); sub_0208EE10(param0, 1); sub_0208F6DC(param0, ¶m0->staticWindows[35]); @@ -1904,10 +1904,10 @@ static u8 sub_0208E308(PokemonSummaryApp *param0) static void sub_0208E3DC(PokemonSummaryApp *param0, u16 param1, u8 param2) { - sub_02019CB8(param0->bgl, 2, param1, 2 + param2 * 2, (32 + 15), 1, 1, 16); - sub_02019CB8(param0->bgl, 2, param1 + 1, 2 + param2 * 2 + 1, (32 + 15), 1, 1, 16); - sub_02019CB8(param0->bgl, 2, param1 + 32, 2 + param2 * 2, (32 + 15) + 1, 1, 1, 16); - sub_02019CB8(param0->bgl, 2, param1 + 33, 2 + param2 * 2 + 1, (32 + 15) + 1, 1, 1, 16); + Bg_FillTilemapRect(param0->bgl, 2, param1, 2 + param2 * 2, (32 + 15), 1, 1, 16); + Bg_FillTilemapRect(param0->bgl, 2, param1 + 1, 2 + param2 * 2 + 1, (32 + 15), 1, 1, 16); + Bg_FillTilemapRect(param0->bgl, 2, param1 + 32, 2 + param2 * 2, (32 + 15) + 1, 1, 1, 16); + Bg_FillTilemapRect(param0->bgl, 2, param1 + 33, 2 + param2 * 2 + 1, (32 + 15) + 1, 1, 1, 16); } static void sub_0208E46C(PokemonSummaryApp *param0) @@ -1918,7 +1918,7 @@ static void sub_0208E46C(PokemonSummaryApp *param0) sub_0208E3DC(param0, 0x12e, v0); } - sub_0201C3C0(param0->bgl, 2); + Bg_ScheduleTilemapTransfer(param0->bgl, 2); } static void sub_0208E498(PokemonSummaryApp *param0, u32 param1) @@ -1938,7 +1938,7 @@ static void sub_0208E498(PokemonSummaryApp *param0, u32 param1) } } - sub_0201C3C0(param0->bgl, 2); + Bg_ScheduleTilemapTransfer(param0->bgl, 2); } static void sub_0208E4EC(PokemonSummaryApp *param0) @@ -1964,10 +1964,10 @@ static void sub_0208E508(PokemonSummaryApp *param0) SpriteActor_DrawSprite(param0->unk_41C[12], 1); } - sub_0201C63C(param0->bgl, 2, 3, 0); + Bg_ScheduleScroll(param0->bgl, 2, 3, 0); } else { sub_0208F844(param0); - sub_0201C63C(param0->bgl, 2, 3, 256); + Bg_ScheduleScroll(param0->bgl, 2, 3, 256); } } @@ -1975,15 +1975,15 @@ static u8 sub_0208E57C(PokemonSummaryApp *param0) { switch (param0->subscreen) { case 0: - sub_0201C63C(param0->bgl, 2, 0, 256); - sub_0201C63C(param0->bgl, 2, 3, 0); + Bg_ScheduleScroll(param0->bgl, 2, 0, 256); + Bg_ScheduleScroll(param0->bgl, 2, 3, 0); sub_0208EE10(param0, 0); - sub_0201AD10(¶m0->staticWindows[6]); - sub_0201AD10(¶m0->staticWindows[32]); - sub_0201AD10(¶m0->staticWindows[30]); - sub_0201AD10(¶m0->staticWindows[35]); - sub_0201AD10(¶m0->extraWindows[0]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[6]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[32]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[30]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[35]); + Window_ClearAndScheduleCopyToVRAM(¶m0->extraWindows[0]); sub_0208F6DC(param0, NULL); param0->ribbonPos = 0; @@ -1991,13 +1991,13 @@ static u8 sub_0208E57C(PokemonSummaryApp *param0) param0->subscreen = 1; break; case 1: { - int v0 = sub_020192F8(param0->bgl, 2); + int v0 = Bg_GetYOffset(param0->bgl, 2); if (v0 >= 48) { - sub_0201C63C(param0->bgl, 2, 3, 56); + Bg_ScheduleScroll(param0->bgl, 2, 3, 56); param0->subscreen = 2; } else { - sub_0201C63C(param0->bgl, 2, 4, 16); + Bg_ScheduleScroll(param0->bgl, 2, 4, 16); } } break; case 2: @@ -2023,30 +2023,30 @@ static u8 sub_0208E6A8(PokemonSummaryApp *param0) case 0: param0->ribbonPos = 0; param0->ribbonState = 0; - sub_0201AD10(¶m0->extraWindows[1]); - sub_0201AD10(¶m0->extraWindows[2]); - sub_0201AD10(¶m0->extraWindows[3]); - sub_0201AD10(¶m0->staticWindows[35]); + Window_ClearAndScheduleCopyToVRAM(¶m0->extraWindows[1]); + Window_ClearAndScheduleCopyToVRAM(¶m0->extraWindows[2]); + Window_ClearAndScheduleCopyToVRAM(¶m0->extraWindows[3]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[35]); sub_0208F6DC(param0, NULL); sub_0208FA04(param0); param0->subscreen = 1; break; case 1: { - int v0 = sub_020192F8(param0->bgl, 2); + int v0 = Bg_GetYOffset(param0->bgl, 2); if (v0 <= 8) { - sub_0201C63C(param0->bgl, 2, 3, 0); + Bg_ScheduleScroll(param0->bgl, 2, 3, 0); param0->subscreen = 2; } else { - sub_0201C63C(param0->bgl, 2, 5, 16); + Bg_ScheduleScroll(param0->bgl, 2, 5, 16); } } break; case 2: - sub_0201A9A4(¶m0->staticWindows[6]); - sub_0201A9A4(¶m0->staticWindows[32]); - sub_0201A9A4(¶m0->staticWindows[30]); - sub_0201A9A4(¶m0->staticWindows[35]); - sub_0201A9A4(¶m0->extraWindows[0]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[6]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[32]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[30]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[35]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[0]); sub_02090064(param0, 180); sub_0208EE10(param0, 1); sub_0208F6DC(param0, ¶m0->staticWindows[35]); diff --git a/src/render_text.c b/src/render_text.c index 682649ffaa..83c24ce1ef 100644 --- a/src/render_text.c +++ b/src/render_text.c @@ -124,7 +124,7 @@ enum RenderResult RenderText(TextPrinter *printer) Text_RenderScreenIndicator(printer, printer->template.currX, printer->template.currY, screen); if (printer->textSpeedTop != 0) { - sub_0201A954(printer->template.window); + Window_CopyToVRAM(printer->template.window); } } break; @@ -196,7 +196,7 @@ enum RenderResult RenderText(TextPrinter *printer) } const TextGlyph *glyph = Font_TryLoadGlyph(substruct->fontID, currChar); - sub_0201AED0(printer->template.window, + Window_CopyGlyph(printer->template.window, glyph->gfx, glyph->width, glyph->height, @@ -218,7 +218,7 @@ enum RenderResult RenderText(TextPrinter *printer) case RENDER_STATE_CLEAR: if (TextPrinter_WaitWithScrollArrow(printer)) { TextPrinter_ClearScrollArrow(printer); - BGL_FillWindow(printer->template.window, printer->template.bgColor); + Window_FillTilemap(printer->template.window, printer->template.bgColor); printer->template.currX = printer->template.x; printer->template.currY = printer->template.y; @@ -242,14 +242,14 @@ enum RenderResult RenderText(TextPrinter *printer) if (printer->scrollDistance) { // This cast here is ugly, but is necessary to match without declaring a separate variable just for 4. if ((int)printer->scrollDistance < 4) { - sub_0201C04C(printer->template.window, 0, printer->scrollDistance, (printer->template.bgColor << 4) | printer->template.bgColor); + Window_Scroll(printer->template.window, 0, printer->scrollDistance, (printer->template.bgColor << 4) | printer->template.bgColor); printer->scrollDistance = 0; } else { - sub_0201C04C(printer->template.window, 0, 4, (printer->template.bgColor << 4) | printer->template.bgColor); + Window_Scroll(printer->template.window, 0, 4, (printer->template.bgColor << 4) | printer->template.bgColor); printer->scrollDistance -= 4; } - sub_0201A954(printer->template.window); + Window_CopyToVRAM(printer->template.window); } else { printer->state = RENDER_STATE_HANDLE_CHAR; } @@ -307,13 +307,13 @@ void TextPrinter_DrawScrollArrow(TextPrinter *printer) return; } - u8 bgID = sub_0201C290(printer->template.window); - u8 x = sub_0201C29C(printer->template.window); - u8 y = sub_0201C2A0(printer->template.window); - u8 width = sub_0201C294(printer->template.window); + u8 bgID = Window_GetBgLayer(printer->template.window); + u8 x = Window_GetXPos(printer->template.window); + u8 y = Window_GetYPos(printer->template.window); + u8 width = Window_GetWidth(printer->template.window); u16 baseTile = sScrollArrowBaseTile; - sub_02019CB8(printer->template.window->bgConfig, + Bg_FillTilemapRect(printer->template.window->bgConfig, bgID, baseTile + 18 + (sScrollArrowTileOffsets[substruct->scrollArrowYPosIdx] * 4), x + width + 1, @@ -321,7 +321,7 @@ void TextPrinter_DrawScrollArrow(TextPrinter *printer) 1, 1, 16); - sub_02019CB8(printer->template.window->bgConfig, + Bg_FillTilemapRect(printer->template.window->bgConfig, bgID, baseTile + 19 + (sScrollArrowTileOffsets[substruct->scrollArrowYPosIdx] * 4), x + width + 2, @@ -329,7 +329,7 @@ void TextPrinter_DrawScrollArrow(TextPrinter *printer) 1, 1, 16); - sub_02019CB8(printer->template.window->bgConfig, + Bg_FillTilemapRect(printer->template.window->bgConfig, bgID, baseTile + 20 + (sScrollArrowTileOffsets[substruct->scrollArrowYPosIdx] * 4), x + width + 1, @@ -337,7 +337,7 @@ void TextPrinter_DrawScrollArrow(TextPrinter *printer) 1, 1, 16); - sub_02019CB8(printer->template.window->bgConfig, + Bg_FillTilemapRect(printer->template.window->bgConfig, bgID, baseTile + 21 + (sScrollArrowTileOffsets[substruct->scrollArrowYPosIdx] * 4), x + width + 2, @@ -346,20 +346,20 @@ void TextPrinter_DrawScrollArrow(TextPrinter *printer) 1, 16); - sub_02019448(printer->template.window->bgConfig, bgID); + Bg_CopyTilemapBufferToVRAM(printer->template.window->bgConfig, bgID); substruct->scrollArrowDelay = 8; substruct->scrollArrowYPosIdx++; } void TextPrinter_ClearScrollArrow(TextPrinter *printer) { - u8 bgID = sub_0201C290(printer->template.window); - u8 x = sub_0201C29C(printer->template.window); - u8 y = sub_0201C2A0(printer->template.window); - u8 width = sub_0201C294(printer->template.window); + u8 bgID = Window_GetBgLayer(printer->template.window); + u8 x = Window_GetXPos(printer->template.window); + u8 y = Window_GetYPos(printer->template.window); + u8 width = Window_GetWidth(printer->template.window); u16 baseTile = sScrollArrowBaseTile; - sub_02019CB8(printer->template.window->bgConfig, + Bg_FillTilemapRect(printer->template.window->bgConfig, bgID, baseTile + 10, x + width + 1, @@ -367,7 +367,7 @@ void TextPrinter_ClearScrollArrow(TextPrinter *printer) 1, 2, 16); - sub_02019CB8(printer->template.window->bgConfig, + Bg_FillTilemapRect(printer->template.window->bgConfig, bgID, baseTile + 11, x + width + 2, @@ -375,7 +375,7 @@ void TextPrinter_ClearScrollArrow(TextPrinter *printer) 1, 2, 16); - sub_02019448(printer->template.window->bgConfig, bgID); + Bg_CopyTilemapBufferToVRAM(printer->template.window->bgConfig, bgID); } static BOOL TextPrinter_Continue(TextPrinter *printer) diff --git a/src/scrcmd.c b/src/scrcmd.c index 47ca620fc8..d718603a05 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -2371,7 +2371,7 @@ static BOOL ScrCmd_CloseMessage(ScriptContext *ctx) u8 *v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN); sub_0200E084(window, 0); - BGL_DeleteWindow(window); + Window_Remove(window); *v2 = 0; return FALSE; @@ -2383,7 +2383,7 @@ static BOOL ScrCmd_035(ScriptContext *ctx) Window *v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW); u8 *v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN); - BGL_DeleteWindow(v1); + Window_Remove(v1); *v2 = 0; return 0; @@ -2428,17 +2428,17 @@ static BOOL ScriptContext_ScrollBG3(ScriptContext *ctx) if (*distanceX != 0) { if (*directionX == 0) { - sub_02019184(fieldSystem->unk_08, 3, 1, *distanceX); + Bg_SetOffset(fieldSystem->unk_08, 3, 1, *distanceX); } else { - sub_02019184(fieldSystem->unk_08, 3, 2, *distanceX); + Bg_SetOffset(fieldSystem->unk_08, 3, 2, *distanceX); } } if (*distanceY != 0) { if (*directionY == 0) { - sub_02019184(fieldSystem->unk_08, 3, 4, *distanceY); + Bg_SetOffset(fieldSystem->unk_08, 3, 4, *distanceY); } else { - sub_02019184(fieldSystem->unk_08, 3, 5, *distanceY); + Bg_SetOffset(fieldSystem->unk_08, 3, 5, *distanceY); } } @@ -4835,7 +4835,7 @@ static BOOL ScrCmd_0E6(ScriptContext *ctx) u16 v6 = ScriptContext_GetVar(ctx); TrainerData_LoadMessage(v5, v6, *v2, 11); - BGL_FillWindow(FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW), SCRIPT_MANAGER_STR_TEMPLATE); + Window_FillTilemap(FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW), SCRIPT_MANAGER_STR_TEMPLATE); *v4 = FieldMessage_Print(FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW), *v2, SaveData_Options(ctx->fieldSystem->saveData), SCRIPT_MANAGER_WINDOW); ScriptContext_Pause(ctx, sub_02040014); diff --git a/src/text.c b/src/text.c index 8a7e865f11..84c522e833 100644 --- a/src/text.c +++ b/src/text.c @@ -214,7 +214,7 @@ u8 Text_AddPrinter(const TextPrinterTemplate *template, u32 renderDelay, TextPri } if (renderDelay != TEXT_SPEED_NO_TRANSFER) { - sub_0201A954(printer->template.window); + Window_CopyToVRAM(printer->template.window); } Text_FreePrinterIconGfx(printer); @@ -237,7 +237,7 @@ static void SysTask_RunTextPrinter(SysTask *task, void *data) switch (TextPrinter_Render(printer)) { case RENDER_PRINT: - sub_0201A954(printer->template.window); + Window_CopyToVRAM(printer->template.window); // fall-through case RENDER_UPDATE: @@ -342,9 +342,9 @@ void Text_RenderScreenIndicator(TextPrinter *printer, u16 unusedX, u16 unusedY, u8 *tiles = printer->iconGfx; tiles = &tiles[indicator * 24 * 16]; - unusedX = (sub_0201C294(window) - 3) * 8; + unusedX = (Window_GetWidth(window) - 3) * 8; - sub_0201ADDC(window, tiles, 0, 0, 24, 32, unusedX, 0, 24, 32); + Window_BlitBitmapRect(window, tiles, 0, 0, 24, 32, unusedX, 0, 24, 32); } static void Text_FreePrinterIconGfx(TextPrinter *printer) diff --git a/src/unk_0200112C.c b/src/unk_0200112C.c index 4857dd1deb..0193e22f7f 100644 --- a/src/unk_0200112C.c +++ b/src/unk_0200112C.c @@ -74,11 +74,11 @@ BmpList *sub_0200112C(const UnkStruct_ov84_02240FA8 *param0, u16 param1, u16 par } ColoredArrow_SetColor(v0->unk_24, TEXT_COLOR(v0->unk_00.unk_17_4, v0->unk_00.unk_18_4, v0->unk_00.unk_18_0)); - BGL_FillWindow(v0->unk_00.unk_0C, v0->unk_00.unk_18_0); + Window_FillTilemap(v0->unk_00.unk_0C, v0->unk_00.unk_18_0); sub_02001688(v0, v0->unk_28, 0, v0->unk_00.unk_12); sub_02001720(v0); sub_02001AD8(v0, 1); - sub_0201A954(param0->unk_0C); + Window_CopyToVRAM(param0->unk_0C); return v0; } @@ -164,10 +164,10 @@ void sub_02001384(BmpList *param0, u16 *param1, u16 *param2) void sub_020013AC(BmpList *param0) { - BGL_FillWindow(param0->unk_00.unk_0C, param0->unk_00.unk_18_0); + Window_FillTilemap(param0->unk_00.unk_0C, param0->unk_00.unk_18_0); sub_02001688(param0, param0->unk_28, 0, param0->unk_00.unk_12); sub_02001720(param0); - sub_0201A954(param0->unk_00.unk_0C); + Window_CopyToVRAM(param0->unk_00.unk_0C); } void sub_020013D8(BmpList *param0, u8 param1, u8 param2, u8 param3) @@ -379,7 +379,7 @@ static void sub_02001778(BmpList *param0, u16 param1) switch (param0->unk_00.unk_1A_15) { case 0: v0 = Font_GetAttribute(param0->unk_00.unk_1A_9, 1) + param0->unk_00.unk_1A_3; - BGL_WindowColor(param0->unk_00.unk_0C, (u8)param0->unk_00.unk_18_0, param0->unk_00.unk_16, (u16)(param1 * v0 + param0->unk_00.unk_17_0), 8, 16); + Window_FillRectWithColor(param0->unk_00.unk_0C, (u8)param0->unk_00.unk_18_0, param0->unk_00.unk_16, (u16)(param1 * v0 + param0->unk_00.unk_17_0), 8, 16); break; case 1: case 2: @@ -472,7 +472,7 @@ static void sub_02001900(BmpList *param0, u8 param1, u8 param2) u16 v1; if (param1 >= param0->unk_00.unk_12) { - BGL_FillWindow(param0->unk_00.unk_0C, param0->unk_00.unk_18_0); + Window_FillTilemap(param0->unk_00.unk_0C, param0->unk_00.unk_18_0); sub_02001688(param0, param0->unk_28, 0, param0->unk_00.unk_12); return; } @@ -480,16 +480,16 @@ static void sub_02001900(BmpList *param0, u8 param1, u8 param2) v0 = Font_GetAttribute(param0->unk_00.unk_1A_9, 1) + param0->unk_00.unk_1A_3; if (param2 == 0) { - sub_0201C04C(param0->unk_00.unk_0C, 1, (u8)(param1 * v0), (u8)((param0->unk_00.unk_18_0 << 4) | param0->unk_00.unk_18_0)); + Window_Scroll(param0->unk_00.unk_0C, 1, (u8)(param1 * v0), (u8)((param0->unk_00.unk_18_0 << 4) | param0->unk_00.unk_18_0)); sub_02001688(param0, param0->unk_28, 0, param1); v1 = (u16)(param0->unk_00.unk_12 * v0 + param0->unk_00.unk_17_0); - BGL_WindowColor(param0->unk_00.unk_0C, (u8)param0->unk_00.unk_18_0, 0, v1, (u16)(sub_0201C294(param0->unk_00.unk_0C) * 8), (u16)(sub_0201C298(param0->unk_00.unk_0C) * 8 - v1)); + Window_FillRectWithColor(param0->unk_00.unk_0C, (u8)param0->unk_00.unk_18_0, 0, v1, (u16)(Window_GetWidth(param0->unk_00.unk_0C) * 8), (u16)(Window_GetHeight(param0->unk_00.unk_0C) * 8 - v1)); } else { - sub_0201C04C(param0->unk_00.unk_0C, 0, (u8)(param1 * v0), (u8)((param0->unk_00.unk_18_0 << 4) | param0->unk_00.unk_18_0)); + Window_Scroll(param0->unk_00.unk_0C, 0, (u8)(param1 * v0), (u8)((param0->unk_00.unk_18_0 << 4) | param0->unk_00.unk_18_0)); sub_02001688(param0, (u16)(param0->unk_28 + (param0->unk_00.unk_12 - param1)), (u16)(param0->unk_00.unk_12 - param1), (u16)param1); - BGL_WindowColor(param0->unk_00.unk_0C, (u8)param0->unk_00.unk_18_0, 0, 0, (u16)(sub_0201C294(param0->unk_00.unk_0C) * 8), (u16)param0->unk_00.unk_17_0); + Window_FillRectWithColor(param0->unk_00.unk_0C, (u8)param0->unk_00.unk_18_0, 0, 0, (u16)(Window_GetWidth(param0->unk_00.unk_0C) * 8), (u16)param0->unk_00.unk_17_0); } } @@ -526,7 +526,7 @@ static u8 sub_02001A18(BmpList *param0, u8 param1, u8 param2, u8 param3) sub_02001778(param0, v0); sub_02001720(param0); sub_02001AD8(param0, 0); - sub_0201A954(param0->unk_00.unk_0C); + Window_CopyToVRAM(param0->unk_00.unk_0C); break; case 2: case 3: @@ -534,7 +534,7 @@ static u8 sub_02001A18(BmpList *param0, u8 param1, u8 param2, u8 param3) sub_02001900(param0, v4, param3); sub_02001720(param0); sub_02001AD8(param0, 0); - sub_0201A954(param0->unk_00.unk_0C); + Window_CopyToVRAM(param0->unk_00.unk_0C); break; } } diff --git a/src/unk_02001AF4.c b/src/unk_02001AF4.c index 11246f9244..a7ac374f5a 100644 --- a/src/unk_02001AF4.c +++ b/src/unk_02001AF4.c @@ -67,7 +67,7 @@ UIControlData *sub_02001B7C(const UnkStruct_02081CF4 *param0, u8 param1, u8 para { UIControlData *v0 = sub_02001AF4(param0, param1, param2, param3, param4, param5); - sub_0201A954(v0->unk_00.unk_04); + Window_CopyToVRAM(v0->unk_00.unk_04); return v0; } @@ -235,7 +235,7 @@ static BOOL sub_02001DCC(UIControlData *param0, u8 param1, u16 param2) v3 = Font_GetAttribute(param0->unk_00.unk_08, 6); sub_02002018(param0, &v1, &v2, v0); - BGL_WindowColor(param0->unk_00.unk_04, v3, v1, v2, 8, param0->unk_1A); + Window_FillRectWithColor(param0->unk_00.unk_04, v3, v1, v2, 8, param0->unk_1A); } sub_02001FE8(param0); @@ -336,7 +336,7 @@ static void sub_02001F5C(UIControlData *param0) u8 v1, v2, v3; u8 v4, v5; - BGL_FillWindow(param0->unk_00.unk_04, Font_GetAttribute(param0->unk_00.unk_08, 6)); + Window_FillTilemap(param0->unk_00.unk_04, Font_GetAttribute(param0->unk_00.unk_08, 6)); v1 = param0->unk_17; v3 = param0->unk_16 + param0->unk_19 * 2; @@ -385,7 +385,7 @@ UIControlData *sub_02002054(BgConfig *param0, const WindowTemplate *param1, u16 MessageLoader_Free(v1); v0.unk_00 = v2; - v0.unk_04 = sub_0201A778(param5, 1); + v0.unk_04 = Window_New(param5, 1); v0.unk_08 = 0; v0.unk_09 = 1; v0.unk_0A = 2; @@ -393,7 +393,7 @@ UIControlData *sub_02002054(BgConfig *param0, const WindowTemplate *param1, u16 v0.unk_0B_4 = 0; v0.unk_0B_6 = 0; - sub_0201A8D4(param0, v0.unk_04, param1); + Window_AddFromTemplate(param0, v0.unk_04, param1); Window_Show(v0.unk_04, 1, param2, param3); return sub_02001B7C(&v0, 8, 0, param4, param5, PAD_BUTTON_B); @@ -429,7 +429,7 @@ u32 sub_02002134(UIControlData *param0, u8 param1, u32 param2) void sub_02002154(UIControlData *param0, u32 param1) { Window_Clear(param0->unk_00.unk_04, 0); - BGL_DeleteWindow(param0->unk_00.unk_04); + Window_Remove(param0->unk_00.unk_04); Heap_FreeToHeapExplicit(param1, param0->unk_00.unk_04); sub_02013A3C((ResourceMetadata *)param0->unk_00.unk_00); sub_02001BC4(param0, NULL); @@ -504,5 +504,5 @@ void sub_02002180(Window *param0, u32 param1, u32 param2) 0x0 }; - sub_0201ADDC(param0, (void *)v0, 0, 0, 8, 16, param1, param2, 8, 16); + Window_BlitBitmapRect(param0, (void *)v0, 0, 0, 8, 16, param1, param2, 8, 16); } diff --git a/src/unk_02006E3C.c b/src/unk_02006E3C.c index 01988443ec..9d06a190e6 100644 --- a/src/unk_02006E3C.c +++ b/src/unk_02006E3C.c @@ -301,7 +301,7 @@ static u32 sub_020072D0(void *param0, BgConfig *param1, u32 param2, u32 param3, param4 = v0->szByte; } - sub_0201958C(param1, param2, v0->pRawData, param4, param3); + Bg_LoadTiles(param1, param2, v0->pRawData, param4, param3); } Heap_FreeToHeap(param0); @@ -320,11 +320,11 @@ static void sub_02007314(void *param0, BgConfig *param1, u32 param2, u32 param3, param4 = v0->szByte; } - if (sub_02019FE4(param1, param2) != NULL) { - sub_02019574(param1, param2, v0->rawData, param4); + if (Bg_GetTilemapBuffer(param1, param2) != NULL) { + Bg_LoadTilemapBuffer(param1, param2, v0->rawData, param4); } - sub_02019460(param1, param2, v0->rawData, param4, param3); + Bg_CopyTilemapBufferRangeToVRAM(param1, param2, v0->rawData, param4, param3); } Heap_FreeToHeap(param0); diff --git a/src/unk_0200C440.c b/src/unk_0200C440.c index 752cb90269..7b9a1f58b4 100644 --- a/src/unk_0200C440.c +++ b/src/unk_0200C440.c @@ -90,7 +90,7 @@ void sub_0200C560(UnkStruct_0200C440 *param0) void sub_0200C578(UnkStruct_0200C440 *param0, int param1, Window *param2, u32 param3, u32 param4) { - sub_0201ADDC(param2, (u8 *)(param0->unk_04->pRawData) + Unk_020E4FEC[param1].unk_00, 0, 0, Unk_020E4FEC[param1].unk_02, 8, param3, param4, Unk_020E4FEC[param1].unk_02, 8); + Window_BlitBitmapRect(param2, (u8 *)(param0->unk_04->pRawData) + Unk_020E4FEC[param1].unk_00, 0, 0, Unk_020E4FEC[param1].unk_02, 8, param3, param4, Unk_020E4FEC[param1].unk_02, 8); } void sub_0200C5BC(UnkStruct_0200C440 *param0, s32 param1, u32 param2, int param3, Window *param4, u32 param5, u32 param6) @@ -101,9 +101,9 @@ void sub_0200C5BC(UnkStruct_0200C440 *param0, s32 param1, u32 param2, int param3 for (v0 = 0; param0->unk_08[v0] != 0xffff; v0++) { if ((param0->unk_08[v0] >= 0xa2) && (param0->unk_08[v0] <= 0xab)) { - sub_0201ADDC(param4, (u8 *)(param0->unk_04->pRawData) + ((param0->unk_08[v0] - 0xa2) * 0x20), 0, 0, 8, 8, param5, param6, 8, 8); + Window_BlitBitmapRect(param4, (u8 *)(param0->unk_04->pRawData) + ((param0->unk_08[v0] - 0xa2) * 0x20), 0, 0, 8, 8, param5, param6, 8, 8); } else { - BGL_WindowColor(param4, param0->unk_28, param5, param6, 8, 8); + Window_FillRectWithColor(param4, param0->unk_28, param5, param6, 8, 8); } param5 += 8; diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c index 7faf0d4d68..a4479c07e9 100644 --- a/src/unk_0200DA60.c +++ b/src/unk_0200DA60.c @@ -120,35 +120,35 @@ void sub_0200DAA4(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, static void sub_0200DB10(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) { - sub_02019CB8(param0, param1, param7, param2 - 1, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 1, param2, param3 - 1, param4, 1, param6); - sub_02019CB8(param0, param1, param7 + 2, param2 + param4, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 3, param2 - 1, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 5, param2 + param4, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 6, param2 - 1, param3 + param5, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 7, param2, param3 + param5, param4, 1, param6); - sub_02019CB8(param0, param1, param7 + 8, param2 + param4, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7, param2 - 1, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 1, param2, param3 - 1, param4, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 2, param2 + param4, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 3, param2 - 1, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 5, param2 + param4, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 6, param2 - 1, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 7, param2, param3 + param5, param4, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 8, param2 + param4, param3 + param5, 1, 1, param6); } void Window_Show(Window *param0, u8 param1, u16 param2, u8 param3) { - u8 v0 = sub_0201C290(param0); + u8 v0 = Window_GetBgLayer(param0); - sub_0200DB10(param0->bgConfig, v0, sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param3, param2); + sub_0200DB10(param0->bgConfig, v0, Window_GetXPos(param0), Window_GetYPos(param0), Window_GetWidth(param0), Window_GetHeight(param0), param3, param2); if (param1 == 0) { - sub_0201A954(param0); + Window_CopyToVRAM(param0); } } void Window_Clear(Window *param0, u8 param1) { - u8 v0 = sub_0201C290(param0); + u8 v0 = Window_GetBgLayer(param0); - sub_02019CB8(param0->bgConfig, v0, 0, sub_0201C29C(param0) - 1, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 2, sub_0201C298(param0) + 2, 0); + Bg_FillTilemapRect(param0->bgConfig, v0, 0, Window_GetXPos(param0) - 1, Window_GetYPos(param0) - 1, Window_GetWidth(param0) + 2, Window_GetHeight(param0) + 2, 0); if (param1 == 0) { - sub_0201ACF4(param0); + Window_ClearAndCopyToVRAM(param0); } } @@ -175,28 +175,28 @@ void sub_0200DD0C(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, static void sub_0200DD7C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) { - sub_02019CB8(param0, param1, param7, param2 - 2, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 1, param2 - 1, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 2, param2, param3 - 1, param4, 1, param6); - sub_02019CB8(param0, param1, param7 + 3, param2 + param4, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 4, param2 + param4 + 1, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 5, param2 + param4 + 2, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 6, param2 - 2, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 7, param2 - 1, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 9, param2 + param4, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 10, param2 + param4 + 1, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 11, param2 + param4 + 2, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 12, param2 - 2, param3 + param5, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 13, param2 - 1, param3 + param5, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 14, param2, param3 + param5, param4, 1, param6); - sub_02019CB8(param0, param1, param7 + 15, param2 + param4, param3 + param5, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 16, param2 + param4 + 1, param3 + param5, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 17, param2 + param4 + 2, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7, param2 - 2, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 1, param2 - 1, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 2, param2, param3 - 1, param4, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 3, param2 + param4, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 4, param2 + param4 + 1, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 5, param2 + param4 + 2, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 6, param2 - 2, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 7, param2 - 1, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 9, param2 + param4, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 10, param2 + param4 + 1, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 11, param2 + param4 + 2, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 12, param2 - 2, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 13, param2 - 1, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 14, param2, param3 + param5, param4, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 15, param2 + param4, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 16, param2 + param4 + 1, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 17, param2 + param4 + 2, param3 + param5, 1, 1, param6); } void sub_0200E010(Window *param0, u32 param1, u32 param2) { - sub_0200DD7C(param0->bgConfig, sub_0201C290(param0), sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param2, param1); + sub_0200DD7C(param0->bgConfig, Window_GetBgLayer(param0), Window_GetXPos(param0), Window_GetYPos(param0), Window_GetWidth(param0), Window_GetHeight(param0), param2, param1); } void sub_0200E060(Window *param0, u8 param1, u16 param2, u8 param3) @@ -204,7 +204,7 @@ void sub_0200E060(Window *param0, u8 param1, u16 param2, u8 param3) sub_0200E010(param0, param2, param3); if (param1 == 0) { - sub_0201A954(param0); + Window_CopyToVRAM(param0); } sub_0200E130(param0, param2); @@ -212,12 +212,12 @@ void sub_0200E060(Window *param0, u8 param1, u16 param2, u8 param3) void sub_0200E084(Window *param0, u8 param1) { - u8 v0 = sub_0201C290(param0); + u8 v0 = Window_GetBgLayer(param0); - sub_02019CB8(param0->bgConfig, v0, 0, sub_0201C29C(param0) - 2, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 5, sub_0201C298(param0) + 2, 0); + Bg_FillTilemapRect(param0->bgConfig, v0, 0, Window_GetXPos(param0) - 2, Window_GetYPos(param0) - 1, Window_GetWidth(param0) + 5, Window_GetHeight(param0) + 2, 0); if (param1 == 0) { - sub_0201ACF4(param0); + Window_ClearAndCopyToVRAM(param0); } } @@ -234,7 +234,7 @@ static void sub_0200E0EC(void *param0, u16 param1, u16 param2, u16 param3, u16 p v1.width = param6; v1.height = param7; - sub_0201A1E4(&v0, &v1, param1, param2, param8, param9, param10, param11, 0); + Bitmap_BlitRect4bpp(&v0, &v1, param1, param2, param8, param9, param10, param11, 0); } static void sub_0200E130(Window *param0, u16 param1) @@ -247,10 +247,10 @@ static void sub_0200E130(Window *param0, u16 param1) u8 v5; u8 v6; - v0 = sub_02018364(param0->bgConfig); - v5 = sub_0201C290(param0); + v0 = BgConfig_GetHeapID(param0->bgConfig); + v5 = Window_GetBgLayer(param0); v1 = Heap_AllocFromHeap(v0, (0x20 * 4 * 3)); - v2 = sub_02019F28(v5); + v2 = Bg_GetCharPtr(v5); { NNSG2dCharacterData *v7; @@ -267,7 +267,7 @@ static void sub_0200E130(Window *param0, u16 param1) } sub_0200E0EC(v3, 4, 0, 12, 16 * 3, v1, 12, 16 * 3, 1, 0, 12, 16 * 3); - sub_0201958C(param0->bgConfig, v5, v1, (0x20 * 4 * 3), param1 + 18); + Bg_LoadTiles(param0->bgConfig, v5, v1, (0x20 * 4 * 3), param1 + 18); TextPrinter_SetScrollArrowBaseTile(param1); Heap_FreeToHeap(v4); Heap_FreeToHeap(v1); @@ -301,7 +301,7 @@ void sub_0200E218(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, v2[v3] = (v4 << 4) | v5; } - sub_0201958C(param0, param1, v2, 0x20 * 18, param2); + Bg_LoadTiles(param0, param1, v2, 0x20 * 18, param2); Heap_FreeToHeap(v0); Heap_FreeToHeap(v2); } @@ -320,7 +320,7 @@ void sub_0200E2A4(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, NNS_G2dGetUnpackedPaletteData(v1, &v0); v2 = (u16 *)v0->pRawData; - sub_0201972C(param1, (void *)&v2[param4 * 16], 0x20, param3 * 0x20); + Bg_LoadPalette(param1, (void *)&v2[param4 * 16], 0x20, param3 * 0x20); Heap_FreeToHeapExplicit(param6, v1); } @@ -342,24 +342,24 @@ static void sub_0200E31C(BgConfig *param0, u8 param1, u16 param2, u8 param3, u16 static void sub_0200E354(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) { - sub_02019CB8(param0, param1, param7, param2 - 9, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 1, param2 - 8, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 2, param2 - 7, param3 - 1, param4 + 7, 1, param6); - sub_02019CB8(param0, param1, param7 + 3, param2 + param4, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 4, param2 + param4 + 1, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 5, param2 + param4 + 2, param3 - 1, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 6, param2 - 9, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 7, param2 - 8, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 8, param2 - 1, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 9, param2 + param4, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 10, param2 + param4 + 1, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 11, param2 + param4 + 2, param3, 1, param5, param6); - sub_02019CB8(param0, param1, param7 + 12, param2 - 9, param3 + param5, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 13, param2 - 8, param3 + param5, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 14, param2 - 7, param3 + param5, param4 + 7, 1, param6); - sub_02019CB8(param0, param1, param7 + 15, param2 + param4, param3 + param5, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 16, param2 + param4 + 1, param3 + param5, 1, 1, param6); - sub_02019CB8(param0, param1, param7 + 17, param2 + param4 + 2, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7, param2 - 9, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 1, param2 - 8, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 2, param2 - 7, param3 - 1, param4 + 7, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 3, param2 + param4, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 4, param2 + param4 + 1, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 5, param2 + param4 + 2, param3 - 1, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 6, param2 - 9, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 7, param2 - 8, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 8, param2 - 1, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 9, param2 + param4, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 10, param2 + param4 + 1, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 11, param2 + param4 + 2, param3, 1, param5, param6); + Bg_FillTilemapRect(param0, param1, param7 + 12, param2 - 9, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 13, param2 - 8, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 14, param2 - 7, param3 + param5, param4 + 7, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 15, param2 + param4, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 16, param2 + param4 + 1, param3 + param5, 1, 1, param6); + Bg_FillTilemapRect(param0, param1, param7 + 17, param2 + param4 + 2, param3 + param5, 1, 1, param6); } static void sub_0200E61C(Window *param0, u16 param1, u8 param2) @@ -368,30 +368,30 @@ static void sub_0200E61C(Window *param0, u16 param1, u8 param2) u16 v2, v3; u8 v4; - v4 = sub_0201C290(param0); - v2 = sub_0201C29C(param0) - 7; - v3 = sub_0201C2A0(param0); + v4 = Window_GetBgLayer(param0); + v2 = Window_GetXPos(param0) - 7; + v3 = Window_GetYPos(param0); for (v0 = 0; v0 < 4; v0++) { for (v1 = 0; v1 < 6; v1++) { - sub_02019CB8(param0->bgConfig, v4, param1 + v0 * 6 + v1, v2 + v1, v3 + v0, 1, 1, param2); + Bg_FillTilemapRect(param0->bgConfig, v4, param1 + v0 * 6 + v1, v2 + v1, v3 + v0, 1, 1, param2); } } } void sub_0200E69C(Window *param0, u8 param1, u16 param2, u8 param3, u8 param4) { - u8 v0 = sub_0201C290(param0); + u8 v0 = Window_GetBgLayer(param0); if ((param4 == 0) || (param4 == 1)) { - sub_0200E354(param0->bgConfig, v0, sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param3, param2); + sub_0200E354(param0->bgConfig, v0, Window_GetXPos(param0), Window_GetYPos(param0), Window_GetWidth(param0), Window_GetHeight(param0), param3, param2); sub_0200E61C(param0, param2 + (18 + 12), param3); } else { - sub_0200DD7C(param0->bgConfig, v0, sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param3, param2); + sub_0200DD7C(param0->bgConfig, v0, Window_GetXPos(param0), Window_GetYPos(param0), Window_GetWidth(param0), Window_GetHeight(param0), param3, param2); } if (param1 == 0) { - sub_0201A954(param0); + Window_CopyToVRAM(param0); } sub_0200E130(param0, param2); @@ -399,16 +399,16 @@ void sub_0200E69C(Window *param0, u8 param1, u16 param2, u8 param3, u8 param4) void sub_0200E744(Window *param0, u8 param1, u8 param2) { - u8 v0 = sub_0201C290(param0); + u8 v0 = Window_GetBgLayer(param0); if ((param1 == 0) || (param1 == 1)) { - sub_02019CB8(param0->bgConfig, v0, 0, sub_0201C29C(param0) - 9, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 11, sub_0201C298(param0) + 2, 0); + Bg_FillTilemapRect(param0->bgConfig, v0, 0, Window_GetXPos(param0) - 9, Window_GetYPos(param0) - 1, Window_GetWidth(param0) + 11, Window_GetHeight(param0) + 2, 0); } else { - sub_02019CB8(param0->bgConfig, v0, 0, sub_0201C29C(param0) - 2, sub_0201C2A0(param0) - 1, sub_0201C294(param0) + 5, sub_0201C298(param0) + 2, 0); + Bg_FillTilemapRect(param0->bgConfig, v0, 0, Window_GetXPos(param0) - 2, Window_GetYPos(param0) - 1, Window_GetWidth(param0) + 5, Window_GetHeight(param0) + 2, 0); } if (param2 == 0) { - sub_0201ACF4(param0); + Window_ClearAndCopyToVRAM(param0); } } @@ -423,9 +423,9 @@ void *sub_0200E7FC(Window *param0, u32 param1) u8 v6; u8 v7; - v1 = sub_02018364(param0->bgConfig); - v6 = sub_0201C290(param0); - v2 = sub_02019F28(v6); + v1 = BgConfig_GetHeapID(param0->bgConfig); + v6 = Window_GetBgLayer(param0); + v2 = Bg_GetCharPtr(v6); v0 = Heap_AllocFromHeap(v1, sizeof(UnkStruct_0200E924)); memcpy(v0->unk_404, &v2[(param1 + 18) * 0x20], 0x20 * 4); @@ -469,34 +469,34 @@ static void sub_0200E924(UnkStruct_0200E924 *param0, u32 param1) { u8 v0, v1, v2, v3; - v0 = sub_0201C290(param0->unk_00); - v1 = sub_0201C29C(param0->unk_00); - v2 = sub_0201C2A0(param0->unk_00); - v3 = sub_0201C294(param0->unk_00); + v0 = Window_GetBgLayer(param0->unk_00); + v1 = Window_GetXPos(param0->unk_00); + v2 = Window_GetYPos(param0->unk_00); + v3 = Window_GetWidth(param0->unk_00); if (param1 == 2) { - sub_0201958C(param0->unk_00->bgConfig, v0, param0->unk_404, 0x20 * 4, param0->unk_484 + 18); - sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 10, v1 + v3 + 1, v2 + 2, 1, 1, 16); - sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 11, v1 + v3 + 2, v2 + 2, 1, 1, 16); - sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 10, v1 + v3 + 1, v2 + 3, 1, 1, 16); - sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 11, v1 + v3 + 2, v2 + 3, 1, 1, 16); - sub_02019448(param0->unk_00->bgConfig, v0); + Bg_LoadTiles(param0->unk_00->bgConfig, v0, param0->unk_404, 0x20 * 4, param0->unk_484 + 18); + Bg_FillTilemapRect(param0->unk_00->bgConfig, v0, param0->unk_484 + 10, v1 + v3 + 1, v2 + 2, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_00->bgConfig, v0, param0->unk_484 + 11, v1 + v3 + 2, v2 + 2, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_00->bgConfig, v0, param0->unk_484 + 10, v1 + v3 + 1, v2 + 3, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_00->bgConfig, v0, param0->unk_484 + 11, v1 + v3 + 2, v2 + 3, 1, 1, 16); + Bg_CopyTilemapBufferToVRAM(param0->unk_00->bgConfig, v0); return; } - sub_0201958C( + Bg_LoadTiles( param0->unk_00->bgConfig, v0, ¶m0->unk_04[0x20 * 4 * param0->unk_487_0], 0x20 * 4, param0->unk_484 + 18); if (param1 == 0) { return; } - sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 18, v1 + v3 + 1, v2 + 2, 1, 1, 16); - sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 19, v1 + v3 + 2, v2 + 2, 1, 1, 16); - sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 20, v1 + v3 + 1, v2 + 3, 1, 1, 16); - sub_02019CB8(param0->unk_00->bgConfig, v0, param0->unk_484 + 21, v1 + v3 + 2, v2 + 3, 1, 1, 16); - sub_02019448(param0->unk_00->bgConfig, v0); + Bg_FillTilemapRect(param0->unk_00->bgConfig, v0, param0->unk_484 + 18, v1 + v3 + 1, v2 + 2, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_00->bgConfig, v0, param0->unk_484 + 19, v1 + v3 + 2, v2 + 2, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_00->bgConfig, v0, param0->unk_484 + 20, v1 + v3 + 1, v2 + 3, 1, 1, 16); + Bg_FillTilemapRect(param0->unk_00->bgConfig, v0, param0->unk_484 + 21, v1 + v3 + 2, v2 + 3, 1, 1, 16); + Bg_CopyTilemapBufferToVRAM(param0->unk_00->bgConfig, v0); } static void sub_0200EB20(SysTask *param0, void *param1) @@ -552,7 +552,7 @@ u8 *sub_0200EBF0(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u sub_0200EDD4(v0, param2, param3); sub_0200EE24(&v0->unk_00, param6, param7); sub_0200EF7C(v0, param4, param5); - sub_02019448(param0, param1); + Bg_CopyTilemapBufferToVRAM(param0, param1); return &v0->unk_1D3; } @@ -566,7 +566,7 @@ u8 *sub_0200EC48(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u sub_0200EDD4(v0, param2, param3); sub_0200EE64(&v0->unk_00, param6); sub_0200EF7C(v0, param4, param5); - sub_02019448(param0, param1); + Bg_CopyTilemapBufferToVRAM(param0, param1); return &v0->unk_1D3; } @@ -702,20 +702,20 @@ static void sub_0200EE98(UnkStruct_ov5_021D30A8 *param0, ArchivedSprite *param1) static void sub_0200EF7C(UnkStruct_0200ED50 *param0, u8 param1, u16 param2) { - sub_02019CB8(param0->unk_1CC, param0->unk_1D0, param2, param0->unk_1D1 - 1, param0->unk_1D2 - 1, 1, 1, param1); - sub_02019CB8(param0->unk_1CC, param0->unk_1D0, param2 + 1, param0->unk_1D1, param0->unk_1D2 - 1, 10, 1, param1); - sub_02019CB8(param0->unk_1CC, param0->unk_1D0, param2 + 2, param0->unk_1D1 + 10, param0->unk_1D2 - 1, 1, 1, param1); - sub_02019CB8(param0->unk_1CC, param0->unk_1D0, param2 + 4, param0->unk_1D1, param0->unk_1D2, 10, 10, param1); - sub_02019CB8(param0->unk_1CC, param0->unk_1D0, param2 + 3, param0->unk_1D1 - 1, param0->unk_1D2, 1, 10, param1); - sub_02019CB8(param0->unk_1CC, param0->unk_1D0, param2 + 5, param0->unk_1D1 + 10, param0->unk_1D2, 1, 10, param1); - sub_02019CB8(param0->unk_1CC, param0->unk_1D0, param2 + 6, param0->unk_1D1 - 1, param0->unk_1D2 + 10, 1, 1, param1); - sub_02019CB8(param0->unk_1CC, param0->unk_1D0, param2 + 7, param0->unk_1D1, param0->unk_1D2 + 10, 10, 1, param1); - sub_02019CB8(param0->unk_1CC, param0->unk_1D0, param2 + 8, param0->unk_1D1 + 10, param0->unk_1D2 + 10, 1, 1, param1); - sub_0201C3C0(param0->unk_1CC, param0->unk_1D0); + Bg_FillTilemapRect(param0->unk_1CC, param0->unk_1D0, param2, param0->unk_1D1 - 1, param0->unk_1D2 - 1, 1, 1, param1); + Bg_FillTilemapRect(param0->unk_1CC, param0->unk_1D0, param2 + 1, param0->unk_1D1, param0->unk_1D2 - 1, 10, 1, param1); + Bg_FillTilemapRect(param0->unk_1CC, param0->unk_1D0, param2 + 2, param0->unk_1D1 + 10, param0->unk_1D2 - 1, 1, 1, param1); + Bg_FillTilemapRect(param0->unk_1CC, param0->unk_1D0, param2 + 4, param0->unk_1D1, param0->unk_1D2, 10, 10, param1); + Bg_FillTilemapRect(param0->unk_1CC, param0->unk_1D0, param2 + 3, param0->unk_1D1 - 1, param0->unk_1D2, 1, 10, param1); + Bg_FillTilemapRect(param0->unk_1CC, param0->unk_1D0, param2 + 5, param0->unk_1D1 + 10, param0->unk_1D2, 1, 10, param1); + Bg_FillTilemapRect(param0->unk_1CC, param0->unk_1D0, param2 + 6, param0->unk_1D1 - 1, param0->unk_1D2 + 10, 1, 1, param1); + Bg_FillTilemapRect(param0->unk_1CC, param0->unk_1D0, param2 + 7, param0->unk_1D1, param0->unk_1D2 + 10, 10, 1, param1); + Bg_FillTilemapRect(param0->unk_1CC, param0->unk_1D0, param2 + 8, param0->unk_1D1 + 10, param0->unk_1D2 + 10, 1, 1, param1); + Bg_ScheduleTilemapTransfer(param0->unk_1CC, param0->unk_1D0); } static void sub_0200F12C(UnkStruct_0200ED50 *param0) { - sub_02019CB8(param0->unk_1CC, param0->unk_1D0, 0, param0->unk_1D1 - 1, param0->unk_1D2 - 1, 12, 12, 0); - sub_0201C3C0(param0->unk_1CC, param0->unk_1D0); + Bg_FillTilemapRect(param0->unk_1CC, param0->unk_1D0, 0, param0->unk_1D1 - 1, param0->unk_1D2 - 1, 12, 12, 0); + Bg_ScheduleTilemapTransfer(param0->unk_1CC, param0->unk_1D0); } diff --git a/src/unk_0201567C.c b/src/unk_0201567C.c index 19347e10d1..59a4511222 100644 --- a/src/unk_0201567C.c +++ b/src/unk_0201567C.c @@ -154,13 +154,13 @@ static u8 sub_020157E4(UnkStruct_020157E4 *param0) static void sub_02015840(void *param0, u16 *param1) { UnkStruct_020157E4 *v0 = (UnkStruct_020157E4 *)param0; - sub_0201972C(0, param1, 0x20, v0->unk_4D * 0x20); + Bg_LoadPalette(0, param1, 0x20, v0->unk_4D * 0x20); } static void sub_02015858(void *param0, u16 *param1) { UnkStruct_020157E4 *v0 = (UnkStruct_020157E4 *)param0; - sub_0201972C(4, param1, 0x20, v0->unk_4D * 0x20); + Bg_LoadPalette(4, param1, 0x20, v0->unk_4D * 0x20); } static void sub_02015870(void *param0, u16 *param1) diff --git a/src/unk_02015920.c b/src/unk_02015920.c index 10fb18f955..57c4c640a1 100644 --- a/src/unk_02015920.c +++ b/src/unk_02015920.c @@ -323,8 +323,8 @@ static void sub_02015D00(UnkStruct_02015C38 *param0) { int v0; - sub_02019CB8(param0->unk_00, param0->unk_04, 0, param0->unk_34, param0->unk_35, param0->unk_18[0]->screenWidth / 8, param0->unk_18[0]->screenHeight / 8, 0); - sub_0201C3C0(param0->unk_00, param0->unk_04); + Bg_FillTilemapRect(param0->unk_00, param0->unk_04, 0, param0->unk_34, param0->unk_35, param0->unk_18[0]->screenWidth / 8, param0->unk_18[0]->screenHeight / 8, 0); + Bg_ScheduleTilemapTransfer(param0->unk_00, param0->unk_04); for (v0 = 0; v0 < 4; v0++) { Heap_FreeToHeap(param0->unk_08[v0]); @@ -400,7 +400,7 @@ static void sub_02015E64(SysTask *param0, void *param1) DC_FlushRange(v0->unk_04->pRawData, v0->unk_04->szByte); - sub_0201958C(v0->unk_00, v0->unk_0C, v0->unk_04->pRawData, v0->unk_04->szByte, v0->unk_10); + Bg_LoadTiles(v0->unk_00, v0->unk_0C, v0->unk_04->pRawData, v0->unk_04->szByte, v0->unk_10); SysTask_Done(param0); Heap_FreeToHeap(v0->unk_08); Heap_FreeToHeap(v0); @@ -425,8 +425,8 @@ static void sub_02015EA0(SysTask *param0, void *param1) static void sub_02015EE8(BgConfig *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4) { - sub_020198E8(param0, param1, param3, param4, param2->screenWidth / 8, param2->screenHeight / 8, param2->rawData, 0, 0, param2->screenWidth / 8, param2->screenHeight / 8); - sub_0201C3C0(param0, param1); + Bg_CopyToTilemapRect(param0, param1, param3, param4, param2->screenWidth / 8, param2->screenHeight / 8, param2->rawData, 0, 0, param2->screenWidth / 8, param2->screenHeight / 8); + Bg_ScheduleTilemapTransfer(param0, param1); } static void sub_02015F34(const NNSG2dScreenData *param0, int param1) diff --git a/src/unk_02039814.c b/src/unk_02039814.c index 09dc76f016..e5441729ce 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -133,16 +133,16 @@ void sub_02039834(int param0, int param1, int param2) GXS_SetVisibleWnd(GX_WNDMASK_NONE); GXLayers_SetBanks(&Unk_020E5EFC); - v0 = sub_02018340(param0); + v0 = BgConfig_New(param0); - sub_02018368(&Unk_020E5ED0); - sub_020183C4(v0, 0, &Unk_020E5EE0, 0); - sub_02019EBC(v0, 0); + SetAllGraphicsModes(&Unk_020E5ED0); + Bg_InitFromTemplate(v0, 0, &Unk_020E5EE0, 0); + Bg_ClearTilemap(v0, 0); sub_0200DAA4(v0, 0, (512 - 9), 2, 0, param0); Font_LoadTextPalette(0, 1 * (2 * 16), param0); - sub_02019690(0, 32, 0, param0); - sub_0201975C(0, 0x6c21); - sub_0201975C(4, 0x6c21); + Bg_ClearTilesRange(0, 32, 0, param0); + Bg_MaskPalette(0, 0x6c21); + Bg_MaskPalette(4, 0x6c21); v2 = MessageLoader_Init(1, 26, 214, param0); v3 = Strbuf_Init(0x180, param0); @@ -150,8 +150,8 @@ void sub_02039834(int param0, int param1, int param2) Text_ResetAllPrinters(); v5 = StringTemplate_Default(param0); - sub_0201A8D4(v0, &v1, &Unk_020E5EC8); - BGL_WindowColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); + Window_AddFromTemplate(v0, &v1, &Unk_020E5EC8); + Window_FillRectWithColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); Window_Show(&v1, 0, (512 - 9), 2); StringTemplate_SetNumber(v5, 0, param2, 5, 2, 1); @@ -166,7 +166,7 @@ void sub_02039834(int param0, int param1, int param2) sub_0200F338(1); sub_0200AB4C(0, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), 3); - BGL_DeleteWindow(&v1); + Window_Remove(&v1); MessageLoader_Free(v2); StringTemplate_Free(v5); Heap_FreeToHeap(v0); diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index a34b7cfe9f..e5c55e5e7c 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -96,23 +96,23 @@ void sub_02039A64(int param0, int param1) GXS_SetVisibleWnd(GX_WNDMASK_NONE); GXLayers_SetBanks(&Unk_020E5F7C); - v0 = sub_02018340(param0); + v0 = BgConfig_New(param0); - sub_02018368(&Unk_020E5F50); - sub_020183C4(v0, 0, &Unk_020E5F60, 0); - sub_02019EBC(v0, 0); + SetAllGraphicsModes(&Unk_020E5F50); + Bg_InitFromTemplate(v0, 0, &Unk_020E5F60, 0); + Bg_ClearTilemap(v0, 0); sub_0200DAA4(v0, 0, (512 - 9), 2, 0, param0); Font_LoadTextPalette(0, 1 * (2 * 16), param0); - sub_02019690(0, 32, 0, param0); - sub_0201975C(0, 0x6c21); - sub_0201975C(4, 0x6c21); + Bg_ClearTilesRange(0, 32, 0, param0); + Bg_MaskPalette(0, 0x6c21); + Bg_MaskPalette(4, 0x6c21); v2 = MessageLoader_Init(1, 26, 695, param0); v3 = Strbuf_Init(0x180, param0); Text_ResetAllPrinters(); - sub_0201A8D4(v0, &v1, &Unk_020E5F48); - BGL_WindowColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); + Window_AddFromTemplate(v0, &v1, &Unk_020E5F48); + Window_FillRectWithColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); Window_Show(&v1, 0, (512 - 9), 2); MessageLoader_GetStrbuf(v2, v4, v3); Text_AddPrinterWithParams(&v1, FONT_SYSTEM, v3, 0, 0, TEXT_SPEED_INSTANT, NULL); @@ -134,17 +134,17 @@ void sub_02039A64(int param0, int param1) OS_WaitIrq(1, OS_IE_V_BLANK); } - BGL_DeleteWindow(&v1); + Window_Remove(&v1); MessageLoader_Free(v2); - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); - sub_02019044(v0, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); + Bg_FreeTilemapBuffer(v0, 0); Heap_FreeToHeap(v0); } diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index 75ded8d36f..77bba6c2e8 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -97,8 +97,8 @@ static void sub_020528D0(BgConfig *param0) }; GXLayers_SetBanks(&v0); - sub_02018368(&v1); - sub_020183C4(param0, 3, &v2, 0); + SetAllGraphicsModes(&v1); + Bg_InitFromTemplate(param0, 3, &v2, 0); sub_02006E84(14, 6, 0, 13 * 0x20, 0x20, 11); } @@ -116,14 +116,14 @@ static void sub_02052914(FieldSystem *fieldSystem, TaskManager *param1) v0->unk_00 = 0; v0->fieldSystem = fieldSystem; - v0->unk_08 = sub_02018340(11); + v0->unk_08 = BgConfig_New(11); sub_020528D0(v0->unk_08); v0->unk_1C = MessageLoader_Init(1, 26, 373, 11); v0->unk_20 = StringTemplate_Default(11); - sub_0201A8D4(v0->unk_08, &v0->unk_0C, &Unk_020EC2F0); + Window_AddFromTemplate(v0->unk_08, &v0->unk_0C, &Unk_020EC2F0); StringTemplate_SetPlayerName(v0->unk_20, 0, SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem))); if (fieldSystem->location->mapId == 414) { @@ -132,7 +132,7 @@ static void sub_02052914(FieldSystem *fieldSystem, TaskManager *param1) sub_02052AA4(v0, 3, 0, 0); } - sub_0201A954(&v0->unk_0C); + Window_CopyToVRAM(&v0->unk_0C); FieldTask_Start(param1, sub_020529C4, v0); return; @@ -160,16 +160,16 @@ static BOOL sub_020529C4(TaskManager *param0) break; case 3: if (ScreenWipe_Done()) { - BGL_FillWindow(&v0->unk_0C, 0); + Window_FillTilemap(&v0->unk_0C, 0); v0->unk_00++; } break; case 4: sub_0200E084(&v0->unk_0C, 0); - BGL_DeleteWindow(&v0->unk_0C); + Window_Remove(&v0->unk_0C); StringTemplate_Free(v0->unk_20); MessageLoader_Free(v0->unk_1C); - sub_02019044(v0->unk_08, 3); + Bg_FreeTilemapBuffer(v0->unk_08, 3); Heap_FreeToHeap(v0->unk_08); Heap_FreeToHeap(v0); @@ -184,7 +184,7 @@ static void sub_02052AA4(UnkStruct_02052AA4 *param0, u16 param1, u8 param2, u8 p Strbuf *v0 = Strbuf_Init(1024, 11); Strbuf *v1 = Strbuf_Init(1024, 11); - BGL_FillWindow(¶m0->unk_0C, 0); + Window_FillTilemap(¶m0->unk_0C, 0); MessageLoader_GetStrbuf(param0->unk_1C, param1, v0); StringTemplate_Format(param0->unk_20, v1, v0); diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index c593aa2549..342891c02e 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -259,12 +259,12 @@ static void sub_02052F28(FieldSystem *fieldSystem, UnkStruct_0205300C *param1) GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); - sub_02018368(&v1); - sub_0201975C(3, 0x0); - sub_020183C4(fieldSystem->unk_08, 3, &v2, 0); - sub_02019690(3, 0x20, 0, 32); - sub_02019CB8(fieldSystem->unk_08, 3, 0x0, 0, 0, 32, 32, 17); - sub_02019448(fieldSystem->unk_08, 3); + SetAllGraphicsModes(&v1); + Bg_MaskPalette(3, 0x0); + Bg_InitFromTemplate(fieldSystem->unk_08, 3, &v2, 0); + Bg_ClearTilesRange(3, 0x20, 0, 32); + Bg_FillTilemapRect(fieldSystem->unk_08, 3, 0x0, 0, 0, 32, 32, 17); + Bg_CopyTilemapBufferToVRAM(fieldSystem->unk_08, 3); } static void sub_02052FA8(FieldSystem *fieldSystem, UnkStruct_0205300C *param1) @@ -317,9 +317,9 @@ static void sub_02053098(FieldSystem *fieldSystem, UnkStruct_0205300C *param1) Strbuf_Free(param1->unk_2C); } - if (BGL_WindowAdded(¶m1->unk_1C)) { - BGL_DeleteWindow(¶m1->unk_1C); + if (Window_IsInUse(¶m1->unk_1C)) { + Window_Remove(¶m1->unk_1C); } - sub_02019044(fieldSystem->unk_08, 3); + Bg_FreeTilemapBuffer(fieldSystem->unk_08, 3); } diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index e372605bc4..44ebb30c98 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -619,7 +619,7 @@ static int sub_0205AA50(UnkStruct_0205A0D8 *param0, const Strbuf *param1) { Window *v0 = &(param0->unk_14); - if (BGL_WindowAdded(v0) == 0) { + if (Window_IsInUse(v0) == 0) { FieldMessage_AddWindow(param0->fieldSystem->unk_08, v0, 3); FieldMessage_DrawWindow(v0, SaveData_Options(param0->fieldSystem->saveData)); } else { @@ -631,23 +631,23 @@ static int sub_0205AA50(UnkStruct_0205A0D8 *param0, const Strbuf *param1) static void sub_0205AAA0(UnkStruct_0205A0D8 *param0, BOOL param1) { - if (BGL_WindowAdded(&(param0->unk_14))) { + if (Window_IsInUse(&(param0->unk_14))) { if (param1) { sub_0200E084(¶m0->unk_14, 0); - sub_0201ACF4(¶m0->unk_14); + Window_ClearAndCopyToVRAM(¶m0->unk_14); } - BGL_DeleteWindow(¶m0->unk_14); + Window_Remove(¶m0->unk_14); Window_Init(¶m0->unk_14); } - if (BGL_WindowAdded(&(param0->unk_54))) { - BGL_DeleteWindow(¶m0->unk_54); + if (Window_IsInUse(&(param0->unk_54))) { + Window_Remove(¶m0->unk_54); Window_Init(¶m0->unk_54); } - if (BGL_WindowAdded(&(param0->unk_64))) { - BGL_DeleteWindow(¶m0->unk_64); + if (Window_IsInUse(&(param0->unk_64))) { + Window_Remove(¶m0->unk_64); Window_Init(¶m0->unk_64); } } @@ -867,16 +867,16 @@ static void sub_0205ADF8(UnkStruct_0205A0D8 *param0, int param1) { Window *v0 = &(param0->unk_54); - if (BGL_WindowAdded(v0) == 0) { + if (Window_IsInUse(v0) == 0) { int v1, v2, v3; MessageLoader *v4; v4 = MessageLoader_Init(1, 26, 412, 4); v3 = Pokemon_GetStructSize(); - BGL_AddWindow(param0->fieldSystem->unk_08, v0, 3, 21, 9, 10, 8, 13, 10); + Window_Add(param0->fieldSystem->unk_08, v0, 3, 21, 9, 10, 8, 13, 10); sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1, 11, 0, 4); - BGL_FillWindow(v0, 15); + Window_FillTilemap(v0, 15); for (v1 = 0; v1 < 3; v1++) { v2 = Pokemon_GetValue((Pokemon *)(¶m0->unk_48[v1 * v3]), MON_DATA_SPECIES, NULL); @@ -890,7 +890,7 @@ static void sub_0205ADF8(UnkStruct_0205A0D8 *param0, int param1) MessageLoader_Free(v4); } - BGL_WindowColor(v0, 15, 0, 0, 16, v0->height * 8); + Window_FillRectWithColor(v0, 15, 0, 0, 16, v0->height * 8); ColoredArrow_Print(param0->unk_78, ¶m0->unk_54, 0, param1 * 16); Window_Show(¶m0->unk_54, 0, 1, 11); @@ -903,12 +903,12 @@ static void sub_0205AF18(UnkStruct_0205A0D8 *param0, int param1) { Window *v0 = &(param0->unk_64); - if (BGL_WindowAdded(v0) == 0) { + if (Window_IsInUse(v0) == 0) { int v1; - BGL_AddWindow(param0->fieldSystem->unk_08, v0, 3, 20, 11, 11, 6, 13, 90); + Window_Add(param0->fieldSystem->unk_08, v0, 3, 20, 11, 11, 6, 13, 90); sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1, 11, 0, 4); - BGL_FillWindow(v0, 15); + Window_FillTilemap(v0, 15); for (v1 = 0; v1 < 3; v1++) { MessageLoader_GetStrbuf(param0->unk_2C, 22 + v1, param0->unk_0C); @@ -920,7 +920,7 @@ static void sub_0205AF18(UnkStruct_0205A0D8 *param0, int param1) param0->unk_7C = v0; param0->unk_81 = param1; - BGL_WindowColor(v0, 15, 0, 0, 16, v0->height * 8); + Window_FillRectWithColor(v0, 15, 0, 0, 16, v0->height * 8); ColoredArrow_Print(param0->unk_78, param0->unk_7C, 0, param1 * 16); Window_Show(param0->unk_7C, 0, 1, 11); } @@ -957,9 +957,9 @@ static int sub_0205AFE4(UnkStruct_0205A0D8 *param0) } while (0); Sound_PlayEffect(1500); - BGL_WindowColor(param0->unk_7C, 15, 0, 0, 16, param0->unk_7C->height * 8); + Window_FillRectWithColor(param0->unk_7C, 15, 0, 0, 16, param0->unk_7C->height * 8); ColoredArrow_Print(param0->unk_78, param0->unk_7C, 0, param0->unk_81 * 16); - sub_0201ACCC(param0->unk_7C); + Window_LoadTiles(param0->unk_7C); return 0; } @@ -1034,7 +1034,7 @@ static BOOL sub_0205B140(TaskManager *param0) Strbuf_Free(v1->unk_00); Strbuf_Free(v1->unk_04); sub_0200E084(&v1->unk_08, 0); - BGL_DeleteWindow(&v1->unk_08); + Window_Remove(&v1->unk_08); ov5_021D1744(0); v1->unk_28++; } diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c index e582af585e..65959cdde1 100644 --- a/src/unk_0205CA94.c +++ b/src/unk_0205CA94.c @@ -198,7 +198,7 @@ void sub_0205CBFC(SysTask *param0, void *param1) v0->unk_1E4++; break; case 1: - sub_0201972C(4, &v3, 2, 0); + Bg_LoadPalette(4, &v3, 2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); sub_0205D274(v0, &v0->unk_1C0[0], 2); diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c index 9a8921b596..8f9adeb3c9 100644 --- a/src/unk_0205D8CC.c +++ b/src/unk_0205D8CC.c @@ -24,22 +24,22 @@ void sub_0205D8CC(u32 param0, u32 param1) void FieldMessage_AddWindow(BgConfig *param0, Window *param1, u32 param2) { if (param2 == 3) { - BGL_AddWindow(param0, param1, 3, 2, 19, 27, 4, 12, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4))); + Window_Add(param0, param1, 3, 2, 19, 27, 4, 12, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4))); } else { - BGL_AddWindow(param0, param1, 7, 2, 19, 27, 4, 12, (512 - (27 * 4))); + Window_Add(param0, param1, 7, 2, 19, 27, 4, 12, (512 - (27 * 4))); } } void FieldMessage_DrawWindow(Window *param0, const Options *param1) { - sub_0200DD0C(param0->bgConfig, sub_0201C290(param0), 1024 - (18 + 12), 10, Options_Frame(param1), 4); + sub_0200DD0C(param0->bgConfig, Window_GetBgLayer(param0), 1024 - (18 + 12), 10, Options_Frame(param1), 4); sub_0205D988(param0); sub_0200E060(param0, 0, 1024 - (18 + 12), 10); } void sub_0205D988(Window *param0) { - BGL_FillWindow(param0, 15); + Window_FillTilemap(param0, 15); } u8 FieldMessage_Print(Window *param0, Strbuf *param1, const Options *param2, u8 param3) @@ -85,15 +85,15 @@ void sub_0205DA1C(BgConfig *param0, Window *param1, u16 param2, u16 param3) } if (param3 == 3) { - BGL_AddWindow(param0, param1, 3, v0, 19, v1, 4, 9, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4))); + Window_Add(param0, param1, 3, v0, 19, v1, 4, 9, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4))); } else { - BGL_AddWindow(param0, param1, 7, v0, 19, v1, 4, 9, (512 - (27 * 4))); + Window_Add(param0, param1, 7, v0, 19, v1, 4, 9, (512 - (27 * 4))); } } void sub_0205DA80(Window *param0, u16 param1, u16 param2) { - sub_0200E2A4(param0->bgConfig, sub_0201C290(param0), ((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)), 9, param1, param2, 4); - BGL_FillWindow(param0, 15); + sub_0200E2A4(param0->bgConfig, Window_GetBgLayer(param0), ((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)), 9, param1, param2, 4); + Window_FillTilemap(param0, 15); sub_0200E69C(param0, 0, ((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)), 9, param1); } diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index 90205b457c..88b14fcc51 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -970,7 +970,7 @@ static BOOL sub_02068F48(TaskManager *param0) break; case 2: MapObjectMan_UnpauseAllMovement(fieldSystem->mapObjMan); - BGL_DeleteWindow(&v1->unk_00); + Window_Remove(&v1->unk_00); Strbuf_Free(v1->unk_10); Heap_FreeToHeap(v1); diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index 0fd7c47d7b..2e21af7925 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -391,7 +391,7 @@ static int sub_0206F658(UnkStruct_0206F7F8 *param0) switch (param0->unk_0C) { case 0: - BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); + Window_FillTilemap(¶m0->unk_E4, ((15 << 4) | 15)); param0->unk_1E = Text_AddPrinterWithParamsAndColor(¶m0->unk_E4, FONT_MESSAGE, param0->unk_2C.unk_68[1], 0, 0, param0->unk_1A, TEXT_COLOR(1, 2, 15), NULL); sub_0200D41C(param0->unk_2FC[0], 2); param0->unk_0C++; @@ -437,7 +437,7 @@ static int sub_0206F748(UnkStruct_0206F7F8 *param0) switch (param0->unk_0C) { case 0: Sound_PlayEffect(1522); - BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); + Window_FillTilemap(¶m0->unk_E4, ((15 << 4) | 15)); param0->unk_1E = Text_AddPrinterWithParamsAndColor(¶m0->unk_E4, FONT_MESSAGE, param0->unk_2C.unk_68[2], 0, 0, param0->unk_1A, TEXT_COLOR(1, 2, 15), NULL); sub_0200D41C(param0->unk_2FC[0], 2); param0->unk_0C++; @@ -581,36 +581,36 @@ static void sub_0206FAC0(UnkStruct_0206F7F8 *param0) static void sub_0206FB38(UnkStruct_0206F7F8 *param0) { - sub_02019690(1, 32 * (24 * (12 + 2) + 9 + 1), 0, param0->unk_00); - sub_02019CB8(param0->unk_D0, 1, 0x0, 0, 0, 32, 32, 17); - sub_0201C3C0(param0->unk_D0, 1); - sub_02019120(1, 1); + Bg_ClearTilesRange(1, 32 * (24 * (12 + 2) + 9 + 1), 0, param0->unk_00); + Bg_FillTilemapRect(param0->unk_D0, 1, 0x0, 0, 0, 32, 32, 17); + Bg_ScheduleTilemapTransfer(param0->unk_D0, 1); + Bg_ToggleLayer(1, 1); - param0->unk_10 = sub_0201A008(param0->unk_D0, 0); - param0->unk_12 = sub_0201A008(param0->unk_D0, 1); + param0->unk_10 = Bg_GetPriority(param0->unk_D0, 0); + param0->unk_12 = Bg_GetPriority(param0->unk_D0, 1); - BGL_SetPriority(0, 2); - BGL_SetPriority(1, 1); + Bg_SetPriority(0, 2); + Bg_SetPriority(1, 1); sub_0200DD0C(param0->unk_D0, 3, (1024 - (18 + 12)), 10, param0->unk_1C, param0->unk_00); sub_0200DAA4(param0->unk_D0, 3, (1024 - (18 + 12) - 9), 11, 0, param0->unk_00); sub_0200DAA4(param0->unk_D0, 1, (1024 - (18 + 12) - 9), 11, 0, param0->unk_00); Font_LoadTextPalette(0, 13 * 32, param0->unk_00); Font_LoadScreenIndicatorsPalette(0, 12 * 32, param0->unk_00); - BGL_AddWindow(param0->unk_D0, ¶m0->unk_E4, 3, 2, 19, 27, 4, 12, ((1024 - (18 + 12) - 9) - 27 * 4)); - BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); + Window_Add(param0->unk_D0, ¶m0->unk_E4, 3, 2, 19, 27, 4, 12, ((1024 - (18 + 12) - 9) - 27 * 4)); + Window_FillTilemap(¶m0->unk_E4, ((15 << 4) | 15)); } static void sub_0206FC4C(UnkStruct_0206F7F8 *param0) { sub_0200E084(¶m0->unk_E4, 1); - sub_0201ACF4(¶m0->unk_E4); - BGL_DeleteWindow(¶m0->unk_E4); - sub_02019690(1, 32 * (24 * (12 + 2) + 9 + 1), 0, param0->unk_00); - sub_02019CB8(param0->unk_D0, 1, 0x0, 0, 0, 32, 32, 17); - sub_0201C3C0(param0->unk_D0, 1); - sub_02019120(1, 0); - BGL_SetPriority(0, param0->unk_10); - BGL_SetPriority(1, param0->unk_12); + Window_ClearAndCopyToVRAM(¶m0->unk_E4); + Window_Remove(¶m0->unk_E4); + Bg_ClearTilesRange(1, 32 * (24 * (12 + 2) + 9 + 1), 0, param0->unk_00); + Bg_FillTilemapRect(param0->unk_D0, 1, 0x0, 0, 0, 32, 32, 17); + Bg_ScheduleTilemapTransfer(param0->unk_D0, 1); + Bg_ToggleLayer(1, 0); + Bg_SetPriority(0, param0->unk_10); + Bg_SetPriority(1, param0->unk_12); } static void sub_0206FCC4(UnkStruct_0206F7F8 *param0) @@ -688,8 +688,8 @@ static void sub_0206FDC0(UnkStruct_0206F7F8 *param0, u16 param1, u16 param2) v1 = param0->unk_18 + 1; param0->unk_C4 = sub_02013A04(v1, param0->unk_00); - BGL_AddWindow(param0->unk_D0, ¶m0->unk_D4, 1, 4, 1, 24, v1 * 2, 13, 1); - BGL_FillWindow(¶m0->unk_D4, ((15 << 4) | 15)); + Window_Add(param0->unk_D0, ¶m0->unk_D4, 1, 4, 1, 24, v1 * 2, 13, 1); + Window_FillTilemap(¶m0->unk_D4, ((15 << 4) | 15)); for (v0 = 0; v0 < param0->unk_18; v0++) { sub_02013A6C(param0->unk_C4, param0->unk_2C.unk_38[v0], v0); @@ -710,21 +710,21 @@ static void sub_0206FDC0(UnkStruct_0206F7F8 *param0, u16 param1, u16 param2) Window_Show(¶m0->unk_D4, 0, (1024 - (18 + 12) - 9), 11); sub_0200E060(¶m0->unk_E4, 1, (1024 - (18 + 12)), 10); - BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); + Window_FillTilemap(¶m0->unk_E4, ((15 << 4) | 15)); Text_AddPrinterWithParamsAndColor(¶m0->unk_E4, FONT_MESSAGE, param0->unk_2C.unk_10, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); SpriteActor_EnableObject(param0->unk_2FC[0], 1); - sub_0201C3C0(param0->unk_D0, 3); + Bg_ScheduleTilemapTransfer(param0->unk_D0, 3); } static void sub_0206FF10(UnkStruct_0206F7F8 *param0) { sub_02001384(param0->unk_C0, &(param0->unk_22), &(param0->unk_24)); sub_02013A3C(param0->unk_C4); - sub_0201ACF4(&(param0->unk_D4)); + Window_ClearAndCopyToVRAM(&(param0->unk_D4)); Window_Clear(&(param0->unk_D4), 0); - BGL_DeleteWindow(&(param0->unk_D4)); + Window_Remove(&(param0->unk_D4)); SpriteActor_EnableObject(param0->unk_2FC[0], 0); - sub_0201C3C0(param0->unk_D0, 3); + Bg_ScheduleTilemapTransfer(param0->unk_D0, 3); } static void sub_0206FF60(BmpList *param0, u32 param1, u8 param2) @@ -744,7 +744,7 @@ static void sub_0206FF60(BmpList *param0, u32 param1, u8 param2) static void sub_0206FFB4(UnkStruct_0206F7F8 *param0) { - BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); + Window_FillTilemap(¶m0->unk_E4, ((15 << 4) | 15)); Text_AddPrinterWithParamsAndColor(¶m0->unk_E4, FONT_MESSAGE, param0->unk_2C.unk_68[0], 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); } @@ -757,7 +757,7 @@ static void sub_0206FFE4(UnkStruct_0206F7F8 *param0) static void sub_02070010(UnkStruct_0206F7F8 *param0) { - BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); + Window_FillTilemap(¶m0->unk_E4, ((15 << 4) | 15)); Text_AddPrinterWithParamsAndColor(¶m0->unk_E4, FONT_MESSAGE, param0->unk_2C.unk_50[param0->unk_1F], 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); SpriteActor_EnableObject(param0->unk_2FC[0], 0); } @@ -771,7 +771,7 @@ static void sub_02070050(UnkStruct_0206F7F8 *param0, BOOL param1) v6 = &(param0->unk_324[param0->unk_1F]); v7 = &(Unk_020F0254[param0->unk_16][param0->unk_1F]); - BGL_FillWindow(¶m0->unk_D4, ((15 << 4) | 15)); + Window_FillTilemap(¶m0->unk_D4, ((15 << 4) | 15)); v1 = v6->unk_00; v2 = 1; @@ -809,7 +809,7 @@ static void sub_02070050(UnkStruct_0206F7F8 *param0, BOOL param1) } } - sub_0201A954(¶m0->unk_D4); + Window_CopyToVRAM(¶m0->unk_D4); param0->unk_21 = v3; @@ -826,23 +826,23 @@ static void sub_02070050(UnkStruct_0206F7F8 *param0, BOOL param1) static void sub_020701DC(UnkStruct_0206F7F8 *param0, u16 param1) { - BGL_AddWindow(param0->unk_D0, ¶m0->unk_D4, 1, 4, 1, 24, 12, 13, 1); + Window_Add(param0->unk_D0, ¶m0->unk_D4, 1, 4, 1, 24, 12, 13, 1); Window_Show(¶m0->unk_D4, 1, (1024 - (18 + 12) - 9), 11); sub_02070050(param0, 0); SpriteActor_EnableObject(param0->unk_2FC[1], 1); - BGL_AddWindow(param0->unk_D0, ¶m0->unk_F4, 3, 8, 14, 8, 2, 13, ((((1024 - (18 + 12) - 9) - 27 * 4) - 6 * 4) - (8 * 2))); - BGL_FillWindow(¶m0->unk_F4, ((0 << 4) | 0)); + Window_Add(param0->unk_D0, ¶m0->unk_F4, 3, 8, 14, 8, 2, 13, ((((1024 - (18 + 12) - 9) - 27 * 4) - 6 * 4) - (8 * 2))); + Window_FillTilemap(¶m0->unk_F4, ((0 << 4) | 0)); Text_AddPrinterWithParamsAndColor(¶m0->unk_F4, FONT_SYSTEM, param0->unk_2C.unk_14, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); - sub_0201C3C0(param0->unk_D0, 3); + Bg_ScheduleTilemapTransfer(param0->unk_D0, 3); } static void sub_02070288(UnkStruct_0206F7F8 *param0) { - sub_0201ACF4(¶m0->unk_D4); + Window_ClearAndCopyToVRAM(¶m0->unk_D4); Window_Clear(¶m0->unk_D4, 0); - BGL_DeleteWindow(¶m0->unk_D4); - sub_0201ACF4(¶m0->unk_F4); - BGL_DeleteWindow(¶m0->unk_F4); + Window_Remove(¶m0->unk_D4); + Window_ClearAndCopyToVRAM(¶m0->unk_F4); + Window_Remove(¶m0->unk_F4); SpriteActor_EnableObject(param0->unk_2FC[0], 0); SpriteActor_EnableObject(param0->unk_2FC[1], 0); } diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index 86d78a0ccb..93d6051818 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -684,10 +684,10 @@ static void sub_020729B4(UnkStruct_02072334 *param0) sub_0206A8A0(param0->unk_1A4, 200, 10, 138); sub_0206A8C4(param0->unk_1A4, 0, 1); sub_0206A8C4(param0->unk_1A4, 1, 1); - sub_0201A8D4(param0->unk_170, &(param0->unk_174), &v3[0]); - sub_0201A8D4(param0->unk_170, &(param0->unk_194), &v3[1]); - BGL_FillWindow(¶m0->unk_174, ((15 << 4) | 15)); - BGL_FillWindow(¶m0->unk_194, ((15 << 4) | 15)); + Window_AddFromTemplate(param0->unk_170, &(param0->unk_174), &v3[0]); + Window_AddFromTemplate(param0->unk_170, &(param0->unk_194), &v3[1]); + Window_FillTilemap(¶m0->unk_174, ((15 << 4) | 15)); + Window_FillTilemap(¶m0->unk_194, ((15 << 4) | 15)); param0->unk_164 = sub_02013A04(param0->unk_1B + 1, param0->unk_00); @@ -734,7 +734,7 @@ static void sub_020729B4(UnkStruct_02072334 *param0) Window_Show(¶m0->unk_174, 0, (1024 - (18 + 12) - 9), 11); Text_AddPrinterWithParamsAndColor(¶m0->unk_194, FONT_SYSTEM, param0->unk_110.unk_0C, 2, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); Window_Show(¶m0->unk_194, 0, (1024 - (18 + 12) - 9), 11); - sub_0201C3C0(param0->unk_170, 3); + Bg_ScheduleTilemapTransfer(param0->unk_170, 3); param0->unk_13B_0 = 0; } @@ -795,8 +795,8 @@ static void sub_02072C98(UnkStruct_02072334 *param0, u8 param1, u8 param2) v1 = NELEMS(Unk_020F0524); param0->unk_164 = sub_02013A04(v1, param0->unk_00); - sub_0201A8D4(param0->unk_170, &(param0->unk_174), &v2); - BGL_FillWindow(¶m0->unk_174, ((15 << 4) | 15)); + Window_AddFromTemplate(param0->unk_170, &(param0->unk_174), &v2); + Window_FillTilemap(¶m0->unk_174, ((15 << 4) | 15)); for (v0 = 0; v0 < v1; v0++) { sub_02013A4C(param0->unk_164, param0->unk_10C, Unk_020F0524[v0].unk_00, Unk_020F0524[v0].unk_04); @@ -814,7 +814,7 @@ static void sub_02072C98(UnkStruct_02072334 *param0, u8 param1, u8 param2) param0->unk_160 = sub_0200112C(&(param0->unk_140), param1, param2, param0->unk_00); Window_Show(¶m0->unk_174, 0, (1024 - (18 + 12) - 9), 11); - sub_0201C3C0(param0->unk_170, 3); + Bg_ScheduleTilemapTransfer(param0->unk_170, 3); param0->unk_13B_0 = 1; } @@ -833,13 +833,13 @@ static void sub_02072DB8(UnkStruct_02072334 *param0) sub_02001384(param0->unk_160, &v0, &v1); sub_02013A3C(param0->unk_164); - sub_0201ACF4(&(param0->unk_194)); + Window_ClearAndCopyToVRAM(&(param0->unk_194)); Window_Clear(&(param0->unk_194), 0); - BGL_DeleteWindow(&(param0->unk_194)); + Window_Remove(&(param0->unk_194)); - sub_0201ACF4(&(param0->unk_174)); + Window_ClearAndCopyToVRAM(&(param0->unk_174)); Window_Clear(&(param0->unk_174), 0); - BGL_DeleteWindow(&(param0->unk_174)); + Window_Remove(&(param0->unk_174)); param0->unk_13C = v0; param0->unk_13E = v1; @@ -849,20 +849,20 @@ static void sub_02072DB8(UnkStruct_02072334 *param0) param0->unk_1A4 = NULL; } - sub_0201C3C0(param0->unk_170, 3); + Bg_ScheduleTilemapTransfer(param0->unk_170, 3); } static void sub_02072E4C(UnkStruct_02072334 *param0) { u16 v0, v1; - sub_0201ACF4(&(param0->unk_174)); + Window_ClearAndCopyToVRAM(&(param0->unk_174)); Window_Clear(&(param0->unk_174), 0); sub_02001384(param0->unk_160, &v0, &v1); sub_02013A3C(param0->unk_164); - BGL_DeleteWindow(&(param0->unk_174)); + Window_Remove(&(param0->unk_174)); sub_02073398(param0); - sub_0201C3C0(param0->unk_170, 3); + Bg_ScheduleTilemapTransfer(param0->unk_170, 3); } static void sub_02072EA4(UnkStruct_02072334 *param0, SysTaskFunc param1, SysTaskFunc param2) @@ -1059,14 +1059,14 @@ static void sub_020731F4(UnkStruct_02072334 *param0) Font_LoadTextPalette(0, 13 * 32, param0->unk_00); Font_LoadScreenIndicatorsPalette(0, 12 * 32, param0->unk_00); - BGL_AddWindow(param0->unk_170, ¶m0->unk_184, 3, 2, 19, 27, 4, 12, ((1024 - (18 + 12) - 9) - 27 * 4)); - BGL_FillWindow(¶m0->unk_184, 0); + Window_Add(param0->unk_170, ¶m0->unk_184, 3, 2, 19, 27, 4, 12, ((1024 - (18 + 12) - 9) - 27 * 4)); + Window_FillTilemap(¶m0->unk_184, 0); } static void sub_02073294(UnkStruct_02072334 *param0) { - sub_0201ACF4(¶m0->unk_184); - BGL_DeleteWindow(¶m0->unk_184); + Window_ClearAndCopyToVRAM(¶m0->unk_184); + Window_Remove(¶m0->unk_184); MI_CpuClear8(¶m0->unk_184, sizeof(Window)); param0->unk_170 = NULL; @@ -1080,7 +1080,7 @@ static void sub_020732C4(UnkStruct_02072334 *param0, int param1, u8 param2, u8 p sub_0200E060(¶m0->unk_184, 1, (1024 - (18 + 12)), 10); } - BGL_WindowColor(¶m0->unk_184, ((15 << 4) | 15), 0, 0, 27 * 8, 4 * 8); + Window_FillRectWithColor(¶m0->unk_184, ((15 << 4) | 15), 0, 0, 27 * 8, 4 * 8); RenderControlFlags_SetCanABSpeedUpPrint(1); RenderControlFlags_SetAutoScrollFlags(0); @@ -1095,14 +1095,14 @@ static void sub_020732C4(UnkStruct_02072334 *param0, int param1, u8 param2, u8 p } param0->unk_138 = Text_AddPrinterWithParamsAndColor(¶m0->unk_184, FONT_MESSAGE, v0, 0, 0, param2, TEXT_COLOR(1, 2, 15), NULL); - sub_0201A954(¶m0->unk_184); + Window_CopyToVRAM(¶m0->unk_184); param0->unk_139 = param3; } static void sub_02073398(UnkStruct_02072334 *param0) { sub_0200E084(¶m0->unk_184, 1); - sub_0201ACF4(¶m0->unk_184); + Window_ClearAndCopyToVRAM(¶m0->unk_184); } static BOOL sub_020733B4(UnkStruct_02072334 *param0) diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index e2ef92d0dc..58644b8ab3 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -119,8 +119,8 @@ UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Opt sub_02002F70(v0->unk_14, 2, (((16 - 2) * 16) * sizeof(u16)), param11); sub_02002F70(v0->unk_14, 3, 0x200, param11); - v0->unk_00 = sub_02018340(param11); - v0->unk_04 = sub_0201A778(param11, 1); + v0->unk_00 = BgConfig_New(param11); + v0->unk_04 = Window_New(param11, 1); v0->unk_2C = param3; v0->unk_34 = sub_0207C690(param11); @@ -128,8 +128,8 @@ UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Opt sub_0207C664(); sub_0207C730(); sub_0207C1CC(v0, v0->unk_00); - BGL_AddWindow(v0->unk_00, v0->unk_04, 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1)); - BGL_FillWindow(v0->unk_04, 0xff); + Window_Add(v0->unk_00, v0->unk_04, 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1)); + Window_FillTilemap(v0->unk_04, 0xff); sub_0200E060(v0->unk_04, 0, 1, 10); v0->unk_18 = sub_0200762C(param11); @@ -191,7 +191,7 @@ void sub_0207B0E0(UnkStruct_0207AE68 *param0) sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); SetMainCallback(NULL, NULL); - sub_0201A928(param0->unk_04, 1); + Windows_Delete(param0->unk_04, 1); sub_02002FA0(param0->unk_14, 0); sub_02002FA0(param0->unk_14, 1); sub_02002FA0(param0->unk_14, 2); @@ -789,7 +789,7 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1) GX_BG0_AS_3D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { @@ -841,12 +841,12 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1) }, }; - sub_020183C4(param1, 1, &v2[0], 0); - sub_02019EBC(param1, 1); - sub_020183C4(param1, 2, &v2[1], 0); - sub_02019EBC(param1, 2); - sub_020183C4(param1, 3, &v2[2], 0); - sub_02019EBC(param1, 3); + Bg_InitFromTemplate(param1, 1, &v2[0], 0); + Bg_ClearTilemap(param1, 1); + Bg_InitFromTemplate(param1, 2, &v2[1], 0); + Bg_ClearTilemap(param1, 2); + Bg_InitFromTemplate(param1, 3, &v2[2], 0); + Bg_ClearTilemap(param1, 3); G2_SetBG0Priority(0x1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -871,8 +871,8 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1) }, }; - sub_020183C4(param1, 4, &v3[0], 0); - sub_02019EBC(param1, 4); + Bg_InitFromTemplate(param1, 4, &v3[0], 0); + Bg_ClearTilemap(param1, 4); } { @@ -926,10 +926,10 @@ static void sub_0207C460(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); - sub_02019044(param0, 1); - sub_02019044(param0, 2); - sub_02019044(param0, 3); - sub_02019044(param0, 4); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 4); } static void sub_0207C498(UnkStruct_0207AE68 *param0) @@ -963,7 +963,7 @@ static void sub_0207C520(void *param0) sub_02008A94(v0->unk_18); sub_0201DCAC(); sub_02003694(v0->unk_14); - sub_0201C2B8(v0->unk_00); + Bg_RunScheduledUpdates(v0->unk_00); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } @@ -976,7 +976,7 @@ static u8 sub_0207C584(UnkStruct_0207AE68 *param0, int param1) StringTemplate_Format(param0->unk_0C, param0->unk_10, v0); Heap_FreeToHeap(v0); - BGL_FillWindow(param0->unk_04, 0xff); + Window_FillTilemap(param0->unk_04, 0xff); return Text_AddPrinterWithParams(param0->unk_04, FONT_MESSAGE, param0->unk_10, 0, 0, Options_TextFrameDelay(param0->unk_2C), sub_0207C5CC); } diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index d8542763f1..27aedca240 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -557,7 +557,7 @@ static int sub_0207E634(GameWindowLayout *param0) case 0xfffffffe: sub_0200E084(¶m0->unk_04[33], 1); Window_Clear(¶m0->unk_04[35], 1); - sub_0201AD10(¶m0->unk_04[35]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_04[35]); sub_02001BC4(param0->unk_700, NULL); sub_02013A3C(param0->unk_6FC); sub_020826E0(param0, 29, 1); @@ -679,7 +679,7 @@ static void sub_0207E898(void *param0) { GameWindowLayout *v0 = param0; - sub_0201C2B8(v0->unk_00); + Bg_RunScheduledUpdates(v0->unk_00); sub_0201DCAC(); sub_0200C800(); @@ -722,8 +722,8 @@ static void sub_0207E8E0(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v0, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v0, 0); + Bg_ClearTilemap(param0, 0); } static void sub_0207E918(BgConfig *param0) @@ -736,7 +736,7 @@ static void sub_0207E918(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -760,8 +760,8 @@ static void sub_0207E918(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v1, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v1, 0); + Bg_ClearTilemap(param0, 1); } { @@ -781,8 +781,8 @@ static void sub_0207E918(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v2, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v2, 0); + Bg_ClearTilemap(param0, 2); } { @@ -802,7 +802,7 @@ static void sub_0207E918(BgConfig *param0) 0 }; - sub_020183C4(param0, 3, &v3, 0); + Bg_InitFromTemplate(param0, 3, &v3, 0); } { @@ -822,8 +822,8 @@ static void sub_0207E918(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v4, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v4, 0); + Bg_ClearTilemap(param0, 4); } { @@ -843,31 +843,31 @@ static void sub_0207E918(BgConfig *param0) 0 }; - sub_020183C4(param0, 5, &v5, 0); + Bg_InitFromTemplate(param0, 5, &v5, 0); } - sub_02019690(0, 32, 0, 12); - sub_02019690(4, 32, 0, 12); + Bg_ClearTilesRange(0, 32, 0, 12); + Bg_ClearTilesRange(4, 32, 0, 12); } static void sub_0207EA24(BgConfig *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_OBJ, 0); - sub_02019044(param0, 5); - sub_02019044(param0, 4); - sub_02019044(param0, 3); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 5); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 3); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); Heap_FreeToHeapExplicit(12, param0); } void sub_0207EA74(GameWindowLayout *param0, int param1) { if (param1 == 0) { - sub_02019120(0, 0); - sub_02019044(param0->unk_00, 0); + Bg_ToggleLayer(0, 0); + Bg_FreeTilemapBuffer(param0->unk_00, 0); GX_SetGraphicsMode(GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D); param0->unk_B28 = sub_0207EAD4(12); @@ -878,7 +878,7 @@ void sub_0207EA74(GameWindowLayout *param0, int param1) GX_SetGraphicsMode(GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_2D); sub_0207E8E0(param0->unk_00); - sub_02019690(0, 32, 0, 12); + Bg_ClearTilesRange(0, 32, 0, 12); } } @@ -919,7 +919,7 @@ static void sub_0207EB6C(GameWindowLayout *param0, NARC *param1) v1 = NARC_AllocAndReadWholeMember(param1, 16, 12); NNS_G2dGetUnpackedPaletteData(v1, &v0); - sub_0201972C(3, (void *)v0->pRawData, v0->szByte, 0); + Bg_LoadPalette(3, (void *)v0->pRawData, v0->szByte, 0); v2 = (u16 *)v0->pRawData; memcpy(param0->unk_4A4, &v2[3 * 16], 32 * 8); @@ -935,8 +935,8 @@ static void sub_0207EB6C(GameWindowLayout *param0, NARC *param1) sub_0200710C(param1, 14, param0->unk_00, 5, 0, 0, 0, 12); sub_02007130(param1, 13, 4, 0, 0x20, 12); LoadScreenDataFromNARC(12, param0->unk_264, param0->unk_324, param0->unk_3E4); - sub_0201975C(0, 0); - sub_0201975C(4, 0); + Bg_MaskPalette(0, 0); + Bg_MaskPalette(4, 0); } static GameWindowLayout *sub_0207ECC0(OverlayManager *param0) @@ -948,7 +948,7 @@ static GameWindowLayout *sub_0207ECC0(OverlayManager *param0) memset(v0, 0, sizeof(GameWindowLayout)); v0->unk_5A4 = OverlayManager_Args(param0); - v0->unk_00 = sub_02018340(12); + v0->unk_00 = BgConfig_New(12); if ((v0->unk_5A4->unk_20 == 2) && (v0->unk_5A4->unk_14 != NULL)) { v0->unk_B20 = sub_0207A2A8(12); @@ -1161,14 +1161,14 @@ static void sub_0207F250(GameWindowLayout *param0, u8 param1, u8 param2, u8 para param0->unk_704[param1].unk_14 = (s8)param2; param0->unk_704[param1].unk_15 = (s8)param3; - sub_020198E8(param0->unk_00, 2, param2, param3, 16, 6, (const void *)v0, 0, 0, 16, 6); + Bg_CopyToTilemapRect(param0->unk_00, 2, param2, param3, 16, 6, (const void *)v0, 0, 0, 16, 6); if (param4 == 0) { - sub_02019CB8( + Bg_FillTilemapRect( param0->unk_00, 2, 0x17, param2 + 6, param3 + 3, 9, 1, 16); } - sub_02019E2C(param0->unk_00, 2, param2, param3, 16, 6, 3 + param1); + Bg_ChangeTilemapRectPalette(param0->unk_00, 2, param2, param3, 16, 6, 3 + param1); sub_0207F8F8(param0, param1); } @@ -1194,8 +1194,8 @@ static void sub_0207F308(GameWindowLayout *param0) sub_0207F388(param0, v0); } - sub_0201C3C0(param0->unk_00, 2); - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 2); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); } static void sub_0207F388(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1) @@ -1341,8 +1341,8 @@ static void sub_0207F788(GameWindowLayout *param0, const UnkStruct_020F1DF8 *par static void sub_0207F884(GameWindowLayout *param0, u8 param1, s16 param2, s16 param3) { - sub_020198E8(param0->unk_00, 2, param2, param3, 16, 6, (const void *)param0->unk_3E4, 0, 0, 16, 6); - sub_02019E2C(param0->unk_00, 2, param2, param3, 16, 6, 1); + Bg_CopyToTilemapRect(param0->unk_00, 2, param2, param3, 16, 6, (const void *)param0->unk_3E4, 0, 0, 16, 6); + Bg_ChangeTilemapRectPalette(param0->unk_00, 2, param2, param3, 16, 6, 1); sub_02083014(param0, param1, 7); sub_02083040(param0, param1, 0); sub_02083104(param0, param1); @@ -1373,7 +1373,7 @@ void sub_0207F8F8(GameWindowLayout *param0, u8 param1) } } - sub_0201972C(2, ¶m0->unk_4A4[v1 * 16], 8 * 2, (3 + param1) * 32); + Bg_LoadPalette(2, ¶m0->unk_4A4[v1 * 16], 8 * 2, (3 + param1) * 32); } static u8 sub_0207F984(GameWindowLayout *param0, u8 param1) @@ -1475,7 +1475,7 @@ static u8 sub_0207FA24(GameWindowLayout *param0) if (v4 < 6) { UpdateWindowLayout(param0, v4, 0); - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); } if ((v4 != 6) && (v4 != 7)) { @@ -1589,7 +1589,7 @@ void sub_0207FD68(GameWindowLayout *param0, u8 param1) if (v2 < 6) { UpdateWindowLayout(param0, v2, 0); - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); } } } @@ -1608,12 +1608,12 @@ static void sub_0207FE1C(GameWindowLayout *param0) sub_020832E4(param0, v0, v1); } UpdateWindowLayout(param0, param0->unk_B0D, 2); - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); param0->unk_B0C++; break; case 2: UpdateWindowLayout(param0, param0->unk_B0D, 1); - sub_0201C3C0(param0->unk_00, 4); + Bg_ScheduleTilemapTransfer(param0->unk_00, 4); param0->unk_B0C = 0; break; } @@ -2276,7 +2276,7 @@ static void UpdateWindowLayout(GameWindowLayout *param0, u8 param1, u8 param2) u8 v2, v3; u8 v4, v5; - v0 = (u16 *)sub_02019FE4(param0->unk_00, 4); + v0 = (u16 *)Bg_GetTilemapBuffer(param0->unk_00, 4); v1 = 5 + (1 << 12) + 5 * 5 * param2; v2 = Unk_020F1BB8[param1][0]; v3 = Unk_020F1BB8[param1][1]; @@ -2307,7 +2307,7 @@ static int GetValidWindowLayout(GameWindowLayout *param0) if (v0 != 0xffffffff) { u16 v1 = 0xfffe; - if (sub_0201C784(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { return 0xffffffff; } } @@ -2503,7 +2503,7 @@ static BOOL UpdatePokemonStatus(GameWindowLayout *param0, u8 slot, s8 param2) param0->unk_B14[2]++; sub_02082098(param0, slot); - BGL_FillWindow(¶m0->unk_04[3 + slot * 5], 0); + Window_FillTilemap(¶m0->unk_04[3 + slot * 5], 0); sub_02082058(param0, slot); sub_02082104(param0, slot); @@ -2686,7 +2686,7 @@ static int ProcessItemApplication(GameWindowLayout *param0) } sub_0200E060(v1, 1, (1 + 9), 15); - BGL_FillWindow(v1, 15); + Window_FillTilemap(v1, 15); sub_0208274C(param0); return v2; @@ -2815,7 +2815,7 @@ static int ProcessPokemonItemSwap(GameWindowLayout *param0) } } - BGL_FillWindow(v3, 15); + Window_FillTilemap(v3, 15); sub_0208274C(param0); } return v0; @@ -2872,7 +2872,7 @@ static int UpdatePokemonFormWithItem(GameWindowLayout *param0) } sub_0200E060(v1, 1, (1 + 9), 15); - BGL_FillWindow(v1, 15); + Window_FillTilemap(v1, 15); sub_0208274C(param0); if (param0->unk_5A4->unk_20 == 12) { diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index c96cccac18..d1b70578f9 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -102,11 +102,11 @@ static const WindowTemplate Unk_020F1E98 = { static void sub_020819DC(BgConfig *param0, Window *param1, const WindowTemplate *param2) { - sub_0201A8D4(param0, ¶m1[0], ¶m2[0]); - sub_0201A8D4(param0, ¶m1[1], ¶m2[1]); - sub_0201A8D4(param0, ¶m1[2], ¶m2[2]); - sub_0201A8D4(param0, ¶m1[3], ¶m2[3]); - sub_0201A8D4(param0, ¶m1[4], ¶m2[4]); + Window_AddFromTemplate(param0, ¶m1[0], ¶m2[0]); + Window_AddFromTemplate(param0, ¶m1[1], ¶m2[1]); + Window_AddFromTemplate(param0, ¶m1[2], ¶m2[2]); + Window_AddFromTemplate(param0, ¶m1[3], ¶m2[3]); + Window_AddFromTemplate(param0, ¶m1[4], ¶m2[4]); } void sub_02081A24(GameWindowLayout *param0) @@ -133,17 +133,17 @@ void sub_02081A24(GameWindowLayout *param0) v2 = Unk_020F1ED0[0]; v2.tilemapTop = 22; - sub_0201A8D4(param0->unk_00, ¶m0->unk_04[31], &v2); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_04[31], &v2); } else { - sub_0201A8D4(param0->unk_00, ¶m0->unk_04[31], &Unk_020F1ED0[0]); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_04[31], &Unk_020F1ED0[0]); } - sub_0201A8D4(param0->unk_00, ¶m0->unk_04[30], &Unk_020F1ED0[1]); - sub_0201A8D4(param0->unk_00, ¶m0->unk_04[32], &Unk_020F1ED0[2]); - sub_0201A8D4(param0->unk_00, ¶m0->unk_04[33], &Unk_020F1ED0[3]); - sub_0201A8D4(param0->unk_00, ¶m0->unk_04[34], &Unk_020F1ED0[4]); - sub_0201A8D4(param0->unk_00, ¶m0->unk_04[35], &Unk_020F1ED0[5]); - sub_0201A8D4(param0->unk_00, ¶m0->unk_04[36], &Unk_020F1ED0[6]); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_04[30], &Unk_020F1ED0[1]); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_04[32], &Unk_020F1ED0[2]); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_04[33], &Unk_020F1ED0[3]); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_04[34], &Unk_020F1ED0[4]); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_04[35], &Unk_020F1ED0[5]); + Window_AddFromTemplate(param0->unk_00, ¶m0->unk_04[36], &Unk_020F1ED0[6]); } void sub_02081B90(GameWindowLayout *param0) @@ -151,12 +151,12 @@ void sub_02081B90(GameWindowLayout *param0) u16 v0; for (v0 = 0; v0 < 37; v0++) { - BGL_DeleteWindow(¶m0->unk_04[v0]); + Window_Remove(¶m0->unk_04[v0]); } for (v0 = 0; v0 < 1; v0++) { - if (BGL_WindowAdded(¶m0->unk_254[v0]) == 1) { - BGL_DeleteWindow(¶m0->unk_254[v0]); + if (Window_IsInUse(¶m0->unk_254[v0]) == 1) { + Window_Remove(¶m0->unk_254[v0]); } } } @@ -198,7 +198,7 @@ void sub_02081CF4(GameWindowLayout *param0, const u8 *param1, u8 param2) UnkStruct_02081CF4 v0; u16 v1, v2; - BGL_AddWindow(param0->unk_00, ¶m0->unk_254[0], 0, 19, 23 - param2 * 2, 12, param2 * 2, 0, (((((((((((((((((((((((((((((((1 + 9) + (18 + 12)) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 5 * 2) + 7 * 2) + 20 * 2) + 13 * 4) + 27 * 4)); + Window_Add(param0->unk_00, ¶m0->unk_254[0], 0, 19, 23 - param2 * 2, 12, param2 * 2, 0, (((((((((((((((((((((((((((((((1 + 9) + (18 + 12)) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 5 * 2) + 7 * 2) + 20 * 2) + 13 * 4) + 27 * 4)); param0->unk_6FC = sub_02013A04(param2, 12); v2 = 0; @@ -284,7 +284,7 @@ void sub_02081F2C(GameWindowLayout *param0, u8 param1) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_704[param1].unk_00, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); if (param0->unk_704[param1].unk_10 == 1) { - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); return; } @@ -300,7 +300,7 @@ void sub_02081F2C(GameWindowLayout *param0, u8 param1) } } - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } void sub_02081FFC(GameWindowLayout *param0, u8 param1) @@ -311,12 +311,12 @@ void sub_02081FFC(GameWindowLayout *param0, u8 param1) v0 = ¶m0->unk_04[1 + param1 * 5]; if (param0->unk_704[param1].unk_0E_0 != 7) { - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); return; } sub_0200C648(param0->unk_698, 1, param0->unk_704[param1].unk_0A, 3, 0, v0, 5, 2); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } void sub_02082058(GameWindowLayout *param0, u8 param1) @@ -328,7 +328,7 @@ void sub_02082058(GameWindowLayout *param0, u8 param1) v0 = ¶m0->unk_04[2 + param1 * 5]; sub_0200C5BC(param0->unk_698, param0->unk_704[param1].unk_06, 3, 1, v0, (28 - 24), 2); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } void sub_02082098(GameWindowLayout *param0, u8 param1) @@ -339,8 +339,8 @@ void sub_02082098(GameWindowLayout *param0, u8 param1) v0 = ¶m0->unk_04[2 + param1 * 5]; - BGL_WindowColor(v0, 0, (28 - 24), 0, 24, 2 * 8); - sub_0201A9A4(v0); + Window_FillRectWithColor(v0, 0, (28 - 24), 0, 24, 2 * 8); + Window_ScheduleCopyToVRAM(v0); } static void sub_020820C4(GameWindowLayout *param0, u8 param1) @@ -351,7 +351,7 @@ static void sub_020820C4(GameWindowLayout *param0, u8 param1) v0 = ¶m0->unk_04[2 + param1 * 5]; sub_0200C5BC(param0->unk_698, param0->unk_704[param1].unk_08, 3, 0, v0, (28 + 8), 2); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } void sub_02082104(GameWindowLayout *param0, u8 param1) @@ -363,41 +363,41 @@ void sub_02082104(GameWindowLayout *param0, u8 param1) switch (HealthBar_Color(param0->unk_704[param1].unk_06, param0->unk_704[param1].unk_08, 48)) { case 0: - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); return; case 4: case 3: - sub_0201972C(1, ¶m0->unk_4A4[9], 2 * 2, (v0->palette * 16 + 9) * 2); + Bg_LoadPalette(1, ¶m0->unk_4A4[9], 2 * 2, (v0->palette * 16 + 9) * 2); break; case 2: - sub_0201972C(1, ¶m0->unk_4A4[(16 + 9)], 2 * 2, (v0->palette * 16 + 9) * 2); + Bg_LoadPalette(1, ¶m0->unk_4A4[(16 + 9)], 2 * 2, (v0->palette * 16 + 9) * 2); break; case 1: - sub_0201972C(1, ¶m0->unk_4A4[(32 + 9)], 2 * 2, (v0->palette * 16 + 9) * 2); + Bg_LoadPalette(1, ¶m0->unk_4A4[(32 + 9)], 2 * 2, (v0->palette * 16 + 9) * 2); break; } v1 = App_PixelCount(param0->unk_704[param1].unk_06, param0->unk_704[param1].unk_08, 48); - BGL_WindowColor(v0, 10, 0, 2, v1, 1); - BGL_WindowColor(v0, 9, 0, 3, v1, 2); - BGL_WindowColor(v0, 10, 0, 5, v1, 1); - sub_0201A9A4(v0); + Window_FillRectWithColor(v0, 10, 0, 2, v1, 1); + Window_FillRectWithColor(v0, 9, 0, 3, v1, 2); + Window_FillRectWithColor(v0, 10, 0, 5, v1, 1); + Window_ScheduleCopyToVRAM(v0); } void sub_020821F8(GameWindowLayout *param0, u8 param1) { - BGL_FillWindow(¶m0->unk_04[0 + param1 * 5], 0); - BGL_FillWindow(¶m0->unk_04[1 + param1 * 5], 0); - BGL_FillWindow(¶m0->unk_04[2 + param1 * 5], 0); - BGL_FillWindow(¶m0->unk_04[3 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[0 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[1 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[2 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[3 + param1 * 5], 0); sub_02081F2C(param0, param1); if (param0->unk_704[param1].unk_10 == 1) { - sub_0201A9A4(¶m0->unk_04[0 + param1 * 5]); - sub_0201A9A4(¶m0->unk_04[1 + param1 * 5]); - sub_0201A9A4(¶m0->unk_04[2 + param1 * 5]); - sub_0201A9A4(¶m0->unk_04[3 + param1 * 5]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[0 + param1 * 5]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[1 + param1 * 5]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[2 + param1 * 5]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[3 + param1 * 5]); return; } @@ -410,26 +410,26 @@ void sub_020821F8(GameWindowLayout *param0, u8 param1) void sub_020822BC(GameWindowLayout *param0, u8 param1) { - sub_0201ACCC(¶m0->unk_04[0 + param1 * 5]); - sub_0201ACCC(¶m0->unk_04[1 + param1 * 5]); - sub_0201ACCC(¶m0->unk_04[2 + param1 * 5]); - sub_0201ACCC(¶m0->unk_04[3 + param1 * 5]); + Window_LoadTiles(¶m0->unk_04[0 + param1 * 5]); + Window_LoadTiles(¶m0->unk_04[1 + param1 * 5]); + Window_LoadTiles(¶m0->unk_04[2 + param1 * 5]); + Window_LoadTiles(¶m0->unk_04[3 + param1 * 5]); } void sub_020822F4(GameWindowLayout *param0, u8 param1) { - sub_0201AD10(¶m0->unk_04[0 + param1 * 5]); - sub_0201AD10(¶m0->unk_04[1 + param1 * 5]); - sub_0201AD10(¶m0->unk_04[2 + param1 * 5]); - sub_0201AD10(¶m0->unk_04[3 + param1 * 5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_04[0 + param1 * 5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_04[1 + param1 * 5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_04[2 + param1 * 5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_04[3 + param1 * 5]); } void sub_0208232C(GameWindowLayout *param0, u8 param1) { Pokemon *v0; - BGL_FillWindow(¶m0->unk_04[0 + param1 * 5], 0); - BGL_FillWindow(¶m0->unk_04[1 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[0 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[1 + param1 * 5], 0); sub_02081F2C(param0, param1); if (param0->unk_704[param1].unk_10 == 1) { @@ -453,8 +453,8 @@ void sub_020823C4(GameWindowLayout *param0, u8 param1) Pokemon *v0; u8 v1; - BGL_FillWindow(¶m0->unk_04[0 + param1 * 5], 0); - BGL_FillWindow(¶m0->unk_04[1 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[0 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[1 + param1 * 5], 0); sub_02081F2C(param0, param1); if (param0->unk_704[param1].unk_10 == 1) { @@ -481,8 +481,8 @@ void sub_0208245C(GameWindowLayout *param0, u8 param1) Pokemon *v0; u8 v1; - BGL_FillWindow(¶m0->unk_04[0 + param1 * 5], 0); - BGL_FillWindow(¶m0->unk_04[1 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[0 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[1 + param1 * 5], 0); sub_02081F2C(param0, param1); if (param0->unk_704[param1].unk_10 != 1) { @@ -497,8 +497,8 @@ void sub_020824C0(GameWindowLayout *param0, u8 param1) Pokemon *v0; u8 v1; - BGL_FillWindow(¶m0->unk_04[0 + param1 * 5], 0); - BGL_FillWindow(¶m0->unk_04[1 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[0 + param1 * 5], 0); + Window_FillTilemap(¶m0->unk_04[1 + param1 * 5], 0); sub_02081F2C(param0, param1); if (param0->unk_704[param1].unk_10 != 1) { @@ -548,21 +548,21 @@ void sub_020825B4(GameWindowLayout *param0, u8 param1) { u32 v0; - BGL_FillWindow(¶m0->unk_04[30], 0); - BGL_FillWindow(¶m0->unk_04[31], 0); + Window_FillTilemap(¶m0->unk_04[30], 0); + Window_FillTilemap(¶m0->unk_04[31], 0); if (param1 & 1) { MessageLoader_GetStrbuf(param0->unk_69C, 0, param0->unk_6A8); v0 = sub_020825A4(0, param0->unk_6A8, param0->unk_04[30].width * 8); Text_AddPrinterWithParamsAndColor(¶m0->unk_04[30], FONT_SYSTEM, param0->unk_6A8, v0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); - sub_0201A9A4(¶m0->unk_04[30]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[30]); } if (param1 & 2) { MessageLoader_GetStrbuf(param0->unk_69C, 1, param0->unk_6A8); v0 = sub_020825A4(0, param0->unk_6A8, param0->unk_04[31].width * 8); Text_AddPrinterWithParamsAndColor(¶m0->unk_04[31], FONT_SYSTEM, param0->unk_6A8, v0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); - sub_0201A9A4(¶m0->unk_04[31]); + Window_ScheduleCopyToVRAM(¶m0->unk_04[31]); } } @@ -572,14 +572,14 @@ static void sub_02082680(GameWindowLayout *param0, Window *param1, u32 param2, u sub_0200E060(param1, 1, (1 + 9), 15); } - BGL_FillWindow(param1, 15); + Window_FillTilemap(param1, 15); if (param2 != 0xffffffff) { MessageLoader_GetStrbuf(param0->unk_69C, param2, param0->unk_6A4); } Text_AddPrinterWithParams(param1, FONT_MESSAGE, param0->unk_6A4, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); - sub_0201A9A4(param1); + Window_ScheduleCopyToVRAM(param1); } void sub_020826E0(GameWindowLayout *param0, u32 param1, u8 param2) @@ -600,7 +600,7 @@ void sub_02082708(GameWindowLayout *param0, u32 param1, u8 param2) sub_0200E060(v0, 1, (1 + 9), 15); } - BGL_FillWindow(v0, 15); + Window_FillTilemap(v0, 15); if (param1 != 0xffffffff) { MessageLoader_GetStrbuf(param0->unk_69C, param1, param0->unk_6A4); @@ -650,7 +650,7 @@ static void sub_02082810(GameWindowLayout *param0, u8 param1, u8 param2) v0 = ¶m0->unk_04[4 + param1 * 5]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); switch (param2) { case 0: @@ -663,7 +663,7 @@ static void sub_02082810(GameWindowLayout *param0, u8 param1, u8 param2) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void sub_02082880(GameWindowLayout *param0, u8 param1, u8 param2) @@ -673,7 +673,7 @@ static void sub_02082880(GameWindowLayout *param0, u8 param1, u8 param2) v0 = ¶m0->unk_04[4 + param1 * 5]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); switch (param2) { case 0: @@ -689,7 +689,7 @@ static void sub_02082880(GameWindowLayout *param0, u8 param1, u8 param2) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void sub_02082900(GameWindowLayout *param0, u8 param1, u8 param2) @@ -699,7 +699,7 @@ static void sub_02082900(GameWindowLayout *param0, u8 param1, u8 param2) v0 = ¶m0->unk_04[4 + param1 * 5]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); if (param2 == 0) { v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 181); @@ -709,7 +709,7 @@ static void sub_02082900(GameWindowLayout *param0, u8 param1, u8 param2) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } static void sub_02082964(GameWindowLayout *param0, u8 param1, u8 param2) @@ -719,7 +719,7 @@ static void sub_02082964(GameWindowLayout *param0, u8 param1, u8 param2) v0 = ¶m0->unk_04[4 + param1 * 5]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); if (param2 < 6) { v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 169 + param2); @@ -731,7 +731,7 @@ static void sub_02082964(GameWindowLayout *param0, u8 param1, u8 param2) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); Strbuf_Free(v1); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } void sub_020829DC(GameWindowLayout *param0) @@ -750,9 +750,9 @@ void sub_020829DC(GameWindowLayout *param0) v3[4] = (u16)Pokemon_GetValue(v0, MON_DATA_SP_DEF, NULL); v3[5] = (u16)Pokemon_GetValue(v0, MON_DATA_SPEED, NULL); - BGL_AddWindow(param0->unk_00, ¶m0->unk_254[0], 0, 1, 1, 14, 12, 0, 576); + Window_Add(param0->unk_00, ¶m0->unk_254[0], 0, 1, 1, 14, 12, 0, 576); Window_Show(¶m0->unk_254[0], 1, 1, 14); - BGL_FillWindow(¶m0->unk_254[0], 15); + Window_FillTilemap(¶m0->unk_254[0], 15); for (v2 = 0; v2 < 6; v2++) { v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 185 + v2); @@ -773,7 +773,7 @@ void sub_020829DC(GameWindowLayout *param0) param0->unk_B14[v2] = v3[v2]; } - sub_0201A9A4(¶m0->unk_254[0]); + Window_ScheduleCopyToVRAM(¶m0->unk_254[0]); } void sub_02082B58(GameWindowLayout *param0) @@ -782,7 +782,7 @@ void sub_02082B58(GameWindowLayout *param0) u32 v1; u32 v2; - BGL_WindowColor(¶m0->unk_254[0], 15, 80, 0, 32, 14 * 8); + Window_FillRectWithColor(¶m0->unk_254[0], 15, 80, 0, 32, 14 * 8); v0 = MessageLoader_GetNewStrbuf(param0->unk_69C, 192); for (v2 = 0; v2 < 6; v2++) { @@ -795,11 +795,11 @@ void sub_02082B58(GameWindowLayout *param0) } Strbuf_Free(v0); - sub_0201A9A4(¶m0->unk_254[0]); + Window_ScheduleCopyToVRAM(¶m0->unk_254[0]); } void sub_02082C10(GameWindowLayout *param0) { Window_Clear(¶m0->unk_254[0], 0); - BGL_DeleteWindow(¶m0->unk_254[0]); + Window_Remove(¶m0->unk_254[0]); } diff --git a/src/unk_02083370.c b/src/unk_02083370.c index eb1d60c52d..47a5a4c4ac 100644 --- a/src/unk_02083370.c +++ b/src/unk_02083370.c @@ -117,10 +117,10 @@ u32 sub_02083370(u8 param0) void sub_0208337C(GameWindowLayout *param0) { Window_Clear(¶m0->unk_254[0], 1); - sub_0201AD10(¶m0->unk_254[0]); + Window_ClearAndScheduleCopyToVRAM(¶m0->unk_254[0]); sub_02001BC4(param0->unk_700, NULL); sub_02013A3C(param0->unk_6FC); - BGL_DeleteWindow(¶m0->unk_254[0]); + Window_Remove(¶m0->unk_254[0]); } static void sub_020833BC(GameWindowLayout *param0, int *param1) @@ -208,7 +208,7 @@ static void sub_020834B0(GameWindowLayout *param0, int *param1) } sub_0200E060(¶m0->unk_04[34], 1, (1 + 9), 15); - BGL_FillWindow(¶m0->unk_04[34], 15); + Window_FillTilemap(¶m0->unk_04[34], 15); sub_0208274C(param0); *param1 = v2; @@ -488,8 +488,8 @@ void sub_02083BD4(GameWindowLayout *param0) param0->unk_7F8.unk_302[1] = 0; } - v0 = (u16 *)sub_02019FE4(param0->unk_00, 2); - v1 = (u16 *)sub_02019FE4(param0->unk_00, 1); + v0 = (u16 *)Bg_GetTilemapBuffer(param0->unk_00, 2); + v1 = (u16 *)Bg_GetTilemapBuffer(param0->unk_00, 1); v2 = param0->unk_704[param0->unk_7F8.unk_300[0]].unk_14; v3 = param0->unk_704[param0->unk_7F8.unk_300[0]].unk_15; @@ -523,8 +523,8 @@ BOOL sub_02083D1C(GameWindowLayout *param0) sub_02083E8C(param0, 1); sub_02083FDC(param0, 0, v0->unk_302[0]); sub_02083FDC(param0, 1, v0->unk_302[1]); - sub_0201C3C0(param0->unk_00, 2); - sub_0201C3C0(param0->unk_00, 1); + Bg_ScheduleTilemapTransfer(param0->unk_00, 2); + Bg_ScheduleTilemapTransfer(param0->unk_00, 1); if (v0->unk_306 == 16) { v0->unk_305 = 2; @@ -542,8 +542,8 @@ BOOL sub_02083D1C(GameWindowLayout *param0) sub_02083E8C(param0, 1); sub_02083FDC(param0, 0, v0->unk_302[0] ^ 1); sub_02083FDC(param0, 1, v0->unk_302[1] ^ 1); - sub_0201C3C0(param0->unk_00, 2); - sub_0201C3C0(param0->unk_00, 1); + Bg_ScheduleTilemapTransfer(param0->unk_00, 2); + Bg_ScheduleTilemapTransfer(param0->unk_00, 1); if (v0->unk_306 == 0) { v0->unk_305 = 4; @@ -578,15 +578,15 @@ static void sub_02083E8C(GameWindowLayout *param0, u8 param1) v1 = param0->unk_704[v0->unk_300[param1]].unk_14; v2 = param0->unk_704[v0->unk_300[param1]].unk_15; - sub_02019CB8(param0->unk_00, 2, 0, v1, v2, 16, 6, 16); - sub_02019CB8(param0->unk_00, 1, 0, v1, v2, 16, 6, 16); + Bg_FillTilemapRect(param0->unk_00, 2, 0, v1, v2, 16, 6, 16); + Bg_FillTilemapRect(param0->unk_00, 1, 0, v1, v2, 16, 6, 16); if (v0->unk_302[param1] == 0) { - sub_020198E8(param0->unk_00, 2, v1, v2, 16 - v0->unk_306, 6, &v0->unk_00[param1], v0->unk_306, 0, 16, 6); - sub_020198E8(param0->unk_00, 1, v1, v2, 16 - v0->unk_306, 6, &v0->unk_180[param1], v0->unk_306, 0, 16, 6); + Bg_CopyToTilemapRect(param0->unk_00, 2, v1, v2, 16 - v0->unk_306, 6, &v0->unk_00[param1], v0->unk_306, 0, 16, 6); + Bg_CopyToTilemapRect(param0->unk_00, 1, v1, v2, 16 - v0->unk_306, 6, &v0->unk_180[param1], v0->unk_306, 0, 16, 6); } else { - sub_020198E8(param0->unk_00, 2, v1 + v0->unk_306, v2, 16 - v0->unk_306, 6, &v0->unk_00[param1], 0, 0, 16, 6); - sub_020198E8(param0->unk_00, 1, v1 + v0->unk_306, v2, 16 - v0->unk_306, 6, &v0->unk_180[param1], 0, 0, 16, 6); + Bg_CopyToTilemapRect(param0->unk_00, 2, v1 + v0->unk_306, v2, 16 - v0->unk_306, 6, &v0->unk_00[param1], 0, 0, 16, 6); + Bg_CopyToTilemapRect(param0->unk_00, 1, v1 + v0->unk_306, v2, 16 - v0->unk_306, 6, &v0->unk_180[param1], 0, 0, 16, 6); } } diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c index 34251cba57..755f8c8d89 100644 --- a/src/unk_02084B70.c +++ b/src/unk_02084B70.c @@ -527,7 +527,7 @@ static int sub_02085704(void *param0) } sub_02082098(v0, v0->unk_B11); - BGL_FillWindow(&v0->unk_04[3 + v0->unk_B11 * 5], 0); + Window_FillTilemap(&v0->unk_04[3 + v0->unk_B11 * 5], 0); sub_02082058(v0, v0->unk_B11); sub_02082104(v0, v0->unk_B11); @@ -618,7 +618,7 @@ int sub_02085804(GameWindowLayout *param0) param0->unk_704[param0->unk_B11].unk_06++; sub_02082098(param0, param0->unk_B11); - BGL_FillWindow(¶m0->unk_04[3 + param0->unk_B11 * 5], 0); + Window_FillTilemap(¶m0->unk_04[3 + param0->unk_B11 * 5], 0); sub_02082058(param0, param0->unk_B11); sub_02082104(param0, param0->unk_B11); diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index a156384106..027a1c55aa 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -890,7 +890,7 @@ static int sub_0208694C(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_02087A10), 18); memset(v0, 0, sizeof(UnkStruct_02087A10)); - v0->unk_160 = sub_02018340(18); + v0->unk_160 = BgConfig_New(18); v1 = NARC_ctor(NARC_INDEX_DATA__NAMEIN, 18); v0->unk_168 = StringTemplate_Default(18); @@ -981,10 +981,10 @@ static int sub_02086B64(OverlayManager *param0, int *param1) break; case 5: sub_02087544(v0, param0); - BGL_FillWindow(&v0->unk_41C[9], 0xf0f); + Window_FillTilemap(&v0->unk_41C[9], 0xf0f); sub_0200E060(&v0->unk_41C[9], 0, (32 * 8), 10); v0->unk_4BC = Text_AddPrinterWithParams(&v0->unk_41C[9], FONT_MESSAGE, v0->unk_180, 0, 0, TEXT_SPEED_FAST, NULL); - sub_0201A954(&v0->unk_41C[9]); + Window_CopyToVRAM(&v0->unk_41C[9]); v0->unk_4C0 = 6; break; case 6: @@ -1160,7 +1160,7 @@ static int sub_02086F3C(OverlayManager *param0, int *param1) Heap_FreeToHeapExplicit(18, v0->unk_520); } - sub_02019044(v0->unk_160, 7); + Bg_FreeTilemapBuffer(v0->unk_160, 7); sub_0201E958(); sub_0201F8B4(); sub_0208765C(v0->unk_160, v0->unk_41C); @@ -1268,7 +1268,7 @@ static void sub_020871EC(BgConfig *param0) GX_BG0_AS_2D, }; - sub_02018368(&v0); + SetAllGraphicsModes(&v0); } { @@ -1288,8 +1288,8 @@ static void sub_020871EC(BgConfig *param0) 0 }; - sub_020183C4(param0, 0, &v1, 0); - sub_02019EBC(param0, 0); + Bg_InitFromTemplate(param0, 0, &v1, 0); + Bg_ClearTilemap(param0, 0); } { @@ -1309,8 +1309,8 @@ static void sub_020871EC(BgConfig *param0) 0 }; - sub_020183C4(param0, 1, &v2, 0); - sub_02019EBC(param0, 1); + Bg_InitFromTemplate(param0, 1, &v2, 0); + Bg_ClearTilemap(param0, 1); } { @@ -1330,8 +1330,8 @@ static void sub_020871EC(BgConfig *param0) 0 }; - sub_020183C4(param0, 2, &v3, 0); - sub_02019EBC(param0, 2); + Bg_InitFromTemplate(param0, 2, &v3, 0); + Bg_ClearTilemap(param0, 2); } { @@ -1351,13 +1351,13 @@ static void sub_020871EC(BgConfig *param0) 0 }; - sub_020183C4(param0, 4, &v4, 0); - sub_02019EBC(param0, 4); + Bg_InitFromTemplate(param0, 4, &v4, 0); + Bg_ClearTilemap(param0, 4); } sub_0208732C(0); - sub_02019690(0, 32, 0, 18); - sub_02019690(4, 32, 0, 18); + Bg_ClearTilesRange(0, 32, 0, 18); + Bg_ClearTilesRange(4, 32, 0, 18); GX_SetVisibleWnd(GX_WNDMASK_W0); G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_OBJ, 1); @@ -1385,10 +1385,10 @@ static void sub_0208737C(UnkStruct_02087A10 *param0, OverlayManager *param1) param0->unk_4C0 = 4; sub_02088260(param0->unk_4CC, 0); - sub_02019184(param0->unk_160, 0 + param0->unk_4C8, 0, param0->unk_4CC[param0->unk_4C8].x); - sub_02019184(param0->unk_160, 0 + param0->unk_4C8, 3, param0->unk_4CC[param0->unk_4C8].y); - sub_02019184(param0->unk_160, 0 + ((param0->unk_4C8) ^ 1), 0, param0->unk_4CC[((param0->unk_4C8) ^ 1)].x); - sub_02019184(param0->unk_160, 0 + ((param0->unk_4C8) ^ 1), 3, param0->unk_4CC[((param0->unk_4C8) ^ 1)].y); + Bg_SetOffset(param0->unk_160, 0 + param0->unk_4C8, 0, param0->unk_4CC[param0->unk_4C8].x); + Bg_SetOffset(param0->unk_160, 0 + param0->unk_4C8, 3, param0->unk_4CC[param0->unk_4C8].y); + Bg_SetOffset(param0->unk_160, 0 + ((param0->unk_4C8) ^ 1), 0, param0->unk_4CC[((param0->unk_4C8) ^ 1)].x); + Bg_SetOffset(param0->unk_160, 0 + ((param0->unk_4C8) ^ 1), 3, param0->unk_4CC[((param0->unk_4C8) ^ 1)].y); param0->unk_118[0] = 0xffff; @@ -1490,13 +1490,13 @@ static void sub_0208765C(BgConfig *param0, Window *param1) int v0; for (v0 = 0; v0 < 10; v0++) { - BGL_DeleteWindow(¶m1[v0]); + Window_Remove(¶m1[v0]); } - sub_02019044(param0, 4); - sub_02019044(param0, 2); - sub_02019044(param0, 1); - sub_02019044(param0, 0); + Bg_FreeTilemapBuffer(param0, 4); + Bg_FreeTilemapBuffer(param0, 2); + Bg_FreeTilemapBuffer(param0, 1); + Bg_FreeTilemapBuffer(param0, 0); Heap_FreeToHeapExplicit(18, param0); } @@ -1506,7 +1506,7 @@ static void sub_0208769C(UnkStruct_02087A10 *param0, NARC *param1) sub_02007130(param1, 0, 0, 0, 16 * 3 * 2, 18); sub_02006E84(12, 12, 4, 0, 16 * 2, 18); - sub_0201975C(4, 0); + Bg_MaskPalette(4, 0); sub_020070E8(param1, 2, v0, 2, 0, ((32 * 8) * 0x20), 1, 18); sub_0200710C(param1, 4, v0, 2, 0, 32 * 24 * 2, 1, 18); sub_020070E8(param1, 2, v0, 1, 0, 32 * 8 * 0x20, 1, 18); @@ -1750,8 +1750,8 @@ static void sub_02087D64(BgConfig *param0, Window *param1, int *param2, int para (*param2)++; } break; case 1: - sub_02019184(param0, 0 + v0, 0, 238); - sub_02019184(param0, 0 + v0, 3, -80); + Bg_SetOffset(param0, 0 + v0, 0, 238); + Bg_SetOffset(param0, 0 + v0, 3, -80); (*param2)++; break; case 2: @@ -1778,8 +1778,8 @@ static void sub_02087D64(BgConfig *param0, Window *param1, int *param2, int para param5[v1].y = -196; } - sub_02019184(param0, 0 + v0, 0, param5[v0].x); - sub_02019184(param0, 0 + v1, 3, param5[v1].y); + Bg_SetOffset(param0, 0 + v0, 0, param5[v0].x); + Bg_SetOffset(param0, 0 + v1, 3, param5[v1].y); break; case 3: param5[v1].y -= 10; @@ -1788,8 +1788,8 @@ static void sub_02087D64(BgConfig *param0, Window *param1, int *param2, int para param5[v1].y = -196; } - sub_02019184(param0, 0 + v0, 0, param5[v0].x); - sub_02019184(param0, 0 + v1, 3, param5[v1].y); + Bg_SetOffset(param0, 0 + v0, 0, param5[v0].x); + Bg_SetOffset(param0, 0 + v1, 3, param5[v1].y); if ((param5[v0].x == -11) && (param5[v1].y == -196)) { (*param2)++; @@ -1807,7 +1807,7 @@ static void sub_02087F48(Window *param0, int param1, Strbuf *param2) { sub_0200E060(param0, 0, (32 * 8), 10); Text_AddPrinterWithParams(param0, FONT_MESSAGE, param2, 0, 0, TEXT_SPEED_INSTANT, NULL); - sub_0201A954(param0); + Window_CopyToVRAM(param0); } static void sub_02087F78(Window *param0, int param1, Strbuf *param2) @@ -1819,15 +1819,15 @@ static void sub_02087F78(Window *param0, int param1, Strbuf *param2) v0 = 0; } - BGL_FillWindow(param0, 0x101); + Window_FillTilemap(param0, 0x101); Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, param2, v0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(14, 15, 1), NULL); - sub_0201A954(param0); + Window_CopyToVRAM(param0); } static void sub_02087FC0(UnkStruct_02087A10 *param0, OverlayManager *param1, NARC *param2) { - BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[0], 0, 2, 1, 26, 12, 1, (32 * 8)); - BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[1], 1, 2, 1, 26, 12, 1, ((32 * 8) + (26 * 12))); + Window_Add(param0->unk_160, ¶m0->unk_41C[0], 0, 2, 1, 26, 12, 1, (32 * 8)); + Window_Add(param0->unk_160, ¶m0->unk_41C[1], 1, 2, 1, 26, 12, 1, ((32 * 8) + (26 * 12))); if (param0->unk_00 == 4) { sub_0200710C(param2, 6 + 3, param0->unk_160, 1, 0, (32 * 14 * 2), 1, 18); @@ -1840,24 +1840,24 @@ static void sub_02087FC0(UnkStruct_02087A10 *param0, OverlayManager *param1, NAR sub_02088E58(¶m0->unk_41C[1], 0x404, 0, TEXT_COLOR(14, 15, 0), param0->unk_514->pRawData); } - BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[2], 2, 7, 2, 22, 2, 0, (((32 * 8) + (26 * 12)) + (26 * 12))); + Window_Add(param0->unk_160, ¶m0->unk_41C[2], 2, 7, 2, 22, 2, 0, (((32 * 8) + (26 * 12)) + (26 * 12))); { int v0 = ((param0->unk_0C * 12) / 8) + 1; - BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[3], 2, 10, 3, v0, 2, 0, ((((32 * 8) + (26 * 12)) + (26 * 12)) + 44)); - BGL_FillWindow(¶m0->unk_41C[3], 0x101); - BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[8], 2, 10 + v0 - 1, 3, 7, 2, 0, (((((32 * 8) + (26 * 12)) + (26 * 12)) + 44) + 36)); - BGL_FillWindow(¶m0->unk_41C[8], 0x101); + Window_Add(param0->unk_160, ¶m0->unk_41C[3], 2, 10, 3, v0, 2, 0, ((((32 * 8) + (26 * 12)) + (26 * 12)) + 44)); + Window_FillTilemap(¶m0->unk_41C[3], 0x101); + Window_Add(param0->unk_160, ¶m0->unk_41C[8], 2, 10 + v0 - 1, 3, 7, 2, 0, (((((32 * 8) + (26 * 12)) + (26 * 12)) + 44) + 36)); + Window_FillTilemap(¶m0->unk_41C[8], 0x101); } if (param0->unk_00 == 5) { sub_02087F78(¶m0->unk_41C[8], param0->unk_00, param0->unk_184); - sub_0201A954(¶m0->unk_41C[8]); + Window_CopyToVRAM(¶m0->unk_41C[8]); } - BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[9], 4, 2, 19, 27, 4, 12, (120 + (2 * 2 * 3))); - BGL_FillWindow(¶m0->unk_41C[9], 0xf0f); + Window_Add(param0->unk_160, ¶m0->unk_41C[9], 4, 2, 19, 27, 4, 12, (120 + (2 * 2 * 3))); + Window_FillTilemap(¶m0->unk_41C[9], 0xf0f); sub_02087F48(¶m0->unk_41C[9], param0->unk_00, param0->unk_178); { @@ -1873,19 +1873,19 @@ static void sub_02087FC0(UnkStruct_02087A10 *param0, OverlayManager *param1, NAR int v2; for (v2 = 0; v2 < 3; v2++) { - BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[4 + v2], 2, 0, 0, 2, 2, 0, 120); - BGL_FillWindow(¶m0->unk_41C[4 + v2], 0); + Window_Add(param0->unk_160, ¶m0->unk_41C[4 + v2], 2, 0, 0, 2, 2, 0, 120); + Window_FillTilemap(¶m0->unk_41C[4 + v2], 0); } - BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[7], 2, 0, 0, 16, 2, 0, (120 + (2 * 2 * 3))); - BGL_FillWindow(¶m0->unk_41C[7], 0); + Window_Add(param0->unk_160, ¶m0->unk_41C[7], 2, 0, 0, 16, 2, 0, (120 + (2 * 2 * 3))); + Window_FillTilemap(¶m0->unk_41C[7], 0); } } static void sub_02088240(BgConfig *param0, int param1, VecFx32 param2[]) { - BGL_SetPriority(0 + param1, 1); - BGL_SetPriority(0 + param1 ^ 1, 2); + Bg_SetPriority(0 + param1, 1); + Bg_SetPriority(0 + param1 ^ 1, 2); } static void sub_02088260(VecFx32 param0[], int param1) @@ -2075,7 +2075,7 @@ static void sub_02088554(Window *param0, const u16 *param1, int param2, int para while (param1[v0] != 0xffff) { if ((param1[v0] == 0xd001) || (param1[v0] == (0xd001 + 1)) || (param1[v0] == (0xd001 + 2))) { u16 v5 = param1[v0] - 0xd001; - sub_0201ADDC(param0, (void *)¶m7[v5 * 8 * 8 * 4 / 2], 0, 0, 12, 12, param2 + v0 * param4, param3 + 2, 12, 12); + Window_BlitBitmapRect(param0, (void *)¶m7[v5 * 8 * 8 * 4 / 2], 0, 0, 12, 12, param2 + v0 * param4, param3 + 2, 12, 12); } else { if (param1[v0] == (0xd001 + 3)) { v0++; @@ -2117,7 +2117,7 @@ static void sub_02088678(Window *param0, const u16 *param1, u8 *param2, Strbuf * void *v3; Strbuf *v4; - BGL_FillWindow(¶m0[3], 0); + Window_FillTilemap(¶m0[3], 0); v3 = sub_02088654(¶m0[3], param3, FONT_SUBSCREEN, TEXT_COLOR(13, 14, 15)); DC_FlushRange(v3, 0x20 * 4 * 16); @@ -2133,7 +2133,7 @@ static void sub_02088678(Window *param0, const u16 *param1, u8 *param2, Strbuf * v0[0] = param1[v1]; v0[1] = 0xffff; - BGL_FillWindow(¶m0[v1], 0); + Window_FillTilemap(¶m0[v1], 0); Strbuf_CopyChars(v4, v0); v3 = sub_02088654(¶m0[v1], v4, FONT_SUBSCREEN, TEXT_COLOR(13, 14, 15)); @@ -2235,21 +2235,21 @@ static int sub_02088898(UnkStruct_02087A10 *param0, u16 param1, int param2) switch (param1) { case 0xd001: if (sub_02088D08(42, (42 + 40), 1, 0xd001, param0->unk_D8, param0->unk_158)) { - BGL_FillWindow(¶m0->unk_41C[3], 0x101); + Window_FillTilemap(¶m0->unk_41C[3], 0x101); sub_02088554(¶m0->unk_41C[3], param0->unk_D8, 0, 0, 12, TEXT_SPEED_INSTANT, TEXT_COLOR(14, 15, 1), NULL); Sound_PlayEffect(1515); } break; case (0xd001 + 1): if (sub_02088D08(72, (72 + 10), 2, (0xd001 + 1), param0->unk_D8, param0->unk_158)) { - BGL_FillWindow(¶m0->unk_41C[3], 0x101); + Window_FillTilemap(¶m0->unk_41C[3], 0x101); sub_02088554(¶m0->unk_41C[3], param0->unk_D8, 0, 0, 12, TEXT_SPEED_INSTANT, TEXT_COLOR(14, 15, 1), NULL); Sound_PlayEffect(1515); } break; case (0xe001 + 5): if (sub_02088C9C(0, (72 + 10), param0->unk_D8, param0->unk_158)) { - BGL_FillWindow(¶m0->unk_41C[3], 0x101); + Window_FillTilemap(¶m0->unk_41C[3], 0x101); sub_02088554(¶m0->unk_41C[3], param0->unk_D8, 0, 0, 12, TEXT_SPEED_INSTANT, TEXT_COLOR(14, 15, 1), NULL); param0->unk_4F4[4]++; Sound_PlayEffect(1515); @@ -2273,10 +2273,10 @@ static int sub_02088898(UnkStruct_02087A10 *param0, u16 param1, int param2) param0->unk_D8[param0->unk_158 - 1] = 0xffff; param0->unk_158--; - BGL_FillWindow(¶m0->unk_41C[3], 0x101); + Window_FillTilemap(¶m0->unk_41C[3], 0x101); if (param0->unk_158 == 0) { - sub_0201A954(¶m0->unk_41C[3]); + Window_CopyToVRAM(¶m0->unk_41C[3]); } else { sub_02088554(¶m0->unk_41C[3], param0->unk_D8, 0, 0, 12, TEXT_SPEED_INSTANT, TEXT_COLOR(14, 15, 1), NULL); } @@ -2311,7 +2311,7 @@ static int sub_02088898(UnkStruct_02087A10 *param0, u16 param1, int param2) if (param0->unk_158 != param0->unk_0C) { param0->unk_D8[param0->unk_158] = param1; - BGL_FillWindow(¶m0->unk_41C[3], 0x101); + Window_FillTilemap(¶m0->unk_41C[3], 0x101); sub_02088554(¶m0->unk_41C[3], param0->unk_D8, 0, 0, 12, TEXT_SPEED_INSTANT, TEXT_COLOR(14, 15, 1), NULL); param0->unk_158++; @@ -2448,24 +2448,24 @@ static void sub_02088E58(Window *param0, u16 param1, int param2, TextColor param { int v0, v1, v2; - BGL_FillWindow(param0, param1); + Window_FillTilemap(param0, param1); for (v0 = 0; v0 < 6; v0++) { - BGL_WindowColor(param0, Unk_020F24E0[param2], 16 + 32 * v0, 0, 16, 19); - BGL_WindowColor(param0, Unk_020F24E0[param2], 16 + 32 * v0, 19 * 2, 16, 19); - BGL_WindowColor(param0, Unk_020F24E0[param2], 16 + 32 * v0, 19 * 4, 16, 19); + Window_FillRectWithColor(param0, Unk_020F24E0[param2], 16 + 32 * v0, 0, 16, 19); + Window_FillRectWithColor(param0, Unk_020F24E0[param2], 16 + 32 * v0, 19 * 2, 16, 19); + Window_FillRectWithColor(param0, Unk_020F24E0[param2], 16 + 32 * v0, 19 * 4, 16, 19); } for (v0 = 0; v0 < 7; v0++) { - BGL_WindowColor(param0, Unk_020F24E0[param2], 32 * v0, 19, 16, 19); - BGL_WindowColor(param0, Unk_020F24E0[param2], 32 * v0, 19 * 3, 16, 19); + Window_FillRectWithColor(param0, Unk_020F24E0[param2], 32 * v0, 19, 16, 19); + Window_FillRectWithColor(param0, Unk_020F24E0[param2], 32 * v0, 19 * 3, 16, 19); } for (v0 = 0; v0 < 5; v0++) { sub_02088554(param0, Unk_02100C54[param2][v0], 0, v0 * 19 + 4, 16, TEXT_SPEED_NO_TRANSFER, param3, param4); } - sub_0201A954(param0); + Window_CopyToVRAM(param0); } static void sub_02088F40(int param0[], CellActor **param1, int param2) diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index d37f23a036..06589c4420 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -60,7 +60,7 @@ static int sub_020890F4(OverlayManager *param0, int *param1) GXS_SetVisiblePlane(0); v0->unk_2C0.unk_00 = NARC_ctor(NARC_INDEX_ARC__CODEIN_GRA, 101); - v0->unk_2C0.unk_0C = sub_02018340(101); + v0->unk_2C0.unk_0C = BgConfig_New(101); v0->unk_2C0.unk_10 = sub_02002F38(101); sub_02003858(v0->unk_2C0.unk_10, 1); @@ -125,13 +125,13 @@ static int sub_0208927C(OverlayManager *param0, int *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); - sub_02019044(v0->unk_2C0.unk_0C, 1); - sub_02019044(v0->unk_2C0.unk_0C, 2); - sub_02019044(v0->unk_2C0.unk_0C, 3); - sub_02019044(v0->unk_2C0.unk_0C, 4); - sub_02019044(v0->unk_2C0.unk_0C, 5); - sub_02019044(v0->unk_2C0.unk_0C, 6); - sub_02019044(v0->unk_2C0.unk_0C, 7); + Bg_FreeTilemapBuffer(v0->unk_2C0.unk_0C, 1); + Bg_FreeTilemapBuffer(v0->unk_2C0.unk_0C, 2); + Bg_FreeTilemapBuffer(v0->unk_2C0.unk_0C, 3); + Bg_FreeTilemapBuffer(v0->unk_2C0.unk_0C, 4); + Bg_FreeTilemapBuffer(v0->unk_2C0.unk_0C, 5); + Bg_FreeTilemapBuffer(v0->unk_2C0.unk_0C, 6); + Bg_FreeTilemapBuffer(v0->unk_2C0.unk_0C, 7); Heap_FreeToHeap(v0->unk_2C0.unk_0C); sub_02002FA0(v0->unk_2C0.unk_10, 0); sub_02002FA0(v0->unk_2C0.unk_10, 1); @@ -278,12 +278,12 @@ static void sub_0208945C(BgConfig *param0) }, }; - sub_020183C4(param0, 1, &v1[0], 0); - sub_020183C4(param0, 2, &v1[1], 0); - sub_020183C4(param0, 3, &v1[2], 0); - sub_02019EBC(param0, 1); - sub_02019EBC(param0, 2); - sub_02019EBC(param0, 3); + Bg_InitFromTemplate(param0, 1, &v1[0], 0); + Bg_InitFromTemplate(param0, 2, &v1[1], 0); + Bg_InitFromTemplate(param0, 3, &v1[2], 0); + Bg_ClearTilemap(param0, 1); + Bg_ClearTilemap(param0, 2); + Bg_ClearTilemap(param0, 3); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); @@ -326,14 +326,14 @@ static void sub_0208945C(BgConfig *param0) { 0 }, }; - sub_020183C4(param0, 4, &v2[0], 0); - sub_020183C4(param0, 5, &v2[1], 0); - sub_020183C4(param0, 6, &v2[2], 0); - sub_020183C4(param0, 7, &v2[3], 0); - sub_02019EBC(param0, 4); - sub_02019EBC(param0, 5); - sub_02019EBC(param0, 6); - sub_02019EBC(param0, 7); + Bg_InitFromTemplate(param0, 4, &v2[0], 0); + Bg_InitFromTemplate(param0, 5, &v2[1], 0); + Bg_InitFromTemplate(param0, 6, &v2[2], 0); + Bg_InitFromTemplate(param0, 7, &v2[3], 0); + Bg_ClearTilemap(param0, 4); + Bg_ClearTilemap(param0, 5); + Bg_ClearTilemap(param0, 6); + Bg_ClearTilemap(param0, 7); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); @@ -354,7 +354,7 @@ static void sub_020895CC(void *param0) sub_0201DCAC(); sub_0200C800(); sub_02003694(v0->unk_2C0.unk_10); - sub_0201C2B8(v0->unk_2C0.unk_0C); + Bg_RunScheduledUpdates(v0->unk_2C0.unk_0C); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index f2ea192fc2..df45c17b93 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -129,7 +129,7 @@ void sub_0208A6CC (UnkStruct_02089688 * param0) } sub_0208AFE8(param0); - BGL_DeleteWindow(¶m0->unk_2C0.unk_B0); + Window_Remove(¶m0->unk_2C0.unk_B0); } extern void _u32_div_f(void); @@ -710,7 +710,7 @@ void sub_0208B090 (UnkStruct_02089688 * param0, int param1, int param2, int para { Window_Init(&v7); - BGL_AddFramelessWindow(param0->unk_2C0.unk_0C, &v7, 10, 2, 0, 0); + Window_AddToTopLeftCorner(param0->unk_2C0.unk_0C, &v7, 10, 2, 0, 0); Text_AddPrinterWithParamsAndColor(&v7, FONT_SUBSCREEN, v3, Font_CalcCenterAlignment(FONT_SUBSCREEN, v3, 0, 80), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 2), NULL); } @@ -742,16 +742,16 @@ void sub_0208B090 (UnkStruct_02089688 * param0, int param1, int param2, int para sub_02012AC0(param0->unk_2C0.unk_90[param1], param4); Strbuf_Free(v3); MessageLoader_Free(v6); - BGL_DeleteWindow(&v7); + Window_Remove(&v7); } void sub_0208B1C4(BgConfig *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { Window_Init(param1); - BGL_AddWindow(param0, param1, param2, param3, param4, param5, param6, 12, param7); + Window_Add(param0, param1, param2, param3, param4, param5, param6, 12, param7); sub_0200E060(param1, 1, 1, 11); - BGL_FillWindow(param1, 15); - sub_0201A954(param1); + Window_FillTilemap(param1, 15); + Window_CopyToVRAM(param1); sub_0208B230(param1, param8); } @@ -760,14 +760,14 @@ void sub_0208B230 (Window * param0, int param1) MessageLoader * v0; Strbuf* v1; - BGL_FillWindow(param0, 15); + Window_FillTilemap(param0, 15); v0 = MessageLoader_Init(0, 26, 212, 101); v1 = MessageLoader_GetNewStrbuf(v0, param1); - BGL_FillWindow(param0, 15); + Window_FillTilemap(param0, 15); Text_AddPrinterWithParams(param0, FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_INSTANT, NULL); - sub_0201A954(param0); + Window_CopyToVRAM(param0); Strbuf_Free(v1); MessageLoader_Free(v0); diff --git a/src/unk_0208C098.c b/src/unk_0208C098.c index 964488d51a..9b209d5091 100644 --- a/src/unk_0208C098.c +++ b/src/unk_0208C098.c @@ -176,7 +176,7 @@ void sub_0208C210(BgConfig *param0, int param1, NARC *param2, int param3, int pa param7 = v2->szByte; } - sub_0201958C(param0, param5, v2->pRawData, param7, param8); + Bg_LoadTiles(param0, param5, v2->pRawData, param7, param8); break; case 1: NNS_G2dGetUnpackedScreenData(v1, &v3); @@ -185,11 +185,11 @@ void sub_0208C210(BgConfig *param0, int param1, NARC *param2, int param3, int pa param7 = v3->szByte; } - if (sub_02019FE4(param0, param5) != NULL) { - sub_02019574(param0, param5, v3->rawData, param7); + if (Bg_GetTilemapBuffer(param0, param5) != NULL) { + Bg_LoadTilemapBuffer(param0, param5, v3->rawData, param7); } - sub_02019460(param0, param5, v3->rawData, param7, param8); + Bg_CopyTilemapBufferRangeToVRAM(param0, param5, v3->rawData, param7, param8); break; case 2: NNS_G2dGetUnpackedPaletteData(v1, &v4); @@ -198,7 +198,7 @@ void sub_0208C210(BgConfig *param0, int param1, NARC *param2, int param3, int pa param7 = v4->szByte; } - sub_0201972C(param5, v4->pRawData, param7, param8); + Bg_LoadPalette(param5, v4->pRawData, param7, param8); } Heap_FreeToHeap(v1); diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c index 0a11f62b30..aac05b835c 100644 --- a/src/unk_0208EA44.c +++ b/src/unk_0208EA44.c @@ -654,7 +654,7 @@ void sub_0208F6DC(PokemonSummaryApp *param0, Window *param1) return; } - SpriteActor_SetPositionXY(param0->unk_41C[47], sub_0201C29C(param1) * 8 - 10, 8); + SpriteActor_SetPositionXY(param0->unk_41C[47], Window_GetXPos(param1) * 8 - 10, 8); CellActor_SetDrawFlag(param0->unk_41C[47], 1); } diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index d318b98a9f..70e9bb01c7 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -138,8 +138,8 @@ void sub_0208FCF8(PokemonSummaryApp *param0) u16 v0; for (v0 = 0; v0 < 36; v0++) { - sub_0201A8D4(param0->bgl, ¶m0->staticWindows[v0], &Unk_020F4ED0[v0]); - BGL_FillWindow(¶m0->staticWindows[v0], 0); + Window_AddFromTemplate(param0->bgl, ¶m0->staticWindows[v0], &Unk_020F4ED0[v0]); + Window_FillTilemap(¶m0->staticWindows[v0], 0); } sub_020902B0(param0); @@ -191,10 +191,10 @@ void sub_0208FD40(PokemonSummaryApp *param0) return; } - param0->extraWindows = sub_0201A778(19, param0->numExtraWindows); + param0->extraWindows = Window_New(19, param0->numExtraWindows); for (v1 = 0; v1 < param0->numExtraWindows; v1++) { - sub_0201A8D4(param0->bgl, ¶m0->extraWindows[v1], &v0[v1]); + Window_AddFromTemplate(param0->bgl, ¶m0->extraWindows[v1], &v0[v1]); } } @@ -218,7 +218,7 @@ void sub_0208FE34(PokemonSummaryApp *param0) return; } - sub_0201A928(param0->extraWindows, param0->numExtraWindows); + Windows_Delete(param0->extraWindows, param0->numExtraWindows); } void sub_0208FE88(PokemonSummaryApp *param0) @@ -228,7 +228,7 @@ void sub_0208FE88(PokemonSummaryApp *param0) sub_0208FE34(param0); for (v0 = 0; v0 < 36; v0++) { - BGL_DeleteWindow(¶m0->staticWindows[v0]); + Window_Remove(¶m0->staticWindows[v0]); } } @@ -239,7 +239,7 @@ void sub_0208FEA4(PokemonSummaryApp *param0) v0 = ¶m0->staticWindows[34]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->monData.nickname, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); if (param0->monData.showGender == 0) { @@ -252,7 +252,7 @@ void sub_0208FEA4(PokemonSummaryApp *param0) } } - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } void sub_0208FF3C(PokemonSummaryApp *param0) @@ -262,7 +262,7 @@ void sub_0208FF3C(PokemonSummaryApp *param0) v0 = ¶m0->staticWindows[33]; - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); if (param0->monData.isEgg == 0) { sub_0200C578(param0->unk_684, 1, v0, 0, 5); @@ -275,14 +275,14 @@ void sub_0208FF3C(PokemonSummaryApp *param0) Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->strbuf, 16, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); } - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } void sub_0208FFE0(PokemonSummaryApp *param0) { Strbuf *v0; - BGL_FillWindow(¶m0->staticWindows[32], 0); + Window_FillTilemap(¶m0->staticWindows[32], 0); if (param0->monData.heldItem != 0) { StringTemplate_SetItemName(param0->strFormatter, 0, param0->monData.heldItem); @@ -294,15 +294,15 @@ void sub_0208FFE0(PokemonSummaryApp *param0) } sub_020900D8(param0, ¶m0->staticWindows[32], TEXT_COLOR(1, 2, 0), 0); - sub_0201A9A4(¶m0->staticWindows[6]); - sub_0201A9A4(¶m0->staticWindows[32]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[6]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[32]); } void sub_02090064(PokemonSummaryApp *param0, u32 param1) { - BGL_FillWindow(¶m0->staticWindows[35], 0); + Window_FillTilemap(¶m0->staticWindows[35], 0); sub_02090158(param0, 35, param1, TEXT_COLOR(15, 14, 0), 0); - sub_0201A9A4(¶m0->staticWindows[35]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[35]); } static BOOL sub_02090098(PokemonSummaryApp *param0) @@ -326,12 +326,12 @@ static void sub_020900D8(PokemonSummaryApp *param0, Window *param1, TextColor pa break; case 1: v0 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->strbuf, 0); - v1 = sub_0201C294(param1) * 8; + v1 = Window_GetWidth(param1) * 8; v2 = v1 - v0; break; case 2: v0 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->strbuf, 0); - v1 = sub_0201C294(param1) * 8; + v1 = Window_GetWidth(param1) * 8; v2 = (v1 - v0) / 2; break; } @@ -424,8 +424,8 @@ static void sub_020902B0(PokemonSummaryApp *param0) void sub_020904C4(PokemonSummaryApp *param0) { - sub_02019CB8(param0->bgl, 1, 0, 0, 0, 32, 2, 16); - sub_02019CB8(param0->bgl, 1, 0, 14, 2, 18, 22, 16); + Bg_FillTilemapRect(param0->bgl, 1, 0, 0, 0, 32, 2, 16); + Bg_FillTilemapRect(param0->bgl, 1, 0, 14, 2, 18, 22, 16); switch (param0->page) { case 0: @@ -457,22 +457,22 @@ void sub_020904C4(PokemonSummaryApp *param0) static void sub_02090578(PokemonSummaryApp *param0) { - sub_0201A9A4(¶m0->staticWindows[0]); - sub_0201A9A4(¶m0->staticWindows[7]); - sub_0201A9A4(¶m0->staticWindows[8]); - sub_0201A9A4(¶m0->staticWindows[9]); - sub_0201A9A4(¶m0->staticWindows[10]); - sub_0201A9A4(¶m0->staticWindows[11]); - sub_0201A9A4(¶m0->staticWindows[12]); - sub_0201A9A4(¶m0->staticWindows[13]); - sub_0201A9A4(¶m0->staticWindows[14]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[0]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[7]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[8]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[9]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[10]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[11]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[12]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[13]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[14]); - BGL_FillWindow(¶m0->extraWindows[0], 0); - BGL_FillWindow(¶m0->extraWindows[1], 0); - BGL_FillWindow(¶m0->extraWindows[2], 0); - BGL_FillWindow(¶m0->extraWindows[3], 0); - BGL_FillWindow(¶m0->extraWindows[4], 0); - BGL_FillWindow(¶m0->extraWindows[5], 0); + Window_FillTilemap(¶m0->extraWindows[0], 0); + Window_FillTilemap(¶m0->extraWindows[1], 0); + Window_FillTilemap(¶m0->extraWindows[2], 0); + Window_FillTilemap(¶m0->extraWindows[3], 0); + Window_FillTilemap(¶m0->extraWindows[4], 0); + Window_FillTilemap(¶m0->extraWindows[5], 0); { u32 v0 = sub_0207A294(param0->data->dexMode, param0->monData.species); @@ -522,12 +522,12 @@ static void sub_02090578(PokemonSummaryApp *param0) } sub_020900D8(param0, ¶m0->extraWindows[5], TEXT_COLOR(1, 2, 0), 2); - sub_0201A9A4(¶m0->extraWindows[0]); - sub_0201A9A4(¶m0->extraWindows[1]); - sub_0201A9A4(¶m0->extraWindows[2]); - sub_0201A9A4(¶m0->extraWindows[3]); - sub_0201A9A4(¶m0->extraWindows[4]); - sub_0201A9A4(¶m0->extraWindows[5]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[0]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[1]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[2]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[3]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[4]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[5]); } static void sub_02090800(Window *param0, Pokemon *param1, BOOL param2) @@ -561,8 +561,8 @@ static void sub_020908CC(PokemonSummaryApp *param0) { Strbuf *v0; - sub_0201A9A4(¶m0->staticWindows[1]); - BGL_FillWindow(¶m0->extraWindows[0], 0); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[1]); + Window_FillTilemap(¶m0->extraWindows[0], 0); { void *v1 = PokemonSummary_MonData(param0); @@ -581,32 +581,32 @@ static void sub_020908CC(PokemonSummaryApp *param0) } } - sub_0201A9A4(¶m0->extraWindows[0]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[0]); } static void sub_0209093C(PokemonSummaryApp *param0) { u32 v0; - sub_0201A9A4(¶m0->staticWindows[2]); - sub_0201A9A4(¶m0->staticWindows[15]); - sub_0201A9A4(¶m0->staticWindows[16]); - sub_0201A9A4(¶m0->staticWindows[17]); - sub_0201A9A4(¶m0->staticWindows[18]); - sub_0201A9A4(¶m0->staticWindows[19]); - sub_0201A9A4(¶m0->staticWindows[20]); - sub_0201A9A4(¶m0->staticWindows[21]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[2]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[15]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[16]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[17]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[18]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[19]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[20]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[21]); - BGL_FillWindow(¶m0->extraWindows[0], 0); - BGL_FillWindow(¶m0->extraWindows[1], 0); - BGL_FillWindow(¶m0->extraWindows[2], 0); - BGL_FillWindow(¶m0->extraWindows[3], 0); - BGL_FillWindow(¶m0->extraWindows[4], 0); - BGL_FillWindow(¶m0->extraWindows[5], 0); - BGL_FillWindow(¶m0->extraWindows[6], 0); - BGL_FillWindow(¶m0->extraWindows[7], 0); + Window_FillTilemap(¶m0->extraWindows[0], 0); + Window_FillTilemap(¶m0->extraWindows[1], 0); + Window_FillTilemap(¶m0->extraWindows[2], 0); + Window_FillTilemap(¶m0->extraWindows[3], 0); + Window_FillTilemap(¶m0->extraWindows[4], 0); + Window_FillTilemap(¶m0->extraWindows[5], 0); + Window_FillTilemap(¶m0->extraWindows[6], 0); + Window_FillTilemap(¶m0->extraWindows[7], 0); - v0 = sub_0201C294(¶m0->extraWindows[0]) * 8; + v0 = Window_GetWidth(¶m0->extraWindows[0]) * 8; sub_020901D0(param0, 0, 117, 119, 118, param0->monData.curHP, param0->monData.maxHP, 3, v0 / 2, 0); sub_02090184(param0, 120, param0->monData.attack, 3, 0); @@ -637,44 +637,44 @@ static void sub_0209093C(PokemonSummaryApp *param0) sub_020900D8(param0, ¶m0->extraWindows[7], TEXT_COLOR(1, 2, 0), 0); } - sub_0201A9A4(¶m0->extraWindows[0]); - sub_0201A9A4(¶m0->extraWindows[1]); - sub_0201A9A4(¶m0->extraWindows[2]); - sub_0201A9A4(¶m0->extraWindows[3]); - sub_0201A9A4(¶m0->extraWindows[4]); - sub_0201A9A4(¶m0->extraWindows[5]); - sub_0201A9A4(¶m0->extraWindows[6]); - sub_0201A9A4(¶m0->extraWindows[7]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[0]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[1]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[2]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[3]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[4]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[5]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[6]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[7]); } static void sub_02090BDC(PokemonSummaryApp *param0) { - sub_0201A9A4(¶m0->staticWindows[3]); - sub_0201A9A4(¶m0->staticWindows[22]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[3]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[22]); if ((param0->data->mode != 3) && (param0->data->mode != 4)) { return; } - BGL_FillWindow(¶m0->extraWindows[1], 0); + Window_FillTilemap(¶m0->extraWindows[1], 0); MessageLoader_GetStrbuf(param0->msgLoader, 165, param0->strbuf); sub_020900D8(param0, ¶m0->extraWindows[1], TEXT_COLOR(15, 14, 0), 0); MessageLoader_GetStrbuf(param0->msgLoader, 166 + param0->monData.preferredFlavor, param0->strbuf); Text_AddPrinterWithParamsAndColor(¶m0->extraWindows[1], FONT_SYSTEM, param0->strbuf, 0, 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A9A4(¶m0->extraWindows[1]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[1]); if (param0->data->mode == 3) { - BGL_FillWindow(¶m0->extraWindows[0], 0); + Window_FillTilemap(¶m0->extraWindows[0], 0); MessageLoader_GetStrbuf(param0->msgLoader, 163, param0->strbuf); sub_020900D8(param0, ¶m0->extraWindows[0], TEXT_COLOR(15, 14, 0), 0); - sub_0201A9A4(¶m0->extraWindows[0]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[0]); sub_0208F6DC(param0, ¶m0->extraWindows[0]); } } static void sub_02090CD4(PokemonSummaryApp *param0) { - sub_0201A9A4(¶m0->staticWindows[4]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[4]); if (param0->data->mode == 2) { sub_02090064(param0, 155); @@ -684,25 +684,25 @@ static void sub_02090CD4(PokemonSummaryApp *param0) sub_0208F6DC(param0, ¶m0->staticWindows[35]); - BGL_FillWindow(¶m0->extraWindows[0], 0); - BGL_FillWindow(¶m0->extraWindows[1], 0); - BGL_FillWindow(¶m0->extraWindows[2], 0); - BGL_FillWindow(¶m0->extraWindows[3], 0); + Window_FillTilemap(¶m0->extraWindows[0], 0); + Window_FillTilemap(¶m0->extraWindows[1], 0); + Window_FillTilemap(¶m0->extraWindows[2], 0); + Window_FillTilemap(¶m0->extraWindows[3], 0); sub_02091188(param0, 0); sub_02091188(param0, 1); sub_02091188(param0, 2); sub_02091188(param0, 3); - sub_0201A9A4(¶m0->extraWindows[0]); - sub_0201A9A4(¶m0->extraWindows[1]); - sub_0201A9A4(¶m0->extraWindows[2]); - sub_0201A9A4(¶m0->extraWindows[3]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[0]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[1]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[2]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[3]); } static void sub_02090D90(PokemonSummaryApp *param0) { - sub_0201A9A4(¶m0->staticWindows[5]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[5]); if (param0->data->mode == 2) { sub_02090064(param0, 159); @@ -712,31 +712,31 @@ static void sub_02090D90(PokemonSummaryApp *param0) sub_0208F6DC(param0, ¶m0->staticWindows[35]); - BGL_FillWindow(¶m0->extraWindows[0], 0); - BGL_FillWindow(¶m0->extraWindows[1], 0); - BGL_FillWindow(¶m0->extraWindows[2], 0); - BGL_FillWindow(¶m0->extraWindows[3], 0); + Window_FillTilemap(¶m0->extraWindows[0], 0); + Window_FillTilemap(¶m0->extraWindows[1], 0); + Window_FillTilemap(¶m0->extraWindows[2], 0); + Window_FillTilemap(¶m0->extraWindows[3], 0); sub_02091188(param0, 0); sub_02091188(param0, 1); sub_02091188(param0, 2); sub_02091188(param0, 3); - sub_0201A9A4(¶m0->extraWindows[0]); - sub_0201A9A4(¶m0->extraWindows[1]); - sub_0201A9A4(¶m0->extraWindows[2]); - sub_0201A9A4(¶m0->extraWindows[3]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[0]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[1]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[2]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[3]); } static void sub_02090E4C(PokemonSummaryApp *param0) { - sub_0201A9A4(¶m0->staticWindows[31]); - sub_0201A9A4(¶m0->staticWindows[30]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[31]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[30]); - BGL_FillWindow(¶m0->extraWindows[0], 0); + Window_FillTilemap(¶m0->extraWindows[0], 0); sub_02090184(param0, 183, param0->ribbonMax, 3, 0); sub_020900D8(param0, ¶m0->extraWindows[0], TEXT_COLOR(1, 2, 0), 0); - sub_0201A9A4(¶m0->extraWindows[0]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[0]); if (param0->ribbonMax != 0) { sub_02090064(param0, 180); @@ -746,7 +746,7 @@ static void sub_02090E4C(PokemonSummaryApp *param0) static void sub_02090EC8(PokemonSummaryApp *param0) { - sub_0201A9A4(¶m0->staticWindows[28]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[28]); sub_02090064(param0, 161); sub_0208F6DC(param0, ¶m0->staticWindows[35]); @@ -754,7 +754,7 @@ static void sub_02090EC8(PokemonSummaryApp *param0) return; } - BGL_FillWindow(¶m0->extraWindows[1], 0); + Window_FillTilemap(¶m0->extraWindows[1], 0); MessageLoader_GetStrbuf(param0->msgLoader, 165, param0->strbuf); sub_020900D8(param0, ¶m0->extraWindows[1], TEXT_COLOR(15, 14, 0), 0); @@ -762,7 +762,7 @@ static void sub_02090EC8(PokemonSummaryApp *param0) MessageLoader_GetStrbuf(param0->msgLoader, 166 + param0->monData.preferredFlavor, param0->strbuf); Text_AddPrinterWithParamsAndColor(¶m0->extraWindows[1], FONT_SYSTEM, param0->strbuf, 0, 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A9A4(¶m0->extraWindows[1]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[1]); } void sub_02090F84(PokemonSummaryApp *param0) @@ -771,7 +771,7 @@ void sub_02090F84(PokemonSummaryApp *param0) u8 v1; u8 v2; - BGL_FillWindow(¶m0->extraWindows[1], 0); + Window_FillTilemap(¶m0->extraWindows[1], 0); v0 = MessageLoader_GetNewStrbuf(param0->msgLoader, 186); @@ -801,13 +801,13 @@ void sub_02090F84(PokemonSummaryApp *param0) v1 -= v2; Text_AddPrinterWithParamsAndColor(¶m0->extraWindows[1], FONT_SYSTEM, param0->strbuf, v1, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); - sub_0201A9A4(¶m0->extraWindows[1]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[1]); } void sub_020910E4(PokemonSummaryApp *param0) { - BGL_FillWindow(¶m0->extraWindows[2], 0); - BGL_FillWindow(¶m0->extraWindows[3], 0); + Window_FillTilemap(¶m0->extraWindows[2], 0); + Window_FillTilemap(¶m0->extraWindows[3], 0); MessageLoader_GetStrbuf(param0->ribbonLoader, sub_020923C0(param0->ribbonNum, 3), param0->strbuf); sub_020900D8(param0, ¶m0->extraWindows[2], TEXT_COLOR(15, 14, 0), 0); @@ -815,8 +815,8 @@ void sub_020910E4(PokemonSummaryApp *param0) MessageLoader_GetStrbuf(param0->ribbonLoader, sub_02092424(param0->data->ribbons, param0->ribbonNum), param0->strbuf); sub_020900D8(param0, ¶m0->extraWindows[3], TEXT_COLOR(1, 2, 0), 0); - sub_0201A9A4(¶m0->extraWindows[2]); - sub_0201A9A4(¶m0->extraWindows[3]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[2]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[3]); } static void sub_02091188(PokemonSummaryApp *param0, u32 param1) @@ -859,13 +859,13 @@ void sub_020912A4(PokemonSummaryApp *param0, u32 param1) u32 v1; u32 v2; - sub_0201A9A4(¶m0->staticWindows[25]); - sub_0201A9A4(¶m0->staticWindows[26]); - sub_0201A9A4(¶m0->staticWindows[27]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[25]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[26]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[27]); - BGL_FillWindow(¶m0->extraWindows[5], 0); - BGL_FillWindow(¶m0->extraWindows[6], 0); - BGL_FillWindow(¶m0->extraWindows[7], 0); + Window_FillTilemap(¶m0->extraWindows[5], 0); + Window_FillTilemap(¶m0->extraWindows[6], 0); + Window_FillTilemap(¶m0->extraWindows[7], 0); v2 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_POWER); @@ -893,48 +893,48 @@ void sub_020912A4(PokemonSummaryApp *param0, u32 param1) sub_020900D8(param0, ¶m0->extraWindows[7], TEXT_COLOR(1, 2, 0), 0); MessageLoader_Free(v0); - sub_0201A9A4(¶m0->extraWindows[5]); - sub_0201A9A4(¶m0->extraWindows[6]); - sub_0201A9A4(¶m0->extraWindows[7]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[5]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[6]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[7]); } void sub_020913D8(PokemonSummaryApp *param0) { - sub_0201AD10(¶m0->staticWindows[25]); - sub_0201AD10(¶m0->staticWindows[26]); - sub_0201AD10(¶m0->staticWindows[27]); - sub_0201AD10(¶m0->extraWindows[5]); - sub_0201AD10(¶m0->extraWindows[6]); - sub_0201AD10(¶m0->extraWindows[7]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[25]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[26]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[27]); + Window_ClearAndScheduleCopyToVRAM(¶m0->extraWindows[5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->extraWindows[6]); + Window_ClearAndScheduleCopyToVRAM(¶m0->extraWindows[7]); } void sub_02091420(PokemonSummaryApp *param0) { if (param0->data->move != 0) { - BGL_FillWindow(¶m0->extraWindows[4], 0); + Window_FillTilemap(¶m0->extraWindows[4], 0); sub_02091188(param0, 4); - sub_0201A9A4(¶m0->extraWindows[4]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[4]); } else { - sub_0201A9A4(¶m0->staticWindows[24]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[24]); } } void sub_0209145C(PokemonSummaryApp *param0) { - sub_0201AD10(¶m0->staticWindows[24]); - sub_0201C3C0(param0->bgl, 1); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[24]); + Bg_ScheduleTilemapTransfer(param0->bgl, 1); } void sub_02091474(PokemonSummaryApp *param0) { - BGL_FillWindow(¶m0->extraWindows[0 + param0->cursor], 0); - BGL_FillWindow(¶m0->extraWindows[0 + param0->cursorTmp], 0); + Window_FillTilemap(¶m0->extraWindows[0 + param0->cursor], 0); + Window_FillTilemap(¶m0->extraWindows[0 + param0->cursorTmp], 0); sub_02091188(param0, param0->cursor); sub_02091188(param0, param0->cursorTmp); - sub_0201A9A4(¶m0->extraWindows[0 + param0->cursor]); - sub_0201A9A4(¶m0->extraWindows[0 + param0->cursorTmp]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[0 + param0->cursor]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[0 + param0->cursorTmp]); } void sub_020914F8(PokemonSummaryApp *param0) @@ -942,18 +942,18 @@ void sub_020914F8(PokemonSummaryApp *param0) Window *v0; if (param0->page == 3) { - sub_0201AD10(¶m0->extraWindows[5]); - sub_0201AD10(¶m0->extraWindows[6]); - sub_0201AD10(¶m0->extraWindows[7]); + Window_ClearAndScheduleCopyToVRAM(¶m0->extraWindows[5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->extraWindows[6]); + Window_ClearAndScheduleCopyToVRAM(¶m0->extraWindows[7]); v0 = ¶m0->extraWindows[7]; } else { v0 = ¶m0->extraWindows[5]; } - BGL_FillWindow(v0, 0); + Window_FillTilemap(v0, 0); MessageLoader_GetStrbuf(param0->msgLoader, 156, param0->strbuf); sub_020900D8(param0, v0, TEXT_COLOR(1, 2, 0), 0); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } void sub_02091570(PokemonSummaryApp *param0, u32 param1) @@ -962,7 +962,7 @@ void sub_02091570(PokemonSummaryApp *param0, u32 param1) u32 v1; u32 v2; - BGL_FillWindow(¶m0->extraWindows[5], 0); + Window_FillTilemap(¶m0->extraWindows[5], 0); v1 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CONTEST_EFFECT); v2 = sub_0209577C(v1); @@ -973,14 +973,14 @@ void sub_02091570(PokemonSummaryApp *param0, u32 param1) MessageLoader_Free(v0); - sub_0201A9A4(¶m0->staticWindows[29]); - sub_0201A9A4(¶m0->extraWindows[5]); + Window_ScheduleCopyToVRAM(¶m0->staticWindows[29]); + Window_ScheduleCopyToVRAM(¶m0->extraWindows[5]); } void sub_020915F4(PokemonSummaryApp *param0) { - sub_0201AD10(¶m0->staticWindows[29]); - sub_0201AD10(¶m0->extraWindows[5]); + Window_ClearAndScheduleCopyToVRAM(¶m0->staticWindows[29]); + Window_ClearAndScheduleCopyToVRAM(¶m0->extraWindows[5]); } void sub_02091610(PokemonSummaryApp *param0, u8 param1) @@ -1014,8 +1014,8 @@ void sub_02091610(PokemonSummaryApp *param0, u8 param1) v0 = ¶m0->extraWindows[2]; sub_0200E060(v0, 1, (1024 - (18 + 12)), 13); - BGL_FillWindow(v0, 15); + Window_FillTilemap(v0, 15); MessageLoader_GetStrbuf(param0->msgLoader, v1, param0->strbuf); Text_AddPrinterWithParamsAndColor(v0, FONT_MESSAGE, param0->strbuf, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); - sub_0201A9A4(v0); + Window_ScheduleCopyToVRAM(v0); } diff --git a/src/unk_020920C0.c b/src/unk_020920C0.c index 76f443d23f..b5f3891864 100644 --- a/src/unk_020920C0.c +++ b/src/unk_020920C0.c @@ -96,7 +96,7 @@ void sub_020920C0(PokemonSummaryApp *param0) param0->subscreenType = 0; } else { param0->subscreenType = 1; - sub_0201C63C(param0->bgl, 4, 0, 4); + Bg_ScheduleScroll(param0->bgl, 4, 0, 4); } break; case 2: @@ -115,7 +115,7 @@ static void sub_0209212C(PokemonSummaryApp *param0, const UnkStruct_020F5164 *pa u8 v2; u8 v3, v4; - v0 = (u16 *)sub_02019FE4(param0->bgl, 4); + v0 = (u16 *)Bg_GetTilemapBuffer(param0->bgl, 4); v1 = (param1->unk_00 & 1) * 15 + (param1->unk_00 / 2) * (30 * 5) + param2 * 5 + 30; for (v3 = 0; v3 < 5; v3++) { @@ -146,7 +146,7 @@ void sub_0209219C(PokemonSummaryApp *param0) v1++; } - sub_0201C3C0(param0->bgl, 4); + Bg_ScheduleTilemapTransfer(param0->bgl, 4); } u8 sub_020921E4(PokemonSummaryApp *param0) @@ -188,7 +188,7 @@ static int sub_02092224(PokemonSummaryApp *param0) if (v0 != 0xffffffff) { u16 v1 = 0xfffe; - if (sub_0201C784(param0->bgl, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0->bgl, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { return 0xffffffff; } } @@ -205,7 +205,7 @@ u8 sub_0209228C(PokemonSummaryApp *param0) Sound_PlayEffect(1508); sub_0209219C(param0); sub_0209212C(param0, &v0[param0->buttonPos], 2); - sub_0201C3C0(param0->bgl, 4); + Bg_ScheduleTilemapTransfer(param0->bgl, 4); sub_0208F600(param0); param0->buttonCount = 0; param0->buttonState = 1; @@ -230,7 +230,7 @@ u8 sub_0209228C(PokemonSummaryApp *param0) sub_0209212C(param0, &v0[param0->buttonPos], 1); } - sub_0201C3C0(param0->bgl, 4); + Bg_ScheduleTilemapTransfer(param0->bgl, 4); return 1; } } diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c index 86481da9c5..3415b9c303 100644 --- a/src/unk_02095E98.c +++ b/src/unk_02095E98.c @@ -159,7 +159,7 @@ void sub_02095EAC(int param0, int param1, void *param2, void *param3) } MI_CpuCopyFast(v0->unk_4434, v0->unk_32C.pixels, 30 * 15 * 32); - sub_0201A954(&v0->unk_32C); + Window_CopyToVRAM(&v0->unk_32C); } else { UnkStruct_02095EAC_sub1 *v2 = (UnkStruct_02095EAC_sub1 *)param2; diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index 2a64fd5e0c..dc2a34de68 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -142,7 +142,7 @@ static int sub_02097B18(OverlayManager *param0, int *param1) } } - v0->unk_D4.unk_10 = sub_02018340(53); + v0->unk_D4.unk_10 = BgConfig_New(53); sub_0201DBEC(64, 53); v0->unk_D4.unk_14 = sub_02002F38(53); sub_02003858(v0->unk_D4.unk_14, 1); @@ -233,13 +233,13 @@ static int sub_02097D88(OverlayManager *param0, int *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); - sub_02019044(v0->unk_D4.unk_10, 1); - sub_02019044(v0->unk_D4.unk_10, 2); - sub_02019044(v0->unk_D4.unk_10, 3); - sub_02019044(v0->unk_D4.unk_10, 4); - sub_02019044(v0->unk_D4.unk_10, 5); - sub_02019044(v0->unk_D4.unk_10, 6); - sub_02019044(v0->unk_D4.unk_10, 7); + Bg_FreeTilemapBuffer(v0->unk_D4.unk_10, 1); + Bg_FreeTilemapBuffer(v0->unk_D4.unk_10, 2); + Bg_FreeTilemapBuffer(v0->unk_D4.unk_10, 3); + Bg_FreeTilemapBuffer(v0->unk_D4.unk_10, 4); + Bg_FreeTilemapBuffer(v0->unk_D4.unk_10, 5); + Bg_FreeTilemapBuffer(v0->unk_D4.unk_10, 6); + Bg_FreeTilemapBuffer(v0->unk_D4.unk_10, 7); Heap_FreeToHeap(v0->unk_D4.unk_10); sub_02002FA0(v0->unk_D4.unk_14, 0); sub_02002FA0(v0->unk_D4.unk_14, 1); diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 1f4c85166e..e4f9829b7a 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -77,7 +77,7 @@ static int sub_02098218(OverlayManager *param0, int *param1) v1->unk_04.unk_34 = ov119_021D0DD4(); v1->unk_04.unk_38 = sub_0200762C(71); v1->unk_04.unk_3C = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, 71); - v1->unk_04.unk_00 = sub_02018340(71); + v1->unk_04.unk_00 = BgConfig_New(71); sub_0201DBEC(64, 71); @@ -172,10 +172,10 @@ static int sub_02098388(OverlayManager *param0, int *param1) sub_02002FA0(v0->unk_04.unk_04, 3); sub_02002F54(v0->unk_04.unk_04); - sub_02019044(v0->unk_04.unk_00, 1); - sub_02019044(v0->unk_04.unk_00, 2); - sub_02019044(v0->unk_04.unk_00, 3); - sub_02019044(v0->unk_04.unk_00, 4); + Bg_FreeTilemapBuffer(v0->unk_04.unk_00, 1); + Bg_FreeTilemapBuffer(v0->unk_04.unk_00, 2); + Bg_FreeTilemapBuffer(v0->unk_04.unk_00, 3); + Bg_FreeTilemapBuffer(v0->unk_04.unk_00, 4); Heap_FreeToHeap(v0->unk_04.unk_00); sub_0201DC3C(); diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index 518a623daf..418b4d66f4 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -164,7 +164,7 @@ int sub_02099F54(OverlayManager *param0, int *param1) static void sub_02099F74(void *param0) { UnkStruct_02099DFC *v0 = param0; - sub_0201C2B8(v0->unk_14); + Bg_RunScheduledUpdates(v0->unk_14); } static void sub_02099F80(UnkStruct_02099DFC *param0) @@ -185,7 +185,7 @@ static void sub_02099F80(UnkStruct_02099DFC *param0) GXLayers_SetBanks(&v0); } { - param0->unk_14 = sub_02018340(param0->unk_00); + param0->unk_14 = BgConfig_New(param0->unk_00); } { GraphicsModes v1 = { @@ -194,7 +194,7 @@ static void sub_02099F80(UnkStruct_02099DFC *param0) GX_BGMODE_0, GX_BG0_AS_2D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { BgTemplate v2 = { @@ -212,29 +212,29 @@ static void sub_02099F80(UnkStruct_02099DFC *param0) 0x0, 0x0 }; - sub_020183C4(param0->unk_14, 0, &v2, 0); - sub_02019EBC(param0->unk_14, 0); + Bg_InitFromTemplate(param0->unk_14, 0, &v2, 0); + Bg_ClearTilemap(param0->unk_14, 0); } sub_0200DD0C(param0->unk_14, 0, (512 - (18 + 12)), 2, 0, param0->unk_00); sub_0200DAA4(param0->unk_14, 0, 512 - (18 + 12) - 9, 3, 0, param0->unk_00); Font_LoadTextPalette(0, 1 * (2 * 16), param0->unk_00); - sub_02019690(0, 32, 0, param0->unk_00); - sub_0201975C(0, 0x6c21); - sub_0201975C(4, 0x6c21); + Bg_ClearTilesRange(0, 32, 0, param0->unk_00); + Bg_MaskPalette(0, 0x6c21); + Bg_MaskPalette(4, 0x6c21); } static void sub_0209A044(UnkStruct_02099DFC *param0) { - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); - sub_02019044(param0->unk_14, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); + Bg_FreeTilemapBuffer(param0->unk_14, 0); Heap_FreeToHeap(param0->unk_14); } @@ -243,13 +243,13 @@ static void sub_0209A098(UnkStruct_02099DFC *param0) param0->unk_18 = MessageLoader_Init(1, 26, 4, param0->unk_00); Text_ResetAllPrinters(); param0->unk_08 = 0; - sub_0201A8D4(param0->unk_14, ¶m0->unk_1C, &Unk_020F89E4); - BGL_WindowColor(¶m0->unk_1C, 15, 0, 0, 27 * 8, 4 * 8); + Window_AddFromTemplate(param0->unk_14, ¶m0->unk_1C, &Unk_020F89E4); + Window_FillRectWithColor(¶m0->unk_1C, 15, 0, 0, 27 * 8, 4 * 8); } static void sub_0209A0E0(UnkStruct_02099DFC *param0) { - BGL_DeleteWindow(¶m0->unk_1C); + Window_Remove(¶m0->unk_1C); MessageLoader_Free(param0->unk_18); } @@ -306,7 +306,7 @@ static BOOL sub_0209A0F4(UnkStruct_02099DFC *param0) param0->unk_04 = 6; break; case 6: - sub_02019EBC(param0->unk_14, 0); + Bg_ClearTilemap(param0->unk_14, 0); v0 = 1; break; } @@ -320,7 +320,7 @@ static BOOL sub_0209A200(UnkStruct_02099DFC *param0, u32 param1, int param2, int switch (param0->unk_08) { case 0: - BGL_WindowColor(¶m0->unk_1C, 15, 0, 0, 27 * 8, 4 * 8); + Window_FillRectWithColor(¶m0->unk_1C, 15, 0, 0, 27 * 8, 4 * 8); sub_0200E060(¶m0->unk_1C, 0, 512 - (18 + 12), 2); param0->unk_10 = Strbuf_Init(0x400, param0->unk_00); diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index 0b3143cf6b..7771dc69a7 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -152,7 +152,7 @@ static void sub_0209A3D0(UnkStruct_0209A3D0 *param0) GXLayers_SetBanks(&v0); } { - param0->unk_18 = sub_02018340(param0->unk_00); + param0->unk_18 = BgConfig_New(param0->unk_00); } { GraphicsModes v1 = { @@ -161,7 +161,7 @@ static void sub_0209A3D0(UnkStruct_0209A3D0 *param0) GX_BGMODE_0, GX_BG0_AS_2D }; - sub_02018368(&v1); + SetAllGraphicsModes(&v1); } { BgTemplate v2 = { @@ -179,28 +179,28 @@ static void sub_0209A3D0(UnkStruct_0209A3D0 *param0) 0x0, 0x0 }; - sub_020183C4(param0->unk_18, 0, &v2, 0); - sub_02019EBC(param0->unk_18, 0); + Bg_InitFromTemplate(param0->unk_18, 0, &v2, 0); + Bg_ClearTilemap(param0->unk_18, 0); } sub_0200DD0C(param0->unk_18, 0, 512 - (18 + 12), 2, 0, param0->unk_00); sub_0200DAA4(param0->unk_18, 0, (512 - (18 + 12)) - 9, 3, 0, param0->unk_00); Font_LoadTextPalette(0, 1 * (2 * 16), param0->unk_00); - sub_02019690(0, 32, 0, param0->unk_00); - sub_0201975C(0, 0); - sub_0201975C(4, 0); + Bg_ClearTilesRange(0, 32, 0, param0->unk_00); + Bg_MaskPalette(0, 0); + Bg_MaskPalette(4, 0); } static void sub_0209A490(UnkStruct_0209A3D0 *param0) { - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); - sub_02019044(param0->unk_18, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); + Bg_FreeTilemapBuffer(param0->unk_18, 0); Heap_FreeToHeap(param0->unk_18); } @@ -210,13 +210,13 @@ static void sub_0209A4E4(UnkStruct_0209A3D0 *param0) Text_ResetAllPrinters(); param0->unk_0C = 0; - sub_0201A8D4(param0->unk_18, ¶m0->unk_20, &Unk_020F8A58); - BGL_WindowColor(¶m0->unk_20, 15, 0, 0, 27 * 8, 4 * 8); + Window_AddFromTemplate(param0->unk_18, ¶m0->unk_20, &Unk_020F8A58); + Window_FillRectWithColor(¶m0->unk_20, 15, 0, 0, 27 * 8, 4 * 8); } static void sub_0209A530(UnkStruct_0209A3D0 *param0) { - BGL_DeleteWindow(¶m0->unk_20); + Window_Remove(¶m0->unk_20); MessageLoader_Free(param0->unk_1C); } @@ -260,8 +260,8 @@ static BOOL sub_0209A544(UnkStruct_0209A3D0 *param0) } break; case 2: - sub_0201975C(0, 0x6c21); - sub_0201975C(4, 0x6c21); + Bg_MaskPalette(0, 0x6c21); + Bg_MaskPalette(4, 0x6c21); sub_0200F174(0, 1, 1, 0, 6, 1, param0->unk_00); param0->unk_04 = 3; break; @@ -278,8 +278,8 @@ static BOOL sub_0209A544(UnkStruct_0209A3D0 *param0) break; case 5: if (ScreenWipe_Done() == 1) { - sub_0201975C(0, 0); - sub_0201975C(4, 0); + Bg_MaskPalette(0, 0); + Bg_MaskPalette(4, 0); param0->unk_04 = 1; } break; @@ -297,7 +297,7 @@ static BOOL sub_0209A688(UnkStruct_0209A3D0 *param0, u32 param1, int param2, int switch (param0->unk_0C) { case 0: - BGL_WindowColor(¶m0->unk_20, 15, 0, 0, 27 * 8, 4 * 8); + Window_FillRectWithColor(¶m0->unk_20, 15, 0, 0, 27 * 8, 4 * 8); sub_0200E060(¶m0->unk_20, 0, 512 - (18 + 12), 2); param0->unk_14 = Strbuf_Init(0x400, param0->unk_00); diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index cbac0733fe..b0ebb4b180 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -93,23 +93,23 @@ void sub_0209A74C(int param0) GXS_SetVisibleWnd(GX_WNDMASK_NONE); GXLayers_SetBanks(&Unk_020F8AF8); - v0 = sub_02018340(param0); + v0 = BgConfig_New(param0); - sub_02018368(&Unk_020F8ACC); - sub_020183C4(v0, 0, &Unk_020F8ADC, 0); - sub_02019EBC(v0, 0); + SetAllGraphicsModes(&Unk_020F8ACC); + Bg_InitFromTemplate(v0, 0, &Unk_020F8ADC, 0); + Bg_ClearTilemap(v0, 0); sub_0200DAA4(v0, 0, 512 - 9, 2, 0, param0); Font_LoadTextPalette(0, 1 * (2 * 16), param0); - sub_02019690(0, 32, 0, param0); - sub_0201975C(0, 27681); - sub_0201975C(4, 27681); + Bg_ClearTilesRange(0, 32, 0, param0); + Bg_MaskPalette(0, 27681); + Bg_MaskPalette(4, 27681); v2 = MessageLoader_Init(1, 26, 5, param0); v3 = Strbuf_Init(384, param0); Text_ResetAllPrinters(); - sub_0201A8D4(v0, &v1, &Unk_020F8AC4); - BGL_WindowColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); + Window_AddFromTemplate(v0, &v1, &Unk_020F8AC4); + Window_FillRectWithColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); Window_Show(&v1, 0, 512 - 9, 2); MessageLoader_GetStrbuf(v2, v4, v3); Text_AddPrinterWithParams(&v1, FONT_SYSTEM, v3, 0, 0, TEXT_SPEED_INSTANT, NULL); @@ -124,17 +124,17 @@ void sub_0209A74C(int param0) OS_WaitIrq(1, OS_IE_V_BLANK); } - BGL_DeleteWindow(&v1); + Window_Remove(&v1); MessageLoader_Free(v2); - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); - sub_02019044(v0, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); + Bg_FreeTilemapBuffer(v0, 0); Heap_FreeToHeap(v0); PM_ForceToPowerOff(); @@ -167,23 +167,23 @@ void sub_0209A8E0(int param0) GXLayers_SetBanks(&Unk_020F8AF8); - v0 = sub_02018340(param0); + v0 = BgConfig_New(param0); - sub_02018368(&Unk_020F8ACC); - sub_020183C4(v0, 0, &Unk_020F8ADC, 0); - sub_02019EBC(v0, 0); + SetAllGraphicsModes(&Unk_020F8ACC); + Bg_InitFromTemplate(v0, 0, &Unk_020F8ADC, 0); + Bg_ClearTilemap(v0, 0); sub_0200DAA4(v0, 0, 512 - 9, 2, 0, param0); Font_LoadTextPalette(0, 1 * (2 * 16), param0); - sub_02019690(0, 32, 0, param0); - sub_0201975C(0, 0x6c21); - sub_0201975C(4, 0x6c21); + Bg_ClearTilesRange(0, 32, 0, param0); + Bg_MaskPalette(0, 0x6c21); + Bg_MaskPalette(4, 0x6c21); v2 = MessageLoader_Init(1, 26, 5, param0); v3 = Strbuf_Init(0x180, param0); Text_ResetAllPrinters(); - sub_0201A8D4(v0, &v1, &Unk_020F8AC4); - BGL_WindowColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); + Window_AddFromTemplate(v0, &v1, &Unk_020F8AC4); + Window_FillRectWithColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); Window_Show(&v1, 0, (512 - 9), 2); MessageLoader_GetStrbuf(v2, v4, v3); Text_AddPrinterWithParams(&v1, FONT_SYSTEM, v3, 0, 0, TEXT_SPEED_INSTANT, NULL); @@ -198,17 +198,17 @@ void sub_0209A8E0(int param0) OS_WaitIrq(1, OS_IE_V_BLANK); } - BGL_DeleteWindow(&v1); + Window_Remove(&v1); MessageLoader_Free(v2); - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); - sub_02019044(v0, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); + Bg_FreeTilemapBuffer(v0, 0); Heap_FreeToHeap(v0); PM_ForceToPowerOff(); diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index 8bf42e9b16..c6b79ca03e 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -103,23 +103,23 @@ void sub_0209AA74(int param0, int param1) GXLayers_SetBanks(&Unk_020F8B54); - v0 = sub_02018340(param0); + v0 = BgConfig_New(param0); - sub_02018368(&Unk_020F8B28); - sub_020183C4(v0, 0, &Unk_020F8B38, 0); - sub_02019EBC(v0, 0); + SetAllGraphicsModes(&Unk_020F8B28); + Bg_InitFromTemplate(v0, 0, &Unk_020F8B38, 0); + Bg_ClearTilemap(v0, 0); sub_0200DAA4(v0, 0, 512 - 9, 2, 0, param0); Font_LoadTextPalette(0, 1 * (2 * 16), param0); - sub_02019690(0, 32, 0, param0); - sub_0201975C(0, 0x6c21); - sub_0201975C(4, 0x6c21); + Bg_ClearTilesRange(0, 32, 0, param0); + Bg_MaskPalette(0, 0x6c21); + Bg_MaskPalette(4, 0x6c21); v2 = MessageLoader_Init(1, 26, 6, param0); v3 = Strbuf_Init(0x180, param0); Text_ResetAllPrinters(); - sub_0201A8D4(v0, &v1, &Unk_020F8B20); - BGL_WindowColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); + Window_AddFromTemplate(v0, &v1, &Unk_020F8B20); + Window_FillRectWithColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); Window_Show(&v1, 0, (512 - 9), 2); MessageLoader_GetStrbuf(v2, v4, v3); Text_AddPrinterWithParams(&v1, FONT_SYSTEM, v3, 0, 0, TEXT_SPEED_INSTANT, NULL); @@ -134,17 +134,17 @@ void sub_0209AA74(int param0, int param1) OS_WaitIrq(1, OS_IE_V_BLANK); } - BGL_DeleteWindow(&v1); + Window_Remove(&v1); MessageLoader_Free(v2); - sub_02019120(0, 0); - sub_02019120(1, 0); - sub_02019120(2, 0); - sub_02019120(3, 0); - sub_02019120(4, 0); - sub_02019120(5, 0); - sub_02019120(6, 0); - sub_02019120(7, 0); - sub_02019044(v0, 0); + Bg_ToggleLayer(0, 0); + Bg_ToggleLayer(1, 0); + Bg_ToggleLayer(2, 0); + Bg_ToggleLayer(3, 0); + Bg_ToggleLayer(4, 0); + Bg_ToggleLayer(5, 0); + Bg_ToggleLayer(6, 0); + Bg_ToggleLayer(7, 0); + Bg_FreeTilemapBuffer(v0, 0); Heap_FreeToHeap(v0); PM_ForceToPowerOff(); diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c index 5c897114e0..90704cacae 100644 --- a/src/unk_0209ACF4.c +++ b/src/unk_0209ACF4.c @@ -98,18 +98,18 @@ static void sub_0209AD84(UnkStruct_0209AD84 *param0) static void sub_0209ADBC(UnkStruct_0209AD84 *param0) { - if (BGL_WindowAdded(&(param0->unk_18))) { - BGL_DeleteWindow(¶m0->unk_18); + if (Window_IsInUse(&(param0->unk_18))) { + Window_Remove(¶m0->unk_18); Window_Init(&(param0->unk_18)); } - if (BGL_WindowAdded(&(param0->unk_28))) { - BGL_DeleteWindow(¶m0->unk_28); + if (Window_IsInUse(&(param0->unk_28))) { + Window_Remove(¶m0->unk_28); Window_Init(&(param0->unk_28)); } - if (BGL_WindowAdded(&(param0->unk_38))) { - BGL_DeleteWindow(¶m0->unk_38); + if (Window_IsInUse(&(param0->unk_38))) { + Window_Remove(¶m0->unk_38); Window_Init(&(param0->unk_38)); } } @@ -265,7 +265,7 @@ static void sub_0209B084(UnkStruct_0209AD84 *param0, int param1, BOOL param2) MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_08); } - if (BGL_WindowAdded(v0) == 0) { + if (Window_IsInUse(v0) == 0) { FieldMessage_AddWindow(param0->fieldSystem->unk_08, v0, 3); FieldMessage_DrawWindow(v0, SaveData_Options(param0->fieldSystem->saveData)); } else { @@ -285,7 +285,7 @@ static void sub_0209B110(UnkStruct_0209AD84 *param0) { Window *v0 = &(param0->unk_18); - if (BGL_WindowAdded(v0)) { + if (Window_IsInUse(v0)) { sub_0200E084(v0, 0); } } @@ -294,12 +294,12 @@ static void sub_0209B12C(UnkStruct_0209AD84 *param0) { Window *v0 = &(param0->unk_28); - if (BGL_WindowAdded(v0) == 0) { + if (Window_IsInUse(v0) == 0) { int v1; sub_0200DAA4(param0->fieldSystem->unk_08, 3, 155, 11, 0, 32); - BGL_AddWindow(param0->fieldSystem->unk_08, v0, 3, 1, 1, 13, 10, 13, 1); - BGL_FillWindow(v0, 15); + Window_Add(param0->fieldSystem->unk_08, v0, 3, 1, 1, 13, 10, 13, 1); + Window_FillTilemap(v0, 15); for (v1 = 0; v1 < 5; v1++) { MessageLoader_GetStrbuf(param0->unk_10, 9 + v1, param0->unk_08); @@ -326,12 +326,12 @@ static void sub_0209B1D8(UnkStruct_0209AD84 *param0) { Window *v0 = &(param0->unk_38); - if (BGL_WindowAdded(v0) == 0) { + if (Window_IsInUse(v0) == 0) { int v1; sub_0200DAA4(param0->fieldSystem->unk_08, 3, 155, 11, 0, 32); - BGL_AddWindow(param0->fieldSystem->unk_08, v0, 3, 25, 13, 6, 4, 13, 131); - BGL_FillWindow(v0, 15); + Window_Add(param0->fieldSystem->unk_08, v0, 3, 25, 13, 6, 4, 13, 131); + Window_FillTilemap(v0, 15); for (v1 = 0; v1 < 2; v1++) { MessageLoader_GetStrbuf(param0->unk_10, v1 + 14, param0->unk_08); @@ -397,9 +397,9 @@ static int sub_0209B288(UnkStruct_0209AD84 *param0) } while (0); { - BGL_WindowColor(param0->unk_68, 15, 0, 0, 12, param0->unk_68->height * 8); + Window_FillRectWithColor(param0->unk_68, 15, 0, 0, 12, param0->unk_68->height * 8); ColoredArrow_Print(param0->unk_14, param0->unk_68, 0, param0->unk_5C * 16); - sub_0201ACCC(param0->unk_68); + Window_LoadTiles(param0->unk_68); Sound_PlayEffect(1500); } From 90b6ef47f3dd70b143710a1d48485e63d5e52e7d Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 20 Oct 2024 21:29:21 -0700 Subject: [PATCH 10/13] Clean up + document BG functions in bg_window.c --- include/bg_window.h | 169 +- src/bg_window.c | 2065 ++++++++++++----------- src/choose_starter/choose_starter_app.c | 4 +- src/overlay013/ov13_0221FC20.c | 2 +- src/overlay013/ov13_022264F4.c | 2 +- 5 files changed, 1190 insertions(+), 1052 deletions(-) diff --git a/include/bg_window.h b/include/bg_window.h index 95b4725c98..1eb3faa079 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -4,16 +4,14 @@ #include #include -enum BGLFrame { - BGL_FRAME_MAIN_0 = 0, - BGL_FRAME_MAIN_1, - BGL_FRAME_MAIN_2, - BGL_FRAME_MAIN_3, - BGL_FRAME_SUB_0, - BGL_FRAME_SUB_1, - BGL_FRAME_SUB_2, - BGL_FRAME_SUB_3, -}; +#define TILE_SIZE_4BPP 0x20 +#define TILE_SIZE_8BPP 0x40 + +#define TILEMAP_COPY_SRC_FLAT 0 // source dimensions are equal to dest dimensions +#define TILEMAP_COPY_SRC_RECT 1 // dest dimensions carve a window from source + +#define TILEMAP_FILL_VAL_KEEP_PALETTE 16 // do not replace the selected palette index +#define TILEMAP_FILL_VAL_INCLUDES_PALETTE 17 enum BGLScreenSize { SCREEN_SIZE_128x128 = 0, @@ -24,6 +22,71 @@ enum BGLScreenSize { SCREEN_SIZE_1024x1024, }; +enum DSScreen { + DS_SCREEN_MAIN = 0, + DS_SCREEN_SUB, +}; + +enum BgLayer { + BG_LAYER_MAIN_0 = 0, + BG_LAYER_MAIN_1, + BG_LAYER_MAIN_2, + BG_LAYER_MAIN_3, + BG_LAYER_SUB_0, + BG_LAYER_SUB_1, + BG_LAYER_SUB_2, + BG_LAYER_SUB_3, +}; + +enum BgType { + BG_TYPE_STATIC = 0, + BG_TYPE_AFFINE, + BG_TYPE_STATIC_WITH_AFFINE, +}; + +enum BgControlParam { + BG_CONTROL_PARAM_COLOR_MODE = 0, + BG_CONTROL_PARAM_SCREEN_BASE, + BG_CONTROL_PARAM_CHAR_BASE, + BG_CONTROL_PARAM_SCREEN_SIZE, +}; + +enum BgOffsetUpdateOp { + BG_OFFSET_UPDATE_SET_X = 0, + BG_OFFSET_UPDATE_ADD_X, + BG_OFFSET_UPDATE_SUB_X, + BG_OFFSET_UPDATE_SET_Y, + BG_OFFSET_UPDATE_ADD_Y, + BG_OFFSET_UPDATE_SUB_Y, +}; + +enum BgAffineUpdateOp { + BG_AFFINE_UPDATE_SET_ROTATION = 0, + BG_AFFINE_UPDATE_ADD_ROTATION, + BG_AFFINE_UPDATE_SUB_ROTATION, + BG_AFFINE_UPDATE_SET_X_SCALE, + BG_AFFINE_UPDATE_ADD_X_SCALE, + BG_AFFINE_UPDATE_SUB_X_SCALE, + BG_AFFINE_UPDATE_SET_Y_SCALE, + BG_AFFINE_UPDATE_ADD_Y_SCALE, + BG_AFFINE_UPDATE_SUB_Y_SCALE, + BG_AFFINE_UPDATE_SET_X_CENTER, + BG_AFFINE_UPDATE_ADD_X_CENTER, + BG_AFFINE_UPDATE_SUB_X_CENTER, + BG_AFFINE_UPDATE_SET_Y_CENTER, + BG_AFFINE_UPDATE_ADD_Y_CENTER, + BG_AFFINE_UPDATE_SUB_Y_CENTER, +}; + +enum BgScreenSize { + BG_SCREEN_SIZE_128x128 = 0, + BG_SCREEN_SIZE_256x256, + BG_SCREEN_SIZE_256x512, + BG_SCREEN_SIZE_512x256, + BG_SCREEN_SIZE_512x512, + BG_SCREEN_SIZE_1024x1024, +}; + typedef struct Bitmap { const u8 *pixels; u16 width; @@ -104,44 +167,55 @@ typedef struct GraphicsModes { GXBG0As bg0As2DOr3D; } GraphicsModes; -BgConfig *BgConfig_New(u32 param0); -u32 BgConfig_GetHeapID(BgConfig *param0); -void SetAllGraphicsModes(const GraphicsModes *param0); -void SetScreenGraphicsModes(const GraphicsModes *param0, u8 param1); -void Bg_InitFromTemplate(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3); -void Bg_SetControlParam(BgConfig *param0, u8 param1, u8 param2, u8 param3); -void Bg_FreeTilemapBuffer(BgConfig *param0, u8 param1); -void Bg_SetPriority(u8 param0, u8 param1); -void Bg_ToggleLayer(u8 param0, u8 param1); -void Bg_SetOffset(BgConfig *param0, u8 param1, u8 param2, int param3); -int Bg_GetXOffset(BgConfig *param0, u32 param1); -int Bg_GetYOffset(BgConfig *param0, u32 param1); -void Bg_SetAffineParams(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4); -void Bg_CopyTilemapBufferToVRAM(BgConfig *param0, u8 param1); -void Bg_CopyTilemapBufferRangeToVRAM(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4); -void Bg_LoadTilemapBuffer(BgConfig *param0, u8 param1, const void *param2, u32 param3); -void Bg_LoadTiles(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4); -void Bg_ClearTilesRange(u8 param0, u32 param1, u32 param2, u32 param3); -void Bg_FillTilesRange(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4); -void Bg_LoadPalette(u8 param0, void *param1, u16 param2, u16 param3); -void Bg_MaskPalette(u8 param0, u16 param1); -void Bg_LoadToTilemapRect(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6); -void Bg_CopyToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); -void Bg_CopyRectToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); -void Bg_FillTilemapRect(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7); -void Bg_ChangeTilemapRectPalette(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); -void Bg_ClearTilemap(BgConfig *param0, u8 param1); -void Bg_FillTilemap(BgConfig *param0, u8 param1, u16 param2); -void Bg_ScheduleFillTilemap(BgConfig *param0, u8 param1, u16 param2); -void *Bg_GetCharPtr(u8 param0); -void *Bg_GetTilemapBuffer(BgConfig *param0, u8 param1); -int Bg_GetXOffset2(BgConfig *param0, u8 param1); -u16 Bg_GetRotation(BgConfig *param0, u8 param1); -u8 Bg_GetPriority(BgConfig *param0, u8 param1); +void SetAllGraphicsModes(const GraphicsModes *graphicsModes); +void SetScreenGraphicsModes(const GraphicsModes *graphicsModes, u8 screen); + +BgConfig *BgConfig_New(u32 heapID); +u32 BgConfig_GetHeapID(BgConfig *bgConfig); +void Bg_InitFromTemplate(BgConfig *bgConfig, u8 bgLayer, const BgTemplate *bgTemplate, u8 bgType); +void Bg_SetControlParam(BgConfig *bgConfig, u8 bgLayer, enum BgControlParam bgControlParam, u8 val); +void Bg_FreeTilemapBuffer(BgConfig *bgConfig, u8 bgLayer); +void Bg_SetPriority(u8 bgLayer, u8 priority); +void Bg_ToggleLayer(u8 bgLayer, u8 enable); +void Bg_SetOffset(BgConfig *bgConfig, u8 bgLayer, u8 bgOffsetUpdateOp, int val); +int Bg_GetXOffset(BgConfig *bgConfig, enum BgLayer bgLayer); +int Bg_GetYOffset(BgConfig *bgConfig, enum BgLayer bgLayer); +void Bg_SetAffineParams(BgConfig *bgConfig, u8 bgLayer, const MtxFx22 *mtx, int centerX, int centerY); +void Bg_CopyTilemapBufferToVRAM(BgConfig *bgConfig, u8 bgLayer); +void Bg_CopyTilemapBufferRangeToVRAM(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32 offset); +void Bg_LoadTilemapBuffer(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size); +void Bg_LoadTiles(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32 tileStart); +void Bg_LoadTilesToVRAM(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32 offset); +void Bg_ClearTilesRange(u8 bgLayer, u32 size, u32 offset, u32 heapID); +void Bg_FillTilesRange(BgConfig *bgConfig, u32 bgLayer, u32 fillVal, u32 numTiles, u32 offset); +void Bg_LoadPalette(u8 bgLayer, void *src, u16 size, u16 offset); +void Bg_MaskPalette(u8 bgLayer, u16 mask); +void Bg_LoadToTilemapRect(BgConfig *bgConfig, u8 bgLayer, const void *src, u8 destX, u8 destY, u8 destWidth, u8 destHeight); +void Bg_CopyToTilemapRect(BgConfig *bgConfig, u8 bgLayer, u8 destX, u8 destY, u8 destWidth, u8 destHeight, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight); +void Bg_CopyRectToTilemapRect(BgConfig *bgConfig, u8 bgLayer, u8 destX, u8 destY, u8 destWidth, u8 destHeight, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight); +void Bg_FillTilemapRect(BgConfig *bgConfig, u8 bgLayer, u16 fillVal, u8 x, u8 y, u8 width, u8 height, u8 palette); +void Bg_ChangeTilemapRectPalette(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 width, u8 height, u8 palette); +void Bg_ClearTilemap(BgConfig *bgConfig, u8 bgLayer); +void Bg_FillTilemap(BgConfig *bgConfig, u8 bgLayer, u16 fillVal); +void Bg_ScheduleFillTilemap(BgConfig *bgConfig, u8 bgLayer, u16 fillVal); +void *Bg_GetCharPtr(u8 bgLayer); +void *Bg_GetTilemapBuffer(BgConfig *bgConfig, u8 bgLayer); +int Bg_GetXOffset2(BgConfig *bgConfig, u8 bgLayer); +u16 Bg_GetRotation(BgConfig *bgConfig, u8 bgLayer); +u8 Bg_GetPriority(BgConfig *bgConfig, u8 bgLayer); +void Bg_RunScheduledUpdates(BgConfig *bgConfig); +void Bg_ScheduleTilemapTransfer(BgConfig *bgConfig, u8 bgLayer); +void Bg_ScheduleScroll(BgConfig *bgConfig, u8 bgLayer, u8 bgOffsetUpdateOp, int val); +void Bg_ScheduleAffineRotation(BgConfig *bgConfig, u8 bgLayer, u8 bgAffineUpdateOp, u16 val); +void Bg_ScheduleAffineScale(BgConfig *bgConfig, u8 bgLayer, u8 bgAffineUpdateOp, fx32 val); +void Bg_ScheduleAffineRotationCenter(BgConfig *bgConfig, u8 bgLayer, u8 bgAffineUpdateOp, int val); +u8 Bg_DoesPixelAtXYMatchVal(BgConfig *bgConfig, u8 bgLayer, u16 x, u16 y, u16 *src); + void Bitmap_BlitRect4bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); void Bitmap_BlitRect8bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); void Bitmap_FillRect4bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); void Bitmap_FillRect8bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); + Window *Window_New(u32 param0, u8 param1); void Window_Init(Window *param0); u8 Window_IsInUse(Window *param0); @@ -174,12 +248,5 @@ u16 Window_GetBaseTile(Window *param0); void Window_SetXPos(Window *param0, u8 param1); void Window_SetYPos(Window *param0, u8 param1); void Window_SetPalette(Window *param0, u8 param1); -void Bg_RunScheduledUpdates(BgConfig *param0); -void Bg_ScheduleTilemapTransfer(BgConfig *param0, u8 param1); -void Bg_ScheduleScroll(BgConfig *param0, u8 param1, u8 param2, int param3); -void Bg_ScheduleAffineRotation(BgConfig *param0, u8 param1, u8 param2, u16 param3); -void Bg_ScheduleAffineScale(BgConfig *param0, u8 param1, u8 param2, fx32 param3); -void Bg_ScheduleAffineRotationCenter(BgConfig *param0, u8 param1, u8 param2, int param3); -u8 Bg_DoesPixelAtXYMatchVal(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4); #endif // POKEPLATINUM_BG_WINDOW_H diff --git a/src/bg_window.c b/src/bg_window.c index 199298e0f8..210d109bf1 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -13,16 +13,20 @@ enum { UnkEnum_01 = 1, }; -static u8 sub_02018F80(u8 param0, u8 param1); -static void sub_02019304(Background *param0, u8 param1, int param2); -static void sub_020193E4(BgConfig *param0, u8 param1); -static void sub_020194E0(u8 param0, void *param1, u32 param2, u32 param3); -static void sub_020195B8(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4); -static void sub_020195FC(u8 param0, void *param1, u32 param2, u32 param3); -static void sub_020199E0(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); -static void sub_02019B54(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); -static void sub_02019D08(Background *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); -static void sub_02019DB8(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5); +static u8 ConvertToGxBgScreenSize(u8 bgScreenSize, u8 bgType); +static void GetBgScreenTileDimensions(u8 bgScreenSize, u8 *outXTiles, u8 *outYTiles); +static void UpdateBgOffsetWithVal(Background *bg, enum BgOffsetUpdateOp op, int val); +static void ResetBgAffineTransforms(BgConfig *bgConfig, u8 bgLayer); +static void CopyOrDecompressData(const void *src, void *dest, u32 size); +static void LoadBgVRAMScr(u8 bgLayer, void *src, u32 offset, u32 size); +static void LoadBgVRAMChar(u8 bgLayer, void *src, u32 offset, u32 size); +static u16 CalcTilemapIndexFromCoords(u8 x, u8 y, u8 bgScreenSize); +static void CopyToBgTilemapRectText(Background *bg, u8 destX, u8 destY, u8 destWidth, u8 destHeight, u16 *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 mode); +static void CopyToBgTilemapRectAffine(Background *bg, u8 destX, u8 destY, u8 destWidth, u8 destHeight, u8 *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 mode); +static void FillBgTilemapRectText(Background *bg, u16 fillVal, u8 x, u8 y, u8 width, u8 height, u8 palette); +static void FillBgTilemapRectAffine(Background *bg, u8 fillVal, u8 x, u8 y, u8 width, u8 height); +static void Copy4bppTo8bpp(const u8 *src, u32 size, u8 *dest, u8 palette); +static void *Convert4bppTo8bpp(const u8 *src, u32 size, u8 palette, u32 heapID); static void sub_0201AC20(Window *param0); static void sub_0201AC4C(Window *param0); static void sub_0201AC64(Window *param0); @@ -33,39 +37,39 @@ static void sub_0201AD68(Window *param0); static void sub_0201AD90(Window *param0); static void sub_0201C06C(Window *param0, u8 param1, u8 param2, u8 param3); static void sub_0201C158(Window *param0, u8 param1, u8 param2, u8 param3); -static void sub_0201C8E0(BgConfig *param0, u8 param1, u8 *param2); +static void ApplyFlipFlagsToTile(BgConfig *bgConfig, u8 flags, u8 *tile); static void sub_0201AA58(Window *param0); static void sub_0201AADC(Window *param0); static void sub_0201AB38(Window *param0); static void sub_0201ABC8(Window *param0); -static void sub_0201C684(Background *param0, u8 param1, u16 param2); -static void sub_0201C6CC(Background *param0, u8 param1, fx32 param2); -static void sub_0201C73C(Background *param0, u8 param1, int param2); -static void sub_0201C3D0(BgConfig *param0); -static void sub_0201C2D0(BgConfig *param0); +static void UpdateBgRotationWithVal(Background *bg, enum BgAffineUpdateOp op, u16 val); +static void UpdateBgAffineScaleWithVal(Background *bg, enum BgAffineUpdateOp op, fx32 val); +static void UpdateBgAffineRotationCenterWithVal(Background *bg, enum BgAffineUpdateOp op, int val); +static void RunScheduledScrolls(BgConfig *bgConfig); +static void RunScheduledTilemapTransfers(BgConfig *bgConfig); -BgConfig *BgConfig_New(u32 param0) +BgConfig *BgConfig_New(u32 heapID) { - BgConfig *v0 = Heap_AllocFromHeap(param0, sizeof(BgConfig)); + BgConfig *bgConfig = Heap_AllocFromHeap(heapID, sizeof(BgConfig)); - memset(v0, 0, sizeof(BgConfig)); + memset(bgConfig, 0, sizeof(BgConfig)); - v0->heapID = param0; - v0->scrollScheduled = 0; - v0->bufferTransferScheduled = 0; + bgConfig->heapID = heapID; + bgConfig->scrollScheduled = 0; + bgConfig->bufferTransferScheduled = 0; - return v0; + return bgConfig; } -u32 BgConfig_GetHeapID(BgConfig *param0) +u32 BgConfig_GetHeapID(BgConfig *bgConfig) { - return param0->heapID; + return bgConfig->heapID; } -void SetAllGraphicsModes(const GraphicsModes *param0) +void SetAllGraphicsModes(const GraphicsModes *graphicsModes) { - GX_SetGraphicsMode(param0->displayMode, param0->mainBgMode, param0->bg0As2DOr3D); - GXS_SetGraphicsMode(param0->subBgMode); + GX_SetGraphicsMode(graphicsModes->displayMode, graphicsModes->mainBgMode, graphicsModes->bg0As2DOr3D); + GXS_SetGraphicsMode(graphicsModes->subBgMode); GX_SetBGScrOffset(GX_BGSCROFFSET_0x00000); GX_SetBGCharOffset(GX_BGCHAROFFSET_0x00000); @@ -74,1302 +78,1363 @@ void SetAllGraphicsModes(const GraphicsModes *param0) GXLayers_DisableEngineBLayers(); } -void SetScreenGraphicsModes(const GraphicsModes *param0, u8 param1) +void SetScreenGraphicsModes(const GraphicsModes *graphicsModes, u8 screen) { - if (param1 == 0) { - GX_SetGraphicsMode(param0->displayMode, param0->mainBgMode, param0->bg0As2DOr3D); + if (screen == DS_SCREEN_MAIN) { + GX_SetGraphicsMode(graphicsModes->displayMode, graphicsModes->mainBgMode, graphicsModes->bg0As2DOr3D); GXLayers_DisableEngineALayers(); } else { - GXS_SetGraphicsMode(param0->subBgMode); + GXS_SetGraphicsMode(graphicsModes->subBgMode); GXLayers_DisableEngineBLayers(); } } -void Bg_InitFromTemplate(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3) +void Bg_InitFromTemplate(BgConfig *bgConfig, u8 bgLayer, const BgTemplate *bgTemplate, u8 bgType) { - u8 v0 = sub_02018F80(param2->screenSize, param3); + u8 screenSize = ConvertToGxBgScreenSize(bgTemplate->screenSize, bgType); - switch (param1) { - case 0: - GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); - G2_SetBG0Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase, (GXBGExtPltt)param2->bgExtPltt); - G2_SetBG0Priority((int)param2->priority); - G2_BG0Mosaic((BOOL)param2->mosaic); + switch (bgLayer) { + case BG_LAYER_MAIN_0: + GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, TRUE); + G2_SetBG0Control(screenSize, bgTemplate->colorMode, bgTemplate->screenBase, bgTemplate->charBase, bgTemplate->bgExtPltt); + G2_SetBG0Priority(bgTemplate->priority); + G2_BG0Mosaic(bgTemplate->mosaic); break; - case 1: - GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); - G2_SetBG1Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase, (GXBGExtPltt)param2->bgExtPltt); - G2_SetBG1Priority((int)param2->priority); - G2_BG1Mosaic((BOOL)param2->mosaic); - break; - case 2: - GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); - switch (param3) { + case BG_LAYER_MAIN_1: + GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, TRUE); + G2_SetBG1Control(screenSize, bgTemplate->colorMode, bgTemplate->screenBase, bgTemplate->charBase, bgTemplate->bgExtPltt); + G2_SetBG1Priority(bgTemplate->priority); + G2_BG1Mosaic(bgTemplate->mosaic); + break; + + case BG_LAYER_MAIN_2: + GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, TRUE); + + switch (bgType) { default: - case 0: - G2_SetBG2ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_STATIC: + G2_SetBG2ControlText(screenSize, bgTemplate->colorMode, bgTemplate->screenBase, bgTemplate->charBase); break; - case 1: - G2_SetBG2ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_AFFINE: + G2_SetBG2ControlAffine(screenSize, bgTemplate->areaOver, bgTemplate->screenBase, bgTemplate->charBase); break; - case 2: - G2_SetBG2Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_STATIC_WITH_AFFINE: + G2_SetBG2Control256x16Pltt(screenSize, bgTemplate->areaOver, bgTemplate->screenBase, bgTemplate->charBase); break; } - G2_SetBG2Priority((int)param2->priority); - G2_BG2Mosaic((BOOL)param2->mosaic); + G2_SetBG2Priority(bgTemplate->priority); + G2_BG2Mosaic(bgTemplate->mosaic); break; - case 3: - GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); - switch (param3) { + case BG_LAYER_MAIN_3: + GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, TRUE); + + switch (bgType) { default: - case 0: - G2_SetBG3ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_STATIC: + G2_SetBG3ControlText(screenSize, bgTemplate->colorMode, bgTemplate->screenBase, bgTemplate->charBase); break; - case 1: - G2_SetBG3ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_AFFINE: + G2_SetBG3ControlAffine(screenSize, bgTemplate->areaOver, bgTemplate->screenBase, bgTemplate->charBase); break; - case 2: - G2_SetBG3Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_STATIC_WITH_AFFINE: + G2_SetBG3Control256x16Pltt(screenSize, bgTemplate->areaOver, bgTemplate->screenBase, bgTemplate->charBase); break; } - G2_SetBG3Priority((int)param2->priority); - G2_BG3Mosaic((BOOL)param2->mosaic); + G2_SetBG3Priority(bgTemplate->priority); + G2_BG3Mosaic(bgTemplate->mosaic); break; - case 4: + + case BG_LAYER_SUB_0: GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); - G2S_SetBG0Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase, (GXBGExtPltt)param2->bgExtPltt); - G2S_SetBG0Priority((int)param2->priority); - G2S_BG0Mosaic((BOOL)param2->mosaic); + G2S_SetBG0Control(screenSize, bgTemplate->colorMode, bgTemplate->screenBase, bgTemplate->charBase, bgTemplate->bgExtPltt); + G2S_SetBG0Priority(bgTemplate->priority); + G2S_BG0Mosaic(bgTemplate->mosaic); break; - case 5: + + case BG_LAYER_SUB_1: GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1); - G2S_SetBG1Control((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase, (GXBGExtPltt)param2->bgExtPltt); - G2S_SetBG1Priority((int)param2->priority); - G2S_BG1Mosaic((BOOL)param2->mosaic); + G2S_SetBG1Control(screenSize, bgTemplate->colorMode, bgTemplate->screenBase, bgTemplate->charBase, bgTemplate->bgExtPltt); + G2S_SetBG1Priority(bgTemplate->priority); + G2S_BG1Mosaic(bgTemplate->mosaic); break; - case 6: + + case BG_LAYER_SUB_2: GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1); - switch (param3) { + switch (bgType) { default: - case 0: - G2S_SetBG2ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_STATIC: + G2S_SetBG2ControlText(screenSize, bgTemplate->colorMode, bgTemplate->screenBase, bgTemplate->charBase); break; - case 1: - G2S_SetBG2ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_AFFINE: + G2S_SetBG2ControlAffine(screenSize, bgTemplate->areaOver, bgTemplate->screenBase, bgTemplate->charBase); break; - case 2: - G2S_SetBG2Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_STATIC_WITH_AFFINE: + G2S_SetBG2Control256x16Pltt(screenSize, bgTemplate->areaOver, bgTemplate->screenBase, bgTemplate->charBase); break; } - G2S_SetBG2Priority((int)param2->priority); - G2S_BG2Mosaic((BOOL)param2->mosaic); + G2S_SetBG2Priority(bgTemplate->priority); + G2S_BG2Mosaic(bgTemplate->mosaic); break; - case 7: + + case BG_LAYER_SUB_3: GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1); - switch (param3) { + switch (bgType) { default: - case 0: - G2S_SetBG3ControlText((GXBGScrSizeText)v0, (GXBGColorMode)param2->colorMode, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_STATIC: + G2S_SetBG3ControlText(screenSize, bgTemplate->colorMode, bgTemplate->screenBase, bgTemplate->charBase); break; - case 1: - G2S_SetBG3ControlAffine((GXBGScrSizeAffine)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_AFFINE: + G2S_SetBG3ControlAffine(screenSize, bgTemplate->areaOver, bgTemplate->screenBase, bgTemplate->charBase); break; - case 2: - G2S_SetBG3Control256x16Pltt((GXBGScrSize256x16Pltt)v0, (GXBGAreaOver)param2->areaOver, (GXBGScrBase)param2->screenBase, (GXBGCharBase)param2->charBase); + case BG_TYPE_STATIC_WITH_AFFINE: + G2S_SetBG3Control256x16Pltt(screenSize, bgTemplate->areaOver, bgTemplate->screenBase, bgTemplate->charBase); break; } - G2S_SetBG3Priority((int)param2->priority); - G2S_BG3Mosaic((BOOL)param2->mosaic); + G2S_SetBG3Priority(bgTemplate->priority); + G2S_BG3Mosaic(bgTemplate->mosaic); break; } - param0->bgs[param1].rotation = 0; - param0->bgs[param1].xScale = FX32_ONE; - param0->bgs[param1].yScale = FX32_ONE; - param0->bgs[param1].xCenter = 0; - param0->bgs[param1].yCenter = 0; + bgConfig->bgs[bgLayer].rotation = 0; + bgConfig->bgs[bgLayer].xScale = FX32_ONE; + bgConfig->bgs[bgLayer].yScale = FX32_ONE; + bgConfig->bgs[bgLayer].xCenter = 0; + bgConfig->bgs[bgLayer].yCenter = 0; - if (param2->bufferSize) { - param0->bgs[param1].tilemapBuffer = Heap_AllocFromHeap(param0->heapID, param2->bufferSize); + if (bgTemplate->bufferSize) { + bgConfig->bgs[bgLayer].tilemapBuffer = Heap_AllocFromHeap(bgConfig->heapID, bgTemplate->bufferSize); - MI_CpuClear16(param0->bgs[param1].tilemapBuffer, param2->bufferSize); + MI_CpuClear16(bgConfig->bgs[bgLayer].tilemapBuffer, bgTemplate->bufferSize); - param0->bgs[param1].bufferSize = param2->bufferSize; - param0->bgs[param1].baseTile = param2->baseTile; + bgConfig->bgs[bgLayer].bufferSize = bgTemplate->bufferSize; + bgConfig->bgs[bgLayer].baseTile = bgTemplate->baseTile; } else { - param0->bgs[param1].tilemapBuffer = NULL; - param0->bgs[param1].bufferSize = 0; - param0->bgs[param1].baseTile = 0; + bgConfig->bgs[bgLayer].tilemapBuffer = NULL; + bgConfig->bgs[bgLayer].bufferSize = 0; + bgConfig->bgs[bgLayer].baseTile = 0; } - param0->bgs[param1].screenSize = param2->screenSize; - param0->bgs[param1].type = param3; - param0->bgs[param1].colorMode = param2->colorMode; + bgConfig->bgs[bgLayer].screenSize = bgTemplate->screenSize; + bgConfig->bgs[bgLayer].type = bgType; + bgConfig->bgs[bgLayer].colorMode = bgTemplate->colorMode; - if ((param3 == 0) && (param2->colorMode == GX_BG_COLORMODE_16)) { - param0->bgs[param1].tileSize = 0x20; + if (bgType == BG_TYPE_STATIC && bgTemplate->colorMode == GX_BG_COLORMODE_16) { + bgConfig->bgs[bgLayer].tileSize = TILE_SIZE_4BPP; } else { - param0->bgs[param1].tileSize = 0x40; + bgConfig->bgs[bgLayer].tileSize = TILE_SIZE_8BPP; } - Bg_SetOffset(param0, param1, 0, param2->x); - Bg_SetOffset(param0, param1, 3, param2->y); + Bg_SetOffset(bgConfig, bgLayer, 0, bgTemplate->x); + Bg_SetOffset(bgConfig, bgLayer, 3, bgTemplate->y); } -void Bg_SetControlParam(BgConfig *param0, u8 param1, u8 param2, u8 param3) +void Bg_SetControlParam(BgConfig *bgConfig, u8 bgLayer, enum BgControlParam bgControlParam, u8 val) { - if (param2 == 0) { - param0->bgs[param1].colorMode = param3; + if (bgControlParam == BG_CONTROL_PARAM_COLOR_MODE) { + bgConfig->bgs[bgLayer].colorMode = val; } - switch (param1) { - case 0: { - GXBg01Control v0 = G2_GetBG0Control(); + switch (bgLayer) { + case BG_LAYER_MAIN_0: { + GXBg01Control bgControl = G2_GetBG0Control(); - if (param2 == 1) { - v0.screenBase = param3; - } else if (param2 == 2) { - v0.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2_SetBG0Control((GXBGScrSizeText)v0.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v0.screenBase, (GXBGCharBase)v0.charBase, (GXBGExtPltt)v0.bgExtPltt); + G2_SetBG0Control(bgControl.screenSize, bgConfig->bgs[bgLayer].colorMode, bgControl.screenBase, bgControl.charBase, bgControl.bgExtPltt); } break; - case 1: { - GXBg01Control v1 = G2_GetBG1Control(); - if (param2 == 1) { - v1.screenBase = param3; - } else if (param2 == 2) { - v1.charBase = param3; + case BG_LAYER_MAIN_1: { + GXBg01Control bgControl = G2_GetBG1Control(); + + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2_SetBG1Control((GXBGScrSizeText)v1.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v1.screenBase, (GXBGCharBase)v1.charBase, (GXBGExtPltt)v1.bgExtPltt); + G2_SetBG1Control(bgControl.screenSize, bgConfig->bgs[bgLayer].colorMode, bgControl.screenBase, bgControl.charBase, bgControl.bgExtPltt); } break; - case 2: - switch (param0->bgs[param1].type) { + + case BG_LAYER_MAIN_2: + switch (bgConfig->bgs[bgLayer].type) { default: - case 0: { - GXBg23ControlText v2 = G2_GetBG2ControlText(); + case BG_TYPE_STATIC: { + GXBg23ControlText bgControl = G2_GetBG2ControlText(); - if (param2 == 1) { - v2.screenBase = param3; - } else if (param2 == 2) { - v2.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2_SetBG2ControlText((GXBGScrSizeText)v2.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v2.screenBase, (GXBGCharBase)v2.charBase); + G2_SetBG2ControlText(bgControl.screenSize, bgConfig->bgs[bgLayer].colorMode, bgControl.screenBase, bgControl.charBase); } break; - case 1: { - GXBg23ControlAffine v3 = G2_GetBG2ControlAffine(); + case BG_TYPE_AFFINE: { + GXBg23ControlAffine bgControl = G2_GetBG2ControlAffine(); - if (param2 == 1) { - v3.screenBase = param3; - } else if (param2 == 2) { - v3.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2_SetBG2ControlAffine((GXBGScrSizeText)v3.screenSize, (GXBGAreaOver)v3.areaOver, (GXBGScrBase)v3.screenBase, (GXBGCharBase)v3.charBase); + G2_SetBG2ControlAffine(bgControl.screenSize, bgControl.areaOver, bgControl.screenBase, bgControl.charBase); } break; - case 2: { - GXBg23Control256x16Pltt v4 = G2_GetBG2Control256x16Pltt(); + case BG_TYPE_STATIC_WITH_AFFINE: { + GXBg23Control256x16Pltt bgControl = G2_GetBG2Control256x16Pltt(); - if (param2 == 1) { - v4.screenBase = param3; - } else if (param2 == 2) { - v4.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2_SetBG2Control256x16Pltt((GXBGScrSizeText)v4.screenSize, (GXBGAreaOver)v4.areaOver, (GXBGScrBase)v4.screenBase, (GXBGCharBase)v4.charBase); + G2_SetBG2Control256x16Pltt(bgControl.screenSize, bgControl.areaOver, bgControl.screenBase, bgControl.charBase); } break; } break; - case 3: - switch (param0->bgs[param1].type) { + + case BG_LAYER_MAIN_3: + switch (bgConfig->bgs[bgLayer].type) { default: - case 0: { - GXBg23ControlText v5 = G2_GetBG3ControlText(); + case BG_TYPE_STATIC: { + GXBg23ControlText bgControl = G2_GetBG3ControlText(); - if (param2 == 1) { - v5.screenBase = param3; - } else if (param2 == 2) { - v5.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2_SetBG3ControlText((GXBGScrSizeText)v5.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v5.screenBase, (GXBGCharBase)v5.charBase); + G2_SetBG3ControlText(bgControl.screenSize, bgConfig->bgs[bgLayer].colorMode, bgControl.screenBase, bgControl.charBase); } break; - case 1: { - GXBg23ControlAffine v6 = G2_GetBG3ControlAffine(); + case BG_TYPE_AFFINE: { + GXBg23ControlAffine bgControl = G2_GetBG3ControlAffine(); - if (param2 == 1) { - v6.screenBase = param3; - } else if (param2 == 2) { - v6.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2_SetBG3ControlAffine((GXBGScrSizeText)v6.screenSize, (GXBGAreaOver)v6.areaOver, (GXBGScrBase)v6.screenBase, (GXBGCharBase)v6.charBase); + G2_SetBG3ControlAffine(bgControl.screenSize, bgControl.areaOver, bgControl.screenBase, bgControl.charBase); } break; - case 2: { - GXBg23Control256x16Pltt v7 = G2_GetBG3Control256x16Pltt(); + case BG_TYPE_STATIC_WITH_AFFINE: { + GXBg23Control256x16Pltt bgControl = G2_GetBG3Control256x16Pltt(); - if (param2 == 1) { - v7.screenBase = param3; - } else if (param2 == 2) { - v7.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2_SetBG3Control256x16Pltt((GXBGScrSizeText)v7.screenSize, (GXBGAreaOver)v7.areaOver, (GXBGScrBase)v7.screenBase, (GXBGCharBase)v7.charBase); + G2_SetBG3Control256x16Pltt(bgControl.screenSize, bgControl.areaOver, bgControl.screenBase, bgControl.charBase); } break; } break; - case 4: { - GXBg01Control v8 = G2S_GetBG0Control(); - if (param2 == 1) { - v8.screenBase = param3; - } else if (param2 == 2) { - v8.charBase = param3; + case BG_LAYER_SUB_0: { + GXBg01Control bgControl = G2S_GetBG0Control(); + + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2S_SetBG0Control((GXBGScrSizeText)v8.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v8.screenBase, (GXBGCharBase)v8.charBase, (GXBGExtPltt)v8.bgExtPltt); + G2S_SetBG0Control(bgControl.screenSize, bgConfig->bgs[bgLayer].colorMode, bgControl.screenBase, bgControl.charBase, bgControl.bgExtPltt); } break; - case 5: { - GXBg01Control v9 = G2S_GetBG1Control(); - if (param2 == 1) { - v9.screenBase = param3; - } else if (param2 == 2) { - v9.charBase = param3; + case BG_LAYER_SUB_1: { + GXBg01Control bgControl = G2S_GetBG1Control(); + + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2S_SetBG1Control((GXBGScrSizeText)v9.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v9.screenBase, (GXBGCharBase)v9.charBase, (GXBGExtPltt)v9.bgExtPltt); + G2S_SetBG1Control(bgControl.screenSize, bgConfig->bgs[bgLayer].colorMode, bgControl.screenBase, bgControl.charBase, bgControl.bgExtPltt); } break; - case 6: - switch (param0->bgs[param1].type) { + + case BG_LAYER_SUB_2: + switch (bgConfig->bgs[bgLayer].type) { default: - case 0: { - GXBg23ControlText v10 = G2S_GetBG2ControlText(); + case BG_TYPE_STATIC: { + GXBg23ControlText bgControl = G2S_GetBG2ControlText(); - if (param2 == 1) { - v10.screenBase = param3; - } else if (param2 == 2) { - v10.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2S_SetBG2ControlText((GXBGScrSizeText)v10.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v10.screenBase, (GXBGCharBase)v10.charBase); + G2S_SetBG2ControlText(bgControl.screenSize, bgConfig->bgs[bgLayer].colorMode, bgControl.screenBase, bgControl.charBase); } break; - case 1: { - GXBg23ControlAffine v11 = G2S_GetBG2ControlAffine(); + case BG_TYPE_AFFINE: { + GXBg23ControlAffine bgControl = G2S_GetBG2ControlAffine(); - if (param2 == 1) { - v11.screenBase = param3; - } else if (param2 == 2) { - v11.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2S_SetBG2ControlAffine((GXBGScrSizeText)v11.screenSize, (GXBGAreaOver)v11.areaOver, (GXBGScrBase)v11.screenBase, (GXBGCharBase)v11.charBase); + G2S_SetBG2ControlAffine(bgControl.screenSize, bgControl.areaOver, bgControl.screenBase, bgControl.charBase); } break; - case 2: { - GXBg23Control256x16Pltt v12 = G2S_GetBG2Control256x16Pltt(); + case BG_TYPE_STATIC_WITH_AFFINE: { + GXBg23Control256x16Pltt bgControl = G2S_GetBG2Control256x16Pltt(); - if (param2 == 1) { - v12.screenBase = param3; - } else if (param2 == 2) { - v12.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2S_SetBG2Control256x16Pltt((GXBGScrSizeText)v12.screenSize, (GXBGAreaOver)v12.areaOver, (GXBGScrBase)v12.screenBase, (GXBGCharBase)v12.charBase); + G2S_SetBG2Control256x16Pltt(bgControl.screenSize, bgControl.areaOver, bgControl.screenBase, bgControl.charBase); } break; } break; - case 7: - switch (param0->bgs[param1].type) { + + case BG_LAYER_SUB_3: + switch (bgConfig->bgs[bgLayer].type) { default: - case 0: { - GXBg23ControlText v13 = G2S_GetBG3ControlText(); + case BG_TYPE_STATIC: { + GXBg23ControlText bgControl = G2S_GetBG3ControlText(); - if (param2 == 1) { - v13.screenBase = param3; - } else if (param2 == 2) { - v13.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2S_SetBG3ControlText((GXBGScrSizeText)v13.screenSize, (GXBGColorMode)param0->bgs[param1].colorMode, (GXBGScrBase)v13.screenBase, (GXBGCharBase)v13.charBase); + G2S_SetBG3ControlText(bgControl.screenSize, bgConfig->bgs[bgLayer].colorMode, bgControl.screenBase, bgControl.charBase); } break; - case 1: { - GXBg23ControlAffine v14 = G2S_GetBG3ControlAffine(); + case BG_TYPE_AFFINE: { + GXBg23ControlAffine bgControl = G2S_GetBG3ControlAffine(); - if (param2 == 1) { - v14.screenBase = param3; - } else if (param2 == 2) { - v14.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2S_SetBG3ControlAffine((GXBGScrSizeText)v14.screenSize, (GXBGAreaOver)v14.areaOver, (GXBGScrBase)v14.screenBase, (GXBGCharBase)v14.charBase); + G2S_SetBG3ControlAffine(bgControl.screenSize, bgControl.areaOver, bgControl.screenBase, bgControl.charBase); } break; - case 2: { - GXBg23Control256x16Pltt v15 = G2S_GetBG3Control256x16Pltt(); + case BG_TYPE_STATIC_WITH_AFFINE: { + GXBg23Control256x16Pltt bgControl = G2S_GetBG3Control256x16Pltt(); - if (param2 == 1) { - v15.screenBase = param3; - } else if (param2 == 2) { - v15.charBase = param3; + if (bgControlParam == BG_CONTROL_PARAM_SCREEN_BASE) { + bgControl.screenBase = val; + } else if (bgControlParam == BG_CONTROL_PARAM_CHAR_BASE) { + bgControl.charBase = val; } - G2S_SetBG3Control256x16Pltt((GXBGScrSizeText)v15.screenSize, (GXBGAreaOver)v15.areaOver, (GXBGScrBase)v15.screenBase, (GXBGCharBase)v15.charBase); + G2S_SetBG3Control256x16Pltt(bgControl.screenSize, bgControl.areaOver, bgControl.screenBase, bgControl.charBase); } break; } break; } } -static u8 sub_02018F80(u8 param0, u8 param1) +static u8 ConvertToGxBgScreenSize(u8 bgScreenSize, u8 bgType) { - switch (param1) { - case 0: - if (param0 == 1) { + switch (bgType) { + case BG_TYPE_STATIC: + if (bgScreenSize == BG_SCREEN_SIZE_256x256) { return GX_BG_SCRSIZE_TEXT_256x256; } - if (param0 == 2) { + if (bgScreenSize == BG_SCREEN_SIZE_256x512) { return GX_BG_SCRSIZE_TEXT_256x512; } - if (param0 == 3) { + if (bgScreenSize == BG_SCREEN_SIZE_512x256) { return GX_BG_SCRSIZE_TEXT_512x256; } - if (param0 == 4) { + if (bgScreenSize == BG_SCREEN_SIZE_512x512) { return GX_BG_SCRSIZE_TEXT_512x512; } break; - case 1: - if (param0 == 0) { + + case BG_TYPE_AFFINE: + if (bgScreenSize == BG_SCREEN_SIZE_128x128) { return GX_BG_SCRSIZE_AFFINE_128x128; } - if (param0 == 1) { + if (bgScreenSize == BG_SCREEN_SIZE_256x256) { return GX_BG_SCRSIZE_AFFINE_256x256; } - if (param0 == 4) { + if (bgScreenSize == BG_SCREEN_SIZE_512x512) { return GX_BG_SCRSIZE_AFFINE_512x512; } - if (param0 == 5) { + if (bgScreenSize == BG_SCREEN_SIZE_1024x1024) { return GX_BG_SCRSIZE_AFFINE_1024x1024; } break; - case 2: - if (param0 == 0) { + + case BG_TYPE_STATIC_WITH_AFFINE: + if (bgScreenSize == BG_SCREEN_SIZE_128x128) { return GX_BG_SCRSIZE_256x16PLTT_128x128; } - if (param0 == 1) { + if (bgScreenSize == BG_SCREEN_SIZE_256x256) { return GX_BG_SCRSIZE_256x16PLTT_256x256; } - if (param0 == 4) { + if (bgScreenSize == BG_SCREEN_SIZE_512x512) { return GX_BG_SCRSIZE_256x16PLTT_512x512; } - if (param0 == 5) { + if (bgScreenSize == BG_SCREEN_SIZE_1024x1024) { return GX_BG_SCRSIZE_256x16PLTT_1024x1024; } break; } - return 0; + return BG_SCREEN_SIZE_128x128; } -static void sub_02018FF4(u8 param0, u8 *param1, u8 *param2) +static void GetBgScreenTileDimensions(u8 bgScreenSize, u8 *outXTiles, u8 *outYTiles) { - switch (param0) { - case 0: - *param1 = 16; - *param2 = 16; + switch (bgScreenSize) { + case BG_SCREEN_SIZE_128x128: + *outXTiles = 16; + *outYTiles = 16; return; - case 1: - *param1 = 32; - *param2 = 32; + + case BG_SCREEN_SIZE_256x256: + *outXTiles = 32; + *outYTiles = 32; return; - case 2: - *param1 = 32; - *param2 = 64; + + case BG_SCREEN_SIZE_256x512: + *outXTiles = 32; + *outYTiles = 64; return; - case 3: - *param1 = 64; - *param2 = 32; + + case BG_SCREEN_SIZE_512x256: + *outXTiles = 64; + *outYTiles = 32; return; - case 4: - *param1 = 64; - *param2 = 64; + + case BG_SCREEN_SIZE_512x512: + *outXTiles = 64; + *outYTiles = 64; return; - case 5: - *param1 = 128; - *param2 = 128; + + case BG_SCREEN_SIZE_1024x1024: + *outXTiles = 128; + *outYTiles = 128; return; } } -void Bg_FreeTilemapBuffer(BgConfig *param0, u8 param1) +void Bg_FreeTilemapBuffer(BgConfig *bgConfig, u8 bgLayer) { - if (param0->bgs[param1].tilemapBuffer == NULL) { + if (bgConfig->bgs[bgLayer].tilemapBuffer == NULL) { return; } - Heap_FreeToHeap(param0->bgs[param1].tilemapBuffer); - param0->bgs[param1].tilemapBuffer = NULL; + Heap_FreeToHeap(bgConfig->bgs[bgLayer].tilemapBuffer); + bgConfig->bgs[bgLayer].tilemapBuffer = NULL; } -void Bg_SetPriority(u8 param0, u8 param1) +void Bg_SetPriority(u8 bgLayer, u8 priority) { - switch (param0) { - case 0: - G2_SetBG0Priority(param1); + switch (bgLayer) { + case BG_LAYER_MAIN_0: + G2_SetBG0Priority(priority); break; - case 1: - G2_SetBG1Priority(param1); + + case BG_LAYER_MAIN_1: + G2_SetBG1Priority(priority); break; - case 2: - G2_SetBG2Priority(param1); + + case BG_LAYER_MAIN_2: + G2_SetBG2Priority(priority); break; - case 3: - G2_SetBG3Priority(param1); + + case BG_LAYER_MAIN_3: + G2_SetBG3Priority(priority); break; - case 4: - G2S_SetBG0Priority(param1); + + case BG_LAYER_SUB_0: + G2S_SetBG0Priority(priority); break; - case 5: - G2S_SetBG1Priority(param1); + + case BG_LAYER_SUB_1: + G2S_SetBG1Priority(priority); break; - case 6: - G2S_SetBG2Priority(param1); + + case BG_LAYER_SUB_2: + G2S_SetBG2Priority(priority); break; - case 7: - G2S_SetBG3Priority(param1); + + case BG_LAYER_SUB_3: + G2S_SetBG3Priority(priority); break; } } -void Bg_ToggleLayer(u8 param0, u8 param1) +void Bg_ToggleLayer(u8 bgLayer, u8 enable) { - switch (param0) { - case 0: - GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, param1); + switch (bgLayer) { + case BG_LAYER_MAIN_0: + GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, enable); break; - case 1: - GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, param1); + + case BG_LAYER_MAIN_1: + GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, enable); break; - case 2: - GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, param1); + + case BG_LAYER_MAIN_2: + GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, enable); break; - case 3: - GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, param1); + + case BG_LAYER_MAIN_3: + GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, enable); break; - case 4: - GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, param1); + + case BG_LAYER_SUB_0: + GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, enable); break; - case 5: - GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, param1); + + case BG_LAYER_SUB_1: + GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, enable); break; - case 6: - GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, param1); + + case BG_LAYER_SUB_2: + GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, enable); break; - case 7: - GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, param1); + + case BG_LAYER_SUB_3: + GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, enable); break; } } -void Bg_SetOffset(BgConfig *param0, u8 param1, u8 param2, int param3) +void Bg_SetOffset(BgConfig *bgConfig, u8 bgLayer, u8 bgUpdateOffsetOp, int val) { - int v0, v1; + UpdateBgOffsetWithVal(&bgConfig->bgs[bgLayer], bgUpdateOffsetOp, val); - sub_02019304(¶m0->bgs[param1], param2, param3); + int hOffset = bgConfig->bgs[bgLayer].xOffset; + int vOffset = bgConfig->bgs[bgLayer].yOffset; - v0 = param0->bgs[param1].xOffset; - v1 = param0->bgs[param1].yOffset; - - switch (param1) { - case 0: - G2_SetBG0Offset(v0, v1); + switch (bgLayer) { + case BG_LAYER_MAIN_0: + G2_SetBG0Offset(hOffset, vOffset); return; - case 1: - G2_SetBG1Offset(v0, v1); + + case BG_LAYER_MAIN_1: + G2_SetBG1Offset(hOffset, vOffset); return; - case 2: - if (param0->bgs[2].type == 0) { - G2_SetBG2Offset(v0, v1); + + case BG_LAYER_MAIN_2: + if (bgConfig->bgs[BG_LAYER_MAIN_2].type == BG_TYPE_STATIC) { + G2_SetBG2Offset(hOffset, vOffset); } else { - sub_020193E4(param0, 2); + ResetBgAffineTransforms(bgConfig, BG_LAYER_MAIN_2); } return; - case 3: - if (param0->bgs[3].type == 0) { - G2_SetBG3Offset(v0, v1); - } else { - sub_020193E4(param0, 3); - } - return; - case 4: - G2S_SetBG0Offset(v0, v1); - return; - case 5: - G2S_SetBG1Offset(v0, v1); - return; - case 6: - if (param0->bgs[6].type == 0) { - G2S_SetBG2Offset(v0, v1); - } else { - sub_020193E4(param0, 6); - } - return; - case 7: - if (param0->bgs[7].type == 0) { - G2S_SetBG3Offset(v0, v1); - } else { - sub_020193E4(param0, 7); - } + case BG_LAYER_MAIN_3: + if (bgConfig->bgs[BG_LAYER_MAIN_3].type == BG_TYPE_STATIC) { + G2_SetBG3Offset(hOffset, vOffset); + } else { + ResetBgAffineTransforms(bgConfig, BG_LAYER_MAIN_3); + } + return; + + case BG_LAYER_SUB_0: + G2S_SetBG0Offset(hOffset, vOffset); + return; + + case BG_LAYER_SUB_1: + G2S_SetBG1Offset(hOffset, vOffset); + return; + + case BG_LAYER_SUB_2: + if (bgConfig->bgs[BG_LAYER_SUB_2].type == BG_TYPE_STATIC) { + G2S_SetBG2Offset(hOffset, vOffset); + } else { + ResetBgAffineTransforms(bgConfig, BG_LAYER_SUB_2); + } + return; + + case BG_LAYER_SUB_3: + if (bgConfig->bgs[BG_LAYER_SUB_3].type == BG_TYPE_STATIC) { + G2S_SetBG3Offset(hOffset, vOffset); + } else { + ResetBgAffineTransforms(bgConfig, BG_LAYER_SUB_3); + } return; } } -int Bg_GetXOffset(BgConfig *param0, u32 param1) +int Bg_GetXOffset(BgConfig *bgConfig, enum BgLayer bgLayer) { - return param0->bgs[param1].xOffset; + return bgConfig->bgs[bgLayer].xOffset; } -int Bg_GetYOffset(BgConfig *param0, u32 param1) +int Bg_GetYOffset(BgConfig *bgConfig, enum BgLayer bgLayer) { - return param0->bgs[param1].yOffset; + return bgConfig->bgs[bgLayer].yOffset; } -static void sub_02019304(Background *param0, u8 param1, int param2) +static void UpdateBgOffsetWithVal(Background *bg, enum BgOffsetUpdateOp op, int val) { - switch (param1) { - case 0: - param0->xOffset = param2; + switch (op) { + case BG_OFFSET_UPDATE_SET_X: + bg->xOffset = val; break; - case 1: - param0->xOffset += param2; + + case BG_OFFSET_UPDATE_ADD_X: + bg->xOffset += val; break; - case 2: - param0->xOffset -= param2; + + case BG_OFFSET_UPDATE_SUB_X: + bg->xOffset -= val; break; - case 3: - param0->yOffset = param2; + + case BG_OFFSET_UPDATE_SET_Y: + bg->yOffset = val; break; - case 4: - param0->yOffset += param2; + + case BG_OFFSET_UPDATE_ADD_Y: + bg->yOffset += val; break; - case 5: - param0->yOffset -= param2; + + case BG_OFFSET_UPDATE_SUB_Y: + bg->yOffset -= val; break; } } -void Bg_SetAffineParams(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4) +void Bg_SetAffineParams(BgConfig *bgConfig, u8 bgLayer, const MtxFx22 *mtx, int centerX, int centerY) { - switch (param1) { - case 2: - G2_SetBG2Affine(param2, param3, param4, param0->bgs[param1].xOffset, param0->bgs[param1].yOffset); + switch (bgLayer) { + case BG_LAYER_MAIN_2: + G2_SetBG2Affine(mtx, centerX, centerY, bgConfig->bgs[bgLayer].xOffset, bgConfig->bgs[bgLayer].yOffset); return; - case 3: - G2_SetBG3Affine(param2, param3, param4, param0->bgs[param1].xOffset, param0->bgs[param1].yOffset); + + case BG_LAYER_MAIN_3: + G2_SetBG3Affine(mtx, centerX, centerY, bgConfig->bgs[bgLayer].xOffset, bgConfig->bgs[bgLayer].yOffset); return; - case 6: - G2S_SetBG2Affine(param2, param3, param4, param0->bgs[param1].xOffset, param0->bgs[param1].yOffset); + + case BG_LAYER_SUB_2: + G2S_SetBG2Affine(mtx, centerX, centerY, bgConfig->bgs[bgLayer].xOffset, bgConfig->bgs[bgLayer].yOffset); return; - case 7: - G2S_SetBG3Affine(param2, param3, param4, param0->bgs[param1].xOffset, param0->bgs[param1].yOffset); + + case BG_LAYER_SUB_3: + G2S_SetBG3Affine(mtx, centerX, centerY, bgConfig->bgs[bgLayer].xOffset, bgConfig->bgs[bgLayer].yOffset); return; } } -static void sub_020193E4(BgConfig *param0, u8 param1) +static void ResetBgAffineTransforms(BgConfig *bgConfig, u8 bgLayer) { - MtxFx22 v0; - - sub_0201D470(&v0, 0, FX32_ONE, FX32_ONE, 0); - Bg_SetAffineParams(param0, param1, &v0, 0, 0); + MtxFx22 mtx; + sub_0201D470(&mtx, 0, FX32_ONE, FX32_ONE, 0); + Bg_SetAffineParams(bgConfig, bgLayer, &mtx, 0, 0); } -static void sub_02019410(const void *param0, void *param1, u32 param2) +static void CopyOrDecompressData(const void *src, void *dest, u32 size) { - if (param2 == 0) { - MI_UncompressLZ8(param0, param1); + if (size == 0) { + MI_UncompressLZ8(src, dest); + return; + } + + if ((((u32)src % 4) == 0) && (((u32)dest % 4) == 0) && (((u16)size % 4) == 0)) { + MI_CpuCopy32(src, dest, size); + return; + } + + MI_CpuCopy16(src, dest, size); +} + +void Bg_CopyTilemapBufferToVRAM(BgConfig *bgConfig, u8 bgLayer) +{ + Bg_CopyTilemapBufferRangeToVRAM(bgConfig, + bgLayer, + bgConfig->bgs[bgLayer].tilemapBuffer, + bgConfig->bgs[bgLayer].bufferSize, + bgConfig->bgs[bgLayer].baseTile); +} + +void Bg_CopyTilemapBufferRangeToVRAM(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32 offset) +{ + if (size == 0) { + void *buf = bgConfig->bgs[bgLayer].tilemapBuffer; + if (buf != NULL) { + CopyOrDecompressData(src, buf, size); + LoadBgVRAMScr(bgLayer, + buf, + bgConfig->bgs[bgLayer].baseTile * 2, + bgConfig->bgs[bgLayer].bufferSize); + + return; + } + + u32 decompressedSize = MI_GetUncompressedSize(src); + void *tmp = Heap_AllocFromHeapAtEnd(bgConfig->heapID, decompressedSize); + + CopyOrDecompressData(src, tmp, size); + LoadBgVRAMScr(bgLayer, tmp, offset * 2, decompressedSize); + Heap_FreeToHeap(tmp); + + return; + } + + LoadBgVRAMScr(bgLayer, src, offset * 2, size); +} + +static void LoadBgVRAMScr(u8 bgLayer, void *src, u32 offset, u32 size) +{ + DC_FlushRange(src, size); + + switch (bgLayer) { + case BG_LAYER_MAIN_0: + GX_LoadBG0Scr(src, offset, size); + return; + + case BG_LAYER_MAIN_1: + GX_LoadBG1Scr(src, offset, size); + return; + + case BG_LAYER_MAIN_2: + GX_LoadBG2Scr(src, offset, size); + return; + + case BG_LAYER_MAIN_3: + GX_LoadBG3Scr(src, offset, size); + return; + + case BG_LAYER_SUB_0: + GXS_LoadBG0Scr(src, offset, size); + return; + + case BG_LAYER_SUB_1: + GXS_LoadBG1Scr(src, offset, size); + return; + + case BG_LAYER_SUB_2: + GXS_LoadBG2Scr(src, offset, size); + return; + + case BG_LAYER_SUB_3: + GXS_LoadBG3Scr(src, offset, size); + return; + } +} + +void Bg_LoadTilemapBuffer(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size) +{ + CopyOrDecompressData(src, bgConfig->bgs[bgLayer].tilemapBuffer, size); +} + +void Bg_LoadTiles(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32 tileStart) +{ + if (bgConfig->bgs[bgLayer].colorMode == GX_BG_COLORMODE_16) { + Bg_LoadTilesToVRAM(bgConfig, bgLayer, src, size, tileStart * TILE_SIZE_4BPP); } else { - if ((!((u32)param0 % 4)) && (!((u32)param1 % 4)) && (!((u16)param2 % 4))) { - MI_CpuCopy32(param0, param1, param2); - } else { - MI_CpuCopy16(param0, param1, param2); - } + Bg_LoadTilesToVRAM(bgConfig, bgLayer, src, size, tileStart * TILE_SIZE_8BPP); } } -void Bg_CopyTilemapBufferToVRAM(BgConfig *param0, u8 param1) +void Bg_LoadTilesToVRAM(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32 offset) { - Bg_CopyTilemapBufferRangeToVRAM(param0, param1, param0->bgs[param1].tilemapBuffer, param0->bgs[param1].bufferSize, param0->bgs[param1].baseTile); + if (size == 0) { + u32 decompressedSize = MI_GetUncompressedSize(src); + void *tmp = Heap_AllocFromHeapAtEnd(bgConfig->heapID, decompressedSize); + + CopyOrDecompressData(src, tmp, size); + LoadBgVRAMChar(bgLayer, tmp, offset, decompressedSize); + Heap_FreeToHeap(tmp); + + return; + } + + LoadBgVRAMChar(bgLayer, (void *)src, offset, size); } -void Bg_CopyTilemapBufferRangeToVRAM(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4) +static void LoadBgVRAMChar(u8 bgLayer, void *src, u32 offset, u32 size) { - void *v0; + DC_FlushRange(src, size); - if (param3 == 0) { - if (param0->bgs[param1].tilemapBuffer != NULL) { - v0 = param0->bgs[param1].tilemapBuffer; - sub_02019410(param2, v0, param3); - sub_020194E0(param1, v0, param0->bgs[param1].baseTile * 0x2, param0->bgs[param1].bufferSize); - } else { - u32 v1; + switch (bgLayer) { + case BG_LAYER_MAIN_0: + GX_LoadBG0Char(src, offset, size); + return; - v1 = ((*(u32 *)param2) >> 8); - v0 = Heap_AllocFromHeapAtEnd(param0->heapID, v1); + case BG_LAYER_MAIN_1: + GX_LoadBG1Char(src, offset, size); + return; - sub_02019410(param2, v0, param3); - sub_020194E0(param1, v0, param4 * 0x2, v1); - Heap_FreeToHeap(v0); - } + case BG_LAYER_MAIN_2: + GX_LoadBG2Char(src, offset, size); + return; + + case BG_LAYER_MAIN_3: + GX_LoadBG3Char(src, offset, size); + return; + + case BG_LAYER_SUB_0: + GXS_LoadBG0Char(src, offset, size); + return; + + case BG_LAYER_SUB_1: + GXS_LoadBG1Char(src, offset, size); + return; + + case BG_LAYER_SUB_2: + GXS_LoadBG2Char(src, offset, size); + return; + + case BG_LAYER_SUB_3: + GXS_LoadBG3Char(src, offset, size); + return; + } +} + +void Bg_ClearTilesRange(u8 bgLayer, u32 size, u32 offset, u32 heapID) +{ + u32 *buf = (u32 *)Heap_AllocFromHeapAtEnd(heapID, size); + + memset(buf, 0, size); + + LoadBgVRAMChar(bgLayer, buf, offset, size); + Heap_FreeToHeapExplicit(heapID, buf); +} + +void Bg_FillTilesRange(BgConfig *bgConfig, u32 bgLayer, u32 fillVal, u32 numTiles, u32 offset) +{ + u32 *buf; + u32 size = numTiles * bgConfig->bgs[bgLayer].tileSize; + buf = Heap_AllocFromHeapAtEnd(bgConfig->heapID, size); + + if (bgConfig->bgs[bgLayer].tileSize == TILE_SIZE_4BPP) { + fillVal = (fillVal << 12) | (fillVal << 8) | (fillVal << 4) | fillVal; + fillVal |= (fillVal << 16); } else { - sub_020194E0(param1, (void *)param2, param4 * 0x2, param3); + fillVal = (fillVal << 24) | (fillVal << 16) | (fillVal << 8) | fillVal; + } + + MI_CpuFillFast(buf, fillVal, size); + LoadBgVRAMChar(bgLayer, buf, offset * bgConfig->bgs[bgLayer].tileSize, size); + Heap_FreeToHeap(buf); +} + +void Bg_LoadPalette(u8 bgLayer, void *src, u16 size, u16 offset) +{ + DC_FlushRange(src, size); + + if (bgLayer < BG_LAYER_SUB_0) { + GX_LoadBGPltt(src, offset, size); + } else { + GXS_LoadBGPltt(src, offset, size); } } -static void sub_020194E0(u8 param0, void *param1, u32 param2, u32 param3) +void Bg_MaskPalette(u8 bgLayer, u16 mask) { - DC_FlushRange(param1, param3); + Bg_LoadPalette(bgLayer, &mask, sizeof(u16), 0); +} - switch (param0) { +static u16 CalcTilemapIndexFromCoords(u8 x, u8 y, u8 bgScreenSize) +{ + u16 ret; + + switch (bgScreenSize) { + case BG_SCREEN_SIZE_128x128: + ret = y * 16 + x; + break; + + case BG_SCREEN_SIZE_256x256: + case BG_SCREEN_SIZE_256x512: + ret = y * 32 + x; + break; + + case BG_SCREEN_SIZE_512x256: + ret = ((x >> 5) * 32 + y) * 32 + (x & 0x1F); + break; + + case BG_SCREEN_SIZE_512x512: + ret = (x >> 5) + (y >> 5) * 2; + ret *= 1024; + ret += (y & 0x1F) * 32 + (x & 0x1F); + break; + + case BG_SCREEN_SIZE_1024x1024: + ret = 0; + } + + return ret; +} + +static u16 CalcTilemapIndexFromCoordsWidthHeight(u8 x, u8 y, u8 width, u8 height) +{ + u8 coordType = 0; + u16 tilemapIndex = 0; + s16 adjustedWidth = width - 32; + s16 adjustedHeight = height - 32; + + if (x / 32) { + coordType += 1; + } + + if (y / 32) { + coordType += 2; + } + + switch (coordType) { case 0: - GX_LoadBG0Scr(param1, param2, param3); - return; - case 1: - GX_LoadBG1Scr(param1, param2, param3); - return; - case 2: - GX_LoadBG2Scr(param1, param2, param3); - return; - case 3: - GX_LoadBG3Scr(param1, param2, param3); - return; - case 4: - GXS_LoadBG0Scr(param1, param2, param3); - return; - case 5: - GXS_LoadBG1Scr(param1, param2, param3); - return; - case 6: - GXS_LoadBG2Scr(param1, param2, param3); - return; - case 7: - GXS_LoadBG3Scr(param1, param2, param3); - return; - } -} - -void Bg_LoadTilemapBuffer(BgConfig *param0, u8 param1, const void *param2, u32 param3) -{ - sub_02019410(param2, param0->bgs[param1].tilemapBuffer, param3); -} - -void Bg_LoadTiles(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4) -{ - if (param0->bgs[param1].colorMode == GX_BG_COLORMODE_16) { - sub_020195B8(param0, param1, param2, param3, param4 * 0x20); - } else { - sub_020195B8(param0, param1, param2, param3, param4 * 0x40); - } -} - -static void sub_020195B8(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4) -{ - void *v0; - - if (param3 == 0) { - u32 v1; - - v1 = ((*(u32 *)param2) >> 8); - v0 = Heap_AllocFromHeapAtEnd(param0->heapID, v1); - - sub_02019410(param2, v0, param3); - sub_020195FC(param1, v0, param4, v1); - Heap_FreeToHeap(v0); - } else { - sub_020195FC(param1, (void *)param2, param4, param3); - } -} - -static void sub_020195FC(u8 param0, void *param1, u32 param2, u32 param3) -{ - DC_FlushRange(param1, param3); - - switch (param0) { - case 0: - GX_LoadBG0Char(param1, param2, param3); - return; - case 1: - GX_LoadBG1Char(param1, param2, param3); - return; - case 2: - GX_LoadBG2Char(param1, param2, param3); - return; - case 3: - GX_LoadBG3Char(param1, param2, param3); - return; - case 4: - GXS_LoadBG0Char(param1, param2, param3); - return; - case 5: - GXS_LoadBG1Char(param1, param2, param3); - return; - case 6: - GXS_LoadBG2Char(param1, param2, param3); - return; - case 7: - GXS_LoadBG3Char(param1, param2, param3); - return; - } -} - -void Bg_ClearTilesRange(u8 param0, u32 param1, u32 param2, u32 param3) -{ - u32 *v0 = (u32 *)Heap_AllocFromHeapAtEnd(param3, param1); - - memset(v0, 0, param1); - - sub_020195FC(param0, (void *)v0, param2, param1); - Heap_FreeToHeapExplicit(param3, v0); -} - -void Bg_FillTilesRange(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4) -{ - u32 *v0; - u32 v1; - - v1 = param3 * param0->bgs[param1].tileSize; - v0 = (u32 *)Heap_AllocFromHeapAtEnd(param0->heapID, v1); - - if (param0->bgs[param1].tileSize == 0x20) { - param2 = (param2 << 12) | (param2 << 8) | (param2 << 4) | param2; - param2 |= (param2 << 16); - } else { - param2 = (param2 << 24) | (param2 << 16) | (param2 << 8) | param2; - } - - MI_CpuFillFast(v0, param2, v1); - - sub_020195FC(param1, (void *)v0, param4 * param0->bgs[param1].tileSize, v1); - Heap_FreeToHeap(v0); -} - -void Bg_LoadPalette(u8 param0, void *param1, u16 param2, u16 param3) -{ - DC_FlushRange((void *)param1, param2); - - if (param0 < 4) { - GX_LoadBGPltt((const void *)param1, param3, param2); - } else { - GXS_LoadBGPltt((const void *)param1, param3, param2); - } -} - -void Bg_MaskPalette(u8 param0, u16 param1) -{ - Bg_LoadPalette(param0, ¶m1, 2, 0); -} - -static u16 sub_02019774(u8 param0, u8 param1, u8 param2) -{ - u16 v0; - - switch (param2) { - case 0: - v0 = param1 * 16 + param0; - break; - case 1: - case 2: - v0 = param1 * 32 + param0; - break; - case 3: - v0 = ((param0 >> 5) * 32 + param1) * 32 + (param0 & 0x1f); - break; - case 4: - v0 = ((param0 >> 5) + (param1 >> 5) * 2); - v0 *= 1024; - v0 += (param1 & 0x1f) * 32 + (param0 & 0x1f); - break; - case 5: - v0 = 0; - } - - return v0; -} - -static u16 sub_020197E0(u8 param0, u8 param1, u8 param2, u8 param3) -{ - u8 v0 = 0; - u16 v1 = 0; - s16 v2 = param2 - 32; - s16 v3 = param3 - 32; - - if (param0 / 32) { - v0 += 1; - } - - if (param1 / 32) { - v0 += 2; - } - - switch (v0) { - case 0: - if (v2 >= 0) { - v1 += param1 * 32 + param0; + if (adjustedWidth >= 0) { + tilemapIndex += y * 32 + x; } else { - v1 += param1 * param2 + param0; + tilemapIndex += y * width + x; } break; + case 1: - if (v3 >= 0) { - v1 += 1024; + if (adjustedHeight >= 0) { + tilemapIndex += 1024; } else { - v1 += 32 * param3; + tilemapIndex += 32 * height; } - v1 += param1 * v2 + (param0 & 0x1F); + tilemapIndex += y * adjustedWidth + (x & 0x1F); break; + case 2: - v1 += param2 * 32; + tilemapIndex += width * 32; - if (v2 >= 0) { - v1 += (param1 & 0x1F) * 32 + param0; + if (adjustedWidth >= 0) { + tilemapIndex += (y & 0x1F) * 32 + x; } else { - v1 += (param1 & 0x1F) * param2 + param0; + tilemapIndex += (y & 0x1F) * width + x; } break; + case 3: - v1 += (u16)param2 * 32 + (u16)32 * v3; - v1 += (param1 & 0x1F) * v2 + (param0 & 0x1F); + tilemapIndex += width * 32 + adjustedHeight * 32; + tilemapIndex += (y & 0x1F) * adjustedWidth + (x & 0x1F); break; } - return v1; + return tilemapIndex; } -void Bg_LoadToTilemapRect(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6) +void Bg_LoadToTilemapRect(BgConfig *bgConfig, u8 bgLayer, const void *src, u8 destX, u8 destY, u8 destWidth, u8 destHeight) { - Bg_CopyToTilemapRect(param0, param1, param3, param4, param5, param6, param2, 0, 0, param5, param6); + Bg_CopyToTilemapRect(bgConfig, bgLayer, destX, destY, destWidth, destHeight, src, 0, 0, destWidth, destHeight); } -void Bg_CopyToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) +void Bg_CopyToTilemapRect(BgConfig *bgConfig, u8 bgLayer, u8 destX, u8 destY, u8 destWidth, u8 destHeight, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight) { - if (param0->bgs[param1].type != 1) { - sub_020199E0(¶m0->bgs[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 0); + if (bgConfig->bgs[bgLayer].type != BG_TYPE_AFFINE) { + CopyToBgTilemapRectText(&bgConfig->bgs[bgLayer], destX, destY, destWidth, destHeight, (u16 *)src, srcX, srcY, srcWidth, srcHeight, TILEMAP_COPY_SRC_FLAT); } else { - sub_02019B54(¶m0->bgs[param1], param2, param3, param4, param5, (u8 *)param6, param7, param8, param9, param10, 0); + CopyToBgTilemapRectAffine(&bgConfig->bgs[bgLayer], destX, destY, destWidth, destHeight, (u8 *)src, srcX, srcY, srcWidth, srcHeight, TILEMAP_COPY_SRC_FLAT); } } -void Bg_CopyRectToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) +void Bg_CopyRectToTilemapRect(BgConfig *bgConfig, u8 bgLayer, u8 destX, u8 destY, u8 destWidth, u8 destHeight, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight) { - if (param0->bgs[param1].type != 1) { - sub_020199E0(¶m0->bgs[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 1); + if (bgConfig->bgs[bgLayer].type != BG_TYPE_AFFINE) { + CopyToBgTilemapRectText(&bgConfig->bgs[bgLayer], destX, destY, destWidth, destHeight, (u16 *)src, srcX, srcY, srcWidth, srcHeight, TILEMAP_COPY_SRC_RECT); } else { - sub_02019B54(¶m0->bgs[param1], param2, param3, param4, param5, (u8 *)param6, param7, param8, param9, param10, 1); + CopyToBgTilemapRectAffine(&bgConfig->bgs[bgLayer], destX, destY, destWidth, destHeight, (u8 *)src, srcX, srcY, srcWidth, srcHeight, TILEMAP_COPY_SRC_RECT); } } -static void sub_020199E0(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10) +static void CopyToBgTilemapRectText(Background *bg, u8 destX, u8 destY, u8 destWidth, u8 destHeight, u16 *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 mode) { - u16 *v0; - u8 v1, v2; - u8 v3, v4; - - if (param0->tilemapBuffer == NULL) { + u16 *dest = bg->tilemapBuffer; + if (dest == NULL) { return; } - v0 = (u16 *)param0->tilemapBuffer; - sub_02018FF4(param0->screenSize, &v1, &v2); + u8 widthTiles, heightTiles; + GetBgScreenTileDimensions(bg->screenSize, &widthTiles, &heightTiles); - if (param10 == 0) { - for (v3 = 0; v3 < param4; v3++) { - if (((param2 + v3) >= v2) || ((param7 + v3) >= param9)) { + u8 i, j; + if (mode == TILEMAP_COPY_SRC_FLAT) { + for (i = 0; i < destHeight; i++) { + if (destY + i >= heightTiles || srcY + i >= srcHeight) { break; } - for (v4 = 0; v4 < param3; v4++) { - if (((param1 + v4) >= v1) || ((param6 + v4) >= param8)) { + for (j = 0; j < destWidth; j++) { + if (destX + j >= widthTiles || srcX + j >= srcWidth) { break; } - v0[sub_02019774(param1 + v4, param2 + v3, param0->screenSize)] = param5[(param7 + v3) * param8 + param6 + v4]; + dest[CalcTilemapIndexFromCoords(destX + j, destY + i, bg->screenSize)] = src[(srcY + i) * srcWidth + srcX + j]; } } } else { - for (v3 = 0; v3 < param4; v3++) { - if (((param2 + v3) >= v2) || ((param7 + v3) >= param9)) { + for (i = 0; i < destHeight; i++) { + if (destY + i >= heightTiles || srcY + i >= srcHeight) { break; } - for (v4 = 0; v4 < param3; v4++) { - if (((param1 + v4) >= v1) || ((param6 + v4) >= param8)) { + for (j = 0; j < destWidth; j++) { + if (destX + j >= widthTiles || srcX + j >= srcWidth) { break; } - v0[sub_02019774(param1 + v4, param2 + v3, param0->screenSize)] = param5[sub_020197E0(param6 + v4, param7 + v3, param8, param9)]; + dest[CalcTilemapIndexFromCoords(destX + j, destY + i, bg->screenSize)] = src[CalcTilemapIndexFromCoordsWidthHeight(srcX + j, srcY + i, srcWidth, srcHeight)]; } } } } -static void sub_02019B54(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10) +static void CopyToBgTilemapRectAffine(Background *bg, u8 destX, u8 destY, u8 destWidth, u8 destHeight, u8 *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 mode) { - u8 *v0; - u8 v1, v2; - u8 v3, v4; - - if (param0->tilemapBuffer == NULL) { + u8 *dest = bg->tilemapBuffer; + if (dest == NULL) { return; } - v0 = (u8 *)param0->tilemapBuffer; - sub_02018FF4(param0->screenSize, &v1, &v2); + u8 widthTiles, heightTiles; + GetBgScreenTileDimensions(bg->screenSize, &widthTiles, &heightTiles); - if (param10 == 0) { - for (v3 = 0; v3 < param4; v3++) { - if (((param2 + v3) >= v2) || ((param7 + v3) >= param9)) { + u8 i, j; + if (mode == TILEMAP_COPY_SRC_FLAT) { + for (i = 0; i < destHeight; i++) { + if (destY + i >= heightTiles || srcY + i >= srcHeight) { break; } - for (v4 = 0; v4 < param3; v4++) { - if (((param1 + v4) >= v1) || ((param6 + v4) >= param8)) { + for (j = 0; j < destWidth; j++) { + if (destX + j >= widthTiles || srcX + j >= srcWidth) { break; } - v0[sub_02019774(param1 + v4, param2 + v3, param0->screenSize)] = param5[(param7 + v3) * param8 + param6 + v4]; + dest[CalcTilemapIndexFromCoords(destX + j, destY + i, bg->screenSize)] = src[(srcY + i) * srcWidth + srcX + j]; } } } else { - for (v3 = 0; v3 < param4; v3++) { - if (((param2 + v3) >= v2) || ((param7 + v3) >= param9)) { + for (i = 0; i < destHeight; i++) { + if (destY + i >= heightTiles || srcY + i >= srcHeight) { break; } - for (v4 = 0; v4 < param3; v4++) { - if (((param1 + v4) >= v1) || ((param6 + v4) >= param8)) { + for (j = 0; j < destWidth; j++) { + if (destX + j >= widthTiles || srcX + j >= srcWidth) { break; } - v0[sub_02019774(param1 + v4, param2 + v3, param0->screenSize)] = param5[sub_020197E0(param6 + v4, param7 + v3, param8, param9)]; + dest[CalcTilemapIndexFromCoords(destX + j, destY + i, bg->screenSize)] = src[CalcTilemapIndexFromCoordsWidthHeight(srcX + j, srcY + i, srcWidth, srcHeight)]; } } } } -void Bg_FillTilemapRect(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7) +void Bg_FillTilemapRect(BgConfig *bgConfig, u8 bgLayer, u16 fillVal, u8 x, u8 y, u8 width, u8 height, u8 palette) { - if (param0->bgs[param1].type != 1) { - sub_02019D08(¶m0->bgs[param1], param2, param3, param4, param5, param6, param7); + if (bgConfig->bgs[bgLayer].type != BG_TYPE_AFFINE) { + FillBgTilemapRectText(&bgConfig->bgs[bgLayer], fillVal, x, y, width, height, palette); } else { - sub_02019DB8(¶m0->bgs[param1], (u8)param2, param3, param4, param5, param6); + FillBgTilemapRectAffine(&bgConfig->bgs[bgLayer], fillVal, x, y, width, height); } } -static void sub_02019D08(Background *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) +static void FillBgTilemapRectText(Background *bg, u16 fillVal, u8 x, u8 y, u8 width, u8 height, u8 palette) { - u16 *v0; - u8 v1, v2; - u8 v3, v4; - - if (param0->tilemapBuffer == NULL) { + u16 *dest = bg->tilemapBuffer; + if (dest == NULL) { return; } - v0 = (u16 *)param0->tilemapBuffer; - sub_02018FF4(param0->screenSize, &v1, &v2); + u8 widthTiles, heightTiles; + GetBgScreenTileDimensions(bg->screenSize, &widthTiles, &heightTiles); - for (v3 = param3; v3 < param3 + param5; v3++) { - if (v3 >= v2) { + u8 i, j; + for (i = y; i < y + height; i++) { + if (i >= heightTiles) { break; } - for (v4 = param2; v4 < param2 + param4; v4++) { - if (v4 >= v1) { + for (j = x; j < x + width; j++) { + if (j >= widthTiles) { break; } - { - u16 v5 = sub_02019774(v4, v3, param0->screenSize); - - if (param6 == 17) { - v0[v5] = param1; - } else if (param6 == 16) { - v0[v5] = (v0[v5] & 0xf000) + param1; - } else { - v0[v5] = (param6 << 12) + param1; - } + u16 idx = CalcTilemapIndexFromCoords(j, i, bg->screenSize); + if (palette == TILEMAP_FILL_VAL_INCLUDES_PALETTE) { + dest[idx] = fillVal; + } else if (palette == TILEMAP_FILL_VAL_KEEP_PALETTE) { + dest[idx] = (dest[idx] & 0xF000) + fillVal; + } else { + dest[idx] = (palette << 12) + fillVal; } } } } -static void sub_02019DB8(Background *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5) +static void FillBgTilemapRectAffine(Background *bg, u8 fillVal, u8 x, u8 y, u8 width, u8 height) { - u8 *v0; - u8 v1, v2; - u8 v3, v4; - - if (param0->tilemapBuffer == NULL) { + u8 *dest = bg->tilemapBuffer; + if (dest == NULL) { return; } - v0 = (u8 *)param0->tilemapBuffer; - sub_02018FF4(param0->screenSize, &v1, &v2); + u8 widthTiles, heightTiles; + GetBgScreenTileDimensions(bg->screenSize, &widthTiles, &heightTiles); - for (v3 = param3; v3 < param3 + param5; v3++) { - if (v3 >= v2) { + u8 i, j; + for (i = y; i < y + height; i++) { + if (i >= heightTiles) { break; } - for (v4 = param2; v4 < param2 + param4; v4++) { - if (v4 >= v1) { + for (j = x; j < x + width; j++) { + if (j >= widthTiles) { break; } - v0[sub_02019774(v4, v3, param0->screenSize)] = param1; + dest[CalcTilemapIndexFromCoords(j, i, bg->screenSize)] = fillVal; } } } -void Bg_ChangeTilemapRectPalette(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) +void Bg_ChangeTilemapRectPalette(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 width, u8 height, u8 palette) { - u16 *v0; - u8 v1, v2; - u8 v3, v4; - - if (param0->bgs[param1].tilemapBuffer == NULL) { + u16 *dest = bgConfig->bgs[bgLayer].tilemapBuffer; + if (dest == NULL) { return; } - v0 = (u16 *)param0->bgs[param1].tilemapBuffer; - sub_02018FF4(param0->bgs[param1].screenSize, &v1, &v2); + u8 widthTiles, heightTiles; + GetBgScreenTileDimensions(bgConfig->bgs[bgLayer].screenSize, &widthTiles, &heightTiles); - for (v3 = param3; v3 < param3 + param5; v3++) { - if (v3 >= v2) { + u8 i, j; + for (i = y; i < y + height; i++) { + if (i >= heightTiles) { break; } - for (v4 = param2; v4 < param2 + param4; v4++) { - if (v4 >= v1) { + for (j = x; j < x + width; j++) { + if (j >= widthTiles) { break; } - { - u16 v5 = sub_02019774(v4, v3, param0->bgs[param1].screenSize); - v0[v5] = (v0[v5] & 0xfff) | (param6 << 12); - } + u16 idx = CalcTilemapIndexFromCoords(j, i, bgConfig->bgs[bgLayer].screenSize); + dest[idx] = (dest[idx] & 0xFFF) | (palette << 12); } } } -void Bg_ClearTilemap(BgConfig *param0, u8 param1) +void Bg_ClearTilemap(BgConfig *bgConfig, u8 bgLayer) { - if (param0->bgs[param1].tilemapBuffer == NULL) { + if (bgConfig->bgs[bgLayer].tilemapBuffer == NULL) { return; } - MI_CpuClear16(param0->bgs[param1].tilemapBuffer, param0->bgs[param1].bufferSize); - Bg_CopyTilemapBufferToVRAM(param0, param1); + MI_CpuClear16(bgConfig->bgs[bgLayer].tilemapBuffer, bgConfig->bgs[bgLayer].bufferSize); + Bg_CopyTilemapBufferToVRAM(bgConfig, bgLayer); } -void Bg_FillTilemap(BgConfig *param0, u8 param1, u16 param2) +void Bg_FillTilemap(BgConfig *bgConfig, u8 bgLayer, u16 fillVal) { - if (param0->bgs[param1].tilemapBuffer == NULL) { + if (bgConfig->bgs[bgLayer].tilemapBuffer == NULL) { return; } - MI_CpuFill16(param0->bgs[param1].tilemapBuffer, param2, param0->bgs[param1].bufferSize); - Bg_CopyTilemapBufferToVRAM(param0, param1); + MI_CpuFill16(bgConfig->bgs[bgLayer].tilemapBuffer, fillVal, bgConfig->bgs[bgLayer].bufferSize); + Bg_CopyTilemapBufferToVRAM(bgConfig, bgLayer); } -void Bg_ScheduleFillTilemap(BgConfig *param0, u8 param1, u16 param2) +void Bg_ScheduleFillTilemap(BgConfig *bgConfig, u8 bgLayer, u16 fillVal) { - if (param0->bgs[param1].tilemapBuffer == NULL) { + if (bgConfig->bgs[bgLayer].tilemapBuffer == NULL) { return; } - MI_CpuFill16(param0->bgs[param1].tilemapBuffer, param2, param0->bgs[param1].bufferSize); - Bg_ScheduleTilemapTransfer(param0, param1); + MI_CpuFill16(bgConfig->bgs[bgLayer].tilemapBuffer, fillVal, bgConfig->bgs[bgLayer].bufferSize); + Bg_ScheduleTilemapTransfer(bgConfig, bgLayer); } -void *Bg_GetCharPtr(u8 param0) +void *Bg_GetCharPtr(u8 bgLayer) { - switch (param0) { - case 0: + switch (bgLayer) { + case BG_LAYER_MAIN_0: return G2_GetBG0CharPtr(); - case 1: + + case BG_LAYER_MAIN_1: return G2_GetBG1CharPtr(); - case 2: + + case BG_LAYER_MAIN_2: return G2_GetBG2CharPtr(); - case 3: + + case BG_LAYER_MAIN_3: return G2_GetBG3CharPtr(); - case 4: + + case BG_LAYER_SUB_0: return G2S_GetBG0CharPtr(); - case 5: + + case BG_LAYER_SUB_1: return G2S_GetBG1CharPtr(); - case 6: + + case BG_LAYER_SUB_2: return G2S_GetBG2CharPtr(); - case 7: + + case BG_LAYER_SUB_3: return G2S_GetBG3CharPtr(); } return NULL; } -static void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3) +static void Copy4bppTo8bpp(const u8 *src, u32 size, u8 *dest, u8 palette) { - u32 v0; + palette <<= 4; - param3 <<= 4; - - for (v0 = 0; v0 < param1; v0++) { - param2[v0 * 2] = param0[v0] & 0xf; - - if (param2[v0 * 2] != 0) { - param2[v0 * 2] += param3; + for (u32 i = 0; i < size; i++) { + dest[i * 2] = src[i] & 0xf; + if (dest[i * 2] != 0) { + dest[i * 2] += palette; } - param2[v0 * 2 + 1] = (param0[v0] >> 4) & 0xf; - - if (param2[v0 * 2 + 1] != 0) { - param2[v0 * 2 + 1] += param3; + dest[i * 2 + 1] = (src[i] >> 4) & 0xf; + if (dest[i * 2 + 1] != 0) { + dest[i * 2 + 1] += palette; } } } -static void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3) +static void *Convert4bppTo8bpp(const u8 *src, u32 size, u8 palette, u32 heapID) { - void *v0; + void *dest = Heap_AllocFromHeap(heapID, size * 2); + Copy4bppTo8bpp(src, size, dest, palette); - v0 = Heap_AllocFromHeap(param3, param1 * 2); - sub_02019F80(param0, param1, (u8 *)v0, param2); - - return v0; + return dest; } -void *Bg_GetTilemapBuffer(BgConfig *param0, u8 param1) +void *Bg_GetTilemapBuffer(BgConfig *bgConfig, u8 bgLayer) { - return param0->bgs[param1].tilemapBuffer; + return bgConfig->bgs[bgLayer].tilemapBuffer; } -int Bg_GetXOffset2(BgConfig *param0, u8 param1) +int Bg_GetXOffset2(BgConfig *bgConfig, u8 bgLayer) { - return param0->bgs[param1].xOffset; + return bgConfig->bgs[bgLayer].xOffset; } -u16 Bg_GetRotation(BgConfig *param0, u8 param1) +u16 Bg_GetRotation(BgConfig *bgConfig, u8 bgLayer) { - return param0->bgs[param1].rotation; + return bgConfig->bgs[bgLayer].rotation; } -u8 Bg_GetPriority(BgConfig *param0, u8 param1) +u8 Bg_GetPriority(BgConfig *bgConfig, u8 bgLayer) { - switch (param1) { - case 0: { - GXBg01Control v0 = G2_GetBG0Control(); - return (u8)v0.priority; + switch (bgLayer) { + case BG_LAYER_MAIN_0: { + GXBg01Control control = G2_GetBG0Control(); + return control.priority; } - case 1: { - GXBg01Control v1 = G2_GetBG1Control(); - return (u8)v1.priority; + + case BG_LAYER_MAIN_1: { + GXBg01Control control = G2_GetBG1Control(); + return control.priority; } - case 2: - switch (param0->bgs[param1].type) { + + case BG_LAYER_MAIN_2: + switch (bgConfig->bgs[bgLayer].type) { default: - case 0: { - GXBg23ControlText v2 = G2_GetBG2ControlText(); - return (u8)v2.priority; + case BG_TYPE_STATIC: { + GXBg23ControlText control = G2_GetBG2ControlText(); + return control.priority; } - case 1: { - GXBg23ControlAffine v3 = G2_GetBG2ControlAffine(); - return (u8)v3.priority; + case BG_TYPE_AFFINE: { + GXBg23ControlAffine control = G2_GetBG2ControlAffine(); + return control.priority; } - case 2: { - GXBg23Control256x16Pltt v4 = G2_GetBG2Control256x16Pltt(); - return (u8)v4.priority; + case BG_TYPE_STATIC_WITH_AFFINE: { + GXBg23Control256x16Pltt control = G2_GetBG2Control256x16Pltt(); + return control.priority; } } - case 3: - switch (param0->bgs[param1].type) { + case BG_LAYER_MAIN_3: + switch (bgConfig->bgs[bgLayer].type) { default: - case 0: { - GXBg23ControlText v5 = G2_GetBG3ControlText(); - return (u8)v5.priority; + case BG_TYPE_STATIC: { + GXBg23ControlText control = G2_GetBG3ControlText(); + return control.priority; } - case 1: { - GXBg23ControlAffine v6 = G2_GetBG3ControlAffine(); - return (u8)v6.priority; + case BG_TYPE_AFFINE: { + GXBg23ControlAffine control = G2_GetBG3ControlAffine(); + return control.priority; } - case 2: { - GXBg23Control256x16Pltt v7 = G2_GetBG3Control256x16Pltt(); - return (u8)v7.priority; + case BG_TYPE_STATIC_WITH_AFFINE: { + GXBg23Control256x16Pltt control = G2_GetBG3Control256x16Pltt(); + return control.priority; } } - case 4: { - GXBg01Control v8 = G2S_GetBG0Control(); - return (u8)v8.priority; + case BG_LAYER_SUB_0: { + GXBg01Control control = G2S_GetBG0Control(); + return control.priority; } - case 5: { - GXBg01Control v9 = G2S_GetBG1Control(); - return (u8)v9.priority; + + case BG_LAYER_SUB_1: { + GXBg01Control control = G2S_GetBG1Control(); + return control.priority; } - case 6: - switch (param0->bgs[param1].type) { + + case BG_LAYER_SUB_2: + switch (bgConfig->bgs[bgLayer].type) { default: - case 0: { - GXBg23ControlText v10 = G2S_GetBG2ControlText(); - return (u8)v10.priority; + case BG_TYPE_STATIC: { + GXBg23ControlText control = G2S_GetBG2ControlText(); + return control.priority; } - case 1: { - GXBg23ControlAffine v11 = G2S_GetBG2ControlAffine(); - return (u8)v11.priority; + case BG_TYPE_AFFINE: { + GXBg23ControlAffine control = G2S_GetBG2ControlAffine(); + return control.priority; } - case 2: { - GXBg23Control256x16Pltt v12 = G2S_GetBG2Control256x16Pltt(); - return (u8)v12.priority; + case BG_TYPE_STATIC_WITH_AFFINE: { + GXBg23Control256x16Pltt control = G2S_GetBG2Control256x16Pltt(); + return control.priority; } } - case 7: - switch (param0->bgs[param1].type) { + case BG_LAYER_SUB_3: + switch (bgConfig->bgs[bgLayer].type) { default: - case 0: { - GXBg23ControlText v13 = G2S_GetBG3ControlText(); - return (u8)v13.priority; + case BG_TYPE_STATIC: { + GXBg23ControlText control = G2S_GetBG3ControlText(); + return control.priority; } - case 1: { - GXBg23ControlAffine v14 = G2S_GetBG3ControlAffine(); - return (u8)v14.priority; + case BG_TYPE_AFFINE: { + GXBg23ControlAffine control = G2S_GetBG3ControlAffine(); + return control.priority; } - case 2: { - GXBg23Control256x16Pltt v15 = G2S_GetBG3Control256x16Pltt(); - return (u8)v15.priority; + case BG_TYPE_STATIC_WITH_AFFINE: { + GXBg23Control256x16Pltt control = G2S_GetBG3Control256x16Pltt(); + return control.priority; } } } @@ -2484,7 +2549,7 @@ void Window_CopyGlyph(Window *param0, const u8 *param1, u16 param2, u16 param3, return; } } else { - u8 *v6 = sub_02019FC0(param1, param2 * 4 * param3 * 8, param0->palette, param0->bgConfig->heapID); + u8 *v6 = Convert4bppTo8bpp(param1, param2 * 4 * param3 * 8, param0->palette, param0->bgConfig->heapID); switch (v5) { case 0: { @@ -3168,306 +3233,312 @@ void Window_SetPalette(Window *param0, u8 param1) param0->palette = param1; } -void Bg_RunScheduledUpdates(BgConfig *param0) +void Bg_RunScheduledUpdates(BgConfig *bgConfig) { - sub_0201C3D0(param0); - sub_0201C2D0(param0); + RunScheduledScrolls(bgConfig); + RunScheduledTilemapTransfers(bgConfig); - param0->scrollScheduled = 0; - param0->bufferTransferScheduled = 0; + bgConfig->scrollScheduled = FALSE; + bgConfig->bufferTransferScheduled = FALSE; } -static void sub_0201C2D0(BgConfig *param0) +static void RunScheduledTilemapTransfers(BgConfig *bgConfig) { - if ((param0->bufferTransferScheduled & 1) != 0) { - sub_020194E0(0, param0->bgs[0].tilemapBuffer, param0->bgs[0].baseTile * 0x2, param0->bgs[0].bufferSize); + if ((bgConfig->bufferTransferScheduled & (1 << BG_LAYER_MAIN_0)) != 0) { + LoadBgVRAMScr(BG_LAYER_MAIN_0, bgConfig->bgs[BG_LAYER_MAIN_0].tilemapBuffer, bgConfig->bgs[BG_LAYER_MAIN_0].baseTile * 0x2, bgConfig->bgs[BG_LAYER_MAIN_0].bufferSize); } - if ((param0->bufferTransferScheduled & 2) != 0) { - sub_020194E0(1, param0->bgs[1].tilemapBuffer, param0->bgs[1].baseTile * 0x2, param0->bgs[1].bufferSize); + if ((bgConfig->bufferTransferScheduled & (1 << BG_LAYER_MAIN_1)) != 0) { + LoadBgVRAMScr(BG_LAYER_MAIN_1, bgConfig->bgs[BG_LAYER_MAIN_1].tilemapBuffer, bgConfig->bgs[BG_LAYER_MAIN_1].baseTile * 0x2, bgConfig->bgs[BG_LAYER_MAIN_1].bufferSize); } - if ((param0->bufferTransferScheduled & 4) != 0) { - sub_020194E0(2, param0->bgs[2].tilemapBuffer, param0->bgs[2].baseTile * 0x2, param0->bgs[2].bufferSize); + if ((bgConfig->bufferTransferScheduled & (1 << BG_LAYER_MAIN_2)) != 0) { + LoadBgVRAMScr(BG_LAYER_MAIN_2, bgConfig->bgs[BG_LAYER_MAIN_2].tilemapBuffer, bgConfig->bgs[BG_LAYER_MAIN_2].baseTile * 0x2, bgConfig->bgs[BG_LAYER_MAIN_2].bufferSize); } - if ((param0->bufferTransferScheduled & 8) != 0) { - sub_020194E0(3, param0->bgs[3].tilemapBuffer, param0->bgs[3].baseTile * 0x2, param0->bgs[3].bufferSize); + if ((bgConfig->bufferTransferScheduled & (1 << BG_LAYER_MAIN_3)) != 0) { + LoadBgVRAMScr(BG_LAYER_MAIN_3, bgConfig->bgs[BG_LAYER_MAIN_3].tilemapBuffer, bgConfig->bgs[BG_LAYER_MAIN_3].baseTile * 0x2, bgConfig->bgs[BG_LAYER_MAIN_3].bufferSize); } - if ((param0->bufferTransferScheduled & 16) != 0) { - sub_020194E0(4, param0->bgs[4].tilemapBuffer, param0->bgs[4].baseTile * 0x2, param0->bgs[4].bufferSize); + if ((bgConfig->bufferTransferScheduled & (1 << BG_LAYER_SUB_0)) != 0) { + LoadBgVRAMScr(BG_LAYER_SUB_0, bgConfig->bgs[BG_LAYER_SUB_0].tilemapBuffer, bgConfig->bgs[BG_LAYER_SUB_0].baseTile * 0x2, bgConfig->bgs[BG_LAYER_SUB_0].bufferSize); } - if ((param0->bufferTransferScheduled & 32) != 0) { - sub_020194E0(5, param0->bgs[5].tilemapBuffer, param0->bgs[5].baseTile * 0x2, param0->bgs[5].bufferSize); + if ((bgConfig->bufferTransferScheduled & (1 << BG_LAYER_SUB_1)) != 0) { + LoadBgVRAMScr(BG_LAYER_SUB_1, bgConfig->bgs[BG_LAYER_SUB_1].tilemapBuffer, bgConfig->bgs[BG_LAYER_SUB_1].baseTile * 0x2, bgConfig->bgs[BG_LAYER_SUB_1].bufferSize); } - if ((param0->bufferTransferScheduled & 64) != 0) { - sub_020194E0(6, param0->bgs[6].tilemapBuffer, param0->bgs[6].baseTile * 0x2, param0->bgs[6].bufferSize); + if ((bgConfig->bufferTransferScheduled & (1 << BG_LAYER_SUB_2)) != 0) { + LoadBgVRAMScr(BG_LAYER_SUB_2, bgConfig->bgs[BG_LAYER_SUB_2].tilemapBuffer, bgConfig->bgs[BG_LAYER_SUB_2].baseTile * 0x2, bgConfig->bgs[BG_LAYER_SUB_2].bufferSize); } - if ((param0->bufferTransferScheduled & 128) != 0) { - sub_020194E0(7, param0->bgs[7].tilemapBuffer, param0->bgs[7].baseTile * 0x2, param0->bgs[7].bufferSize); + if ((bgConfig->bufferTransferScheduled & (1 << BG_LAYER_SUB_3)) != 0) { + LoadBgVRAMScr(BG_LAYER_SUB_3, bgConfig->bgs[BG_LAYER_SUB_3].tilemapBuffer, bgConfig->bgs[BG_LAYER_SUB_3].baseTile * 0x2, bgConfig->bgs[BG_LAYER_SUB_3].bufferSize); } } -void Bg_ScheduleTilemapTransfer(BgConfig *param0, u8 param1) +void Bg_ScheduleTilemapTransfer(BgConfig *bgConfig, u8 bgLayer) { - param0->bufferTransferScheduled |= (1 << param1); + bgConfig->bufferTransferScheduled |= (1 << bgLayer); } -static void sub_0201C3D0(BgConfig *param0) +static void RunScheduledScrolls(BgConfig *bgConfig) { - if ((param0->scrollScheduled & 1) != 0) { - G2_SetBG0Offset(param0->bgs[0].xOffset, param0->bgs[0].yOffset); + if ((bgConfig->scrollScheduled & (1 << BG_LAYER_MAIN_0)) != 0) { + G2_SetBG0Offset(bgConfig->bgs[BG_LAYER_MAIN_0].xOffset, bgConfig->bgs[BG_LAYER_MAIN_0].yOffset); } - if ((param0->scrollScheduled & 2) != 0) { - G2_SetBG1Offset(param0->bgs[1].xOffset, param0->bgs[1].yOffset); + if ((bgConfig->scrollScheduled & (1 << BG_LAYER_MAIN_1)) != 0) { + G2_SetBG1Offset(bgConfig->bgs[BG_LAYER_MAIN_1].xOffset, bgConfig->bgs[BG_LAYER_MAIN_1].yOffset); } - if ((param0->scrollScheduled & 4) != 0) { - if (param0->bgs[2].type == 0) { - G2_SetBG2Offset(param0->bgs[2].xOffset, param0->bgs[2].yOffset); + if ((bgConfig->scrollScheduled & (1 << BG_LAYER_MAIN_2)) != 0) { + if (bgConfig->bgs[BG_LAYER_MAIN_2].type == BG_TYPE_STATIC) { + G2_SetBG2Offset(bgConfig->bgs[BG_LAYER_MAIN_2].xOffset, bgConfig->bgs[BG_LAYER_MAIN_2].yOffset); } else { - MtxFx22 v0; - - sub_0201D470(&v0, param0->bgs[2].rotation, param0->bgs[2].xScale, param0->bgs[2].yScale, 2); - G2_SetBG2Affine(&v0, param0->bgs[2].xCenter, param0->bgs[2].yCenter, param0->bgs[2].xOffset, param0->bgs[2].yOffset); + MtxFx22 mtx; + sub_0201D470(&mtx, bgConfig->bgs[BG_LAYER_MAIN_2].rotation, bgConfig->bgs[BG_LAYER_MAIN_2].xScale, bgConfig->bgs[BG_LAYER_MAIN_2].yScale, 2); + G2_SetBG2Affine(&mtx, bgConfig->bgs[BG_LAYER_MAIN_2].xCenter, bgConfig->bgs[BG_LAYER_MAIN_2].yCenter, bgConfig->bgs[BG_LAYER_MAIN_2].xOffset, bgConfig->bgs[BG_LAYER_MAIN_2].yOffset); } } - if ((param0->scrollScheduled & 8) != 0) { - if (param0->bgs[3].type == 0) { - G2_SetBG3Offset(param0->bgs[3].xOffset, param0->bgs[3].yOffset); + if ((bgConfig->scrollScheduled & (1 << BG_LAYER_MAIN_3)) != 0) { + if (bgConfig->bgs[BG_LAYER_MAIN_3].type == BG_TYPE_STATIC) { + G2_SetBG3Offset(bgConfig->bgs[BG_LAYER_MAIN_3].xOffset, bgConfig->bgs[BG_LAYER_MAIN_3].yOffset); } else { - MtxFx22 v1; - - sub_0201D470(&v1, param0->bgs[3].rotation, param0->bgs[3].xScale, param0->bgs[3].yScale, 2); - G2_SetBG3Affine(&v1, param0->bgs[3].xCenter, param0->bgs[3].yCenter, param0->bgs[3].xOffset, param0->bgs[3].yOffset); + MtxFx22 mtx; + sub_0201D470(&mtx, bgConfig->bgs[BG_LAYER_MAIN_3].rotation, bgConfig->bgs[BG_LAYER_MAIN_3].xScale, bgConfig->bgs[BG_LAYER_MAIN_3].yScale, 2); + G2_SetBG3Affine(&mtx, bgConfig->bgs[BG_LAYER_MAIN_3].xCenter, bgConfig->bgs[BG_LAYER_MAIN_3].yCenter, bgConfig->bgs[BG_LAYER_MAIN_3].xOffset, bgConfig->bgs[BG_LAYER_MAIN_3].yOffset); } } - if ((param0->scrollScheduled & 16) != 0) { - G2S_SetBG0Offset(param0->bgs[4].xOffset, param0->bgs[4].yOffset); + if ((bgConfig->scrollScheduled & (1 << BG_LAYER_SUB_0)) != 0) { + G2S_SetBG0Offset(bgConfig->bgs[BG_LAYER_SUB_0].xOffset, bgConfig->bgs[BG_LAYER_SUB_0].yOffset); } - if ((param0->scrollScheduled & 32) != 0) { - G2S_SetBG1Offset(param0->bgs[5].xOffset, param0->bgs[5].yOffset); + if ((bgConfig->scrollScheduled & (1 << BG_LAYER_SUB_1)) != 0) { + G2S_SetBG1Offset(bgConfig->bgs[BG_LAYER_SUB_1].xOffset, bgConfig->bgs[BG_LAYER_SUB_1].yOffset); } - if ((param0->scrollScheduled & 64) != 0) { - if (param0->bgs[6].type == 0) { - G2S_SetBG2Offset(param0->bgs[6].xOffset, param0->bgs[6].yOffset); + if ((bgConfig->scrollScheduled & (1 << BG_LAYER_SUB_2)) != 0) { + if (bgConfig->bgs[BG_LAYER_SUB_2].type == BG_TYPE_STATIC) { + G2S_SetBG2Offset(bgConfig->bgs[BG_LAYER_SUB_2].xOffset, bgConfig->bgs[BG_LAYER_SUB_2].yOffset); } else { - MtxFx22 v2; - - sub_0201D470(&v2, param0->bgs[6].rotation, param0->bgs[6].xScale, param0->bgs[6].yScale, 2); - G2S_SetBG2Affine(&v2, param0->bgs[6].xCenter, param0->bgs[6].yCenter, param0->bgs[6].xOffset, param0->bgs[6].yOffset); + MtxFx22 mtx; + sub_0201D470(&mtx, bgConfig->bgs[BG_LAYER_SUB_2].rotation, bgConfig->bgs[BG_LAYER_SUB_2].xScale, bgConfig->bgs[BG_LAYER_SUB_2].yScale, 2); + G2S_SetBG2Affine(&mtx, bgConfig->bgs[BG_LAYER_SUB_2].xCenter, bgConfig->bgs[BG_LAYER_SUB_2].yCenter, bgConfig->bgs[BG_LAYER_SUB_2].xOffset, bgConfig->bgs[BG_LAYER_SUB_2].yOffset); } } - if ((param0->scrollScheduled & 128) != 0) { - if (param0->bgs[7].type == 0) { - G2S_SetBG3Offset(param0->bgs[7].xOffset, param0->bgs[7].yOffset); + if ((bgConfig->scrollScheduled & (1 << BG_LAYER_SUB_3)) != 0) { + if (bgConfig->bgs[BG_LAYER_SUB_3].type == BG_TYPE_STATIC) { + G2S_SetBG3Offset(bgConfig->bgs[BG_LAYER_SUB_3].xOffset, bgConfig->bgs[BG_LAYER_SUB_3].yOffset); } else { - MtxFx22 v3; - - sub_0201D470(&v3, param0->bgs[7].rotation, param0->bgs[7].xScale, param0->bgs[7].yScale, 2); - G2S_SetBG3Affine(&v3, param0->bgs[7].xCenter, param0->bgs[7].yCenter, param0->bgs[7].xOffset, param0->bgs[7].yOffset); + MtxFx22 mtx; + sub_0201D470(&mtx, bgConfig->bgs[BG_LAYER_SUB_3].rotation, bgConfig->bgs[BG_LAYER_SUB_3].xScale, bgConfig->bgs[BG_LAYER_SUB_3].yScale, 2); + G2S_SetBG3Affine(&mtx, bgConfig->bgs[BG_LAYER_SUB_3].xCenter, bgConfig->bgs[BG_LAYER_SUB_3].yCenter, bgConfig->bgs[BG_LAYER_SUB_3].xOffset, bgConfig->bgs[BG_LAYER_SUB_3].yOffset); } } } -void Bg_ScheduleScroll(BgConfig *param0, u8 param1, u8 param2, int param3) +void Bg_ScheduleScroll(BgConfig *bgConfig, u8 bgLayer, u8 bgUpdateOffsetOp, int val) { - sub_02019304(¶m0->bgs[param1], param2, param3); - param0->scrollScheduled |= (1 << param1); + UpdateBgOffsetWithVal(&bgConfig->bgs[bgLayer], bgUpdateOffsetOp, val); + bgConfig->scrollScheduled |= (1 << bgLayer); } -void Bg_ScheduleAffineRotation(BgConfig *param0, u8 param1, u8 param2, u16 param3) +void Bg_ScheduleAffineRotation(BgConfig *bgConfig, u8 bgLayer, u8 bgAffineUpdateOp, u16 val) { - sub_0201C684(¶m0->bgs[param1], param2, param3); - param0->scrollScheduled |= (1 << param1); + UpdateBgRotationWithVal(&bgConfig->bgs[bgLayer], bgAffineUpdateOp, val); + bgConfig->scrollScheduled |= (1 << bgLayer); } -static void sub_0201C684(Background *param0, u8 param1, u16 param2) +static void UpdateBgRotationWithVal(Background *bg, enum BgAffineUpdateOp op, u16 val) { - switch (param1) { - case 0: - param0->rotation = param2; + switch (op) { + case BG_AFFINE_UPDATE_SET_ROTATION: + bg->rotation = val; break; - case 1: - param0->rotation += param2; + + case BG_AFFINE_UPDATE_ADD_ROTATION: + bg->rotation += val; break; - case 2: - param0->rotation -= param2; + + case BG_AFFINE_UPDATE_SUB_ROTATION: + bg->rotation -= val; + break; + + default: break; } } -void Bg_ScheduleAffineScale(BgConfig *param0, u8 param1, u8 param2, fx32 param3) +void Bg_ScheduleAffineScale(BgConfig *bgConfig, u8 bgLayer, u8 bgAffineUpdateOp, fx32 val) { - sub_0201C6CC(¶m0->bgs[param1], param2, param3); - param0->scrollScheduled |= (1 << param1); + UpdateBgAffineScaleWithVal(&bgConfig->bgs[bgLayer], bgAffineUpdateOp, val); + bgConfig->scrollScheduled |= (1 << bgLayer); } -static void sub_0201C6CC(Background *param0, u8 param1, fx32 param2) +static void UpdateBgAffineScaleWithVal(Background *bg, enum BgAffineUpdateOp op, fx32 val) { - switch (param1) { - case 3: - param0->xScale = param2; + switch (op) { + case BG_AFFINE_UPDATE_SET_X_SCALE: + bg->xScale = val; break; - case 4: - param0->xScale += param2; + + case BG_AFFINE_UPDATE_ADD_X_SCALE: + bg->xScale += val; break; - case 5: - param0->xScale -= param2; + + case BG_AFFINE_UPDATE_SUB_X_SCALE: + bg->xScale -= val; break; - case 6: - param0->yScale = param2; + + case BG_AFFINE_UPDATE_SET_Y_SCALE: + bg->yScale = val; break; - case 7: - param0->yScale += param2; + + case BG_AFFINE_UPDATE_ADD_Y_SCALE: + bg->yScale += val; break; - case 8: - param0->yScale -= param2; + + case BG_AFFINE_UPDATE_SUB_Y_SCALE: + bg->yScale -= val; + break; + + default: break; } } -void Bg_ScheduleAffineRotationCenter(BgConfig *param0, u8 param1, u8 param2, int param3) +void Bg_ScheduleAffineRotationCenter(BgConfig *bgConfig, u8 bgLayer, u8 bgAffineUpdateOp, int val) { - sub_0201C73C(¶m0->bgs[param1], param2, param3); - param0->scrollScheduled |= (1 << param1); + UpdateBgAffineRotationCenterWithVal(&bgConfig->bgs[bgLayer], bgAffineUpdateOp, val); + bgConfig->scrollScheduled |= (1 << bgLayer); } -static void sub_0201C73C(Background *param0, u8 param1, int param2) +static void UpdateBgAffineRotationCenterWithVal(Background *bg, enum BgAffineUpdateOp op, int val) { - switch (param1) { - case 9: - param0->xCenter = param2; + switch (op) { + case BG_AFFINE_UPDATE_SET_X_CENTER: + bg->xCenter = val; break; - case 10: - param0->xCenter += param2; + + case BG_AFFINE_UPDATE_ADD_X_CENTER: + bg->xCenter += val; break; - case 11: - param0->xCenter -= param2; + + case BG_AFFINE_UPDATE_SUB_X_CENTER: + bg->xCenter -= val; break; - case 12: - param0->yCenter = param2; + + case BG_AFFINE_UPDATE_SET_Y_CENTER: + bg->yCenter = val; break; - case 13: - param0->yCenter += param2; + + case BG_AFFINE_UPDATE_ADD_Y_CENTER: + bg->yCenter += val; break; - case 14: - param0->yCenter -= param2; + + case BG_AFFINE_UPDATE_SUB_Y_CENTER: + bg->yCenter -= val; + break; + + default: break; } } -u8 Bg_DoesPixelAtXYMatchVal(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4) +u8 Bg_DoesPixelAtXYMatchVal(BgConfig *bgConfig, u8 bgLayer, u16 x, u16 y, u16 *src) { - u8 *v0; - u16 v1; - u8 v2, v3; - u8 v4; - u8 v5; + u8 *charPtr; + u16 tilemapIndex; + u8 xPixelOffset, yPixelOffset; + u8 pixelVal; + u8 i; - if (param0->bgs[param1].tilemapBuffer == NULL) { - return 0; + if (bgConfig->bgs[bgLayer].tilemapBuffer == NULL) { + return FALSE; } - v1 = sub_02019774((u8)(param2 >> 3), (u8)(param3 >> 3), param0->bgs[param1].screenSize); - v0 = (u8 *)Bg_GetCharPtr(param1); - v2 = (u8)(param2 & 7); - v3 = (u8)(param3 & 7); + tilemapIndex = CalcTilemapIndexFromCoords(x / 8, y / 8, bgConfig->bgs[bgLayer].screenSize); + charPtr = Bg_GetCharPtr(bgLayer); + xPixelOffset = x & 7; + yPixelOffset = y & 7; - if (param0->bgs[param1].colorMode == GX_BG_COLORMODE_16) { - u16 *v6; - u8 *v7; + if (bgConfig->bgs[bgLayer].colorMode == GX_BG_COLORMODE_16) { + u16 *tilemapBuffer = bgConfig->bgs[bgLayer].tilemapBuffer; + u8 *tile = Heap_AllocFromHeapAtEnd(bgConfig->heapID, 64); - v6 = (u16 *)param0->bgs[param1].tilemapBuffer; - v7 = Heap_AllocFromHeapAtEnd(param0->heapID, 64); + charPtr += (tilemapBuffer[tilemapIndex] & 0x3FF) * TILE_SIZE_4BPP; - v0 += ((v6[v1] & 0x3ff) << 5); - - for (v5 = 0; v5 < 32; v5++) { - v7[(v5 << 1)] = v0[v5] & 0xf; - v7[(v5 << 1) + 1] = v0[v5] >> 4; + for (i = 0; i < TILE_SIZE_4BPP; i++) { + tile[i * 2] = charPtr[i] & 0xF; + tile[i * 2 + 1] = charPtr[i] >> 4; } - sub_0201C8E0(param0, (u8)((v6[v1] >> 10) & 3), v7); - v4 = v7[v2 + (v3 << 3)]; - Heap_FreeToHeap(v7); + ApplyFlipFlagsToTile(bgConfig, (tilemapBuffer[tilemapIndex] >> 10) & 3, tile); + pixelVal = tile[xPixelOffset + yPixelOffset * 8]; + Heap_FreeToHeap(tile); - if ((param4[0] & (1 << v4)) != 0) { - return 1; + if ((*src & (1 << pixelVal)) != 0) { + return TRUE; } } else { - if (param0->bgs[param1].type != 1) { - u16 *v8; - u8 *v9; + if (bgConfig->bgs[bgLayer].type != BG_TYPE_AFFINE) { + u16 *tilemapBuffer = bgConfig->bgs[bgLayer].tilemapBuffer; + u8 *tile = Heap_AllocFromHeapAtEnd(bgConfig->heapID, 64); - v8 = (u16 *)param0->bgs[param1].tilemapBuffer; - v9 = Heap_AllocFromHeapAtEnd(param0->heapID, 64); + memcpy(tile, &charPtr[(tilemapBuffer[tilemapIndex] & 0x3FF) * TILE_SIZE_8BPP], 64); + ApplyFlipFlagsToTile(bgConfig, (tilemapBuffer[tilemapIndex] >> 10) & 3, tile); - memcpy(v9, &v0[(v8[v1] & 0x3ff) << 6], 64); - sub_0201C8E0(param0, (u8)((v8[v1] >> 10) & 3), v9); - - v4 = v9[v2 + (v3 << 3)]; - Heap_FreeToHeap(v9); + pixelVal = tile[xPixelOffset + yPixelOffset * 8]; + Heap_FreeToHeap(tile); } else { - u8 *v10 = (u8 *)param0->bgs[param1].tilemapBuffer; - - v4 = v0[(v10[v1] << 6) + v2 + (v3 << 3)]; + u8 *tilemapBuffer = bgConfig->bgs[bgLayer].tilemapBuffer; + pixelVal = charPtr[tilemapBuffer[tilemapIndex] * TILE_SIZE_8BPP + xPixelOffset + yPixelOffset * 8]; } - v5 = 0; - + // BUG: Infinite loop while (TRUE) { - if (param4[v5] == 0xffff) { + if (*src == 0xFFFF) { break; } - if ((u8)param4[v5] == v4) { - return 1; + if (pixelVal == (u8)*src) { + return TRUE; } } } - return 0; + return FALSE; } -static void sub_0201C8E0(BgConfig *param0, u8 param1, u8 *param2) +static void ApplyFlipFlagsToTile(BgConfig *bgConfig, u8 flags, u8 *tile) { - u8 *v0; - u8 v1, v2; - - if (param1 == 0) { + if (flags == 0) { return; } - v0 = Heap_AllocFromHeapAtEnd(param0->heapID, 64); + u8 *buf = Heap_AllocFromHeapAtEnd(bgConfig->heapID, 64); - if (param1 & 1) { - for (v1 = 0; v1 < 8; v1++) { - for (v2 = 0; v2 < 8; v2++) { - v0[v1 * 8 + v2] = param2[v1 * 8 + (7 - v2)]; + if (flags & 1) { + for (u8 i = 0; i < 8; i++) { + for (u8 j = 0; j < 8; j++) { + buf[i * 8 + j] = tile[i * 8 + (7 - j)]; } } - memcpy(param2, v0, 64); + memcpy(tile, buf, 64); } - if (param1 & 2) { - for (v1 = 0; v1 < 8; v1++) { - memcpy(&v0[v1 * 8], ¶m2[(7 - v1) * 8], 8); + if (flags & 2) { + for (u8 i = 0; i < 8; i++) { + memcpy(&buf[i * 8], &tile[(7 - i) * 8], 8); } - memcpy(param2, v0, 64); + memcpy(tile, buf, 64); } - Heap_FreeToHeap(v0); + Heap_FreeToHeap(buf); } diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index 88558678d1..0881f0e928 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -667,10 +667,10 @@ static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID) app->messageWindow = Window_New(heapID, 1); Window_Init(app->messageWindow); - Window_Add(app->bgl, app->messageWindow, BGL_FRAME_MAIN_1, TEXT_POS_X, TEXT_POS_Y, TEXT_COLUMNS, TEXT_ROWS, FRAME_PALETTE_INDEX, TEXT_WINDOW_SIZE + 1); + Window_Add(app->bgl, app->messageWindow, BG_LAYER_MAIN_1, TEXT_POS_X, TEXT_POS_Y, TEXT_COLUMNS, TEXT_ROWS, FRAME_PALETTE_INDEX, TEXT_WINDOW_SIZE + 1); Window_FillTilemap(app->messageWindow, 15); - sub_0200DD0C(app->bgl, BGL_FRAME_MAIN_1, FRAME_TEXT_START, FRAME_TEXT_PALETTE_INDEX, app->messageFrame, heapID); + sub_0200DD0C(app->bgl, BG_LAYER_MAIN_1, FRAME_TEXT_START, FRAME_TEXT_PALETTE_INDEX, app->messageFrame, heapID); sub_02006E84(NARC_INDEX_GRAPHIC__EV_POKESELECT, 16, 0, FRAME_PALETTE_INDEX * 32, 32, heapID); sub_0200E060(app->messageWindow, 0, FRAME_TEXT_START, FRAME_TEXT_PALETTE_INDEX); } diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index 6e47ee9be4..3a906e8db4 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -1021,7 +1021,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) GX_BG0_AS_3D, }; - SetScreenGraphicsModes(&v0, 1); + SetScreenGraphicsModes(&v0, DS_SCREEN_SUB); } { diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index d9ac3eba79..e73de5c602 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -642,7 +642,7 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0) GX_BG0_AS_3D, }; - SetScreenGraphicsModes(&v0, 1); + SetScreenGraphicsModes(&v0, DS_SCREEN_SUB); } { From bc6966faf45d503c513a70c144f48f0dbf57a177 Mon Sep 17 00:00:00 2001 From: Rachel Date: Mon, 21 Oct 2024 10:18:58 -0700 Subject: [PATCH 11/13] Clean up + document Bitmap functions in bg_window.c --- include/bg_window.h | 8 +-- src/bg_window.c | 172 +++++++++++++++++++++----------------------- 2 files changed, 86 insertions(+), 94 deletions(-) diff --git a/include/bg_window.h b/include/bg_window.h index 1eb3faa079..cfcbb3ae15 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -211,10 +211,10 @@ void Bg_ScheduleAffineScale(BgConfig *bgConfig, u8 bgLayer, u8 bgAffineUpdateOp, void Bg_ScheduleAffineRotationCenter(BgConfig *bgConfig, u8 bgLayer, u8 bgAffineUpdateOp, int val); u8 Bg_DoesPixelAtXYMatchVal(BgConfig *bgConfig, u8 bgLayer, u16 x, u16 y, u16 *src); -void Bitmap_BlitRect4bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); -void Bitmap_BlitRect8bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); -void Bitmap_FillRect4bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); -void Bitmap_FillRect8bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); +void Bitmap_BlitRect4bpp(const Bitmap *src, const Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u16 transparent); +void Bitmap_BlitRect8bpp(const Bitmap *src, const Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u16 transparent); +void Bitmap_FillRect4bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 height, u8 fillVal); +void Bitmap_FillRect8bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 height, u8 fillVal); Window *Window_New(u32 param0, u8 param1); void Window_Init(Window *param0); diff --git a/src/bg_window.c b/src/bg_window.c index 210d109bf1..e2af00335b 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -1442,154 +1442,146 @@ u8 Bg_GetPriority(BgConfig *bgConfig, u8 bgLayer) return 0; } -void Bitmap_BlitRect4bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) +#define CalcPixelAddressFromBlit4bpp(ptr, x, y, width) ((u8 *)((ptr) + (((x) >> 1) & 3) + (((x) << 2) & 0x3FE0) + ((((y) << 2) & 0x3FE0) * (width)) + (((u32)(((y) << 2) & 0x1C))))) +#define CalcPixelAddressFromBlit8bpp(ptr, x, y, width) ((u8 *)((ptr) + ((x) & 7) + (((x) << 3) & 0x7FC0) + ((((y) << 3) & 0x7FC0) * (width)) + (((u32)(((y) << 3) & 0x38))))) +#define ConvertPixelsToTiles(x) (((x) + ((x) & 7)) >> 3) + +void Bitmap_BlitRect4bpp(const Bitmap *src, const Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u16 transparent) { - int v0, v1, v2, v3, v4, v5, v6, v7, v8, v9; - u8 *v10, *v11; + int loopSrcX, loopDestX, loopSrcY, loopDestY, toOrr, shift, xEnd, yEnd, multiplierSrcY, multiplierDestY; + u8 *srcPixels, *destPixels; - if (((param1->width) - (param4)) < (param6)) { - v6 = (param1->width) - (param4) + (param2); + if (dest->width - destX < width) { + xEnd = dest->width - destX + srcX; } else { - v6 = (param6) + (param2); + xEnd = width + srcX; } - if (((param1->height) - (param5)) < (param7)) { - v7 = (param1->height) - (param5) + (param3); + if (dest->height - destY < height) { + yEnd = dest->height - destY + srcY; } else { - v7 = (param7) + (param3); + yEnd = height + srcY; } - v8 = (((param0->width) + ((param0->width) & 7)) >> 3); - v9 = (((param1->width) + ((param1->width) & 7)) >> 3); + multiplierSrcY = ConvertPixelsToTiles(src->width); + multiplierDestY = ConvertPixelsToTiles(dest->width); - if (param8 == 0xffff) { - for (v2 = (param3), v3 = (param5); v2 < v7; v2++, v3++) { - for (v0 = (param2), v1 = (param4); v0 < v6; v0++, v1++) { - v10 = (u8 *)((param0->pixels) + ((v0 >> 1) & 0x3) + ((v0 << 2) & 0x3fe0) + (((v2 << 2) & 0x3fe0) * v8) + ((u32)((v2 << 2) & 0x1c))); - v11 = (u8 *)((param1->pixels) + ((v1 >> 1) & 0x3) + ((v1 << 2) & 0x3fe0) + (((v3 << 2) & 0x3fe0) * v9) + ((u32)((v3 << 2) & 0x1c))); + if (transparent == 0xFFFF) { + for (loopSrcY = srcY, loopDestY = destY; loopSrcY < yEnd; loopSrcY++, loopDestY++) { + for (loopSrcX = srcX, loopDestX = destX; loopSrcX < xEnd; loopSrcX++, loopDestX++) { + srcPixels = CalcPixelAddressFromBlit4bpp(src->pixels, loopSrcX, loopSrcY, multiplierSrcY); + destPixels = CalcPixelAddressFromBlit4bpp(dest->pixels, loopDestX, loopDestY, multiplierDestY); - v4 = (*v10 >> ((v0 & 1) * 4)) & 0xf; - v5 = (v1 & 1) * 4; - *v11 = (u8)((v4 << v5) | (*v11 & (0xf0 >> v5))); + toOrr = (*srcPixels >> ((loopSrcX & 1) * 4)) & 0xF; + shift = (loopDestX & 1) * 4; + *destPixels = ((toOrr << shift) | (*destPixels & (0xF0 >> shift))); } } } else { - for (v2 = (param3), v3 = (param5); v2 < v7; v2++, v3++) { - for (v0 = (param2), v1 = (param4); v0 < v6; v0++, v1++) { - v10 = (u8 *)((param0->pixels) + ((v0 >> 1) & 0x3) + ((v0 << 2) & 0x3fe0) + (((v2 << 2) & 0x3fe0) * v8) + ((u32)((v2 << 2) & 0x1c))); - v11 = (u8 *)((param1->pixels) + ((v1 >> 1) & 0x3) + ((v1 << 2) & 0x3fe0) + (((v3 << 2) & 0x3fe0) * v9) + ((u32)((v3 << 2) & 0x1c))); + for (loopSrcY = srcY, loopDestY = destY; loopSrcY < yEnd; loopSrcY++, loopDestY++) { + for (loopSrcX = srcX, loopDestX = destX; loopSrcX < xEnd; loopSrcX++, loopDestX++) { + srcPixels = CalcPixelAddressFromBlit4bpp(src->pixels, loopSrcX, loopSrcY, multiplierSrcY); + destPixels = CalcPixelAddressFromBlit4bpp(dest->pixels, loopDestX, loopDestY, multiplierDestY); - v4 = (*v10 >> ((v0 & 1) * 4)) & 0xf; - - if (v4 != (param8)) { - v5 = (v1 & 1) * 4; - *v11 = (u8)((v4 << v5) | (*v11 & (0xf0 >> v5))); + toOrr = (*srcPixels >> ((loopSrcX & 1) * 4)) & 0xF; + if (toOrr != transparent) { + shift = (loopDestX & 1) * 4; + *destPixels = ((toOrr << shift) | (*destPixels & (0xF0 >> shift))); } } } } } -void Bitmap_BlitRect8bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) +void Bitmap_BlitRect8bpp(const Bitmap *src, const Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u16 transparent) { - int v0, v1, v2, v3, v4, v5, v6, v7; - u8 *v8; - u8 *v9; + int loopSrcX, loopDestX, loopSrcY, loopDestY, xEnd, yEnd, multiplierSrcY, multiplierDestY; + u8 *srcPixels, *destPixels; - if (((param1->width) - (param4)) < (param6)) { - v4 = (param1->width) - (param4) + (param2); + if (dest->width - destX < width) { + xEnd = dest->width - destX + srcX; } else { - v4 = (param6) + (param2); + xEnd = width + srcX; } - if (((param1->height) - (param5)) < (param7)) { - v5 = (param1->height) - (param5) + (param3); + if (dest->height - destY < height) { + yEnd = dest->height - destY + srcY; } else { - v5 = (param7) + (param3); + yEnd = height + srcY; } - v6 = (((param0->width) + ((param0->width) & 7)) >> 3); - v7 = (((param1->width) + ((param1->width) & 7)) >> 3); + multiplierSrcY = ConvertPixelsToTiles(src->width); + multiplierDestY = ConvertPixelsToTiles(dest->width); - if (param8 == 0xffff) { - for (v2 = (param3), v3 = (param5); v2 < v5; v2++, v3++) { - for (v0 = (param2), v1 = (param4); v0 < v4; v0++, v1++) { - v8 = (u8 *)((param0->pixels) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v2 << 3) & 0x7fc0) * v6) + ((u32)((v2 << 3) & 0x38))); - v9 = (u8 *)((param1->pixels) + (v1 & 0x7) + ((v1 << 3) & 0x7fc0) + (((v3 << 3) & 0x7fc0) * v7) + ((u32)((v3 << 3) & 0x38))); - *v9 = *v8; + if (transparent == 0xffff) { + for (loopSrcY = srcY, loopDestY = destY; loopSrcY < yEnd; loopSrcY++, loopDestY++) { + for (loopSrcX = srcX, loopDestX = destX; loopSrcX < xEnd; loopSrcX++, loopDestX++) { + srcPixels = CalcPixelAddressFromBlit8bpp(src->pixels, loopSrcX, loopSrcY, multiplierSrcY); + destPixels = CalcPixelAddressFromBlit8bpp(dest->pixels, loopDestX, loopDestY, multiplierDestY); + *destPixels = *srcPixels; } } } else { - for (v2 = (param3), v3 = (param5); v2 < v5; v2++, v3++) { - for (v0 = (param2), v1 = (param4); v0 < v4; v0++, v1++) { - v8 = (u8 *)((param0->pixels) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v2 << 3) & 0x7fc0) * v6) + ((u32)((v2 << 3) & 0x38))); - v9 = (u8 *)((param1->pixels) + (v1 & 0x7) + ((v1 << 3) & 0x7fc0) + (((v3 << 3) & 0x7fc0) * v7) + ((u32)((v3 << 3) & 0x38))); + for (loopSrcY = srcY, loopDestY = destY; loopSrcY < yEnd; loopSrcY++, loopDestY++) { + for (loopSrcX = srcX, loopDestX = destX; loopSrcX < xEnd; loopSrcX++, loopDestX++) { + srcPixels = CalcPixelAddressFromBlit8bpp(src->pixels, loopSrcX, loopSrcY, multiplierSrcY); + destPixels = CalcPixelAddressFromBlit8bpp(dest->pixels, loopDestX, loopDestY, multiplierDestY); - if (*v8 != (param8)) { - *v9 = *v8; + if (*srcPixels != transparent) { + *destPixels = *srcPixels; } } } } } -void Bitmap_FillRect4bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) +void Bitmap_FillRect4bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 height, u8 fillVal) { - int v0, v1, v2, v3, v4; - u8 *v5; - - v2 = param1 + param3; - - if (v2 > param0->width) { - v2 = param0->width; + int xEnd = x + width; + if (xEnd > bitmap->width) { + xEnd = bitmap->width; } - v3 = param2 + param4; - - if (v3 > param0->height) { - v3 = param0->height; + int yEnd = y + height; + if (yEnd > bitmap->height) { + yEnd = bitmap->height; } - v4 = (((param0->width) + (param0->width & 7)) >> 3); + int blitWidth = ConvertPixelsToTiles(bitmap->width); - for (v1 = param2; v1 < v3; v1++) { - for (v0 = param1; v0 < v2; v0++) { - v5 = (u8 *)((param0->pixels) + ((v0 >> 1) & 0x3) + ((v0 << 2) & 0x3fe0) + (((v1 << 2) & 0x3fe0) * v4) + ((u32)((v1 << 2) & 0x1c))); + for (int i = y; i < yEnd; i++) { + for (int j = x; j < xEnd; j++) { + u8 *pixels = CalcPixelAddressFromBlit4bpp(bitmap->pixels, j, i, blitWidth); - if (v0 & 1) { - *v5 &= 0xf; - *v5 |= (param5 << 4); + if (j & 1) { + *pixels &= 0xF; + *pixels |= (fillVal << 4); } else { - *v5 &= 0xf0; - *v5 |= param5; + *pixels &= 0xF0; + *pixels |= fillVal; } } } } -void Bitmap_FillRect8bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) +void Bitmap_FillRect8bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 height, u8 fillVal) { - int v0, v1, v2, v3, v4; - u8 *v5; - - v2 = param1 + param3; - - if (v2 > param0->width) { - v2 = param0->width; + int xEnd = x + width; + if (xEnd > bitmap->width) { + xEnd = bitmap->width; } - v3 = param2 + param4; - - if (v3 > param0->height) { - v3 = param0->height; + int yEnd = y + height; + if (yEnd > bitmap->height) { + yEnd = bitmap->height; } - v4 = (param0->width + (param0->width & 7)) >> 3; + int blitWidth = ConvertPixelsToTiles(bitmap->width); - for (v1 = param2; v1 < v3; v1++) { - for (v0 = param1; v0 < v2; v0++) { - v5 = (u8 *)((param0->pixels) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v1 << 3) & 0x7fc0) * v4) + ((u32)((v1 << 3) & 0x38))); - *v5 = param5; + for (int i = y; i < yEnd; i++) { + for (int j = x; j < xEnd; j++) { + u8 *pixels = CalcPixelAddressFromBlit8bpp(bitmap->pixels, j, i, blitWidth); + *pixels = fillVal; } } } From a9cbdb6a0404dcae39c0baa7b8427a1f6a149c09 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 20 Oct 2024 23:36:08 -0700 Subject: [PATCH 12/13] Clean up + document Window functions in bg_window.c --- include/bg_window.h | 87 +- src/bg_window.c | 1945 +++++++---------------- src/choose_starter/choose_starter_app.c | 6 +- 3 files changed, 607 insertions(+), 1431 deletions(-) diff --git a/include/bg_window.h b/include/bg_window.h index cfcbb3ae15..6ef1e3eb84 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -13,15 +13,6 @@ #define TILEMAP_FILL_VAL_KEEP_PALETTE 16 // do not replace the selected palette index #define TILEMAP_FILL_VAL_INCLUDES_PALETTE 17 -enum BGLScreenSize { - SCREEN_SIZE_128x128 = 0, - SCREEN_SIZE_256x256, - SCREEN_SIZE_256x512, - SCREEN_SIZE_512x256, - SCREEN_SIZE_512x512, - SCREEN_SIZE_1024x1024, -}; - enum DSScreen { DS_SCREEN_MAIN = 0, DS_SCREEN_SUB, @@ -36,6 +27,8 @@ enum BgLayer { BG_LAYER_SUB_1, BG_LAYER_SUB_2, BG_LAYER_SUB_3, + + BG_LAYER_MAX, }; enum BgType { @@ -87,6 +80,18 @@ enum BgScreenSize { BG_SCREEN_SIZE_1024x1024, }; +enum BgColorMode { + BG_COLOR_MODE_4BPP = 0, + BG_COLOR_MODE_8BPP, +}; + +enum ScrollDirection { + SCROLL_DIRECTION_UP = 0, + SCROLL_DIRECTION_DOWN, + SCROLL_DIRECTION_LEFT, + SCROLL_DIRECTION_RIGHT, +}; + typedef struct Bitmap { const u8 *pixels; u16 width; @@ -216,37 +221,37 @@ void Bitmap_BlitRect8bpp(const Bitmap *src, const Bitmap *dest, u16 srcX, u16 sr void Bitmap_FillRect4bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 height, u8 fillVal); void Bitmap_FillRect8bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 height, u8 fillVal); -Window *Window_New(u32 param0, u8 param1); -void Window_Init(Window *param0); -u8 Window_IsInUse(Window *param0); -void Window_Add(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8); -void Window_AddToTopLeftCorner(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5); -void Window_AddFromTemplate(BgConfig *param0, Window *param1, const WindowTemplate *param2); -void Window_Remove(Window *param0); -void Windows_Delete(Window *param0, u8 param1); -void Window_CopyToVRAM(Window *param0); -void Window_ScheduleCopyToVRAM(Window *param0); -void Window_PutToTilemap(Window *param0); -void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2); -void Window_ClearTilemap(Window *param0); -void Window_LoadTiles(Window *param0); -void Window_ClearAndCopyToVRAM(Window *param0); -void Window_ClearAndScheduleCopyToVRAM(Window *param0); -void Window_FillTilemap(Window *param0, u8 param1); -void Window_BlitBitmapRect(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9); -void Window_BlitBitmapRectWithTransparency(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10); -void Window_FillRectWithColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5); -void Window_CopyGlyph(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6); -void Window_Scroll(Window *param0, u8 param1, u8 param2, u8 param3); -BgConfig *Window_GetBgConfig(Window *param0); -u8 Window_GetBgLayer(Window *param0); -u8 Window_GetWidth(Window *param0); -u8 Window_GetHeight(Window *param0); -u8 Window_GetXPos(Window *param0); -u8 Window_GetYPos(Window *param0); -u16 Window_GetBaseTile(Window *param0); -void Window_SetXPos(Window *param0, u8 param1); -void Window_SetYPos(Window *param0, u8 param1); -void Window_SetPalette(Window *param0, u8 param1); +Window *Window_New(u32 heapID, u8 numWindows); +void Window_Init(Window *window); +u8 Window_IsInUse(Window *window); +void Window_Add(BgConfig *bgConfig, Window *window, u8 bgLayer, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palette, u16 baseTile); +void Window_AddToTopLeftCorner(BgConfig *bgConfig, Window *window, u8 width, u8 height, u16 baseTile, u8 fillVal); +void Window_AddFromTemplate(BgConfig *bgConfig, Window *window, const WindowTemplate *template); +void Window_Remove(Window *window); +void Windows_Delete(Window *window, u8 numWindows); +void Window_CopyToVRAM(Window *window); +void Window_ScheduleCopyToVRAM(Window *window); +void Window_PutToTilemap(Window *window); +void Window_PutRectToTilemap(Window *window, u32 width, u32 height); +void Window_ClearTilemap(Window *window); +void Window_LoadTiles(Window *window); +void Window_ClearAndCopyToVRAM(Window *window); +void Window_ClearAndScheduleCopyToVRAM(Window *window); +void Window_FillTilemap(Window *window, u8 val); +void Window_BlitBitmapRect(Window *window, void *src, u16 srcX, u16 srcY, u16 srcWidth, u16 srcHeight, u16 destX, u16 destY, u16 destWidth, u16 destHeight); +void Window_BlitBitmapRectWithTransparency(Window *window, void *src, u16 srcX, u16 srcY, u16 srcWidth, u16 srcHeight, u16 destX, u16 destY, u16 destWidth, u16 destHeight, u16 transparent); +void Window_FillRectWithColor(Window *window, u8 color, u16 x, u16 y, u16 width, u16 height); +void Window_CopyGlyph(Window *window, const u8 *glyphPixels, u16 srcWidth, u16 srcHeight, u16 destX, u16 destY, u16 table); +void Window_Scroll(Window *window, u8 direction, u8 distance, u8 fillVal); +BgConfig *Window_GetBgConfig(Window *window); +u8 Window_GetBgLayer(Window *window); +u8 Window_GetWidth(Window *window); +u8 Window_GetHeight(Window *window); +u8 Window_GetXPos(Window *window); +u8 Window_GetYPos(Window *window); +u16 Window_GetBaseTile(Window *window); +void Window_SetXPos(Window *window, u8 x); +void Window_SetYPos(Window *window, u8 y); +void Window_SetPalette(Window *window, u8 palette); #endif // POKEPLATINUM_BG_WINDOW_H diff --git a/src/bg_window.c b/src/bg_window.c index e2af00335b..a89c90e195 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -3,16 +3,10 @@ #include #include -#include "bg_window.h" #include "gx_layers.h" #include "heap.h" #include "unk_0201D15C.h" -enum { - UnkEnum_00 = 0, - UnkEnum_01 = 1, -}; - static u8 ConvertToGxBgScreenSize(u8 bgScreenSize, u8 bgType); static void GetBgScreenTileDimensions(u8 bgScreenSize, u8 *outXTiles, u8 *outYTiles); static void UpdateBgOffsetWithVal(Background *bg, enum BgOffsetUpdateOp op, int val); @@ -27,21 +21,21 @@ static void FillBgTilemapRectText(Background *bg, u16 fillVal, u8 x, u8 y, u8 wi static void FillBgTilemapRectAffine(Background *bg, u8 fillVal, u8 x, u8 y, u8 width, u8 height); static void Copy4bppTo8bpp(const u8 *src, u32 size, u8 *dest, u8 palette); static void *Convert4bppTo8bpp(const u8 *src, u32 size, u8 palette, u32 heapID); -static void sub_0201AC20(Window *param0); -static void sub_0201AC4C(Window *param0); -static void sub_0201AC64(Window *param0); -static void sub_0201ACA0(Window *param0); -static void sub_0201AD2C(Window *param0); -static void sub_0201AD54(Window *param0); -static void sub_0201AD68(Window *param0); -static void sub_0201AD90(Window *param0); -static void sub_0201C06C(Window *param0, u8 param1, u8 param2, u8 param3); -static void sub_0201C158(Window *param0, u8 param1, u8 param2, u8 param3); +static void CopyWindowToVramText(Window *window); +static void ScheduleCopyWindowToVramText(Window *window); +static void CopyWindowToVramAffine(Window *window); +static void ScheduleCopyWindowToVramAffine(Window *window); +static void ClearAndCopyWindowToVramText(Window *window); +static void ClearAndScheduleCopyWindowToVramText(Window *window); +static void ClearAndCopyWindowToVramAffine(Window *window); +static void ClearAndScheduleCopyWindowToVramAffine(Window *window); +static void ScrollWindow4bpp(Window *window, u8 direction, u8 distance, u8 fillVal); +static void ScrollWindow8bpp(Window *window, u8 direction, u8 distance, u8 fillVal); static void ApplyFlipFlagsToTile(BgConfig *bgConfig, u8 flags, u8 *tile); -static void sub_0201AA58(Window *param0); -static void sub_0201AADC(Window *param0); -static void sub_0201AB38(Window *param0); -static void sub_0201ABC8(Window *param0); +static void PutWindowToTilemapText(Window *window); +static void PutWindowToTilemapAffine(Window *window); +static void ClearWindowTilemapText(Window *window); +static void ClearWindowTilemapAffine(Window *window); static void UpdateBgRotationWithVal(Background *bg, enum BgAffineUpdateOp op, u16 val); static void UpdateBgAffineScaleWithVal(Background *bg, enum BgAffineUpdateOp op, fx32 val); static void UpdateBgAffineRotationCenterWithVal(Background *bg, enum BgAffineUpdateOp op, int val); @@ -1586,1643 +1580,820 @@ void Bitmap_FillRect8bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 heig } } -Window *Window_New(u32 param0, u8 param1) +Window *Window_New(u32 heapID, u8 winCount) { - Window *v0; - u16 v1; + Window *windows = (Window *)Heap_AllocFromHeap(heapID, sizeof(Window) * winCount); - v0 = (Window *)Heap_AllocFromHeap(param0, sizeof(Window) * param1); - - for (v1 = 0; v1 < param1; v1++) { - Window_Init(&v0[v1]); + for (u16 i = 0; i < winCount; i++) { + Window_Init(&windows[i]); } - return v0; + return windows; } -void Window_Init(Window *param0) +void Window_Init(Window *window) { - param0->bgConfig = NULL; - param0->bgLayer = 0xff; - param0->tilemapLeft = 0; - param0->tilemapTop = 0; - param0->width = 0; - param0->height = 0; - param0->palette = 0; - param0->baseTile = 0; - param0->pixels = NULL; - param0->colorMode = UnkEnum_00; + window->bgConfig = NULL; + window->bgLayer = 0xFF; + window->tilemapLeft = 0; + window->tilemapTop = 0; + window->width = 0; + window->height = 0; + window->palette = 0; + window->baseTile = 0; + window->pixels = NULL; + window->colorMode = BG_COLOR_MODE_4BPP; } -u8 Window_IsInUse(Window *param0) +u8 Window_IsInUse(Window *window) { - if ((param0->bgConfig == NULL) || (param0->bgLayer == 0xff) || (param0->pixels == NULL)) { - return 0; + if (window->bgConfig == NULL || window->bgLayer == 0xFF || window->pixels == NULL) { + return FALSE; } - return 1; + return TRUE; } -void Window_Add(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8) +void Window_Add(BgConfig *bgConfig, Window *window, u8 bgLayer, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palette, u16 baseTile) { - void *v0; - u32 v1; - - if (param0->bgs[param2].tilemapBuffer == NULL) { + if (bgConfig->bgs[bgLayer].tilemapBuffer == NULL) { return; } - v1 = param5 * param6 * param0->bgs[param2].tileSize; - v0 = Heap_AllocFromHeap(param0->heapID, v1); + u32 size = width * height * bgConfig->bgs[bgLayer].tileSize; + void *pixels = Heap_AllocFromHeap(bgConfig->heapID, size); - if (v0 == NULL) { + if (pixels == NULL) { return; } - param1->bgConfig = param0; - param1->bgLayer = param2; - param1->tilemapLeft = param3; - param1->tilemapTop = param4; - param1->width = param5; - param1->height = param6; - param1->palette = param7; - param1->baseTile = param8; - param1->pixels = v0; - param1->colorMode = (param0->bgs[param2].colorMode == GX_BG_COLORMODE_16) ? UnkEnum_00 : UnkEnum_01; + window->bgConfig = bgConfig; + window->bgLayer = bgLayer; + window->tilemapLeft = tilemapLeft; + window->tilemapTop = tilemapTop; + window->width = width; + window->height = height; + window->palette = palette; + window->baseTile = baseTile; + window->pixels = pixels; + window->colorMode = (bgConfig->bgs[bgLayer].colorMode == GX_BG_COLORMODE_16) ? BG_COLOR_MODE_4BPP : BG_COLOR_MODE_8BPP; } -void Window_AddToTopLeftCorner(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5) +void Window_AddToTopLeftCorner(BgConfig *bgConfig, Window *window, u8 width, u8 height, u16 baseTile, u8 fillVal) { - void *v0; - u32 v1; + u32 size = width * height * TILE_SIZE_4BPP; + void *pixels = Heap_AllocFromHeap(bgConfig->heapID, size); - v1 = (u32)(param2 * param3 * 0x20); - v0 = Heap_AllocFromHeap(param0->heapID, v1); + fillVal |= fillVal << 4; + memset(pixels, fillVal, size); - param5 |= param5 << 4; - memset(v0, param5, v1); - - if (v0 == NULL) { + if (pixels == NULL) { return; } - param1->bgConfig = param0; - param1->width = param2; - param1->height = param3; - param1->baseTile = param4; - param1->pixels = v0; - param1->colorMode = UnkEnum_00; + window->bgConfig = bgConfig; + window->width = width; + window->height = height; + window->baseTile = baseTile; + window->pixels = pixels; + window->colorMode = BG_COLOR_MODE_4BPP; } -void Window_AddFromTemplate(BgConfig *param0, Window *param1, const WindowTemplate *param2) +void Window_AddFromTemplate(BgConfig *bgConfig, Window *window, const WindowTemplate *template) { - Window_Add( - param0, param1, param2->bgLayer, param2->tilemapLeft, param2->tilemapTop, param2->width, param2->height, param2->palette, param2->baseTile); + Window_Add(bgConfig, + window, + template->bgLayer, + template->tilemapLeft, + template->tilemapTop, + template->width, + template->height, + template->palette, + template->baseTile); } -void Window_Remove(Window *param0) +void Window_Remove(Window *window) { - Heap_FreeToHeap(param0->pixels); + Heap_FreeToHeap(window->pixels); - param0->bgConfig = NULL; - param0->bgLayer = 0xff; - param0->tilemapLeft = 0; - param0->tilemapTop = 0; - param0->width = 0; - param0->height = 0; - param0->palette = 0; - param0->baseTile = 0; - param0->pixels = NULL; + window->bgConfig = NULL; + window->bgLayer = 0xFF; + window->tilemapLeft = 0; + window->tilemapTop = 0; + window->width = 0; + window->height = 0; + window->palette = 0; + window->baseTile = 0; + window->pixels = NULL; } -void Windows_Delete(Window *param0, u8 param1) +void Windows_Delete(Window *window, u8 winCount) { - u16 v0; - - for (v0 = 0; v0 < param1; v0++) { - if (param0[v0].pixels == NULL) { - continue; + for (u16 i = 0; i < winCount; i++) { + if (window[i].pixels != NULL) { + Heap_FreeToHeap(window[i].pixels); } - - Heap_FreeToHeap(param0[v0].pixels); } - Heap_FreeToHeap(param0); + Heap_FreeToHeap(window); } -static void (*const Unk_020E56CC[])(Window *) = { - sub_0201AC20, - sub_0201AC64, - sub_0201AC20 +typedef void (*WindowFunc)(Window *); + +static const WindowFunc sCopyWindowToVramFuncs[] = { + [BG_TYPE_STATIC] = CopyWindowToVramText, + [BG_TYPE_AFFINE] = CopyWindowToVramAffine, + [BG_TYPE_STATIC_WITH_AFFINE] = CopyWindowToVramText, }; -static void (*const Unk_020E56C0[])(Window *) = { - sub_0201AC4C, - sub_0201ACA0, - sub_0201AC4C +static const WindowFunc sScheduleCopyWindowToVramFuncs[] = { + [BG_TYPE_STATIC] = ScheduleCopyWindowToVramText, + [BG_TYPE_AFFINE] = ScheduleCopyWindowToVramAffine, + [BG_TYPE_STATIC_WITH_AFFINE] = ScheduleCopyWindowToVramText, }; -static void (*const Unk_020E56B4[])(Window *) = { - sub_0201AD2C, - sub_0201AD68, - sub_0201AD2C +static const WindowFunc sClearAndCopyWindowToVramFuncs[] = { + [BG_TYPE_STATIC] = ClearAndCopyWindowToVramText, + [BG_TYPE_AFFINE] = ClearAndCopyWindowToVramAffine, + [BG_TYPE_STATIC_WITH_AFFINE] = ClearAndCopyWindowToVramText, }; -static void (*const Unk_020E56A8[])(Window *) = { - sub_0201AD54, - sub_0201AD90, - sub_0201AD54 +static const WindowFunc sClearAndScheduleCopyWindowToVramFuncs[] = { + [BG_TYPE_STATIC] = ClearAndScheduleCopyWindowToVramText, + [BG_TYPE_AFFINE] = ClearAndScheduleCopyWindowToVramAffine, + [BG_TYPE_STATIC_WITH_AFFINE] = ClearAndScheduleCopyWindowToVramText, }; -static void (*const Unk_020E569C[])(Window *) = { - sub_0201AA58, - sub_0201AADC, - sub_0201AA58 +static const WindowFunc sPutWindowToTilemapFuncs[] = { + [BG_TYPE_STATIC] = PutWindowToTilemapText, + [BG_TYPE_AFFINE] = PutWindowToTilemapAffine, + [BG_TYPE_STATIC_WITH_AFFINE] = PutWindowToTilemapText, }; -static void (*const Unk_020E56D8[])(Window *) = { - sub_0201AB38, - sub_0201ABC8, - sub_0201AB38 +static const WindowFunc sClearWindowTilemapFuncs[] = { + [BG_TYPE_STATIC] = ClearWindowTilemapText, + [BG_TYPE_AFFINE] = ClearWindowTilemapAffine, + [BG_TYPE_STATIC_WITH_AFFINE] = ClearWindowTilemapText, }; -static const u8 Unk_020E5694[] = { - 0x10, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20 +static const u8 sScreenSizeToTilemapWidth[] = { + [BG_SCREEN_SIZE_128x128] = 0x10, + [BG_SCREEN_SIZE_256x256] = 0x20, + [BG_SCREEN_SIZE_256x512] = 0x20, + [BG_SCREEN_SIZE_512x256] = 0x20, + [BG_SCREEN_SIZE_512x512] = 0x20, + [BG_SCREEN_SIZE_1024x1024] = 0x20, }; -void Window_CopyToVRAM(Window *param0) +void Window_CopyToVRAM(Window *window) { - GF_ASSERT(param0 != NULL); - GF_ASSERT(param0->bgConfig != NULL); - GF_ASSERT(param0->bgLayer < 8); - GF_ASSERT(param0->bgConfig->bgs[param0->bgLayer].type < NELEMS(Unk_020E56CC)); + GF_ASSERT(window != NULL); + GF_ASSERT(window->bgConfig != NULL); + GF_ASSERT(window->bgLayer < BG_LAYER_MAX); + GF_ASSERT(window->bgConfig->bgs[window->bgLayer].type < NELEMS(sCopyWindowToVramFuncs)); - Unk_020E56CC[param0->bgConfig->bgs[param0->bgLayer].type](param0); + sCopyWindowToVramFuncs[window->bgConfig->bgs[window->bgLayer].type](window); } -void Window_ScheduleCopyToVRAM(Window *param0) +void Window_ScheduleCopyToVRAM(Window *window) { - GF_ASSERT(param0 != NULL); - GF_ASSERT(param0->bgConfig != NULL); - GF_ASSERT(param0->bgLayer < 8); - GF_ASSERT(param0->bgConfig->bgs[param0->bgLayer].type < NELEMS(Unk_020E56C0)); + GF_ASSERT(window != NULL); + GF_ASSERT(window->bgConfig != NULL); + GF_ASSERT(window->bgLayer < BG_LAYER_MAX); + GF_ASSERT(window->bgConfig->bgs[window->bgLayer].type < NELEMS(sScheduleCopyWindowToVramFuncs)); - Unk_020E56C0[param0->bgConfig->bgs[param0->bgLayer].type](param0); + sScheduleCopyWindowToVramFuncs[window->bgConfig->bgs[window->bgLayer].type](window); } -void Window_PutToTilemap(Window *param0) +void Window_PutToTilemap(Window *window) { - Unk_020E569C[param0->bgConfig->bgs[param0->bgLayer].type](param0); + sPutWindowToTilemapFuncs[window->bgConfig->bgs[window->bgLayer].type](window); } -void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2) +void Window_PutRectToTilemap(Window *window, u32 width, u32 height) { - u32 v0, v1; + u32 oldWidth = window->width; + u32 oldHeight = window->height; - v0 = param0->width; - v1 = param0->height; + window->width = width; + window->height = height; - param0->width = param1; - param0->height = param2; + sPutWindowToTilemapFuncs[window->bgConfig->bgs[window->bgLayer].type](window); - Unk_020E569C[param0->bgConfig->bgs[param0->bgLayer].type](param0); - - param0->width = v0; - param0->height = v1; + window->width = oldWidth; + window->height = oldHeight; } -void Window_ClearTilemap(Window *param0) +void Window_ClearTilemap(Window *window) { - Unk_020E56D8[param0->bgConfig->bgs[param0->bgLayer].type](param0); + sClearWindowTilemapFuncs[window->bgConfig->bgs[window->bgLayer].type](window); } -static void sub_0201AA58(Window *param0) +static void PutWindowToTilemapText(Window *window) { - if (param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) { - u32 v0, v1, v2, v3, v4, v5, v6; - u16 *v7; + u32 x, y, tilemapRight, tilemapBottom, tile, idx, tilemapWidth; + u16 *tilemap = window->bgConfig->bgs[window->bgLayer].tilemapBuffer; - v6 = 32; - v7 = (u16 *)(param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer); - v4 = param0->baseTile; - v2 = param0->tilemapLeft + param0->width; - v3 = param0->tilemapTop + param0->height; + if (tilemap == NULL) { + return; + } - for (v1 = param0->tilemapTop; v1 < v3; v1++) { - for (v0 = param0->tilemapLeft; v0 < v2; v0++) { - v5 = ((v1 & 0x20) * 32) + ((v0 & 0x20) * 32) + ((v1 & 0x1f) * v6) + (v0 & 0x1f); - v7[v5] = v4 | (param0->palette << 12); - v4++; - } + tilemapWidth = 32; // required to match + tile = window->baseTile; + tilemapRight = window->tilemapLeft + window->width; + tilemapBottom = window->tilemapTop + window->height; + + for (y = window->tilemapTop; y < tilemapBottom; y++) { + for (x = window->tilemapLeft; x < tilemapRight; x++) { + idx = ((y & 0x20) * 32) + ((x & 0x20) * 32) + ((y & 0x1F) * tilemapWidth) + (x & 0x1F); + tilemap[idx] = tile | (window->palette << 12); + tile++; } } } -static void sub_0201AADC(Window *param0) +static void PutWindowToTilemapAffine(Window *window) { - if (param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) { - int v0, v1, v2, v3; - u8 *v4; + if (window->bgConfig->bgs[window->bgLayer].tilemapBuffer == NULL) { + return; + } - v3 = Unk_020E5694[param0->bgConfig->bgs[param0->bgLayer].screenSize]; - v4 = (u8 *)(param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) + param0->tilemapTop * v3 + param0->tilemapLeft; - v2 = param0->baseTile; + int x, y, tile, tilemapWidth; + u8 *tilemap; - for (v1 = 0; v1 < param0->height; v1++) { - for (v0 = 0; v0 < param0->width; v0++) { - v4[v0] = v2++; - } + tilemapWidth = sScreenSizeToTilemapWidth[window->bgConfig->bgs[window->bgLayer].screenSize]; + tilemap = (u8 *)(window->bgConfig->bgs[window->bgLayer].tilemapBuffer) + window->tilemapTop * tilemapWidth + window->tilemapLeft; + tile = window->baseTile; - v4 += v3; + for (y = 0; y < window->height; y++) { + for (x = 0; x < window->width; x++) { + tilemap[x] = tile++; + } + + tilemap += tilemapWidth; + } +} + +static void ClearWindowTilemapText(Window *window) +{ + if (window->bgConfig->bgs[window->bgLayer].tilemapBuffer == NULL) { + return; + } + + u32 x, y, tilemapRight, tilemapBottom, idx, tilemapWidth; + u16 *tilemap; + + tilemapWidth = sScreenSizeToTilemapWidth[window->bgConfig->bgs[window->bgLayer].screenSize]; + tilemap = window->bgConfig->bgs[window->bgLayer].tilemapBuffer; + tilemapRight = window->tilemapLeft + window->width; + tilemapBottom = window->tilemapTop + window->height; + + for (y = window->tilemapTop; y < tilemapBottom; y++) { + for (x = window->tilemapLeft; x < tilemapRight; x++) { + idx = ((y & 0x20) * 32) + ((x & 0x20) * 32) + ((y & 0x1F) * tilemapWidth) + (x & 0x1F); + tilemap[idx] = 0; } } } -static void sub_0201AB38(Window *param0) +static void ClearWindowTilemapAffine(Window *window) { - if (param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) { - u32 v0, v1, v2, v3, v4, v5; - u16 *v6; + if (window->bgConfig->bgs[window->bgLayer].tilemapBuffer == NULL) { + return; + } - v5 = Unk_020E5694[param0->bgConfig->bgs[param0->bgLayer].screenSize]; - v6 = (u16 *)(param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer); - v2 = param0->tilemapLeft + param0->width; - v3 = param0->tilemapTop + param0->height; + int x, y, tilemapWidth; + u8 *tilemap; - for (v1 = param0->tilemapTop; v1 < v3; v1++) { - for (v0 = param0->tilemapLeft; v0 < v2; v0++) { - v4 = ((v1 & 0x20) * 32) + ((v0 & 0x20) * 32) + ((v1 & 0x1f) * v5) + (v0 & 0x1f); - v6[v4] = 0x0; - } + tilemapWidth = sScreenSizeToTilemapWidth[window->bgConfig->bgs[window->bgLayer].screenSize]; + tilemap = (u8 *)(window->bgConfig->bgs[window->bgLayer].tilemapBuffer) + window->tilemapTop * tilemapWidth + window->tilemapLeft; + + for (y = 0; y < window->height; y++) { + for (x = 0; x < window->width; x++) { + tilemap[x] = 0; } + + tilemap += tilemapWidth; } } -static void sub_0201ABC8(Window *param0) +static void CopyWindowToVramText(Window *window) { - if (param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) { - int v0, v1, v2; - u8 *v3; - - v2 = Unk_020E5694[param0->bgConfig->bgs[param0->bgLayer].screenSize]; - v3 = (u8 *)(param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer) + param0->tilemapTop * v2 + param0->tilemapLeft; - - for (v1 = 0; v1 < param0->height; v1++) { - for (v0 = 0; v0 < param0->width; v0++) { - v3[v0] = 0; - } - - v3 += v2; - } - } + PutWindowToTilemapText(window); + Window_LoadTiles(window); + Bg_CopyTilemapBufferRangeToVRAM(window->bgConfig, + window->bgLayer, + window->bgConfig->bgs[window->bgLayer].tilemapBuffer, + window->bgConfig->bgs[window->bgLayer].bufferSize, + window->bgConfig->bgs[window->bgLayer].baseTile); } -static void sub_0201AC20(Window *param0) +static void ScheduleCopyWindowToVramText(Window *window) { - sub_0201AA58(param0); - Window_LoadTiles(param0); - Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); + PutWindowToTilemapText(window); + Bg_ScheduleTilemapTransfer(window->bgConfig, window->bgLayer); + Window_LoadTiles(window); } -static void sub_0201AC4C(Window *param0) +static void CopyWindowToVramAffine(Window *window) { - sub_0201AA58(param0); - Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer); - Window_LoadTiles(param0); + PutWindowToTilemapAffine(window); + + Bg_CopyTilemapBufferRangeToVRAM(window->bgConfig, + window->bgLayer, + window->bgConfig->bgs[window->bgLayer].tilemapBuffer, + window->bgConfig->bgs[window->bgLayer].bufferSize, + window->bgConfig->bgs[window->bgLayer].baseTile); + Bg_LoadTiles(window->bgConfig, + window->bgLayer, + window->pixels, + window->width * window->height * 0x40, + window->baseTile); } -static void sub_0201AC64(Window *param0) +static void ScheduleCopyWindowToVramAffine(Window *window) { - sub_0201AADC(param0); + PutWindowToTilemapAffine(window); - Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); - Bg_LoadTiles(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile); + Bg_ScheduleTilemapTransfer(window->bgConfig, window->bgLayer); + Bg_LoadTiles(window->bgConfig, + window->bgLayer, + window->pixels, + window->width * window->height * 0x40, + window->baseTile); } -static void sub_0201ACA0(Window *param0) +void Window_LoadTiles(Window *window) { - sub_0201AADC(param0); - - Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer); - Bg_LoadTiles(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile); + u32 size = window->width * window->height * window->bgConfig->bgs[window->bgLayer].tileSize; + Bg_LoadTiles(window->bgConfig, window->bgLayer, window->pixels, size, window->baseTile); } -void Window_LoadTiles(Window *param0) +void Window_ClearAndCopyToVRAM(Window *window) { - u32 v0 = param0->width * param0->height * param0->bgConfig->bgs[param0->bgLayer].tileSize; - Bg_LoadTiles(param0->bgConfig, param0->bgLayer, param0->pixels, v0, param0->baseTile); + sClearAndCopyWindowToVramFuncs[window->bgConfig->bgs[window->bgLayer].type](window); } -void Window_ClearAndCopyToVRAM(Window *param0) +void Window_ClearAndScheduleCopyToVRAM(Window *window) { - Unk_020E56B4[param0->bgConfig->bgs[param0->bgLayer].type](param0); + sClearAndScheduleCopyWindowToVramFuncs[window->bgConfig->bgs[window->bgLayer].type](window); } -void Window_ClearAndScheduleCopyToVRAM(Window *param0) +static void ClearAndCopyWindowToVramText(Window *window) { - Unk_020E56A8[param0->bgConfig->bgs[param0->bgLayer].type](param0); + ClearWindowTilemapText(window); + Bg_CopyTilemapBufferRangeToVRAM(window->bgConfig, + window->bgLayer, + window->bgConfig->bgs[window->bgLayer].tilemapBuffer, + window->bgConfig->bgs[window->bgLayer].bufferSize, + window->bgConfig->bgs[window->bgLayer].baseTile); } -static void sub_0201AD2C(Window *param0) +static void ClearAndScheduleCopyWindowToVramText(Window *window) { - sub_0201AB38(param0); - Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); + ClearWindowTilemapText(window); + Bg_ScheduleTilemapTransfer(window->bgConfig, window->bgLayer); } -static void sub_0201AD54(Window *param0) +static void ClearAndCopyWindowToVramAffine(Window *window) { - sub_0201AB38(param0); - Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer); + ClearWindowTilemapAffine(window); + Bg_CopyTilemapBufferRangeToVRAM(window->bgConfig, + window->bgLayer, + window->bgConfig->bgs[window->bgLayer].tilemapBuffer, + window->bgConfig->bgs[window->bgLayer].bufferSize, + window->bgConfig->bgs[window->bgLayer].baseTile); } -static void sub_0201AD68(Window *param0) +static void ClearAndScheduleCopyWindowToVramAffine(Window *window) { - sub_0201ABC8(param0); - Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile); + ClearWindowTilemapAffine(window); + Bg_ScheduleTilemapTransfer(window->bgConfig, window->bgLayer); } -static void sub_0201AD90(Window *param0) +void Window_FillTilemap(Window *window, u8 val) { - sub_0201ABC8(param0); - Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer); -} - -void Window_FillTilemap(Window *param0, u8 param1) -{ - u32 v0; - u32 v1; - - if (param0->bgConfig->bgs[param0->bgLayer].tileSize == 0x20) { - param1 = (param1 << 4) | param1; + if (window->bgConfig->bgs[window->bgLayer].tileSize == TILE_SIZE_4BPP) { + val = (val << 4) | val; } - v1 = (param1 << 24) | (param1 << 16) | (param1 << 8) | param1; - v0 = param0->bgConfig->bgs[param0->bgLayer].tileSize * param0->width * param0->height; + u32 fill = (val << 24) | (val << 16) | (val << 8) | val; + u32 size = window->bgConfig->bgs[window->bgLayer].tileSize * window->width * window->height; - MI_CpuFillFast(param0->pixels, v1, v0); + MI_CpuFillFast(window->pixels, fill, size); } -void Window_BlitBitmapRect(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9) +void Window_BlitBitmapRect(Window *window, void *src, u16 srcX, u16 srcY, u16 srcWidth, u16 srcHeight, u16 destX, u16 destY, u16 destWidth, u16 destHeight) { - Window_BlitBitmapRectWithTransparency(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9, 0); + Window_BlitBitmapRectWithTransparency(window, src, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, 0); } -void Window_BlitBitmapRectWithTransparency(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10) +void Window_BlitBitmapRectWithTransparency(Window *window, void *src, u16 srcX, u16 srcY, u16 srcWidth, u16 srcHeight, u16 destX, u16 destY, u16 destWidth, u16 destHeight, u16 transparent) { - Bitmap v0; - Bitmap v1; + Bitmap bmpSrc, bmpDest; - v0.pixels = (u8 *)param1; - v0.width = param4; - v0.height = param5; - v1.pixels = (u8 *)param0->pixels; - v1.width = (u16)(param0->width * 0x8); - v1.height = (u16)(param0->height * 0x8); + bmpSrc.pixels = src; + bmpSrc.width = srcWidth; + bmpSrc.height = srcHeight; - if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) { - Bitmap_BlitRect4bpp(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); + bmpDest.pixels = window->pixels; + bmpDest.width = window->width * 8; + bmpDest.height = window->height * 8; + + if (window->bgConfig->bgs[window->bgLayer].colorMode == GX_BG_COLORMODE_16) { + Bitmap_BlitRect4bpp(&bmpSrc, &bmpDest, srcX, srcY, destX, destY, destWidth, destHeight, transparent); } else { - Bitmap_BlitRect8bpp(&v0, &v1, param2, param3, param6, param7, param8, param9, param10); + Bitmap_BlitRect8bpp(&bmpSrc, &bmpDest, srcX, srcY, destX, destY, destWidth, destHeight, transparent); } } -void Window_FillRectWithColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5) +void Window_FillRectWithColor(Window *window, u8 color, u16 x, u16 y, u16 width, u16 height) { - Bitmap v0; + Bitmap bmp; - v0.pixels = (u8 *)param0->pixels; - v0.width = (u16)(param0->width * 0x8); - v0.height = (u16)(param0->height * 0x8); + bmp.pixels = window->pixels; + bmp.width = window->width * 8; + bmp.height = window->height * 8; - if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) { - Bitmap_FillRect4bpp((const Bitmap *)&v0, param2, param3, param4, param5, param1); + if (window->bgConfig->bgs[window->bgLayer].colorMode == GX_BG_COLORMODE_16) { + Bitmap_FillRect4bpp((const Bitmap *)&bmp, x, y, width, height, color); } else { - Bitmap_FillRect8bpp((const Bitmap *)&v0, param2, param3, param4, param5, param1); + Bitmap_FillRect8bpp((const Bitmap *)&bmp, x, y, width, height, color); } } -void Window_CopyGlyph(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6) +#define CopyGlyph4bpp(glyphPixels, srcX, srcY, srcWidth, srcHeight, windowPixels, destX, destY, destWidth, table) \ + { \ + int srcJ, destJ, srcI, destI, bits; \ + u8 toOrr; \ + u8 tableFlag; \ + u8 tableBit; \ + u8 *dest; \ + const u8 *src; \ + u32 pixelData; \ + \ + src = glyphPixels + (srcY / 8 * 64) + (srcX / 8 * 32); \ + if (srcY == 0) { \ + destI = destY + srcY; \ + tableBit = table & 0xFF; \ + } else { \ + destI = destY + srcY; \ + for (srcI = 0; srcI < 8; srcI++) { \ + if (((table >> srcI) & 1) != 0) { \ + destI++; \ + } \ + } \ + tableBit = table >> 8; \ + } \ + for (srcI = 0; srcI < srcHeight; srcI++) { \ + pixelData = *(u32 *)src; \ + tableFlag = (tableBit >> srcI) & 1; \ + for (srcJ = 0, destJ = destX + srcX; srcJ < srcWidth; srcJ++, destJ++) { \ + dest = CalcPixelAddressFromBlit4bpp(windowPixels, destJ, destI, destWidth); \ + toOrr = (pixelData >> (srcJ * 4)) & 0xF; \ + if (toOrr != 0) { \ + bits = (destJ & 1) * 4; \ + toOrr = (toOrr << bits) | (*dest & (0xF0 >> bits)); \ + *dest = toOrr; \ + if (tableFlag) { \ + dest = CalcPixelAddressFromBlit4bpp(windowPixels, destJ, destI + 1, destWidth); \ + *dest = toOrr; \ + } \ + } \ + } \ + if (tableFlag) { \ + destI += 2; \ + } else { \ + destI += 1; \ + } \ + src += 4; \ + } \ + } + +#define CopyGlyph8bpp(glyphPixels, srcX, srcY, srcWidth, srcHeight, windowPixels, destX, destY, destWidth, table) \ + { \ + int srcJ, destJ, srcI, destI; \ + u8 toOrr; \ + u8 tableFlag; \ + u8 tableBit; \ + u8 *dest; \ + const u8 *src; \ + u8 *pixelData; \ + \ + src = glyphPixels + (srcY / 8 * 128) + (srcX / 8 * 64); \ + if (srcY == 0) { \ + destI = destY + srcY; \ + tableBit = table & 0xFF; \ + } else { \ + destI = destY + srcY; \ + for (srcI = 0; srcI < 8; srcI++) { \ + if (((table >> srcI) & 1) != 0) { \ + destI++; \ + } \ + } \ + tableBit = table >> 8; \ + } \ + for (srcI = 0; srcI < srcHeight; srcI++) { \ + pixelData = (u8 *)src; \ + tableFlag = (tableBit >> srcI) & 1; \ + for (srcJ = 0, destJ = destX + srcX; srcJ < srcWidth; srcJ++, destJ++) { \ + dest = CalcPixelAddressFromBlit8bpp(windowPixels, destJ, destI, destWidth); \ + toOrr = pixelData[srcJ]; \ + if (toOrr != 0) { \ + *dest = toOrr; \ + if (tableFlag) { \ + dest = CalcPixelAddressFromBlit8bpp(windowPixels, destJ, destI + 1, destWidth); \ + *dest = toOrr; \ + } \ + } \ + } \ + if (tableFlag) { \ + destI += 2; \ + } else { \ + destI += 1; \ + } \ + src += 8; \ + } \ + } + +void Window_CopyGlyph(Window *window, const u8 *glyphPixels, u16 srcWidth, u16 srcHeight, u16 destX, u16 destY, u16 table) { - u8 *v0; - u16 v1, v2; - int v3, v4; - u8 v5; + u8 *windowPixels; + u16 destWidth, destHeight; + int srcRight, srcBottom; + u8 glyphSizeParam; - v0 = (u8 *)param0->pixels; - v1 = (u16)(param0->width * 0x8); - v2 = (u16)(param0->height * 0x8); + windowPixels = window->pixels; + destWidth = window->width * 8; + destHeight = window->height * 8; - if (((v1) - (param4)) < (param2)) { - v3 = (v1) - (param4); + if (destWidth - destX < srcWidth) { + srcRight = destWidth - destX; } else { - v3 = (param2); + srcRight = srcWidth; } - - if (((v2) - (param5)) < (param3)) { - v4 = (v2) - (param5); + if (destHeight - destY < srcHeight) { + srcBottom = destHeight - destY; } else { - v4 = (param3); + srcBottom = srcHeight; } - v5 = 0; - - if (v3 > 8) { - v5 |= 1; + glyphSizeParam = 0; + if (srcRight > 8) { + glyphSizeParam |= 1; + } + if (srcBottom > 8) { + glyphSizeParam |= 2; } - if (v4 > 8) { - v5 |= 2; - } - - if (param0->colorMode == UnkEnum_00) { - switch (v5) { - case 0: { - int v7, v8, v9, v10, v17; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u32 v16; - - v15 = (param1) + (0 / 8 * 0x40) + (0 / 8 * 0x20); - - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4; v9++) { - v16 = *(u32 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); - v11 = (u8)((v16 >> (v7 * 4)) & 0xf); - - if (v11 != 0) { - v17 = (v8 & 1) * 4; - v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 4; - } - }; + if (window->colorMode == BG_COLOR_MODE_4BPP) { + switch (glyphSizeParam) { + case 0: // 1x1 + CopyGlyph4bpp(glyphPixels, 0, 0, srcRight, srcBottom, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); return; - case 1: { - int v7, v8, v9, v10, v17; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u32 v16; - v15 = (param1) + (0 / 8 * 0x40) + (0 / 8 * 0x20); - - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4; v9++) { - v16 = *(u32 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); - v11 = (u8)((v16 >> (v7 * 4)) & 0xf); - - if (v11 != 0) { - v17 = (v8 & 1) * 4; - v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 4; - } - }; - { - int v7, v8, v9, v10, v17; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u32 v16; - - v15 = (param1) + (0 / 8 * 0x40) + (8 / 8 * 0x20); - - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4; v9++) { - v16 = *(u32 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); - v11 = (u8)((v16 >> (v7 * 4)) & 0xf); - - if (v11 != 0) { - v17 = (v8 & 1) * 4; - v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 4; - } - } + case 1: // 2x1 + CopyGlyph4bpp(glyphPixels, 0, 0, 8, srcBottom, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); + CopyGlyph4bpp(glyphPixels, 8, 0, srcRight - 8, srcBottom, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); return; - case 2: { - int v7, v8, v9, v10, v17; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u32 v16; - v15 = (param1) + (0 / 8 * 0x40) + (0 / 8 * 0x20); - - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < 8; v9++) { - v16 = *(u32 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); - v11 = (u8)((v16 >> (v7 * 4)) & 0xf); - - if (v11 != 0) { - v17 = (v8 & 1) * 4; - v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 4; - } - }; - { - int v7, v8, v9, v10, v17; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u32 v16; - v15 = (param1) + (8 / 8 * 0x40) + (0 / 8 * 0x20); - - if (8 == 0) { - v10 = (param5) + 8; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 8; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = *(u32 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); - v11 = (u8)((v16 >> (v7 * 4)) & 0xf); - - if (v11 != 0) { - v17 = (v8 & 1) * 4; - v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 4; - } - } + case 2: // 1x2 + CopyGlyph4bpp(glyphPixels, 0, 0, srcRight, 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); + CopyGlyph4bpp(glyphPixels, 0, 8, srcRight, srcBottom - 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); return; - case 3: { - int v7, v8, v9, v10, v17; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u32 v16; - v15 = (param1) + (0 / 8 * 0x40) + (0 / 8 * 0x20); - - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < 8; v9++) { - v16 = *(u32 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); - v11 = (u8)((v16 >> (v7 * 4)) & 0xf); - - if (v11 != 0) { - v17 = (v8 & 1) * 4; - v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 4; - } - }; - { - int v7, v8, v9, v10, v17; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u32 v16; - - v15 = (param1) + (0 / 8 * 0x40) + (8 / 8 * 0x20); - - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < 8; v9++) { - v16 = *(u32 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); - v11 = (u8)((v16 >> (v7 * 4)) & 0xf); - - if (v11 != 0) { - v17 = (v8 & 1) * 4; - v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 4; - } - } - { - int v7, v8, v9, v10, v17; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u32 v16; - - v15 = (param1) + (8 / 8 * 0x40) + (0 / 8 * 0x20); - - if (8 == 0) { - v10 = (param5) + 8; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 8; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = *(u32 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); - v11 = (u8)((v16 >> (v7 * 4)) & 0xf); - - if (v11 != 0) { - v17 = (v8 & 1) * 4; - v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 4; - } - } - { - int v7, v8, v9, v10, v17; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u32 v16; - - v15 = (param1) + (8 / 8 * 0x40) + (8 / 8 * 0x20); - - if (8 == 0) { - v10 = (param5) + 8; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 8; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = *(u32 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); - v11 = (u8)((v16 >> (v7 * 4)) & 0xf); - - if (v11 != 0) { - v17 = (v8 & 1) * 4; - v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 4; - } - } + case 3: // 2x2 + CopyGlyph4bpp(glyphPixels, 0, 0, 8, 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); + CopyGlyph4bpp(glyphPixels, 8, 0, srcRight - 8, 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); + CopyGlyph4bpp(glyphPixels, 0, 8, 8, srcBottom - 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); + CopyGlyph4bpp(glyphPixels, 8, 8, srcRight - 8, srcBottom - 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); return; } } else { - u8 *v6 = Convert4bppTo8bpp(param1, param2 * 4 * param3 * 8, param0->palette, param0->bgConfig->heapID); - - switch (v5) { - case 0: { - int v7, v8, v9, v10; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u8 *v16; - - v15 = (v6) + (0 / 8 * 0x80) + (0 / 8 * 0x40); - - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4; v9++) { - v16 = (u8 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); - v11 = v16[v7]; - - if (v11 != 0) { - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 8; - } - }; + u8 *convertedSrc = Convert4bppTo8bpp(glyphPixels, srcWidth * 4 * srcHeight * 8, window->palette, window->bgConfig->heapID); + switch (glyphSizeParam) { + case 0: // 1x1 + CopyGlyph8bpp(convertedSrc, 0, 0, srcRight, srcBottom, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); break; - case 1: { - int v7, v8, v9, v10; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u8 *v16; - v15 = (v6) + (0 / 8 * 0x80) + (0 / 8 * 0x40); - - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4; v9++) { - v16 = (u8 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); - v11 = v16[v7]; - - if (v11 != 0) { - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 8; - } - }; - { - int v7, v8, v9, v10; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u8 *v16; - - v15 = (v6) + (0 / 8 * 0x80) + (8 / 8 * 0x40); - - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4; v9++) { - v16 = (u8 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); - v11 = v16[v7]; - - if (v11 != 0) { - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 8; - } - } + case 1: // 2x1 + CopyGlyph8bpp(convertedSrc, 0, 0, 8, srcBottom, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); + CopyGlyph8bpp(convertedSrc, 8, 0, srcRight - 8, srcBottom, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); break; - case 2: { - int v7, v8, v9, v10; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u8 *v16; - v15 = (v6) + (0 / 8 * 0x80) + (0 / 8 * 0x40); - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < 8; v9++) { - v16 = (u8 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); - v11 = v16[v7]; - - if (v11 != 0) { - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 8; - } - }; - { - int v7, v8, v9, v10; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u8 *v16; - - v15 = (v6) + (8 / 8 * 0x80) + (0 / 8 * 0x40); - - if (8 == 0) { - v10 = (param5) + 8; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 8; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = (u8 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); - v11 = v16[v7]; - - if (v11 != 0) { - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 8; - } - } + case 2: // 1x2 + CopyGlyph8bpp(convertedSrc, 0, 0, srcRight, 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); + CopyGlyph8bpp(convertedSrc, 0, 8, srcRight, srcBottom - 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); break; - case 3: { - int v7, v8, v9, v10; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u8 *v16; - v15 = (v6) + (0 / 8 * 0x80) + (0 / 8 * 0x40); - - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < 8; v9++) { - v16 = (u8 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); - v11 = v16[v7]; - - if (v11 != 0) { - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 8; - } - }; - { - int v7, v8, v9, v10; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u8 *v16; - - v15 = (v6) + (0 / 8 * 0x80) + (8 / 8 * 0x40); - - if (0 == 0) { - v10 = (param5) + 0; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 0; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < 8; v9++) { - v16 = (u8 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); - v11 = v16[v7]; - - if (v11 != 0) { - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 8; - } - } - { - int v7, v8, v9, v10; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u8 *v16; - - v15 = (v6) + (8 / 8 * 0x80) + (0 / 8 * 0x40); - - if (8 == 0) { - v10 = (param5) + 8; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 8; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = (u8 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); - v11 = v16[v7]; - - if (v11 != 0) { - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 8; - } - } - { - int v7, v8, v9, v10; - u8 v11; - u8 v12; - u8 v13; - u8 *v14; - const u8 *v15; - u8 *v16; - v15 = (v6) + (8 / 8 * 0x80) + (8 / 8 * 0x40); - - if (8 == 0) { - v10 = (param5) + 8; - v13 = (u8)((param6) & 0xff); - } else { - v10 = (param5) + 8; - - for (v9 = 0; v9 < 8; v9++) { - if ((((param6) >> v9) & 1) != 0) { - v10++; - } - } - - v13 = (u8)((param6) >> 8); - } - - for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = (u8 *)v15; - v12 = (u8)((v13 >> v9) & 1); - - for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); - v11 = v16[v7]; - - if (v11 != 0) { - *v14 = v11; - - if (v12 != 0) { - v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); - *v14 = v11; - } - } - } - - if (v12 != 0) { - v10 += 2; - } else { - v10++; - } - - v15 += 8; - } - } + case 3: // 2x2 + CopyGlyph8bpp(convertedSrc, 0, 0, 8, 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); + CopyGlyph8bpp(convertedSrc, 8, 0, srcRight - 8, 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); + CopyGlyph8bpp(convertedSrc, 0, 8, 8, srcBottom - 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); + CopyGlyph8bpp(convertedSrc, 8, 8, srcRight - 8, srcBottom - 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); break; } - - Heap_FreeToHeap(v6); + Heap_FreeToHeap(convertedSrc); } } -void Window_Scroll(Window *param0, u8 param1, u8 param2, u8 param3) +void Window_Scroll(Window *window, u8 direction, u8 distance, u8 fillVal) { - if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) { - sub_0201C06C(param0, param1, param2, param3); + if (window->bgConfig->bgs[window->bgLayer].colorMode == GX_BG_COLORMODE_16) { + ScrollWindow4bpp(window, direction, distance, fillVal); } else { - sub_0201C158(param0, param1, param2, param3); + ScrollWindow8bpp(window, direction, distance, fillVal); } } -static void sub_0201C06C(Window *param0, u8 param1, u8 param2, u8 param3) +static void ScrollWindow4bpp(Window *window, u8 direction, u8 distance, u8 fillVal) { - u8 *v0; - int v1, v2, v3; - int v4, v5; - int v6, v7; - int v8; + u8 *pixels; + int y0, y1, y2; + int fill, size; + u32 width; + int i, j; - v0 = (u8 *)param0->pixels; - v4 = (param3 << 24) | (param3 << 16) | (param3 << 8) | (param3 << 0); - v5 = param0->height * param0->width * 0x20; - v6 = param0->width; + pixels = window->pixels; + fill = (fillVal << 24) | (fillVal << 16) | (fillVal << 8) | (fillVal << 0); + size = window->height * window->width * TILE_SIZE_4BPP; + width = window->width; - switch (param1) { - case 0: - for (v1 = 0; v1 < v5; v1 += 0x20) { - v7 = param2; + switch (direction) { + case SCROLL_DIRECTION_UP: + for (i = 0; i < size; i += TILE_SIZE_4BPP) { + y0 = distance; - for (v8 = 0; v8 < 8; v8++) { - v2 = v1 + (v8 << 2); - v3 = v1 + (((v6 * (v7 & 0xfffffff8)) | (v7 & 0x7)) << 2); + for (j = 0; j < 8; j++) { + y1 = i + (j << 2); + y2 = i + (((width * (y0 & ~7)) | (y0 & 7)) << 2); - if (v3 < v5) { - *(u32 *)(v0 + v2) = *(u32 *)(v0 + v3); + if (y2 < size) { + *(u32 *)(pixels + y1) = *(u32 *)(pixels + y2); } else { - *(u32 *)(v0 + v2) = v4; + *(u32 *)(pixels + y1) = fill; } - v7++; - } - } - - break; - case 1: - v0 += v5 - 4; - - for (v1 = 0; v1 < v5; v1 += 0x20) { - v7 = param2; - - for (v8 = 0; v8 < 8; v8++) { - v2 = v1 + (v8 << 2); - v3 = v1 + (((v6 * (v7 & 0xfffffff8)) | (v7 & 0x7)) << 2); - - if (v3 < v5) { - *(u32 *)(v0 - v2) = *(u32 *)(v0 - v3); - } else { - *(u32 *)(v0 - v2) = v4; - } - - v7++; + y0++; } } break; - case 2: + + case SCROLL_DIRECTION_DOWN: + pixels += size - 4; + for (i = 0; i < size; i += TILE_SIZE_4BPP) { + y0 = distance; + + for (j = 0; j < 8; j++) { + y1 = i + (j << 2); + y2 = i + (((width * (y0 & ~7)) | (y0 & 7)) << 2); + + if (y2 < size) { + *(u32 *)(pixels - y1) = *(u32 *)(pixels - y2); + } else { + *(u32 *)(pixels - y1) = fill; + } + + y0++; + } + } break; - case 3: + + case SCROLL_DIRECTION_LEFT: + break; + + case SCROLL_DIRECTION_RIGHT: break; } } -static void sub_0201C158(Window *param0, u8 param1, u8 param2, u8 param3) +static void ScrollWindow8bpp(Window *window, u8 direction, u8 distance, u8 fillVal) { - u8 *v0; - int v1, v2, v3; - int v4, v5; - int v6, v7; - int v8; + u8 *pixels; + int y0, y1, y2; + int fill, size; + u32 width; + int i, j; - v0 = (u8 *)param0->pixels; - v4 = (param3 << 24) | (param3 << 16) | (param3 << 8) | param3; - v5 = param0->height * param0->width * 0x40; - v6 = param0->width; + pixels = window->pixels; + fill = (fillVal << 24) | (fillVal << 16) | (fillVal << 8) | fillVal; + size = window->height * window->width * TILE_SIZE_8BPP; + width = window->width; - switch (param1) { - case 0: - for (v1 = 0; v1 < v5; v1 += 0x40) { - v7 = param2; + switch (direction) { + case SCROLL_DIRECTION_UP: + for (i = 0; i < size; i += TILE_SIZE_8BPP) { + y0 = distance; - for (v8 = 0; v8 < 8; v8++) { - v2 = v1 + (v8 << 3); - v3 = v1 + (((v6 * (v7 & 0xfffffff8)) | (v7 & 0x7)) << 3); + for (j = 0; j < 8; j++) { + y1 = i + (j << 3); + y2 = i + (((width * (y0 & ~7)) | (y0 & 7)) << 3); - if (v3 < v5) { - *(u32 *)(v0 + v2) = *(u32 *)(v0 + v3); + if (y2 < size) { + *(u32 *)(pixels + y1) = *(u32 *)(pixels + y2); } else { - *(u32 *)(v0 + v2) = v4; + *(u32 *)(pixels + y1) = fill; } - v2 += 4; - v3 += 4; + y1 += 4; + y2 += 4; - if (v3 < v5 + 4) { - *(u32 *)(v0 + v2) = *(u32 *)(v0 + v3); + if (y2 < size + 4) { + *(u32 *)(pixels + y1) = *(u32 *)(pixels + y2); } else { - *(u32 *)(v0 + v2) = v4; + *(u32 *)(pixels + y1) = fill; } - v7++; + y0++; } } break; - case 1: - v0 += (v5 - 8); - for (v1 = 0; v1 < v5; v1 += 0x40) { - v7 = param2; + case SCROLL_DIRECTION_DOWN: + pixels += (size - 8); + for (i = 0; i < size; i += TILE_SIZE_8BPP) { + y0 = distance; - for (v8 = 0; v8 < 8; v8++) { - v2 = v1 + (v8 << 3); - v3 = v1 + (((v6 * (v7 & 0xfffffff8)) | (v7 & 0x7)) << 3); + for (j = 0; j < 8; j++) { + y1 = i + (j << 3); + y2 = i + (((width * (y0 & ~7)) | (y0 & 7)) << 3); - if (v3 < v5) { - *(u32 *)(v0 - v2) = *(u32 *)(v0 - v3); + if (y2 < size) { + *(u32 *)(pixels - y1) = *(u32 *)(pixels - y2); } else { - *(u32 *)(v0 - v2) = v4; + *(u32 *)(pixels - y1) = fill; } - v2 -= 4; - v3 -= 4; + y1 -= 4; + y2 -= 4; - if (v3 < v5 - 4) { - *(u32 *)(v0 - v2) = *(u32 *)(v0 - v3); + if (y2 < size - 4) { + *(u32 *)(pixels - y1) = *(u32 *)(pixels - y2); } else { - *(u32 *)(v0 - v2) = v4; + *(u32 *)(pixels - y1) = fill; } - v7++; + y0++; } } break; - case 2: + + case SCROLL_DIRECTION_LEFT: break; - case 3: + + case SCROLL_DIRECTION_RIGHT: break; } } -BgConfig *Window_GetBgConfig(Window *param0) +BgConfig *Window_GetBgConfig(Window *window) { - return param0->bgConfig; + return window->bgConfig; } -u8 Window_GetBgLayer(Window *param0) +u8 Window_GetBgLayer(Window *window) { - return param0->bgLayer; + return window->bgLayer; } -u8 Window_GetWidth(Window *param0) +u8 Window_GetWidth(Window *window) { - return param0->width; + return window->width; } -u8 Window_GetHeight(Window *param0) +u8 Window_GetHeight(Window *window) { - return param0->height; + return window->height; } -u8 Window_GetXPos(Window *param0) +u8 Window_GetXPos(Window *window) { - return param0->tilemapLeft; + return window->tilemapLeft; } -u8 Window_GetYPos(Window *param0) +u8 Window_GetYPos(Window *window) { - return param0->tilemapTop; + return window->tilemapTop; } -u16 Window_GetBaseTile(Window *param0) +u16 Window_GetBaseTile(Window *window) { - return param0->baseTile; + return window->baseTile; } -void Window_SetXPos(Window *param0, u8 param1) +void Window_SetXPos(Window *window, u8 x) { - param0->tilemapLeft = param1; + window->tilemapLeft = x; } -void Window_SetYPos(Window *param0, u8 param1) +void Window_SetYPos(Window *window, u8 y) { - param0->tilemapTop = param1; + window->tilemapTop = y; } -void Window_SetPalette(Window *param0, u8 param1) +void Window_SetPalette(Window *window, u8 palette) { - param0->palette = param1; + window->palette = palette; } void Bg_RunScheduledUpdates(BgConfig *bgConfig) diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index 0881f0e928..234de5b0f7 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -594,7 +594,7 @@ static void SetupBGL(BgConfig *bgl, enum HeapId heapID) 0, 0x800, 0, - SCREEN_SIZE_256x256, + BG_SCREEN_SIZE_256x256, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0000, GX_BG_CHARBASE_0x04000, @@ -616,7 +616,7 @@ static void SetupBGL(BgConfig *bgl, enum HeapId heapID) 0, 0x800, 0, - SCREEN_SIZE_256x256, + BG_SCREEN_SIZE_256x256, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0800, GX_BG_CHARBASE_0x0c000, @@ -638,7 +638,7 @@ static void SetupBGL(BgConfig *bgl, enum HeapId heapID) 0, 0x800, 0, - SCREEN_SIZE_256x256, + BG_SCREEN_SIZE_256x256, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x1000, GX_BG_CHARBASE_0x14000, From 9cc3c05bf90838ca950ec08e900415d8a20499c9 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 22 Oct 2024 12:52:12 -0700 Subject: [PATCH 13/13] Start 2D rendering documentation + document background system --- docs/2d_rendering.md | 196 +++++++++++++++++++++++++++++++++++++++++++ docs/index.md | 1 + 2 files changed, 197 insertions(+) create mode 100644 docs/2d_rendering.md diff --git a/docs/2d_rendering.md b/docs/2d_rendering.md new file mode 100644 index 0000000000..e299c17d2b --- /dev/null +++ b/docs/2d_rendering.md @@ -0,0 +1,196 @@ +# 2D Rendering + +This document aims to outline and summarize the functionality of the Nintendo DS's +2D rendering system and the wrapping APIs around that system as used in Pokemon +Platinum. + +Much of the underlying systems from the Game Boy Advance still applies to the +DS. Thus, this document will aim to only highlight the differences. + +## Backgrounds + +Backgrounds are rendered in layers; the SDK provides support for 8 total layers +evenly split across the Main and Sub screens. For simplicity, this document will +refer to layers by the indices `0`, `1`, `2`, and `3` to refer to the set of +layers accessible to each of the displays. + +### Tiling + +Like its predecessors, the DS makes use of a basic tiling system with access +to 656 KB of VRAM. This VRAM chunk is split into 9 total banks of varying sizes: + +- Four banks of size 128 KB +- One bank of size 64 KB +- One bank of size 32 KB +- Three banks of size 16 KB + +Both the 2D and 3D processing engines can access any of these banks, but +are not permitted to access the same bank concurrently. The 2D processing engine +will access these banks to render each of the various backgrounds, while the 3D +processing engine will fetch textures from these banks during rendering. + +Some restrictions apply to accessing each of these banks: + +1. The ARM7 co-processor can only access two of the four 128 KB banks. +2. Sprite graphics are not permitted to be stored in this section of VRAM. +3. The main screen is not permitted to access the third 16 KB bank. + +### Background Types + +The console's 2D engine can generate various types of backgrounds, each with +different supported functions. There are, effectively, three groups of these +types. + +#### Character-type Groups + +These background types utilize a traditional tiling system, rendering frames by +mapping them from VRAM to simple indexing buffer. + +##### Static Backgrounds + +This is the most ordinary background type. It supports screen resolutions up to +512x512, 256 on-screen colors, and 16 total palettes (of 16 colors each). It +also supports all the usual effects: + +- Horizontal and vertical flipping flags +- Horizontal and vertical scrolling +- Mosaic effects +- Alpha blending +- Priority rendering (which permits "layering" backgrounds atop one another) +- Palette fading + +The VRAM buffer supports up to 1024 total tiles for each background of this type. + +##### Affine Backgrounds + +This background type supports screen resolutions up to 1024x1024, as well as the +usual set of basic affine transformations: + +- Translations +- Rotations +- Scaling +- Reflection +- Shearing + +However, to support these transformations, the flipping flags are disabled, and +the VRAM buffer supports up to 256 tiles rather than 1024. + +##### Affine Extended with Static Functions + +This background type is an extension of the Affine type; it supports the same +screen resolutions and set of affine transformations, but restores support for +flipping flags and 1024 tiles. + +#### Bitmap-type Groups + +Rather than rendering frames from tiles mapped onto an indexing buffer, types +in this group treat VRAM as a true bitmap frame buffer. + +##### Affine Extended with 256 Colors + +Functionally, this type is identical to a Static with Affine background, but +effects are applied on the full 512x512 bitmap. + +##### Affine Extended with Direct Color + +This type is similar to the 256 color extension, but the frame buffer now +supports direct 15-bit color, permitting up to 32,768 total on-screen colors. + +##### Large Screen + +This type treats a single 128KB chunk of VRAM as a frame-buffer of size 1024x512. + +#### 3D Background + +Backgrounds of this type (which is the only member of its group) treat the +rendering result of the 3D graphics engine as a background layer. Thus, +backgrounds of this type do not support *most* of the previous 2D effects, +but do retain support for horizontal scrolling and alpha blending. In addition, +backgrounds of this type support direct 18-bit color, permitting up to 262,144 +total on-screen colors. + +### Background Modes + +Background types are restricted to various "modes", as controlled by the SDK. +The SDK supports 7 total modes: + +| Mode | Layer 0 Type | Layer 1 Type | Layer 2 Type | Layer 3 Type | +| ---: | ------------- | ------------ | --------------- | --------------- | +| 0 | Static / 3D | Static | Static | Static | +| 1 | Static / 3D | Static | Static | Affine | +| 2 | Static / 3D | Static | Affine | Affine | +| 3 | Static / 3D | Static | Static | Affine Extended | +| 4 | Static / 3D | Static | Affine | Affine Extended | +| 5 | Static / 3D | Static | Affine Extended | Affine Extended | +| 6 | 3D Background | N/A | Large Screen | N/A | + +Each of the displays can be set to its own background mode; this permits, for +example, having affine transformations apply to the main screen, but showing +a simple static HUD on the sub screen. + +### The Game Freak API + +Game Freak built a minimal wrapping API around the SDK's internals, much of +which is identical to the similar wrapping API built for the Advance generation. +This wrapping API restricts the available background types to the following: + +```c +enum BgType { + BG_TYPE_STATIC = 0, + BG_TYPE_AFFINE, + BG_TYPE_STATIC_WITH_AFFINE, +}; +``` + +Backgrounds can be quickly constructed via a simple template system, which allows +storing common properties in ROM: + +```c +typedef struct BgTemplate { + u32 x; + u32 y; + u32 bufferSize; + u32 baseTile; + u8 screenSize; + u8 colorMode; + u8 screenBase; + u8 charBase; + u8 bgExtPltt; + u8 priority; + u8 areaOver; + u8 dummy; + BOOL mosaic; +} BgTemplate; +``` + +The wrapping API's primary feature is support for scheduling scroll and VRAM +transfer operations for future bulk transformation. Most background update +operations provide `Schedule` alternative, which will perform the operation, +but delay committing the result to VRAM until the next invocation of +`Bg_RunScheduledUpdates`. To illustrate, consider the following functions: + +```c +void Bg_FillTilemap(BgConfig *bgConfig, u8 bgLayer, u16 fillVal) +{ + if (bgConfig->bgs[bgLayer].tilemapBuffer == NULL) { + return; + } + + MI_CpuFill16(bgConfig->bgs[bgLayer].tilemapBuffer, fillVal, bgConfig->bgs[bgLayer].bufferSize); + Bg_CopyTilemapBufferToVRAM(bgConfig, bgLayer); +} + +void Bg_ScheduleFillTilemap(BgConfig *bgConfig, u8 bgLayer, u16 fillVal) +{ + if (bgConfig->bgs[bgLayer].tilemapBuffer == NULL) { + return; + } + + MI_CpuFill16(bgConfig->bgs[bgLayer].tilemapBuffer, fillVal, bgConfig->bgs[bgLayer].bufferSize); + Bg_ScheduleTilemapTransfer(bgConfig, bgLayer); +} +``` + +Note that each of these operations perform the same `MI_CpuFill16` operation, +but the latter invokes `Bg_ScheduleTilemapTransfer`, which flags the background +layer for VRAM transfer, usually on the next VBlank callback. diff --git a/docs/index.md b/docs/index.md index 9bb8431eb9..f098ee72ed 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,4 +9,5 @@ For more detailed information about the project as a whole, please refer to its ## Subsystems +- [2D Graphics](2d_rendering.md) - [3D Graphics](3d_rendering.md)