From fa194563da6d87918b4be799b03c32a71d7946a5 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 23 Oct 2024 16:33:13 -0700 Subject: [PATCH] Identify extern functions in graphics.h --- include/graphics.h | 48 ++++----- include/inlines.h | 2 +- src/battle/ov16_0223B140.c | 8 +- src/battle/ov16_0226871C.c | 16 +-- src/choose_starter/choose_starter_app.c | 8 +- src/font.c | 4 +- src/graphics.c | 52 +++++----- src/library_tv/library_tv.c | 14 +-- src/overlay005/encounter_effect.c | 8 +- src/overlay005/encounter_effect_core.c | 4 +- src/overlay005/ov5_021DD6FC.c | 4 +- src/overlay005/ov5_021F007C.c | 4 +- src/overlay006/ov6_0223E140.c | 6 +- src/overlay007/ov7_0224CD28.c | 10 +- src/overlay010/ov10_0221F800.c | 14 +-- src/overlay012/ov12_0221FC20.c | 24 ++--- src/overlay012/ov12_02226B84.c | 8 +- src/overlay012/ov12_02234E44.c | 4 +- src/overlay013/ov13_0221FC20.c | 4 +- src/overlay013/ov13_022264F4.c | 6 +- src/overlay017/ov17_0223B140.c | 12 +-- src/overlay017/ov17_0223CB1C.c | 12 +-- src/overlay017/ov17_0223DAD0.c | 4 +- src/overlay017/ov17_0223F7E4.c | 4 +- src/overlay017/ov17_022413D8.c | 2 +- src/overlay017/ov17_02247A48.c | 2 +- src/overlay017/ov17_022492DC.c | 14 +-- src/overlay017/ov17_0224F4D4.c | 4 +- src/overlay017/ov17_02250744.c | 10 +- src/overlay019/ov19_021D61B0.c | 10 +- src/overlay019/ov19_021D79F8.c | 2 +- src/overlay019/ov19_021D8B54.c | 6 +- src/overlay019/ov19_021DA270.c | 12 +-- src/overlay019/ov19_021DA814.c | 6 +- src/overlay019/ov19_021DA92C.c | 14 +-- src/overlay019/ov19_021DB2FC.c | 6 +- src/overlay019/ov19_021DB8E4.c | 18 ++-- src/overlay019/ov19_021DC5F0.c | 2 +- src/overlay019/ov19_021DCF88.c | 24 ++--- src/overlay019/ov19_021DE3E8.c | 10 +- src/overlay019/ov19_021DEC04.c | 24 ++--- src/overlay020/ov20_021D2098.c | 8 +- src/overlay020/ov20_021D2EA4.c | 12 +-- src/overlay020/ov20_021D3864.c | 4 +- src/overlay020/ov20_021D3A54.c | 4 +- src/overlay020/ov20_021D4728.c | 16 +-- src/overlay021/ov21_021E8D48.c | 22 ++--- src/overlay022/ov22_022597BC.c | 10 +- src/overlay022/ov22_0225B660.c | 12 +-- src/overlay023/ov23_0223E140.c | 18 ++-- src/overlay023/ov23_02241F74.c | 2 +- src/overlay023/ov23_0224340C.c | 8 +- src/overlay023/ov23_02248F1C.c | 8 +- src/overlay023/ov23_0224B05C.c | 2 +- src/overlay024/ov24_02253CE0.c | 6 +- src/overlay025/ov25_02254560.c | 12 +-- src/overlay025/ov25_02255090.c | 2 +- src/overlay026/ov26_02256404.c | 6 +- src/overlay027/ov27_0225680C.c | 8 +- src/overlay028/ov28_0225697C.c | 4 +- src/overlay029/ov29_022566C8.c | 6 +- src/overlay030/ov30_022563EC.c | 6 +- src/overlay032/ov32_02256470.c | 4 +- src/overlay033/ov33_02256474.c | 4 +- src/overlay034/ov34_02256540.c | 6 +- src/overlay035/ov35_02256410.c | 8 +- src/overlay036/ov36_02256404.c | 8 +- src/overlay037/ov37_022563D4.c | 6 +- src/overlay038/ov38_0225632C.c | 4 +- src/overlay039/ov39_022563DC.c | 4 +- src/overlay040/ov40_0225645C.c | 6 +- src/overlay041/ov41_022567B0.c | 6 +- src/overlay042/ov42_022563D4.c | 6 +- src/overlay043/ov43_02256544.c | 6 +- src/overlay044/ov44_022565BC.c | 6 +- src/overlay045/ov45_022566EC.c | 8 +- src/overlay046/ov46_02256BCC.c | 8 +- src/overlay047/ov47_02256634.c | 6 +- src/overlay048/ov48_0225650C.c | 6 +- src/overlay049/ov49_022563D4.c | 6 +- src/overlay050/ov50_02256510.c | 6 +- src/overlay051/ov51_0225632C.c | 4 +- src/overlay052/ov52_02256694.c | 6 +- src/overlay053/ov53_02256420.c | 6 +- src/overlay055/ov55_0225632C.c | 4 +- src/overlay056/ov56_022561C0.c | 8 +- src/overlay058/ov58_021D0D80.c | 12 +-- src/overlay059/ov59_021D0D80.c | 22 ++--- src/overlay061/ov61_0222BF44.c | 12 +-- src/overlay062/ov62_022300D8.c | 24 ++--- src/overlay062/ov62_02231690.c | 2 +- src/overlay062/ov62_02234A10.c | 8 +- src/overlay062/ov62_02235E64.c | 6 +- src/overlay062/ov62_02236CBC.c | 4 +- src/overlay062/ov62_02237D24.c | 4 +- src/overlay062/ov62_02239D60.c | 46 ++++----- src/overlay062/ov62_0223CAEC.c | 8 +- src/overlay062/ov62_0223DFA8.c | 34 +++---- src/overlay062/ov62_02241204.c | 50 +++++----- src/overlay062/ov62_02246B00.c | 4 +- src/overlay062/ov62_02247D74.c | 6 +- src/overlay063/ov63_0222D1C0.c | 2 +- src/overlay064/ov64_0222DCE0.c | 24 ++--- src/overlay065/ov65_0222DCE0.c | 40 ++++---- src/overlay065/ov65_02235060.c | 6 +- src/overlay065/ov65_0223648C.c | 12 +-- src/overlay067/ov67_0225C700.c | 12 +-- src/overlay068/ov68_0225C700.c | 22 ++--- src/overlay069/ov69_0225C700.c | 16 +-- src/overlay070/ov70_0225D9A4.c | 24 ++--- src/overlay071/ov71_0223B140.c | 60 ++++++------ src/overlay072/ov72_0223D7A0.c | 12 +-- src/overlay073/ov73_021D0D80.c | 38 ++++---- src/overlay073/ov73_021D3250.c | 16 +-- src/overlay076/ov76_0223B870.c | 16 +-- src/overlay077/ov77_021D0D80.c | 36 +++---- src/overlay077/ov77_021D25B0.c | 124 ++++++++++++------------ src/overlay081/ov81_021D0D80.c | 12 +-- src/overlay083/ov83_0223D6A8.c | 18 ++-- src/overlay084/ov84_0223B5A0.c | 24 ++--- src/overlay085/ov85_02241440.c | 12 +-- src/overlay086/ov86_0223B140.c | 22 ++--- src/overlay087/ov87_021D106C.c | 16 +-- src/overlay088/ov88_0223B140.c | 20 ++-- src/overlay091/ov91_021D0D80.c | 6 +- src/overlay092/ov92_021D0D80.c | 12 +-- src/overlay094/ov94_0223BCB0.c | 2 +- src/overlay094/ov94_0223C610.c | 14 +-- src/overlay094/ov94_0223D0C4.c | 14 +-- src/overlay094/ov94_0223DC04.c | 8 +- src/overlay094/ov94_0223E46C.c | 8 +- src/overlay094/ov94_0223FB48.c | 10 +- src/overlay094/ov94_022414B8.c | 6 +- src/overlay094/ov94_02242AD0.c | 2 +- src/overlay094/ov94_02243EF8.c | 4 +- src/overlay094/ov94_02244950.c | 12 +-- src/overlay095/ov95_02246C20.c | 10 +- src/overlay095/ov95_02247B6C.c | 18 ++-- src/overlay095/ov95_02248590.c | 32 +++--- src/overlay095/ov95_02249740.c | 16 +-- src/overlay095/ov95_02249F90.c | 12 +-- src/overlay095/ov95_0224A390.c | 16 +-- src/overlay095/ov95_0224ABC0.c | 24 ++--- src/overlay095/ov95_0224B3D8.c | 12 +-- src/overlay096/ov96_0223BCE0.c | 12 +-- src/overlay097/ov97_0222AE60.c | 4 +- src/overlay097/ov97_0222C174.c | 12 +-- src/overlay097/ov97_0222D30C.c | 12 +-- src/overlay097/ov97_02230410.c | 24 ++--- src/overlay097/ov97_02233B18.c | 10 +- src/overlay097/ov97_02237694.c | 6 +- src/overlay098/ov98_022471C8.c | 18 ++-- src/overlay099/ov99_021D1A54.c | 30 +++--- src/overlay099/ov99_021D4134.c | 6 +- src/overlay100/ov100_021D13E4.c | 6 +- src/overlay100/ov100_021D1C44.c | 4 +- src/overlay100/ov100_021D2F0C.c | 4 +- src/overlay102/ov102_021D0D80.c | 26 ++--- src/overlay104/ov104_02237DD8.c | 10 +- src/overlay104/ov104_0223C2D4.c | 16 +-- src/overlay104/ov104_0223D9E4.c | 6 +- src/overlay104/ov104_0223DC7C.c | 6 +- src/overlay105/ov105_02241AE0.c | 36 +++---- src/overlay106/ov106_02241AE0.c | 12 +-- src/overlay107/ov107_02241AE0.c | 28 +++--- src/overlay107/ov107_02245EB0.c | 24 ++--- src/overlay108/ov108_02241AE0.c | 14 +-- src/overlay109/ov109_021D3D50.c | 22 ++--- src/overlay110/ov110_021D0D80.c | 12 +-- src/overlay111/ov111_021D0D80.c | 22 ++--- src/overlay112/ov112_0225C700.c | 18 ++-- src/overlay113/ov113_0225C700.c | 12 +-- src/overlay114/ov114_0225C700.c | 38 ++++---- src/overlay115/ov115_02260CEC.c | 18 ++-- src/overlay116/ov116_02261870.c | 30 +++--- src/overlay117/ov117_02260668.c | 24 ++--- src/overlay117/ov117_02263AF0.c | 4 +- src/overlay119/ov119_021D0D80.c | 8 +- src/palette.c | 6 +- src/pokemon_summary_app.c | 16 +-- src/text.c | 2 +- src/unk_0200C440.c | 2 +- src/unk_0200DA60.c | 26 ++--- src/unk_02012744.c | 2 +- src/unk_02015920.c | 6 +- src/unk_020528D0.c | 2 +- src/unk_0205C980.c | 2 +- src/unk_0207AE68.c | 8 +- src/unk_0207E0B8.c | 14 +-- src/unk_0208694C.c | 24 ++--- src/unk_0208A3F4.c | 8 +- 191 files changed, 1240 insertions(+), 1240 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index e8093cf79a..067b20d4c9 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -28,29 +28,29 @@ void *LoadMemberFromNARC_OutFileSize(u32 narcID, u32 narcMemberIdx, BOOL compres void *LoadMemberFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd); void *LoadMemberFromOpenNARC_OutFileSize(NARC *narc, u32 narcMemberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd, u32 *fileSize); -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); -void sub_02006EE0(u32 param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5); -u32 sub_02006F00(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8); -void sub_02006F28(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8); -void *sub_02006F50(u32 param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4); -void *sub_02006F6C(u32 param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4); -void *sub_02006F88(u32 bankID, u32 memberIndex, NNSG2dPaletteData **param2, u32 param3); -void *sub_02006FA0(u32 param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4); -void *sub_02006FBC(u32 param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4); -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); -u32 sub_0200718C(NARC *param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8); -void *sub_020071B4(NARC *param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4); -void *sub_020071D0(NARC *param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4); -void *sub_020071EC(NARC *param0, u32 param1, NNSG2dPaletteData **param2, u32 param3); -void *sub_02007204(NARC *param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4); -void *sub_02007220(NARC *param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4); +u32 Graphics_LoadTilesToBgLayer(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +void Graphics_LoadTilemapToBgLayer(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +void Graphics_LoadPalette(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); +void Graphics_LoadPaletteWithSrcOffset(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6); +u32 Graphics_LoadObjectTiles(u32 param0, u32 param1, int param2, u32 param3, u32 param4, BOOL param5, u32 param6); +void Graphics_LoadPartialPalette(u32 param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5); +u32 Graphics_LoadImageMapping(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8); +void Graphics_LoadImageMappingAndSetVramMode(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8); +void *Graphics_GetCharData(u32 param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4); +void *Graphics_GetScrnData(u32 param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4); +void *Graphics_GetPlttData(u32 bankID, u32 memberIndex, NNSG2dPaletteData **param2, u32 param3); +void *Graphics_GetCellBank(u32 param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4); +void *Graphics_GetAnimBank(u32 param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4); +u32 Graphics_LoadTilesToBgLayerFromOpenNARC(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +void Graphics_LoadTilemapToBgLayerFromOpenNARC(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +void Graphics_LoadPaletteFromOpenNARC(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); +void Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6); +void Graphics_LoadPartialPaletteFromOpenNARC(NARC *param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5); +u32 Graphics_LoadImageMappingFromOpenNARC(NARC *param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8); +void *Graphics_GetCharDataFromOpenNARC(NARC *param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4); +void *Graphics_GetScrnDataFromOpenNARC(NARC *param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4); +void *Graphics_GetPlttDataFromOpenNARC(NARC *param0, u32 param1, NNSG2dPaletteData **param2, u32 param3); +void *Graphics_GetCellBankFromOpenNARC(NARC *param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4); +void *Graphics_GetAnimBankFromOpenNARC(NARC *param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4); #endif // POKEPLATINUM_GRAPHICS_H diff --git a/include/inlines.h b/include/inlines.h index 34a8275c07..79f6abaae2 100644 --- a/include/inlines.h +++ b/include/inlines.h @@ -34,7 +34,7 @@ static inline void inline_ov61_0222C3B0(UnkStruct_ov61_0222C3B0 *param0, NARC *p MI_CpuClear8(param0, sizeof(UnkStruct_ov61_0222C3B0)); - v1 = sub_020071EC(param1, param2, &v0, param3); + v1 = Graphics_GetPlttDataFromOpenNARC(param1, param2, &v0, param3); MI_CpuCopy16(&((u16 *)(v0->pRawData))[0 * 16], param0->unk_08, 4 * 0x20); MI_CpuCopy16(&((u16 *)(v0->pRawData))[0 * 16], param0->unk_88, 4 * 0x20); diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index fc75329842..0f4b1c5ea8 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -446,11 +446,11 @@ void ov16_0223B578(BattleSystem *param0) v1 = ov16_0223EDE0(param0); sub_0200E218(param0->unk_04, 1, 1, 10, v1, 5); - sub_02006E3C(7, 3 + param0->unk_2400, param0->unk_04, 3, 0, 0, 1, 5); + Graphics_LoadTilesToBgLayer(7, 3 + param0->unk_2400, param0->unk_04, 3, 0, 0, 1, 5); PaletteData_LoadBufferFromFileStart(param0->unk_28, 7, 172 + (param0->unk_2400 * 3) + ov16_0223EC04(param0), 5, 0, 0, 0); PaletteData_LoadBufferFromFileStart(param0->unk_28, 38, sub_0200DD08(v1), 5, 0, 0x20, 10 * 0x10); PaletteData_LoadBufferFromFileStart(param0->unk_28, 14, 7, 5, 0, 0x20, 0xb * 0x10); - sub_02006E60(7, 2, param0->unk_04, 3, 0, 0, 1, 5); + Graphics_LoadTilemapToBgLayer(7, 2, param0->unk_04, 3, 0, 0, 1, 5); } { @@ -931,11 +931,11 @@ static void ov16_0223C004(BattleSystem *param0, BgConfig *param1) v3 = ov16_0223EDE0(param0); sub_0200E218(param1, 1, 1, 10, v3, 5); - sub_02006E3C(7, 3 + param0->unk_2400, param1, 3, 0, 0, 1, 5); + Graphics_LoadTilesToBgLayer(7, 3 + param0->unk_2400, param1, 3, 0, 0, 1, 5); PaletteData_LoadBufferFromFileStart(param0->unk_28, 7, 172 + (param0->unk_2400 * 3) + ov16_0223EC04(param0), 5, 0, 0, 0); PaletteData_LoadBufferFromFileStart(param0->unk_28, 38, sub_0200DD08(v3), 5, 0, 0x20, 10 * 0x10); PaletteData_LoadBufferFromFileStart(param0->unk_28, 14, 7, 5, 0, 0x20, 0xb * 0x10); - sub_02006E60(7, 2, param1, 3, 0, 0, 1, 5); + Graphics_LoadTilemapToBgLayer(7, 2, param1, 3, 0, 0, 1, 5); } { diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 281e84574b..11c8342d2d 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -1093,7 +1093,7 @@ void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3 v6 = Unk_ov16_02270264[v5]; } - v4 = sub_02006F6C(7, v6, 1, &v3, 5); + v4 = Graphics_GetScrnData(7, v6, 1, &v3, 5); MI_CpuCopy32(v3->rawData, v0->unk_3C[v5], 0x800); Heap_FreeToHeap(v4); @@ -1154,7 +1154,7 @@ void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3 v15 = 267; } - v14 = sub_02006F88(7, v15, &v13, 5); + v14 = Graphics_GetPlttData(7, v15, &v13, 5); if (BattleSystem_BattleType(param2) & 0x80) { MI_CpuCopy16(v13->pRawData, v0->unk_60, 0x40); @@ -1221,7 +1221,7 @@ void ov16_02268A88(UnkStruct_ov16_02268A14 *param0) v5 = 28; } - sub_02006E3C(7, v5, v0, 4, 0, 0x6000, 1, 5); + Graphics_LoadTilesToBgLayer(7, v5, v0, 4, 0, 0x6000, 1, 5); } sub_0207C9EC(v1, v2, 20017, 20017); @@ -1295,12 +1295,12 @@ void ov16_02268C04(NARC *param0, NARC *param1, UnkStruct_ov16_02268A14 *param2, v6 = v0->unk_00; } - sub_020070E8(param0, v6, v3, 4, 0, (0x6000 - (32 * 12 * 0x20)), 1, 5); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0, v6, v3, 4, 0, (0x6000 - (32 * 12 * 0x20)), 1, 5); if (param2->unk_66D == 0) { - sub_020070E8(param0, 37, v3, 4, ((0x6000 - (32 * 12 * 0x20)) / 0x20), (32 * 12 * 0x20), 1, 5); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0, 37, v3, 4, ((0x6000 - (32 * 12 * 0x20)) / 0x20), (32 * 12 * 0x20), 1, 5); } else { - sub_020070E8(param0, 38, v3, 4, ((0x6000 - (32 * 12 * 0x20)) / 0x20), (32 * 12 * 0x20), 1, 5); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0, 38, v3, 4, ((0x6000 - (32 * 12 * 0x20)) / 0x20), (32 * 12 * 0x20), 1, 5); } } @@ -2034,7 +2034,7 @@ static void ov16_02269E94(UnkStruct_ov16_02268A14 *param0, int param1, int param NNSG2dScreenData *v3; void *v4; - v4 = sub_02006F6C(7, 46, 1, &v3, 5); + v4 = Graphics_GetScrnData(7, 46, 1, &v3, 5); MI_CpuCopy32(v3->rawData, param0->unk_3C[6], 0x800); Heap_FreeToHeap(v4); @@ -2800,7 +2800,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_ for (v4 = 0; v4 < 4; v4++) { if ((param2->unk_00[v4] != v0->unk_00.unk_00[v4]) && (param2->unk_00[v4] != 0)) { v5 = MoveTable_LoadParam(param2->unk_00[v4], MOVEATTRIBUTE_TYPE); - v1 = sub_02006F50(sub_0207C944(), sub_0207C908(v5), 1, &v2, 5); + v1 = Graphics_GetCharData(sub_0207C944(), sub_0207C908(v5), 1, &v2, 5); MI_CpuCopy32(v2->pRawData, v0->unk_18[v4], v3); Heap_FreeToHeap(v1); } diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index 9eb9642452..ad665bf923 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -671,7 +671,7 @@ static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID) Window_FillTilemap(app->messageWindow, 15); 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); + Graphics_LoadPalette(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); } @@ -1546,8 +1546,8 @@ static void MakePreviewWindow(StarterPreviewWindow *param0, ChooseStarterApp *pa UnkStruct_ov22_02255800 v1; UnkStruct_ov21_021E7F40 v2; - param0->unk_0C = sub_02006F50(82, 14, 0, ¶m0->unk_14, param2); - param0->unk_10 = sub_02006F88(82, 15, ¶m0->unk_18, param2); + param0->unk_0C = Graphics_GetCharData(82, 14, 0, ¶m0->unk_14, param2); + param0->unk_10 = Graphics_GetPlttData(82, 15, ¶m0->unk_18, param2); v0.unk_00 = param1->spriteDisplay; v0.unk_04 = param0->unk_14; @@ -1730,7 +1730,7 @@ static void MakeSubplaneWindow(ChooseStarterApp *param0, int param1) int v0; int v1, v2; - sub_02006E84(82, 17, 0, 5 * 32, 32, param1); + Graphics_LoadPalette(82, 17, 0, 5 * 32, 32, param1); for (v0 = 0; v0 < 3; v0++) { param0->unk_9C[v0] = Window_New(param1, 1); diff --git a/src/font.c b/src/font.c index ad32372961..df5b303ce2 100644 --- a/src/font.c +++ b/src/font.c @@ -230,12 +230,12 @@ u8 Font_GetAttribute(u8 font, u8 attribute) void Font_LoadTextPalette(int palLocation, u32 palSlotOffset, u32 heapID) { - sub_02006E84(NARC_INDEX_GRAPHIC__PL_FONT, 6, palLocation, palSlotOffset, 0x20, heapID); + Graphics_LoadPalette(NARC_INDEX_GRAPHIC__PL_FONT, 6, palLocation, palSlotOffset, 0x20, heapID); } void Font_LoadScreenIndicatorsPalette(int palLocation, u32 palSlotOffset, u32 heapID) { - sub_02006E84(NARC_INDEX_GRAPHIC__PL_FONT, 7, palLocation, palSlotOffset, 0x20, heapID); + Graphics_LoadPalette(NARC_INDEX_GRAPHIC__PL_FONT, 7, palLocation, palSlotOffset, 0x20, heapID); } u32 Font_CalcMaxLineWidth(enum Font font, const Strbuf *strbuf, u32 letterSpacing) diff --git a/src/graphics.c b/src/graphics.c index 055c132ff3..b4aee94f3b 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -20,73 +20,73 @@ static void *GetPaletteData(void *nclrBuffer, NNSG2dPaletteData **outPaletteData static void *GetCellBank(void *ncerBuffer, NNSG2dCellDataBank **outCellData); static void *GetAnimBank(void *nanrBuffer, NNSG2dAnimBankData **outAnimBank); -u32 sub_02006E3C(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +u32 Graphics_LoadTilesToBgLayer(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { void *v0 = LoadMemberFromNARC(param0, param1, param6, param7, 0); return LoadTilesToBgLayer(v0, param2, param3, param4, param5); } -void sub_02006E60(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +void Graphics_LoadTilemapToBgLayer(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { void *v0 = LoadMemberFromNARC(param0, param1, param6, param7, 1); LoadTilemapToBgLayer(v0, param2, param3, param4, param5); } -void sub_02006E84(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) +void Graphics_LoadPalette(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) { - sub_02006E9C(param0, param1, param2, 0, param3, param4, param5); + Graphics_LoadPaletteWithSrcOffset(param0, param1, param2, 0, param3, param4, param5); } -void sub_02006E9C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6) +void Graphics_LoadPaletteWithSrcOffset(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6) { void *v0 = LoadMemberFromNARC(param0, param1, 0, param6, 1); LoadPaletteWithSrcOffset(v0, param2, param3, param4, param5); } -u32 sub_02006EC0(u32 param0, u32 param1, int param2, u32 param3, u32 param4, BOOL param5, u32 param6) +u32 Graphics_LoadObjectTiles(u32 param0, u32 param1, int param2, u32 param3, u32 param4, BOOL param5, u32 param6) { void *v0 = LoadMemberFromNARC(param0, param1, param5, param6, 1); return LoadObjectTiles(v0, param2, param3, param4); } -void sub_02006EE0(u32 param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5) +void Graphics_LoadPartialPalette(u32 param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5) { void *v0 = LoadMemberFromNARC(param0, param1, 0, param4, 1); LoadPartialPalette(v0, param2, param3, param5); } -u32 sub_02006F00(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8) +u32 Graphics_LoadImageMapping(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8) { void *v0 = LoadMemberFromNARC(param0, param1, param2, param7, 1); return LoadImageMapping(v0, param3, param4, param5, param6, param8); } -void sub_02006F28(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8) +void Graphics_LoadImageMappingAndSetVramMode(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8) { void *v0 = LoadMemberFromNARC(param0, param1, param2, param7, 1); LoadImageMappingAndSetVramMode(v0, param3, param4, param5, param6, param8); } -void *sub_02006F50(u32 param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4) +void *Graphics_GetCharData(u32 param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4) { void *v0 = LoadMemberFromNARC(param0, param1, param2, param4, 0); return GetCharacterData(v0, param3); } -void *sub_02006F6C(u32 param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4) +void *Graphics_GetScrnData(u32 param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4) { void *v0 = LoadMemberFromNARC(param0, param1, param2, param4, 0); return GetScreenData(v0, param3); } -void *sub_02006F88(u32 param0, u32 param1, NNSG2dPaletteData **param2, u32 param3) +void *Graphics_GetPlttData(u32 param0, u32 param1, NNSG2dPaletteData **param2, u32 param3) { void *v0 = LoadMemberFromNARC(param0, param1, 0, param3, 0); return GetPaletteData(v0, param2); } -void *sub_02006FA0(u32 param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4) +void *Graphics_GetCellBank(u32 param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4) { void *v0; @@ -94,7 +94,7 @@ void *sub_02006FA0(u32 param0, u32 param1, BOOL param2, NNSG2dCellDataBank **par return GetCellBank(v0, param3); } -void *sub_02006FBC(u32 param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4) +void *Graphics_GetAnimBank(u32 param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4) { void *v0 = LoadMemberFromNARC(param0, param1, param2, param4, 0); return GetAnimBank(v0, param3); @@ -175,60 +175,60 @@ void *LoadMemberFromNARC_OutFileSize(u32 narcID, u32 narcMemberIdx, BOOL compres return data; } -u32 sub_020070E8(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +u32 Graphics_LoadTilesToBgLayerFromOpenNARC(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { void *v0 = LoadMemberFromOpenNARC(param0, param1, param6, param7, 0); return LoadTilesToBgLayer(v0, param2, param3, param4, param5); } -void sub_0200710C(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +void Graphics_LoadTilemapToBgLayerFromOpenNARC(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { void *v0 = LoadMemberFromOpenNARC(param0, param1, param6, param7, 1); LoadTilemapToBgLayer(v0, param2, param3, param4, param5); } -void sub_02007130(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) +void Graphics_LoadPaletteFromOpenNARC(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) { - sub_02007148(param0, param1, param2, 0, param3, param4, param5); + Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(param0, param1, param2, 0, param3, param4, param5); } -void sub_02007148(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6) +void Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6) { void *v0 = LoadMemberFromOpenNARC(param0, param1, 0, param6, 1); LoadPaletteWithSrcOffset(v0, param2, param3, param4, param5); } -void sub_0200716C(NARC *param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5) +void Graphics_LoadPartialPaletteFromOpenNARC(NARC *param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5) { void *v0 = LoadMemberFromOpenNARC(param0, param1, 0, param4, 1); LoadPartialPalette(v0, param2, param3, param5); } -u32 sub_0200718C(NARC *param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8) +u32 Graphics_LoadImageMappingFromOpenNARC(NARC *param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8) { void *v0 = LoadMemberFromOpenNARC(param0, param1, param2, param7, 1); return LoadImageMapping(v0, param3, param4, param5, param6, param8); } -void *sub_020071B4(NARC *param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4) +void *Graphics_GetCharDataFromOpenNARC(NARC *param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4) { void *v0 = LoadMemberFromOpenNARC(param0, param1, param2, param4, 0); return GetCharacterData(v0, param3); } -void *sub_020071D0(NARC *param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4) +void *Graphics_GetScrnDataFromOpenNARC(NARC *param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4) { void *v0 = LoadMemberFromOpenNARC(param0, param1, param2, param4, 0); return GetScreenData(v0, param3); } -void *sub_020071EC(NARC *param0, u32 param1, NNSG2dPaletteData **param2, u32 param3) +void *Graphics_GetPlttDataFromOpenNARC(NARC *param0, u32 param1, NNSG2dPaletteData **param2, u32 param3) { void *v0 = LoadMemberFromOpenNARC(param0, param1, 0, param3, 0); return GetPaletteData(v0, param2); } -void *sub_02007204(NARC *param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4) +void *Graphics_GetCellBankFromOpenNARC(NARC *param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4) { void *v0; @@ -236,7 +236,7 @@ void *sub_02007204(NARC *param0, u32 param1, BOOL param2, NNSG2dCellDataBank **p return GetCellBank(v0, param3); } -void *sub_02007220(NARC *param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4) +void *Graphics_GetAnimBankFromOpenNARC(NARC *param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4) { void *v0 = LoadMemberFromOpenNARC(param0, param1, param2, param4, 0); return GetAnimBank(v0, param3); diff --git a/src/library_tv/library_tv.c b/src/library_tv/library_tv.c index 45867d4430..ea8c6f0110 100644 --- a/src/library_tv/library_tv.c +++ b/src/library_tv/library_tv.c @@ -203,26 +203,26 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv) charSetID = 1; screenID = 4; 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); + Graphics_LoadTilesToBgLayer(NARC_INDEX_DEMO__INTRO__INTRO_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); + Graphics_LoadTilemapToBgLayer(NARC_INDEX_DEMO__INTRO__INTRO_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); 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; 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); + Graphics_LoadTilesToBgLayer(NARC_INDEX_DEMO__INTRO__INTRO_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); + Graphics_LoadTilemapToBgLayer(NARC_INDEX_DEMO__INTRO__INTRO_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); 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; 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); + Graphics_LoadTilesToBgLayer(NARC_INDEX_GRAPHIC__LIBRARY_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); + Graphics_LoadTilemapToBgLayer(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); + Graphics_LoadPalette(NARC_INDEX_GRAPHIC__LIBRARY_TV, 3, 0, 0, 0, ltv->heapID); Font_LoadTextPalette(0, 1 * (2 * 16), ltv->heapID); Bg_MaskPalette(0, 0x0); Bg_MaskPalette(4, 0x0); diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c index 8e37e06dcf..cc300b6d43 100644 --- a/src/overlay005/encounter_effect.c +++ b/src/overlay005/encounter_effect.c @@ -714,10 +714,10 @@ void ov5_021DE3D0(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4, void *v0; NNSG2dScreenData *v1; - sub_02007130(param0, param3, 0, param4 * 32, param5 * 32, 4); - sub_020070E8(param0, param2, param6, param7, 0, 0, 0, 4); + Graphics_LoadPaletteFromOpenNARC(param0, param3, 0, param4 * 32, param5 * 32, 4); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0, param2, param6, param7, 0, 0, 0, 4); - v0 = sub_020071D0(param0, param1, 0, &v1, 4); + v0 = Graphics_GetScrnDataFromOpenNARC(param0, param1, 0, &v1, 4); 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); @@ -781,7 +781,7 @@ void ov5_021DE5D0(CellActor *param0, u32 param1, u32 param2, u8 param3, u16 para sub_02076AAC(param2, 2, &v0); v3 = Heap_AllocFromHeap(param1, 32); - v2 = sub_02006F88(v0.unk_00, v0.unk_08, &v1, param1); + v2 = Graphics_GetPlttData(v0.unk_00, v0.unk_08, &v1, param1); BlendPalette(v1->pRawData, v3, 16, param3, param4); ov5_021DE67C(param0, v3, 32); diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c index 548bef4d3f..36a7ef3d15 100644 --- a/src/overlay005/encounter_effect_core.c +++ b/src/overlay005/encounter_effect_core.c @@ -2897,7 +2897,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he memset(encEffect->param, 0, sizeof(UnkStruct_ov5_021E52A8)); v0 = encEffect->param; - sub_02007130(encEffect->narc, 11, 0, 2 * 0x20, 0x20, heapID); + Graphics_LoadPaletteFromOpenNARC(encEffect->narc, 11, 0, 2 * 0x20, 0x20, heapID); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); Window_Add(encEffect->fieldSystem->unk_08, &v0->unk_2E0, 2, 0, 10, 16, 2, 2, 1); @@ -3332,7 +3332,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H { Strbuf *v9; - sub_02007130(encEffect->narc, 11, 0, 2 * 0x20, 0x20, heapID); + Graphics_LoadPaletteFromOpenNARC(encEffect->narc, 11, 0, 2 * 0x20, 0x20, heapID); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); Window_Add(encEffect->fieldSystem->unk_08, &v0->unk_358, 2, 21, 13, 11, 2, 2, 1); diff --git a/src/overlay005/ov5_021DD6FC.c b/src/overlay005/ov5_021DD6FC.c index f50d127688..f6557d96c4 100644 --- a/src/overlay005/ov5_021DD6FC.c +++ b/src/overlay005/ov5_021DD6FC.c @@ -64,9 +64,9 @@ 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); + param0->unk_38 = Graphics_GetCharData(160, v3, 0, ¶m0->unk_34, 4); Bg_LoadTiles(param0->unk_1C, param1, param0->unk_34->pRawData, param0->unk_34->szByte, param2); - v0 = sub_02006F88(160, v3 + 1, &v2, 4); + v0 = Graphics_GetPlttData(160, v3 + 1, &v2, 4); ov5_021DD6FC(v2->pRawData, 1, param3); Heap_FreeToHeap(v0); diff --git a/src/overlay005/ov5_021F007C.c b/src/overlay005/ov5_021F007C.c index f94069ac1d..745ff97ea5 100644 --- a/src/overlay005/ov5_021F007C.c +++ b/src/overlay005/ov5_021F007C.c @@ -62,7 +62,7 @@ static void ov5_021F007C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste { UnkStruct_ov5_021F007C *v0 = param2; - v0->unk_00 = sub_02006F88(65, 55, &v0->unk_04, 4); + v0->unk_00 = Graphics_GetPlttData(65, 55, &v0->unk_04, 4); v0->unk_3C = 0; ov5_021F02B8(&v0->unk_28, 0, 8, 19); @@ -76,7 +76,7 @@ static void ov5_021F00BC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste { UnkStruct_ov5_021F007C *v0 = param2; - v0->unk_00 = sub_02006F88(65, 55, &v0->unk_04, 4); + v0->unk_00 = Graphics_GetPlttData(65, 55, &v0->unk_04, 4); v0->unk_3C = 0; ov5_021F02B8(&v0->unk_28, 8, 0, 19); diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index c00e1458a2..09403c54b9 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -2060,9 +2060,9 @@ UnkStruct_ov6_022401B8 *ov6_02240104(u32 param0, FieldSystem *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); - sub_02006E84(172, 75, 0, 0x20 * 6, 0x20, param0); + Graphics_LoadTilesToBgLayer(172, 74, v1, 2, 0, 0, 0, param0); + Graphics_LoadTilemapToBgLayer(172, 76, v1, 2, 0, 0, 0, param0); + Graphics_LoadPalette(172, 75, 0, 0x20 * 6, 0x20, param0); Bg_SetPriority(2, 1); v0->unk_34.unk_00 = 0; diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index 3573a484ae..41786b85d9 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -485,18 +485,18 @@ static void ov7_0224D474(UnkStruct_ov7_0224D008 *param0) v0 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, 11); - sub_020070E8(v0, 0, param0->unk_00, 1, 0, 0, 0, 11); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 0, param0->unk_00, 1, 0, 0, 0, 11); if ((param0->unk_2A9 == 0) || (param0->unk_2A9 == 3)) { - sub_0200710C(v0, 2, param0->unk_00, 1, 0, 0, 0, 11); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 2, param0->unk_00, 1, 0, 0, 0, 11); } else { - sub_0200710C(v0, 3, param0->unk_00, 1, 0, 0, 0, 11); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 3, param0->unk_00, 1, 0, 0, 0, 11); } if (param0->unk_2A9 == 3) { - sub_02007130(v0, 11, 0, 0, 32, 11); + Graphics_LoadPaletteFromOpenNARC(v0, 11, 0, 0, 32, 11); } else { - sub_02007130(v0, 1, 0, 0, 32, 11); + Graphics_LoadPaletteFromOpenNARC(v0, 1, 0, 0, 32, 11); } sub_0200DAA4(param0->unk_00, 3, (1 + (18 + 12)), 11, 0, 11); diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 4eb31ea539..d2192c772c 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -1432,11 +1432,11 @@ static void ov10_02220E70(UnkStruct_ov10_0221FB28 *param0) v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__VS_DEMO_GRA, param0->unk_00->unk_24); - sub_020070E8(v0, 0, param0->unk_0C, 1, 0, 0, 0, param0->unk_00->unk_24); - sub_0200710C(v0, 4, param0->unk_0C, 1, 0, 0, 0, param0->unk_00->unk_24); - sub_0200710C(v0, 2, param0->unk_0C, 2, 0, 0, 0, param0->unk_00->unk_24); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 0, param0->unk_0C, 1, 0, 0, 0, param0->unk_00->unk_24); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 4, param0->unk_0C, 1, 0, 0, 0, param0->unk_00->unk_24); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 2, param0->unk_0C, 2, 0, 0, 0, param0->unk_00->unk_24); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 3, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->unk_24); + Graphics_LoadPaletteFromOpenNARC(v0, 1, 0, 0, 0, param0->unk_00->unk_24); PaletteData_LoadBufferFromHardware(param0->unk_08, 0, 0, 0x20 * 5); Bg_MaskPalette(1, 0x18c6); NARC_dtor(v0); @@ -1921,8 +1921,8 @@ static void ov10_02221A3C(UnkStruct_ov10_0221FB28 *param0) v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->unk_24); - sub_020070E8(v0, 15, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->unk_24); - sub_0200710C(v0, 17, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->unk_24); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 15, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->unk_24); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 17, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->unk_24); { NNSG2dPaletteData *v1; diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index 601fc61f2d..3a575cb70f 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -2045,7 +2045,7 @@ static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0) Bg_ToggleLayer(2, 0); Bg_LoadTiles(param0->unk_C0, 2, v0, (10 * 10 * ((8 / 2) * 8)), 0); PaletteData_LoadBufferFromFileStart(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); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A0[0], v6, param0->unk_C0, 2, 0, 0, 0, param0->unk_00); if (v2 == 1) { SysTask *v9; @@ -2516,7 +2516,7 @@ static BOOL ov12_02221A54(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FC static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FCDC *param1, int param2, int param3) { - sub_02006E3C(7, ov12_022234E4(param3, 0), param1->unk_C0, param2, 0, 0, 1, param1->unk_00); + Graphics_LoadTilesToBgLayer(7, ov12_022234E4(param3, 0), param1->unk_C0, param2, 0, 0, 1, param1->unk_00); PaletteData_LoadBufferFromFileStart(param1->unk_C4, 7, ov12_022234E4(param3, 1), param1->unk_00, 0, 0x20, (9 * 16)); Bg_ClearTilemap(param1->unk_C0, param2); @@ -2529,7 +2529,7 @@ static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FC v0 = 3; } - sub_02006E60(7, ov12_022234E4(param3, v0), param1->unk_C0, param2, 0, 0, 1, param1->unk_00); + Graphics_LoadTilemapToBgLayer(7, ov12_022234E4(param3, v0), param1->unk_C0, param2, 0, 0, 1, param1->unk_00); } } @@ -2749,11 +2749,11 @@ static BOOL ov12_02221D50(SysTask *param0, UnkStruct_ov12_02221BBC *param1) ov12_02223460(param1->unk_48, 3); ov12_02223488(param1->unk_48); } else { - sub_02006E3C(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_04, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->unk_00); + Graphics_LoadTilesToBgLayer(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_04, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->unk_00); PaletteData_LoadBufferFromFileStart(param1->unk_48->unk_C4, param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_08, param1->unk_48->unk_00, 0, param1->unk_48->unk_180.unk_14 * 0x20, param1->unk_48->unk_180.unk_10); } - 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); + Graphics_LoadTilemapToBgLayer(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); param1->unk_05++; break; case 4: @@ -2853,11 +2853,11 @@ static BOOL ov12_0222206C(SysTask *param0, UnkStruct_ov12_02221BBC *param1) ov12_02223460(param1->unk_48, 3); ov12_02223488(param1->unk_48); } else { - sub_02006E3C(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_04, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->unk_00); + Graphics_LoadTilesToBgLayer(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_04, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->unk_00); PaletteData_LoadBufferFromFileStart(param1->unk_48->unk_C4, param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_08, param1->unk_48->unk_00, 0, param1->unk_48->unk_180.unk_14 * 0x20, param1->unk_48->unk_180.unk_10); } - 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); + Graphics_LoadTilemapToBgLayer(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); Bg_ToggleLayer(3, 1); param1->unk_05++; @@ -3073,12 +3073,12 @@ void ov12_02222590(UnkStruct_ov12_0221FCDC *param0, int 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); + Graphics_LoadTilesToBgLayer(param0->unk_180.unk_00, param0->unk_180.unk_04, param0->unk_C0, param1, 0, 0, 1, param0->unk_00); } else { ov12_02223460(param0, param1); } - sub_02006E60(param0->unk_180.unk_00, param0->unk_180.unk_0C, param0->unk_C0, param1, 0, 0, 1, param0->unk_00); + Graphics_LoadTilemapToBgLayer(param0->unk_180.unk_00, param0->unk_180.unk_0C, param0->unk_C0, param1, 0, 0, 1, param0->unk_00); } void ov12_02222664(UnkStruct_ov12_0221FCDC *param0, int param1) @@ -3227,9 +3227,9 @@ static void ov12_02222860(UnkStruct_ov12_0221FCDC *param0) v0 = inline_ov12_022204C4(param0->unk_18); param0->unk_18 += 1; - sub_02006E3C(7, ov12_022234E4(v0, 0), param0->unk_C0, 3, 0, 0, 1, param0->unk_00); - sub_02006E84(7, ov12_022234E4(v0, 1), 0, 0, 0, param0->unk_00); - sub_02006E60(7, ov12_022234E4(v0, 2), param0->unk_C0, 3, 0, 0, 1, param0->unk_00); + Graphics_LoadTilesToBgLayer(7, ov12_022234E4(v0, 0), param0->unk_C0, 3, 0, 0, 1, param0->unk_00); + Graphics_LoadPalette(7, ov12_022234E4(v0, 1), 0, 0, 0, param0->unk_00); + Graphics_LoadTilemapToBgLayer(7, ov12_022234E4(v0, 2), param0->unk_C0, 3, 0, 0, 1, param0->unk_00); } static void ov12_022228DC(UnkStruct_ov12_0221FCDC *param0) diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c index e7d900ff9d..d621f2a9dc 100644 --- a/src/overlay012/ov12_02226B84.c +++ b/src/overlay012/ov12_02226B84.c @@ -644,7 +644,7 @@ void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0) { 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)); + Graphics_LoadTilesToBgLayer(7, ov12_022234E4(v2, 0), v0->unk_1C.unk_14, 2, 0, 0, 1, ov12_0221FDE4(param0)); PaletteData_LoadBufferFromFileStart(v0->unk_1C.unk_18, 7, ov12_022234E4(v2, 1), ov12_0221FDE4(param0), 0, 0x20, (9 * 16)); Bg_ClearTilemap(v0->unk_1C.unk_14, 2); @@ -657,7 +657,7 @@ void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0) v3 = 3; } - sub_02006E60(7, ov12_022234E4(v2, v3), v0->unk_1C.unk_14, 2, 0, 0, 1, ov12_0221FDE4(param0)); + Graphics_LoadTilemapToBgLayer(7, ov12_022234E4(v2, v3), v0->unk_1C.unk_14, 2, 0, 0, 1, ov12_0221FDE4(param0)); } } @@ -804,7 +804,7 @@ void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0) { 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)); + Graphics_LoadTilesToBgLayer(7, ov12_022234E4(v2, 0), v0->unk_1C.unk_14, 2, 0, 0, 1, ov12_0221FDE4(param0)); PaletteData_LoadBufferFromFileStart(v0->unk_1C.unk_18, 7, ov12_022234E4(v2, 1), ov12_0221FDE4(param0), 0, 0x20, (9 * 16)); Bg_ClearTilemap(v0->unk_1C.unk_14, 2); @@ -817,7 +817,7 @@ void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0) v3 = 3; } - sub_02006E60(7, ov12_022234E4(v2, v3), v0->unk_1C.unk_14, 2, 0, 0, 1, ov12_0221FDE4(param0)); + Graphics_LoadTilemapToBgLayer(7, ov12_022234E4(v2, v3), v0->unk_1C.unk_14, 2, 0, 0, 1, ov12_0221FDE4(param0)); } } diff --git a/src/overlay012/ov12_02234E44.c b/src/overlay012/ov12_02234E44.c index cf80c2f8f1..2194801d9c 100644 --- a/src/overlay012/ov12_02234E44.c +++ b/src/overlay012/ov12_02234E44.c @@ -65,10 +65,10 @@ static void ov12_02234E54(UnkStruct_ov12_02234E54 *param0, int param1) v1 = ov12_02223428(param0->unk_18.unk_04, 3); 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); + Graphics_LoadTilesToBgLayer(param0->unk_00.unk_00, Unk_ov12_0223A1D8[param0->unk_00.unk_04][0], param0->unk_18.unk_14, param1, 0, 0, 1, v0); PaletteData_LoadBufferFromFileStart(param0->unk_18.unk_18, param0->unk_00.unk_00, Unk_ov12_0223A1D8[param0->unk_00.unk_04][1], v0, 0, 0x20, (8 * 16)); 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); + Graphics_LoadTilemapToBgLayer(param0->unk_00.unk_00, Unk_ov12_0223A1D8[param0->unk_00.unk_04][2], param0->unk_18.unk_14, param1, 0, 0, 1, v0); } static void ov12_02234EF0(SysTask *param0, void *param1) diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index c98bdedf54..fa0da990a7 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -1125,7 +1125,7 @@ static void ov13_02220D4C(UnkStruct_ov13_022213F0 *param0) NARC *v0; v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_B_PLIST_GRA, param0->unk_00->unk_0C); - sub_020070E8(v0, 22, param0->unk_1E0, 7, 0, 0, 0, param0->unk_00->unk_0C); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 22, param0->unk_1E0, 7, 0, 0, 0, param0->unk_00->unk_0C); { NNSG2dScreenData *v1; @@ -1157,7 +1157,7 @@ static void ov13_02220D4C(UnkStruct_ov13_022213F0 *param0) { int v4 = ov16_0223EDE0(param0->unk_00->unk_08); - sub_02006E3C(38, sub_0200DD04(v4), param0->unk_1E0, 4, 1, 0, 0, param0->unk_00->unk_0C); + Graphics_LoadTilesToBgLayer(38, sub_0200DD04(v4), param0->unk_1E0, 4, 1, 0, 0, param0->unk_00->unk_0C); PaletteData_LoadBufferFromFileStart(param0->unk_1E4, 38, sub_0200DD08(v4), param0->unk_00->unk_0C, 1, 0x20, 14 * 16); } diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 5e5a1059ec..7dcfb8a0d5 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -726,8 +726,8 @@ static void ov13_02226FC4(UnkStruct_ov13_02227244 *param0) v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__B_BAG_GRA, param0->unk_00->unk_0C); - sub_020070E8(v0, 2, param0->unk_04, 6, 0, 0, 0, param0->unk_00->unk_0C); - sub_0200710C(v0, 0, param0->unk_04, 6, 0, 0, 0, param0->unk_00->unk_0C); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 2, param0->unk_04, 6, 0, 0, 0, param0->unk_00->unk_0C); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 0, param0->unk_04, 6, 0, 0, 0, param0->unk_00->unk_0C); { NNSG2dScreenData *v1; @@ -748,7 +748,7 @@ static void ov13_02226FC4(UnkStruct_ov13_02227244 *param0) { int v4 = ov16_0223EDE0(param0->unk_00->unk_00); - sub_02006E3C(38, sub_0200DD04(v4), param0->unk_04, 4, 1024 - (18 + 12), 0, 0, param0->unk_00->unk_0C); + Graphics_LoadTilesToBgLayer(38, sub_0200DD04(v4), param0->unk_04, 4, 1024 - (18 + 12), 0, 0, param0->unk_00->unk_0C); PaletteData_LoadBufferFromFileStart(param0->unk_08, 38, sub_0200DD08(v4), param0->unk_00->unk_0C, 1, 0x20, 14 * 16); } } diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index 02c8f99e61..82ea709a9f 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -637,8 +637,8 @@ static void ov17_0223BAD0(UnkStruct_ov17_02246F24 *param0) 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); + Graphics_LoadTilesToBgLayer(45, 3, param0->unk_0C.unk_24, 2, 0, 0x4000, 1, 21); + Graphics_LoadTilemapToBgLayer(45, 5, param0->unk_0C.unk_24, 2, 0, 0, 1, 21); Bg_SetPriority(1, 1); Bg_SetPriority(2, 0); @@ -657,10 +657,10 @@ void ov17_0223BB14(UnkStruct_ov17_02246F24 *param0, int param1, int param2) static void ov17_0223BBA8(UnkStruct_ov17_02246F24 *param0, NARC *param1) { - sub_020070E8(param1, 1, param0->unk_0C.unk_24, 3, 0, 0, 1, 21); - sub_0200710C(param1, 2, param0->unk_0C.unk_24, 3, 0, 0, 1, 21); - sub_020070E8(param1, 3, param0->unk_0C.unk_24, 1, 0, 0, 1, 21); - sub_0200710C(param1, 4, param0->unk_0C.unk_24, 1, 0, 0, 1, 21); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 1, param0->unk_0C.unk_24, 3, 0, 0, 1, 21); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 2, param0->unk_0C.unk_24, 3, 0, 0, 1, 21); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 3, param0->unk_0C.unk_24, 1, 0, 0, 1, 21); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 4, param0->unk_0C.unk_24, 1, 0, 0, 1, 21); ov17_0223BB14(param0, 0, 0); diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index 19e9a7d980..1b6f8cc661 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -602,8 +602,8 @@ static void ov17_0223D4A8(UnkStruct_ov17_02247A48 *param0, NARC *param1) { int v0; - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 23, param0->unk_0C.unk_24, 3, 0, 0, 1, 22); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 22, param0->unk_0C.unk_24, 3, 0, 0, 1, 22); Bg_ClearTilemap(param0->unk_0C.unk_24, 1); PaletteData_LoadBufferFromFileStart(param0->unk_0C.unk_44, 45, 35, 22, 0, 0, 0); PaletteData_LoadBufferFromFileStart(param0->unk_0C.unk_44, 45, 36, 22, 0, 0x20, 13 * 16); @@ -612,8 +612,8 @@ static void ov17_0223D4A8(UnkStruct_ov17_02247A48 *param0, NARC *param1) sub_0200DD0C(param0->unk_0C.unk_24, 1, 1, 15, v0, 22); PaletteData_LoadBufferFromFileStart(param0->unk_0C.unk_44, 38, sub_0200DD08(v0), 22, 0, 0x20, 14 * 16); - sub_020070E8(param1, 24, param0->unk_0C.unk_24, 2, 0, 0, 1, 22); - sub_0200710C(param1, 21, param0->unk_0C.unk_24, 2, 0, 0, 1, 22); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 24, param0->unk_0C.unk_24, 2, 0, 0, 1, 22); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 21, param0->unk_0C.unk_24, 2, 0, 0, 1, 22); PaletteData_LoadBufferFromFileStart(param0->unk_0C.unk_44, 45, 37, 22, 0, 0x20, 0xc * 16); } @@ -624,8 +624,8 @@ static void ov17_0223D5AC(UnkStruct_ov17_02247A48 *param0) static void ov17_0223D5B0(UnkStruct_ov17_02247A48 *param0, NARC *param1) { - sub_020070E8(param1, 19, param0->unk_0C.unk_24, 4, 0, 0, 1, 22); - sub_0200710C(param1, 20, param0->unk_0C.unk_24, 4, 0, 0, 1, 22); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 19, param0->unk_0C.unk_24, 4, 0, 0, 1, 22); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 20, param0->unk_0C.unk_24, 4, 0, 0, 1, 22); PaletteData_LoadBufferFromFileStart(param0->unk_0C.unk_44, 45, 34, 22, 1, 0, 0); } diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 47050f950f..8cc6cbd17b 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -783,7 +783,7 @@ static void ov17_0223E67C(UnkStruct_ov17_0224DF54 *param0, NARC *param1) { int v0; - sub_020070E8(param1, 13, param0->unk_14.unk_60, 3, 0, 0, 1, 23); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 13, param0->unk_14.unk_60, 3, 0, 0, 1, 23); { int v1, v2; @@ -791,7 +791,7 @@ static void ov17_0223E67C(UnkStruct_ov17_0224DF54 *param0, NARC *param1) ov17_0223E3CC(param0, &v1, &v2); v3 = ov17_0223F0BC(v2, 0); - sub_0200710C(param1, v3, param0->unk_14.unk_60, 3, 0, 0, 1, 23); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, v3, param0->unk_14.unk_60, 3, 0, 0, 1, 23); } PaletteData_LoadBufferFromFileStart(param0->unk_14.unk_90, 45, 32, 23, 0, 0, 0); diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index 337a03901d..1b2d9fa818 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -581,7 +581,7 @@ void *ov17_0223F88C(UnkStruct_02095C48 *param0, UnkStruct_ov17_0223F88C *param1, for (v4 = 0; v4 < 5; v4++) { v0->unk_20[v4] = Heap_AllocFromHeap(21, 0x800); - v3 = sub_020071D0(v1, Unk_ov17_02253250[v4], 1, &v2, 21); + v3 = Graphics_GetScrnDataFromOpenNARC(v1, Unk_ov17_02253250[v4], 1, &v2, 21); MI_CpuCopy32(v2->rawData, v0->unk_20[v4], 0x800); Heap_FreeToHeap(v3); } @@ -677,7 +677,7 @@ void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void } if ((v0->unk_00 != 0xffff) && ((param2 == 1) || (v0->unk_00 != v1->unk_00))) { - param0->unk_2C0 = sub_02006F50(45, v0->unk_00, 1, ¶m0->unk_2C4, 21); + param0->unk_2C0 = Graphics_GetCharData(45, v0->unk_00, 1, ¶m0->unk_2C4, 21); SysTask_ExecuteAfterVBlank(ov17_022411E4, param0, 10); } diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index f0b6315f63..f43cc43579 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -1754,7 +1754,7 @@ static void ov17_022431E8(SysTask *param0, void *param1) v1 = 2; } - sub_02006E60(45, v1, v0->unk_00->unk_0C.unk_24, 3, 0, 0, 1, 21); + Graphics_LoadTilemapToBgLayer(45, v1, v0->unk_00->unk_0C.unk_24, 3, 0, 0, 1, 21); } v0->unk_08++; diff --git a/src/overlay017/ov17_02247A48.c b/src/overlay017/ov17_02247A48.c index b56af29229..ef56dddb03 100644 --- a/src/overlay017/ov17_02247A48.c +++ b/src/overlay017/ov17_02247A48.c @@ -259,7 +259,7 @@ static void ov17_02247B00(UnkStruct_ov17_0224F30C *param0, void *param1, const U v0->unk_F5B = (Unk_ov17_02254468[0] + 4) * 8; } - sub_02006E60(45, 21, v0->unk_0C.unk_24, 2, 0, 0, 1, 22); + Graphics_LoadTilemapToBgLayer(45, 21, v0->unk_0C.unk_24, 2, 0, 0, 1, 22); SysTask_Start(ov17_02247C5C, v2, 30000); } diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index 41e114e34b..4dd109d334 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -355,31 +355,31 @@ static void ov17_022493DC(UnkStruct_ov17_022492DC *param0) param0->unk_E0[0] = Heap_AllocFromHeap(23, 0x200); param0->unk_E0[1] = Heap_AllocFromHeap(23, 0x200); - v2 = sub_02006F50(45, 9, 1, &v0, 23); + v2 = Graphics_GetCharData(45, 9, 1, &v0, 23); MI_CpuCopy32(v0->pRawData, param0->unk_C4[0], (0x8000 - (0x800 * 4))); Heap_FreeToHeap(v2); - v2 = sub_02006F50(45, 18, 1, &v0, 23); + v2 = Graphics_GetCharData(45, 18, 1, &v0, 23); MI_CpuCopy32(v0->pRawData, param0->unk_C4[1], (0x8000 - (0x800 * 4))); Heap_FreeToHeap(v2); - v2 = sub_02006F50(45, 16, 1, &v0, 23); + v2 = Graphics_GetCharData(45, 16, 1, &v0, 23); MI_CpuCopy32(v0->pRawData, param0->unk_C4[2], 6 * 12 * 0x20 * 3); Heap_FreeToHeap(v2); - v2 = sub_02006F6C(45, 7, 1, &v1, 23); + v2 = Graphics_GetScrnData(45, 7, 1, &v1, 23); MI_CpuCopy32(v1->rawData, param0->unk_D0[0], 0x800); Heap_FreeToHeap(v2); - v2 = sub_02006F6C(45, 8, 1, &v1, 23); + v2 = Graphics_GetScrnData(45, 8, 1, &v1, 23); MI_CpuCopy32(v1->rawData, param0->unk_D0[1], 0x800); Heap_FreeToHeap(v2); - v2 = sub_02006F6C(45, 17, 1, &v1, 23); + v2 = Graphics_GetScrnData(45, 17, 1, &v1, 23); MI_CpuCopy32(v1->rawData, param0->unk_D0[2], 0x800); Heap_FreeToHeap(v2); - v2 = sub_02006F6C(45, 28, 1, &v1, 23); + v2 = Graphics_GetScrnData(45, 28, 1, &v1, 23); MI_CpuCopy32(v1->rawData, param0->unk_D0[3], 0x800); Heap_FreeToHeap(v2); diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index ede9bbf8bb..1b56314091 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -612,8 +612,8 @@ static void ov17_0224FE68(UnkStruct_ov17_0224FCA0 *param0) static void ov17_0224FE70(UnkStruct_ov17_0224FCA0 *param0) { - sub_02006E3C(45, 19, param0->unk_10.unk_20, 4, 0, 0, 1, 24); - sub_02006E60(45, 20, param0->unk_10.unk_20, 4, 0, 0, 1, 24); + Graphics_LoadTilesToBgLayer(45, 19, param0->unk_10.unk_20, 4, 0, 0, 1, 24); + Graphics_LoadTilemapToBgLayer(45, 20, param0->unk_10.unk_20, 4, 0, 0, 1, 24); PaletteData_LoadBufferFromFileStart(param0->unk_10.unk_C0, 45, 34, 24, 1, 0, 0); } diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 7e31ecdad4..15fa78af12 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -282,8 +282,8 @@ void ov17_022509AC(UnkStruct_ov17_0224FCA0 *param0) v1 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, 24); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 23, param0->unk_10.unk_20, 3, 0, 0, 1, 24); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 22, param0->unk_10.unk_20, 3, 0, 0, 1, 24); Bg_ClearTilemap(param0->unk_10.unk_20, 1); PaletteData_LoadBufferFromFileStart(param0->unk_10.unk_C0, 45, 35, 24, 0, 0, 0); PaletteData_LoadBufferFromFileStart(param0->unk_10.unk_C0, 45, 36, 24, 0, 0x20, 13 * 16); @@ -320,9 +320,9 @@ void ov17_02250B00(UnkStruct_ov17_0224FCA0 *param0) v1 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, 24); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 27, param0->unk_10.unk_20, 3, 0, 0, 1, 24); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 25, param0->unk_10.unk_20, 3, 0, 0, 1, 24); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 26, param0->unk_10.unk_20, 2, 0, 0, 1, 24); Bg_ClearTilemap(param0->unk_10.unk_20, 1); PaletteData_LoadBufferFromFileStart(param0->unk_10.unk_C0, 45, 39, 24, 0, 0, 0); PaletteData_LoadBufferFromFileStart(param0->unk_10.unk_C0, 45, 36, 24, 0, 0x20, 13 * 16); diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index 1de0f6c308..49340d1fa1 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -181,7 +181,7 @@ BOOL ov19_021D61B0(UnkStruct_ov19_021D61B0 **param0, const UnkStruct_ov19_021D4D NNS_G2dInitImagePaletteProxy(&(v0->unk_1A8)); - sub_0200716C(v3, 26, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 10, &(v0->unk_1A8)); + Graphics_LoadPartialPaletteFromOpenNARC(v3, 26, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 10, &(v0->unk_1A8)); Font_UseImmediateGlyphAccess(FONT_SYSTEM, 10); v0->unk_1BC = sub_0200762C(10); @@ -1795,14 +1795,14 @@ 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 4, param0->unk_1C0, 1, 0, 0, 1, 10); 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 1, param0->unk_1C0, 2, 0, 0, 1, 10); + Graphics_LoadPaletteFromOpenNARC(param2, 5, 0, 0, 0x20 * 7, 10); if (ov19_021D5E08(param1) != 4) { - sub_0200710C(param2, 0, param0->unk_1C0, 2, 0, 0, 1, 10); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param2, 0, param0->unk_1C0, 2, 0, 0, 1, 10); } ov19_021D7A9C(¶m0->unk_494); diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c index 05c9e4fffb..999317ced3 100644 --- a/src/overlay019/ov19_021D79F8.c +++ b/src/overlay019/ov19_021D79F8.c @@ -174,7 +174,7 @@ static void ov19_021D7BC0(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_ NNSG2dPaletteData *v0; void *v1; - v1 = sub_02006F88(18, Unk_ov19_021E0178[param1->unk_01].unk_02, &v0, 10); + v1 = Graphics_GetPlttData(18, Unk_ov19_021E0178[param1->unk_01].unk_02, &v0, 10); if (v1) { int v2; diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c index 4b63b5787e..c8bfe5c836 100644 --- a/src/overlay019/ov19_021D8B54.c +++ b/src/overlay019/ov19_021D8B54.c @@ -80,8 +80,8 @@ BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 *param0, UnkStruct_ov19_021D61B0 *par param0->unk_10 = NULL; param0->unk_754 = 0; param0->unk_78E = 1; - param0->unk_14 = sub_02007204(param4, 13, 1, &(param0->unk_1C), 10); - param0->unk_18 = sub_02007220(param4, 14, 1, &(param0->unk_20), 10); + param0->unk_14 = Graphics_GetCellBankFromOpenNARC(param4, 13, 1, &(param0->unk_1C), 10); + param0->unk_18 = Graphics_GetAnimBankFromOpenNARC(param4, 14, 1, &(param0->unk_20), 10); if ((param0->unk_14 == NULL) || (param0->unk_18 == NULL)) { return 0; @@ -97,7 +97,7 @@ void ov19_021D8C1C(UnkStruct_ov19_021D8E00 *param0, NARC *param1) NNS_G2dInitImageProxy(&(param0->unk_24)); - sub_0200718C(param1, 12, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0 * 0x20, 10, &(param0->unk_24)); + Graphics_LoadImageMappingFromOpenNARC(param1, 12, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0 * 0x20, 10, &(param0->unk_24)); ov19_021D783C(&v0, &(param0->unk_24), ov19_021D77D0(param0->unk_794), param0->unk_1C, param0->unk_20, ((param0->unk_785 == 1) ? 1 : 2)); ov19_021D9D48(¶m0->unk_764, ¶m0->unk_768, ¶m0->unk_785, param0); diff --git a/src/overlay019/ov19_021DA270.c b/src/overlay019/ov19_021DA270.c index e9ce531021..9d82b858ba 100644 --- a/src/overlay019/ov19_021DA270.c +++ b/src/overlay019/ov19_021DA270.c @@ -26,9 +26,9 @@ BOOL ov19_021DA270(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021D61B0 *par param0->unk_48 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 10); NNS_G2dInitImagePaletteProxy(&v0); - sub_0200716C(param0->unk_48, PokeIconPalettesFileIndex(), NNS_G2D_VRAM_TYPE_2DMAIN, 2 * 0x20, 10, &v0); + Graphics_LoadPartialPaletteFromOpenNARC(param0->unk_48, PokeIconPalettesFileIndex(), NNS_G2D_VRAM_TYPE_2DMAIN, 2 * 0x20, 10, &v0); - v2 = sub_020071EC(param0->unk_48, PokeIconPalettesFileIndex(), &v1, 10); + v2 = Graphics_GetPlttDataFromOpenNARC(param0->unk_48, PokeIconPalettesFileIndex(), &v1, 10); if (v2) { BOOL v3; @@ -47,10 +47,10 @@ BOOL ov19_021DA270(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021D61B0 *par Heap_FreeToHeap(v2); } - param0->unk_08 = sub_02007204(param4, 21, 1, &(param0->unk_10), 10); - param0->unk_00 = sub_02007220(param4, 22, 1, &(param0->unk_04), 10); - param0->unk_14 = sub_02007204(param4, 23, 1, &(param0->unk_1C), 10); - param0->unk_18 = sub_02007220(param4, 24, 1, &(param0->unk_20), 10); + param0->unk_08 = Graphics_GetCellBankFromOpenNARC(param4, 21, 1, &(param0->unk_10), 10); + param0->unk_00 = Graphics_GetAnimBankFromOpenNARC(param4, 22, 1, &(param0->unk_04), 10); + param0->unk_14 = Graphics_GetCellBankFromOpenNARC(param4, 23, 1, &(param0->unk_1C), 10); + param0->unk_18 = Graphics_GetAnimBankFromOpenNARC(param4, 24, 1, &(param0->unk_20), 10); if ((param0->unk_08 == NULL) || (param0->unk_00 == NULL) || (param0->unk_48 == NULL)) { return 0; diff --git a/src/overlay019/ov19_021DA814.c b/src/overlay019/ov19_021DA814.c index 3f81fad84d..2a2db5b061 100644 --- a/src/overlay019/ov19_021DA814.c +++ b/src/overlay019/ov19_021DA814.c @@ -20,8 +20,8 @@ BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 *param0, UnkStruct_ov19_021D61B0 *par param0->unk_40 = param2; param0->unk_00 = param3; param0->unk_04 = NULL; - param0->unk_08 = sub_02007204(param4, 10, 1, &(param0->unk_10), 10); - param0->unk_0C = sub_02007220(param4, 11, 1, &(param0->unk_14), 10); + param0->unk_08 = Graphics_GetCellBankFromOpenNARC(param4, 10, 1, &(param0->unk_10), 10); + param0->unk_0C = Graphics_GetAnimBankFromOpenNARC(param4, 11, 1, &(param0->unk_14), 10); if ((param0->unk_08 == NULL) || (param0->unk_0C == NULL)) { return 0; @@ -36,7 +36,7 @@ void ov19_021DA864(UnkStruct_ov19_021DA8D8 *param0, NARC *param1) NNS_G2dInitImageProxy(&(param0->unk_18)); - sub_0200718C(param1, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1256 * 0x20, 10, &(param0->unk_18)); + Graphics_LoadImageMappingFromOpenNARC(param1, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1256 * 0x20, 10, &(param0->unk_18)); ov19_021D783C(&v0, &(param0->unk_18), ov19_021D77D0(param0->unk_44), param0->unk_10, param0->unk_14, 2); param0->unk_04 = ov19_021D785C(param0->unk_00, &v0, 183 + ov19_021D7820(param0->unk_44), 176, 44, NNS_G2D_VRAM_TYPE_2DMAIN); CellActor_SetExplicitPalette(param0->unk_04, 1); diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index a69774490c..e107cfb6b0 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -74,11 +74,11 @@ BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *par param0->unk_20 = ov19_021D7818(param1); param0->unk_18 = sub_0200C440(9, 6, 15, 10); param0->unk_1C = sub_0200C440(1, 2, 15, 10); - param0->unk_28 = sub_02007204(param6, 16, 1, &(param0->unk_2C), 10); + param0->unk_28 = Graphics_GetCellBankFromOpenNARC(param6, 16, 1, &(param0->unk_2C), 10); param0->unk_30 = NULL; param0->unk_44 = MessageLoader_GetNewStrbuf(param5, 21); param0->unk_48 = MessageLoader_GetNewStrbuf(param5, 22); - param0->unk_34 = sub_02006FA0(sub_0207C944(), sub_0207C924(), 1, &(param0->unk_38), 10); + param0->unk_34 = Graphics_GetCellBank(sub_0207C944(), sub_0207C924(), 1, &(param0->unk_38), 10); for (v0 = 0; v0 < 2; v0++) { param0->unk_3C[v0] = NULL; @@ -218,11 +218,11 @@ static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0) v2 = sub_0207C944(); v3 = sub_0207C908(2); - sub_02006E84(v2, sub_0207C920(), 1, 10 * 0x20, 0x20 * 3, 10); + Graphics_LoadPalette(v2, sub_0207C920(), 1, 10 * 0x20, 0x20 * 3, 10); for (v4 = 0; v4 < 2; v4++) { NNS_G2dInitImageProxy(&v0); - sub_02006F28(v2, v3, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, (1504 + (8 * v4)) * 0x20, 10, &v0); + Graphics_LoadImageMappingAndSetVramMode(v2, v3, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, (1504 + (8 * v4)) * 0x20, 10, &v0); ov19_021D783C(&v1, &v0, ov19_021D77D0(param0->unk_14), param0->unk_38, NULL, 3); param0->unk_3C[v4] = ov19_021D785C(param0->unk_0C, &v1, 24 + 36 * v4, 176, 46, NNS_G2D_VRAM_TYPE_2DMAIN); @@ -233,7 +233,7 @@ static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0) NNS_G2dInitImageProxy(&v0); - sub_02006F00(18, 15, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1480 * 0x20, 10, &v0); + Graphics_LoadImageMapping(18, 15, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1480 * 0x20, 10, &v0); ov19_021D783C(&v1, &v0, ov19_021D77D0(param0->unk_14), param0->unk_2C, NULL, 3); param0->unk_30 = ov19_021D785C(param0->unk_0C, &v1, 56, 176, 47, NNS_G2D_VRAM_TYPE_2DMAIN); @@ -416,7 +416,7 @@ static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 p v3 = sub_0207C944(); v4 = sub_0207C908(param1->unk_10->unk_4C.unk_0C); - sub_02006EC0(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10); + Graphics_LoadObjectTiles(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10); v2 = *CellActor_GetPosition(param1->unk_3C[0]); v2.y = (176 + (16 * param3)) << FX32_SHIFT; @@ -426,7 +426,7 @@ static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 p CellActor_SetDrawFlag(param1->unk_3C[0], 1); if (param1->unk_10->unk_4C.unk_0C != param1->unk_10->unk_4C.unk_0D) { - sub_02006EC0(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10); + Graphics_LoadObjectTiles(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10); v2.x += (36 << FX32_SHIFT); diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c index 3f93b5672f..ae13143aca 100644 --- a/src/overlay019/ov19_021DB2FC.c +++ b/src/overlay019/ov19_021DB2FC.c @@ -42,7 +42,7 @@ BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *par param0->unk_1C = 0; param0->unk_1E = 0; param0->unk_18 = NULL; - param0->unk_24 = sub_020071B4(param8, 25, 1, &(param0->unk_28), 10); + param0->unk_24 = Graphics_GetCharDataFromOpenNARC(param8, 25, 1, &(param0->unk_28), 10); if ((param0->unk_24 == NULL) || (param0->unk_30 == NULL) || (param0->unk_34 == NULL)) { return 0; @@ -98,8 +98,8 @@ void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 *param0) } } - sub_02006E3C(38, 0, param0->unk_00, 1, 512, 0, 0, 10); - sub_02006E84(38, 24, 0, 7 * 0x20, 0x20, 10); + Graphics_LoadTilesToBgLayer(38, 0, param0->unk_00, 1, 512, 0, 0, 10); + Graphics_LoadPalette(38, 24, 0, 7 * 0x20, 0x20, 10); sub_0200DD0C(param0->unk_00, 1, 521, 8, param0->unk_20, 10); } diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index a2d61c519e..39ad30b237 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -76,17 +76,17 @@ BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *par param0->unk_0C = param2; param0->unk_08 = param4; - sub_020070E8(param5, 4, param3, 1, 0, 0, 1, 10); + Graphics_LoadTilesToBgLayerFromOpenNARC(param5, 4, param3, 1, 0, 0, 1, 10); { NNSG2dPaletteData *v1; void *v2; - v2 = sub_020071EC(param5, 27, &v1, 10); + v2 = Graphics_GetPlttDataFromOpenNARC(param5, 27, &v1, 10); MI_CpuCopy16(v1->pRawData, &(param0->unk_E4[0][0]), 0x40); Heap_FreeToHeap(v2); - v2 = sub_020071EC(param5, 20, &v1, 10); + v2 = Graphics_GetPlttDataFromOpenNARC(param5, 20, &v1, 10); MI_CpuCopy16(v1->pRawData, &(param0->unk_E4[0][32]), 0x20); Heap_FreeToHeap(v2); @@ -109,10 +109,10 @@ BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *par GXS_LoadOBJPltt(param0->unk_E4[0], 13 * 0x20, 96); } - param0->unk_14 = sub_020071B4(param5, 17, 1, &(param0->unk_18), 10); - param0->unk_1C = sub_02007204(param5, 18, 1, &(param0->unk_20), 10); - param0->unk_34 = sub_020071D0(param5, 2, 1, &(param0->unk_38), 10); - param0->unk_2C = sub_020071D0(param5, 3, 1, &(param0->unk_30), 10); + param0->unk_14 = Graphics_GetCharDataFromOpenNARC(param5, 17, 1, &(param0->unk_18), 10); + param0->unk_1C = Graphics_GetCellBankFromOpenNARC(param5, 18, 1, &(param0->unk_20), 10); + param0->unk_34 = Graphics_GetScrnDataFromOpenNARC(param5, 2, 1, &(param0->unk_38), 10); + param0->unk_2C = Graphics_GetScrnDataFromOpenNARC(param5, 3, 1, &(param0->unk_30), 10); param0->unk_44 = sub_0200C440(2, 13, 4, 10); param0->unk_4BFC = Strbuf_Init(500, 10); param0->unk_10 = NULL; @@ -717,11 +717,11 @@ static void ov19_021DC4F8(UnkStruct_ov19_021DBA9C *param0, u32 param1) ov19_021D783C(&v0, &v2, ov19_021D77D0(param0->unk_00), v1->unk_1C, v1->unk_20, 0); NNS_G2dInitImageProxy(&v2); - v4 = sub_02006F50(16, Item_FileID(param1, 1), 0, &v3, 10); + v4 = Graphics_GetCharData(16, Item_FileID(param1, 1), 0, &v3, 10); v3->mapingType = GX_GetOBJVRamModeChar(); NNS_G2dLoadImage1DMapping(v3, 1520 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &v2); - sub_02006E84(16, Item_FileID(param1, 2), 1, 6 * 0x20, 0x20, 10); + Graphics_LoadPalette(16, Item_FileID(param1, 2), 1, 6 * 0x20, 0x20, 10); param0->unk_90 = ov19_021D785C(param0->unk_08, &v0, 18, 224, 0, NNS_G2D_VRAM_TYPE_2DMAIN); if (param0->unk_90) { diff --git a/src/overlay019/ov19_021DC5F0.c b/src/overlay019/ov19_021DC5F0.c index 3df4bccba8..c5f5ad8657 100644 --- a/src/overlay019/ov19_021DC5F0.c +++ b/src/overlay019/ov19_021DC5F0.c @@ -68,7 +68,7 @@ BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *par ov19_021DA3CC(param0->unk_38, param0->unk_3C, 6); param0->unk_1C = Heap_AllocFromHeap(10, sizeof(VecFx32) * 6 * 8); - param0->unk_14 = sub_020071D0(param5, 6, 1, &(param0->unk_18), 10); + param0->unk_14 = Graphics_GetScrnDataFromOpenNARC(param5, 6, 1, &(param0->unk_18), 10); if ((param0->unk_14 == NULL) || (param0->unk_1C == NULL)) { return 0; diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c index 2cecf113ff..5d6eef668a 100644 --- a/src/overlay019/ov19_021DCF88.c +++ b/src/overlay019/ov19_021DCF88.c @@ -418,10 +418,10 @@ void ov19_021DD078(UnkStruct_ov19_021DCF88 *param0) void ov19_021DD114(UnkStruct_ov19_021DCF88 *param0, NARC *param1) { if (param0) { - sub_020070E8(param1, 127, param0->unk_08, 7, 0, 0, 1, 10); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 127, param0->unk_08, 7, 0, 0, 1, 10); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 124, param0->unk_08, 7, 0, 0, 1, 10); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 125, param0->unk_08, 6, 0, 0, 1, 10); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 126, param0->unk_08, 5, 0, 0, 1, 10); 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); @@ -430,7 +430,7 @@ void ov19_021DD114(UnkStruct_ov19_021DCF88 *param0, NARC *param1) Window_FillTilemap(&(param0->unk_88), 0x0); Window_CopyToVRAM(¶m0->unk_88); ov19_021DE324(param0); - sub_02007130(param1, 128, 4, 0, 0x20 * 3, 10); + Graphics_LoadPaletteFromOpenNARC(param1, 128, 4, 0, 0x20 * 3, 10); ov19_021DD224(param0, param1); } } @@ -443,7 +443,7 @@ static void ov19_021DD224(UnkStruct_ov19_021DCF88 *param0, NARC *param1) ov19_021DD2BC(param0, param1); NNS_G2dInitImageProxy(&v1); - sub_0200718C(param1, 138, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0 * 0x20, 10, &(v1)); + Graphics_LoadImageMappingFromOpenNARC(param1, 138, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0 * 0x20, 10, &(v1)); ov19_021D783C(&v0, &v1, &(param0->unk_18), param0->unk_9C, param0->unk_A4, 3); @@ -459,13 +459,13 @@ static void ov19_021DD224(UnkStruct_ov19_021DCF88 *param0, NARC *param1) static void ov19_021DD2BC(UnkStruct_ov19_021DCF88 *param0, NARC *param1) { - param0->unk_98 = sub_02007204(param1, 139, 1, &(param0->unk_9C), 10); - param0->unk_A0 = sub_02007220(param1, 140, 1, &(param0->unk_A4), 10); - param0->unk_A8 = sub_02007204(param1, 142, 1, &(param0->unk_AC), 10); - param0->unk_B0 = sub_02007220(param1, 143, 1, &(param0->unk_B4), 10); + param0->unk_98 = Graphics_GetCellBankFromOpenNARC(param1, 139, 1, &(param0->unk_9C), 10); + param0->unk_A0 = Graphics_GetAnimBankFromOpenNARC(param1, 140, 1, &(param0->unk_A4), 10); + param0->unk_A8 = Graphics_GetCellBankFromOpenNARC(param1, 142, 1, &(param0->unk_AC), 10); + param0->unk_B0 = Graphics_GetAnimBankFromOpenNARC(param1, 143, 1, &(param0->unk_B4), 10); NNS_G2dInitImagePaletteProxy(&(param0->unk_18)); - sub_0200716C(param1, 144, NNS_G2D_VRAM_TYPE_2DSUB, 0, 10, &(param0->unk_18)); + Graphics_LoadPartialPaletteFromOpenNARC(param1, 144, NNS_G2D_VRAM_TYPE_2DSUB, 0, 10, &(param0->unk_18)); } static SysTask *ov19_021DD344(UnkStruct_ov19_021DCF88 *param0, SysTaskFunc param1, void *param2) @@ -933,7 +933,7 @@ static void ov19_021DD9DC(UnkStruct_ov19_021DCF88 *param0) v2 = ov19_021D5EC8(param0->unk_04); NNS_G2dInitImageProxy(&v1); - sub_02006F00(18, 141, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 192 * 0x20, 10, &v1); + Graphics_LoadImageMapping(18, 141, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 192 * 0x20, 10, &v1); for (v3 = 0; v3 < 8; v3++) { ov19_021D783C(&v0, &v1, &(param0->unk_18), param0->unk_AC, param0->unk_B4, 2); diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c index b0e022f017..d6f6c3cca8 100644 --- a/src/overlay019/ov19_021DE3E8.c +++ b/src/overlay019/ov19_021DE3E8.c @@ -107,7 +107,7 @@ static void ov19_021DE450(UnkStruct_ov19_021DE3E8 *param0) int v4; ov19_021D783C(&v0, &v1, ov19_021D77D0(param0->unk_04), param0->unk_14->unk_1C, param0->unk_14->unk_20, 0); - v3 = sub_02006F50(16, Item_FileID(1, 1), 0, &v2, 10); + v3 = Graphics_GetCharData(16, Item_FileID(1, 1), 0, &v2, 10); if (v3) { int v5; @@ -225,8 +225,8 @@ static void ov19_021DE5D4(UnkStruct_ov19_021DE3E8 *param0) v2 = 2; } - sub_02006EC0(16, Item_FileID(v0, 1), 0, Unk_ov19_021E04CC[v3].unk_00, 0, 0, 10); - sub_02006E84(16, Item_FileID(v0, 2), 1, Unk_ov19_021E04CC[v3].unk_04 * 0x20, 0x20, 10); + Graphics_LoadObjectTiles(16, Item_FileID(v0, 1), 0, Unk_ov19_021E04CC[v3].unk_00, 0, 0, 10); + Graphics_LoadPalette(16, Item_FileID(v0, 2), 1, Unk_ov19_021E04CC[v3].unk_04 * 0x20, 0x20, 10); CellActor_SetExplicitPriority(param0->unk_1C[v3], v2); ov19_021D78AC(param0->unk_1C[v3], 2); @@ -266,8 +266,8 @@ static void ov19_021DE718(UnkStruct_ov19_021DE3E8 *param0, int param1, int param ov19_021DE694(param0, &v0, &v1); - sub_02006EC0(16, Item_FileID(param2, 1), 0, Unk_ov19_021E04CC[param1].unk_00, 0, 0, 10); - sub_02006E84(16, Item_FileID(param2, 2), 1, Unk_ov19_021E04CC[param1].unk_04 * 0x20, 0x20, 10); + Graphics_LoadObjectTiles(16, Item_FileID(param2, 1), 0, Unk_ov19_021E04CC[param1].unk_00, 0, 0, 10); + Graphics_LoadPalette(16, Item_FileID(param2, 2), 1, Unk_ov19_021E04CC[param1].unk_04 * 0x20, 0x20, 10); CellActor_SetExplicitPriority(param0->unk_1C[param1], v1); ov19_021D78AC(param0->unk_1C[param1], 3); diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c index 16ace07dae..5d4732811a 100644 --- a/src/overlay019/ov19_021DEC04.c +++ b/src/overlay019/ov19_021DEC04.c @@ -95,8 +95,8 @@ BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *pa v0->unk_0C = param3; v0->unk_10 = param4; v0->unk_14 = ov19_021D77D8(param1); - v0->unk_370 = sub_020071D0(param6, 7, 1, &(v0->unk_368), 10); - v0->unk_374 = sub_020071D0(param6, 8, 1, &(v0->unk_36C), 10); + v0->unk_370 = Graphics_GetScrnDataFromOpenNARC(param6, 7, 1, &(v0->unk_368), 10); + v0->unk_374 = Graphics_GetScrnDataFromOpenNARC(param6, 8, 1, &(v0->unk_36C), 10); v0->unk_6C = param5; v0->unk_70 = MessageLoader_Init(1, 26, 647, 10); v0->unk_74 = Strbuf_Init(32, 10); @@ -127,12 +127,12 @@ void ov19_021DECE8(UnkStruct_ov19_021DEC04 *param0, NARC *param1) if (param0) { ov19_021DEEFC(param0); - sub_020070E8(param1, 132, param0->unk_0C, 5, 0, 0, 1, 10); - sub_0200710C(param1, 129, param0->unk_0C, 5, 0, 0, 1, 10); - sub_0200710C(param1, 130, param0->unk_0C, 6, 0, 0, 1, 10); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 132, param0->unk_0C, 5, 0, 0, 1, 10); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 129, param0->unk_0C, 5, 0, 0, 1, 10); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 130, param0->unk_0C, 6, 0, 0, 1, 10); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 131, param0->unk_0C, 7, 0, 0, 1, 10); + Graphics_LoadPaletteFromOpenNARC(param1, 133, 4, 0, 0x20 * 4, 10); + Graphics_LoadPalette(19, PokeIconPalettesFileIndex(), 5, 4 * 0x20, 4 * 0x20, 10); Bg_ClearTilesRange(4, 0x20, 0, 10); Bg_FillTilemapRect(param0->unk_0C, 4, 0x0, 0, 0, 32, 32, 17); @@ -583,12 +583,12 @@ static void ov19_021DF5D0(UnkStruct_ov19_021DEC04 *param0, NARC *param1) CellActorResourceData v2; u32 v3, v4, v5; - param0->unk_5C = sub_02007204(param1, 135, 1, &(param0->unk_60), 10); - param0->unk_64 = sub_02007220(param1, 136, 1, &(param0->unk_68), 10); + param0->unk_5C = Graphics_GetCellBankFromOpenNARC(param1, 135, 1, &(param0->unk_60), 10); + param0->unk_64 = Graphics_GetAnimBankFromOpenNARC(param1, 136, 1, &(param0->unk_68), 10); - sub_02007130(param1, 137, 5, 0, 0x20 * 3, 10); + Graphics_LoadPaletteFromOpenNARC(param1, 137, 5, 0, 0x20 * 3, 10); NNS_G2dInitImageProxy(&v1); - v3 = sub_0200718C(param1, 134, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 10, &v1); + v3 = Graphics_LoadImageMappingFromOpenNARC(param1, 134, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 10, &v1); ov19_021D783C(&v2, &v1, ov19_021D77D0(param0->unk_04), param0->unk_60, param0->unk_68, 1); for (v4 = 0; v4 < 2; v4++) { diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c index 2c9e97f2a1..15e757dbc7 100644 --- a/src/overlay020/ov20_021D2098.c +++ b/src/overlay020/ov20_021D2098.c @@ -320,11 +320,11 @@ static void ov20_021D2370(UnkStruct_ov20_021D2238 *param0, NARC *param1) NNS_G2dInitImageProxy(&(v0->unk_1B4[0])); NNS_G2dInitImageProxy(&(v0->unk_1B4[1])); - sub_0200718C(param1, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 35, &(v0->unk_1B4[0])); - sub_0200716C(param1, 10, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 35, &(v0->unk_1FC[0])); + Graphics_LoadImageMappingFromOpenNARC(param1, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 35, &(v0->unk_1B4[0])); + Graphics_LoadPartialPaletteFromOpenNARC(param1, 10, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 35, &(v0->unk_1FC[0])); - v0->unk_234[0] = sub_02007204(param1, 7, 1, &(v0->unk_224[0]), 35); - v0->unk_23C[0] = sub_02007220(param1, 8, 1, &(v0->unk_22C[0]), 35); + v0->unk_234[0] = Graphics_GetCellBankFromOpenNARC(param1, 7, 1, &(v0->unk_224[0]), 35); + v0->unk_23C[0] = Graphics_GetAnimBankFromOpenNARC(param1, 8, 1, &(v0->unk_22C[0]), 35); v0->unk_234[1] = NULL; v0->unk_23C[1] = NULL; } diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c index e588cc8be9..ca9937fecf 100644 --- a/src/overlay020/ov20_021D2EA4.c +++ b/src/overlay020/ov20_021D2EA4.c @@ -127,9 +127,9 @@ void ov20_021D2F50(UnkStruct_ov20_021D30F8 *param0, NARC *param1) v0 = ov20_021D2E04(param0->unk_00); ov20_021D30A4(param0, param1); - sub_0200710C(param1, 0, v0, 0, 0, 0, 1, 35); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 0, v0, 0, 0, 0, 1, 35); - v1 = sub_020070E8(param1, 1, v0, 0, 0, 0, 1, 35); + v1 = Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 1, v0, 0, 0, 0, 1, 35); v1 /= 0x20; Window_Add(v0, ¶m0->unk_0C, 0, 3, 1, 27, 4, 0, v1); @@ -141,11 +141,11 @@ void ov20_021D2F50(UnkStruct_ov20_021D30F8 *param0, NARC *param1) 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); + Graphics_LoadTilesToBgLayer(38, 0, v0, 0, v1, 0, 0, 35); param0->unk_60 = v1; v1 += 9; - sub_02006E84(38, 24, 0, 14 * 0x20, 0x20, 35); + Graphics_LoadPalette(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); Window_PutToTilemap(¶m0->unk_0C); @@ -164,9 +164,9 @@ static void ov20_021D30A4(UnkStruct_ov20_021D30F8 *param0, NARC *param1) NNSG2dPaletteData *v0; void *v1; - sub_02007130(param1, 6, 0, 0, 14 * 0x20, 35); + Graphics_LoadPaletteFromOpenNARC(param1, 6, 0, 0, 14 * 0x20, 35); - v1 = sub_020071EC(param1, 6, &v0, 35); + v1 = Graphics_GetPlttDataFromOpenNARC(param1, 6, &v0, 35); MI_CpuCopy16(v0->pRawData, param0->unk_70, sizeof(param0->unk_70)); DC_FlushRange(param0->unk_70, sizeof(param0->unk_70)); diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c index b6e014f9e1..c5f4637ef0 100644 --- a/src/overlay020/ov20_021D3864.c +++ b/src/overlay020/ov20_021D3864.c @@ -62,8 +62,8 @@ void ov20_021D3898(UnkStruct_ov20_021D3980 *param0, NARC *param1) v2 = ov20_021D2E04(param0->unk_00); - sub_0200710C(param1, 4, v2, 3, 0, 0, 1, 35); - sub_020070E8(param1, 5, v2, 3, 0, 0, 1, 35); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 4, v2, 3, 0, 0, 1, 35); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 5, v2, 3, 0, 0, 1, 35); ov20_021D390C(v2, &v0, 0); ov20_021D390C(v2, &v1, 1); diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c index 678f7fa573..7fc6d59266 100644 --- a/src/overlay020/ov20_021D3A54.c +++ b/src/overlay020/ov20_021D3A54.c @@ -76,9 +76,9 @@ void ov20_021D3A98(UnkStruct_ov20_021D3E0C *param0, NARC *param1) v0 = ov20_021D2E04(param0->unk_00); - sub_0200710C(param1, 2, v0, 1, 0, 0, 1, 35); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 2, v0, 1, 0, 0, 1, 35); - v1 = sub_020070E8(param1, 3, v0, 1, 0, 0, 1, 35); + v1 = Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 3, v0, 1, 0, 0, 1, 35); v1 /= 0x20; v1 = ov20_021D3B74(param0, v0, v1); v1 = ov20_021D3C78(param0, v0, v1); diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c index 18303de705..9ff114e999 100644 --- a/src/overlay020/ov20_021D4728.c +++ b/src/overlay020/ov20_021D4728.c @@ -91,8 +91,8 @@ void ov20_021D4764(UnkStruct_ov20_021D4AD4 *param0) void ov20_021D4774(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) { - sub_02007130(param1, 21, 4, 0, 0x40, 35); - sub_0200710C(param1, 11, param0->unk_0C, 4, 0, 0, 1, 35); + Graphics_LoadPaletteFromOpenNARC(param1, 21, 4, 0, 0x40, 35); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 11, param0->unk_0C, 4, 0, 0, 1, 35); ov20_021D4874(param0, param1); ov20_021D48C4(param0, param1); @@ -126,7 +126,7 @@ static void ov20_021D4874(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) NNSG2dScreenData *v3; for (v1 = 0; v1 < NELEMS(v0); v1++) { - v2 = sub_020071D0(param1, v0[v1], 1, &v3, 35); + v2 = Graphics_GetScrnDataFromOpenNARC(param1, v0[v1], 1, &v3, 35); if (v2) { MI_CpuCopy16(v3->rawData, param0->unk_2C[v1], 77 * 2); @@ -145,7 +145,7 @@ static void ov20_021D48C4(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) Font_InitManager(FONT_SUBSCREEN, HEAP_ID_SYSTEM); v0 = MessageBank_GetNewStrbufFromNARC(0x1A, 0x1B5, 0xB, 0x23); v1 = MessageBank_GetNewStrbufFromNARC(0x1A, 0x1B5, 0xC, 0x23); - v2 = sub_020071B4(param1, 20, 1, &v3, 0x23); + v2 = Graphics_GetCharDataFromOpenNARC(param1, 20, 1, &v3, 0x23); if (v2) { Window v4; @@ -205,8 +205,8 @@ static void ov20_021D4A24(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) NNS_G2dInitImagePaletteProxy(&v0); NNS_G2dInitImageProxy(&v1); - sub_0200716C(param1, 25, NNS_G2D_VRAM_TYPE_2DSUB, 0, 35, &v0); - sub_0200718C(param1, 24, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 35, &v1); + Graphics_LoadPartialPaletteFromOpenNARC(param1, 25, NNS_G2D_VRAM_TYPE_2DSUB, 0, 35, &v0); + Graphics_LoadImageMappingFromOpenNARC(param1, 24, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 35, &v1); ov20_021D4AF8(&(param0->unk_1C), param1, 22, 23); @@ -234,8 +234,8 @@ static void ov20_021D4AD4(UnkStruct_ov20_021D4AD4 *param0) static void ov20_021D4AF8(UnkStruct_ov20_021D4B2C *param0, NARC *param1, u32 param2, u32 param3) { - param0->unk_00 = sub_02007204(param1, param2, 1, &(param0->unk_04), 35); - param0->unk_08 = sub_02007220(param1, param3, 1, &(param0->unk_0C), 35); + param0->unk_00 = Graphics_GetCellBankFromOpenNARC(param1, param2, 1, &(param0->unk_04), 35); + param0->unk_08 = Graphics_GetAnimBankFromOpenNARC(param1, param3, 1, &(param0->unk_0C), 35); } static void ov20_021D4B2C(UnkStruct_ov20_021D4B2C *param0) diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 8c167d4540..8142742ecc 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -635,25 +635,25 @@ static void ov21_021E96A8(BgConfig *param0, int param1, NARC *param2) void *v0; NNSG2dScreenData *v1; - sub_02007130(param2, 6, 0, 0, 0, param1); - sub_020070E8(param2, 33, param0, 3, 0, 0, 1, param1); + Graphics_LoadPaletteFromOpenNARC(param2, 6, 0, 0, 0, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 33, param0, 3, 0, 0, 1, param1); - v0 = sub_020071D0(param2, 50, 1, &v1, param1); + v0 = Graphics_GetScrnDataFromOpenNARC(param2, 50, 1, &v1, param1); 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); + v0 = Graphics_GetScrnDataFromOpenNARC(param2, 51, 1, &v1, param1); 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); + v0 = Graphics_GetScrnDataFromOpenNARC(param2, 52, 1, &v1, param1); 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); + v0 = Graphics_GetScrnDataFromOpenNARC(param2, 54, 1, &v1, param1); Bg_LoadToTilemapRect(param0, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); @@ -665,9 +665,9 @@ static void ov21_021E97C4(BgConfig *param0, int param1, NARC *param2) void *v0; NNSG2dScreenData *v1; - sub_020070E8(param2, 33, param0, 2, 0, 0, 1, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 33, param0, 2, 0, 0, 1, param1); - v0 = sub_020071D0(param2, 57, 1, &v1, param1); + v0 = Graphics_GetScrnDataFromOpenNARC(param2, 57, 1, &v1, param1); Bg_LoadToTilemapRect(param0, 2, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); @@ -785,12 +785,12 @@ static void ov21_021E9A40(UnkStruct_ov21_021E9A9C *param0, int param1, int param int v0; if (param2 == 0) { - param0->unk_00[0] = sub_020071EC(param3, 23, ¶m0->unk_08[0], param1); + param0->unk_00[0] = Graphics_GetPlttDataFromOpenNARC(param3, 23, ¶m0->unk_08[0], param1); } else { - param0->unk_00[0] = sub_020071EC(param3, 24, ¶m0->unk_08[0], param1); + param0->unk_00[0] = Graphics_GetPlttDataFromOpenNARC(param3, 24, ¶m0->unk_08[0], param1); } - param0->unk_00[1] = sub_020071EC(param3, 26, ¶m0->unk_08[1], param1); + param0->unk_00[1] = Graphics_GetPlttDataFromOpenNARC(param3, 26, ¶m0->unk_08[1], param1); param0->unk_10 = 0; param0->unk_1C = 0; diff --git a/src/overlay022/ov22_022597BC.c b/src/overlay022/ov22_022597BC.c index d91c2102be..0a7b200ad1 100644 --- a/src/overlay022/ov22_022597BC.c +++ b/src/overlay022/ov22_022597BC.c @@ -101,7 +101,7 @@ void ov22_02259838(UnkStruct_ov22_02259820 *param0, int param1) param0->unk_10 = 0; } - v1 = sub_02006F6C(param0->unk_00->unk_04, v2, 0, &v0, param0->unk_14); + v1 = Graphics_GetScrnData(param0->unk_00->unk_04, v2, 0, &v0, param0->unk_14); ov22_02259ABC(param0->unk_00->unk_00, param0->unk_00->unk_1C, v0, param0->unk_00->unk_14, param0->unk_00->unk_18, param0->unk_00->unk_0C, param0->unk_00->unk_10, param0->unk_00->unk_28, param0->unk_00->unk_20); Heap_FreeToHeap(v1); @@ -113,7 +113,7 @@ void ov22_022598A0(UnkStruct_ov22_02259820 *param0) NNSG2dScreenData *v0; void *v1; - v1 = sub_02006F6C(param0->unk_00->unk_04, param0->unk_00->unk_08, 0, &v0, param0->unk_14); + v1 = Graphics_GetScrnData(param0->unk_00->unk_04, param0->unk_00->unk_08, 0, &v0, param0->unk_14); ov22_02259ABC(param0->unk_00->unk_00, param0->unk_00->unk_1C, v0, param0->unk_00->unk_14, param0->unk_00->unk_18, param0->unk_00->unk_0C, param0->unk_00->unk_10, param0->unk_00->unk_28, param0->unk_00->unk_20); Heap_FreeToHeap(v1); @@ -181,7 +181,7 @@ static void ov22_022599A0(UnkStruct_ov22_022599A0 *param0, int *param1, int *par ov22_02259B8C(param0->unk_04, param0->unk_0C, v0, param0->unk_24 * 32, param0->unk_20 * 32, param0->unk_2C); - v2 = sub_02006F6C(param0->unk_04, param0->unk_10, 0, &v1, param0->unk_2C); + v2 = Graphics_GetScrnData(param0->unk_04, param0->unk_10, 0, &v1, param0->unk_2C); v4 = v1->screenWidth / 8; v3 = v1->screenHeight / 8; @@ -234,7 +234,7 @@ static void ov22_02259B3C(u32 param0, u32 param1, BgConfig *param2, u32 param3, v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_ov22_02259B3C)); memset(v0, 0, sizeof(UnkStruct_ov22_02259B3C)); - v0->unk_08 = sub_02006F50(param0, param1, 0, &v0->unk_04, param5); + v0->unk_08 = Graphics_GetCharData(param0, param1, 0, &v0->unk_04, param5); v0->unk_00 = param2; v0->unk_0C = param3; v0->unk_10 = param4; @@ -249,7 +249,7 @@ static void ov22_02259B8C(u32 param0, u32 param1, int param2, u32 param3, u32 pa v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_ov22_02259B8C)); memset(v0, 0, sizeof(UnkStruct_ov22_02259B8C)); - v0->unk_04 = sub_02006F88(param0, param1, &v0->unk_00, param5); + v0->unk_04 = Graphics_GetPlttData(param0, param1, &v0->unk_00, param5); v0->unk_08 = param2; v0->unk_0C = param3; v0->unk_10 = param4; diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index 7befffe0ca..7f6f03d618 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -188,8 +188,8 @@ static void ov22_0225B85C(UnkStruct_ov22_0225B85C *param0) int v2; int v3; - sub_02007130(param0->unk_14.unk_5C, 126, 0, 3 * 32, 64, 14); - sub_020070E8(param0->unk_14.unk_5C, 125, param0->unk_14.unk_40, 1, 0, 0, 0, 14); + Graphics_LoadPaletteFromOpenNARC(param0->unk_14.unk_5C, 126, 0, 3 * 32, 64, 14); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_5C, 125, param0->unk_14.unk_40, 1, 0, 0, 0, 14); if (param0->unk_0C == 0) { v2 = 128; @@ -199,7 +199,7 @@ static void ov22_0225B85C(UnkStruct_ov22_0225B85C *param0) v3 = 3; } - v0 = sub_020071D0(param0->unk_14.unk_5C, v2, 0, &v1, 14); + v0 = Graphics_GetScrnDataFromOpenNARC(param0->unk_14.unk_5C, v2, 0, &v1, 14); 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); @@ -209,9 +209,9 @@ static void ov22_0225B85C(UnkStruct_ov22_0225B85C *param0) static void ov22_0225B910(UnkStruct_ov22_0225B85C *param0) { - sub_02006E84(12, 12, 4, 0, 32, 14); - sub_02006E60(12, 11, param0->unk_14.unk_40, 4, 0, 0, 1, 14); - sub_02006E3C(12, 10, param0->unk_14.unk_40, 4, 0, 0, 1, 14); + Graphics_LoadPalette(12, 12, 4, 0, 32, 14); + Graphics_LoadTilemapToBgLayer(12, 11, param0->unk_14.unk_40, 4, 0, 0, 1, 14); + Graphics_LoadTilesToBgLayer(12, 10, param0->unk_14.unk_40, 4, 0, 0, 1, 14); } static void ov22_0225B964(UnkStruct_ov22_0225B85C *param0) diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index 082cc10f93..8f52081386 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -1324,14 +1324,14 @@ static void ov23_0223EE80(UnkStruct_ov23_0223EE80 *param0) NARC *v6; v6 = NARC_ctor(NARC_INDEX_DATA__UG_FOSSIL, 29); - sub_02007130(v6, 1, 0, 0, 32 * 3, 29); + Graphics_LoadPaletteFromOpenNARC(v6, 1, 0, 0, 32 * 3, 29); - v0 = sub_020070E8(v6, 0, v1, 0, 0, 0, 0, 29); - sub_0200710C(v6, 2, v1, 0, 0, 0, 0, 29); + v0 = Graphics_LoadTilesToBgLayerFromOpenNARC(v6, 0, v1, 0, 0, 0, 0, 29); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v6, 2, v1, 0, 0, 0, 0, 29); NARC_dtor(v6); } - sub_02006E84(50, 52, 0, 10 * 0x20, 4 * 0x20, 29); + Graphics_LoadPalette(50, 52, 0, 10 * 0x20, 4 * 0x20, 29); ov23_0223FA3C(v1, v0, param0); } @@ -1348,7 +1348,7 @@ static void ov23_0223EF98(void) 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); + Graphics_LoadTilesToBgLayer(55, 9, Unk_ov23_02257740->unk_04, 2, 1, 0, 0, 29); ov23_022401B0(Unk_ov23_02257740->unk_04); @@ -1590,7 +1590,7 @@ static void ov23_0223F118(SysTask *param0, void *param1) HBlankSystem_Stop(v0->fieldSystem->unk_04->hBlankSystem); HBlankSystem_Start(v0->fieldSystem->unk_04->hBlankSystem); - sub_02006E84(50, 52, 0, 10 * 0x20, 4 * 0x20, 4); + Graphics_LoadPalette(50, 52, 0, 10 * 0x20, 4 * 0x20, 4); sub_0200DAA4(v0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 2, 4); CommPlayerMan_Restart(); @@ -1938,14 +1938,14 @@ static int ov23_0223FC9C(int param0, BgConfig *param1, int param2, UnkStruct_ov2 } if (param0 >= param3->unk_0C) { - sub_02007130(v12, v0->unk_00->unk_12, 0, (v11 + 3) * 32, 32, 29); + Graphics_LoadPaletteFromOpenNARC(v12, v0->unk_00->unk_12, 0, (v11 + 3) * 32, 32, 29); } else { - param3->unk_18[param0] = sub_020071EC(v12, v0->unk_00->unk_12, ¶m3->unk_28[param0], 29); + param3->unk_18[param0] = Graphics_GetPlttDataFromOpenNARC(v12, v0->unk_00->unk_12, ¶m3->unk_28[param0], 29); DC_FlushRange(param3->unk_28[param0]->pRawData, 32); GX_LoadBGPltt(param3->unk_28[param0]->pRawData, (v11 + 3) * 32, 32); } - v10 = sub_020070E8(v12, v0->unk_00->unk_10, param1, 1, param2, 0, 0, 29); + v10 = Graphics_LoadTilesToBgLayerFromOpenNARC(v12, v0->unk_00->unk_10, param1, 1, param2, 0, 0, 29); NARC_dtor(v12); for (v6 = v3; v6 < v5; v6++) { diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index 6187e50537..95a976a199 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -144,7 +144,7 @@ static void CommManUnderground_Init(CommManUnderground *param0, FieldSystem *fie sCommManUnderground->unk_128 = ov23_02253D48(630, 33, fieldSystem->unk_08, v0, 0); sub_0200DD0C(sCommManUnderground->fieldSystem->unk_08, 3, (1024 - (18 + 12)), 10, 0, 4); - sub_02006E84(50, 52, 0, 10 * 0x20, 4 * 0x20, 4); + Graphics_LoadPalette(50, 52, 0, 10 * 0x20, 4 * 0x20, 4); sub_0200DAA4(sCommManUnderground->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 2, 4); for (v1 = 0; v1 < (7 + 1); v1++) { diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index eb6159926b..3d1ca32041 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -2346,23 +2346,23 @@ static void ov23_022451C8(SysTask *param0, void *param1) break; case 1: sub_0200AAE0(1, 10, 0, GX_BLEND_PLANEMASK_BG0, 1); - sub_02006E3C(50, 9, v0->unk_10, 2, 0, 8 * 6 * 6, 0, 4); + Graphics_LoadTilesToBgLayer(50, 9, v0->unk_10, 2, 0, 8 * 6 * 6, 0, 4); v0->unk_00++; break; case 2: - sub_02006E84(50, 10, 0, 0, 32, 4); + Graphics_LoadPalette(50, 10, 0, 0, 32, 4); v0->unk_00++; break; case 3: sub_0200AAE0(1, 0, 10, GX_BLEND_PLANEMASK_BG0, 1); if (Unk_ov23_02257764->unk_B9F == 19) { - sub_02006E60(50, 8, v0->unk_10, 2, 0, 32 * 24 * 2, 0, 4); + Graphics_LoadTilemapToBgLayer(50, 8, v0->unk_10, 2, 0, 32 * 24 * 2, 0, 4); } else { u16 v2[] = { 11, 12, 13, 14 }; u16 v3 = LCRNG_Next() % 4; - sub_02006E60(50, v2[v3], v0->unk_10, 2, 0, 32 * 24 * 2, 0, 4); + Graphics_LoadTilemapToBgLayer(50, v2[v3], v0->unk_10, 2, 0, 32 * 24 * 2, 0, 4); } Bg_SetPriority(0, 3); diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c index bf8b91b91b..b22a045f79 100644 --- a/src/overlay023/ov23_02248F1C.c +++ b/src/overlay023/ov23_02248F1C.c @@ -415,9 +415,9 @@ static void ov23_0224944C(BgConfig *param0, Window *param1) v3 = NARC_ctor(NARC_INDEX_DATA__UNDERG_RADAR, 4); - sub_02007130(v3, 0, 4, 0, 0x20 * 2, 4); - sub_020070E8(v3, 1, param0, 4, 0, 32 * 5 * 0x20, 0, 4); - sub_0200710C(v3, 2, param0, 4, 0, 32 * 24 * 2, 0, 4); + Graphics_LoadPaletteFromOpenNARC(v3, 0, 4, 0, 0x20 * 2, 4); + Graphics_LoadTilesToBgLayerFromOpenNARC(v3, 1, param0, 4, 0, 32 * 5 * 0x20, 0, 4); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v3, 2, param0, 4, 0, 32 * 24 * 2, 0, 4); NARC_dtor(v3); } @@ -425,7 +425,7 @@ static void ov23_0224944C(BgConfig *param0, Window *param1) Bg_ClearTilesRange(7, 32, 0, 4); FieldMessage_AddWindow(param0, param1, 7); Window_FillTilemap(param1, 0); - sub_02006E84(50, 52, 4, 10 * 0x20, 4 * 0x20, 4); + Graphics_LoadPalette(50, 52, 4, 10 * 0x20, 4 * 0x20, 4); sub_0200F338(1); } diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index da8813e1ed..465cb816bc 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -1641,7 +1641,7 @@ static BOOL ov23_0224C790(TaskManager *param0) CommSys_EnableSendMovementData(); sub_020594FC(); - sub_02006E84(50, 52, 0, 10 * 0x20, 4 * 0x20, 4); + Graphics_LoadPalette(50, 52, 0, 10 * 0x20, 4 * 0x20, 4); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 2, 4); if (v1->unk_2D) { diff --git a/src/overlay024/ov24_02253CE0.c b/src/overlay024/ov24_02253CE0.c index 137c3e0f9b..b044d2551a 100644 --- a/src/overlay024/ov24_02253CE0.c +++ b/src/overlay024/ov24_02253CE0.c @@ -42,9 +42,9 @@ void ov24_02253CE0(BgConfig *param0) v1 = NARC_ctor(NARC_INDEX_GRAPHIC__POKETCH, 8); - sub_020070E8(v1, 10, param0, 4, 0, 0, 1, 8); - sub_0200710C(v1, 11, param0, 4, 0, 0, 1, 8); - sub_02007130(v1, 12, 4, 0, 0x20, 8); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 10, param0, 4, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 11, param0, 4, 0, 0, 1, 8); + Graphics_LoadPaletteFromOpenNARC(v1, 12, 4, 0, 0x20, 8); NARC_dtor(v1); } diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index 4763a0d393..08ded5f2c6 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -150,7 +150,7 @@ static void ov25_02254684(UnkStruct_ov25_02254560 *param0) NNSG2dPaletteData *v0; void *v1; - v1 = sub_02006F88(12, 0, &v0, 7); + v1 = Graphics_GetPlttData(12, 0, &v0, 7); if (v1) { MI_CpuCopy32(v0->pRawData, param0->unk_200, 8 * 0x40); @@ -318,9 +318,9 @@ static void ov25_02254820(SysTask *param0, void *param1) 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); + Graphics_LoadTilesToBgLayer(12, 14, v2->unk_1F8, 4, 64, 0, 1, 7); + Graphics_LoadTilemapToBgLayer(12, 15, v2->unk_1F8, 4, 0, 0, 1, 7); + Graphics_LoadPaletteWithSrcOffset(12, 13, 4, PoketchSystem_GetBorderColor(v2->poketchSys) * 0x20, 15 * 0x20, 0x20, 7); Bg_FillTilemapRect(v2->unk_1F8, 5, 64 + 164, 0, 0, 32, 24, 15); Bg_CopyTilemapBufferToVRAM(v2->unk_1F8, 5); @@ -576,8 +576,8 @@ static void ov25_02254DE0(UnkStruct_ov25_02254560 *param0, UnkStruct_ov25_02254D 0 }; - sub_02006EC0(12, 2, 1, 0, 0, 1, 7); - sub_02006E84(12, 0, 5, 0, 0x60, 7); + Graphics_LoadObjectTiles(12, 2, 1, 0, 0, 1, 7); + Graphics_LoadPalette(12, 0, 5, 0, 0x60, 7); ov25_02254E84(param0, 15); diff --git a/src/overlay025/ov25_02255090.c b/src/overlay025/ov25_02255090.c index 8c1a7d0d47..2a70120cfa 100644 --- a/src/overlay025/ov25_02255090.c +++ b/src/overlay025/ov25_02255090.c @@ -253,7 +253,7 @@ void ov25_02255360(u32 param0) void *v0; NNSG2dPaletteData *v1; - v0 = sub_02006F88(19, PokeIconPalettesFileIndex(), &v1, 8); + v0 = Graphics_GetPlttData(19, PokeIconPalettesFileIndex(), &v1, 8); if (v0) { ov25_02255290(v1->pRawData, 4 * 0x10); diff --git a/src/overlay026/ov26_02256404.c b/src/overlay026/ov26_02256404.c index b0e8b06f85..179cb1037a 100644 --- a/src/overlay026/ov26_02256404.c +++ b/src/overlay026/ov26_02256404.c @@ -43,7 +43,7 @@ BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_022564 v0->unk_00 = param1; v0->unk_04 = ov25_02254674(); - v2 = sub_02006F6C(12, 25, 1, &v1, 8); + v2 = Graphics_GetScrnData(12, 25, 1, &v1, 8); if (v2 == NULL) { Heap_FreeToHeap(v0); @@ -136,8 +136,8 @@ static void ov26_022564F8(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 23, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 24, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); ov26_022565F4(v2); diff --git a/src/overlay027/ov27_0225680C.c b/src/overlay027/ov27_0225680C.c index 81bccd4981..e43ada31b0 100644 --- a/src/overlay027/ov27_0225680C.c +++ b/src/overlay027/ov27_0225680C.c @@ -191,8 +191,8 @@ static void ov27_02256A18(SysTask *param0, void *param1) UnkStruct_ov27_0225680C *v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 21, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 20, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); @@ -221,8 +221,8 @@ static void ov27_02256A18(SysTask *param0, void *param1) static BOOL ov27_02256AEC(UnkStruct_ov27_0225680C *param0) { - sub_02006EC0(12, 2, 1, 0, 0, 1, 8); - sub_02006EC0(12, 22, 1, 80 * 0x20, 0, 1, 8); + Graphics_LoadObjectTiles(12, 2, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 22, 1, 80 * 0x20, 0, 1, 8); return 1; } diff --git a/src/overlay028/ov28_0225697C.c b/src/overlay028/ov28_0225697C.c index f070ee9408..a15deff3c7 100644 --- a/src/overlay028/ov28_0225697C.c +++ b/src/overlay028/ov28_0225697C.c @@ -542,8 +542,8 @@ static void ov28_02256A08(SysTask *param0, void *param1) v3 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 16, v3->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 17, v3->unk_04, 6, 0, 0, 1, 8); ov28_02256AA4(v3); ov25_022546B8(0, 0); diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c index 9210903648..7d503d3ca4 100644 --- a/src/overlay029/ov29_022566C8.c +++ b/src/overlay029/ov29_022566C8.c @@ -175,8 +175,8 @@ static void ov29_02256804(SysTask *param0, void *param1) GF_ASSERT(GF_heap_c_dummy_return_true(8)); - sub_02006E3C(12, 30, v3->unk_04, 6, 0, 0, 1, 8); - sub_02006E60(12, 31, v3->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilesToBgLayer(12, 30, v3->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 31, v3->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); GF_ASSERT(GF_heap_c_dummy_return_true(8)); @@ -324,7 +324,7 @@ static void ov29_02256ABC(UnkStruct_ov29_022566C8 *param0) }, }; - sub_02006EC0(12, 32, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 32, 1, 0, 0, 1, 8); if (ov25_02255958(¶m0->unk_54, 12, 33, 34, 8)) { int v1; diff --git a/src/overlay030/ov30_022563EC.c b/src/overlay030/ov30_022563EC.c index 03adfbfa7f..3e1b011ef7 100644 --- a/src/overlay030/ov30_022563EC.c +++ b/src/overlay030/ov30_022563EC.c @@ -140,8 +140,8 @@ static void ov30_022564B4(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 23, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 26, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); ov30_022565B0(v2); @@ -217,7 +217,7 @@ static BOOL ov30_022565F4(UnkStruct_ov30_022563EC *param0) }, }; - sub_02006EC0(12, 29, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 29, 1, 0, 0, 1, 8); if (ov25_02255958(¶m0->unk_34, 12, 27, 28, 8)) { int v1; diff --git a/src/overlay032/ov32_02256470.c b/src/overlay032/ov32_02256470.c index 4b6745524f..aeccd5ff74 100644 --- a/src/overlay032/ov32_02256470.c +++ b/src/overlay032/ov32_02256470.c @@ -177,7 +177,7 @@ static void ov32_02256588(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); - v3 = sub_02006E3C(12, 106, v2->unk_04, 6, 0, 0, 1, 8); + v3 = Graphics_LoadTilesToBgLayer(12, 106, v2->unk_04, 6, 0, 0, 1, 8); v3 /= 0x20; Bg_FillTilemapRect(v2->unk_04, 6, 0x5, 0, 0, 32, 24, 0); @@ -278,7 +278,7 @@ static void ov32_02256898(UnkStruct_ov32_02256470 *param0, const UnkStruct_ov32_ int v0; UnkStruct_ov25_02255810 v1; - sub_02006EC0(12, 109, 1, 0 * 0x20, 0, 1, 8); + Graphics_LoadObjectTiles(12, 109, 1, 0 * 0x20, 0, 1, 8); v1.unk_0A = 0; v1.unk_0B = 2; diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c index f3172a3a8c..d4b8b6122e 100644 --- a/src/overlay033/ov33_02256474.c +++ b/src/overlay033/ov33_02256474.c @@ -217,7 +217,7 @@ static void ov33_02256598(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); - sub_02006E3C(12, 7, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilesToBgLayer(12, 7, v2->unk_04, 6, 0, 0, 1, 8); Bg_FillTilemapRect(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); ov25_022546B8(0, 0); @@ -247,7 +247,7 @@ static void ov33_02256634(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_ NARC *v1; ov25_02255360(1); - sub_02006EC0(12, 35, 1, ((4 * 4 * 2) * 6) * 0x20, 0, 1, 8); + Graphics_LoadObjectTiles(12, 35, 1, ((4 * 4 * 2) * 6) * 0x20, 0, 1, 8); v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 8); diff --git a/src/overlay034/ov34_02256540.c b/src/overlay034/ov34_02256540.c index 6b0762f012..e86b4479e5 100644 --- a/src/overlay034/ov34_02256540.c +++ b/src/overlay034/ov34_02256540.c @@ -93,7 +93,7 @@ static BOOL ov34_02256588(UnkStruct_ov34_02256540 *param0) if (ov25_02255958(¶m0->unk_58, 12, 40, 41, 8)) { int v2; - sub_02006EC0(12, 42, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 42, 1, 0, 0, 1, 8); param0->unk_34 = ov25_02255810(param0->unk_30, &v0, ¶m0->unk_58); ov25_02255914(param0->unk_34, 1); @@ -181,8 +181,8 @@ static void ov34_02256690(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 39, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 38, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); diff --git a/src/overlay035/ov35_02256410.c b/src/overlay035/ov35_02256410.c index 9c5b172b58..589bf60f6e 100644 --- a/src/overlay035/ov35_02256410.c +++ b/src/overlay035/ov35_02256410.c @@ -89,8 +89,8 @@ static void ov35_02256460(UnkStruct_ov35_02256410 *param0, const UnkStruct_ov35_ }; int v2; - sub_02006EC0(12, 2, 1, 0, 0, 1, 8); - sub_02006EC0(12, 47, 1, 80 * 0x20, 0, 1, 8); + Graphics_LoadObjectTiles(12, 2, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 47, 1, 80 * 0x20, 0, 1, 8); ov25_02255958(¶m0->unk_38, 12, 45, 46, 8); ov25_02255958(¶m0->unk_4C, 12, 3, 4, 8); @@ -176,8 +176,8 @@ static void ov35_02256598(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 44, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 43, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay036/ov36_02256404.c b/src/overlay036/ov36_02256404.c index f0196a0691..ce7dd0291c 100644 --- a/src/overlay036/ov36_02256404.c +++ b/src/overlay036/ov36_02256404.c @@ -84,8 +84,8 @@ static void ov36_02256454(UnkStruct_ov36_02256404 *param0, const UnkStruct_ov36_ }; int v2; - sub_02006EC0(12, 2, 1, 0, 0, 1, 8); - sub_02006EC0(12, 52, 1, 80 * 0x20, 0, 1, 8); + Graphics_LoadObjectTiles(12, 2, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 52, 1, 80 * 0x20, 0, 1, 8); ov25_02255958(¶m0->unk_3C, 12, 50, 51, 8); ov25_02255958(¶m0->unk_50, 12, 3, 4, 8); @@ -169,8 +169,8 @@ static void ov36_0225658C(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 49, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 48, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay037/ov37_022563D4.c b/src/overlay037/ov37_022563D4.c index 4371eb006d..7c74d4f713 100644 --- a/src/overlay037/ov37_022563D4.c +++ b/src/overlay037/ov37_022563D4.c @@ -74,7 +74,7 @@ static void ov37_0225641C(UnkStruct_ov37_022563D4 *param0, const UnkStruct_ov37_ }; int v1; - sub_02006EC0(12, 104, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 104, 1, 0, 0, 1, 8); ov25_02255958(¶m0->unk_28, 12, 102, 103, 8); param0->unk_24 = ov25_02255810(param0->unk_20, &v0, ¶m0->unk_28); @@ -144,8 +144,8 @@ static void ov37_022564D8(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 101, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 100, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay038/ov38_0225632C.c b/src/overlay038/ov38_0225632C.c index fd191e8cab..4a5f8c46b3 100644 --- a/src/overlay038/ov38_0225632C.c +++ b/src/overlay038/ov38_0225632C.c @@ -101,9 +101,9 @@ static void ov38_022563B8(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); - sub_02006E3C(12, 8, v2->unk_04, 6, 0, 0, 0, 8); + Graphics_LoadTilesToBgLayer(12, 8, v2->unk_04, 6, 0, 0, 0, 8); Bg_FillTilemapRect(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); - sub_02006E84(12, 9, 4, 0 * 0x20, 0x20, 8); + Graphics_LoadPalette(12, 9, 4, 0 * 0x20, 0x20, 8); ov25_02255440(v2->unk_04, 12, 6); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay039/ov39_022563DC.c b/src/overlay039/ov39_022563DC.c index c252d1ac91..60497f80e7 100644 --- a/src/overlay039/ov39_022563DC.c +++ b/src/overlay039/ov39_022563DC.c @@ -111,8 +111,8 @@ static void ov39_02256468(SysTask *param0, void *param1) v3 = ov25_02255240(param1); 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); + Graphics_LoadTilesToBgLayer(12, 59, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 58, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); diff --git a/src/overlay040/ov40_0225645C.c b/src/overlay040/ov40_0225645C.c index 54265fb3d3..ca9017cb20 100644 --- a/src/overlay040/ov40_0225645C.c +++ b/src/overlay040/ov40_0225645C.c @@ -184,7 +184,7 @@ static void ov40_022564D4(UnkStruct_ov40_0225645C *param0, const UnkStruct_ov40_ ov25_02255360(1); - v3 = sub_02006EC0(12, 84, 1, 0, 0, 1, 8); + v3 = Graphics_LoadObjectTiles(12, 84, 1, 0, 0, 1, 8); v3 /= 20; param0->unk_78 = v3; @@ -271,8 +271,8 @@ static void ov40_02256618(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 81, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 80, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c index d7b57da119..b2a102a211 100644 --- a/src/overlay041/ov41_022567B0.c +++ b/src/overlay041/ov41_022567B0.c @@ -123,7 +123,7 @@ static void ov41_0225680C(UnkStruct_ov41_022567B0 *param0, const UnkStruct_ov41_ }; int v1; - sub_02006EC0(12, 89, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 89, 1, 0, 0, 1, 8); ov25_02255958(¶m0->unk_34, 12, 87, 88, 8); for (v1 = 0; v1 < 4; v1++) { @@ -222,10 +222,10 @@ static void ov41_022568DC(SysTask *param0, void *param1) GF_ASSERT(GF_heap_c_dummy_return_true(8)); - v4 = sub_02006E3C(12, 86, v3->unk_04, 6, 0, 0, 1, 8); + v4 = Graphics_LoadTilesToBgLayer(12, 86, v3->unk_04, 6, 0, 0, 1, 8); v4 /= 0x20; - sub_02006E60(12, 85, v3->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 85, v3->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); GF_ASSERT(GF_heap_c_dummy_return_true(8)); diff --git a/src/overlay042/ov42_022563D4.c b/src/overlay042/ov42_022563D4.c index 4d05e581d2..ea20fc6bbb 100644 --- a/src/overlay042/ov42_022563D4.c +++ b/src/overlay042/ov42_022563D4.c @@ -75,7 +75,7 @@ static void ov42_02256420(UnkStruct_ov42_022563D4 *param0) 0 }; - sub_02006EC0(12, 57, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 57, 1, 0, 0, 1, 8); ov25_02255958(¶m0->unk_28, 12, 55, 56, 8); param0->unk_24 = ov25_02255810(param0->unk_20, &v0, ¶m0->unk_28); @@ -152,8 +152,8 @@ static void ov42_022564F0(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 54, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 53, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index 2157ff421a..f116997f48 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -140,7 +140,7 @@ static void ov43_022565B4(UnkStruct_ov43_02256544 *param0) }; int v2; - sub_02006EC0(12, 64, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 64, 1, 0, 0, 1, 8); ov25_02255958(¶m0->unk_60, 12, 62, 63, 8); for (v2 = 0; v2 < 6; v2++) { @@ -242,8 +242,8 @@ static void ov43_02256700(SysTask *param0, void *param1) 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); + v6 = Graphics_LoadTilesToBgLayer(12, 61, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 60, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); v6 /= 0x20; diff --git a/src/overlay044/ov44_022565BC.c b/src/overlay044/ov44_022565BC.c index b84694b456..9688c3aafa 100644 --- a/src/overlay044/ov44_022565BC.c +++ b/src/overlay044/ov44_022565BC.c @@ -140,7 +140,7 @@ static void ov44_0225660C(UnkStruct_ov44_022565BC *param0, const UnkStruct_ov44_ ov25_02255360(1); - v2 = sub_02006EC0(12, 74, 1, 0, 0, 1, 8); + v2 = Graphics_LoadObjectTiles(12, 74, 1, 0, 0, 1, 8); v2 /= 20; param0->unk_64 = v2; @@ -239,8 +239,8 @@ static void ov44_02256794(SysTask *param0, void *param1) v3 = ov25_02255240(param1); 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); + Graphics_LoadTilesToBgLayer(12, 71, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 70, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay045/ov45_022566EC.c b/src/overlay045/ov45_022566EC.c index 40914e0e50..d54c37c062 100644 --- a/src/overlay045/ov45_022566EC.c +++ b/src/overlay045/ov45_022566EC.c @@ -181,8 +181,8 @@ static void ov45_0225673C(UnkStruct_ov45_022566EC *param0, const UnkStruct_ov45_ }; int v1; - sub_02006EC0(12, 2, 1, 0, 0, 1, 8); - sub_02006EC0(12, 79, 1, 80 * 0x20, 0, 1, 8); + Graphics_LoadObjectTiles(12, 2, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 79, 1, 80 * 0x20, 0, 1, 8); ov25_02255958(¶m0->unk_68, 12, 77, 78, 8); ov25_02255958(¶m0->unk_7C, 12, 3, 4, 8); @@ -296,8 +296,8 @@ static void ov45_02256968(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 76, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 75, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay046/ov46_02256BCC.c b/src/overlay046/ov46_02256BCC.c index 6ffb28123e..687882239c 100644 --- a/src/overlay046/ov46_02256BCC.c +++ b/src/overlay046/ov46_02256BCC.c @@ -221,8 +221,8 @@ static void ov46_02256C20(UnkStruct_ov46_02256BCC *param0, const UnkStruct_ov46_ }; int v1; - sub_02006EC0(12, 2, 1, 0, 0, 1, 8); - sub_02006EC0(12, 94, 1, 80 * 0x20, 0, 1, 8); + Graphics_LoadObjectTiles(12, 2, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 94, 1, 80 * 0x20, 0, 1, 8); ov25_02255958(¶m0->unk_78, 12, 92, 93, 8); ov25_02255958(¶m0->unk_8C, 12, 3, 4, 8); @@ -315,8 +315,8 @@ static void ov46_02256D74(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 91, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 90, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay047/ov47_02256634.c b/src/overlay047/ov47_02256634.c index 326ea29b11..7e9724ad45 100644 --- a/src/overlay047/ov47_02256634.c +++ b/src/overlay047/ov47_02256634.c @@ -76,7 +76,7 @@ static void ov47_02256684(UnkStruct_ov47_02256634 *param0, const UnkStruct_ov47_ int v1, v2; u32 v3, v4; - sub_02006EC0(12, 120, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 120, 1, 0, 0, 1, 8); ov25_02255958(¶m0->unk_68, 12, 118, 119, 8); @@ -217,8 +217,8 @@ static void ov47_022568BC(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); 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); + Graphics_LoadTilesToBgLayer(12, 117, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 115, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c index 5e84db3729..b63ec3b944 100644 --- a/src/overlay048/ov48_0225650C.c +++ b/src/overlay048/ov48_0225650C.c @@ -133,10 +133,10 @@ static void ov48_022565A8(SysTask *param0, void *param1) Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); - v4 = sub_02006E3C(12, 117, v2->unk_04, 6, 0, 0, 1, 8); + v4 = Graphics_LoadTilesToBgLayer(12, 117, v2->unk_04, 6, 0, 0, 1, 8); v4 /= 0x20; - sub_02006E60(12, 116, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 116, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); ov48_02256650(v2, v4); @@ -239,7 +239,7 @@ static void ov48_022567FC(UnkStruct_ov48_0225650C *param0) v0 = param0->unk_00; - sub_02006EC0(12, 120, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 120, 1, 0, 0, 1, 8); ov25_02255958(¶m0->unk_138, 12, 118, 119, 8); diff --git a/src/overlay049/ov49_022563D4.c b/src/overlay049/ov49_022563D4.c index 0da542333c..59449bd35e 100644 --- a/src/overlay049/ov49_022563D4.c +++ b/src/overlay049/ov49_022563D4.c @@ -66,7 +66,7 @@ static void ov49_02256410(UnkStruct_ov49_022563D4 *param0, const UnkStruct_ov49_ 0 }; - sub_02006EC0(12, 69, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 69, 1, 0, 0, 1, 8); ov25_02255958(¶m0->unk_28, 12, 67, 68, 8); param0->unk_24 = ov25_02255810(param0->unk_20, &v0, ¶m0->unk_28); @@ -147,8 +147,8 @@ static void ov49_022564E4(SysTask *param0, void *param1) v3 = ov25_02255240(param1); 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); + Graphics_LoadTilesToBgLayer(12, 66, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 65, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay050/ov50_02256510.c b/src/overlay050/ov50_02256510.c index c0825a043d..6fc8f713b7 100644 --- a/src/overlay050/ov50_02256510.c +++ b/src/overlay050/ov50_02256510.c @@ -79,7 +79,7 @@ static void ov50_02256560(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_ 0, }; - sub_02006EC0(12, 114, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 114, 1, 0, 0, 1, 8); ov25_02255958(¶m0->unk_28, 12, 112, 113, 8); param0->unk_24 = ov25_02255810(param0->unk_20, &v0, ¶m0->unk_28); @@ -175,7 +175,7 @@ static void ov50_0225664C(SysTask *param0, void *param1) ov50_0225675C(v3, v4); ov50_022567F4(v3, v4); - sub_02006E3C(12, 111, v3->unk_04, 7, 0, 0, 1, 8); + Graphics_LoadTilesToBgLayer(12, 111, v3->unk_04, 7, 0, 0, 1, 8); ov25_022546B8(0, 0); Bg_CopyTilemapBufferToVRAM(v3->unk_04, 6); @@ -215,7 +215,7 @@ static void ov50_0225675C(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_ { u32 v0; - sub_02006E60(12, 110, param0->unk_04, 7, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 110, param0->unk_04, 7, 0, 0, 1, 8); for (v0 = 0; v0 < param1->unk_04; v0++) { if (param1->unk_0C[v0].unk_03) { diff --git a/src/overlay051/ov51_0225632C.c b/src/overlay051/ov51_0225632C.c index ce465d5ee1..f61945f603 100644 --- a/src/overlay051/ov51_0225632C.c +++ b/src/overlay051/ov51_0225632C.c @@ -101,9 +101,9 @@ static void ov51_022563B8(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); - sub_02006E3C(12, 8, v2->unk_04, 6, 0, 0, 0, 8); + Graphics_LoadTilesToBgLayer(12, 8, v2->unk_04, 6, 0, 0, 0, 8); Bg_FillTilemapRect(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); - sub_02006E84(12, 9, 4, 0 * 0x20, 0x20, 8); + Graphics_LoadPalette(12, 9, 4, 0 * 0x20, 0x20, 8); ov25_02255440(v2->unk_04, 26, 6); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c index 0910cbad09..3e0940787e 100644 --- a/src/overlay052/ov52_02256694.c +++ b/src/overlay052/ov52_02256694.c @@ -122,7 +122,7 @@ static void ov52_0225670C(UnkStruct_ov52_02256694 *param0, const UnkStruct_ov52_ }; int v1; - sub_02006EC0(12, 99, 1, 0, 0, 1, 8); + Graphics_LoadObjectTiles(12, 99, 1, 0, 0, 1, 8); ov25_02255958(¶m0->unk_44, 12, 97, 98, 8); for (v1 = 0; v1 < 4; v1++) { @@ -207,10 +207,10 @@ static void ov52_022567F4(SysTask *param0, void *param1) Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); - v5 = sub_02006E3C(12, 96, v2->unk_04, 6, 0, 0, 1, 8); + v5 = Graphics_LoadTilesToBgLayer(12, 96, v2->unk_04, 6, 0, 0, 1, 8); v5 /= 0x20; - sub_02006E60(12, 95, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 95, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); Window_Add(v2->unk_04, &v2->unk_20, 6, 2, 2, 24, 20, 0, v5); diff --git a/src/overlay053/ov53_02256420.c b/src/overlay053/ov53_02256420.c index eec22fe405..18aa3a2235 100644 --- a/src/overlay053/ov53_02256420.c +++ b/src/overlay053/ov53_02256420.c @@ -126,8 +126,8 @@ static void ov53_022564B0(SysTask *param0, void *param1) v3 = ov25_02255240(param1); 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); + Graphics_LoadTilesToBgLayer(12, 122, v2->unk_04, 6, 0, 0, 1, 8); + Graphics_LoadTilemapToBgLayer(12, 121, v2->unk_04, 6, 0, 0, 1, 8); ov25_022546B8(0, 0); ov53_022566AC(v2, v3); @@ -347,7 +347,7 @@ static void ov53_022566AC(UnkStruct_ov53_02256420 *param0, const UnkStruct_ov53_ ov25_02255958(¶m0->unk_78, 12, 5, 6, 8); ov25_02255958(¶m0->unk_64, 12, 123, 124, 8); - v1 = sub_02006EC0(12, 125, 1, 0, 0, 1, 8); + v1 = Graphics_LoadObjectTiles(12, 125, 1, 0, 0, 1, 8); v1 /= 0x20; param0->unk_AC = v1; diff --git a/src/overlay055/ov55_0225632C.c b/src/overlay055/ov55_0225632C.c index 97a748dfd8..0bf9025936 100644 --- a/src/overlay055/ov55_0225632C.c +++ b/src/overlay055/ov55_0225632C.c @@ -104,9 +104,9 @@ static void ov55_022563C8(SysTask *param0, void *param1) v2 = ov25_0225523C(param1); Bg_InitFromTemplate(v2->unk_04, 6, &v0, 0); - sub_02006E3C(12, 8, v2->unk_04, 6, 0, 0, 0, 8); + Graphics_LoadTilesToBgLayer(12, 8, v2->unk_04, 6, 0, 0, 0, 8); Bg_FillTilemapRect(v2->unk_04, 6, 0, 0, 0, 32, 24, 0); - sub_02006E84(12, 9, 4, 0 * 0x20, 0x20, 8); + Graphics_LoadPalette(12, 9, 4, 0 * 0x20, 0x20, 8); ov25_02255440(v2->unk_04, v2->unk_00->unk_00, 6); Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6); diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index 2663b4d5f5..6a94f406f1 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -185,7 +185,7 @@ static void ov56_02256294(UnkStruct_ov56_02256468 *param0) param0->unk_2D8.unk_06 = 0; param0->unk_18 = StringTemplate_Default(4); param0->unk_1C = MessageLoader_Init(0, 26, 635, 4); - param0->unk_20 = sub_02006F6C(74, 3, 1, &(param0->unk_24), 4); + param0->unk_20 = Graphics_GetScrnData(74, 3, 1, &(param0->unk_24), 4); } static void ov56_022562EC(BgConfig *param0, UnkStruct_ov56_022562EC *param1) @@ -368,9 +368,9 @@ static void ov56_02256508(BgConfig *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); } - sub_02006E84(74, 0, 4, 0, 0x20 * 3, 4); - sub_02006E3C(74, 2, param0, 7, 0, (32 * 5) * 0x20, 1, 4); - sub_02006E60(74, 4, param0, 7, 0, 32 * 24 * 2, 1, 4); + Graphics_LoadPalette(74, 0, 4, 0, 0x20 * 3, 4); + Graphics_LoadTilesToBgLayer(74, 2, param0, 7, 0, (32 * 5) * 0x20, 1, 4); + Graphics_LoadTilemapToBgLayer(74, 4, param0, 7, 0, 32 * 24 * 2, 1, 4); sub_0205D8CC(4, 0); } diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 53450e29e8..9b2da2ce3b 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -586,14 +586,14 @@ static void ov58_021D142C(UnkStruct_02095EAC *param0, NARC *param1) { 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); + Graphics_LoadPaletteFromOpenNARC(param1, 0, 0, 0, 16 * 2 * 2, 39); + Graphics_LoadPaletteFromOpenNARC(param1, 1, 4, 0, 16 * 2 * 2, 39); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 39); Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, 39); - sub_020070E8(param1, 2, v0, 2, 0, 32 * 8 * 0x20, 1, 39); - sub_0200710C(param1, 4, v0, 2, 0, 32 * 24 * 2, 1, 39); - sub_020070E8(param1, 3, v0, 5, 0, 32 * 8 * 0x20, 1, 39); - sub_0200710C(param1, 5, v0, 5, 0, 32 * 24 * 2, 1, 39); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, v0, 2, 0, 32 * 8 * 0x20, 1, 39); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 4, v0, 2, 0, 32 * 24 * 2, 1, 39); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 3, v0, 5, 0, 32 * 8 * 0x20, 1, 39); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 5, v0, 5, 0, 32 * 24 * 2, 1, 39); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_08->unk_08), 39); sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 39); } diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index cf300bd20c..12c9a527d0 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -533,7 +533,7 @@ static void ov59_021D1250(UnkStruct_020961E8 *param0, NARC *param1) param0->unk_0C.unk_00 = 0; param0->unk_0C.unk_08 = 0; param0->unk_0C.unk_04 = 0; - param0->unk_0C.unk_0C = sub_020071EC(param1, 1, ¶m0->unk_0C.unk_10, 51); + param0->unk_0C.unk_0C = Graphics_GetPlttDataFromOpenNARC(param1, 1, ¶m0->unk_0C.unk_10, 51); param0->unk_4AA8 = 0; param0->unk_384 = NULL; param0->unk_4AAC = 2; @@ -570,14 +570,14 @@ static void ov59_021D1388(UnkStruct_020961E8 *param0, NARC *param1) { BgConfig *v0 = param0->unk_00; - sub_02007130(param1, 0, 0, 0, 16 * 16 * 2, 51); - sub_02006E84(12, 12, 4, 0, 16 * 2, 51); + Graphics_LoadPaletteFromOpenNARC(param1, 0, 0, 0, 16 * 16 * 2, 51); + Graphics_LoadPalette(12, 12, 4, 0, 16 * 2, 51); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 51); Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, 51); - sub_02006E3C(12, 10, v0, 6, 0, 0, 1, 51); - sub_02006E60(12, 11, v0, 6, 0, 0, 1, 51); - sub_020070E8(param1, 2, v0, 1, 0, 32 * 8 * 0x20, 1, 51); - sub_0200710C(param1, 3, v0, 1, 0, 32 * 24 * 2, 1, 51); + Graphics_LoadTilesToBgLayer(12, 10, v0, 6, 0, 0, 1, 51); + Graphics_LoadTilemapToBgLayer(12, 11, v0, 6, 0, 0, 1, 51); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, v0, 1, 0, 32 * 8 * 0x20, 1, 51); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 3, v0, 1, 0, 32 * 24 * 2, 1, 51); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_08->unk_08), 51); sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 51); } @@ -1649,10 +1649,10 @@ static void ov59_021D26E8(UnkStruct_020961E8 *param0) static void ov59_021D27FC(UnkStruct_020961E8 *param0, NARC *param1) { - param0->unk_398[0] = sub_02006F88(104, 8, &(param0->unk_3A0[0]), 51); - param0->unk_398[1] = sub_020071EC(param1, 7, &(param0->unk_3A0[1]), 51); - param0->unk_388[0] = sub_02006F50(104, 32, 1, &(param0->unk_390[0]), 51); - param0->unk_388[1] = sub_020071B4(param1, 9, 1, &(param0->unk_390[1]), 51); + param0->unk_398[0] = Graphics_GetPlttData(104, 8, &(param0->unk_3A0[0]), 51); + param0->unk_398[1] = Graphics_GetPlttDataFromOpenNARC(param1, 7, &(param0->unk_3A0[1]), 51); + param0->unk_388[0] = Graphics_GetCharData(104, 32, 1, &(param0->unk_390[0]), 51); + param0->unk_388[1] = Graphics_GetCharDataFromOpenNARC(param1, 9, 1, &(param0->unk_390[1]), 51); } static const u16 Unk_ov59_021D3290[] = { diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index 39409ba3dc..f528c21c61 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -433,16 +433,16 @@ static void ov61_0222C3B0(UnkStruct_ov61_0222C664 *param0) v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 117); - sub_02007130(v1, 3, 0, 0, 0, 117); - sub_02007130(v1, 3, 4, 0, 0, 117); + Graphics_LoadPaletteFromOpenNARC(v1, 3, 0, 0, 0, 117); + Graphics_LoadPaletteFromOpenNARC(v1, 3, 4, 0, 0, 117); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 117); Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, 117); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(SaveData_Options(param0->unk_00->unk_00->unk_04)), 117); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 117); - sub_020070E8(v1, 2, v0, 1, 0, 0, 0, 117); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 2, v0, 1, 0, 0, 0, 117); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, 117); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 10, v0, 5, 0, 0, 0, 117); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 11, v0, 5, 0, 32 * 24 * 2, 0, 117); Bg_MaskPalette(0, 0); Bg_MaskPalette(4, 0); diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index bee32b7512..36564e00f7 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -50,25 +50,25 @@ void ov62_022300D8(UnkStruct_0208C06C *param0) PaletteData *v4 = param0->unk_14.unk_14; if (param0->unk_00 == 0) { - sub_020070E8(v0, 67, v1, 1, 0, 0, 0, 102); - sub_020070E8(v0, 67, v1, 5, 0, 0, 0, 102); - sub_0200710C(v0, 69, v1, 5, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 67, v1, 1, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 67, v1, 5, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 69, v1, 5, 0, 0, 0, 102); PaletteData_LoadBufferFromFileStart(v4, 162, ov62_02231710(param0, 3), 102, 0, 0x20 * (8 + 1), 0); PaletteData_LoadBufferFromFileStart(v4, 162, ov62_02231710(param0, 3), 102, 1, 0x20 * (8 + 1), 0); PaletteData_LoadBufferFromFileStart(v4, 162, ov62_02231710(param0, 0), 102, 0, 0x20, 14 * 16); PaletteData_LoadBufferFromFileStart(v4, 162, ov62_02231710(param0, 0), 102, 1, 0x20, 14 * 16); } else { - sub_020070E8(v0, 54, v1, 1, 0, 0, 0, 102); - sub_020070E8(v0, 54, v1, 5, 0, 0, 0, 102); - sub_0200710C(v0, 55, v1, 5, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 54, v1, 1, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 54, v1, 5, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 55, v1, 5, 0, 0, 0, 102); PaletteData_LoadBufferFromFileStart(v4, 162, 53, 102, 0, 0x20 * (8 + 1), 0); PaletteData_LoadBufferFromFileStart(v4, 162, 53, 102, 1, 0x20 * (8 + 1), 0); PaletteData_LoadBufferFromFileStart(v4, 162, 52, 102, 0, 0x20, 14 * 16); PaletteData_LoadBufferFromFileStart(v4, 162, 52, 102, 1, 0x20, 14 * 16); } - sub_0200710C(v0, 70, v1, 5, 0, 0, 0, 102); - sub_0200710C(v0, 70, v1, 1, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 70, v1, 5, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 70, v1, 1, 0, 0, 0, 102); PaletteData_BlendMulti(v4, 1, 0x2, 16, param0->unk_14.unk_44); } @@ -85,8 +85,8 @@ void ov62_022302A8(UnkStruct_0208C06C *param0, int param1, BOOL param2) v5 = 0; } - sub_020070E8(v0, 45, v1, param1, 0, 0, 0, 102); - sub_0200710C(v0, v5, v1, param1, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 45, v1, param1, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, v5, v1, param1, 0, 0, 0, 102); } void ov62_022302F0(UnkStruct_0208C06C *param0, int param1) @@ -98,8 +98,8 @@ void ov62_022302F0(UnkStruct_0208C06C *param0, int param1) PaletteData *v4 = param0->unk_14.unk_14; int v5 = 1; - sub_020070E8(v0, 45, v1, param1, 0, 0, 0, 102); - sub_0200710C(v0, v5, v1, param1, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 45, v1, param1, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, v5, v1, param1, 0, 0, 0, 102); } void ov62_02230330(UnkStruct_0208C06C *param0) diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index e34789d950..74a9c1b86d 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -2711,7 +2711,7 @@ int ov62_0223438C(u64 param0) void ov62_022343B8(UnkStruct_0208C06C *param0, int param1, int param2) { - sub_0200710C(param0->unk_14.unk_00, param1, param0->unk_14.unk_10, param2, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, param1, param0->unk_14.unk_10, param2, 0, 0, 0, 102); } static void ov62_022343D8(SysTask *param0, void *param1) diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c index 4ffeecc9e9..d0ebedbe0d 100644 --- a/src/overlay062/ov62_02234A10.c +++ b/src/overlay062/ov62_02234A10.c @@ -163,9 +163,9 @@ static BOOL ov62_02234CDC(UnkStruct_0208C06C *param0) if (ov62_022300BC(param0) == 1) { if (param0->unk_00 == 0) { - sub_0200710C(param0->unk_14.unk_00, 69, param0->unk_14.unk_10, 5, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 69, param0->unk_14.unk_10, 5, 0, 0, 0, 102); } else { - sub_0200710C(param0->unk_14.unk_00, 55, param0->unk_14.unk_10, 5, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 55, param0->unk_14.unk_10, 5, 0, 0, 0, 102); } sub_0208B948(param0->unk_6F0, 256 / 2, 192 + 32); @@ -202,9 +202,9 @@ static BOOL ov62_02234CDC(UnkStruct_0208C06C *param0) break; case 2: if (param0->unk_00 == 0) { - sub_0200710C(param0->unk_14.unk_00, 69, param0->unk_14.unk_10, 5, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 69, param0->unk_14.unk_10, 5, 0, 0, 0, 102); } else { - sub_0200710C(param0->unk_14.unk_00, 55, param0->unk_14.unk_10, 5, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 55, param0->unk_14.unk_10, 5, 0, 0, 0, 102); } param0->unk_08++; diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c index 8bee644d7b..d7aaa2e636 100644 --- a/src/overlay062/ov62_02235E64.c +++ b/src/overlay062/ov62_02235E64.c @@ -126,8 +126,8 @@ static BOOL ov62_02235EBC(UnkStruct_0208C06C *param0) 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; break; default: @@ -363,7 +363,7 @@ static BOOL ov62_022363CC(UnkStruct_0208C06C *param0) case 2: ov62_022362B8(param0); ov62_02231AAC(param0, 296); - sub_0200710C(param0->unk_14.unk_00, 84, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 84, param0->unk_14.unk_10, 7, 0, 0, 0, 102); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1); param0->unk_08++; diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c index a43b122e25..85b5a909a8 100644 --- a/src/overlay062/ov62_02236CBC.c +++ b/src/overlay062/ov62_02236CBC.c @@ -139,8 +139,8 @@ static void ov62_02236E14(UnkStruct_0208C06C *param0) SpriteGfxHandler *v4 = param0->unk_14.unk_08; PaletteData *v5 = param0->unk_14.unk_14; - sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 6, 0, 0, 0, 102); - sub_0200710C(v1, 68, v2, 6, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 6, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 68, v2, 6, 0, 0, 0, 102); SpriteRenderer_LoadPalette(v5, 3, v3, v4, v1, ov62_02231710(param0, 0), 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 29292); SpriteRenderer_LoadCharResObjFromOpenNarc(v3, v4, v1, 66, 0, NNS_G2D_VRAM_TYPE_2DSUB, 29292); SpriteRenderer_LoadCellResObjFromOpenNarc(v3, v4, v1, 71, 0, 29292); diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index 22ca7a3297..b3d06cb87f 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -274,8 +274,8 @@ static BOOL ov62_02237DB8(UnkStruct_0208C06C *param0) ov62_02231454(param0); ov62_02239608(param0); ov62_02234540(param0, 0); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_0222FB60(param0, 2); break; } diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index df6664d695..b1ece971f7 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -600,7 +600,7 @@ static BOOL ov62_0223A544(UnkStruct_0208C06C *param0) ov62_02231664(&v0->unk_1AC, 1); if (ov62_022315E0(&v0->unk_1A4, &v0->unk_1A8, 1, 2)) { - sub_0200710C(param0->unk_14.unk_00, 79, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 79, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_0223AB14(param0); ov62_0223A4C8(param0, 1); param0->unk_08++; @@ -725,7 +725,7 @@ static BOOL ov62_0223A840(UnkStruct_0208C06C *param0) if (ov62_022315E0(&v0->unk_1A4, &v0->unk_1A8, 1, 2)) { ov62_0223A4C8(param0, 0); - sub_0200710C(param0->unk_14.unk_00, 77, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 77, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; } @@ -1248,8 +1248,8 @@ static void ov62_0223B158(UnkStruct_0208C06C *param0) v0->unk_04.unk_176 = 0; } - sub_020070E8(param0->unk_14.unk_00, (138 + (v0->unk_04.unk_176 * 3)), param0->unk_14.unk_10, 3, 0, 0, 0, 102); - sub_0200710C(param0->unk_14.unk_00, (140 + (v0->unk_04.unk_176 * 3)), param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, (138 + (v0->unk_04.unk_176 * 3)), param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, (140 + (v0->unk_04.unk_176 * 3)), param0->unk_14.unk_10, 3, 0, 0, 0, 102); PaletteData_LoadBufferFromFile(param0->unk_14.unk_14, 162, (139 + (v0->unk_04.unk_176 * 3)), 102, 0, 0x40, 12 * 16, 12 * 16); ov62_0223B050(param0); @@ -1277,8 +1277,8 @@ static void ov62_0223B230(UnkStruct_0208C06C *param0) } } - sub_020070E8(param0->unk_14.unk_00, (138 + (v0->unk_04.unk_176 * 3)), param0->unk_14.unk_10, 3, 0, 0, 0, 102); - sub_0200710C(param0->unk_14.unk_00, (140 + (v0->unk_04.unk_176 * 3)), param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, (138 + (v0->unk_04.unk_176 * 3)), param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, (140 + (v0->unk_04.unk_176 * 3)), param0->unk_14.unk_10, 3, 0, 0, 0, 102); PaletteData_LoadBufferFromFile(param0->unk_14.unk_14, 162, (139 + (v0->unk_04.unk_176 * 3)), 102, 0, 0x40, 12 * 16, 12 * 16); ov62_0223B050(param0); @@ -1301,8 +1301,8 @@ static BOOL ov62_0223B2E8(UnkStruct_0208C06C *param0) ov62_0223AFC0(param0, 0); ov62_02234540(param0, 0); - sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); - sub_0200710C(param0->unk_14.unk_00, 77, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 77, param0->unk_14.unk_10, 7, 0, 0, 0, 102); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1); @@ -1410,8 +1410,8 @@ static BOOL ov62_0223B564(UnkStruct_0208C06C *param0) ov62_022302F0(param0, 2); ov62_0223AA90(param0); ov62_0223AC0C(param0, 275); - sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); - sub_0200710C(param0->unk_14.unk_00, 79, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 79, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_0223AB14(param0); ov62_0223A4C8(param0, 1); @@ -1640,9 +1640,9 @@ static BOOL ov62_0223B980(UnkStruct_0208C06C *param0) ov62_02231664(&v0->unk_1AC, 1); if (ov62_022315E0(&v0->unk_1A4, &v0->unk_1A8, 1, 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); - sub_0200710C(param0->unk_14.unk_00, 78, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 3, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 78, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; } @@ -1725,7 +1725,7 @@ static BOOL ov62_0223B980(UnkStruct_0208C06C *param0) if (ov62_022315E0(&v0->unk_1A4, &v0->unk_1A8, 1, 0)) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); - sub_0200710C(param0->unk_14.unk_00, 79, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 79, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; } break; @@ -1875,7 +1875,7 @@ static BOOL ov62_0223BFB4(UnkStruct_0208C06C *param0) param0->unk_08++; case 1: if (ov62_022315E0(&v0->unk_1A4, &v0->unk_1A8, 1, 0)) { - sub_0200710C(param0->unk_14.unk_00, 79, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 79, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; } break; @@ -1942,7 +1942,7 @@ static BOOL ov62_0223C138(UnkStruct_0208C06C *param0) ov62_02234540(param0, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); - sub_0200710C(param0->unk_14.unk_00, 75, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 75, param0->unk_14.unk_10, 7, 0, 0, 0, 102); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1); @@ -2017,9 +2017,9 @@ static BOOL ov62_0223C424(UnkStruct_0208C06C *param0) param0->unk_08++; case 2: if (ov62_022315E0(&v0->unk_1A4, &v0->unk_1A8, 1, 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); - sub_0200710C(param0->unk_14.unk_00, 78, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 3, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 78, param0->unk_14.unk_10, 7, 0, 0, 0, 102); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); param0->unk_08++; @@ -2096,8 +2096,8 @@ static BOOL ov62_0223C63C(UnkStruct_0208C06C *param0) ov62_02232378(&v0->unk_2ED8, param0); ov62_022323B8(&v0->unk_2ED8, 0); ov62_02234540(param0, 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, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); param0->unk_08++; } break; @@ -2136,8 +2136,8 @@ static BOOL ov62_0223C79C(UnkStruct_0208C06C *param0) if (ov62_022315E0(&v0->unk_1A4, &v0->unk_1A8, 1, 1)) { 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 3, param0->unk_14.unk_10, 3, 0, 0, 0, 102); param0->unk_08++; } break; diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index 5edafe6af4..e259ea99a2 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -1098,10 +1098,10 @@ static BOOL ov62_0223DAE8 (UnkStruct_0208C06C * param0) switch (param0->unk_08) { case 0: - 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); - sub_0200710C(param0->unk_14.unk_00, 33, param0->unk_14.unk_10, 3, 0, 0, 0, 102); - sub_0200710C(param0->unk_14.unk_00, 34, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 33, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 34, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_0223D004(param0); ov62_0223D160(param0); diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c index 4a0fccc9b7..4797d61d02 100644 --- a/src/overlay062/ov62_0223DFA8.c +++ b/src/overlay062/ov62_0223DFA8.c @@ -547,7 +547,7 @@ static BOOL ov62_0223E810 (UnkStruct_0208C06C * param0) ov62_02231664(&v0->unk_08, 1); if (ov62_022315E0(&v0->unk_00, &v0->unk_04, 1, 2)) { - sub_0200710C(param0->unk_14.unk_00, 84, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 84, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_0223E0FC(param0, 102, v0->unk_1FB0); param0->unk_08++; } @@ -600,8 +600,8 @@ static BOOL ov62_0223E8BC (UnkStruct_0208C06C * param0) ov62_0224088C(param0); ov62_02240900(param0); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_02234540(param0, 1); if (v0->unk_10 == 0) { @@ -613,11 +613,11 @@ static BOOL ov62_0223E8BC (UnkStruct_0208C06C * param0) ov62_02232394(&v0->unk_194, param0); ov62_02232378(&v0->unk_194, param0); ov62_022323B8(&v0->unk_194, 0); - sub_0200710C(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); } ov62_02234540(param0, 0); - sub_0200710C(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; break; case 3: @@ -695,8 +695,8 @@ static BOOL ov62_0223EB28 (UnkStruct_0208C06C * param0) } ov62_02240900(param0); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_02234540(param0, 1); if (v0->unk_10 == 0) { @@ -707,11 +707,11 @@ static BOOL ov62_0223EB28 (UnkStruct_0208C06C * param0) } else { ov62_02232378(&v0->unk_194, param0); ov62_022323B8(&v0->unk_194, 0); - sub_0200710C(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); } ov62_02234540(param0, 0); - sub_0200710C(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; break; case 3: @@ -1216,8 +1216,8 @@ static BOOL ov62_0223F760 (UnkStruct_0208C06C * param0) v0->unk_2008.unk_00 = ov62_02233A68(102); v0->unk_2008.unk_08 = 500; - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_022343B8(param0, 4, 3); ov62_022343B8(param0, 7, 7); @@ -1683,8 +1683,8 @@ static BOOL ov62_02240084 (UnkStruct_0208C06C * param0) } } - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_022343B8(param0, 6, 7); @@ -2032,7 +2032,7 @@ asm static BOOL ov62_022403F8 (UnkStruct_0208C06C * param0) ldr r2, [r4, #0x24] mov r1, #0x3e mov r3, #3 - bl sub_020070E8 + bl Graphics_LoadTilesToBgLayerFromOpenNARC mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2043,7 +2043,7 @@ asm static BOOL ov62_022403F8 (UnkStruct_0208C06C * param0) ldr r2, [r4, #0x24] mov r1, #0x3e mov r3, #7 - bl sub_020070E8 + bl Graphics_LoadTilesToBgLayerFromOpenNARC add r0, r4, #0 mov r1, #1 bl ov62_02234540 @@ -2090,7 +2090,7 @@ asm static BOOL ov62_022403F8 (UnkStruct_0208C06C * param0) ldr r2, [r4, #0x24] mov r1, #0x50 mov r3, #3 - bl sub_0200710C + bl Graphics_LoadTilemapToBgLayerFromOpenNARC _02240698: add r0, r4, #0 mov r1, #0 @@ -2105,7 +2105,7 @@ asm static BOOL ov62_022403F8 (UnkStruct_0208C06C * param0) ldr r2, [r4, #0x24] mov r1, #6 mov r3, #7 - bl sub_0200710C + bl Graphics_LoadTilemapToBgLayerFromOpenNARC ldr r0, [r4, #8] add r0, r0, #1 str r0, [r4, #8] diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index 181ddb7892..fe7c69d0a4 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -858,8 +858,8 @@ static BOOL ov62_02241D24 (UnkStruct_0208C06C * param0) ov62_02234314(); ov62_022315C8(&v0->unk_00, &v0->unk_04, 0); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_022343B8(param0, 56, 3); ov62_022343B8(param0, 59, 7); @@ -2228,8 +2228,8 @@ static BOOL ov62_02243514 (UnkStruct_0208C06C * param0) ov62_02234540(param0, 0); ov62_02245640(param0); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_02234540(param0, 1); if (v0->unk_1CC == 0) { @@ -2240,11 +2240,11 @@ static BOOL ov62_02243514 (UnkStruct_0208C06C * param0) } else { ov62_02232378(&v0->unk_80, param0); ov62_022323B8(&v0->unk_80, 0); - sub_0200710C(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); } ov62_02234540(param0, 0); - sub_0200710C(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; break; case 5: @@ -2456,8 +2456,8 @@ static BOOL ov62_02243B1C (UnkStruct_0208C06C * param0) v0->unk_79C = param0->unk_8B4.unk_3904[param0->unk_14.unk_48C.unk_38.unk_00]; - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_022343B8(param0, 6, 7); @@ -2946,8 +2946,8 @@ static BOOL ov62_022444BC (UnkStruct_0208C06C * param0) ov62_02231560(&v0->unk_00, &v0->unk_04, (GX_BLEND_PLANEMASK_BG3), (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ), (GX_BLEND_PLANEMASK_BG3), (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ), 0); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_022343B8(param0, 6, 7); @@ -3474,8 +3474,8 @@ static BOOL ov62_02245018 (UnkStruct_0208C06C * param0) 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); - sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_0223376C(param0, 0); param0->unk_08++; break; @@ -3504,8 +3504,8 @@ static BOOL ov62_02245018 (UnkStruct_0208C06C * param0) case 2: ov62_02245C64(param0); ov62_02245640(param0); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_02234540(param0, 1); if (v0->unk_1CC == 0) { @@ -3516,11 +3516,11 @@ static BOOL ov62_02245018 (UnkStruct_0208C06C * param0) } else { ov62_02232378(&v0->unk_80, param0); ov62_022323B8(&v0->unk_80, 0); - sub_0200710C(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); } ov62_02234540(param0, 0); - sub_0200710C(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; break; case 3: @@ -4261,7 +4261,7 @@ static BOOL ov62_02245FE4 (UnkStruct_0208C06C * param0) ov62_02231664(&v0->unk_08, 1); if (ov62_022315E0(&v0->unk_00, &v0->unk_04, 1, 2)) { - sub_0200710C(param0->unk_14.unk_00, 84, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 84, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_02244AB4(param0, 102, v0->unk_1C8); param0->unk_08++; } @@ -4479,8 +4479,8 @@ static BOOL ov62_02246428 (UnkStruct_0208C06C * param0) ov62_022455C4(param0); ov62_02245640(param0); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_02234540(param0, 1); @@ -4493,11 +4493,11 @@ static BOOL ov62_02246428 (UnkStruct_0208C06C * param0) ov62_02232394(&v0->unk_80, param0); ov62_02232378(&v0->unk_80, param0); ov62_022323B8(&v0->unk_80, 0); - sub_0200710C(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); } ov62_02234540(param0, 0); - sub_0200710C(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; break; case 3: @@ -4558,8 +4558,8 @@ static BOOL ov62_02246640 (UnkStruct_0208C06C * param0) } ov62_02245640(param0); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_02234540(param0, 1); if (v0->unk_1CC == 0) { @@ -4569,11 +4569,11 @@ static BOOL ov62_02246640 (UnkStruct_0208C06C * param0) } else { ov62_02232378(&v0->unk_80, param0); ov62_022323B8(&v0->unk_80, 0); - sub_0200710C(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 80, param0->unk_14.unk_10, 3, 0, 0, 0, 102); } ov62_02234540(param0, 0); - sub_0200710C(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 6, param0->unk_14.unk_10, 7, 0, 0, 0, 102); param0->unk_08++; break; case 3: diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c index 388d1e522f..7a22774005 100644 --- a/src/overlay062/ov62_02246B00.c +++ b/src/overlay062/ov62_02246B00.c @@ -594,8 +594,8 @@ void ov62_02247574(UnkStruct_ov62_02246BF4 *param0) v1 = param0->unk_220.unk_0C; v0 = param0->unk_220.unk_00; - sub_020070E8(v0, 54, param0->unk_220.unk_0C, 3, 0, 0, 0, 102); - sub_0200710C(v0, 43, v1, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 54, param0->unk_220.unk_0C, 3, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 43, v1, 3, 0, 0, 0, 102); SpriteRenderer_LoadPalette(v4, 2, v2, v3, v0, 44, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 1000); SpriteRenderer_LoadCharResObjFromOpenNarc(v2, v3, v0, 40, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1000); SpriteRenderer_LoadCellResObjFromOpenNarc(v2, v3, v0, 41, 0, 1000); diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c index ee2b8a89e3..a3bdaa9312 100644 --- a/src/overlay062/ov62_02247D74.c +++ b/src/overlay062/ov62_02247D74.c @@ -174,8 +174,8 @@ static BOOL ov62_02247FFC(UnkStruct_0208C06C *param0) 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 3, 0, 0, 0, 102); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 7, 0, 0, 0, 102); ov62_02234540(param0, 1); ov62_02231454(param0); ov62_02234540(param0, 0); @@ -203,7 +203,7 @@ static BOOL ov62_02248114(UnkStruct_0208C06C *param0) case 0: ov62_02247E9C(param0); ov62_02247D74(param0, 0); - sub_0200710C(param0->unk_14.unk_00, 84, param0->unk_14.unk_10, 7, 0, 0, 0, 102); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14.unk_00, 84, param0->unk_14.unk_10, 7, 0, 0, 0, 102); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); diff --git a/src/overlay063/ov63_0222D1C0.c b/src/overlay063/ov63_0222D1C0.c index a78fe6cde4..58052582c0 100644 --- a/src/overlay063/ov63_0222D1C0.c +++ b/src/overlay063/ov63_0222D1C0.c @@ -47,7 +47,7 @@ UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(UnkStruct_0200C738 *param0, BgConfig *par ov63_0222D31C(v0->unk_04, v0->unk_14, param2); - v0->unk_08 = sub_02006F6C(param2->unk_08, param2->unk_09, param2->unk_0A, &v0->unk_0C, param3); + v0->unk_08 = Graphics_GetScrnData(param2->unk_08, param2->unk_09, param2->unk_0A, &v0->unk_0C, param3); return v0; } diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index b0db8c99cc..8d606d941a 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -941,15 +941,15 @@ static void ov64_0222E290 (UnkStruct_ov64_0222E21C * param0, u32 param1) Bg_ClearTilemap(param0->unk_00, Unk_ov64_02232258[v0]); } - sub_02007130(param0->unk_21C, 0, 0, 0, ((6 + 1) - 0) * 32, param1); - sub_02007130(param0->unk_21C, 0, 4, 0, ((4 + 1) - 0) * 32, param1); + Graphics_LoadPaletteFromOpenNARC(param0->unk_21C, 0, 0, 0, ((6 + 1) - 0) * 32, param1); + Graphics_LoadPaletteFromOpenNARC(param0->unk_21C, 0, 4, 0, ((4 + 1) - 0) * 32, param1); - sub_020070E8(param0->unk_21C, 18, param0->unk_00, Unk_ov64_02232258[0], 0, 0, 0, param1); - sub_020070E8(param0->unk_21C, 18, param0->unk_00, Unk_ov64_02232258[2], 0, 0, 0, param1); - sub_020070E8(param0->unk_21C, 13, param0->unk_00, Unk_ov64_02232258[4], 0, 0, 0, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_21C, 18, param0->unk_00, Unk_ov64_02232258[0], 0, 0, 0, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_21C, 18, param0->unk_00, Unk_ov64_02232258[2], 0, 0, 0, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_21C, 13, param0->unk_00, Unk_ov64_02232258[4], 0, 0, 0, param1); - sub_0200710C(param0->unk_21C, 12, param0->unk_00, Unk_ov64_02232258[0], 0, 0, 0, param1); - sub_0200710C(param0->unk_21C, 14, param0->unk_00, Unk_ov64_02232258[4], 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_21C, 12, param0->unk_00, Unk_ov64_02232258[0], 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_21C, 14, param0->unk_00, Unk_ov64_02232258[4], 0, 0, 0, param1); } static void ov64_0222E3AC (UnkStruct_ov64_0222E21C * param0) @@ -1076,7 +1076,7 @@ static void ov64_0222E6D8 (UnkStruct_ov64_0222E21C * param0, u32 param1) int v1; for (v1 = 0; v1 < 2; v1++) { - param0->unk_278.unk_00[v1] = sub_020071D0(param0->unk_21C, v0[v1], 0, ¶m0->unk_278.unk_08[v1], param1); + param0->unk_278.unk_00[v1] = Graphics_GetScrnDataFromOpenNARC(param0->unk_21C, v0[v1], 0, ¶m0->unk_278.unk_08[v1], param1); } } @@ -1565,7 +1565,7 @@ asm static void ov64_0222EC94 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_ mov r1, #1 mov r2, #0 add r3, #0x18 - bl sub_020071D0 + bl Graphics_GetScrnDataFromOpenNARC ldr r1, [sp, #0x14] str r0, [r1, #0x14] add sp, #0x30 @@ -3113,7 +3113,7 @@ asm static void ov64_02230680 (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_ mov r1, #0xb mov r2, #0 add r3, #0x24 - bl sub_020071D0 + bl Graphics_GetScrnDataFromOpenNARC str r0, [r5, #0x20] add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} @@ -3477,7 +3477,7 @@ static void ov64_02230F24 (UnkStruct_ov64_02230F60 * param0, UnkStruct_ov64_0222 int v1; for (v1 = 0; v1 < 7; v1++) { - param0->unk_00[v1] = sub_020071D0(param1->unk_21C, v0[v1], 0, ¶m0->unk_1C[v1], param2); + param0->unk_00[v1] = Graphics_GetScrnDataFromOpenNARC(param1->unk_21C, v0[v1], 0, ¶m0->unk_1C[v1], param2); } } @@ -3950,7 +3950,7 @@ asm static void ov64_02231164 (UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_ ldr r1, [sp, #0x40] mov r2, #0 lsl r3, r3, #6 - bl sub_02006E84 + bl Graphics_LoadPalette ldr r0, [sp, #0x30] cmp r0, #0 bne _0223148A diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 94e308fc36..f8ae5eca5c 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -1211,17 +1211,17 @@ static UnkStruct_ov65_022354D8 * ov65_0222E8D4 (UnkStruct_ov65_0222EBE0 * param0 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); - sub_020070E8(param2, 12, param0, 1, 0, 0, 0, param3); - sub_020070E8(param2, 12, param0, 6, 0, 0, 0, param3); + Graphics_LoadPaletteFromOpenNARC(param2, 13, 0, 8 * 32, 2 * 32, param3); + Graphics_LoadPaletteFromOpenNARC(param2, 13, 4, 13 * 32, 2 * 32, param3); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 12, param0, 1, 0, 0, 0, param3); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 12, param0, 6, 0, 0, 0, param3); if (param1->unk_08 == NULL) { - param1->unk_08 = sub_020071B4(param2, 12, 0, ¶m1->unk_0C, param3); + param1->unk_08 = Graphics_GetCharDataFromOpenNARC(param2, 12, 0, ¶m1->unk_0C, param3); } if (param1->unk_00 == NULL) { - param1->unk_00 = sub_020071D0(param2, 14, 0, ¶m1->unk_04, param3); + param1->unk_00 = Graphics_GetScrnDataFromOpenNARC(param2, 14, 0, ¶m1->unk_04, param3); } } @@ -1453,16 +1453,16 @@ static void ov65_0222ECA8 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); - sub_02007130(param1, 3, 0, 0, 0, 54); - sub_02007130(param1, 3, 4, 0, 0, 54); + Graphics_LoadPaletteFromOpenNARC(param1, 3, 0, 0, 0, 54); + Graphics_LoadPaletteFromOpenNARC(param1, 3, 4, 0, 0, 54); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 54); Font_LoadScreenIndicatorsPalette(0, 12 * 0x20, 54); - sub_020070E8(param1, 2, v0, 0, 0, 0, 0, 54); - sub_0200710C(param1, 5, v0, 0, 0, 0, 0, 54); - sub_020070E8(param1, 10, v0, 4, 0, 0, 0, 54); - sub_0200710C(param1, 11, v0, 4, 0, 0, 0, 54); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, v0, 0, 0, 0, 0, 54); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 5, v0, 0, 0, 0, 0, 54); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 10, v0, 4, 0, 0, 0, 54); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 11, v0, 4, 0, 0, 0, 54); { int v1 = Options_Frame(SaveData_Options(param0->unk_160)); @@ -5141,22 +5141,22 @@ static void ov65_022332FC (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32 int v2, v3; 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); - sub_020070E8(param1, 18, param0->unk_15C, 6, (0 + 48), 0, 0, param2); - sub_0200710C(param1, 17, param0->unk_15C, 4, 0, 0, 0, param2); + Graphics_LoadPaletteFromOpenNARC(param1, 16, 4, 0 * 32, 4 * 32, param2); + Graphics_LoadPaletteFromOpenNARC(param1, 19, 4, 4 * 32, 5 * 32, param2); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 15, param0->unk_15C, 4, 0, 0, 0, param2); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 18, param0->unk_15C, 6, (0 + 48), 0, 0, param2); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 17, param0->unk_15C, 4, 0, 0, 0, param2); - param0->unk_BE0.unk_04 = sub_020071D0(param1, 20, 0, ¶m0->unk_BE0.unk_08, param2); + param0->unk_BE0.unk_04 = Graphics_GetScrnDataFromOpenNARC(param1, 20, 0, ¶m0->unk_BE0.unk_08, param2); ov65_022335F8(param0->unk_BE0.unk_08, (0 + 48)); for (v0 = 0; v0 < 7; v0++) { - param0->unk_BE0.unk_0C[v0] = sub_020071D0(param1, 21 + v0, 0, ¶m0->unk_BE0.unk_28[v0], param2); + param0->unk_BE0.unk_0C[v0] = Graphics_GetScrnDataFromOpenNARC(param1, 21 + v0, 0, ¶m0->unk_BE0.unk_28[v0], param2); ov65_022335F8(param0->unk_BE0.unk_28[v0], (0 + 48)); } - param0->unk_BE0.unk_44 = sub_020071D0(param1, 28, 0, ¶m0->unk_BE0.unk_48, param2); + param0->unk_BE0.unk_44 = Graphics_GetScrnDataFromOpenNARC(param1, 28, 0, ¶m0->unk_BE0.unk_48, param2); ov65_022335F8(param0->unk_BE0.unk_48, (0 + 48)); Font_LoadScreenIndicatorsPalette(4, 15 * 32, param2); diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c index 3995ab4e06..dddf74ec7c 100644 --- a/src/overlay065/ov65_02235060.c +++ b/src/overlay065/ov65_02235060.c @@ -637,9 +637,9 @@ 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); + Graphics_LoadPaletteFromOpenNARC(param2, 30, 0, 0, 8 * 32, param1); Bg_MaskPalette(0, 0); - sub_020070E8(param2, 29, param0, 0, 0, 0, 0, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 29, param0, 0, 0, 0, 0, param1); } static void ov65_02235960(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2) @@ -1159,7 +1159,7 @@ static void ov65_022362B0(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022363 { memset(param1, 0, sizeof(UnkStruct_ov65_02236318)); - param1->unk_00 = sub_020071EC(param2, 31, ¶m1->unk_04, param0->unk_04); + param1->unk_00 = Graphics_GetPlttDataFromOpenNARC(param2, 31, ¶m1->unk_04, param0->unk_04); param1->unk_08 = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3); param1->unk_09 = 0; param1->unk_0A = Unk_ov65_02238BC8[param1->unk_09]; diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 957de17553..5c871683a2 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -711,16 +711,16 @@ static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1) v0 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, param1); - sub_02007130(v0, 13, 0, 5 * 32, 1 * 32, param1); - sub_020070E8(v0, 12, param0->unk_00, 2, 0 * 32, (24 * 2) * 32, 0, param1); + Graphics_LoadPaletteFromOpenNARC(v0, 13, 0, 5 * 32, 1 * 32, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 12, param0->unk_00, 2, 0 * 32, (24 * 2) * 32, 0, param1); - param0->unk_244 = sub_020071D0(v0, 14, 0, ¶m0->unk_248, param1); + param0->unk_244 = Graphics_GetScrnDataFromOpenNARC(v0, 14, 0, ¶m0->unk_248, param1); { - param0->unk_250 = sub_020071EC(v0, 44, ¶m0->unk_254, param1); + param0->unk_250 = Graphics_GetPlttDataFromOpenNARC(v0, 44, ¶m0->unk_254, param1); - sub_020070E8(v0, 45, param0->unk_00, 0, 0, 0, 0, param1); - sub_0200710C(v0, 46, param0->unk_00, 0, 0, 0, 0, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 45, param0->unk_00, 0, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 46, param0->unk_00, 0, 0, 0, 0, param1); ov65_022372EC(param0, 0); param0->unk_258 = 3; diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index a45156997e..26881b9378 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -587,12 +587,12 @@ static void ov67_0225CE30(UnkStruct_ov67_0225D154 *param0, u32 param1) } { - sub_02006E84(92, 3, 0, 0, 11 * 32, param1); - sub_02006E84(92, 3, 4, 0, 11 * 32, param1); - sub_02006E3C(92, 2, param0->unk_0C, Unk_ov67_0225D3F4[0], 0, 0, 0, param1); - sub_02006E3C(92, 10, param0->unk_0C, Unk_ov67_0225D3F4[2], 0, 0, 0, param1); - sub_02006E60(92, 5, param0->unk_0C, Unk_ov67_0225D3F4[0], 0, 0, 0, param1); - sub_02006E60(92, 11, param0->unk_0C, Unk_ov67_0225D3F4[2], 0, 0, 0, param1); + Graphics_LoadPalette(92, 3, 0, 0, 11 * 32, param1); + Graphics_LoadPalette(92, 3, 4, 0, 11 * 32, param1); + Graphics_LoadTilesToBgLayer(92, 2, param0->unk_0C, Unk_ov67_0225D3F4[0], 0, 0, 0, param1); + Graphics_LoadTilesToBgLayer(92, 10, param0->unk_0C, Unk_ov67_0225D3F4[2], 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayer(92, 5, param0->unk_0C, Unk_ov67_0225D3F4[0], 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayer(92, 11, param0->unk_0C, Unk_ov67_0225D3F4[2], 0, 0, 0, param1); } GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index a19f213c35..f688c9d375 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -496,9 +496,9 @@ static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 sub_0200DAA4(param0->unk_00, 1, (1 + (18 + 12)), 6, 0, param2); { - sub_02006E3C(169, 2, param0->unk_00, 4, 0, 0, 0, param2); - sub_02006E60(169, 6, param0->unk_00, 4, 0, 0, 0, param2); - sub_02006E84(169, 0, 4, 0, 0, param2); + Graphics_LoadTilesToBgLayer(169, 2, param0->unk_00, 4, 0, 0, 0, param2); + Graphics_LoadTilemapToBgLayer(169, 6, param0->unk_00, 4, 0, 0, 0, param2); + Graphics_LoadPalette(169, 0, 4, 0, 0, param2); } } @@ -663,9 +663,9 @@ static void ov68_0225CCC8(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB7 static void ov68_0225CCD0(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3) { { - sub_02007130(param2->unk_1A4, 199, 0, 0, 4 * 32, param3); - sub_020070E8(param2->unk_1A4, 200, param2->unk_00, 0, 0, 0, 0, param3); - sub_0200710C(param2->unk_1A4, 201, param2->unk_00, 0, 0, 0, 0, param3); + Graphics_LoadPaletteFromOpenNARC(param2->unk_1A4, 199, 0, 0, 4 * 32, param3); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2->unk_1A4, 200, param2->unk_00, 0, 0, 0, 0, param3); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param2->unk_1A4, 201, param2->unk_00, 0, 0, 0, 0, param3); } { @@ -1033,9 +1033,9 @@ static void ov68_0225D380(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB7 static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4) { { - sub_02007130(param2->unk_1A4, 199, 0, 0, 4 * 32, param4); - sub_020070E8(param2->unk_1A4, 200, param2->unk_00, 0, 0, 0, 0, param4); - sub_0200710C(param2->unk_1A4, 202, param2->unk_00, 0, 0, 0, 0, param4); + Graphics_LoadPaletteFromOpenNARC(param2->unk_1A4, 199, 0, 0, 4 * 32, param4); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2->unk_1A4, 200, param2->unk_00, 0, 0, 0, 0, param4); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param2->unk_1A4, 202, param2->unk_00, 0, 0, 0, 0, param4); } { @@ -1049,7 +1049,7 @@ static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB ov68_0225D89C(param0, param1, 109, TEXT_COLOR(3, 4, 0)); { - param0->unk_80 = sub_020071B4(param2->unk_1A4, 200, 0, ¶m0->unk_84, param4); + param0->unk_80 = Graphics_GetCharDataFromOpenNARC(param2->unk_1A4, 200, 0, ¶m0->unk_84, param4); } { @@ -1422,7 +1422,7 @@ static BOOL ov68_0225DA74(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225C9 static void ov68_0225DB3C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3) { { - sub_0200710C(param2->unk_1A4, 203, param2->unk_00, 0, 0, 0, 0, param3); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param2->unk_1A4, 203, param2->unk_00, 0, 0, 0, 0, param3); } { diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index 4894ab2625..254679553c 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -1423,16 +1423,16 @@ static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 } } - sub_02007130(param0->unk_1A8, 5, 4, 0, 0, param2); + Graphics_LoadPaletteFromOpenNARC(param0->unk_1A8, 5, 4, 0, 0, param2); { - sub_020070E8(param0->unk_1A8, 11, param0->unk_00, 4, 0, 0, 0, param2); - sub_0200710C(param0->unk_1A8, 12, param0->unk_00, 4, 0, 0, 0, param2); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A8, 11, param0->unk_00, 4, 0, 0, 0, param2); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A8, 12, param0->unk_00, 4, 0, 0, 0, param2); } { - sub_020070E8(param0->unk_1A8, 4, param0->unk_00, 6, 0, 0, 0, param2); - sub_0200710C(param0->unk_1A8, 18, param0->unk_00, 7, 0, 0, 0, param2); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A8, 4, param0->unk_00, 6, 0, 0, 0, param2); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A8, 18, param0->unk_00, 7, 0, 0, 0, param2); } Font_LoadScreenIndicatorsPalette(0, 1 * 0x20, param2); @@ -2039,7 +2039,7 @@ static void ov69_0225DEC0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D3 ov69_0225E590(param0, param1, param3); { - param0->unk_94 = sub_020071D0(param1->unk_1A8, 19, 0, ¶m0->unk_98, param3); + param0->unk_94 = Graphics_GetScrnDataFromOpenNARC(param1->unk_1A8, 19, 0, ¶m0->unk_98, param3); } ov69_0225E960(¶m0->unk_1B8, param1, ¶m0->unk_2E4, param3); @@ -2539,7 +2539,7 @@ static void ov69_0225E748(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D3 param0->unk_18 = param2->unk_04; for (v0 = 0; v0 < param0->unk_18; v0++) { - param0->unk_08[v0] = sub_020071D0( + param0->unk_08[v0] = Graphics_GetScrnDataFromOpenNARC( param1->unk_1A8, param2->unk_00[v0], 0, ¶m0->unk_10[v0], param4); } } @@ -2547,7 +2547,7 @@ static void ov69_0225E748(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D3 if (param2->unk_08 > 0) { param0->unk_24 = param2->unk_08; param0->unk_26 = param2->unk_0A; - param0->unk_1C = sub_020071EC(param1->unk_1A8, param2->unk_06, ¶m0->unk_20, param4); + param0->unk_1C = Graphics_GetPlttDataFromOpenNARC(param1->unk_1A8, param2->unk_06, ¶m0->unk_20, param4); } } diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index fa030c14e9..e6ec6e3942 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -1302,7 +1302,7 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 sub_0200DD0C(param0->unk_00, Unk_ov70_0226D5CC[0], 1, 1, v2, param2); sub_0200E2A4(param0->unk_00, Unk_ov70_0226D5CC[0], (1 + (18 + 12)), 2, 3, 0, param2); - sub_02006E84(186, 90, 0, 2 * 32, 32, param2); + Graphics_LoadPalette(186, 90, 0, 2 * 32, 32, param2); } { @@ -2431,7 +2431,7 @@ static void ov70_0225F95C(SysTask *param0, void *param1) UnkStruct_ov70_0225F350 *v0 = param1; { - sub_02007130(v0->unk_14C, v0->unk_154, 4, 0, 0, v0->unk_156); + Graphics_LoadPaletteFromOpenNARC(v0->unk_14C, v0->unk_154, 4, 0, 0, v0->unk_156); } { @@ -2439,7 +2439,7 @@ static void ov70_0225F95C(SysTask *param0, void *param1) } { - sub_02006E84(sub_0207C944(), sub_0207C920(), 4, 11 * 32, 3 * 32, v0->unk_156); + Graphics_LoadPalette(sub_0207C944(), sub_0207C920(), 4, 11 * 32, 3 * 32, v0->unk_156); } SysTask_Done(param0); @@ -2449,12 +2449,12 @@ static void ov70_0225F9BC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4 { { if (param3 == 0) { - sub_02007130(param2, 86, 4, 0, 0, param4); + Graphics_LoadPaletteFromOpenNARC(param2, 86, 4, 0, 0, param4); } else { - sub_02007130(param2, 87, 4, 0, 0, param4); + Graphics_LoadPaletteFromOpenNARC(param2, 87, 4, 0, 0, param4); } - sub_020070E8(param2, 54, param1->unk_00, Unk_ov70_0226D5CC[1], 0, 0, 0, param4); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 54, param1->unk_00, Unk_ov70_0226D5CC[1], 0, 0, 0, param4); } { @@ -2472,7 +2472,7 @@ static void ov70_0225FA14(UnkStruct_ov70_0225E4EC *param0, NARC *param1, u32 par void *v0; NNSG2dScreenData *v1; - v0 = sub_020071D0(param1, param2, 0, &v1, param5); + v0 = Graphics_GetScrnDataFromOpenNARC(param1, param2, 0, &v1, param5); { int v2; @@ -3066,7 +3066,7 @@ static void ov70_02260744(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 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); + param0->unk_20[v0] = Graphics_GetScrnDataFromOpenNARC(param2, 56 + v0, 0, ¶m0->unk_2C[v0], param3); } { @@ -3134,7 +3134,7 @@ static BOOL ov70_022607D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 static void ov70_02260870(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, UnkStruct_ov70_0225F208 *param2, const UnkStruct_ov66_0222E71C *param3, NARC *param4, u32 param5) { { - sub_0200710C(param4, 55, param1->unk_00, Unk_ov70_0226D5CC[1], 0, 0, 0, param5); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param4, 55, param1->unk_00, Unk_ov70_0226D5CC[1], 0, 0, 0, param5); } param0->unk_08 = 0; @@ -3142,7 +3142,7 @@ static void ov70_02260870(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 { param0->unk_0A = ov66_0222E8C4(param3); - sub_020070E8(param4, 0 + param0->unk_0A, param1->unk_00, Unk_ov70_0226D5CC[3], 320, 0, 0, param5); + Graphics_LoadTilesToBgLayerFromOpenNARC(param4, 0 + param0->unk_0A, param1->unk_00, Unk_ov70_0226D5CC[3], 320, 0, 0, param5); ov70_0225FA14(param1, param4, 27 + param0->unk_0A, Unk_ov70_0226D5CC[3], 320, param5); } @@ -3167,13 +3167,13 @@ static void ov70_02260930(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 GF_ASSERT(param2 < 3); { - sub_0200710C(param3, 55, param1->unk_00, Unk_ov70_0226D5CC[1], 0, 0, 0, param4); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param3, 55, param1->unk_00, Unk_ov70_0226D5CC[1], 0, 0, 0, param4); } param0->unk_08 = 1; param0->unk_0A = param2; - sub_020070E8(param3, 93 + param0->unk_0A, param1->unk_00, Unk_ov70_0226D5CC[3], 320, 0, 0, param4); + Graphics_LoadTilesToBgLayerFromOpenNARC(param3, 93 + param0->unk_0A, param1->unk_00, Unk_ov70_0226D5CC[3], 320, 0, 0, param4); if (param0->unk_02 == 0) { ov70_022609D4(param0, param1, 0, param3, param4); diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index 4b9ee2ba5a..c31e337ed0 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -447,26 +447,26 @@ static void ov71_0223B6A8(const u8 param0, const u8 param1, NARC *param2) if (param1) { switch (param0) { case 0: - v0 = sub_020071EC(param2, 0, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param2, 0, &v1, 25); break; case 1: - v0 = sub_020071EC(param2, 1, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param2, 1, &v1, 25); break; case 2: - v0 = sub_020071EC(param2, 2, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param2, 2, &v1, 25); break; case 3: - v0 = sub_020071EC(param2, 3, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param2, 3, &v1, 25); break; case 4: - v0 = sub_020071EC(param2, 4, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param2, 4, &v1, 25); break; case 5: - v0 = sub_020071EC(param2, 5, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param2, 5, &v1, 25); break; } } else { - v0 = sub_020071EC(param2, 6, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param2, 6, &v1, 25); } { @@ -490,22 +490,22 @@ static void ov71_0223B768(const u8 param0, NARC *param1) switch (param0) { case 10: - v0 = sub_020071EC(param1, 7, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param1, 7, &v1, 25); break; case 11: - v0 = sub_020071EC(param1, 8, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param1, 8, &v1, 25); break; case 12: - v0 = sub_020071EC(param1, 10, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param1, 10, &v1, 25); break; case 7: - v0 = sub_020071EC(param1, 11, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param1, 11, &v1, 25); break; case 8: - v0 = sub_020071EC(param1, 12, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param1, 12, &v1, 25); break; default: - v0 = sub_020071EC(param1, 9, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param1, 9, &v1, 25); break; } @@ -523,7 +523,7 @@ static void ov71_0223B820(const u8 param0, NARC *param1) u8 *v1; NNSG2dPaletteData *v2; - v0 = sub_020071EC(param1, 48, &v2, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param1, 48, &v2, 25); v1 = (u8 *)(v2->pRawData); DC_FlushRange(&v1[2 * 16 * param0], 2 * 16); @@ -659,7 +659,7 @@ static void ov71_0223B968(UnkStruct_ov71_0223B620 *param0, NARC *param1) void *v0; NNSG2dPaletteData *v1; - v0 = sub_020071EC(param1, 0, &v1, 25); + v0 = Graphics_GetPlttDataFromOpenNARC(param1, 0, &v1, 25); DC_FlushRange(v1->pRawData, 2 * 16 * 16); GXS_LoadBGPltt(v1->pRawData, 0, 2 * 16 * 16); @@ -672,7 +672,7 @@ static void ov71_0223B968(UnkStruct_ov71_0223B620 *param0, NARC *param1) void *v2; NNSG2dPaletteData *v3; - v2 = sub_020071EC(param1, 13, &v3, 25); + v2 = Graphics_GetPlttDataFromOpenNARC(param1, 13, &v3, 25); DC_FlushRange(v3->pRawData, 16 * 2 * 16); GX_LoadBGPltt(v3->pRawData, 0, 16 * 2 * 16); @@ -709,13 +709,13 @@ static void ov71_0223B968(UnkStruct_ov71_0223B620 *param0, NARC *param1) } if (v6 != -1) { - sub_02007130(param1, v6, 4, (4 * 32), (2 * 32), 25); + Graphics_LoadPaletteFromOpenNARC(param1, v6, 4, (4 * 32), (2 * 32), 25); } if (param0->unk_B4->unk_04_2 == 0) { - param0->unk_335C = sub_020071D0(param1, v5, 0, ¶m0->unk_3360, 25); + param0->unk_335C = Graphics_GetScrnDataFromOpenNARC(param1, v5, 0, ¶m0->unk_3360, 25); } else { - param0->unk_335C = sub_020071D0(param1, v5 + 1, 0, ¶m0->unk_3360, 25); + param0->unk_335C = Graphics_GetScrnDataFromOpenNARC(param1, v5 + 1, 0, ¶m0->unk_3360, 25); } } else { { @@ -727,7 +727,7 @@ static void ov71_0223B968(UnkStruct_ov71_0223B620 *param0, NARC *param1) v8 = NNS_G2dGetUnpackedBGCharacterData(param0->unk_30B8, ¶m0->unk_30BC); GF_ASSERT(v8); - param0->unk_335C = sub_020071D0(param1, 49, 0, ¶m0->unk_3360, 25); + param0->unk_335C = Graphics_GetScrnDataFromOpenNARC(param1, 49, 0, ¶m0->unk_3360, 25); ov71_0223B820(param0->unk_B4->unk_05, param1); } @@ -735,17 +735,17 @@ static void ov71_0223B968(UnkStruct_ov71_0223B620 *param0, NARC *param1) ov71_0223C390(param0); - sub_020070E8(param1, 27, param0->unk_00, 6, 0, 0, 0, 25); - sub_0200710C(param1, 35, param0->unk_00, 6, 0, 0, 0, 25); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 27, param0->unk_00, 6, 0, 0, 0, 25); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 35, param0->unk_00, 6, 0, 0, 0, 25); - sub_020070E8(param1, 28, param0->unk_00, 5, 0, 0, 0, 25); - sub_0200710C(param1, 37, param0->unk_00, 5, 0, 0, 0, 25); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 28, param0->unk_00, 5, 0, 0, 0, 25); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 37, param0->unk_00, 5, 0, 0, 0, 25); - sub_020070E8(param1, 29, param0->unk_00, 2, 0, 0, 0, 25); - sub_0200710C(param1, 38, param0->unk_00, 2, 0, 0, 0, 25); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 29, param0->unk_00, 2, 0, 0, 0, 25); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 38, param0->unk_00, 2, 0, 0, 0, 25); - sub_020070E8(param1, 30, param0->unk_00, 3, 0, 0, 0, 25); - sub_0200710C(param1, 39, param0->unk_00, 3, 0, 0, 0, 25); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 30, param0->unk_00, 3, 0, 0, 0, 25); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 39, param0->unk_00, 3, 0, 0, 0, 25); ov71_0223C4DC(param0->unk_B4->unk_68, param0->unk_B8); } @@ -799,7 +799,7 @@ static BOOL ov71_0223BC20(UnkStruct_ov71_0223B620 *param0) case 2: if (param0->unk_30C0 == 0) { param0->unk_30C0 = 1; - sub_02006E60(51, 36, param0->unk_00, 6, 0, 0, 0, 25); + Graphics_LoadTilemapToBgLayer(51, 36, param0->unk_00, 6, 0, 0, 0, 25); ov71_0223CD44(param0->unk_04, 0, 6); ov71_0223C3E8(param0); Bg_ClearTilemap(param0->unk_00, 7); @@ -807,7 +807,7 @@ static BOOL ov71_0223BC20(UnkStruct_ov71_0223B620 *param0) 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); + Graphics_LoadTilemapToBgLayer(51, 35, param0->unk_00, 6, 0, 0, 0, 25); ov71_0223CD44(param0->unk_04, 7, 10); Bg_ClearTilemap(param0->unk_00, 7); ov71_0223C390(param0); diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index af0aa35fae..f8ac7d3d66 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -442,15 +442,15 @@ static void ov72_0223DCA8(UnkStruct_ov72_0223DB98 *param0, NARC *param1) { 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); + Graphics_LoadPaletteFromOpenNARC(param1, 0, 0, 0, 16 * 2 * 3, 39); + Graphics_LoadPaletteFromOpenNARC(param1, 2, 4, 0, 16 * 2 * 2, 39); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 39); Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, 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); - sub_0200710C(param1, 6, v0, 5, 0, 32 * 24 * 2, 1, 39); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 3, v0, 2, 0, 32 * 8 * 0x20, 1, 39); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 5, v0, 2, 0, 32 * 24 * 2, 1, 39); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 4, v0, 5, 0, 32 * 8 * 0x20, 1, 39); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 6, v0, 5, 0, 32 * 24 * 2, 1, 39); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_0C), 39); sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 39); } diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index bccd5fd790..1502ad95ca 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -905,9 +905,9 @@ 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); + Graphics_LoadTilesToBgLayer(125, 0, param0->unk_18, 3, 0, 0, 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); + Graphics_LoadTilesToBgLayer(125, 24, param0->unk_18, 7, 0, 0, 0, param0->unk_00); { int v0, v1; @@ -923,8 +923,8 @@ static void ov73_021D1930(UnkStruct_ov73_021D1058 *param0) v1 = 26; } - sub_02006E84(125, v0, 0, 0 * (2 * 16), (2 * 16) * 3, param0->unk_00); - sub_02006E84(125, v1, 4, 0 * (2 * 16), (2 * 16) * 5, param0->unk_00); + Graphics_LoadPalette(125, v0, 0, 0 * (2 * 16), (2 * 16) * 3, param0->unk_00); + Graphics_LoadPalette(125, v1, 4, 0 * (2 * 16), (2 * 16) * 5, param0->unk_00); } ov73_021D19DC(param0); @@ -943,7 +943,7 @@ static void ov73_021D19DC(UnkStruct_ov73_021D1058 *param0) return; } - sub_02006E60(125, v0[param0->unk_88], param0->unk_18, 3, 0, 0, 0, param0->unk_00); + Graphics_LoadTilemapToBgLayer(125, v0[param0->unk_88], param0->unk_18, 3, 0, 0, 0, param0->unk_00); } static void ov73_021D1A20(UnkStruct_ov73_021D1058 *param0) @@ -963,16 +963,16 @@ static void ov73_021D1A20(UnkStruct_ov73_021D1058 *param0) }; if ((param0->unk_89 != 0) && (param0->unk_89 < 12)) { - sub_02006E3C(125, v0[param0->unk_89][0], param0->unk_18, 1, 0, 0, 0, param0->unk_00); - sub_02006E84(125, v0[param0->unk_89][1], 0, 7 * (2 * 16), (2 * 16), param0->unk_00); - sub_02006E60(125, 23, param0->unk_18, 1, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v0[param0->unk_89][0], param0->unk_18, 1, 0, 0, 0, param0->unk_00); + Graphics_LoadPalette(125, v0[param0->unk_89][1], 0, 7 * (2 * 16), (2 * 16), param0->unk_00); + Graphics_LoadTilemapToBgLayer(125, 23, param0->unk_18, 1, 0, 0, 0, param0->unk_00); ov73_021D14DC(param0, 1, 7); } if ((param0->unk_8A != 0) && (param0->unk_8A < 12)) { - sub_02006E3C(125, v0[param0->unk_8A][0], param0->unk_18, 2, 0, 0, 0, param0->unk_00); - sub_02006E84(125, v0[param0->unk_8A][1], 0, 8 * (2 * 16), (2 * 16), param0->unk_00); - sub_02006E60(125, 23, param0->unk_18, 2, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v0[param0->unk_8A][0], param0->unk_18, 2, 0, 0, 0, param0->unk_00); + Graphics_LoadPalette(125, v0[param0->unk_8A][1], 0, 8 * (2 * 16), (2 * 16), param0->unk_00); + Graphics_LoadTilemapToBgLayer(125, 23, param0->unk_18, 2, 0, 0, 0, param0->unk_00); ov73_021D14DC(param0, 2, 8); } } @@ -985,7 +985,7 @@ static void ov73_021D1B14(UnkStruct_ov73_021D1058 *param0) return; } - sub_02006E60(125, v0[param0->unk_8B], param0->unk_18, 7, 0, 0, 0, param0->unk_00); + Graphics_LoadTilemapToBgLayer(125, v0[param0->unk_8B], param0->unk_18, 7, 0, 0, 0, param0->unk_00); if (param0->unk_8B == 1) { ov73_021D14DC(param0, 7, 3); @@ -1149,12 +1149,12 @@ static void ov73_021D1B80(UnkStruct_ov73_021D1058 *param0) static void ov73_021D1CE0(UnkStruct_ov73_021D1058 *param0) { - sub_02006E60(125, 40, param0->unk_18, 6, 0, 0, 0, param0->unk_00); + Graphics_LoadTilemapToBgLayer(125, 40, param0->unk_18, 6, 0, 0, 0, param0->unk_00); ov73_021D14DC(param0, 6, 9); - sub_02006E84(125, 41, 4, 7 * (2 * 16), (2 * 16) * 3, param0->unk_00); + Graphics_LoadPalette(125, 41, 4, 7 * (2 * 16), (2 * 16) * 3, 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); + Graphics_LoadTilesToBgLayer(125, 32, param0->unk_18, 6, 0x20, 0, 0, param0->unk_00); } static BOOL ov73_021D1D44(UnkStruct_ov73_021D1058 *param0, int param1, int param2) @@ -1216,7 +1216,7 @@ static void ov73_021D1DE8(UnkStruct_ov73_021D1058 *param0) { int v0[] = { 9, 10, 11, 12 }; - sub_02006E3C(125, v0[param0->unk_8C], param0->unk_18, 1, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v0[param0->unk_8C], param0->unk_18, 1, 0, 0, 0, param0->unk_00); } } else { if (param0->unk_8F) { @@ -1231,7 +1231,7 @@ static void ov73_021D1DE8(UnkStruct_ov73_021D1058 *param0) { int v1[] = { 14, 15, 16, 17 }; - sub_02006E3C(125, v1[param0->unk_8E], param0->unk_18, 2, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v1[param0->unk_8E], param0->unk_18, 2, 0, 0, 0, param0->unk_00); } } } @@ -1274,7 +1274,7 @@ static BOOL ov73_021D1F18(UnkStruct_ov73_021D1058 *param0) if (v1 == 0xff) { v0 = 1; } else { - sub_02006E3C(125, v1, param0->unk_18, 1, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v1, param0->unk_18, 1, 0, 0, 0, param0->unk_00); } return v0; @@ -1766,7 +1766,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) param0->unk_0C = 50; } else { - sub_02006E3C(125, v3[param0->unk_94[0]], param0->unk_18, 6, 0x20, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v3[param0->unk_94[0]], param0->unk_18, 6, 0x20, 0, 0, param0->unk_00); param0->unk_94[0]++; param0->unk_94[1] = 4; } diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c index 26fd07f72c..5b68cbb488 100644 --- a/src/overlay073/ov73_021D3250.c +++ b/src/overlay073/ov73_021D3250.c @@ -239,8 +239,8 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) v4 = 4; 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); + Graphics_LoadTilesToBgLayer(136, v3, param0->unk_04, v2, 0, 0, 0, param0->unk_00); + Graphics_LoadTilemapToBgLayer(136, v4, param0->unk_04, v2, 0, 0, 0, param0->unk_00); } { BgTemplate v7 = { @@ -264,8 +264,8 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) v4 = 5; 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); + Graphics_LoadTilesToBgLayer(136, v3, param0->unk_04, v2, 0, 0, 0, param0->unk_00); + Graphics_LoadTilemapToBgLayer(136, v4, param0->unk_04, v2, 0, 0, 0, param0->unk_00); } { BgTemplate v8 = { @@ -289,12 +289,12 @@ static void ov73_021D342C (UnkStruct_ov73_021D342C * param0) v4 = 7; 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); + Graphics_LoadTilesToBgLayer(136, v3, param0->unk_04, v2, 0, 0, 0, param0->unk_00); + Graphics_LoadTilemapToBgLayer(136, v4, param0->unk_04, v2, 0, 0, 0, param0->unk_00); } } - sub_02006E84(136, 6, 0, 0, 0, param0->unk_00); - sub_02006E9C(136, 9, 0, 0x20 * 2, 0x20 * 2, 0x20 * 14, param0->unk_00); + Graphics_LoadPalette(136, 6, 0, 0, 0, param0->unk_00); + Graphics_LoadPaletteWithSrcOffset(136, 9, 0, 0x20 * 2, 0x20 * 2, 0x20 * 14, param0->unk_00); Font_LoadTextPalette(0, 1 * (2 * 16), param0->unk_00); Bg_MaskPalette(0, 0x0); Bg_MaskPalette(4, 0x0); diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index dd9c993617..4eb34f5e68 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -1109,16 +1109,16 @@ void ov76_0223CE84(UnkStruct_ov76_0223DE00 *param0, NARC *param1) int v3 = 288; int v4 = 2; - sub_020070E8(param1, v1, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); - sub_0200710C(param1, v2, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, v1, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, v2, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); PaletteData_LoadBufferFromFileStart(param0->unk_D4.unk_14, v0, v3, 53, 0, 0x20 * 2, 0); v1 = 269; v2 = 285; v4 = 3; - sub_020070E8(param1, v1, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); - sub_0200710C(param1, v2, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, v1, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, v2, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); } void ov76_0223CF24(UnkStruct_ov76_0223DE00 *param0, NARC *param1) @@ -1129,8 +1129,8 @@ void ov76_0223CF24(UnkStruct_ov76_0223DE00 *param0, NARC *param1) int v3 = 287; int v4 = 5; - sub_020070E8(param1, v1, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); - sub_0200710C(param1, v2, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, v1, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, v2, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); PaletteData_LoadBufferFromFileStart(param0->unk_D4.unk_14, v0, v3, 53, 1, 0x20 * 2, 0); } @@ -1142,8 +1142,8 @@ void ov76_0223CF88(UnkStruct_ov76_0223DE00 *param0, NARC *param1) int v3 = 287; int v4 = 7; - sub_020070E8(param1, v1, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); - sub_0200710C(param1, v2, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, v1, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, v2, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); PaletteData_LoadBufferFromFileStart(param0->unk_D4.unk_14, v0, v3, 53, 1, 0x20 * 2, 0); } diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index c41e3da837..80ba12924b 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -948,8 +948,8 @@ static void ov77_021D1CC0(BgConfig *param0, int param1) Bg_InitFromTemplate(param0, 5, &v0, 0); } - sub_02006E3C(48, 23, param0, 5, 0, 0, 0, param1); - sub_02006E60(48, 25, param0, 5, 0, 0, 0, param1); + Graphics_LoadTilesToBgLayer(48, 23, param0, 5, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayer(48, 25, param0, 5, 0, 0, 0, param1); G2_BlendNone(); G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_PLANEMASK_BG3, 10, 10); @@ -981,7 +981,7 @@ static void ov77_021D1D48(BgConfig *param0, int param1) Bg_InitFromTemplate(param0, 4, &v0, 0); } - sub_02006E60(48, 22, param0, 4, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayer(48, 22, param0, 4, 0, 0, 0, param1); G2S_SetBG0Priority(0); G2S_SetBG1Priority(1); @@ -1216,16 +1216,16 @@ static void ov77_021D2214(BgConfig *param0, int param1, UnkStruct_ov77_021D1568 { int v0, v1; - sub_02006E3C(48, 23, param0, 7, 0, 0, 0, param1); - sub_02006E3C(48, 26, param0, 3, 0, 0, 0, param1); - sub_02006E60(48, 24, param0, 7, 0, 0, 0, param1); - sub_02006E60(48, 27, param0, 3, 0, 0, 0, param1); + Graphics_LoadTilesToBgLayer(48, 23, param0, 7, 0, 0, 0, param1); + Graphics_LoadTilesToBgLayer(48, 26, param0, 3, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayer(48, 24, param0, 7, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayer(48, 27, param0, 3, 0, 0, 0, param1); v0 = 7; v1 = 6; - sub_02006E84(48, v0, 4, 0, 0, param1); - sub_02006E84(48, v1, 0, 0, 0, param1); + Graphics_LoadPalette(48, v0, 4, 0, 0, param1); + Graphics_LoadPalette(48, v1, 0, 0, 0, param1); } { int v2, v3; @@ -1233,19 +1233,19 @@ static void ov77_021D2214(BgConfig *param0, int param1, UnkStruct_ov77_021D1568 v2 = 12; v3 = 11; - sub_02006E3C(48, v2, param0, 6, 0, 0, 0, param1); - sub_02006E84(48, v3, 6, 0x4000, 0, param1); - sub_02006E60(48, 22, param0, 6, 0, 0, 0, param1); + Graphics_LoadTilesToBgLayer(48, v2, param0, 6, 0, 0, 0, param1); + Graphics_LoadPalette(48, v3, 6, 0x4000, 0, param1); + Graphics_LoadTilemapToBgLayer(48, 22, param0, 6, 0, 0, 0, param1); } { - sub_02006E3C(128, 14, param0, 5, 0, 0, 0, param1); - sub_02006E84(128, 13, 6, 0x2000, 0, param1); - sub_02006E60(128, 12, param0, 5, 0, 0, 0, param1); + Graphics_LoadTilesToBgLayer(128, 14, param0, 5, 0, 0, 0, param1); + Graphics_LoadPalette(128, 13, 6, 0x2000, 0, param1); + Graphics_LoadTilemapToBgLayer(128, 12, param0, 5, 0, 0, 0, param1); } { - sub_02006E3C(48, 5, param0, 1, 0, 0, 0, param1); - sub_02006E60(48, 3, param0, 1, 0, 0, 0, param1); - sub_02006E84(48, 4, 0, 32 * 1, 32 * 3, param1); + Graphics_LoadTilesToBgLayer(48, 5, param0, 1, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayer(48, 3, param0, 1, 0, 0, 0, param1); + Graphics_LoadPalette(48, 4, 0, 32 * 1, 32 * 3, param1); } Bg_MaskPalette(0, 0x0); diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c index a7bd436e79..bbf5058cb8 100644 --- a/src/overlay077/ov77_021D25B0.c +++ b/src/overlay077/ov77_021D25B0.c @@ -1067,25 +1067,25 @@ static void ov77_021D2F0C(UnkStruct_ov77_021D2E9C *param0) static void ov77_021D2F38(UnkStruct_ov77_021D2F38 *param0) { - sub_02006E3C(128, 16, param0->unk_0C, 2, 0, 0, 0, 76); - sub_02006E3C(128, 16, param0->unk_0C, 6, 0, 0, 0, 76); - sub_02006E60(128, 17, param0->unk_0C, 2, 0, 0, 0, 76); - sub_02006E60(128, 18, param0->unk_0C, 6, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayer(128, 16, param0->unk_0C, 2, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayer(128, 16, param0->unk_0C, 6, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayer(128, 17, param0->unk_0C, 2, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayer(128, 18, param0->unk_0C, 6, 0, 0, 0, 76); - sub_02006E84(128, 15, 0, 0, 0, 76); - sub_02006E84(128, 15, 4, 0, 0, 76); + Graphics_LoadPalette(128, 15, 0, 0, 0, 76); + Graphics_LoadPalette(128, 15, 4, 0, 0, 76); - sub_02006E3C(48, 15, param0->unk_0C, 1, 0, 0, 0, 76); - sub_02006E60(48, 13, param0->unk_0C, 1, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayer(48, 15, param0->unk_0C, 1, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayer(48, 13, param0->unk_0C, 1, 0, 0, 0, 76); - sub_02006E84(48, 14, 0, 0, 2 * 16 * 1, 76); + Graphics_LoadPalette(48, 14, 0, 0, 2 * 16 * 1, 76); - sub_02006E60(128, 19, param0->unk_0C, 3, 0, 0, 0, 76); - sub_02006E60(128, 19, param0->unk_0C, 7, 0, 0, 0, 76); - sub_02006E3C(128, 114, param0->unk_0C, 5, 0, 0, 0, 76); - sub_02006E60(128, 113, param0->unk_0C, 5, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayer(128, 19, param0->unk_0C, 3, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayer(128, 19, param0->unk_0C, 7, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayer(128, 114, param0->unk_0C, 5, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayer(128, 113, param0->unk_0C, 5, 0, 0, 0, 76); - sub_02006E84(128, 115, 4, 0, 2 * 16 * 1, 76); + Graphics_LoadPalette(128, 115, 4, 0, 2 * 16 * 1, 76); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); @@ -1477,41 +1477,41 @@ static void ov77_021D37C0(UnkStruct_ov77_021D37C0 *param0) v1 = NARC_ctor(NARC_INDEX_DEMO__TITLE__OP_DEMO, 76); { - sub_02007148(v1, 96, 0, 0x20 * 0xc, 0x20 * 0xc, 0x20 * 2, 76); - sub_020070E8(v1, 95, param0->unk_10, 3, 0, 0, 0, 76); - sub_0200710C(v1, 12, param0->unk_10, 3, 0, 0, 0, 76); + Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(v1, 96, 0, 0x20 * 0xc, 0x20 * 0xc, 0x20 * 2, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 95, param0->unk_10, 3, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 12, param0->unk_10, 3, 0, 0, 0, 76); - sub_02007148(v1, 13, 0, 0x20 * 0xe, 0x20 * 0xe, 0x20 * 2, 76); - sub_020070E8(v1, 14, param0->unk_10, 2, 0, 0, 0, 76); - sub_0200710C(v1, 12, param0->unk_10, 2, 0, 0, 0, 76); + Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(v1, 13, 0, 0x20 * 0xe, 0x20 * 0xe, 0x20 * 2, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 14, param0->unk_10, 2, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 12, param0->unk_10, 2, 0, 0, 0, 76); { NARC *v2; v2 = NARC_ctor(NARC_INDEX_DATA__WEATHER_SYS, 76); - sub_020070E8(v2, 56, param0->unk_10, 1, 0, 0, 0, 76); - sub_0200710C(v2, 57, param0->unk_10, 1, 0, 0, 0, 76); - sub_0200710C(v2, 57, param0->unk_10, 1, 32 * 32, 0, 0, 76); - sub_02007130(v2, 55, 0, 0x20 * 0, 0x20, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v2, 56, param0->unk_10, 1, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v2, 57, param0->unk_10, 1, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v2, 57, param0->unk_10, 1, 32 * 32, 0, 0, 76); + Graphics_LoadPaletteFromOpenNARC(v2, 55, 0, 0x20 * 0, 0x20, 76); NARC_dtor(v2); } } { - sub_02007130(v1, 61, 4, 0, 0, 76); - sub_020070E8(v1, 59, param0->unk_10, 5, 0, 0, 0, 76); - sub_0200710C(v1, 63, param0->unk_10, 5, 0, 0, 0, 76); - sub_020070E8(v1, 58, param0->unk_10, 6, 0, 0, 0, 76); - sub_0200710C(v1, 62, param0->unk_10, 6, 0, 0, 0, 76); - sub_020070E8(v1, 60, param0->unk_10, 7, 0, 0, 0, 76); - sub_0200710C(v1, 64, param0->unk_10, 7, 0, 0, 0, 76); + Graphics_LoadPaletteFromOpenNARC(v1, 61, 4, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 59, param0->unk_10, 5, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 63, param0->unk_10, 5, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 58, param0->unk_10, 6, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 62, param0->unk_10, 6, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 60, param0->unk_10, 7, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 64, param0->unk_10, 7, 0, 0, 0, 76); } { - sub_020070E8(v1, 14, param0->unk_10, 4, 0, 0, 0, 76); - sub_0200710C(v1, 12, param0->unk_10, 4, 0, 0, 0, 76); - sub_02007148(v1, 13, 4, 0x20 * 0xe, 0x20 * 0xe, 0x20 * 2, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 14, param0->unk_10, 4, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 12, param0->unk_10, 4, 0, 0, 0, 76); + Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(v1, 13, 4, 0x20 * 0xe, 0x20 * 0xe, 0x20 * 2, 76); } ov77_021D5564(param0->unk_14); @@ -1544,14 +1544,14 @@ static void ov77_021D3A10(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 v1 = NARC_ctor(NARC_INDEX_DEMO__TITLE__OP_DEMO, 76); - sub_02007130(v1, 68, 0, 0, 0, 76); + Graphics_LoadPaletteFromOpenNARC(v1, 68, 0, 0, 0, 76); - sub_020070E8(v1, 66, param1->unk_10, 1, 0, 0, 0, 76); - sub_0200710C(v1, 70, param1->unk_10, 1, 0, 0, 0, 76); - sub_020070E8(v1, 65, param1->unk_10, 2, 0, 0, 0, 76); - sub_0200710C(v1, 69, param1->unk_10, 2, 0, 0, 0, 76); - sub_020070E8(v1, 67, param1->unk_10, 3, 0, 0, 0, 76); - sub_0200710C(v1, 71, param1->unk_10, 3, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 66, param1->unk_10, 1, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 70, param1->unk_10, 1, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 65, param1->unk_10, 2, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 69, param1->unk_10, 2, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 67, param1->unk_10, 3, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 71, param1->unk_10, 3, 0, 0, 0, 76); MI_CpuClear16((void *)HW_BG_PLTT, 2); MI_CpuClear16((void *)HW_DB_BG_PLTT, 2); @@ -1575,28 +1575,28 @@ static void ov77_021D3B5C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 v1 = NARC_ctor(NARC_INDEX_DEMO__TITLE__OP_DEMO, 76); - sub_02007130(v1, 72, 0, 0, 0, 76); - sub_02007130(v1, 72, 4, 0, 0, 76); + Graphics_LoadPaletteFromOpenNARC(v1, 72, 0, 0, 0, 76); + Graphics_LoadPaletteFromOpenNARC(v1, 72, 4, 0, 0, 76); param1->unk_240 = Heap_AllocFromHeap(76, 0x200); MI_CpuCopy16((void *)HW_BG_PLTT, param1->unk_240, 0x200); MI_CpuClear16(param1->unk_240, 2); - sub_020070E8(v1, 73, param1->unk_10, 1, 0, 0, 0, 76); - sub_0200710C(v1, 76, param1->unk_10, 1, 0, 0, 0, 76); - sub_020070E8(v1, 73, param1->unk_10, 5, 0, 0, 0, 76); - sub_0200710C(v1, 76, param1->unk_10, 5, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 73, param1->unk_10, 1, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 76, param1->unk_10, 1, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 73, param1->unk_10, 5, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 76, param1->unk_10, 5, 0, 0, 0, 76); - sub_020070E8(v1, 74, param1->unk_10, 2, 0, 0, 0, 76); - sub_0200710C(v1, 77, param1->unk_10, 2, 0, 0, 0, 76); - sub_020070E8(v1, 74, param1->unk_10, 6, 0, 0, 0, 76); - sub_0200710C(v1, 77, param1->unk_10, 6, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 74, param1->unk_10, 2, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 77, param1->unk_10, 2, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 74, param1->unk_10, 6, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 77, param1->unk_10, 6, 0, 0, 0, 76); - sub_020070E8(v1, 75, param1->unk_10, 3, 0, 0, 0, 76); - sub_0200710C(v1, 78, param1->unk_10, 3, 0, 0, 0, 76); - sub_020070E8(v1, 75, param1->unk_10, 7, 0, 0, 0, 76); - sub_0200710C(v1, 78, param1->unk_10, 7, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 75, param1->unk_10, 3, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 78, param1->unk_10, 3, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 75, param1->unk_10, 7, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 78, param1->unk_10, 7, 0, 0, 0, 76); MI_CpuClear16((void *)HW_BG_PLTT, 2); MI_CpuClear16((void *)HW_DB_BG_PLTT, 2); @@ -1620,10 +1620,10 @@ static void ov77_021D3D4C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 v1 = NARC_ctor(NARC_INDEX_DEMO__TITLE__OP_DEMO, 76); - sub_020070E8(v1, 79, param1->unk_10, 0, 0, 0, 0, 76); - sub_0200710C(v1, 80, param1->unk_10, 0, 0, 0, 0, 76); - sub_020070E8(v1, 81, param1->unk_10, 4, 0, 0, 0, 76); - sub_0200710C(v1, 82, param1->unk_10, 4, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 79, param1->unk_10, 0, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 80, param1->unk_10, 0, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 81, param1->unk_10, 4, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 82, param1->unk_10, 4, 0, 0, 0, 76); NARC_dtor(v1); } @@ -2532,9 +2532,9 @@ static void ov77_021D52C8(UnkStruct_ov77_021D2E9C *param0) static void ov77_021D5308(UnkStruct_ov77_021D5308 *param0) { - sub_02006E84(128, 99, 0, 0, 0, 76); - sub_02006E3C(128, 98, param0->unk_08, 2, 0, 0, 0, 76); - sub_02006E60(128, 97, param0->unk_08, 2, 0, 0, 0, 76); + Graphics_LoadPalette(128, 99, 0, 0, 0, 76); + Graphics_LoadTilesToBgLayer(128, 98, param0->unk_08, 2, 0, 0, 0, 76); + Graphics_LoadTilemapToBgLayer(128, 97, param0->unk_08, 2, 0, 0, 0, 76); GXLayers_DisableEngineALayers(); GXLayers_EngineASetLayers(0); diff --git a/src/overlay081/ov81_021D0D80.c b/src/overlay081/ov81_021D0D80.c index a88c10d49e..249928ee08 100644 --- a/src/overlay081/ov81_021D0D80.c +++ b/src/overlay081/ov81_021D0D80.c @@ -292,13 +292,13 @@ static void ov81_021D1050(UnkStruct_ov81_021D1610 *param0) v1 = NARC_ctor(NARC_INDEX_GRAPHIC__F_NOTE_GRA, 42); if (TrainerInfo_Gender(param0->unk_48) == 0) { - sub_020070E8(v1, 2, param0->unk_00, 2, 0, 0, 0, 42); - sub_0200710C(v1, 0, param0->unk_00, 2, 0, 0, 0, 42); - sub_02007130(v1, 4, 0, 0, 0, 42); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 2, param0->unk_00, 2, 0, 0, 0, 42); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 0, param0->unk_00, 2, 0, 0, 0, 42); + Graphics_LoadPaletteFromOpenNARC(v1, 4, 0, 0, 0, 42); } else { - sub_020070E8(v1, 3, param0->unk_00, 2, 0, 0, 0, 42); - sub_0200710C(v1, 1, param0->unk_00, 2, 0, 0, 0, 42); - sub_02007130(v1, 5, 0, 0, 0, 42); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 3, param0->unk_00, 2, 0, 0, 0, 42); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 1, param0->unk_00, 2, 0, 0, 0, 42); + Graphics_LoadPaletteFromOpenNARC(v1, 5, 0, 0, 0, 42); } NARC_dtor(v1); diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c index cfe68ba9c0..793c3c5b87 100644 --- a/src/overlay083/ov83_0223D6A8.c +++ b/src/overlay083/ov83_0223D6A8.c @@ -131,7 +131,7 @@ static UnkStruct_02015128 *ov83_0223D6BC(UnkStruct_02015064 *param0, u32 param1, NNSG2dCharacterData *v2; UnkStruct_02015128 *v3; - v1 = sub_020071B4(param3, param1, 0, &v2, param2); + v1 = Graphics_GetCharDataFromOpenNARC(param3, param1, 0, &v2, param2); v0.unk_00 = param0; v0.unk_04 = v2; v3 = sub_02015128(&v0); @@ -148,7 +148,7 @@ static UnkStruct_020151A4 *ov83_0223D6EC(UnkStruct_02015064 *param0, u32 param1, NNSG2dPaletteData *v2; UnkStruct_020151A4 *v3; - v1 = sub_020071EC(param3, param1, &v2, param2); + v1 = Graphics_GetPlttDataFromOpenNARC(param3, param1, &v2, param2); v0.unk_00 = param0; v0.unk_04 = v2; v0.unk_08 = 1; @@ -648,8 +648,8 @@ static void ov83_0223E15C(UnkStruct_ov83_0223E138 *param0, u32 param1, NARC *par { int v0; - sub_02007130(param2, 1, 4, 2 * 32, 2 * 32, param1); - sub_020070E8(param2, 0, param0->unk_04, 5, 0, 0, 0, param1); + Graphics_LoadPaletteFromOpenNARC(param2, 1, 4, 2 * 32, 2 * 32, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 0, param0->unk_04, 5, 0, 0, 0, param1); if (param0->unk_14 == 1) { v0 = 2; @@ -657,12 +657,12 @@ static void ov83_0223E15C(UnkStruct_ov83_0223E138 *param0, u32 param1, NARC *par v0 = 3; } - param0->unk_20 = sub_020071D0(param2, v0, 0, ¶m0->unk_24, param1); + param0->unk_20 = Graphics_GetScrnDataFromOpenNARC(param2, v0, 0, ¶m0->unk_24, param1); 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); + param0->unk_28 = Graphics_GetScrnDataFromOpenNARC(param2, 4, 0, ¶m0->unk_2C, param1); Bg_ScheduleTilemapTransfer(param0->unk_04, 5); } @@ -1085,10 +1085,10 @@ static void ov83_0223E844(UnkStruct_ov83_0223E824 *param0, u32 param1, NARC *par void *v0; NNSG2dScreenData *v1; - sub_02007130(param2, 6, 0, 4 * 32, 1 * 32, param1); - sub_020070E8(param2, 5, param0->unk_04, 1, 0, 0, 0, param1); + Graphics_LoadPaletteFromOpenNARC(param2, 6, 0, 4 * 32, 1 * 32, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 5, param0->unk_04, 1, 0, 0, 0, param1); - v0 = sub_020071D0(param2, 7, 0, &v1, param1); + v0 = Graphics_GetScrnDataFromOpenNARC(param2, 7, 0, &v1, param1); 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); diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index ab6f9a7e11..db1425ae4c 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -816,21 +816,21 @@ static void ov84_0223BC1C(UnkStruct_ov84_0223B5A0 *param0) { param0->unk_D4 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_BAG_GRA, 6); - sub_020070E8(param0->unk_D4, 11, param0->unk_00, 1, 0, 0, 0, 6); - sub_0200710C(param0->unk_D4, 14, param0->unk_00, 1, 0, 0, 0, 6); - sub_0200710C(param0->unk_D4, 13, param0->unk_00, 3, 0, 0, 0, 6); - sub_02007130(param0->unk_D4, 12, 0, 0, 0, 6); - sub_02007130(param0->unk_D4, 22, 0, 16 * 13 * 2, 32, 6); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_D4, 11, param0->unk_00, 1, 0, 0, 0, 6); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_D4, 14, param0->unk_00, 1, 0, 0, 0, 6); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_D4, 13, param0->unk_00, 3, 0, 0, 0, 6); + Graphics_LoadPaletteFromOpenNARC(param0->unk_D4, 12, 0, 0, 0, 6); + Graphics_LoadPaletteFromOpenNARC(param0->unk_D4, 22, 0, 16 * 13 * 2, 32, 6); Font_LoadScreenIndicatorsPalette(0, 11 * 32, 6); sub_0200DAA4(param0->unk_00, 0, 1024 - 9, 14, 0, 6); sub_0200DD0C(param0->unk_00, 0, 1024 - 9 - (18 + 12), 12, Options_Frame(param0->unk_D0), 6); - sub_020070E8(param0->unk_D4, 15, param0->unk_00, 5, 0, 0, 0, 6); - sub_02007130(param0->unk_D4, 16, 4, 0, 0, 6); - sub_0200710C(param0->unk_D4, 17, param0->unk_00, 5, 0, 0, 0, 6); - sub_020070E8(param0->unk_D4, 32, param0->unk_00, 7, 0, 0, 0, 6); - sub_0200710C(param0->unk_D4, 33, param0->unk_00, 7, 0, 0, 0, 6); - sub_020070E8(param0->unk_D4, 19, param0->unk_00, 4, 0, 0, 0, 6); - sub_02007130(param0->unk_D4, 18, 4, 16 * 2 * 2, 0x20 * 2, 6); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_D4, 15, param0->unk_00, 5, 0, 0, 0, 6); + Graphics_LoadPaletteFromOpenNARC(param0->unk_D4, 16, 4, 0, 0, 6); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_D4, 17, param0->unk_00, 5, 0, 0, 0, 6); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_D4, 32, param0->unk_00, 7, 0, 0, 0, 6); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_D4, 33, param0->unk_00, 7, 0, 0, 0, 6); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_D4, 19, param0->unk_00, 4, 0, 0, 0, 6); + Graphics_LoadPaletteFromOpenNARC(param0->unk_D4, 18, 4, 16 * 2 * 2, 0x20 * 2, 6); } static void ov84_0223BDB4(UnkStruct_ov84_0223B5A0 *param0) diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index f0983af222..99a106cd06 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -419,10 +419,10 @@ static void ov85_022416E8(BgConfig *param0) static void ov85_02241718(UnkStruct_ov85_022417E4 *param0, NARC *param1) { - sub_020070E8(param1, 2, param0->unk_00, 2, 0, 0, 0, 36); - sub_0200710C(param1, 0, param0->unk_00, 2, 0, 0, 0, 36); - sub_0200710C(param1, 1, param0->unk_00, 3, 0, 0, 0, 36); - sub_02007130(param1, 3, 0, 0, 0, 36); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, param0->unk_00, 2, 0, 0, 0, 36); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 0, param0->unk_00, 2, 0, 0, 0, 36); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 1, param0->unk_00, 3, 0, 0, 0, 36); + Graphics_LoadPaletteFromOpenNARC(param1, 3, 0, 0, 0, 36); { u16 *v0; @@ -788,8 +788,8 @@ static int ov85_02241DF8(UnkStruct_ov85_022417E4 *param0) static void ov85_02241E60(UnkStruct_ov85_022417E4 *param0, NARC *param1) { - sub_020070E8(param1, ov85_02241EB0(param0->unk_1F8->unk_08), param0->unk_00, 1, 1, 0, 0, 36); - sub_02007130(param1, ov85_02241EB4(param0->unk_1F8->unk_08), 0, 3 * 0x20, 0x20, 36); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, ov85_02241EB0(param0->unk_1F8->unk_08), param0->unk_00, 1, 1, 0, 0, 36); + Graphics_LoadPaletteFromOpenNARC(param1, ov85_02241EB4(param0->unk_1F8->unk_08), 0, 3 * 0x20, 0x20, 36); } u32 ov85_02241EB0(u32 param0) diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 12e1ab6148..6cab882581 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -500,7 +500,7 @@ static BOOL ov86_0223B574(UnkStruct_ov86_0223B3C8 *param0) switch (param0->unk_00) { case 0: - sub_02006E60(105, 1, param0->unk_10, 3, 0, 0, 1, 63); + Graphics_LoadTilemapToBgLayer(105, 1, param0->unk_10, 3, 0, 0, 1, 63); param0->unk_00++; break; case 1: @@ -690,10 +690,10 @@ static void ov86_0223B74C(UnkStruct_ov86_0223B3C8 *param0) v0 = NARC_ctor(NARC_INDEX_GRAPHIC__DENDOU_DEMO, 63); - sub_020070E8(v0, 3, param0->unk_10, 3, 0, 0, 1, 63); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 3, param0->unk_10, 3, 0, 0, 1, 63); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 0, param0->unk_10, 3, 0, 0, 1, 63); + Graphics_LoadPaletteFromOpenNARC(v0, 4, 0, 0, 0x60, 63); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 2, param0->unk_10, 2, 0, 0, 1, 63); Bg_CopyTilemapBufferToVRAM(param0->unk_10, 1); G2_SetWnd0Position(0, 0, 0, 0); @@ -780,8 +780,8 @@ static void ov86_0223BA44(UnkStruct_ov86_0223B3C8 *param0) sub_0200A784(0, 128, 0, 32, 0, 128, 0, 32, 63); param0->unk_24 = sub_020095C4(64, ¶m0->unk_28, 63); - param0->unk_1D0 = sub_02007204(v2, 77, 0, &v0, 63); - param0->unk_1D4 = sub_02007220(v2, 78, 0, &v1, 63); + param0->unk_1D0 = Graphics_GetCellBankFromOpenNARC(v2, 77, 0, &v0, 63); + param0->unk_1D4 = Graphics_GetAnimBankFromOpenNARC(v2, 78, 0, &v1, 63); ov86_0223BAC8(param0, v0, v1, v2); @@ -826,8 +826,8 @@ static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 *param0, NNSG2dCellDataBank *p v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; v3.heapID = 63; - v9 = sub_020071B4(param3, 76, 0, &v7, 63); - v10 = sub_020071EC(param3, 75, &v8, 63); + v9 = Graphics_GetCharDataFromOpenNARC(param3, 76, 0, &v7, 63); + v10 = Graphics_GetPlttDataFromOpenNARC(param3, 75, &v8, 63); for (v12 = 0; v12 < param0->unk_04; v12++) { NNS_G2dInitImageProxy(&v5); @@ -855,7 +855,7 @@ static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 *param0, NNSG2dCellDataBank *p DC_FlushRange(param0->unk_310, 3200); GX_LoadOBJ(param0->unk_310, v12 * 2 * 3200 + 3200, 3200); - sub_02006E84(v1.archive, v1.palette, 1, v12 * 0x20, 0x20, 63); + Graphics_LoadPalette(v1.archive, v1.palette, 1, v12 * 0x20, 0x20, 63); PokeSprite_LoadAnimationFrames(param0->unk_1C54, ¶m0->unk_1D8[v12][0], param0->unk_2E0[v12], 1); } @@ -870,7 +870,7 @@ static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 *param0, NNSG2dCellDataBank *p DC_FlushRange(param0->unk_310, 3200); GX_LoadOBJ(param0->unk_310, 38400, 3200); - sub_02006E84(v4.unk_00, v4.unk_08, 1, 192, 0x20, 63); + Graphics_LoadPalette(v4.unk_00, v4.unk_08, 1, 192, 0x20, 63); v3.priority = 0; param0->unk_1CC = CellActorCollection_Add(&v3); diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index c5a0303694..412c6e5b59 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -303,9 +303,9 @@ static void ov87_021D139C(UnkStruct_ov87_021D106C *param0) 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); + Graphics_LoadTilesToBgLayer(101, 1, param0->unk_10, 2, 0, 0, 1, 61); + Graphics_LoadTilemapToBgLayer(101, 0, param0->unk_10, 2, 0, 0, 1, 61); + Graphics_LoadPalette(101, 2, 0, 0, 0x40, 61); Bg_FillTilesRange(param0->unk_10, 1, 0x0, 1, 0); Bg_FillTilemapRect(param0->unk_10, 1, 0x0, 0, 0, 32, 32, 0); @@ -443,8 +443,8 @@ static void ov87_021D1818(UnkStruct_ov87_021D106C *param0) NNSG2dAnimBankData *v1; int v2; - param0->unk_1DC = sub_02006FA0(27, 77, 0, &v0, 61); - param0->unk_1E0 = sub_02006FBC(27, 78, 0, &v1, 61); + param0->unk_1DC = Graphics_GetCellBank(27, 77, 0, &v0, 61); + param0->unk_1E0 = Graphics_GetAnimBank(27, 78, 0, &v1, 61); MI_CpuClearFast(param0->unk_200, sizeof(param0->unk_200)); @@ -504,8 +504,8 @@ static void ov87_021D18A0(UnkStruct_ov87_021D106C *param0, NNSG2dCellDataBank *p v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; v2.heapID = 61; - v7 = sub_02006F50(27, 76, 0, &v5, 61); - v8 = sub_02006F88(27, 75, &v6, 61); + v7 = Graphics_GetCharData(27, 76, 0, &v5, 61); + v8 = Graphics_GetPlttData(27, 75, &v6, 61); for (v9 = 0; v9 < 6; v9++) { NNS_G2dInitImageProxy(&v3); @@ -548,7 +548,7 @@ static void ov87_021D1970(UnkStruct_ov87_021D106C *param0) DC_FlushRange(param0->unk_200, sizeof(param0->unk_200)); GX_LoadOBJ(param0->unk_200, 3200 * v3, 3200); - sub_02006E84(v1.archive, v1.palette, 1, v3 * 0x20, 0x20, 61); + Graphics_LoadPalette(v1.archive, v1.palette, 1, v3 * 0x20, 0x20, 61); if (v3 == v2->unk_18) { Sound_FlagDefaultChatotCry(1); diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 2c376c546d..b9e3aeea94 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -528,7 +528,7 @@ static void ov88_0223B7A0(Party *param0, int param1, UnkStruct_02095E80 *param2) for (v0 = 0; v0 < Party_GetCurrentCount(param0); v0++) { v1 = v0 + param1; - param2->unk_7E8[v1] = sub_02006F50(19, PokeIconSpriteIndex(param2->unk_6F4[v1].unk_00, param2->unk_6F4[v1].unk_05, param2->unk_6F4[v1].unk_06), 0, ¶m2->unk_818[v1], 26); + param2->unk_7E8[v1] = Graphics_GetCharData(19, PokeIconSpriteIndex(param2->unk_6F4[v1].unk_00, param2->unk_6F4[v1].unk_05, param2->unk_6F4[v1].unk_06), 0, ¶m2->unk_818[v1], 26); DC_FlushRange(param2->unk_818[v1]->pRawData, 0x20 * 4 * 4); @@ -909,7 +909,7 @@ static void ov88_0223C0E0(void *param0) int v1 = v0->unk_2168 - 1; GXS_LoadOBJ(v0->unk_848[v1], 0 + v1 * (0x20 * 10 * 10), (0x20 * 10 * 10)); - sub_02006E84(v0->unk_2148[v1].archive, v0->unk_2148[v1].palette, 5, 0x20 * (2 + v1), 32, 26); + Graphics_LoadPalette(v0->unk_2148[v1].archive, v0->unk_2148[v1].palette, 5, 0x20 * (2 + v1), 32, 26); v0->unk_2168 = 0; } @@ -1203,21 +1203,21 @@ static void ov88_0223C504(UnkStruct_02095E80 *param0, NARC *param1) { 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); + Graphics_LoadPaletteFromOpenNARC(param1, 0, 4, 0, 16 * 9 * 2, 26); + Graphics_LoadPaletteFromOpenNARC(param1, 0, 0, 0, 16 * 9 * 2, 26); 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 1, v0, 2, 0, 16 * 18 * 0x20, 1, 26); ov88_0223C488(param1, 3, v0, 2, 0, 32 * 24 * 2, 1, 26); - sub_0200710C(param1, 4, v0, 3, 0, 32 * 24 * 2, 1, 26); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 4, v0, 3, 0, 32 * 24 * 2, 1, 26); Font_LoadScreenIndicatorsPalette(0, 2 * 32, 26); Font_LoadTextPalette(0, 3 * 32, 26); - sub_020070E8(param1, 2, v0, 5, 0, 16 * 4 * 0x20, 1, 26); - sub_0200710C(param1, 5, v0, 5, 0, 32 * 24 * 2, 1, 26); - sub_0200710C(param1, 6, v0, 6, 0, 32 * 24 * 2, 1, 26); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, v0, 5, 0, 16 * 4 * 0x20, 1, 26); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 5, v0, 5, 0, 32 * 24 * 2, 1, 26); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 6, v0, 6, 0, 32 * 24 * 2, 1, 26); Font_LoadScreenIndicatorsPalette(4, 2 * 32, 26); Font_LoadTextPalette(4, 3 * 32, 26); Bg_ClearTilemap(v0, 4); @@ -1264,7 +1264,7 @@ static void ov88_0223C66C(UnkStruct_02095E80 *param0, NARC *param1) sub_0200A328(param0->unk_334[1][0]); sub_0200A5C8(param0->unk_334[0][1]); sub_0200A5C8(param0->unk_334[1][1]); - sub_02006E84(19, PokeIconPalettesFileIndex(), 1, 10 * 0x20, 0x20 * 4, 26); + Graphics_LoadPalette(19, PokeIconPalettesFileIndex(), 1, 10 * 0x20, 0x20 * 4, 26); } static int ov88_0223C800(int param0, Pokemon *param1, u8 *param2, ArchivedSprite *param3) diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 03032e265c..63bdb619e3 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -603,9 +603,9 @@ static void ov91_021D1098(BgConfig *param0) static void ov91_021D10C8(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) { - sub_020070E8(param1, 10, param0->unk_04, 2, 0, 0, 0, 67); - sub_0200710C(param1, 11, param0->unk_04, 2, 0, 0, 0, 67); - sub_02007130(param1, 12, 0, 0, 0, 67); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 10, param0->unk_04, 2, 0, 0, 0, 67); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 11, param0->unk_04, 2, 0, 0, 0, 67); + Graphics_LoadPaletteFromOpenNARC(param1, 12, 0, 0, 0, 67); Font_LoadScreenIndicatorsPalette(0, 14 * 32, 67); sub_0200DAA4(param0->unk_04, 0, 1, 12, 0, 67); sub_0200DD0C(param0->unk_04, 0, (1 + 9), 13, Options_Frame(param0->unk_00->unk_08), 67); diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 0e2f58149b..ae32ff3cd2 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -919,9 +919,9 @@ static void ov92_021D1888(UnkStruct_ov92_021D1B24 *param0, NARC *param1) 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 5, param0->unk_B810, 7, 0, 0, 0, param0->unk_00); + Graphics_LoadPaletteFromOpenNARC(param1, 6, 4, 0 * (2 * 16), (2 * 16) * 4, param0->unk_00); + Graphics_LoadTilemapToBgLayerFromOpenNARC(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); @@ -936,9 +936,9 @@ static void ov92_021D1888(UnkStruct_ov92_021D1B24 *param0, NARC *param1) 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 5, param0->unk_B810, 3, 0, 0, 0, param0->unk_00); + Graphics_LoadPaletteFromOpenNARC(param1, 6, 0, 0 * (2 * 16), (2 * 16) * 4, param0->unk_00); + Graphics_LoadTilemapToBgLayerFromOpenNARC(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); Bg_ClearTilesRange(2, 32, 0, param0->unk_00); diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index 3e17485241..979696b2d8 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -347,7 +347,7 @@ static void ov94_0223C0D4(UnkStruct_ov94_0223FD4C *param0) int v4, v5, v6, v7; u16 *v8; - v2 = sub_02006F88(19, PokeIconPalettesFileIndex(), &v3, 62); + v2 = Graphics_GetPlttData(19, PokeIconPalettesFileIndex(), &v3, 62); DC_FlushRange(v3->pRawData, (3 * 16) * 2); GX_LoadOBJPltt(v3->pRawData, 3 * 0x20, (3 * 16) * 2); diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index e7df6e126a..7246876028 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -276,13 +276,13 @@ static void ov94_0223C888(UnkStruct_ov94_0223FD4C *param0) v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); - sub_02007130(v1, 4, 0, 0, 16 * 3 * 2, 62); + Graphics_LoadPaletteFromOpenNARC(v1, 4, 0, 0, 16 * 3 * 2, 62); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 62); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); - sub_020070E8(v1, 14, v0, 1, 0, 16 * 6 * 0x20, 1, 62); - sub_0200710C(v1, 30, v0, 1, 0, 32 * 24 * 2, 1, 62); - sub_0200710C(v1, 29, v0, 2, 0, 32 * 24 * 2, 1, 62); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 14, v0, 1, 0, 16 * 6 * 0x20, 1, 62); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 30, v0, 1, 0, 32 * 24 * 2, 1, 62); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 29, v0, 2, 0, 32 * 24 * 2, 1, 62); ov94_0223D068(param0); @@ -615,7 +615,7 @@ void ov94_0223D068(UnkStruct_ov94_0223FD4C *param0) { 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); - sub_02006E60(104, 31, v0, 5, 0, 32 * 24 * 2, 1, 62); + Graphics_LoadPalette(104, 5, 4, 0, 16 * 16 * 2, 62); + Graphics_LoadTilesToBgLayer(104, 15, v0, 5, 0, 32 * 21 * 0x40, 1, 62); + Graphics_LoadTilemapToBgLayer(104, 31, v0, 5, 0, 32 * 24 * 2, 1, 62); } diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index 2af712a611..5e3b01ae85 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -237,15 +237,15 @@ static void ov94_0223D2E8(UnkStruct_ov94_0223FD4C *param0) BgConfig *v0 = param0->unk_04; NARC *v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); - sub_02007130(v1, 7, 0, 0, 16 * 3 * 2, 62); - sub_02007130(v1, 5, 4, 0, 16 * 8 * 2, 62); + Graphics_LoadPaletteFromOpenNARC(v1, 7, 0, 0, 16 * 3 * 2, 62); + Graphics_LoadPaletteFromOpenNARC(v1, 5, 4, 0, 16 * 8 * 2, 62); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 62); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); - sub_020070E8(v1, 17, v0, 1, 0, 16 * 5 * 0x20, 1, 62); - sub_0200710C(v1, 25, v0, 1, 0, 32 * 24 * 2, 1, 62); - sub_020070E8(v1, 15, v0, 5, 0, 32 * 21 * 0x40, 1, 62); - sub_0200710C(v1, 31, v0, 5, 0, 32 * 24 * 2, 1, 62); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 17, v0, 1, 0, 16 * 5 * 0x20, 1, 62); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 25, v0, 1, 0, 32 * 24 * 2, 1, 62); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 15, v0, 5, 0, 32 * 21 * 0x40, 1, 62); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 31, v0, 5, 0, 32 * 24 * 2, 1, 62); NARC_dtor(v1); } @@ -600,7 +600,7 @@ void ov94_0223DB2C(Pokemon *param0) DC_FlushRange(v1, (0x20 * 10 * 10)); GX_LoadOBJ(v1, ((18 * 32 + 16) * 32), (0x20 * 10 * 10)); - sub_02006E84(v0.archive, v0.palette, 1, 0x20 * 13, 32, 62); + Graphics_LoadPalette(v0.archive, v0.palette, 1, 0x20 * 13, 32, 62); Heap_FreeToHeap(v1); } diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index dc1a1d61ab..6be2d0712a 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -209,8 +209,8 @@ static void ov94_0223DE04(UnkStruct_ov94_0223FD4C *param0) Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 62); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); - sub_02006E3C(104, 17, v0, 1, 0, 16 * 5 * 0x20, 1, 62); - sub_02006E84(104, 7, 0, 0, 16 * 3 * 2, 62); + Graphics_LoadTilesToBgLayer(104, 17, v0, 1, 0, 16 * 5 * 0x20, 1, 62); + Graphics_LoadPalette(104, 7, 0, 0, 16 * 3 * 2, 62); } static void ov94_0223DE7C(UnkStruct_ov94_0223FD4C *param0) @@ -401,10 +401,10 @@ static int ov94_0223E1D0(UnkStruct_ov94_0223FD4C *param0) static void ov94_0223E240(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_10E == 0) { - sub_02006E60(104, 27, param0->unk_04, 1, 0, 32 * 24 * 2, 1, 62); + Graphics_LoadTilemapToBgLayer(104, 27, param0->unk_04, 1, 0, 32 * 24 * 2, 1, 62); ov94_0223E3B0(¶m0->unk_FCC[9], param0->unk_B90, param0->unk_B94, ¶m0->unk_250[param0->unk_11C].unk_F0); } else { - sub_02006E60(104, 28, param0->unk_04, 1, 0, 32 * 24 * 2, 1, 62); + Graphics_LoadTilemapToBgLayer(104, 28, param0->unk_04, 1, 0, 32 * 24 * 2, 1, 62); ov94_0223E424(¶m0->unk_FCC[9], param0->unk_BB4[0], param0->unk_BB4[1]); } } diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 4f3b03d439..ccd46cebfd 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -273,13 +273,13 @@ static void ov94_0223E6B8(UnkStruct_ov94_0223FD4C *param0) BgConfig *v0 = param0->unk_04; NARC *v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); - sub_02007130(v1, 3, 0, 0, 16 * 3 * 2, 62); - sub_02007130(v1, 5, 4, 0, 16 * 8 * 2, 62); + Graphics_LoadPaletteFromOpenNARC(v1, 3, 0, 0, 16 * 3 * 2, 62); + Graphics_LoadPaletteFromOpenNARC(v1, 5, 4, 0, 16 * 8 * 2, 62); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 62); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); - sub_020070E8(v1, 13, v0, 1, 0, 16 * 5 * 0x20, 1, 62); - sub_0200710C(v1, 26, v0, 1, 0, 32 * 24 * 2, 1, 62); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 13, v0, 1, 0, 16 * 5 * 0x20, 1, 62); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 26, v0, 1, 0, 32 * 24 * 2, 1, 62); NARC_dtor(v1); } diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 2107bce8f2..8b2e0f476e 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -295,14 +295,14 @@ static void ov94_0223FD4C(UnkStruct_ov94_0223FD4C *param0) BgConfig *v0 = param0->unk_04; NARC *v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); - sub_02007130(v1, 2, 0, 0, 16 * 3 * 2, 62); - sub_02007130(v1, 5, 4, 0, 16 * 8 * 2, 62); + Graphics_LoadPaletteFromOpenNARC(v1, 2, 0, 0, 16 * 3 * 2, 62); + Graphics_LoadPaletteFromOpenNARC(v1, 5, 4, 0, 16 * 8 * 2, 62); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 62); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); - sub_020070E8(v1, 12, v0, 1, 0, 16 * 5 * 0x20, 1, 62); - sub_0200710C(v1, 24, v0, 1, 0, 32 * 24 * 2, 1, 62); - sub_0200710C(v1, 29, v0, 2, 0, 32 * 24 * 2, 1, 62); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 12, v0, 1, 0, 16 * 5 * 0x20, 1, 62); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 24, v0, 1, 0, 32 * 24 * 2, 1, 62); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 29, v0, 2, 0, 32 * 24 * 2, 1, 62); NARC_dtor(v1); } diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index fea4de11bc..2dd54efbcc 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -456,12 +456,12 @@ static void ov94_0224170C(UnkStruct_ov94_0223FD4C *param0) { BgConfig *v0 = param0->unk_04; - sub_02006E84(104, 1, 0, 0, 16 * 3 * 2, 62); + Graphics_LoadPalette(104, 1, 0, 0, 16 * 3 * 2, 62); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 62); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); - sub_02006E3C(104, 11, v0, 1, 0, 16 * 5 * 0x20, 1, 62); - sub_02006E60(104, 23, v0, 1, 0, 32 * 24 * 2, 1, 62); + Graphics_LoadTilesToBgLayer(104, 11, v0, 1, 0, 16 * 5 * 0x20, 1, 62); + Graphics_LoadTilemapToBgLayer(104, 23, v0, 1, 0, 32 * 24 * 2, 1, 62); } static void ov94_022417A0(UnkStruct_ov94_0223FD4C *param0) diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index e4d1f2d222..bc48f4ebc7 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -326,7 +326,7 @@ static void ov94_02242CAC(UnkStruct_ov94_0223FD4C *param0) { BgConfig *v0 = param0->unk_04; - sub_02006E84(104, 0, 0, 0, 16 * 3 * 2, 62); + Graphics_LoadPalette(104, 0, 0, 0, 16 * 3 * 2, 62); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 62); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c index bb74ac0de2..f5c7be2243 100644 --- a/src/overlay094/ov94_02243EF8.c +++ b/src/overlay094/ov94_02243EF8.c @@ -281,8 +281,8 @@ void ov94_022442E4(UnkStruct_ov94_0223FD4C *param0) static void ov94_0224432C(UnkStruct_ov94_0223FD4C *param0) { - param0->unk_10FC = sub_02006F88(86, 7, &(param0->unk_1100), 62); - param0->unk_10F4 = sub_02006F50(86, 9, 1, &(param0->unk_10F8), 62); + param0->unk_10FC = Graphics_GetPlttData(86, 7, &(param0->unk_1100), 62); + param0->unk_10F4 = Graphics_GetCharData(86, 9, 1, &(param0->unk_10F8), 62); DC_FlushRange(param0->unk_10F8, (256 * 256 / 2)); } diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index 2fdeb6b16c..dff8d0e3d0 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -272,16 +272,16 @@ static void ov94_02244B8C(UnkStruct_ov94_0223FD4C *param0) v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 62); - sub_02007130(v1, 3, 0, 0, 0, 62); - sub_02007130(v1, 3, 4, 0, 0, 62); + Graphics_LoadPaletteFromOpenNARC(v1, 3, 0, 0, 0, 62); + Graphics_LoadPaletteFromOpenNARC(v1, 3, 4, 0, 0, 62); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 62); Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, 62); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); - sub_020070E8(v1, 2, v0, 1, 0, 0, 0, 62); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 2, v0, 1, 0, 0, 0, 62); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, 62); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 10, v0, 5, 0, 0, 0, 62); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 11, v0, 5, 0, 32 * 24 * 2, 0, 62); Bg_MaskPalette(0, 0); Bg_MaskPalette(4, 0); diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index 6567871d3f..a0c8a6e3b6 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -276,7 +276,7 @@ UnkStruct_ov95_02247004 *ov95_02246F30(BOOL *param0, int param1) u32 v3; int v4; - v2 = sub_02006F88(93, 6, &v1, 57); + v2 = Graphics_GetPlttData(93, 6, &v1, 57); if (v2) { MI_CpuFill16(v0->unk_00, 0x0, 96); @@ -588,7 +588,7 @@ void ov95_022473E8(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 } v1 = (param2 >= 4) ? 4 : 0; - sub_02006E84(v0.archive, v0.palette, v1, param3 * 0x20, 0x20, 57); + Graphics_LoadPalette(v0.archive, v0.palette, v1, param3 * 0x20, 0x20, 57); } void ov95_022474D4(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 param3, u32 param4, u32 param5) @@ -603,7 +603,7 @@ void ov95_022474D4(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 v2 = (param0->unk_1AC) ? 263 : 262; } - v0 = sub_02006F6C(7, v2, 0, &v1, 57); + v0 = Graphics_GetScrnData(7, v2, 0, &v1, 57); if (v0) { Bg_CopyToTilemapRect(param0->unk_08, param2, param4, param5, 10, 10, v1->rawData, 0, 0, 32, 32); @@ -614,8 +614,8 @@ void ov95_022474D4(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 void ov95_02247568(UnkStruct_ov95_02247568 *param0, u32 param1, u32 param2, u32 param3) { - param0->unk_00 = sub_02006FA0(param1, param2, 1, &(param0->unk_08), 58); - param0->unk_04 = sub_02006FBC(param1, param3, 1, &(param0->unk_0C), 58); + param0->unk_00 = Graphics_GetCellBank(param1, param2, 1, &(param0->unk_08), 58); + param0->unk_04 = Graphics_GetAnimBank(param1, param3, 1, &(param0->unk_0C), 58); } void ov95_022475A0(UnkStruct_ov95_02247568 *param0) diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 57e363d80b..7af2480ec1 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -260,13 +260,13 @@ static int ov95_02247CB4(UnkStruct_ov95_02247C6C *param0, int *param1) 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); - sub_02006E60(93, 21, param0->unk_54, 2, 0, 0, 1, 58); - sub_02006E84(93, 23, 0, 0 * 0x20, 0x20, 58); - sub_02006E3C(93, 22, param0->unk_54, 6, 0, 0, 1, 58); - sub_02006E60(93, 21, param0->unk_54, 6, 0, 0, 1, 58); - sub_02006E84(93, 23, 4, 0 * 0x20, 0x20, 58); + Graphics_LoadPalette(14, 7, 0, 1 * 0x20, 0x20, 58); + Graphics_LoadTilesToBgLayer(93, 22, param0->unk_54, 2, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 21, param0->unk_54, 2, 0, 0, 1, 58); + Graphics_LoadPalette(93, 23, 0, 0 * 0x20, 0x20, 58); + Graphics_LoadTilesToBgLayer(93, 22, param0->unk_54, 6, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 21, param0->unk_54, 6, 0, 0, 1, 58); + Graphics_LoadPalette(93, 23, 4, 0 * 0x20, 0x20, 58); Bg_CopyTilemapBufferToVRAM(param0->unk_54, 1); ov95_02248174(param0); @@ -478,8 +478,8 @@ static void ov95_0224829C(UnkStruct_ov95_02247C6C *param0) NNS_G2dInitImagePaletteProxy(&v0); NNS_G2dInitImageProxy(&v1); - sub_02006F00(93, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v1); - sub_02006EE0(93, 10, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v0); + Graphics_LoadImageMapping(93, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v1); + Graphics_LoadPartialPalette(93, 10, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v0); ov95_022475C4(&v2, ¶m0->unk_44, &v1, &v0, 2); diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c index ee171b308e..bea5163c8d 100644 --- a/src/overlay095/ov95_02248590.c +++ b/src/overlay095/ov95_02248590.c @@ -481,22 +481,22 @@ static void ov95_022488A4(UnkStruct_ov95_02248688 *param0) OS_RestoreInterrupts(v6); } - sub_02006E3C(93, 2, param0->unk_C0, 2, 0, 0, 1, 58); - sub_02006E3C(93, 2, param0->unk_C0, 6, 0, 0, 1, 58); - sub_02006E60(93, 0, param0->unk_C0, 2, 0, 0, 1, 58); - sub_02006E60(93, 0, param0->unk_C0, 6, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, 2, param0->unk_C0, 2, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, 2, param0->unk_C0, 6, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 0, param0->unk_C0, 2, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 0, param0->unk_C0, 6, 0, 0, 1, 58); v5 = ov95_02247644(param0->unk_00); - sub_02006E84(93, 3, 0, 0, 0x20, 58); - sub_02006E84(93, 3, 4, 0, 0x20, 58); - sub_02006E9C(93, 3, 0, v4[v5], 0x20, 0x40, 58); - sub_02006E9C(93, 3, 4, v4[v5], 0x20, 0x40, 58); + Graphics_LoadPalette(93, 3, 0, 0, 0x20, 58); + Graphics_LoadPalette(93, 3, 4, 0, 0x20, 58); + Graphics_LoadPaletteWithSrcOffset(93, 3, 0, v4[v5], 0x20, 0x40, 58); + Graphics_LoadPaletteWithSrcOffset(93, 3, 4, v4[v5], 0x20, 0x40, 58); - sub_02006E3C(93, 5, param0->unk_C0, 3, 0, 0, 1, 58); - sub_02006E3C(93, 5, param0->unk_C0, 7, 0, 0, 1, 58); - sub_02006E60(93, 4, param0->unk_C0, 3, 0, 0, 1, 58); - sub_02006E60(93, 4, param0->unk_C0, 7, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, 5, param0->unk_C0, 3, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, 5, param0->unk_C0, 7, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 4, param0->unk_C0, 3, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 4, param0->unk_C0, 7, 0, 0, 1, 58); { u8 *v7 = Heap_AllocFromHeap(58, 96); @@ -607,10 +607,10 @@ static void ov95_02248CA8(UnkStruct_ov95_02248688 *param0) NNS_G2dInitImagePaletteProxy(&v0); NNS_G2dInitImageProxy(&v1); - sub_02006F00(93, 13, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v1); - sub_02006F00(93, 13, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 58, &v1); - sub_02006EE0(93, 14, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v0); - sub_02006EE0(93, 14, NNS_G2D_VRAM_TYPE_2DSUB, 0, 58, &v0); + Graphics_LoadImageMapping(93, 13, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v1); + Graphics_LoadImageMapping(93, 13, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 58, &v1); + Graphics_LoadPartialPalette(93, 14, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v0); + Graphics_LoadPartialPalette(93, 14, NNS_G2D_VRAM_TYPE_2DSUB, 0, 58, &v0); ov95_022475C4(&v2, ¶m0->unk_0C, &v1, &v0, 1); MTRNG_SetSeed(UnkEnum_ov95_02248CA8_00); diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c index f8a89aa454..562f4b610f 100644 --- a/src/overlay095/ov95_02249740.c +++ b/src/overlay095/ov95_02249740.c @@ -309,14 +309,14 @@ static void ov95_02249910(UnkStruct_ov95_022497D8 *param0) break; } - sub_02006E3C(93, v4, param0->unk_24, 3, 0, 0, 1, 58); - sub_02006E3C(93, v4, param0->unk_24, 7, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, v4, param0->unk_24, 3, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, v4, param0->unk_24, 7, 0, 0, 1, 58); - sub_02006E60(93, v3, param0->unk_24, 3, 0, 0, 1, 58); - sub_02006E60(93, v3, param0->unk_24, 7, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, v3, param0->unk_24, 3, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, v3, param0->unk_24, 7, 0, 0, 1, 58); - sub_02006E9C(93, v5, 0, v6, 0, 0x20, 58); - sub_02006E9C(93, v5, 4, v6, 0, 0x20, 58); + Graphics_LoadPaletteWithSrcOffset(93, v5, 0, v6, 0, 0x20, 58); + Graphics_LoadPaletteWithSrcOffset(93, v5, 4, v6, 0, 0x20, 58); Bg_SetOffset(param0->unk_24, 3, 3, 256); Bg_SetOffset(param0->unk_24, 7, 3, 0); @@ -404,8 +404,8 @@ static void ov95_02249B90(UnkStruct_ov95_022497D8 *param0) NNS_G2dInitImagePaletteProxy(&v0); NNS_G2dInitImageProxy(&v1); - sub_02006F00(93, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v1); - sub_02006EE0(93, 10, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v0); + Graphics_LoadImageMapping(93, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v1); + Graphics_LoadPartialPalette(93, 10, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v0); ov95_022475C4(&v2, ¶m0->unk_10, &v1, &v0, 0); param0->unk_20[0] = ov95_022475E4(param0->unk_00, &v2, UnkEnum_ov95_02249B90_00, UnkEnum_ov95_02249B90_01, 0, NNS_G2D_VRAM_TYPE_2DMAIN); diff --git a/src/overlay095/ov95_02249F90.c b/src/overlay095/ov95_02249F90.c index 63ce336c3c..33e7757d53 100644 --- a/src/overlay095/ov95_02249F90.c +++ b/src/overlay095/ov95_02249F90.c @@ -226,13 +226,13 @@ static void ov95_0224A10C(UnkStruct_ov95_02249FF8 *param0) 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); - sub_02006E60(93, 18, param0->unk_0C, 3, 0, 0, 1, 58); - sub_02006E60(93, 18, param0->unk_0C, 7, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, 19, param0->unk_0C, 3, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, 19, param0->unk_0C, 7, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 18, param0->unk_0C, 3, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 18, param0->unk_0C, 7, 0, 0, 1, 58); - sub_02006E84(93, 20, 0, 0, 0x20, 58); - sub_02006E84(93, 20, 4, 0, 0x20, 58); + Graphics_LoadPalette(93, 20, 0, 0, 0x20, 58); + Graphics_LoadPalette(93, 20, 4, 0, 0x20, 58); Bg_FillTilesRange(param0->unk_0C, 1, 0x0, 1, 200); Bg_FillTilesRange(param0->unk_0C, 5, 0x0, 1, 200); diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c index ecdee0fab7..0e0738247c 100644 --- a/src/overlay095/ov95_0224A390.c +++ b/src/overlay095/ov95_0224A390.c @@ -288,14 +288,14 @@ static void ov95_0224A518(UnkStruct_ov95_0224A42C *param0) break; } - sub_02006E3C(93, v4, param0->unk_24, 3, 0, 0, 1, 58); - sub_02006E3C(93, v4, param0->unk_24, 7, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, v4, param0->unk_24, 3, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, v4, param0->unk_24, 7, 0, 0, 1, 58); - sub_02006E60(93, v3, param0->unk_24, 3, 0, 0, 1, 58); - sub_02006E60(93, v3, param0->unk_24, 7, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, v3, param0->unk_24, 3, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, v3, param0->unk_24, 7, 0, 0, 1, 58); - sub_02006E9C(93, v5, 0, v6, 0, 0x20, 58); - sub_02006E9C(93, v5, 4, v6, 0, 0x20, 58); + Graphics_LoadPaletteWithSrcOffset(93, v5, 0, v6, 0, 0x20, 58); + Graphics_LoadPaletteWithSrcOffset(93, v5, 4, v6, 0, 0x20, 58); Bg_SetOffset(param0->unk_24, 3, 3, 0); Bg_SetOffset(param0->unk_24, 7, 3, 256); @@ -388,8 +388,8 @@ static void ov95_0224A7B0(UnkStruct_ov95_0224A42C *param0) NNS_G2dInitImagePaletteProxy(&v0); NNS_G2dInitImageProxy(&v1); - sub_02006F00(93, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v1); - sub_02006EE0(93, 10, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v0); + Graphics_LoadImageMapping(93, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v1); + Graphics_LoadPartialPalette(93, 10, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v0); ov95_022475C4(&v2, ¶m0->unk_10, &v1, &v0, 1); param0->unk_20[0] = ov95_022475E4(param0->unk_00, &v2, 128, 96, 0, NNS_G2D_VRAM_TYPE_2DMAIN); diff --git a/src/overlay095/ov95_0224ABC0.c b/src/overlay095/ov95_0224ABC0.c index c63e3958ef..47f69d7bd8 100644 --- a/src/overlay095/ov95_0224ABC0.c +++ b/src/overlay095/ov95_0224ABC0.c @@ -358,22 +358,22 @@ static void ov95_0224AE1C(UnkStruct_ov95_0224AC64 *param0) OS_RestoreInterrupts(v6); } - sub_02006E3C(93, 2, param0->unk_0C, 2, 0, 0, 1, 58); - sub_02006E3C(93, 2, param0->unk_0C, 6, 0, 0, 1, 58); - sub_02006E60(93, 1, param0->unk_0C, 2, 0, 0, 1, 58); - sub_02006E60(93, 1, param0->unk_0C, 6, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, 2, param0->unk_0C, 2, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, 2, param0->unk_0C, 6, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 1, param0->unk_0C, 2, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 1, param0->unk_0C, 6, 0, 0, 1, 58); v5 = ov95_02247644(param0->unk_00); - sub_02006E84(93, 3, 0, 0, 0x20, 58); - sub_02006E84(93, 3, 4, 0, 0x20, 58); - sub_02006E9C(93, 3, 0, v4[v5], 0x20, 0x40, 58); - sub_02006E9C(93, 3, 4, v4[v5], 0x20, 0x40, 58); + Graphics_LoadPalette(93, 3, 0, 0, 0x20, 58); + Graphics_LoadPalette(93, 3, 4, 0, 0x20, 58); + Graphics_LoadPaletteWithSrcOffset(93, 3, 0, v4[v5], 0x20, 0x40, 58); + Graphics_LoadPaletteWithSrcOffset(93, 3, 4, v4[v5], 0x20, 0x40, 58); - sub_02006E3C(93, 5, param0->unk_0C, 3, 0, 0, 1, 58); - sub_02006E3C(93, 5, param0->unk_0C, 7, 0, 0, 1, 58); - sub_02006E60(93, 4, param0->unk_0C, 3, 0, 0, 1, 58); - sub_02006E60(93, 4, param0->unk_0C, 7, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, 5, param0->unk_0C, 3, 0, 0, 1, 58); + Graphics_LoadTilesToBgLayer(93, 5, param0->unk_0C, 7, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 4, param0->unk_0C, 3, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 4, param0->unk_0C, 7, 0, 0, 1, 58); { u8 *v7 = Heap_AllocFromHeap(58, 96); diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 370b29b33d..57d3abce28 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -288,12 +288,12 @@ static int ov95_0224B520(UnkStruct_ov95_0224B4D4 *param0, int *param1) 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); + Graphics_LoadPalette(14, 7, 0, 1 * 0x20, 0x20, 58); 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); - sub_02006E84(93, 23, 0, 0 * 0x20, 0x20, 58); + Graphics_LoadTilesToBgLayer(93, 22, param0->unk_58, 2, 0, 0, 1, 58); + Graphics_LoadTilemapToBgLayer(93, 21, param0->unk_58, 2, 0, 0, 1, 58); + Graphics_LoadPalette(93, 23, 0, 0 * 0x20, 0x20, 58); ov95_0224B9C0(param0); @@ -520,8 +520,8 @@ static void ov95_0224BAE8(UnkStruct_ov95_0224B4D4 *param0) NNS_G2dInitImagePaletteProxy(&v0); NNS_G2dInitImageProxy(&v1); - sub_02006F00(93, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v1); - sub_02006EE0(93, 10, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v0); + Graphics_LoadImageMapping(93, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v1); + Graphics_LoadPartialPalette(93, 10, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 58, &v0); ov95_022475C4(&v2, ¶m0->unk_48, &v1, &v0, 2); diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index dcabf62995..d6af618a8f 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -351,16 +351,16 @@ static void ov96_0223BF40(UnkStruct_ov96_0223BF40 *param0) BgConfig *v0 = param0->unk_04; NARC *v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 68); - sub_02007130(v1, 3, 0, 0, 0, 68); - sub_02007130(v1, 3, 4, 0, 0, 68); + Graphics_LoadPaletteFromOpenNARC(v1, 3, 0, 0, 0, 68); + Graphics_LoadPaletteFromOpenNARC(v1, 3, 4, 0, 0, 68); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 68); Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, 68); sub_0200DD0C(v0, 0, 1, 14, Options_Frame(param0->unk_00->unk_10), 68); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 68); - sub_020070E8(v1, 2, v0, 1, 0, 0, 0, 68); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 2, v0, 1, 0, 0, 0, 68); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, 68); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 10, v0, 5, 0, 0, 0, 68); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 11, v0, 5, 0, 32 * 24 * 2, 0f, 68); Bg_MaskPalette(0, 0); Bg_MaskPalette(4, 0); diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index edd9b02ffb..73635c55f1 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -491,8 +491,8 @@ static void ov97_0222B404(UnkStruct_0222AE60 *param0) static void ov97_0222B46C(UnkStruct_0222AE60 *param0) { - sub_02006E84(116, 45, 0, 4 * 32, 32 * 1, 81); - sub_02006E3C(116, 44, param0->unk_00, 2, 0x380, 2 * 32 * 0x20, 0, 81); + Graphics_LoadPalette(116, 45, 0, 4 * 32, 32 * 1, 81); + Graphics_LoadTilesToBgLayer(116, 44, param0->unk_00, 2, 0x380, 2 * 32 * 0x20, 0, 81); } static void ov97_0222B4AC(UnkStruct_0222AE60 *param0, int param1, int param2, int param3) diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 0159f0661b..2948de2ead 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -547,9 +547,9 @@ static void ov97_0222C254(UnkStruct_ov97_0222C388 *param0) v0 = Options_Frame(param0->unk_14); sub_0200DD0C(param0->unk_04, 0, (1 + 9), 2, v0, param0->unk_00); - 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); + Graphics_LoadPalette(116, 0, 0, 16 * 2 * 8, 16 * 2, param0->unk_00); + Graphics_LoadTilesToBgLayer(116, 1, param0->unk_04, 1, 0, 10 * 16 * 0x20, 1, param0->unk_00); + Graphics_LoadTilemapToBgLayer(116, 2, param0->unk_04, 1, 0, 32 * 24 * 2, 1, param0->unk_00); Bg_ChangeTilemapRectPalette(param0->unk_04, 1, 0, 0, 32, 24, 8); Bg_CopyTilemapBufferToVRAM(param0->unk_04, 1); @@ -558,9 +558,9 @@ static void ov97_0222C254(UnkStruct_ov97_0222C388 *param0) 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); + Graphics_LoadPalette(116, 0, 4, 16 * 2 * 8, 16 * 2, param0->unk_00); + Graphics_LoadTilesToBgLayer(116, 1, param0->unk_04, 4, 0, 10 * 16 * 0x20, 1, param0->unk_00); + Graphics_LoadTilemapToBgLayer(116, 2, param0->unk_04, 4, 0, 32 * 24 * 2, 1, param0->unk_00); Bg_ChangeTilemapRectPalette(param0->unk_04, 4, 0, 0, 32, 24, 8); Bg_CopyTilemapBufferToVRAM(param0->unk_04, 4); } diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index 31fc547032..e19c62601d 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -758,18 +758,18 @@ static void ov97_0222DBC4(BgConfig *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); - sub_02006E60(116, 2, param0, 5, 0, 32 * 24 * 2, 1, 86); + Graphics_LoadPalette(116, 0, 4, 16 * 2 * 8, 16 * 2, 86); + Graphics_LoadTilesToBgLayer(116, 1, param0, 5, 0, 10 * 16 * 0x20, 1, 86); + Graphics_LoadTilemapToBgLayer(116, 2, param0, 5, 0, 32 * 24 * 2, 1, 86); Bg_ChangeTilemapRectPalette(param0, 5, 0, 0, 32, 24, 8); Bg_CopyTilemapBufferToVRAM(param0, 5); } 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); + Graphics_LoadPalette(116, 0, 0, 16 * 2 * 8, 16 * 2, 86); + Graphics_LoadTilesToBgLayer(116, 1, param0, 1, 0, 10 * 16 * 0x20, 1, 86); + Graphics_LoadTilemapToBgLayer(116, 2, param0, 1, 0, 32 * 24 * 2, 1, 86); Bg_ChangeTilemapRectPalette(param0, 1, 0, 0, 32, 24, 8); Bg_CopyTilemapBufferToVRAM(param0, 1); diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index 3aa41091e1..e301897b2b 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -341,10 +341,10 @@ static void ov97_022305EC(Window *param0, int param1) 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); - sub_02006E3C(116, 17, param0, 1, 0, 6 * 16 * 0x20, 1, 87); - sub_02006E60(116, 18, param0, 1, 0, 32 * 24 * 2, 1, 87); + Graphics_LoadPalette(116, 11, 0, 16 * 2 * 15, 16 * 2, 87); + Graphics_LoadPalette(116, 16, 0, 16 * 2 * 12, 16 * 2, 87); + Graphics_LoadTilesToBgLayer(116, 17, param0, 1, 0, 6 * 16 * 0x20, 1, 87); + Graphics_LoadTilemapToBgLayer(116, 18, param0, 1, 0, 32 * 24 * 2, 1, 87); Bg_ChangeTilemapRectPalette(param0, 1, 0, 0, 32, 24, 12); Bg_CopyTilemapBufferToVRAM(param0, 1); } @@ -716,20 +716,20 @@ static void ov97_02230F58(UnkStruct_ov97_02230868 *param0, u32 param1, u32 param static void ov97_02230F98(UnkStruct_ov97_02230868 *param0, int param1) { - sub_02006E84(116, 3, 0, 0, 16 * 16, param0->unk_00); - sub_02006E3C(116, 6, param0->unk_2A5C, 1, 0, 24 * 16 * 0x20, 1, param0->unk_00); + Graphics_LoadPalette(116, 3, 0, 0, 16 * 16, param0->unk_00); + Graphics_LoadTilesToBgLayer(116, 6, param0->unk_2A5C, 1, 0, 24 * 16 * 0x20, 1, param0->unk_00); switch (param1) { case 0: - sub_02006E60(116, 4, param0->unk_2A5C, 1, 0, 32 * 24 * 2, 1, param0->unk_00); + Graphics_LoadTilemapToBgLayer(116, 4, param0->unk_2A5C, 1, 0, 32 * 24 * 2, 1, param0->unk_00); break; case 1: - sub_02006E60(116, 5, param0->unk_2A5C, 1, 0, 32 * 24 * 2, 1, param0->unk_00); + Graphics_LoadTilemapToBgLayer(116, 5, param0->unk_2A5C, 1, 0, 32 * 24 * 2, 1, param0->unk_00); break; } - sub_02006E84(116, 0, 0, 16 * 2 * 11, 16 * 2, param0->unk_00); - sub_02006E3C(116, 1, param0->unk_2A5C, 3, 0 * 1, 1 * 16 * 0x20, 1, param0->unk_00); + Graphics_LoadPalette(116, 0, 0, 16 * 2 * 11, 16 * 2, param0->unk_00); + Graphics_LoadTilesToBgLayer(116, 1, param0->unk_2A5C, 3, 0 * 1, 1 * 16 * 0x20, 1, param0->unk_00); ov97_02230F58(param0, 2, 3, 32 * 24 * 2); @@ -794,7 +794,7 @@ static void ov97_022310FC(UnkStruct_ov97_02230868 *param0) ov97_02237A74(); ov97_02237B0C(116, 26, 23, 25, 24, 0); - sub_02006E84(19, PokeIconPalettesFileIndex(), 1, 3 * 0x20, 0, param0->unk_00); + Graphics_LoadPalette(19, PokeIconPalettesFileIndex(), 1, 3 * 0x20, 0, param0->unk_00); } v2 = 1; @@ -812,7 +812,7 @@ static void ov97_022310FC(UnkStruct_ov97_02230868 *param0) } param0->unk_2E90[v1] = ov97_02237D14(0, param0->unk_2E90[v1], v0, 16, 10 + v1); - v3 = sub_02006F50(19, PokeIconSpriteIndex(v2, 0, 0), 0, &v4, param0->unk_00); + v3 = Graphics_GetCharData(19, PokeIconSpriteIndex(v2, 0, 0), 0, &v4, param0->unk_00); DC_FlushRange(v4->pRawData, ((4 * 4) * 0x20)); GX_LoadOBJ(v4->pRawData, (0x64 + v1 * (4 * 4)) * 0x20, ((4 * 4) * 0x20)); diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 2ee11641c6..75efc73c0d 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -528,7 +528,7 @@ static void ov97_02233FA4(UnkStruct_ov97_02234A2C *param0) sub_0200A328(param0->unk_1D0[0]); sub_0200A5C8(param0->unk_1D0[1]); - sub_02006E84(19, PokeIconPalettesFileIndex(), 1, 8 * 0x20, 0, 78); + Graphics_LoadPalette(19, PokeIconPalettesFileIndex(), 1, 8 * 0x20, 0, 78); } static void ov97_022340B0(UnkStruct_ov97_02234A2C *param0) @@ -1403,14 +1403,14 @@ static void ov97_02234DFC(UnkStruct_ov97_02234A2C *param0) Text_ResetAllPrinters(); Font_LoadTextPalette(0, 15 * 32, 78); - sub_02006E84(116, 19, 0, 0, 32 * 6, 78); - sub_02006E3C(116, 22, param0->unk_20, 2, 0, 10 * 16 * 0x20, 1, 78); + Graphics_LoadPalette(116, 19, 0, 0, 32 * 6, 78); + Graphics_LoadTilesToBgLayer(116, 22, param0->unk_20, 2, 0, 10 * 16 * 0x20, 1, 78); Font_InitManager(FONT_SUBSCREEN, 78); } static void ov97_02234E7C(UnkStruct_ov97_02234A2C *param0) { - sub_02006E60(116, 20, param0->unk_20, 2, 0, 32 * 24 * 2, 1, 78); + Graphics_LoadTilemapToBgLayer(116, 20, param0->unk_20, 2, 0, 32 * 24 * 2, 1, 78); Bg_ChangeTilemapRectPalette(param0->unk_20, 2, 0, 0, 32, 24, Unk_ov97_0223EA60[param0->unk_00]); Bg_CopyTilemapBufferToVRAM(param0->unk_20, 2); } @@ -1477,7 +1477,7 @@ static void ov97_02234F88(UnkStruct_ov97_02234A2C *param0) ov97_02234278(v1, v2, v4, v3, v0, param0->unk_478[v0]); } - sub_02006E60(116, 21, param0->unk_20, 2, 0, 32 * 24 * 2, 1, 78); + Graphics_LoadTilemapToBgLayer(116, 21, param0->unk_20, 2, 0, 32 * 24 * 2, 1, 78); 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); diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index 500c3054ea..eb03b71b1f 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -594,7 +594,7 @@ static void ov97_02237EF8(CellActor *param0, Pokemon *param1, int param2, int pa NNSG2dImagePaletteProxy *v6 = CellActor_GetPaletteProxy(param0); u32 v7 = NNS_G2dGetImagePaletteLocation(v6, NNS_G2D_VRAM_TYPE_2DSUB); - sub_02006E84(param5->archive, param5->palette, 5, 0x20 * (2 + 1) + v7, 32, v3->unk_08); + Graphics_LoadPalette(param5->archive, param5->palette, 5, 0x20 * (2 + 1) + v7, 32, v3->unk_08); } } @@ -661,7 +661,7 @@ static void ov97_022380C8(UnkStruct_ov97_0223F550 *param0, int param1, UnkStruct static void ov97_02238174(void *param0) { UnkStruct_ov97_0223F550 *v0 = (UnkStruct_ov97_0223F550 *)param0; - sub_02006E84(116, 29, 4, 16 * 2 * 8, 16 * 2 * 6, v0->unk_08); + Graphics_LoadPalette(116, 29, 4, 16 * 2 * 8, 16 * 2 * 6, v0->unk_08); } void ov97_02238194(BgConfig *param0, UnkStruct_0202DF40 *param1) @@ -672,7 +672,7 @@ void ov97_02238194(BgConfig *param0, UnkStruct_0202DF40 *param1) v1 = param1->unk_00; v0 = ov97_02237EA8(v1); - sub_02006E3C(116, 30, param0, 5, 0, 10 * 16 * 0x20, 1, v2->unk_08); + Graphics_LoadTilesToBgLayer(116, 30, param0, 5, 0, 10 * 16 * 0x20, 1, v2->unk_08); { NNSG2dScreenData *v3; diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index 7d5e3f5876..63c5bb085e 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -627,17 +627,17 @@ static void ov98_02247704 (UnkStruct_ov98_02247704 * param0) v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 109); - sub_02007130(v1, 3, 0, 0, 0, 109); - sub_02007130(v1, 3, 4, 0, 0, 109); + Graphics_LoadPaletteFromOpenNARC(v1, 3, 0, 0, 0, 109); + Graphics_LoadPaletteFromOpenNARC(v1, 3, 4, 0, 0, 109); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 109); Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, 109); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_08), 109); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 109); sub_0200DAA4(v0, 2, (1 + (18 + 12)), 11, 0, 109); - sub_020070E8(v1, 2, v0, 1, 0, 0, 0, 109); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 2, v0, 1, 0, 0, 0, 109); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, 109); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 10, v0, 5, 0, 0, 0, 109); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 11, v0, 5, 0, 32 * 24 * 2, 0, 109); Bg_MaskPalette(0, 0); Bg_MaskPalette(4, 0); @@ -650,9 +650,9 @@ static void ov98_02247704 (UnkStruct_ov98_02247704 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 0); - sub_020070E8(v1, 11, v0, 3, 0, 0, 0, 109); - sub_0200710C(v1, 10, v0, 3, 0, 0, 0, 109); - sub_02007130(v1, 12, 0, 9 * 0x20, 0x20, 109); + Graphics_LoadTilesToBgLayerFromOpenNARC(v1, 11, v0, 3, 0, 0, 0, 109); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v1, 10, v0, 3, 0, 0, 0, 109); + Graphics_LoadPaletteFromOpenNARC(v1, 12, 0, 9 * 0x20, 0x20, 109); NARC_dtor(v1); } diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c index 2673b4efea..3ab7356962 100644 --- a/src/overlay099/ov99_021D1A54.c +++ b/src/overlay099/ov99_021D1A54.c @@ -389,7 +389,7 @@ static void ov99_021D1BC4(UnkStruct_ov99_021D2CB0 *param0, CellActorData **param } param0->unk_10F4 = Heap_AllocFromHeap(75, (0x20 * 8)); - v3 = sub_020071B4(param0->unk_10F8, v5, 0, &v4, 75); + v3 = Graphics_GetCharDataFromOpenNARC(param0->unk_10F8, v5, 0, &v4, 75); MI_CpuCopy32(v4->pRawData, param0->unk_10F4, (0x20 * 8)); Heap_FreeToHeap(v3); @@ -454,12 +454,12 @@ static void ov99_021D1D68(UnkStruct_ov99_021D2CB0 *param0) BgConfig *v0 = param0->unk_08; PaletteData_LoadBufferFromFileStart(param0->unk_0C, 127, 18, 75, 0, 0, 0); - sub_020070E8(param0->unk_10F8, 9, param0->unk_08, 2, 0, 0, 0, 75); - sub_0200710C(param0->unk_10F8, 3, param0->unk_08, 2, 0, 0, 0, 75); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_10F8, 9, param0->unk_08, 2, 0, 0, 0, 75); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_10F8, 3, param0->unk_08, 2, 0, 0, 0, 75); PaletteData_LoadBufferFromFileStart(param0->unk_0C, 127, 21, 75, 1, 0, 0); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_10F8, 12, param0->unk_08, 7, 0, 0, 0, 75); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_10F8, 6, param0->unk_08, 7, 0, 0, 0, 75); Bg_SetOffset(v0, 2, 0, 0); Bg_SetOffset(v0, 2, 3, 0); @@ -663,18 +663,18 @@ static void ov99_021D2180(UnkStruct_ov99_021D2CB0 *param0) BgConfig *v0 = param0->unk_08; PaletteData_LoadBufferFromFileStart(param0->unk_0C, 127, 19, 75, 0, 0, 0); - sub_020070E8(param0->unk_10F8, 10, param0->unk_08, 2, 0, 0, 0, 75); - sub_0200710C(param0->unk_10F8, 4, param0->unk_08, 2, 0, 0, 0, 75); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_10F8, 10, param0->unk_08, 2, 0, 0, 0, 75); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_10F8, 4, param0->unk_08, 2, 0, 0, 0, 75); PaletteData_LoadBufferFromFileStart(param0->unk_0C, 127, 22, 75, 1, 0, 0); - sub_020070E8(param0->unk_10F8, 13, param0->unk_08, 7, 0, 0, 0, 75); - sub_0200710C(param0->unk_10F8, 7, param0->unk_08, 7, 0, 0, 0, 75); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_10F8, 13, param0->unk_08, 7, 0, 0, 0, 75); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_10F8, 7, param0->unk_08, 7, 0, 0, 0, 75); { NNSG2dPaletteData *v1; void *v2; - v2 = sub_020071EC(param0->unk_10F8, 16, &v1, 75); + v2 = Graphics_GetPlttDataFromOpenNARC(param0->unk_10F8, 16, &v1, 75); MI_CpuCopy16(v1->pRawData, param0->unk_FA4.unk_08_val2.unk_08, 0x20 * 4); Heap_FreeToHeap(v2); } @@ -803,18 +803,18 @@ static void ov99_021D24F0(UnkStruct_ov99_021D2CB0 *param0) BgConfig *v0 = param0->unk_08; PaletteData_LoadBufferFromFileStart(param0->unk_0C, 127, 20, 75, 0, 0, 0); - sub_020070E8(param0->unk_10F8, 11, param0->unk_08, 2, 0, 0, 0, 75); - sub_0200710C(param0->unk_10F8, 5, param0->unk_08, 2, 0, 0, 0, 75); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_10F8, 11, param0->unk_08, 2, 0, 0, 0, 75); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_10F8, 5, param0->unk_08, 2, 0, 0, 0, 75); PaletteData_LoadBufferFromFileStart(param0->unk_0C, 127, 23, 75, 1, 0, 0); - sub_020070E8(param0->unk_10F8, 14, param0->unk_08, 7, 0, 0, 0, 75); - sub_0200710C(param0->unk_10F8, 8, param0->unk_08, 7, 0, 0, 0, 75); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_10F8, 14, param0->unk_08, 7, 0, 0, 0, 75); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_10F8, 8, param0->unk_08, 7, 0, 0, 0, 75); { NNSG2dPaletteData *v1; void *v2; - v2 = sub_020071EC(param0->unk_10F8, 17, &v1, 75); + v2 = Graphics_GetPlttDataFromOpenNARC(param0->unk_10F8, 17, &v1, 75); MI_CpuCopy16(v1->pRawData, param0->unk_FA4.unk_08_val3.unk_08, 0x20 * 8); Heap_FreeToHeap(v2); diff --git a/src/overlay099/ov99_021D4134.c b/src/overlay099/ov99_021D4134.c index b589c37e58..3389f7aca1 100644 --- a/src/overlay099/ov99_021D4134.c +++ b/src/overlay099/ov99_021D4134.c @@ -182,7 +182,7 @@ void ov99_021D439C(UnkStruct_ov99_021D2CB0 *param0, int param1, int param2, int break; } - v2 = sub_020071EC(param0->unk_10F8, v3->unk_04, &v1, 75); + v2 = Graphics_GetPlttDataFromOpenNARC(param0->unk_10F8, v3->unk_04, &v1, 75); DC_FlushRange(v1->pRawData, v1->szByte); GX_BeginLoadBGExtPltt(); @@ -198,8 +198,8 @@ void ov99_021D439C(UnkStruct_ov99_021D2CB0 *param0, int param1, int param2, int Heap_FreeToHeap(v2); PaletteData_FillBufferRange(param0->unk_0C, 0, 2, 0x0, 0, 1); PaletteData_FillBufferRange(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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_10F8, v3->unk_00, param0->unk_08, param2, 0, 0, 0, 75); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_10F8, v3->unk_02, param0->unk_08, param2, 0, 0, 0, 75); Bg_SetOffset(v0, param2, 0, v3->unk_06); Bg_SetOffset(v0, param2, 3, v3->unk_08); } diff --git a/src/overlay100/ov100_021D13E4.c b/src/overlay100/ov100_021D13E4.c index 7a01205a04..ce823277aa 100644 --- a/src/overlay100/ov100_021D13E4.c +++ b/src/overlay100/ov100_021D13E4.c @@ -245,9 +245,9 @@ static void ov100_021D1808(UnkStruct_ov100_021D1808 *param0) PaletteData *v4 = param0->unk_7C4->unk_10; int v5 = 50000; - sub_020070E8(v0, 70, v1, 5, 0, 0, 0, 111); - sub_0200710C(v0, 72, v1, 5, 0, 0, 0, 111); - sub_0200710C(v0, 73, v1, 4, 0, 0, 0, 111); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 70, v1, 5, 0, 0, 0, 111); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 72, v1, 5, 0, 0, 0, 111); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 73, v1, 4, 0, 0, 0, 111); PaletteData_LoadBufferFromFileStart(v4, 172, 71, 111, 1, 0x20 * 2, 0); { diff --git a/src/overlay100/ov100_021D1C44.c b/src/overlay100/ov100_021D1C44.c index f855c409b0..580c9eebb9 100644 --- a/src/overlay100/ov100_021D1C44.c +++ b/src/overlay100/ov100_021D1C44.c @@ -78,8 +78,8 @@ static void ov100_021D1C98(UnkStruct_ov100_021D1C98 *param0) PaletteData *v4 = param0->unk_1EBC->unk_10; int v5 = 50000; - sub_020070E8(v0, 18, v1, 5, 0, 0, 0, 111); - sub_0200710C(v0, 20, v1, 5, 0, 0, 0, 111); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 18, v1, 5, 0, 0, 0, 111); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 20, v1, 5, 0, 0, 0, 111); PaletteData_LoadBufferFromFileStart(v4, 172, 19, 111, 1, 0x20 * 2, 0); PaletteData_LoadBufferFromFileStart(v4, 172, 19, 111, 0, 0x20 * 2, 0); diff --git a/src/overlay100/ov100_021D2F0C.c b/src/overlay100/ov100_021D2F0C.c index b3eefe061b..82ca221018 100644 --- a/src/overlay100/ov100_021D2F0C.c +++ b/src/overlay100/ov100_021D2F0C.c @@ -49,8 +49,8 @@ static void ov100_021D2F0C(BgConfig *param0, PaletteData *param1) int v4 = 4; int v5 = 111; - sub_02006E3C(v0, v1, param0, v4, 0, 0, 1, v5); - sub_02006E60(v0, v2, param0, v4, 0, 0, 1, v5); + Graphics_LoadTilesToBgLayer(v0, v1, param0, v4, 0, 0, 1, v5); + Graphics_LoadTilemapToBgLayer(v0, v2, param0, v4, 0, 0, 1, v5); PaletteData_LoadBufferFromFileStart(param1, v0, v3, v5, 1, 0x20 * 1, 0); } diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index 83ec58ec44..d3e28f282f 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -368,23 +368,23 @@ static void ov102_021D1274(UnkStruct_ov102_021D0F8C *param0) v5 = 5; } - sub_02006E60(132, v0, param0->unk_10, 3, 0, 0, 0, param0->unk_00); - sub_02006E3C(132, v1, param0->unk_10, 3, 0, 0, 0, param0->unk_00); - sub_02006E84(132, v2, 0, 0 * (2 * 16), (2 * 16), param0->unk_00); - sub_02006E60(132, v0, param0->unk_10, 7, 0, 0, 0, param0->unk_00); - sub_02006E3C(132, v1, param0->unk_10, 7, 0, 0, 0, param0->unk_00); - 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); + Graphics_LoadTilemapToBgLayer(132, v0, param0->unk_10, 3, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(132, v1, param0->unk_10, 3, 0, 0, 0, param0->unk_00); + Graphics_LoadPalette(132, v2, 0, 0 * (2 * 16), (2 * 16), param0->unk_00); + Graphics_LoadTilemapToBgLayer(132, v0, param0->unk_10, 7, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(132, v1, param0->unk_10, 7, 0, 0, 0, param0->unk_00); + Graphics_LoadPalette(132, v2, 4, 0 * (2 * 16), (2 * 16), param0->unk_00); + + Graphics_LoadTilemapToBgLayer(132, v3, param0->unk_10, 1, 0, 0, 0, param0->unk_00); 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); + Graphics_LoadTilesToBgLayer(132, v4, param0->unk_10, 1, 0, 0, 0, param0->unk_00); + Graphics_LoadPalette(132, v5, 0, 1 * (2 * 16), (2 * 16), param0->unk_00); + Graphics_LoadTilemapToBgLayer(132, v3, param0->unk_10, 5, 0, 0, 0, param0->unk_00); 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); + Graphics_LoadTilesToBgLayer(132, v4, param0->unk_10, 5, 0, 0, 0, param0->unk_00); + Graphics_LoadPalette(132, v5, 4, 1 * (2 * 16), (2 * 16), param0->unk_00); Bg_ClearTilesRange(0, 32, 0, param0->unk_00); Bg_ClearTilesRange(4, 32, 0, param0->unk_00); diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c index a43690dad0..cdadc338b2 100644 --- a/src/overlay104/ov104_02237DD8.c +++ b/src/overlay104/ov104_02237DD8.c @@ -636,14 +636,14 @@ void ov104_02238658(void *param0, UnkStruct_ov104_0223C4CC *param1) if (v1->unk_13 != 32) { v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 94); - sub_020070E8(v0, Unk_ov104_0223FBBA[v1->unk_13][0], param1->unk_00, 2, 0, 0, 1, 94); - sub_0200710C(v0, Unk_ov104_0223FBBA[v1->unk_13][1], param1->unk_00, 2, 0, 0, 1, 94); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, Unk_ov104_0223FBBA[v1->unk_13][0], param1->unk_00, 2, 0, 0, 1, 94); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, Unk_ov104_0223FBBA[v1->unk_13][1], param1->unk_00, 2, 0, 0, 1, 94); { NNSG2dPaletteData *v2; void *v3; - v3 = sub_020071EC(v0, Unk_ov104_0223FBBA[v1->unk_13][2], &v2, 94); + v3 = Graphics_GetPlttDataFromOpenNARC(v0, Unk_ov104_0223FBBA[v1->unk_13][2], &v2, 94); DC_FlushRange(v2->pRawData, v2->szByte); GX_BeginLoadBGExtPltt(); @@ -671,7 +671,7 @@ void ov104_02238728(void *param0, UnkStruct_ov104_0223C4CC *param1) v1 = (UnkStruct_ov104_0223BFFC *)param0; v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 94); - sub_0200710C(v0, 53, param1->unk_00, 3, 0, 0, 1, 94); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 53, param1->unk_00, 3, 0, 0, 1, 94); Bg_ScheduleTilemapTransfer(param1->unk_00, 3); NARC_dtor(v0); @@ -900,7 +900,7 @@ void ov104_02238AB4(u8 param0, u8 param1) memset(v5, 0, 0x1000 * 2); v4 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 94); - v3 = sub_020071EC(v4, v0, &v2, 94); + v3 = Graphics_GetPlttDataFromOpenNARC(v4, v0, &v2, 94); BlendPalette(v2->pRawData, v5, 0x1000, param0, 0x0); DC_FlushRange(v5, 0x1000 * 2); diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index 1e57cb62a3..24024d5d87 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -635,8 +635,8 @@ static void ov104_0223CC10(UnkStruct_ov104_0223C4CC *param0) v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 94); - sub_020070E8(v0, 125, param0->unk_00, 4, 0, 0, 1, 94); - sub_0200710C(v0, 126, param0->unk_00, 4, 0, 0, 1, 94); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 125, param0->unk_00, 4, 0, 0, 1, 94); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 126, param0->unk_00, 4, 0, 0, 1, 94); PaletteData_LoadBufferFromFileStart(param0->unk_04, 150, 171, 94, 1, 0x20, 0 * 16); NARC_dtor(v0); } @@ -701,7 +701,7 @@ static void ov104_0223CC74(UnkStruct_ov104_0223C4CC *param0, int param1, const T v2 = ov104_0222EA90(param1, 5); v3 = NARC_ctor(v2, 94); - sub_020070E8(v3, ov104_0222EA90(param1, 7), param0->unk_00, 3, 0, 0, 1, 94); + Graphics_LoadTilesToBgLayerFromOpenNARC(v3, ov104_0222EA90(param1, 7), param0->unk_00, 3, 0, 0, 1, 94); if (v4 == GX_BGMODE_0) { PaletteData_LoadBufferFromFileStart(param0->unk_04, v2, ov104_0222EA90(param1, 8), 94, 0, ((10 - 0 + 1) * 0x20), 0 * 16); @@ -709,7 +709,7 @@ static void ov104_0223CC74(UnkStruct_ov104_0223C4CC *param0, int param1, const T NNSG2dPaletteData *v5; void *v6; - v6 = sub_020071EC(v3, ov104_0222EA90(param1, 8), &v5, 94); + v6 = Graphics_GetPlttDataFromOpenNARC(v3, ov104_0222EA90(param1, 8), &v5, 94); DC_FlushRange(v5->pRawData, v5->szByte); GX_BeginLoadBGExtPltt(); @@ -720,11 +720,11 @@ static void ov104_0223CC74(UnkStruct_ov104_0223C4CC *param0, int param1, const T } PaletteData_FillBufferRange(param0->unk_04, 0, 2, 0x0, 0, 1); - sub_0200710C(v3, ov104_0222EA90(param1, 6), param0->unk_00, 3, 0, 0, 1, 94); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v3, ov104_0222EA90(param1, 6), param0->unk_00, 3, 0, 0, 1, 94); if (ov104_0222EA90(param1, 9) != 0xffff) { - sub_020070E8(v3, ov104_0222EA90(param1, 10), param0->unk_00, 2, 0, 0, 1, 94); - sub_0200710C(v3, ov104_0222EA90(param1, 9), param0->unk_00, 2, 0, 0, 1, 94); + Graphics_LoadTilesToBgLayerFromOpenNARC(v3, ov104_0222EA90(param1, 10), param0->unk_00, 2, 0, 0, 1, 94); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v3, ov104_0222EA90(param1, 9), param0->unk_00, 2, 0, 0, 1, 94); if (v4 == GX_BGMODE_0) { (void)0; @@ -732,7 +732,7 @@ static void ov104_0223CC74(UnkStruct_ov104_0223C4CC *param0, int param1, const T NNSG2dPaletteData *v7; void *v8; - v8 = sub_020071EC(v3, ov104_0222EA90(param1, 11), &v7, 94); + v8 = Graphics_GetPlttDataFromOpenNARC(v3, ov104_0222EA90(param1, 11), &v7, 94); DC_FlushRange(v7->pRawData, v7->szByte); GX_BeginLoadBGExtPltt(); diff --git a/src/overlay104/ov104_0223D9E4.c b/src/overlay104/ov104_0223D9E4.c index 223b9536e6..1d51962d6c 100644 --- a/src/overlay104/ov104_0223D9E4.c +++ b/src/overlay104/ov104_0223D9E4.c @@ -100,7 +100,7 @@ static UnkStruct_ov104_0223DB34 *ov104_0223DA40(BgConfig *param0) v1 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 94); for (v4 = 0; v4 < 2; v4++) { - v2 = sub_020071D0(v1, Unk_ov104_022418B0[v4], 1, &v3, 94); + v2 = Graphics_GetScrnDataFromOpenNARC(v1, Unk_ov104_022418B0[v4], 1, &v3, 94); MI_CpuCopy32(v3->rawData, v0->unk_08[v4], 0x1000); Heap_FreeToHeap(v2); } @@ -115,12 +115,12 @@ static UnkStruct_ov104_0223DB34 *ov104_0223DA40(BgConfig *param0) v5 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 94); - v6 = sub_020071B4(v5, 14, 1, &v7, 94); + v6 = Graphics_GetCharDataFromOpenNARC(v5, 14, 1, &v7, 94); MI_CpuCopy32(v7->pRawData, v0->unk_2008[0], v7->szByte); Heap_FreeToHeap(v6); - v6 = sub_020071B4(v5, 15, 1, &v7, 94); + v6 = Graphics_GetCharDataFromOpenNARC(v5, 15, 1, &v7, 94); MI_CpuCopy32(v7->pRawData, v0->unk_2008[1], v7->szByte); Heap_FreeToHeap(v6); diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c index efe431620a..622b305eec 100644 --- a/src/overlay104/ov104_0223DC7C.c +++ b/src/overlay104/ov104_0223DC7C.c @@ -621,8 +621,8 @@ static void ov104_0223E5A8(UnkStruct_ov104_0223DD30 *param0, const UnkStruct_ov1 G2_SetWnd1Position(0, 0, 0, 0); PaletteData_LoadBufferFromFileStart(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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_24, param1->unk_09, param0->unk_10, 1, 0, 0, 0, 94); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_24, param1->unk_0A, param0->unk_10, 1, 0, 0, 0, 94); Bg_ChangeTilemapRectPalette(param0->unk_10, 1, 0, 0, 32, 32, 12); Bg_ScheduleTilemapTransfer(param0->unk_10, 1); @@ -630,7 +630,7 @@ static void ov104_0223E5A8(UnkStruct_ov104_0223DD30 *param0, const UnkStruct_ov1 void *v0; NNSG2dPaletteData *v1; - v0 = sub_02006F88(112, param1->unk_08, &v1, 94); + v0 = Graphics_GetPlttData(112, param1->unk_08, &v1, 94); MI_CpuCopy16(v1->pRawData, param0->unk_40, 8 * 32); Heap_FreeToHeap(v0); diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 59e7a8c1d3..74e1ff51d3 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -2445,12 +2445,12 @@ static void ov105_02244924(UnkStruct_ov105_02241FF4 *param0, u32 param1) static void ov105_022449A4(UnkStruct_ov105_02241FF4 *param0, u32 param1) { - sub_020070E8(param0->unk_338, 4, param0->unk_4C, param1, 0, 0, 1, 93); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_338, 4, param0->unk_4C, param1, 0, 0, 1, 93); if (ov104_0223AED4(param0->unk_09) == 0) { - sub_0200710C(param0->unk_338, 5, param0->unk_4C, param1, 0, 0, 1, 93); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_338, 5, param0->unk_4C, param1, 0, 0, 1, 93); } else { - sub_0200710C(param0->unk_338, 11, param0->unk_4C, param1, 0, 0, 1, 93); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_338, 11, param0->unk_4C, param1, 0, 0, 1, 93); } return; @@ -2458,24 +2458,24 @@ static void ov105_022449A4(UnkStruct_ov105_02241FF4 *param0, u32 param1) static void ov105_02244A18(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, 7, param0->unk_4C, param1, 0, 0, 1, 93); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_338, 4, param0->unk_4C, param1, 0, 0, 1, 93); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_338, 7, param0->unk_4C, param1, 0, 0, 1, 93); return; } static void ov105_02244A60(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, 8, param0->unk_4C, param1, 0, 0, 1, 93); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_338, 4, param0->unk_4C, param1, 0, 0, 1, 93); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_338, 8, param0->unk_4C, param1, 0, 0, 1, 93); return; } 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_338, 4, param0->unk_4C, param1, 0, 0, 1, 93); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_338, 9, param0->unk_4C, param1, 0, 0, 1, 93); Bg_SetPriority(1, 2); return; @@ -2486,7 +2486,7 @@ static void ov105_02244AF8(void) void *v0; NNSG2dPaletteData *v1; - v0 = sub_02006F88(150, 130, &v1, 93); + v0 = Graphics_GetPlttData(150, 130, &v1, 93); DC_FlushRange(v1->pRawData, (sizeof(u16) * 16 * 11)); GX_LoadBGPltt(v1->pRawData, 0, (sizeof(u16) * 16 * 11)); @@ -2497,9 +2497,9 @@ static void ov105_02244AF8(void) static void ov105_02244B30(UnkStruct_ov105_02241FF4 *param0, u32 param1) { - sub_020070E8(param0->unk_338, 125, param0->unk_4C, param1, 0, 0, 1, 93); - sub_0200710C(param0->unk_338, 126, param0->unk_4C, param1, 0, 0, 1, 93); - sub_02007130(param0->unk_338, 171, 4, 0, 0x20, 93); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_338, 125, param0->unk_4C, param1, 0, 0, 1, 93); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_338, 126, param0->unk_4C, param1, 0, 0, 1, 93); + Graphics_LoadPaletteFromOpenNARC(param0->unk_338, 171, 4, 0, 0x20, 93); return; } @@ -2507,9 +2507,9 @@ static void ov105_02244B30(UnkStruct_ov105_02241FF4 *param0, u32 param1) static void ov105_02244B90(UnkStruct_ov105_02241FF4 *param0, u32 param1) { if (ov104_0223AED4(param0->unk_09) == 0) { - sub_0200710C(param0->unk_338, 5, param0->unk_4C, 3, 0, 0, 1, 93); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_338, 5, param0->unk_4C, 3, 0, 0, 1, 93); } else { - sub_0200710C(param0->unk_338, 11, param0->unk_4C, 3, 0, 0, 1, 93); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_338, 11, param0->unk_4C, 3, 0, 0, 1, 93); } return; @@ -2517,16 +2517,16 @@ static void ov105_02244B90(UnkStruct_ov105_02241FF4 *param0, u32 param1) static void ov105_02244BE4(UnkStruct_ov105_02241FF4 *param0, u32 param1) { - sub_0200710C(param0->unk_338, 7, param0->unk_4C, 3, 0, 0, 1, 93); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_338, 7, param0->unk_4C, 3, 0, 0, 1, 93); return; } static void ov105_02244C0C(UnkStruct_ov105_02241FF4 *param0, u32 param1) { if (ov104_0223AED4(param0->unk_09) == 0) { - sub_0200710C(param0->unk_338, 10, param0->unk_4C, 3, 0, 0, 1, 93); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_338, 10, param0->unk_4C, 3, 0, 0, 1, 93); } else { - sub_0200710C(param0->unk_338, 12, param0->unk_4C, 3, 0, 0, 1, 93); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_338, 12, param0->unk_4C, 3, 0, 0, 1, 93); } return; diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index d4500a2d15..8960d33772 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -1026,8 +1026,8 @@ static void ov106_0224273C(BgConfig *param0) static void ov106_0224283C(UnkStruct_ov106_02243118 *param0, u32 param1) { - sub_020070E8(param0->unk_29C, 23, param0->unk_48, param1, 0, 0, 1, 98); - sub_0200710C(param0->unk_29C, 24, param0->unk_48, param1, 0, 0, 1, 98); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_29C, 23, param0->unk_48, param1, 0, 0, 1, 98); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_29C, 24, param0->unk_48, param1, 0, 0, 1, 98); return; } @@ -1037,7 +1037,7 @@ static void ov106_02242884(void) void *v0; NNSG2dPaletteData *v1; - v0 = sub_02006F88(150, 134, &v1, 98); + v0 = Graphics_GetPlttData(150, 134, &v1, 98); DC_FlushRange(v1->pRawData, (sizeof(u16) * 16 * 6)); GX_LoadBGPltt(v1->pRawData, 0, (sizeof(u16) * 16 * 6)); @@ -1048,9 +1048,9 @@ static void ov106_02242884(void) static void ov106_022428B8(UnkStruct_ov106_02243118 *param0, u32 param1) { - sub_020070E8(param0->unk_29C, 125, param0->unk_48, param1, 0, 0, 1, 98); - sub_0200710C(param0->unk_29C, 126, param0->unk_48, param1, 0, 0, 1, 98); - sub_02007130(param0->unk_29C, 171, 4, 0, 0x20, 98); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_29C, 125, param0->unk_48, param1, 0, 0, 1, 98); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_29C, 126, param0->unk_48, param1, 0, 0, 1, 98); + Graphics_LoadPaletteFromOpenNARC(param0->unk_29C, 171, 4, 0, 0x20, 98); return; } diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index 19b29ea494..0671fd0110 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -1736,12 +1736,12 @@ static void ov107_02243444(BgConfig *param0) static void ov107_02243588 (UnkStruct_ov107_02241D6C * param0, u32 param1) { - sub_020070E8(param0->unk_440, 34, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_440, 34, param0->unk_4C, param1, 0, 0, 1, 100); if (ov104_0223BA14(param0->unk_09) == 0) { - sub_0200710C(param0->unk_440, 35, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_440, 35, param0->unk_4C, param1, 0, 0, 1, 100); } else { - sub_0200710C(param0->unk_440, 36, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_440, 36, param0->unk_4C, param1, 0, 0, 1, 100); } return; @@ -1752,7 +1752,7 @@ static void ov107_022435FC (void) void * v0; NNSG2dPaletteData * v1; - v0 = sub_02006F88(150, 137, &v1, 100); + v0 = Graphics_GetPlttData(150, 137, &v1, 100); DC_FlushRange(v1->pRawData, (sizeof(u16) * 16 * 4)); GX_LoadBGPltt(v1->pRawData, 0, (sizeof(u16) * 16 * 4)); @@ -1763,8 +1763,8 @@ static void ov107_022435FC (void) static void ov107_02243630 (UnkStruct_ov107_02241D6C * param0, u32 param1) { - sub_020070E8(param0->unk_440, 34, param0->unk_4C, param1, 0, 0, 1, 100); - sub_0200710C(param0->unk_440, 38, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_440, 34, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_440, 38, param0->unk_4C, param1, 0, 0, 1, 100); return; } @@ -1774,7 +1774,7 @@ static void ov107_02243678 (void) void * v0; NNSG2dPaletteData * v1; - v0 = sub_02006F88(150, 137, &v1, 100); + v0 = Graphics_GetPlttData(150, 137, &v1, 100); DC_FlushRange(v1->pRawData, (sizeof(u16) * 16 * 4)); GX_LoadBGPltt(v1->pRawData, 0, (sizeof(u16) * 16 * 4)); @@ -1785,25 +1785,25 @@ static void ov107_02243678 (void) static void ov107_022436AC (UnkStruct_ov107_02241D6C * param0, u32 param1) { - sub_020070E8(param0->unk_440, 34, param0->unk_4C, param1, 0, 0, 1, 100); - sub_0200710C(param0->unk_440, 39, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_440, 34, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_440, 39, param0->unk_4C, param1, 0, 0, 1, 100); return; } static void ov107_022436F4 (UnkStruct_ov107_02241D6C * param0, u32 param1) { - sub_020070E8(param0->unk_440, 34, param0->unk_4C, param1, 0, 0, 1, 100); - sub_0200710C(param0->unk_440, 37, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_440, 34, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_440, 37, param0->unk_4C, param1, 0, 0, 1, 100); return; } static void ov107_0224373C (UnkStruct_ov107_02241D6C * param0, u32 param1) { - sub_020070E8(param0->unk_440, 125, param0->unk_4C, param1, 0, 0, 1, 100); - sub_0200710C(param0->unk_440, 126, param0->unk_4C, param1, 0, 0, 1, 100); - sub_02007130(param0->unk_440, 171, 4, 0, 0x20, 100); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_440, 125, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_440, 126, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadPaletteFromOpenNARC(param0->unk_440, 171, 4, 0, 0x20, 100); return; } diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index 5a58a075ad..300d50777c 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -1403,12 +1403,12 @@ static void ov107_02247340(BgConfig *param0) static void ov107_02247484 (UnkStruct_ov107_02246170 * param0, u32 param1) { - sub_020070E8(param0->unk_3E0, 44, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_3E0, 44, param0->unk_4C, param1, 0, 0, 1, 100); if (ov104_0223BA14(param0->unk_09) == 0) { - sub_0200710C(param0->unk_3E0, 40, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3E0, 40, param0->unk_4C, param1, 0, 0, 1, 100); } else { - sub_0200710C(param0->unk_3E0, 41, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3E0, 41, param0->unk_4C, param1, 0, 0, 1, 100); } return; @@ -1419,7 +1419,7 @@ static void ov107_022474F8 (void) void * v0; NNSG2dPaletteData * v1; - v0 = sub_02006F88(150, 138, &v1, 100); + v0 = Graphics_GetPlttData(150, 138, &v1, 100); DC_FlushRange(v1->pRawData, (sizeof(u16) * 16 * 4)); GX_LoadBGPltt(v1->pRawData, 0, (sizeof(u16) * 16 * 4)); @@ -1430,8 +1430,8 @@ static void ov107_022474F8 (void) static void ov107_0224752C (UnkStruct_ov107_02246170 * param0, u32 param1) { - sub_020070E8(param0->unk_3E0, 44, param0->unk_4C, param1, 0, 0, 1, 100); - sub_0200710C(param0->unk_3E0, 42, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_3E0, 44, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3E0, 42, param0->unk_4C, param1, 0, 0, 1, 100); return; } @@ -1441,7 +1441,7 @@ static void ov107_02247574 (void) void * v0; NNSG2dPaletteData * v1; - v0 = sub_02006F88(150, 138, &v1, 100); + v0 = Graphics_GetPlttData(150, 138, &v1, 100); DC_FlushRange(v1->pRawData, (sizeof(u16) * 16 * 4)); GX_LoadBGPltt(v1->pRawData, 0, (sizeof(u16) * 16 * 4)); @@ -1452,17 +1452,17 @@ static void ov107_02247574 (void) static void ov107_022475A8 (UnkStruct_ov107_02246170 * param0, u32 param1) { - sub_020070E8(param0->unk_3E0, 44, param0->unk_4C, param1, 0, 0, 1, 100); - sub_0200710C(param0->unk_3E0, 43, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_3E0, 44, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3E0, 43, param0->unk_4C, param1, 0, 0, 1, 100); return; } static void ov107_022475F0 (UnkStruct_ov107_02246170 * param0, u32 param1) { - sub_020070E8(param0->unk_3E0, 125, param0->unk_4C, param1, 0, 0, 1, 100); - sub_0200710C(param0->unk_3E0, 126, param0->unk_4C, param1, 0, 0, 1, 100); - sub_02007130(param0->unk_3E0, 171, 4, 0, 0x20, 100); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_3E0, 125, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3E0, 126, param0->unk_4C, param1, 0, 0, 1, 100); + Graphics_LoadPaletteFromOpenNARC(param0->unk_3E0, 171, 4, 0, 0x20, 100); return; } diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 9a4d72913c..c5107ec807 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -1027,7 +1027,7 @@ static void ov108_02242828(UnkStruct_ov108_02241DB0 *param0, u32 param1) { u32 v0; - sub_020070E8(param0->unk_3D0, 120, param0->unk_90, param1, 0, 0, 1, 103); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_3D0, 120, param0->unk_90, param1, 0, 0, 1, 103); if (ov104_0223C000(param0->unk_09) == 0) { v0 = 116; @@ -1035,7 +1035,7 @@ static void ov108_02242828(UnkStruct_ov108_02241DB0 *param0, u32 param1) v0 = 118; } - sub_0200710C(param0->unk_3D0, v0, param0->unk_90, param1, 0, 0, 1, 103); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3D0, v0, param0->unk_90, param1, 0, 0, 1, 103); return; } @@ -1049,7 +1049,7 @@ static void ov108_02242884(UnkStruct_ov108_02241DB0 *param0, u32 param1) v0 = 119; } - sub_0200710C(param0->unk_3D0, v0, param0->unk_90, param1, 0, 0, 1, 103); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3D0, v0, param0->unk_90, param1, 0, 0, 1, 103); return; } @@ -1058,7 +1058,7 @@ static void ov108_022428C0(void) void *v0; NNSG2dPaletteData *v1; - v0 = sub_02006F88(150, 167, &v1, 103); + v0 = Graphics_GetPlttData(150, 167, &v1, 103); DC_FlushRange(v1->pRawData, (sizeof(u16) * 16 * 7)); GX_LoadBGPltt(v1->pRawData, 0, (sizeof(u16) * 16 * 7)); @@ -1069,9 +1069,9 @@ static void ov108_022428C0(void) static void ov108_022428F4(UnkStruct_ov108_02241DB0 *param0, u32 param1) { - sub_020070E8(param0->unk_3D0, 122, param0->unk_90, param1, 0, 0, 1, 103); - sub_02007130(param0->unk_3D0, 168, 4, 0, (sizeof(u16) * 16 * 2), 103); - sub_0200710C(param0->unk_3D0, 121, param0->unk_90, param1, 0, 0, 1, 103); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_3D0, 122, param0->unk_90, param1, 0, 0, 1, 103); + Graphics_LoadPaletteFromOpenNARC(param0->unk_3D0, 168, 4, 0, (sizeof(u16) * 16 * 2), 103); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3D0, 121, param0->unk_90, param1, 0, 0, 1, 103); return; } diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 31c2a19666..1b17c9470b 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -530,7 +530,7 @@ static void ov109_021D41F8(UnkStruct_ov109_021D5140 *param0, NARC *param1) param0->unk_1C.unk_00 = 0; param0->unk_1C.unk_08 = 0; param0->unk_1C.unk_04 = 0; - param0->unk_1C.unk_0C = sub_020071EC(param1, 1, ¶m0->unk_1C.unk_10, 95); + param0->unk_1C.unk_0C = Graphics_GetPlttDataFromOpenNARC(param1, 1, ¶m0->unk_1C.unk_10, 95); param0->unk_4AA8 = 0; param0->unk_394 = NULL; param0->unk_10->unk_2C = 2; @@ -566,14 +566,14 @@ static void ov109_021D4300(UnkStruct_ov109_021D5140 *param0, NARC *param1) { BgConfig *v0 = param0->unk_14; - sub_02007130(param1, 0, 0, 0, 16 * 16 * 2, 95); - sub_02006E84(12, 12, 4, 0, 16 * 2, 95); + Graphics_LoadPaletteFromOpenNARC(param1, 0, 0, 0, 16 * 16 * 2, 95); + Graphics_LoadPalette(12, 12, 4, 0, 16 * 2, 95); Font_LoadScreenIndicatorsPalette(0, 13 * 0x20, 95); Font_LoadScreenIndicatorsPalette(4, 13 * 0x20, 95); - sub_02006E3C(12, 10, v0, 6, 0, 0, 1, 95); - sub_02006E60(12, 11, v0, 6, 0, 0, 1, 95); - sub_020070E8(param1, 2, v0, 1, 0, 32 * 8 * 0x20, 1, 95); - sub_0200710C(param1, 3, v0, 1, 0, 32 * 24 * 2, 1, 95); + Graphics_LoadTilesToBgLayer(12, 10, v0, 6, 0, 0, 1, 95); + Graphics_LoadTilemapToBgLayer(12, 11, v0, 6, 0, 0, 1, 95); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, v0, 1, 0, 32 * 8 * 0x20, 1, 95); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 3, v0, 1, 0, 32 * 24 * 2, 1, 95); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_0C->unk_14.unk_10), 95); sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 95); } @@ -1651,10 +1651,10 @@ static void ov109_021D5668(UnkStruct_ov109_021D5140 *param0) static void ov109_021D577C(UnkStruct_ov109_021D5140 *param0, NARC *param1) { - param0->unk_3A8[0] = sub_02006F88(104, 8, &(param0->unk_3B0[0]), 95); - param0->unk_3A8[1] = sub_020071EC(param1, 7, &(param0->unk_3B0[1]), 95); - param0->unk_398[0] = sub_02006F50(104, 32, 1, &(param0->unk_3A0[0]), 95); - param0->unk_398[1] = sub_020071B4(param1, 9, 1, &(param0->unk_3A0[1]), 95); + param0->unk_3A8[0] = Graphics_GetPlttData(104, 8, &(param0->unk_3B0[0]), 95); + param0->unk_3A8[1] = Graphics_GetPlttDataFromOpenNARC(param1, 7, &(param0->unk_3B0[1]), 95); + param0->unk_398[0] = Graphics_GetCharData(104, 32, 1, &(param0->unk_3A0[0]), 95); + param0->unk_398[1] = Graphics_GetCharDataFromOpenNARC(param1, 9, 1, &(param0->unk_3A0[1]), 95); } static const u16 Unk_ov109_021D5D9C[] = { diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 13d5a0a32c..0e88d91c31 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -437,8 +437,8 @@ static void ov110_021D123C (UnkStruct_ov110_021D0F78 * param0, u32 param1) v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 114); - sub_020070E8(v0, 124, param0->unk_0C, param1, 0, 0, 1, 114); - sub_0200710C(v0, 123, param0->unk_0C, param1, 0, 0, 1, 114); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 124, param0->unk_0C, param1, 0, 0, 1, 114); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 123, param0->unk_0C, param1, 0, 0, 1, 114); NARC_dtor(v0); return; @@ -449,7 +449,7 @@ static void ov110_021D128C (void) void * v0; NNSG2dPaletteData * v1; - v0 = sub_02006F88(150, 170, &v1, 114); + v0 = Graphics_GetPlttData(150, 170, &v1, 114); DC_FlushRange(v1->pRawData, (sizeof(u16) * 16 * 2)); GX_LoadBGPltt(v1->pRawData, 0, (sizeof(u16) * 16 * 2)); @@ -464,9 +464,9 @@ static void ov110_021D12C0 (UnkStruct_ov110_021D0F78 * param0, u32 param1) v0 = NARC_ctor(NARC_INDEX_GRAPHIC__POKETCH, 114); - sub_020070E8(v0, 10, param0->unk_0C, param1, 0, 0, 1, 114); - sub_0200710C(v0, 11, param0->unk_0C, param1, 0, 0, 1, 114); - sub_02007130(v0, 12, 4, 0, 0x20, 114); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 10, param0->unk_0C, param1, 0, 0, 1, 114); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 11, param0->unk_0C, param1, 0, 0, 1, 114); + Graphics_LoadPaletteFromOpenNARC(v0, 12, 4, 0, 0x20, 114); NARC_dtor(v0); return; diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index 48bea07e82..393ee36d27 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -1460,16 +1460,16 @@ static void ov111_021D20EC(BgConfig *param0) static void ov111_021D2248(UnkStruct_ov111_021D0F7C *param0, u32 param1) { - sub_020070E8(param0->unk_3E4, 35, param0->unk_58, param1, 0, 0, 0, 115); - sub_0200710C(param0->unk_3E4, 37, param0->unk_58, param1, 0, 0, 0, 115); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_3E4, 35, param0->unk_58, param1, 0, 0, 0, 115); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3E4, 37, param0->unk_58, param1, 0, 0, 0, 115); return; } static void ov111_021D228C(UnkStruct_ov111_021D0F7C *param0, u32 param1) { - sub_020070E8(param0->unk_3E4, 38, param0->unk_58, param1, 0, 0, 0, 115); - sub_0200710C(param0->unk_3E4, 40, param0->unk_58, param1, 0, 0, 0, 115); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_3E4, 38, param0->unk_58, param1, 0, 0, 0, 115); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3E4, 40, param0->unk_58, param1, 0, 0, 0, 115); return; } @@ -1479,7 +1479,7 @@ static void ov111_021D22D0(void) void *v0; NNSG2dPaletteData *v1; - v0 = sub_02006F88(184, 34, &v1, 115); + v0 = Graphics_GetPlttData(184, 34, &v1, 115); DC_FlushRange(v1->pRawData, (sizeof(u16) * 16 * 5)); GXS_LoadBGPltt(v1->pRawData, 0, (sizeof(u16) * 16 * 5)); @@ -1493,7 +1493,7 @@ static void ov111_021D2304(void) void *v0; NNSG2dPaletteData *v1; - v0 = sub_02006F88(184, 0, &v1, 115); + v0 = Graphics_GetPlttData(184, 0, &v1, 115); DC_FlushRange(v1->pRawData, (sizeof(u16) * 16 * 9)); GX_LoadBGPltt(v1->pRawData, 0, (sizeof(u16) * 16 * 10)); @@ -1504,16 +1504,16 @@ static void ov111_021D2304(void) static void ov111_021D233C(UnkStruct_ov111_021D0F7C *param0, u32 param1) { - sub_020070E8(param0->unk_3E4, 4, param0->unk_58, param1, 0, 0, 0, 115); - sub_0200710C(param0->unk_3E4, 6, param0->unk_58, param1, 0, 0, 0, 115); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_3E4, 4, param0->unk_58, param1, 0, 0, 0, 115); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3E4, 6, param0->unk_58, param1, 0, 0, 0, 115); return; } static void ov111_021D2380(UnkStruct_ov111_021D0F7C *param0, u32 param1) { - sub_020070E8(param0->unk_3E4, 7, param0->unk_58, param1, 0, 0, 0, 115); - sub_0200710C(param0->unk_3E4, 9, param0->unk_58, param1, 0, 0, 0, 115); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_3E4, 7, param0->unk_58, param1, 0, 0, 0, 115); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_3E4, 9, param0->unk_58, param1, 0, 0, 0, 115); return; } @@ -2123,7 +2123,7 @@ static void ov111_021D2E28(UnkStruct_ov111_021D0F7C *param0) static void ov111_021D2E4C(UnkStruct_ov111_021D0F7C *param0) { - param0->unk_3F0 = sub_02006F50(184, 7, 0, ¶m0->unk_3F4, 115); + param0->unk_3F0 = Graphics_GetCharData(184, 7, 0, ¶m0->unk_3F4, 115); Bg_LoadTiles(param0->unk_58, 0, param0->unk_3F4->pRawData, param0->unk_3F4->szByte, 0); Bg_CopyTilemapBufferToVRAM(param0->unk_58, 0); diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index 2a23940e6f..09da2f3f83 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -507,17 +507,17 @@ static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 param1) } { - sub_02007130(param0->unk_1A4, 0, 0, 0, 0, param1); + Graphics_LoadPaletteFromOpenNARC(param0->unk_1A4, 0, 0, 0, 0, param1); Font_LoadScreenIndicatorsPalette(0, 10 * 32, param1); - sub_020070E8(param0->unk_1A4, 1, param0->unk_00, 1, 0, 0, 0, param1); - sub_0200710C(param0->unk_1A4, 3, param0->unk_00, 1, 0, 0, 0, param1); - sub_0200710C(param0->unk_1A4, 4, param0->unk_00, 2, 0, 0, 0, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A4, 1, param0->unk_00, 1, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A4, 3, param0->unk_00, 1, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A4, 4, param0->unk_00, 2, 0, 0, 0, param1); } { - sub_02007130(param0->unk_1A4, 0, 4, 0, 0, param1); - sub_020070E8(param0->unk_1A4, 2, param0->unk_00, 4, 0, 0, 0, param1); - sub_0200710C(param0->unk_1A4, 6, param0->unk_00, 4, 0, 0, 0, param1); + Graphics_LoadPaletteFromOpenNARC(param0->unk_1A4, 0, 4, 0, 0, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A4, 2, param0->unk_00, 4, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A4, 6, param0->unk_00, 4, 0, 0, 0, param1); } } @@ -580,7 +580,7 @@ static void ov112_0225CC38(UnkStruct_ov112_0225C9BC *param0) static void ov112_0225CC64(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2) { - param0->unk_00 = sub_020071D0(param1->unk_1A4, 5, 0, ¶m0->unk_04, param2); + param0->unk_00 = Graphics_GetScrnDataFromOpenNARC(param1->unk_1A4, 5, 0, ¶m0->unk_04, param2); } static void ov112_0225CC84(UnkStruct_ov112_0225CC84 *param0) @@ -957,7 +957,7 @@ static void ov112_0225D1EC(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov112_022 } param0->unk_90 = Strbuf_Init(256, param2); - param0->unk_94 = sub_020071EC(param1->unk_1A4, 0, ¶m0->unk_98, param2); + param0->unk_94 = Graphics_GetPlttDataFromOpenNARC(param1->unk_1A4, 0, ¶m0->unk_98, param2); 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)); diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index ea7342c2a6..75798cf1e1 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -889,18 +889,18 @@ static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1) u16 *v1; PaletteData_LoadBufferFromFileStart(param0->unk_0C, 187, 19, 118, 0, 0x200 - 0x40, 0); - sub_020070E8(param1, 18, param0->unk_08, 2, 0, 0, 0, 118); - sub_0200710C(param1, 17, param0->unk_08, 2, 0, 0, 0, 118); - sub_0200710C(param1, 20, param0->unk_08, 3, 0, 0, 0, 118); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 18, param0->unk_08, 2, 0, 0, 0, 118); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 17, param0->unk_08, 2, 0, 0, 0, 118); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 20, param0->unk_08, 3, 0, 0, 0, 118); PaletteData_LoadBufferFromFileStart(param0->unk_0C, 187, 23, 118, 1, 0, 0); if (param0->unk_00->unk_04 == 0) { PaletteData_CopyBuffer(param0->unk_0C, 1, 16 * 1, 1, 16 * 0, 0x20); } - sub_020070E8(param1, 22, param0->unk_08, 6, 0, 0, 0, 118); - sub_0200710C(param1, 21, param0->unk_08, 6, 0, 0, 0, 118); - sub_0200710C(param1, 24, param0->unk_08, 7, 0, 0, 0, 118); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 22, param0->unk_08, 6, 0, 0, 0, 118); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 21, param0->unk_08, 6, 0, 0, 0, 118); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 24, param0->unk_08, 7, 0, 0, 0, 118); v1 = Bg_GetTilemapBuffer(param0->unk_08, 6); diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index 2acd15f3e7..261f9928d0 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -1679,12 +1679,12 @@ static void ov114_0225D5BC(UnkStruct_ov114_0225D678 *param0, u32 param1) v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__WIFI_LOBBY_MINIGAME__WLMNGM_TOOL, param1); - sub_02007130(v0, 4, 0, 0, 9 * 32, param1); - sub_020070E8(v0, 6, param0->unk_30.unk_00, 1, 0, 0, 0, param1); + Graphics_LoadPaletteFromOpenNARC(v0, 4, 0, 0, 9 * 32, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 6, param0->unk_30.unk_00, 1, 0, 0, 0, param1); - param0->unk_260 = sub_020071D0(v0, 9, 0, ¶m0->unk_264, param1); + param0->unk_260 = Graphics_GetScrnDataFromOpenNARC(v0, 9, 0, ¶m0->unk_264, param1); - sub_0200710C(v0, 8, param0->unk_30.unk_00, 3, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 8, param0->unk_30.unk_00, 3, 0, 0, 0, param1); ov114_0225E550(v0, param0->unk_04, param1); param0->unk_22C = ov114_0225CD54(¶m0->unk_214, v0, 11, 5, 12, 13, 14, 5000, param1); @@ -2297,8 +2297,8 @@ static void ov114_0225E1A4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_022 param0->unk_10 = param3; GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); - sub_020070E8(param4, 7, param1->unk_00, 0, 0, 0, 0, param5); - sub_0200710C(param4, 10, param1->unk_00, 0, 0, 0, 0, param5); + Graphics_LoadTilesToBgLayerFromOpenNARC(param4, 7, param1->unk_00, 0, 0, 0, 0, param5); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param4, 10, param1->unk_00, 0, 0, 0, 0, param5); } static void ov114_0225E234(UnkStruct_ov114_0225E1A4 *param0) @@ -2465,8 +2465,8 @@ static void ov114_0225E550(NARC *param0, u32 param1, u32 param2) break; } - sub_02007148(param0, 5, 0, v0 * 32, 5 * 32, 32, param2); - sub_02007148(param0, 5, 4, v0 * 32, 5 * 32, 32, param2); + Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(param0, 5, 0, v0 * 32, 5 * 32, 32, param2); + Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(param0, 5, 4, v0 * 32, 5 * 32, 32, param2); } static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 param3) @@ -2547,21 +2547,21 @@ static void ov114_0225E744(UnkStruct_ov114_0225E854 *param0, u32 param1) v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__WIFI_LOBBY_MINIGAME__WLMNGM_TOOL, param1); - sub_02007130(v0, 4, 0, 0, 9 * 32, param1); - sub_02007130(v0, 4, 4, 0, 9 * 32, param1); - sub_020070E8(v0, 6, param0->unk_4C.unk_00, 1, 0, 0, 0, param1); - sub_020070E8(v0, 6, param0->unk_4C.unk_00, 5, 0, 0x4000, 0, param1); + Graphics_LoadPaletteFromOpenNARC(v0, 4, 0, 0, 9 * 32, param1); + Graphics_LoadPaletteFromOpenNARC(v0, 4, 4, 0, 9 * 32, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 6, param0->unk_4C.unk_00, 1, 0, 0, 0, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 6, param0->unk_4C.unk_00, 5, 0, 0x4000, 0, param1); { int v1; for (v1 = 0; v1 < 1; v1++) { - param0->unk_2B8[v1] = sub_020071D0(v0, 9 + v1, 0, ¶m0->unk_2BC[v1], param1); + param0->unk_2B8[v1] = Graphics_GetScrnDataFromOpenNARC(v0, 9 + v1, 0, ¶m0->unk_2BC[v1], param1); } } - sub_0200710C(v0, 8, param0->unk_4C.unk_00, 3, 0, 0, 0, param1); - sub_0200710C(v0, 8, param0->unk_4C.unk_00, 5, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 8, param0->unk_4C.unk_00, 3, 0, 0, 0, param1); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 8, param0->unk_4C.unk_00, 5, 0, 0, 0, param1); ov114_0225E550(v0, param0->unk_07, param1); @@ -3142,7 +3142,7 @@ static void ov114_0225F124(SysTask *param0, void *param1) static void ov114_0225F148(UnkStruct_ov114_0225E854 *param0, NARC *param1, u32 param2) { - param0->unk_6B8 = sub_020071EC(param1, 5, ¶m0->unk_6BC, param2); + param0->unk_6B8 = Graphics_GetPlttDataFromOpenNARC(param1, 5, ¶m0->unk_6BC, param2); } static void ov114_0225F168(UnkStruct_ov114_0225E854 *param0) @@ -3369,9 +3369,9 @@ static void ov114_0225F484(UnkStruct_ov114_0225F578 *param0, UnkStruct_ov114_022 memset(param0, 0, sizeof(UnkStruct_ov114_0225F578)); { - sub_02007130(param4, 24, 0, (13 + 1) * 32, 32, param5); - sub_020070E8(param4, 25, param1->unk_00, 2, ((1 + (18 + 12)) + (27 * 4)), 0, 0, param5); - param0->unk_00 = sub_020071D0(param4, 26, 0, ¶m0->unk_04, param5); + Graphics_LoadPaletteFromOpenNARC(param4, 24, 0, (13 + 1) * 32, 32, param5); + Graphics_LoadTilesToBgLayerFromOpenNARC(param4, 25, param1->unk_00, 2, ((1 + (18 + 12)) + (27 * 4)), 0, 0, param5); + param0->unk_00 = Graphics_GetScrnDataFromOpenNARC(param4, 26, 0, ¶m0->unk_04, param5); } { diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index 076c106f75..3b74523485 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -1430,9 +1430,9 @@ static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_022 MessageLoader_GetStrbuf(param1->unk_08, 0, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_0C, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); Strbuf_Free(v0); - sub_020070E8(param5, 18, param1->unk_00, 2, 0, 0, 0, param6); - sub_0200710C(param5, 20 + (param3 - 2), param1->unk_00, 2, 0, 0, 0, param6); - sub_02007130(param5, 19, 0, 0 * 32, (3 + 1) * 32, param6); + Graphics_LoadTilesToBgLayerFromOpenNARC(param5, 18, param1->unk_00, 2, 0, 0, 0, param6); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param5, 20 + (param3 - 2), param1->unk_00, 2, 0, 0, 0, param6); + Graphics_LoadPaletteFromOpenNARC(param5, 19, 0, 0 * 32, (3 + 1) * 32, param6); { int v2; @@ -3301,12 +3301,12 @@ static void ov115_02263CD8(UnkStruct_ov115_02261ADC *param0, NARC *param1, u32 p 11, }; - sub_020070E8(param1, 12, param0->unk_00, 4, 0, 0, 0, param3); - sub_0200710C(param1, 14, param0->unk_00, 7, 0, 0, 0, param3); - sub_0200710C(param1, 15, param0->unk_00, 6, 0, 0, 0, param3); - 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); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 12, param0->unk_00, 4, 0, 0, 0, param3); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 14, param0->unk_00, 7, 0, 0, 0, param3); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 15, param0->unk_00, 6, 0, 0, 0, param3); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 16, param0->unk_00, 5, 0, 0, 0, param3); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 17, param0->unk_00, 4, 0, 0, 0, param3); + Graphics_LoadPaletteFromOpenNARC(param1, 13, 4, 0, 12 * 32, param3); 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)); diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c index daab0de656..214745a87a 100644 --- a/src/overlay116/ov116_02261870.c +++ b/src/overlay116/ov116_02261870.c @@ -497,13 +497,13 @@ void ov116_022620AC(UnkStruct_ov116_0226139C *param0, UnkStruct_ov116_02262A8C * switch (param1->unk_04) { case 2: - sub_0200710C(param1->unk_14->unk_00, 79, param1->unk_14->unk_10, 7, 0, 0, 0, 106); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1->unk_14->unk_00, 79, param1->unk_14->unk_10, 7, 0, 0, 0, 106); break; case 3: - sub_0200710C(param1->unk_14->unk_00, 80, param1->unk_14->unk_10, 7, 0, 0, 0, 106); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1->unk_14->unk_00, 80, param1->unk_14->unk_10, 7, 0, 0, 0, 106); break; case 4: - sub_0200710C(param1->unk_14->unk_00, 81, param1->unk_14->unk_10, 7, 0, 0, 0, 106); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1->unk_14->unk_00, 81, param1->unk_14->unk_10, 7, 0, 0, 0, 106); break; default: GF_ASSERT(0); @@ -570,7 +570,7 @@ void ov116_02262264(UnkStruct_ov116_02262A8C *param0) v1++; } - sub_0200710C(param0->unk_14->unk_00, 78, param0->unk_14->unk_10, 7, 0, 0, 0, 106); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_14->unk_00, 78, param0->unk_14->unk_10, 7, 0, 0, 0, 106); } void ov116_022622C8(UnkStruct_ov116_0226139C *param0) @@ -821,18 +821,18 @@ void ov116_022628B8(UnkStruct_ov116_0226139C *param0) PaletteData *v5 = param0->unk_48.unk_14; NARC *v6 = v0; - sub_020070E8(v6, 72, v2, 4, 0, 0, 0, 106); - sub_020070E8(v6, 75, v2, 5, 0, 0, 0, 106); - sub_0200710C(v6, 74, v2, 4, 0, 0, 0, 106); - sub_0200710C(v6, 76, v2, 5, 0, 0, 0, 106); - sub_0200710C(v6, 77, v2, 6, 0, 0, 0, 106); - sub_0200710C(v6, 78, v2, 7, 0, 0, 0, 106); + Graphics_LoadTilesToBgLayerFromOpenNARC(v6, 72, v2, 4, 0, 0, 0, 106); + Graphics_LoadTilesToBgLayerFromOpenNARC(v6, 75, v2, 5, 0, 0, 0, 106); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v6, 74, v2, 4, 0, 0, 0, 106); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v6, 76, v2, 5, 0, 0, 0, 106); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v6, 77, v2, 6, 0, 0, 0, 106); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v6, 78, v2, 7, 0, 0, 0, 106); PaletteData_LoadBufferFromFileStart(v5, 164, 73, 106, 1, 0x20 * 5, 0); - sub_020070E8(v6, 5, v2, 3, 0, 0, 0, 106); - sub_020070E8(v6, 8, v2, 1, 0, 0, 0, 106); - sub_0200710C(v6, 7, v2, 3, 0, 0, 0, 106); - sub_0200710C(v6, 9, v2, 1, 0, 0, 0, 106); - sub_0200710C(v6, 10, v2, 2, 0, 0, 0, 106); + Graphics_LoadTilesToBgLayerFromOpenNARC(v6, 5, v2, 3, 0, 0, 0, 106); + Graphics_LoadTilesToBgLayerFromOpenNARC(v6, 8, v2, 1, 0, 0, 0, 106); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v6, 7, v2, 3, 0, 0, 0, 106); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v6, 9, v2, 1, 0, 0, 0, 106); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v6, 10, v2, 2, 0, 0, 0, 106); PaletteData_LoadBufferFromFileStart(v5, 164, 6, 106, 0, 0x20, 0); PaletteData_LoadBufferFromFileStart(v5, 14, 7, 106, 1, 0x20, 14 * 16); PaletteData_LoadBufferFromFileStart(v5, 38, Window_FramePalette(), 106, 1, 0x20, 13 * 16); diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index d59ac21818..f2136bbf9a 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -1048,10 +1048,10 @@ static void ov117_022619F8(UnkStruct_ov117_02261280 *param0) static void ov117_02261A2C(UnkStruct_ov117_02261280 *param0, NARC *param1) { PaletteData_LoadBufferFromFileStart(param0->unk_8C, 173, 4, 110, 0, 0, 0); - sub_020070E8(param1, 2, param0->unk_2C, 3, 0, 0, 0, 110); - sub_0200710C(param1, 3, param0->unk_2C, 3, 0, 0, 0, 110); - sub_020070E8(param1, 0, param0->unk_2C, 2, 0, 0, 0, 110); - sub_0200710C(param1, 1, param0->unk_2C, 2, 0, 0, 0, 110); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, param0->unk_2C, 3, 0, 0, 0, 110); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 3, param0->unk_2C, 3, 0, 0, 0, 110); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 0, param0->unk_2C, 2, 0, 0, 0, 110); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 1, param0->unk_2C, 2, 0, 0, 0, 110); PaletteData_FillBufferRange(param0->unk_8C, 0, 2, 0x0, 0, 1); } @@ -1064,24 +1064,24 @@ static void ov117_02261AC8(UnkStruct_ov117_02261280 *param0, NARC *param1) { PaletteData_LoadBufferFromFileStart(param0->unk_8C, 173, 5, 110, 1, 5 * 0x20, 0); PaletteData_LoadBufferFromFile(param0->unk_8C, 173, 6, 110, 1, (0x20 * 10), 6 * 16, 6 * 16); - sub_020070E8(param1, 13, param0->unk_2C, 6, 0, 0, 0, 110); - sub_0200710C(param1, 14, param0->unk_2C, 6, 0, 0, 0, 110); - sub_020070E8(param1, 18, param0->unk_2C, 5, 0, 0, 0, 110); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 13, param0->unk_2C, 6, 0, 0, 0, 110); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 14, param0->unk_2C, 6, 0, 0, 0, 110); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 18, param0->unk_2C, 5, 0, 0, 0, 110); switch (param0->unk_00->unk_30) { case 2: - sub_0200710C(param1, 15, param0->unk_2C, 5, 0, 0, 0, 110); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 15, param0->unk_2C, 5, 0, 0, 0, 110); break; case 3: - sub_0200710C(param1, 16, param0->unk_2C, 5, 0, 0, 0, 110); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 16, param0->unk_2C, 5, 0, 0, 0, 110); break; default: - sub_0200710C(param1, 17, param0->unk_2C, 5, 0, 0, 0, 110); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 17, param0->unk_2C, 5, 0, 0, 0, 110); break; } - sub_020070E8(param1, 18, param0->unk_2C, 4, 0, 0, 0, 110); - sub_0200710C(param1, 19, param0->unk_2C, 4, 0, 0, 0, 110); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 18, param0->unk_2C, 4, 0, 0, 0, 110); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 19, param0->unk_2C, 4, 0, 0, 0, 110); ov117_02264AF0(param0); ov117_02264AB0(param0); diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c index c3b623a230..d3736683ec 100644 --- a/src/overlay117/ov117_02263AF0.c +++ b/src/overlay117/ov117_02263AF0.c @@ -391,8 +391,8 @@ void ov117_02263AF0(BgConfig *param0, int param1, int param2, UnkStruct_ov117_02 v0 = NARC_ctor(NARC_INDEX_APPLICATION__BALLOON__GRAPHIC__BALLOON_GRA, 110); - sub_020070E8(v0, Unk_ov117_02266BEC[param2].unk_00, param0, 7, 0, 0, 0, 110); - sub_0200710C(v0, Unk_ov117_02266BEC[param2].unk_02, param0, 7, 0, 0, 0, 110); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, Unk_ov117_02266BEC[param2].unk_00, param0, 7, 0, 0, 0, 110); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, Unk_ov117_02266BEC[param2].unk_02, param0, 7, 0, 0, 0, 110); NARC_dtor(v0); MI_CpuClear8(param3, sizeof(UnkStruct_ov117_02263DAC)); diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index 2be2eb80a7..ebe854c994 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -387,8 +387,8 @@ void ov119_021D1308(BgConfig *param0, PaletteData *param1) int v4 = 3; int v5 = 71; - sub_02006E3C(v0, v1, param0, v4, 0, 0, 1, v5); - sub_02006E60(v0, v2, param0, v4, 0, 0, 1, v5); + Graphics_LoadTilesToBgLayer(v0, v1, param0, v4, 0, 0, 1, v5); + Graphics_LoadTilemapToBgLayer(v0, v2, param0, v4, 0, 0, 1, v5); PaletteData_LoadBufferFromFileStart(param1, v0, v3, v5, 0, 0x20 * 2, 0); } @@ -401,8 +401,8 @@ void ov119_021D135C(BgConfig *param0, PaletteData *param1) int v4 = 4; int v5 = 71; - sub_02006E3C(v0, v1, param0, v4, 0, 0, 1, v5); - sub_02006E60(v0, v2, param0, v4, 0, 0, 1, v5); + Graphics_LoadTilesToBgLayer(v0, v1, param0, v4, 0, 0, 1, v5); + Graphics_LoadTilemapToBgLayer(v0, v2, param0, v4, 0, 0, 1, v5); PaletteData_LoadBufferFromFileStart(param1, v0, v3, v5, 1, 0x20 * 1, 0); } diff --git a/src/palette.c b/src/palette.c index 72a2d1d97c..a101cd4d32 100644 --- a/src/palette.c +++ b/src/palette.c @@ -70,7 +70,7 @@ void PaletteData_LoadBuffer(PaletteData *paletteData, const void *src, enum Pale void PaletteData_LoadBufferFromFile(PaletteData *paletteData, u32 narcID, u32 narcMemberIdx, u32 heapID, enum PaletteBufferID bufferID, u32 srcSize, u16 destStart, u16 srcStart) { NNSG2dPaletteData *palette; - void *ptr = sub_02006F88(narcID, narcMemberIdx, &palette, heapID); + void *ptr = Graphics_GetPlttData(narcID, narcMemberIdx, &palette, heapID); GF_ASSERT(ptr != NULL); @@ -122,7 +122,7 @@ void PaletteData_LoadBufferFromHardware(PaletteData *paletteData, enum PaletteBu void LoadPaletteFromFile(u32 narcID, u32 narcMemberIdx, u32 heapID, u32 size, u16 start, void *dest) { NNSG2dPaletteData *palette; - void *ptr = sub_02006F88(narcID, narcMemberIdx, &palette, heapID); + void *ptr = Graphics_GetPlttData(narcID, narcMemberIdx, &palette, heapID); GF_ASSERT(ptr != NULL); @@ -594,7 +594,7 @@ void TintPalette(u16 *palette, int numColorsToTint, int tintR, int tintG, int ti void PaletteData_LoadBufferFromFileStartWithTint(PaletteData *paletteData, u32 narcID, u32 narcMemberIdx, u32 heapID, enum PaletteBufferID bufferID, u32 size, u16 start, int r, int g, int b) { NNSG2dPaletteData *palette; - void *ptr = sub_02006F88(narcID, narcMemberIdx, &palette, heapID); + void *ptr = Graphics_GetPlttData(narcID, narcMemberIdx, &palette, heapID); GF_ASSERT(ptr != NULL); diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c index b4ce86e385..124a08a36b 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_app.c @@ -460,16 +460,16 @@ static void sub_0208C76C(BgConfig *param0) static void sub_0208C7AC(PokemonSummaryApp *param0, NARC *param1) { - sub_020070E8(param1, 0, param0->bgl, 3, 0, 0, 0, 19); - sub_0200710C(param1, 3, param0->bgl, 3, 0, 0, 0, 19); - sub_02007130(param1, 1, 0, 0, 0, 19); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 0, param0->bgl, 3, 0, 0, 0, 19); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 3, param0->bgl, 3, 0, 0, 0, 19); + Graphics_LoadPaletteFromOpenNARC(param1, 1, 0, 0, 0, 19); - sub_0200710C(param1, 11, param0->bgl, 2, 0, 0, 0, 19); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 11, param0->bgl, 2, 0, 0, 0, 19); - sub_020070E8(param1, 2, param0->bgl, 4, 0, 0, 0, 19); - sub_020070E8(param1, 16, param0->bgl, 5, 0, 0, 0, 19); - sub_0200710C(param1, 15, param0->bgl, 5, 0, 0, 0, 19); - sub_02007130(param1, 14, 4, 0, 0, 19); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, param0->bgl, 4, 0, 0, 0, 19); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 16, param0->bgl, 5, 0, 0, 0, 19); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 15, param0->bgl, 5, 0, 0, 0, 19); + Graphics_LoadPaletteFromOpenNARC(param1, 14, 4, 0, 0, 19); } static void sub_0208C86C(void) diff --git a/src/text.c b/src/text.c index db6b9a5903..5933628e4a 100644 --- a/src/text.c +++ b/src/text.c @@ -324,7 +324,7 @@ static u8 *Text_LoadScreenIndicatorGfx(void) NNSG2dCharacterData *g2dCharData; u8 *gfx = Heap_AllocFromHeap(HEAP_ID_SYSTEM, 24 * 64); // These numbers are file dimensions. Curiously, this only loads the bottom-screen indicators. - void *ncgr = sub_02006F50(NARC_INDEX_GRAPHIC__PL_FONT, 5, FALSE, &g2dCharData, HEAP_ID_SYSTEM); + void *ncgr = Graphics_GetCharData(NARC_INDEX_GRAPHIC__PL_FONT, 5, FALSE, &g2dCharData, HEAP_ID_SYSTEM); MI_CpuCopy32(g2dCharData->pRawData, gfx, 24 * 64); Heap_FreeToHeap(ncgr); diff --git a/src/unk_0200C440.c b/src/unk_0200C440.c index 66a19005e5..4479231297 100644 --- a/src/unk_0200C440.c +++ b/src/unk_0200C440.c @@ -36,7 +36,7 @@ UnkStruct_0200C440 *sub_0200C440(u32 param0, u32 param1, u32 param2, u32 param3) u32 v1; u8 *v2; - v0->unk_00 = sub_02006F50(14, 4, 1, &v0->unk_04, param3); + v0->unk_00 = Graphics_GetCharData(14, 4, 1, &v0->unk_04, param3); v2 = v0->unk_04->pRawData; for (v1 = 0; v1 < v0->unk_04->szByte; v1++) { diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c index f85afb5bf5..dddc564919 100644 --- a/src/unk_0200DA60.c +++ b/src/unk_0200DA60.c @@ -82,9 +82,9 @@ static const SpriteTemplate Unk_020E5040 = { 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); + Graphics_LoadTilesToBgLayer(38, 0, param0, param1, param2, 0, 0, param4); } else { - sub_02006E3C(38, 1, param0, param1, param2, 0, 0, param4); + Graphics_LoadTilesToBgLayer(38, 1, param0, param1, param2, 0, 0, param4); } } @@ -103,7 +103,7 @@ void sub_0200DAA4(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, v0 = 1; } - sub_02006E3C(38, v0, param0, param1, param2, 0, 0, param5); + Graphics_LoadTilesToBgLayer(38, v0, param0, param1, param2, 0, 0, param5); if (param4 == 2) { v0 = 45; @@ -112,9 +112,9 @@ void sub_0200DAA4(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, } if (param1 < 4) { - sub_02006E84(38, v0, 0, param3 * 0x20, 0x20, param5); + Graphics_LoadPalette(38, v0, 0, param3 * 0x20, 0x20, param5); } else { - sub_02006E84(38, v0, 4, param3 * 0x20, 0x20, param5); + Graphics_LoadPalette(38, v0, 4, param3 * 0x20, 0x20, param5); } } @@ -164,12 +164,12 @@ u32 sub_0200DD08(u32 param0) 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); + Graphics_LoadTilesToBgLayer(38, sub_0200DD04(param4), param0, param1, param2, 0, 0, param5); if (param1 < 4) { - sub_02006E84(38, sub_0200DD08(param4), 0, param3 * 0x20, 0x20, param5); + Graphics_LoadPalette(38, sub_0200DD08(param4), 0, param3 * 0x20, 0x20, param5); } else { - sub_02006E84(38, sub_0200DD08(param4), 4, param3 * 0x20, 0x20, param5); + Graphics_LoadPalette(38, sub_0200DD08(param4), 4, param3 * 0x20, 0x20, param5); } } @@ -255,7 +255,7 @@ static void sub_0200E130(Window *param0, u16 param1) { NNSG2dCharacterData *v7; - v4 = sub_02006F50(38, 22, 0, &v7, v0); + v4 = Graphics_GetCharData(38, 22, 0, &v7, v0); v3 = (u8 *)v7->pRawData; } @@ -281,7 +281,7 @@ void sub_0200E218(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 v3; u8 v4, v5; - v0 = sub_02006F50(38, sub_0200DD04(param4), 0, &v1, param5); + v0 = Graphics_GetCharData(38, sub_0200DD04(param4), 0, &v1, param5); v2 = Heap_AllocFromHeap(param5, 0x20 * 18); memcpy(v2, v1->pRawData, 0x20 * 18); @@ -308,7 +308,7 @@ void sub_0200E218(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, void sub_0200E2A4(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u16 param5, u32 param6) { - sub_02006E3C( + Graphics_LoadTilesToBgLayer( 36, 0, param0, param1, param2, (18 + 12) * 0x20, 0, param6); { @@ -337,7 +337,7 @@ static void sub_0200E31C(BgConfig *param0, u8 param1, u16 param2, u8 param3, u16 param4 += 2; } - sub_02006E3C(36, param4, param0, param1, param2, 24 * 0x20, 0, param5); + Graphics_LoadTilesToBgLayer(36, param4, param0, param1, param2, 24 * 0x20, 0, param5); } static void sub_0200E354(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) @@ -446,7 +446,7 @@ void *sub_0200E7FC(Window *param0, u32 param1) { NNSG2dCharacterData *v8; - v5 = sub_02006F50(38, 23, 0, &v8, v1); + v5 = Graphics_GetCharData(38, 23, 0, &v8, v1); v3 = (u8 *)v8->pRawData; } diff --git a/src/unk_02012744.c b/src/unk_02012744.c index 5b7065f5fe..1dcebb5cd5 100644 --- a/src/unk_02012744.c +++ b/src/unk_02012744.c @@ -100,7 +100,7 @@ UnkStruct_02012744 *sub_02012744(int param0, int param1) GF_ASSERT(v0); for (v1 = 0; v1 < 12; v1++) { - v0->unk_00[v1] = sub_02006FA0( + v0->unk_00[v1] = Graphics_GetCellBank( 35, v1, 0, &v0->unk_30[v1], param1); GF_ASSERT(v0->unk_00[v1]); diff --git a/src/unk_02015920.c b/src/unk_02015920.c index a5f3a8d176..7972d316fe 100644 --- a/src/unk_02015920.c +++ b/src/unk_02015920.c @@ -291,7 +291,7 @@ static void sub_02015C38(UnkStruct_02015C38 *param0, const UnkStruct_02015B14 *p param0->unk_35 = param1->unk_2D; for (v0 = 0; v0 < 4; v0++) { - param0->unk_08[v0] = sub_02006F6C(param1->unk_08, param1->unk_0C[v0], 1, ¶m0->unk_18[v0], param2); + param0->unk_08[v0] = Graphics_GetScrnData(param1->unk_08, param1->unk_0C[v0], 1, ¶m0->unk_18[v0], param2); sub_02015F34(param0->unk_18[v0], param1->unk_1C); sub_02015F54(param0->unk_18[v0], param1->unk_20); @@ -371,7 +371,7 @@ static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_02015DCC)); memset(v0, 0, sizeof(UnkStruct_02015DCC)); - v0->unk_08 = sub_02006F50(param0, param1, 1, &v0->unk_04, param5); + v0->unk_08 = Graphics_GetCharData(param0, param1, 1, &v0->unk_04, param5); v0->unk_00 = param2; v0->unk_0C = param3; v0->unk_10 = param4; @@ -386,7 +386,7 @@ static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 par v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_02015E1C)); memset(v0, 0, sizeof(UnkStruct_02015E1C)); - v0->unk_04 = sub_02006F88(param0, param1, &v0->unk_00, param5); + v0->unk_04 = Graphics_GetPlttData(param0, param1, &v0->unk_00, param5); v0->unk_08 = param2; v0->unk_0C = param3; v0->unk_10 = param4; diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index 58fbb38153..9977429919 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -99,7 +99,7 @@ static void sub_020528D0(BgConfig *param0) GXLayers_SetBanks(&v0); SetAllGraphicsModes(&v1); Bg_InitFromTemplate(param0, 3, &v2, 0); - sub_02006E84(14, 6, 0, 13 * 0x20, 0x20, 11); + Graphics_LoadPalette(14, 6, 0, 13 * 0x20, 0x20, 11); } static void sub_02052914(FieldSystem *fieldSystem, TaskManager *param1) diff --git a/src/unk_0205C980.c b/src/unk_0205C980.c index 40092b380c..94c5bfc879 100644 --- a/src/unk_0205C980.c +++ b/src/unk_0205C980.c @@ -102,7 +102,7 @@ u16 *sub_0205CA4C(int param0) u16 *v4, *v5; int v6; - v0 = sub_02006F88(86, 7, &v2, param0); + v0 = Graphics_GetPlttData(86, 7, &v2, param0); v4 = Heap_AllocFromHeap(param0, 16 * 18 * 2); v5 = (u16 *)v2->pRawData; diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 8772b214df..2e6b443c60 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -886,8 +886,8 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1) v4 = Options_Frame(param0->unk_2C); sub_0200E218(param1, 1, 1, 10, v4, param0->unk_5C); - sub_02006E3C(v5, v6, param1, v9, 0, 0, 1, param0->unk_5C); - sub_02006E60(v5, v7, param1, v9, 0, 0, 1, param0->unk_5C); + Graphics_LoadTilesToBgLayer(v5, v6, param1, v9, 0, 0, 1, param0->unk_5C); + Graphics_LoadTilemapToBgLayer(v5, v7, param1, v9, 0, 0, 1, param0->unk_5C); PaletteData_LoadBufferFromFileStart(param0->unk_14, v5, v8, param0->unk_5C, 0, 0x20 * 2, 0); PaletteData_LoadBufferFromFileStart(param0->unk_14, 38, sub_0200DD08(v4), param0->unk_5C, 0, 0x20, 10 * 0x10); PaletteData_LoadBufferFromFileStart(param0->unk_14, 14, 7, param0->unk_5C, 0, 0x20, 0xb * 0x10); @@ -902,8 +902,8 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1) int v13 = 12; int v14 = 4; - sub_02006E3C(v10, v11, param1, v14, 0, 0, 1, param0->unk_5C); - sub_02006E60(v10, v12, param1, v14, 0, 0, 1, param0->unk_5C); + Graphics_LoadTilesToBgLayer(v10, v11, param1, v14, 0, 0, 1, param0->unk_5C); + Graphics_LoadTilemapToBgLayer(v10, v12, param1, v14, 0, 0, 1, param0->unk_5C); PaletteData_LoadBufferFromFileStart(param0->unk_14, v10, v13, param0->unk_5C, 1, 0x20 * 1, 0); } diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index b3a1110d6b..7ce9ae3251 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -908,8 +908,8 @@ static void sub_0207EB64(GenericPointerData *param0) static void sub_0207EB6C(GameWindowLayout *param0, NARC *param1) { - sub_020070E8(param1, 15, param0->unk_00, 3, 0, 0, 0, 12); - sub_0200710C(param1, 17, param0->unk_00, 3, 0, 0, 0, 12); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 15, param0->unk_00, 3, 0, 0, 0, 12); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 17, param0->unk_00, 3, 0, 0, 0, 12); { NNSG2dPaletteData *v0; @@ -928,11 +928,11 @@ static void sub_0207EB6C(GameWindowLayout *param0, NARC *param1) Font_LoadScreenIndicatorsPalette(0, 13 * 32, 12); sub_0200DAA4(param0->unk_00, 0, 1, 14, 0, 12); sub_0200DD0C(param0->unk_00, 0, (1 + 9), 15, Options_Frame(param0->unk_5A4->unk_0C), 12); - sub_020070E8(param1, 3, param0->unk_00, 4, 0, 0, 0, 12); - sub_02007130(param1, 4, 4, 0x20, 0x20, 12); - sub_020070E8(param1, 12, param0->unk_00, 5, 0, 0, 0, 12); - sub_0200710C(param1, 14, param0->unk_00, 5, 0, 0, 0, 12); - sub_02007130(param1, 13, 4, 0, 0x20, 12); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 3, param0->unk_00, 4, 0, 0, 0, 12); + Graphics_LoadPaletteFromOpenNARC(param1, 4, 4, 0x20, 0x20, 12); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 12, param0->unk_00, 5, 0, 0, 0, 12); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 14, param0->unk_00, 5, 0, 0, 0, 12); + Graphics_LoadPaletteFromOpenNARC(param1, 13, 4, 0, 0x20, 12); LoadScreenDataFromNARC(12, param0->unk_264, param0->unk_324, param0->unk_3E4); Bg_MaskPalette(0, 0); Bg_MaskPalette(4, 0); diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index a09ba94b56..1acb0fe762 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -1503,19 +1503,19 @@ static void sub_0208769C(UnkStruct_02087A10 *param0, NARC *param1) { BgConfig *v0 = param0->unk_160; - sub_02007130(param1, 0, 0, 0, 16 * 3 * 2, 18); - sub_02006E84(12, 12, 4, 0, 16 * 2, 18); + Graphics_LoadPaletteFromOpenNARC(param1, 0, 0, 0, 16 * 3 * 2, 18); + Graphics_LoadPalette(12, 12, 4, 0, 16 * 2, 18); 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); - sub_0200710C(param1, 6, v0, 1, 0, (32 * 14 * 2), 1, 18); - sub_0200710C(param1, 7, v0, 0, 0, (32 * 14 * 2), 1, 18); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, v0, 2, 0, ((32 * 8) * 0x20), 1, 18); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 4, v0, 2, 0, 32 * 24 * 2, 1, 18); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 2, v0, 1, 0, 32 * 8 * 0x20, 1, 18); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 6, v0, 1, 0, (32 * 14 * 2), 1, 18); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 7, v0, 0, 0, (32 * 14 * 2), 1, 18); Font_LoadScreenIndicatorsPalette(0, 12 * 32, 18); sub_0200DD0C(param0->unk_160, 4, (32 * 8), 10, Options_Frame(param0->unk_18), 18); Font_LoadScreenIndicatorsPalette(4, 12 * 32, 18); - param0->unk_510 = sub_020071B4(param1, 16, 1, ¶m0->unk_514, 18); + param0->unk_510 = Graphics_GetCharDataFromOpenNARC(param1, 16, 1, ¶m0->unk_514, 18); } void sub_020877C4(void) @@ -1554,10 +1554,10 @@ static void sub_020877F4(UnkStruct_02087A10 *param0, NARC *param1) param0->unk_328[0][3] = SpriteResourceCollection_AddFrom(param0->unk_318[3], param1, 14, 1, 0, 3, 18); if (param0->unk_00 == 1) { - param0->unk_518 = sub_02006F50(19, PokeIconSpriteIndex(param0->unk_04, 0, param0->unk_08), 0, ¶m0->unk_51C, 18); + param0->unk_518 = Graphics_GetCharData(19, PokeIconSpriteIndex(param0->unk_04, 0, param0->unk_08), 0, ¶m0->unk_51C, 18); DC_FlushRange(param0->unk_51C, 0x20 * 4 * 4); - param0->unk_520 = sub_02006F88(19, PokeIconPalettesFileIndex(), ¶m0->unk_524, 18); + param0->unk_520 = Graphics_GetPlttData(19, PokeIconPalettesFileIndex(), ¶m0->unk_524, 18); DC_FlushRange(param0->unk_524, 0x20 * 4); } @@ -1743,7 +1743,7 @@ static void sub_02087D64(BgConfig *param0, Window *param1, int *param2, int para case 0: { u16 v3 = Unk_020F24DC[param3] | (Unk_020F24DC[param3] << 4); - sub_02006E60(31, 6 + param3, param0, 0 + v0, 0, (32 * 14 * 2), 1, 18); + Graphics_LoadTilemapToBgLayer(31, 6 + param3, param0, 0 + v0, 0, (32 * 14 * 2), 1, 18); sub_02088260(param5, v0); sub_02088E58(¶m1[v0], v3, param3, TEXT_COLOR(14, 15, 0), param7); (*param2)++; @@ -1829,7 +1829,7 @@ static void sub_02087FC0(UnkStruct_02087A10 *param0, OverlayManager *param1, NAR 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); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param2, 6 + 3, param0->unk_160, 1, 0, (32 * 14 * 2), 1, 18); param0->unk_4C4 = 4; sub_02088844(param0->unk_3A, 4); sub_02088E58(¶m0->unk_41C[1], 0xa0a, 4, TEXT_COLOR(14, 15, 0), param0->unk_514->pRawData); diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index ac140af0d8..1643154a9b 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -75,12 +75,12 @@ void sub_0208A490 (UnkStruct_02089688 * param0) v1 = param0->unk_2C0.unk_0C; v0 = param0->unk_2C0.unk_00; - sub_020070E8(v0, 12, v1, 1, 0, 0, 0, 101); - sub_0200710C(v0, 14, v1, 1, 0, 0, 0, 101); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 12, v1, 1, 0, 0, 0, 101); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 14, v1, 1, 0, 0, 0, 101); PaletteData_LoadBufferFromFileStart(v4, 159, 13, 101, 0, 0x20 * 1, 0); - sub_020070E8(v0, 15, v1, 5, 0, 0, 0, 101); - sub_0200710C(v0, 17, v1, 5, 0, 0, 0, 101); + Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 15, v1, 5, 0, 0, 0, 101); + Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 17, v1, 5, 0, 0, 0, 101); PaletteData_LoadBufferFromFileStart(v4, 159, 16, 101, 1, 0x20 * 1, 0); SpriteRenderer_LoadPalette(v4, 2, v2, v3, v0, 1, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 1000);