Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-09-30 22:27:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename to ground.bg

Browse Source
This commit is contained in:
DizzyEggg
2025-08-25 12:49:26 +02:00
parent 00bbe993cb
commit bb4e544f07
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
asm/overlay_11_022ECD24.s
View File

@@ -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

6
include/overlay_11_022EBB40.h → include/ground_bg.h
View File

@@ -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

2
main.lsf
View File

@@ -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
}

10
src/overlay_11_022EBB40.c → src/ground_bg.c
View File

@@ -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;