From bb4e544f072155770f54dda9010416058a0c4ab1 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 25 Aug 2025 12:49:26 +0200 Subject: [PATCH] rename to ground.bg --- asm/overlay_11_022ECD24.s | 8 ++++---- include/{overlay_11_022EBB40.h => ground_bg.h} | 6 +++--- main.lsf | 2 +- src/{overlay_11_022EBB40.c => ground_bg.c} | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) rename include/{overlay_11_022EBB40.h => ground_bg.h} (98%) rename src/{overlay_11_022EBB40.c => ground_bg.c} (99%) diff --git a/asm/overlay_11_022ECD24.s b/asm/overlay_11_022ECD24.s index 563d9c61..7fe8b50a 100644 --- a/asm/overlay_11_022ECD24.s +++ b/asm/overlay_11_022ECD24.s @@ -513,7 +513,7 @@ _022EDD48: strh ip, [r4, #6] ldrb ip, [lr, #0xa] strh ip, [r4, #8] - bl ov11_022EE2D4 + bl BmaLayerNrlDecompressor mov r1, r0 str r1, [r5, #0x1f0] ldr r0, [r5, #0x2d8] @@ -911,8 +911,8 @@ ov11_022EE2D0: ; 0x022EE2D0 bx lr arm_func_end ov11_022EE2D0 - arm_func_start ov11_022EE2D4 -ov11_022EE2D4: ; 0x022EE2D4 + arm_func_start BmaLayerNrlDecompressor +BmaLayerNrlDecompressor: ; 0x022EE2D4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x10 mov r5, #0 @@ -1140,7 +1140,7 @@ _022EE5C8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022EE5E0: .word 0x00000FFF - arm_func_end ov11_022EE2D4 + arm_func_end BmaLayerNrlDecompressor arm_func_start ov11_022EE5E4 ov11_022EE5E4: ; 0x022EE5E4 diff --git a/include/overlay_11_022EBB40.h b/include/ground_bg.h similarity index 98% rename from include/overlay_11_022EBB40.h rename to include/ground_bg.h index 46228957..ae488fcf 100644 --- a/include/overlay_11_022EBB40.h +++ b/include/ground_bg.h @@ -1,5 +1,5 @@ -#ifndef PMDSKY_OVERLAY_11_022EBB40_H -#define PMDSKY_OVERLAY_11_022EBB40_H +#ifndef PMDSKY_GROUND_BG_H +#define PMDSKY_GROUND_BG_H #include "util.h" @@ -254,4 +254,4 @@ void ov11_022EC27C(GroundBg *groundBg, s32 bgId); void LoadMapType10(GroundBg *groundBg, s32 bgId, const DungeonLocation *dungLoc, s32 a3); void LoadMapType11(GroundBg *groundBg, s32 bgId, const DungeonLocation *dungLoc, s32 a3); -#endif //PMDSKY_OVERLAY_11_022EBB40_H +#endif //PMDSKY_GROUND_BG_H diff --git a/main.lsf b/main.lsf index 454632d2..4cab165b 100644 --- a/main.lsf +++ b/main.lsf @@ -198,7 +198,7 @@ Overlay OVY_11 { After OVY_10 Object asm/overlay_11.o - Object src/overlay_11_022EBB40.o + Object src/ground_bg.o Object asm/overlay_11_022ECD24_data.o Object asm/overlay_11_022ECD24.o } diff --git a/src/overlay_11_022EBB40.c b/src/ground_bg.c similarity index 99% rename from src/overlay_11_022EBB40.c rename to src/ground_bg.c index c79744fe..52ee4a00 100644 --- a/src/overlay_11_022EBB40.c +++ b/src/ground_bg.c @@ -1,4 +1,4 @@ -#include "overlay_11_022EBB40.h" +#include "ground_bg.h" #include "file_rom.h" // TODO: Move these to headers @@ -112,7 +112,7 @@ void sub_0206367C(struct UnkGroundBg_1A0 *); void sub_020635C8(struct UnkGroundBg_194 *); void sub_020635D8(struct UnkGroundBg_194 *); void ov11_022EE620(GroundBg *groundBg, s32 a1); -const u8 *ov11_022EE2D4(u16 **dstArray, const void *bmaData, SubStruct_52C *a2, BmaHeader *bmaHeader); // BmaLayerNrlDecompressor +const u8 *BmaLayerNrlDecompressor(u16 **dstArray, const void *bmaData, SubStruct_52C *a2, BmaHeader *bmaHeader); // GroundBg_Init? void ov11_022EBC18(GroundBg *groundBg, const SubStruct_52C *a1) @@ -660,7 +660,7 @@ void ov11_022EC27C(GroundBg *groundBg, s32 bgId) } } - bmaData = ov11_022EE2D4(groundBg->unk2E4, bmaData, &groundBg->unk52C, &groundBg->bmaHeader); + bmaData = BmaLayerNrlDecompressor(groundBg->unk2E4, bmaData, &groundBg->unk52C, &groundBg->bmaHeader); groundBg->unk1F0 = bmaData; if (groundBg->unk2D8 != NULL) { groundBg->unk52C.unk18(groundBg->unk2D8, bmaData, bmaHeader, groundBg->unk52C.unk12); @@ -1296,7 +1296,7 @@ _022EC9A0: add r1, r5, #0xc add r2, r10, #0x2bc add r3, r10, #0x1e0 - bl ov11_022EE2D4 + bl BmaLayerNrlDecompressor mov r1, r0 str r1, [r10, #0x1f0] ldr r0, [r10, #0x2d8] @@ -1620,7 +1620,7 @@ void LoadMapType10(GroundBg *groundBg, s32 bgId, const DungeonLocation *dungLoc, struct UnkTwoPtrs unkPtrArray = zeros; unkPtrArray.ptrs[0] = groundBg->unk2D8; - bmaData = ov11_022EE2D4((void *) &unkPtrArray, bmaData, &groundBg->unk52C, &groundBg->bmaHeader); + bmaData = BmaLayerNrlDecompressor((void *) &unkPtrArray, bmaData, &groundBg->unk52C, &groundBg->bmaHeader); } groundBg->unk1F0 = bmaData;