From e859c2a0655ff786a70280fd1550bc071296c259 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 3 Jun 2025 15:52:41 +0200 Subject: [PATCH 01/11] start code 80A26CC --- asm/code_80A26CC_1.s | 407 ------------------------------------------ include/file_system.h | 8 + include/ground_map.h | 76 +++++++- include/memory.h | 8 + src/code_80A26CC.c | 126 +++++++++++++ 5 files changed, 216 insertions(+), 409 deletions(-) diff --git a/asm/code_80A26CC_1.s b/asm/code_80A26CC_1.s index 23ce59134..9b367c157 100644 --- a/asm/code_80A26CC_1.s +++ b/asm/code_80A26CC_1.s @@ -5,415 +5,8 @@ .text - thumb_func_start sub_80A2B40 -sub_80A2B40: - push {r4-r6,lr} - adds r5, r0, 0 - ldr r2, _080A2BFC - adds r0, r5, r2 - ldm r1!, {r2-r4} - stm r0!, {r2-r4} - ldm r1!, {r2-r4} - stm r0!, {r2-r4} - ldr r3, _080A2C00 - adds r0, r5, r3 - movs r4, 0 - ldrsh r1, [r0, r4] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - movs r1, 0x6 - bl MemoryAlloc - movs r2, 0xA9 - lsls r2, 3 - adds r1, r5, r2 - str r0, [r1] - movs r6, 0 - movs r3, 0xA7 - lsls r3, 3 - adds r0, r5, r3 - movs r4, 0 - ldrsh r0, [r0, r4] - cmp r6, r0 - bge _080A2BC0 -_080A2B7C: - lsls r4, r6, 2 - ldr r0, _080A2C04 - adds r2, r5, r0 - adds r2, r4 - ldr r1, _080A2C08 - adds r0, r5, r1 - movs r3, 0 - ldrsh r0, [r0, r3] - adds r1, r6, 0x2 - adds r0, r1 - lsls r0, 11 - ldr r1, _080A2C0C - adds r0, r1 - str r0, [r2] - ldr r1, _080A2C10 - adds r0, r5, r1 - movs r2, 0 - ldrsh r0, [r0, r2] - lsls r0, 7 - movs r1, 0x6 - bl MemoryAlloc - ldr r3, _080A2C14 - adds r1, r5, r3 - adds r1, r4 - str r0, [r1] - adds r6, 0x1 - movs r4, 0xA7 - lsls r4, 3 - adds r0, r5, r4 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r6, r0 - blt _080A2B7C -_080A2BC0: - cmp r6, 0x1 - bgt _080A2BD8 - movs r1, 0 - lsls r0, r6, 2 - ldr r2, _080A2C14 - adds r0, r2 - adds r0, r5 -_080A2BCE: - str r1, [r0, 0x8] - stm r0!, {r1} - adds r6, 0x1 - cmp r6, 0x1 - ble _080A2BCE -_080A2BD8: - movs r3, 0xA8 - lsls r3, 3 - adds r0, r5, r3 - ldr r1, [r0] - cmp r1, 0 - beq _080A2C20 - ldr r4, _080A2C18 - adds r0, r5, r4 - movs r1, 0 - ldrsh r0, [r0, r1] - lsls r0, 8 - movs r1, 0x6 - bl MemoryAlloc - ldr r2, _080A2C1C - adds r1, r5, r2 - str r0, [r1] - b _080A2C26 - .align 2, 0 -_080A2BFC: .4byte 0x0000052c -_080A2C00: .4byte 0x00000534 -_080A2C04: .4byte 0x00000554 -_080A2C08: .4byte 0x00000536 -_080A2C0C: .4byte gBgTilemaps -_080A2C10: .4byte 0x0000053c -_080A2C14: .4byte 0x0000054c -_080A2C18: .4byte 0x0000053a -_080A2C1C: .4byte 0x00000544 -_080A2C20: - ldr r3, _080A2CF0 - adds r0, r5, r3 - str r1, [r0] -_080A2C26: - movs r4, 0x86 - lsls r4, 3 - adds r0, r5, r4 - movs r1, 0 - str r1, [r0] - ldr r2, _080A2CF4 - adds r0, r5, r2 - str r1, [r0] - movs r3, 0x87 - lsls r3, 3 - adds r0, r5, r3 - str r1, [r0] - adds r4, 0xC - adds r0, r5, r4 - str r1, [r0] - adds r2, 0xC - adds r0, r5, r2 - str r1, [r0] - adds r3, 0xF2 - adds r0, r5, r3 - strb r1, [r0] - adds r4, 0x8 - adds r2, r5, r4 - ldr r0, _080A2CF8 - strh r0, [r2] - movs r2, 0x8D - lsls r2, 3 - adds r0, r5, r2 - str r1, [r0] - subs r3, 0xE2 - adds r0, r5, r3 - strb r1, [r0] - adds r4, 0x5 - adds r0, r5, r4 - strb r1, [r0] - subs r2, 0x1E - adds r0, r5, r2 - strb r1, [r0] - adds r3, 0x3 - adds r0, r5, r3 - strb r1, [r0] - adds r4, 0x3 - adds r0, r5, r4 - strb r1, [r0] - adds r2, 0x3 - adds r0, r5, r2 - strb r1, [r0] - adds r2, r5, 0 - adds r3, 0x21 - adds r0, r5, r3 - str r1, [r0] - adds r4, 0x24 - adds r0, r5, r4 - strb r1, [r0] - adds r3, 0x5 - adds r0, r5, r3 - strb r1, [r0] - movs r0, 0 - movs r1, 0xD -_080A2C9C: - strh r0, [r2] - strh r0, [r2, 0x2] - str r0, [r2, 0x8] - str r0, [r2, 0x4] - subs r1, 0x1 - adds r2, 0x10 - cmp r1, 0 - bge _080A2C9C - movs r1, 0 - movs r4, 0xF8 - lsls r4, 2 - adds r0, r5, r4 - movs r2, 0x1 -_080A2CB6: - strb r1, [r0] - strb r1, [r0, 0x1] - strh r1, [r0, 0x2] - strh r1, [r0, 0x4] - str r1, [r0, 0x8] - str r1, [r0, 0xC] - str r1, [r0, 0x14] - str r1, [r0, 0x10] - str r1, [r0, 0x1C] - str r1, [r0, 0x18] - str r1, [r0, 0x20] - str r1, [r0, 0x24] - adds r0, 0x28 - subs r2, 0x1 - cmp r2, 0 - bge _080A2CB6 - movs r4, 0 -_080A2CD8: - adds r0, r5, 0 - adds r1, r4, 0 - ldr r2, _080A2CFC - bl sub_80A456C - adds r4, 0x1 - cmp r4, 0x1 - ble _080A2CD8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080A2CF0: .4byte 0x00000544 -_080A2CF4: .4byte 0x00000434 -_080A2CF8: .4byte 0x0000ffff -_080A2CFC: .4byte gUnknown_81172B8 - thumb_func_end sub_80A2B40 - thumb_func_start sub_80A2D00 -sub_80A2D00: - push {r4-r7,lr} - adds r6, r0, 0 - bl sub_80A2DD4 - ldr r0, _080A2D5C - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080A2D1A - bl MemoryFree - movs r0, 0 - str r0, [r4] -_080A2D1A: - movs r1, 0xA9 - lsls r1, 3 - adds r4, r6, r1 - ldr r0, [r4] - bl MemoryFree - movs r0, 0 - str r0, [r4] - movs r5, 0 - movs r7, 0 -_080A2D2E: - lsls r2, r5, 2 - ldr r1, _080A2D60 - adds r0, r6, r1 - adds r1, r0, r2 - ldr r0, [r1] - cmp r0, 0 - beq _080A2D3E - str r7, [r1] -_080A2D3E: - ldr r1, _080A2D64 - adds r0, r6, r1 - adds r4, r0, r2 - ldr r0, [r4] - cmp r0, 0 - beq _080A2D50 - bl MemoryFree - str r7, [r4] -_080A2D50: - adds r5, 0x1 - cmp r5, 0x1 - ble _080A2D2E - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080A2D5C: .4byte 0x00000544 -_080A2D60: .4byte 0x00000554 -_080A2D64: .4byte 0x0000054c - thumb_func_end sub_80A2D00 - thumb_func_start sub_80A2D68 -sub_80A2D68: - push {r4,lr} - ldr r1, _080A2D84 - adds r4, r0, r1 - ldr r0, [r4] - cmp r0, 0 - beq _080A2D7C - bl MemoryFree - movs r0, 0 - str r0, [r4] -_080A2D7C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080A2D84: .4byte 0x00000544 - thumb_func_end sub_80A2D68 - - thumb_func_start sub_80A2D88 -sub_80A2D88: - push {r4-r7,lr} - adds r6, r0, 0 - movs r0, 0xA8 - lsls r0, 3 - adds r7, r6, r0 - ldr r0, [r7] - cmp r0, 0 - beq _080A2DC6 - movs r1, 0x89 - lsls r1, 3 - adds r5, r6, r1 - ldr r2, _080A2DCC - adds r4, r6, r2 - movs r1, 0 - ldrsh r0, [r4, r1] - lsls r0, 8 - movs r1, 0x6 - bl MemoryAlloc - ldr r2, _080A2DD0 - adds r1, r6, r2 - str r0, [r1] - subs r2, 0xDC - adds r1, r6, r2 - ldr r1, [r1] - movs r2, 0 - ldrsh r3, [r4, r2] - ldr r4, [r7] - adds r2, r5, 0 - bl _call_via_r4 -_080A2DC6: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080A2DCC: .4byte 0x0000053a -_080A2DD0: .4byte 0x00000544 - thumb_func_end sub_80A2D88 - - thumb_func_start sub_80A2DD4 -sub_80A2DD4: - push {r4-r6,lr} - adds r6, r0, 0 - movs r0, 0xFA - lsls r0, 2 - adds r4, r6, r0 - movs r5, 0x1 -_080A2DE0: - ldr r0, [r4] - cmp r0, 0 - beq _080A2DEE - bl CloseFile - movs r0, 0 - str r0, [r4] -_080A2DEE: - adds r4, 0x28 - subs r5, 0x1 - cmp r5, 0 - bge _080A2DE0 - ldr r0, _080A2E5C - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080A2E08 - bl CloseFile - movs r0, 0 - str r0, [r4] -_080A2E08: - movs r0, 0x88 - lsls r0, 3 - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080A2E1C - bl CloseFile - movs r0, 0 - str r0, [r4] -_080A2E1C: - movs r0, 0x86 - lsls r0, 3 - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080A2E30 - bl CloseFile - movs r0, 0 - str r0, [r4] -_080A2E30: - ldr r0, _080A2E60 - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080A2E42 - bl CloseFile - movs r0, 0 - str r0, [r4] -_080A2E42: - movs r0, 0x87 - lsls r0, 3 - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080A2E56 - bl CloseFile - movs r0, 0 - str r0, [r4] -_080A2E56: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080A2E5C: .4byte 0x0000043c -_080A2E60: .4byte 0x00000434 - thumb_func_end sub_80A2DD4 thumb_func_start sub_80A2E64 sub_80A2E64: diff --git a/include/file_system.h b/include/file_system.h index 2b917cce2..566c48f46 100644 --- a/include/file_system.h +++ b/include/file_system.h @@ -12,4 +12,12 @@ OpenedFile *OpenFileAndGetFileDataPtr(const u8 *filename, const FileArchive *arc u32 sub_800A8F8(u32 value); +#define CLOSE_FILE_AND_SET_NULL(filePtr) \ +{ \ + CloseFile(filePtr); \ + filePtr = NULL; \ +} + +#define TRY_CLOSE_FILE_AND_SET_NULL(filePtr) if (filePtr != NULL) CLOSE_FILE_AND_SET_NULL(filePtr) + #endif //GUARD_FILE_SYSTEM_H diff --git a/include/ground_map.h b/include/ground_map.h index 8f48d1354..95c6395cb 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -1,10 +1,82 @@ #ifndef GUARD_GROUND_MAP_H #define GUARD_GROUND_MAP_H +#include "structs/str_file_system.h" + +typedef struct SubStruct_0 +{ + u16 unk0; + u16 unk2; + s32 unk4; + s32 unk8; + u8 fillC; +} SubStruct_0; + +typedef struct SubStruct_3E0 +{ + u8 unk0; + u8 unk1; + u16 unk2; + u16 unk4; + OpenedFile *unk8; + s32 unkC; + s32 unk10; + s32 unk12; + s32 unk14; + s32 unk1C; + s32 unk20; + s32 unk24; +} SubStruct_3E0; + +// size: 0x18? +typedef struct SubStruct_52C +{ + u8 fill0[8]; // 0x52C + s16 unk8; // 0x534 + s16 unkA; // 0x536 + s16 unkC; // 0x538 + s16 unkE; // 0x53A + s16 unk10; // 0x53C + s16 unk12; // 0x53E + void (*unk14)(void *, s32, void *, s32); // TODO: fix void * to proper ptr types 0x540 +} SubStruct_52C; + +#define UNK_0_ARR_COUNT 14 +#define UNK_3E0_ARR_COUNT 2 + +#define UNK_54C_ARR_COUNT 2 + // size: 0x55C typedef struct unkStruct_3001B70 { - u8 fill0[0x55C - 0x0]; + SubStruct_0 unk0[UNK_0_ARR_COUNT]; + u8 fillUnk[0x300]; + SubStruct_3E0 unk3E0[UNK_3E0_ARR_COUNT]; + OpenedFile *unk430; + OpenedFile *unk434; + OpenedFile *unk438; + OpenedFile *unk43C; + OpenedFile *unk440; + s16 unk444; + u8 fill446[2]; + u8 unk448; + u8 unk449; + u8 unk44A; + u8 unk44B; + u8 unk44C; + u8 unk44D; + u8 fill44E[0x468-0x44E]; + s32 unk468; + s32 unk46C; + u8 unk470; + u8 unk471; + u8 fill472[0x52A-0x472]; + u8 unk52A; + SubStruct_52C unk52C; + void *unk544; + void *unk548; + void *unk54C[UNK_54C_ARR_COUNT]; + u16 *unk554[UNK_54C_ARR_COUNT]; } unkStruct_3001B70; extern unkStruct_3001B70 *gGroundMapDungeon_3001B70; @@ -16,4 +88,4 @@ void FreeGroundMapAction(void); void sub_80A4B38(void); void sub_80A4B54(void); -#endif // GUARD_GROUND_MAP_H \ No newline at end of file +#endif // GUARD_GROUND_MAP_H diff --git a/include/memory.h b/include/memory.h index 98065e07d..5d3951b29 100644 --- a/include/memory.h +++ b/include/memory.h @@ -13,4 +13,12 @@ void MemoryCopy32(u32 *dest, u32 *src, s32 size); void *MemoryAlloc(s32 size, s32 group); void MemoryFree(void *a); +#define FREE_AND_SET_NULL(ptr) \ +{ \ + MemoryFree(ptr); \ + ptr = NULL; \ +} + +#define TRY_FREE_AND_SET_NULL(ptr) if (ptr != NULL) FREE_AND_SET_NULL(ptr) + #endif // GUARD_MEMORY_H diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c index 8425b167f..52f8f2281 100644 --- a/src/code_80A26CC.c +++ b/src/code_80A26CC.c @@ -462,3 +462,129 @@ UNUSED static const u8 *sub_80A2B28(u16 r0) { return sub_80A2B18(GetScriptVarValue(NULL, GROUND_PLACE)); } + +#include "ground_map.h" +#include "text_1.h" +#include "memory.h" +#include "file_system.h" + +extern void sub_80A456C(unkStruct_3001B70 *, u32, const PixelPos *); +extern const PixelPos gUnknown_81172B8; + +void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) +{ + SubStruct_0 *unk0Ptr; + s32 id, unk0Id, unk3E0Id; + s32 i; + + mapPtr->unk52C = *a1; + mapPtr->unk548 = MemoryAlloc(mapPtr->unk52C.unk8 * 18, 6); + for (id = 0; id < mapPtr->unk52C.unkC; id++) { + mapPtr->unk554[id] = &gBgTilemaps[2 + mapPtr->unk52C.unkA + id][0][0]; + mapPtr->unk54C[id] = MemoryAlloc(mapPtr->unk52C.unk10 * 128, 6); + } + for (; id < UNK_54C_ARR_COUNT; id++) { + mapPtr->unk554[id] = NULL; + mapPtr->unk54C[id] = NULL; + } + + if (mapPtr->unk52C.unk14 != NULL) { + mapPtr->unk544 = MemoryAlloc(mapPtr->unk52C.unkE * 256, 6); + } + else { + mapPtr->unk544 = NULL; + } + + mapPtr->unk430 = NULL; + mapPtr->unk434 = NULL; + mapPtr->unk438 = NULL; + mapPtr->unk43C = NULL; + mapPtr->unk440 = NULL; + mapPtr->unk52A = 0; + mapPtr->unk444 = -1; + mapPtr->unk468 = 0; + mapPtr->unk448 = 0; + mapPtr->unk449 = 0; + mapPtr->unk44A = 0; + mapPtr->unk44B = 0; + mapPtr->unk44C = 0; + mapPtr->unk44D = 0; + unk0Ptr = &mapPtr->unk0[0]; + mapPtr->unk46C = 0; + mapPtr->unk470 = 0; + mapPtr->unk471 = 0; + + for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, unk0Ptr++) { + unk0Ptr->unk0 = 0; + unk0Ptr->unk2 = 0; + unk0Ptr->unk8 = 0; + unk0Ptr->unk4 = 0; + } + + for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { + SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[unk3E0Id]; + unkPtr->unk0 = 0; + unkPtr->unk1 = 0; + unkPtr->unk2 = 0; + unkPtr->unk4 = 0; + unkPtr->unk8 = NULL; + unkPtr->unkC = 0; + unkPtr->unk12 = 0; + unkPtr->unk10 = 0; + unkPtr->unk1C = 0; + unkPtr->unk14 = 0; + unkPtr->unk20 = 0; + unkPtr->unk24 = 0; + } + + for (i = 0; i < 2; i++) { + sub_80A456C(mapPtr, i, &gUnknown_81172B8); + } +} + +void sub_80A2DD4(unkStruct_3001B70 *mapPtr); + +void sub_80A2D00(unkStruct_3001B70 *mapPtr) +{ + s32 i; + + sub_80A2DD4(mapPtr); + TRY_FREE_AND_SET_NULL(mapPtr->unk544); + FREE_AND_SET_NULL(mapPtr->unk548); + + for (i = 0; i < UNK_54C_ARR_COUNT; i++) { + if (mapPtr->unk554[i] != NULL) { + mapPtr->unk554[i] = NULL; + } + TRY_FREE_AND_SET_NULL(mapPtr->unk54C[i]); + } +} + +void sub_80A2D68(unkStruct_3001B70 *mapPtr) +{ + TRY_FREE_AND_SET_NULL(mapPtr->unk544); +} + +void sub_80A2D88(unkStruct_3001B70 *mapPtr) +{ + if (mapPtr->unk52C.unk14 != NULL) { + void *unk448 = &mapPtr->unk448; + mapPtr->unk544 = MemoryAlloc(mapPtr->unk52C.unkE * 256, 6); + mapPtr->unk52C.unk14(mapPtr->unk544, mapPtr->unk468, unk448, mapPtr->unk52C.unkE); + } +} + +void sub_80A2DD4(unkStruct_3001B70 *mapPtr) +{ + s32 i; + + for (i = 0; i < UNK_3E0_ARR_COUNT; i++) { + SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[i]; + TRY_CLOSE_FILE_AND_SET_NULL(unkPtr->unk8); + } + TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk43C); + TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk440); + TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk430); + TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk434); + TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk438); +} From 9ed54037203a0eafd18b6a8fcd93a373e04a1e53 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 4 Jun 2025 09:09:16 +0200 Subject: [PATCH 02/11] sub_80A2FBC will be a nightmare to match --- asm/code_80A26CC_1.s | 170 ------------------------------------------- include/ground_map.h | 15 +++- src/code_80A26CC.c | 93 +++++++++++++++++++++++ 3 files changed, 106 insertions(+), 172 deletions(-) diff --git a/asm/code_80A26CC_1.s b/asm/code_80A26CC_1.s index 9b367c157..d474cbb7a 100644 --- a/asm/code_80A26CC_1.s +++ b/asm/code_80A26CC_1.s @@ -8,176 +8,6 @@ - thumb_func_start sub_80A2E64 -sub_80A2E64: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - adds r7, r0, 0 - bl sub_80A2DD4 - ldr r0, _080A2FA4 - adds r1, r7, r0 - ldr r0, _080A2FA8 - strh r0, [r1] - movs r1, 0xA5 - lsls r1, 3 - adds r0, r7, r1 - movs r1, 0 - movs r2, 0 - strh r2, [r0] - movs r3, 0x89 - lsls r3, 3 - adds r0, r7, r3 - strb r1, [r0] - ldr r4, _080A2FAC - adds r0, r7, r4 - strb r1, [r0] - adds r3, 0x2 - adds r0, r7, r3 - strb r1, [r0] - adds r4, 0x2 - adds r0, r7, r4 - strb r1, [r0] - adds r3, 0x2 - adds r0, r7, r3 - strb r1, [r0] - adds r4, 0x2 - adds r0, r7, r4 - strb r1, [r0] - adds r3, r7, 0 - adds r4, 0x1F - adds r0, r7, r4 - str r2, [r0] - movs r2, 0x8E - lsls r2, 3 - adds r0, r7, r2 - strb r1, [r0] - adds r4, 0x5 - adds r0, r7, r4 - strb r1, [r0] - movs r0, 0 - movs r1, 0xD -_080A2ECA: - strh r0, [r3] - strh r0, [r3, 0x2] - str r0, [r3, 0x8] - str r0, [r3, 0x4] - subs r1, 0x1 - adds r3, 0x10 - cmp r1, 0 - bge _080A2ECA - movs r1, 0 - movs r2, 0xF8 - lsls r2, 2 - adds r0, r7, r2 - movs r2, 0x1 -_080A2EE4: - strb r1, [r0] - strb r1, [r0, 0x1] - strh r1, [r0, 0x2] - strh r1, [r0, 0x4] - str r1, [r0, 0x8] - str r1, [r0, 0xC] - str r1, [r0, 0x14] - str r1, [r0, 0x10] - str r1, [r0, 0x1C] - str r1, [r0, 0x18] - str r1, [r0, 0x20] - str r1, [r0, 0x24] - adds r0, 0x28 - subs r2, 0x1 - cmp r2, 0 - bge _080A2EE4 - ldr r3, _080A2FB0 - adds r0, r7, r3 - movs r4, 0 - ldrsh r0, [r0, r4] - lsls r0, 20 - lsrs r6, r0, 16 - movs r5, 0 - ldr r1, _080A2FB4 - adds r0, r7, r1 - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r5, r0 - bge _080A2F78 - mov r10, r5 - add r4, sp, 0x4 - movs r3, 0xFF - mov r9, r3 -_080A2F26: - mov r0, r10 - str r0, [sp] - ldrb r0, [r4] - mov r1, r9 - orrs r0, r1 - strb r0, [r4] - ldrb r0, [r4, 0x1] - orrs r0, r1 - strb r0, [r4, 0x1] - ldrb r0, [r4, 0x2] - orrs r0, r1 - strb r0, [r4, 0x2] - mov r2, r10 - strb r2, [r4, 0x3] - adds r0, r6, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r6, r1, 16 - ldr r1, [sp] - bl sub_8003810 - adds r5, 0x1 - mov r8, r5 - movs r5, 0xE -_080A2F56: - adds r0, r6, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r6, r1, 16 - ldr r1, [sp, 0x4] - bl sub_8003810 - subs r5, 0x1 - cmp r5, 0 - bge _080A2F56 - mov r5, r8 - ldr r3, _080A2FB4 - adds r0, r7, r3 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r5, r0 - blt _080A2F26 -_080A2F78: - adds r0, r7, 0 - movs r1, 0 - bl sub_80A3BB0 - movs r2, 0x91 - lsls r2, 3 - adds r0, r7, r2 - bl sub_80A3EB0 - ldr r3, _080A2FB8 - adds r1, r7, r3 - movs r0, 0x1 - strb r0, [r1] - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080A2FA4: .4byte 0x00000444 -_080A2FA8: .4byte 0x0000ffff -_080A2FAC: .4byte 0x00000449 -_080A2FB0: .4byte 0x0000052c -_080A2FB4: .4byte 0x0000052e -_080A2FB8: .4byte 0x0000052a - thumb_func_end sub_80A2E64 - thumb_func_start sub_80A2FBC sub_80A2FBC: push {r4-r7,lr} diff --git a/include/ground_map.h b/include/ground_map.h index 95c6395cb..12fa74646 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -28,10 +28,19 @@ typedef struct SubStruct_3E0 s32 unk24; } SubStruct_3E0; +typedef struct SubStruct_488 +{ + u8 fill0[0x18]; + void (*unk18)(struct SubStruct_488 *); + u8 fill1C[0x84]; +} SubStruct_488; + // size: 0x18? typedef struct SubStruct_52C { - u8 fill0[8]; // 0x52C + s16 unk0; // 0x52C + s16 unk2; // 0x52E + u8 fill4[0x4]; // 0x530 s16 unk8; // 0x534 s16 unkA; // 0x536 s16 unkC; // 0x538 @@ -70,7 +79,9 @@ typedef struct unkStruct_3001B70 s32 unk46C; u8 unk470; u8 unk471; - u8 fill472[0x52A-0x472]; + u8 fill472[0x488-0x472]; + struct SubStruct_488 unk488; + u16 unk528; u8 unk52A; SubStruct_52C unk52C; void *unk544; diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c index 52f8f2281..6b853f58c 100644 --- a/src/code_80A26CC.c +++ b/src/code_80A26CC.c @@ -463,10 +463,14 @@ UNUSED static const u8 *sub_80A2B28(u16 r0) return sub_80A2B18(GetScriptVarValue(NULL, GROUND_PLACE)); } +// TODO: Figure out if a new file starts here + #include "ground_map.h" #include "text_1.h" #include "memory.h" #include "file_system.h" +#include "code_8002774.h" +#include "code_801D9E4.h" extern void sub_80A456C(unkStruct_3001B70 *, u32, const PixelPos *); extern const PixelPos gUnknown_81172B8; @@ -543,6 +547,8 @@ void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) } void sub_80A2DD4(unkStruct_3001B70 *mapPtr); +void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0); +void sub_80A3EB0(SubStruct_488 *mapSubstructPtr); void sub_80A2D00(unkStruct_3001B70 *mapPtr) { @@ -588,3 +594,90 @@ void sub_80A2DD4(unkStruct_3001B70 *mapPtr) TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk434); TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk438); } + +extern void sub_8003810(u32 param_1, struct S param_2); + +void sub_80A2E64(unkStruct_3001B70 *mapPtr) +{ + u16 r6; + s32 i, j; + SubStruct_0 *unk0Ptr; + s32 unk0Id, unk3E0Id; + + sub_80A2DD4(mapPtr); + mapPtr->unk444 = -1; + mapPtr->unk528 = 0; + mapPtr->unk448 = 0; + mapPtr->unk449 = 0; + mapPtr->unk44A = 0; + mapPtr->unk44B = 0; + mapPtr->unk44C = 0; + mapPtr->unk44D = 0; + unk0Ptr = &mapPtr->unk0[0]; + mapPtr->unk46C = 0; + mapPtr->unk470 = 0; + mapPtr->unk471 = 0; + + for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, unk0Ptr++) { + unk0Ptr->unk0 = 0; + unk0Ptr->unk2 = 0; + unk0Ptr->unk8 = 0; + unk0Ptr->unk4 = 0; + } + + for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { + SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[unk3E0Id]; + unkPtr->unk0 = 0; + unkPtr->unk1 = 0; + unkPtr->unk2 = 0; + unkPtr->unk4 = 0; + unkPtr->unk8 = NULL; + unkPtr->unkC = 0; + unkPtr->unk12 = 0; + unkPtr->unk10 = 0; + unkPtr->unk1C = 0; + unkPtr->unk14 = 0; + unkPtr->unk20 = 0; + unkPtr->unk24 = 0; + } + + r6 = mapPtr->unk52C.unk0 * 16; + for (i = 0; i < mapPtr->unk52C.unk2; i++) { + struct S str1 = {0}; + struct S str2 = {0xFF, 0xFF, 0xFF, 0}; + + sub_8003810(r6++, str1); + for (j = 0; j < 15; j++) { + sub_8003810(r6++, str2); + } + } + + sub_80A3BB0(mapPtr, 0); + sub_80A3EB0(&mapPtr->unk488); + mapPtr->unk52A = 1; +} + +extern const struct unkStruct_81188F0 gUnknown_81188F0[10]; +extern const FileArchive gGroundFileArchive; + +/* +void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) +{ + const struct unkStruct_81188F0 *dataPtr; + s32 a1 = (s16) a1_; + + if (a1 == -1) { + sub_80A2E64(mapPtr); + return; + } + + sub_80A2DD4(mapPtr); + mapPtr->unk444 = a1; + dataPtr = &gUnknown_81188F0[a1]; + mapPtr->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); + mapPtr->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive); + mapPtr->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive); +} +*/ + +// From ba550a1b9d9f4731a26da1137dda275d04011c6b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 4 Jun 2025 16:16:19 +0200 Subject: [PATCH 03/11] Match sub_80A2FBC --- asm/code_80A26CC_1.s | 570 ----------------------------------------- include/code_801D9E4.h | 3 +- include/ground_map.h | 58 +++-- src/code_80A26CC.c | 208 ++++++++++++++- 4 files changed, 233 insertions(+), 606 deletions(-) diff --git a/asm/code_80A26CC_1.s b/asm/code_80A26CC_1.s index d474cbb7a..c49122c96 100644 --- a/asm/code_80A26CC_1.s +++ b/asm/code_80A26CC_1.s @@ -8,576 +8,6 @@ - thumb_func_start sub_80A2FBC -sub_80A2FBC: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x2C - mov r9, r0 - lsls r1, 16 - asrs r4, r1, 16 - movs r0, 0x1 - negs r0, r0 - cmp r4, r0 - bne _080A2FDE - mov r0, r9 - bl sub_80A2E64 - b _080A3428 -_080A2FDE: - mov r0, r9 - bl sub_80A2DD4 - ldr r0, _080A3284 - add r0, r9 - strh r4, [r0] - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - ldr r1, _080A3288 - adds r0, r1 - str r0, [sp, 0xC] - ldr r0, [r0] - ldr r4, _080A328C - adds r1, r4, 0 - bl OpenFileAndGetFileDataPtr - movs r6, 0x86 - lsls r6, 3 - add r6, r9 - str r0, [r6] - ldr r1, [sp, 0xC] - ldr r0, [r1, 0x4] - adds r1, r4, 0 - bl OpenFileAndGetFileDataPtr - ldr r5, _080A3290 - add r5, r9 - str r0, [r5] - ldr r2, [sp, 0xC] - ldr r0, [r2, 0x8] - adds r1, r4, 0 - bl OpenFileAndGetFileDataPtr - movs r1, 0x87 - lsls r1, 3 - add r1, r9 - str r0, [r1] - ldr r1, [r6] - ldr r1, [r1, 0x4] - str r1, [sp, 0x18] - ldr r1, [r5] - ldr r1, [r1, 0x4] - mov r8, r1 - ldr r6, [r0, 0x4] - ldr r3, _080A3294 - add r3, r9 - str r3, [sp, 0x10] - ldr r4, _080A3298 - add r4, r9 - str r4, [sp, 0x14] - movs r5, 0x89 - lsls r5, 3 - add r5, r9 - mov r10, r5 - ldr r7, [sp, 0x18] - ldrb r0, [r7] - strh r0, [r3] - adds r0, r7, 0 - adds r0, 0x2 - str r0, [sp, 0x18] - ldrb r0, [r0] - strh r0, [r3, 0x2] - ldr r1, [sp, 0x18] - adds r1, 0x2 - str r1, [sp, 0x18] - mov r2, r8 - ldrh r0, [r2] - strh r0, [r4] - movs r3, 0x2 - add r8, r3 - mov r4, r8 - ldrh r0, [r4] - ldr r5, [sp, 0x14] - strh r0, [r5, 0x2] - add r8, r3 - mov r7, r8 - ldrh r0, [r7] - strh r0, [r5, 0x4] - add r8, r3 - add r3, sp, 0x8 - ldr r0, _080A329C - add r0, r9 - str r0, [sp, 0x1C] - adds r1, r0, 0 - movs r2, 0x3 -_080A308A: - mov r4, r8 - ldrh r0, [r4] - strh r0, [r1] - movs r5, 0x2 - add r8, r5 - adds r1, 0x2 - subs r2, 0x1 - cmp r2, 0 - bge _080A308A - mov r7, r8 - ldrh r0, [r7] - movs r2, 0 - movs r1, 0 - ldr r4, [sp, 0x14] - strh r0, [r4, 0xE] - add r8, r5 - ldrb r0, [r6] - mov r5, r10 - strb r0, [r5] - adds r6, 0x1 - ldrb r0, [r6] - strb r0, [r5, 0x1] - adds r6, 0x1 - ldrb r0, [r6] - strb r0, [r5, 0x2] - adds r6, 0x1 - ldrb r0, [r6] - strb r0, [r5, 0x3] - adds r6, 0x1 - ldrb r0, [r6] - strb r0, [r5, 0x4] - adds r6, 0x1 - ldrb r0, [r6] - strb r0, [r5, 0x5] - adds r6, 0x1 - ldrb r0, [r6] - strh r0, [r5, 0x6] - adds r6, 0x2 - ldrb r0, [r6] - strh r0, [r5, 0x8] - adds r6, 0x2 - ldrb r0, [r6] - strh r0, [r5, 0xA] - adds r6, 0x2 - ldr r7, [sp, 0x18] - ldr r0, _080A32A0 - add r0, r9 - movs r4, 0 - ldrsh r0, [r0, r4] - lsls r0, 20 - lsrs r5, r0, 16 - str r1, [sp, 0x4] - movs r0, 0xFF - strb r0, [r3] - movs r0, 0x1 - negs r0, r0 - strb r0, [r3, 0x1] - strb r0, [r3, 0x2] - strb r2, [r3, 0x3] - movs r4, 0 - ldr r1, [sp, 0x10] - movs r2, 0 - ldrsh r0, [r1, r2] - ldr r3, [sp, 0xC] - adds r3, 0xC - str r3, [sp, 0x20] - cmp r4, r0 - bge _080A3158 - ldr r0, _080A32A4 - add r0, r9 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r4, r0 - bge _080A3198 -_080A311E: - adds r0, r5, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r5, r1, 16 - ldr r1, [sp, 0x4] - bl sub_8003810 - adds r0, r5, 0 - adds r1, r7, 0 - movs r2, 0xF - bl sub_809971C - adds r0, r5, 0 - adds r0, 0xF - lsls r0, 16 - lsrs r5, r0, 16 - adds r7, 0x3C - adds r4, 0x1 - ldr r2, [sp, 0x10] - movs r3, 0 - ldrsh r0, [r2, r3] - cmp r4, r0 - bge _080A3158 - ldr r0, _080A32A4 - add r0, r9 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r4, r0 - blt _080A311E -_080A3158: - ldr r0, _080A32A4 - add r0, r9 - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r4, r0 - bge _080A3198 -_080A3164: - adds r0, r5, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r5, r1, 16 - ldr r1, [sp, 0x4] - bl sub_8003810 - adds r7, r4, 0x1 - movs r4, 0xE -_080A3176: - adds r0, r5, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r5, r1, 16 - ldr r1, [sp, 0x8] - bl sub_8003810 - subs r4, 0x1 - cmp r4, 0 - bge _080A3176 - adds r4, r7, 0 - ldr r0, _080A32A4 - add r0, r9 - movs r3, 0 - ldrsh r0, [r0, r3] - cmp r4, r0 - blt _080A3164 -_080A3198: - movs r0, 0xA6 - lsls r0, 3 - add r0, r9 - movs r4, 0 - ldrsh r0, [r0, r4] - lsls r0, 5 - ldr r5, _080A32A8 - adds r0, r5 - ldr r4, _080A32A0 - add r4, r9 - ldr r5, _080A3298 - add r5, r9 - mov r1, r8 - adds r2, r4, 0 - adds r3, r5, 0 - bl sub_80A37C4 - movs r0, 0xA9 - lsls r0, 3 - add r0, r9 - ldr r0, [r0] - movs r1, 0xA5 - lsls r1, 3 - add r1, r9 - ldr r7, [sp, 0x14] - movs r3, 0x4 - ldrsh r2, [r7, r3] - subs r2, 0x1 - lsls r2, 5 - add r2, r8 - str r5, [sp] - adds r3, r4, 0 - bl _UncompressCell - ldr r0, _080A32AC - add r0, r9 - movs r3, 0x89 - lsls r3, 3 - add r3, r9 - adds r1, r6, 0 - adds r2, r4, 0 - bl sub_80A3908 - adds r6, r0, 0 - movs r0, 0x8D - lsls r0, 3 - add r0, r9 - str r6, [r0] - ldr r0, _080A32B0 - add r0, r9 - ldr r2, [r0] - cmp r2, 0 - beq _080A321C - movs r1, 0xA8 - lsls r1, 3 - add r1, r9 - ldr r0, _080A32B4 - add r0, r9 - movs r4, 0 - ldrsh r3, [r0, r4] - ldr r4, [r1] - adds r0, r2, 0 - adds r1, r6, 0 - mov r2, r10 - bl _call_via_r4 -_080A321C: - mov r2, r9 - movs r4, 0 - ldr r5, [sp, 0x10] - movs r6, 0x2 - ldrsh r0, [r5, r6] - cmp r0, 0 - beq _080A32E4 - movs r7, 0 - ldrsh r1, [r5, r7] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 2 - ldr r5, [sp, 0x18] - adds r3, r5, r0 - lsls r1, 2 - adds r6, r3, r1 - ldr r0, _080A32B8 - add r0, r9 - str r3, [r0] - movs r0, 0x8E - lsls r0, 3 - add r0, r9 - movs r1, 0x1 - strb r1, [r0] - ldr r0, _080A32BC - add r0, r9 - strb r1, [r0] - ldr r7, [sp, 0x10] - movs r1, 0 - ldrsh r0, [r7, r1] - cmp r4, r0 - bge _080A32F8 - ldr r1, _080A32A4 - add r1, r9 - movs r5, 0 - ldrsh r0, [r1, r5] - cmp r4, r0 - bge _080A32F8 - movs r5, 0 - mov r8, r1 -_080A326C: - movs r7, 0x2 - ldrsh r0, [r3, r7] - cmp r0, 0 - ble _080A32C0 - str r6, [r2, 0x4] - movs r0, 0x2 - ldrsh r1, [r3, r0] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 2 - adds r6, r0 - b _080A32C2 - .align 2, 0 -_080A3284: .4byte 0x00000444 -_080A3288: .4byte gUnknown_81188F0 -_080A328C: .4byte gGroundFileArchive -_080A3290: .4byte 0x00000434 -_080A3294: .4byte 0x00000464 -_080A3298: .4byte 0x00000454 -_080A329C: .4byte 0x0000045a -_080A32A0: .4byte 0x0000052c -_080A32A4: .4byte 0x0000052e -_080A32A8: .4byte 0x06008000 -_080A32AC: .4byte 0x0000054c -_080A32B0: .4byte 0x00000544 -_080A32B4: .4byte 0x0000053a -_080A32B8: .4byte 0x0000046c -_080A32BC: .4byte 0x00000471 -_080A32C0: - str r5, [r2, 0x4] -_080A32C2: - strh r5, [r2] - strh r5, [r2, 0x2] - str r5, [r2, 0x8] - adds r4, 0x1 - adds r2, 0x10 - adds r3, 0x4 - ldr r1, [sp, 0x10] - movs r7, 0 - ldrsh r0, [r1, r7] - cmp r4, r0 - bge _080A32F8 - mov r1, r8 - movs r7, 0 - ldrsh r0, [r1, r7] - cmp r4, r0 - blt _080A326C - b _080A32F8 -_080A32E4: - ldr r0, _080A3384 - add r0, r9 - str r4, [r0] - movs r0, 0x8E - lsls r0, 3 - add r0, r9 - strb r4, [r0] - ldr r0, _080A3388 - add r0, r9 - strb r4, [r0] -_080A32F8: - cmp r4, 0xD - bgt _080A330E - movs r0, 0 -_080A32FE: - strh r0, [r2] - strh r0, [r2, 0x2] - str r0, [r2, 0x8] - str r0, [r2, 0x4] - adds r4, 0x1 - adds r2, 0x10 - cmp r4, 0xD - ble _080A32FE -_080A330E: - movs r0, 0xA6 - lsls r0, 3 - add r0, r9 - movs r1, 0 - ldrsh r0, [r0, r1] - ldr r2, [sp, 0x14] - movs r3, 0x4 - ldrsh r1, [r2, r3] - adds r0, r1 - lsls r0, 5 - ldr r4, _080A338C - adds r5, r0, r4 - movs r7, 0 - movs r6, 0 - mov r8, r6 - movs r4, 0xF8 - lsls r4, 2 - add r4, r9 - ldr r0, [sp, 0x1C] - str r0, [sp, 0x28] - ldr r3, [sp, 0x20] -_080A3338: - ldr r0, [r3] - cmp r0, 0 - beq _080A3394 - ldr r1, _080A3390 - str r3, [sp, 0x24] - bl OpenFileAndGetFileDataPtr - str r0, [r4, 0x8] - movs r1, 0x1 - strb r1, [r4] - strb r1, [r4, 0x1] - ldr r2, [r0, 0x4] - str r2, [r4, 0xC] - adds r1, r2, 0x4 - movs r0, 0x2 - ldrsh r6, [r2, r0] - lsls r6, 2 - adds r0, r1, r6 - str r1, [r4, 0x14] - str r1, [r4, 0x10] - str r0, [r4, 0x1C] - str r0, [r4, 0x18] - mov r1, r8 - strh r1, [r4, 0x2] - ldr r0, [r2, 0x4] - strh r0, [r4, 0x4] - str r5, [r4, 0x20] - ldr r2, [sp, 0x28] - movs r6, 0 - ldrsh r0, [r2, r6] - lsls r0, 5 - str r0, [r4, 0x24] - movs r1, 0 - ldrsh r0, [r2, r1] - lsls r0, 5 - adds r5, r0 - ldr r3, [sp, 0x24] - b _080A33AC - .align 2, 0 -_080A3384: .4byte 0x0000046c -_080A3388: .4byte 0x00000471 -_080A338C: .4byte 0x06008000 -_080A3390: .4byte gGroundFileArchive -_080A3394: - strb r0, [r4] - strb r0, [r4, 0x1] - strh r0, [r4, 0x4] - strh r0, [r4, 0x2] - str r0, [r4, 0x8] - str r0, [r4, 0xC] - str r0, [r4, 0x14] - str r0, [r4, 0x10] - str r0, [r4, 0x1C] - str r0, [r4, 0x18] - str r0, [r4, 0x20] - str r0, [r4, 0x24] -_080A33AC: - adds r4, 0x28 - ldr r2, [sp, 0x28] - adds r2, 0x2 - str r2, [sp, 0x28] - adds r3, 0x4 - adds r7, 0x1 - cmp r7, 0x1 - ble _080A3338 - cmp r7, 0x3 - bgt _080A340E -_080A33C0: - lsls r0, r7, 2 - ldr r3, [sp, 0x20] - adds r0, r3, r0 - ldr r0, [r0] - adds r4, r7, 0x1 - cmp r0, 0 - beq _080A3408 - ldr r1, _080A3438 - bl OpenFileAndGetFileDataPtr - adds r3, r0, 0 - ldr r0, [r3, 0x4] - adds r1, r0, 0x4 - movs r6, 0x2 - ldrsh r0, [r0, r6] - lsls r0, 2 - adds r1, r0 - lsls r0, r7, 1 - ldr r7, [sp, 0x1C] - adds r0, r7, r0 - movs r2, 0 - ldrsh r0, [r0, r2] - lsls r0, 4 - cmp r0, 0 - ble _080A3402 - adds r2, r0, 0 -_080A33F4: - ldrh r0, [r1] - strh r0, [r5] - adds r1, 0x2 - adds r5, 0x2 - subs r2, 0x1 - cmp r2, 0 - bne _080A33F4 -_080A3402: - adds r0, r3, 0 - bl CloseFile -_080A3408: - adds r7, r4, 0 - cmp r7, 0x3 - ble _080A33C0 -_080A340E: - mov r0, r9 - movs r1, 0 - bl sub_80A3BB0 - movs r0, 0x91 - lsls r0, 3 - add r0, r9 - bl sub_80A3EB0 - ldr r1, _080A343C - add r1, r9 - movs r0, 0x1 - strb r0, [r1] -_080A3428: - add sp, 0x2C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080A3438: .4byte gGroundFileArchive -_080A343C: .4byte 0x0000052a - thumb_func_end sub_80A2FBC - thumb_func_start sub_80A3440 sub_80A3440: push {r4-r7,lr} diff --git a/include/code_801D9E4.h b/include/code_801D9E4.h index a828449cf..fdd014a98 100644 --- a/include/code_801D9E4.h +++ b/include/code_801D9E4.h @@ -10,8 +10,7 @@ struct unkStruct_81188F0 /* 0x0 */ u8 *text1; /* 0x4 */ u8 *text2; /* 0x8 */ u8 *text3; - /* 0xC */ u8 *text4; - /* 0x10 */ u32 unk1; + /* 0xC */ u8 *text4[2]; /* 0x14 */ u32 unk2; /* 0x18 */ u32 unk3; }; diff --git a/include/ground_map.h b/include/ground_map.h index 12fa74646..2b2729dc4 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -7,8 +7,8 @@ typedef struct SubStruct_0 { u16 unk0; u16 unk2; - s32 unk4; - s32 unk8; + const void *unk4; + const void *unk8; u8 fillC; } SubStruct_0; @@ -19,12 +19,12 @@ typedef struct SubStruct_3E0 u16 unk2; u16 unk4; OpenedFile *unk8; - s32 unkC; - s32 unk10; - s32 unk12; - s32 unk14; - s32 unk1C; - s32 unk20; + const void *unkC; + const void *unk10; + const void *unk12; + const void *unk14; + const void *unk1C; + void *unk20; s32 unk24; } SubStruct_3E0; @@ -40,21 +40,44 @@ typedef struct SubStruct_52C { s16 unk0; // 0x52C s16 unk2; // 0x52E - u8 fill4[0x4]; // 0x530 + s16 unk4; // 0x530 + s16 unk6; // 0x532 s16 unk8; // 0x534 s16 unkA; // 0x536 s16 unkC; // 0x538 s16 unkE; // 0x53A s16 unk10; // 0x53C s16 unk12; // 0x53E - void (*unk14)(void *, s32, void *, s32); // TODO: fix void * to proper ptr types 0x540 + void (*unk14)(void *, const void *, void *, s32); // TODO: fix void * to proper ptr types 0x540 } SubStruct_52C; +typedef struct SubStruct_448 +{ + u8 unk0; + u8 unk1; + u8 unk2; + u8 unk3; + u8 unk4; + u8 unk5; + u16 unk6; + u16 unk8; + u16 unkA; +} SubStruct_448; + #define UNK_0_ARR_COUNT 14 #define UNK_3E0_ARR_COUNT 2 #define UNK_54C_ARR_COUNT 2 +typedef struct SubStruct_545 +{ + s16 unk0; + s16 unk2; + s16 unk4; + s16 unk6[4]; + s16 unkE; +} SubStruct_545; + // size: 0x55C typedef struct unkStruct_3001B70 { @@ -67,16 +90,11 @@ typedef struct unkStruct_3001B70 OpenedFile *unk43C; OpenedFile *unk440; s16 unk444; - u8 fill446[2]; - u8 unk448; - u8 unk449; - u8 unk44A; - u8 unk44B; - u8 unk44C; - u8 unk44D; - u8 fill44E[0x468-0x44E]; - s32 unk468; - s32 unk46C; + SubStruct_448 unk448; + SubStruct_545 unk454; + s16 unk464[2]; + const void *unk468; + const void *unk46C; u8 unk470; u8 unk471; u8 fill472[0x488-0x472]; diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c index 6b853f58c..a0f39bd10 100644 --- a/src/code_80A26CC.c +++ b/src/code_80A26CC.c @@ -507,12 +507,12 @@ void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) mapPtr->unk52A = 0; mapPtr->unk444 = -1; mapPtr->unk468 = 0; - mapPtr->unk448 = 0; - mapPtr->unk449 = 0; - mapPtr->unk44A = 0; - mapPtr->unk44B = 0; - mapPtr->unk44C = 0; - mapPtr->unk44D = 0; + mapPtr->unk448.unk0 = 0; + mapPtr->unk448.unk1 = 0; + mapPtr->unk448.unk2 = 0; + mapPtr->unk448.unk3 = 0; + mapPtr->unk448.unk4 = 0; + mapPtr->unk448.unk5 = 0; unk0Ptr = &mapPtr->unk0[0]; mapPtr->unk46C = 0; mapPtr->unk470 = 0; @@ -607,12 +607,12 @@ void sub_80A2E64(unkStruct_3001B70 *mapPtr) sub_80A2DD4(mapPtr); mapPtr->unk444 = -1; mapPtr->unk528 = 0; - mapPtr->unk448 = 0; - mapPtr->unk449 = 0; - mapPtr->unk44A = 0; - mapPtr->unk44B = 0; - mapPtr->unk44C = 0; - mapPtr->unk44D = 0; + mapPtr->unk448.unk0 = 0; + mapPtr->unk448.unk1 = 0; + mapPtr->unk448.unk2 = 0; + mapPtr->unk448.unk3 = 0; + mapPtr->unk448.unk4 = 0; + mapPtr->unk448.unk5 = 0; unk0Ptr = &mapPtr->unk0[0]; mapPtr->unk46C = 0; mapPtr->unk470 = 0; @@ -657,13 +657,42 @@ void sub_80A2E64(unkStruct_3001B70 *mapPtr) mapPtr->unk52A = 1; } +// RGB? +u8* sub_80A3908(void * a0, const void * a1, void * a2, SubStruct_448 *); +void sub_80A37C4(u16 * a0, const u16 *a1, SubStruct_52C *a2, SubStruct_545 *a3); +void _UncompressCell(void * a0, u16 *a1, const void * a2, SubStruct_52C *a3, SubStruct_545 *a4); + extern const struct unkStruct_81188F0 gUnknown_81188F0[10]; extern const FileArchive gGroundFileArchive; -/* +extern void sub_809971C(u16 a0, const void *a1, int a2); + +struct UnkFileStruct +{ + u8 unk0; + s16 unk2; + void *unk4[0]; // This is most likely wrong, will need to be fixed. +}; + void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) { + SubStruct_0 *sub0Ptr; + u16 r5; + s32 i, j, k; const struct unkStruct_81188F0 *dataPtr; + s16 *mapPtr_464; + SubStruct_545 *mapPtr_454; + const u16 *file_434; + const void *file_438; + const void *file_430; + SubStruct_448 *mapPtr_448; + struct S str2; + struct S str1; + const void *r7; + s32 unk0Id; + s32 id; + void *vramPtr; + s32 sum; s32 a1 = (s16) a1_; if (a1 == -1) { @@ -677,7 +706,158 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) mapPtr->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); mapPtr->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive); mapPtr->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive); + file_430 = mapPtr->unk430->data; + file_434 = mapPtr->unk434->data; + file_438 = mapPtr->unk438->data; + mapPtr_464 = mapPtr->unk464; + mapPtr_454 = &mapPtr->unk454; + mapPtr_448 = &mapPtr->unk448; + + mapPtr_464[0] = *(u8 *)(file_430); file_430 += 2; + mapPtr_464[1] = *(u8 *)(file_430); file_430 += 2; + + mapPtr_454->unk0 = *file_434++; + mapPtr_454->unk2 = *file_434++; + mapPtr_454->unk4 = *file_434++; + + sum = mapPtr_454->unk4; + for (k = 0; k < 4; k++) { + mapPtr_454->unk6[k] = *file_434++; + sum += mapPtr_454->unk6[k]; + } + mapPtr_454->unkE = *file_434++; + + mapPtr_448->unk0 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk1 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk2 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk3 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk4 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk5 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk6 = *(u8 *)(file_438); file_438 += 2; + mapPtr_448->unk8 = *(u8 *)(file_438); file_438 += 2; + mapPtr_448->unkA = *(u8 *)(file_438); file_438 += 2; + + r7 = file_430; + r5 = mapPtr->unk52C.unk0 * 16; + str2 = (struct S) {0}; + str1.x0.x0[0] = 0xff; + str1.x0.x0[1] = 0xff; + str1.x0.x0[2] = 0xff; + str1.x0.x0[3] = 0; + for (i = 0; i < mapPtr_464[0] && i < mapPtr->unk52C.unk2; i++) { + sub_8003810(r5++, str2); + sub_809971C(r5, r7, 15); + r5 += 15; + r7 += 60; + } + for (; i < mapPtr->unk52C.unk2; i++) { + sub_8003810(r5++, str2); + for (j = 0; j < 15; j++) { + sub_8003810(r5++, str1); + } + } + + sub_80A37C4((void *)(VRAM + 0x8000 + mapPtr->unk52C.unk4 * 32), file_434, &mapPtr->unk52C, &mapPtr->unk454); + _UncompressCell(mapPtr->unk548, &mapPtr->unk528, file_434 + ((mapPtr_454->unk4 - 1) * 16), &mapPtr->unk52C, &mapPtr->unk454); + file_438 = sub_80A3908(&mapPtr->unk54C, file_438, &mapPtr->unk52C, &mapPtr->unk448); + mapPtr->unk468 = file_438; + if (mapPtr->unk544 != NULL) { + mapPtr->unk52C.unk14(mapPtr->unk544, file_438, mapPtr_448, mapPtr->unk52C.unkE); + } + + sub0Ptr = mapPtr->unk0; + unk0Id = 0; + if (mapPtr_464[1] != 0) { + const s16 *r3 = file_430 + (mapPtr_464[0] * 60); + const void *r6 = &r3[mapPtr_464[0] * 2]; + + mapPtr->unk46C = r3; + mapPtr->unk470 = 1; + mapPtr->unk471 = 1; + for (; unk0Id < mapPtr_464[0] && unk0Id < mapPtr->unk52C.unk2; unk0Id++, sub0Ptr++, r3 += 2) { + if (r3[1] > 0) { + sub0Ptr->unk4 = r6; + r6 += r3[1] * 60; + } + else { + sub0Ptr->unk4 = NULL; + } + sub0Ptr->unk0 = 0; + sub0Ptr->unk2 = 0; + sub0Ptr->unk8 = 0; + } + } + else { + mapPtr->unk46C = NULL; + mapPtr->unk470 = 0; + mapPtr->unk471 = 0; + } + + for (; unk0Id < UNK_0_ARR_COUNT; unk0Id++, sub0Ptr++) { + sub0Ptr->unk0 = 0; + sub0Ptr->unk2 = 0; + sub0Ptr->unk4 = sub0Ptr->unk8 = 0; + } + + vramPtr = (void *)(VRAM + 0x8000 + (mapPtr->unk52C.unk4 + mapPtr_454->unk4) * 32); + for (id = 0; id < 2; id++) { + SubStruct_3E0 *sub3E0 = &mapPtr->unk3E0[id]; + if (dataPtr->text4[id] != NULL) { + const struct UnkFileStruct *fileStr; + const void *r1, *r0; + + sub3E0->unk8 = OpenFileAndGetFileDataPtr(dataPtr->text4[id], &gGroundFileArchive); + sub3E0->unk0 = 1; + sub3E0->unk1 = 1; + fileStr = sub3E0->unk8->data; + sub3E0->unkC = fileStr; + r1 = &fileStr->unk4; + r0 = r1 + fileStr->unk2 * 4; + sub3E0->unk10 = sub3E0->unk12 = r1; + sub3E0->unk14 = sub3E0->unk1C = r0; + sub3E0->unk2 = 0; + sub3E0->unk4 = (u32) fileStr->unk4[0]; // ? + sub3E0->unk20 = vramPtr; + sub3E0->unk24 = mapPtr_454->unk6[id] * 32; + + vramPtr += mapPtr_454->unk6[id] * 32; + } + else { + sub3E0->unk0 = 0; + sub3E0->unk1 = 0; + sub3E0->unk4 = 0; + sub3E0->unk2 = 0; + sub3E0->unk8 = NULL; + sub3E0->unkC = 0; + sub3E0->unk12 = 0; + sub3E0->unk10 = 0; + sub3E0->unk1C = 0; + sub3E0->unk14 = 0; + sub3E0->unk20 = 0; + sub3E0->unk24 = 0; + } + } + for (; id < 4; id++) { + if (dataPtr->text4[id] != NULL) { + s32 n; + OpenedFile *file = OpenFileAndGetFileDataPtr(dataPtr->text4[id], &gGroundFileArchive); + const struct UnkFileStruct *fileStr = file->data; + u16 *r1 = (void *) fileStr->unk4; + r1 += fileStr->unk2 * 2; + + n = mapPtr_454->unk6[id] * 16; + for (k = 0; k < n; k++) { + *(u16 *)(vramPtr) = *r1; + r1++; + vramPtr += 2; + } + CloseFile(file); + } + } + + sub_80A3BB0(mapPtr, 0); + sub_80A3EB0(&mapPtr->unk488); + mapPtr->unk52A = 1; } -*/ // From 8e7f66a45039924d726700e0d16f2e4c1ee98669 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 5 Jun 2025 14:02:30 +0200 Subject: [PATCH 04/11] sub_80A3440 --- asm/code_80A26CC_1.s | 434 ---------------------------------- include/code_8004AA0.h | 13 +- include/constants/dungeon.h | 3 +- include/ground_map.h | 10 +- include/structs/str_202EE8C.h | 18 ++ include/unk_dungeon_load.h | 9 + src/code_80A26CC.c | 144 ++++++++++- src/unk_dungeon_load_maybe.c | 3 +- 8 files changed, 181 insertions(+), 453 deletions(-) create mode 100644 include/structs/str_202EE8C.h create mode 100644 include/unk_dungeon_load.h diff --git a/asm/code_80A26CC_1.s b/asm/code_80A26CC_1.s index c49122c96..f13a348b7 100644 --- a/asm/code_80A26CC_1.s +++ b/asm/code_80A26CC_1.s @@ -7,440 +7,6 @@ - - thumb_func_start sub_80A3440 -sub_80A3440: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4C - mov r9, r0 - str r2, [sp, 0x34] - str r3, [sp, 0x38] - lsls r1, 16 - asrs r5, r1, 16 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - beq _080A3464 - ldrb r0, [r2] - cmp r0, 0x63 - bne _080A346C -_080A3464: - mov r0, r9 - bl sub_80A2E64 - b _080A376C -_080A346C: - mov r0, r9 - adds r1, r5, 0 - bl sub_80A2FBC - mov r0, r9 - bl sub_80A2DD4 - ldr r0, _080A377C - add r0, r9 - strh r5, [r0] - lsls r4, r5, 3 - subs r4, r5 - lsls r4, 2 - ldr r0, _080A3780 - adds r4, r0 - ldr r0, [r4] - ldr r5, _080A3784 - adds r1, r5, 0 - bl OpenFileAndGetFileDataPtr - movs r1, 0x86 - lsls r1, 3 - add r1, r9 - mov r8, r1 - str r0, [r1] - ldr r0, [r4, 0x4] - adds r1, r5, 0 - bl OpenFileAndGetFileDataPtr - ldr r6, _080A3788 - add r6, r9 - str r0, [r6] - ldr r0, [r4, 0x8] - adds r1, r5, 0 - bl OpenFileAndGetFileDataPtr - movs r1, 0x87 - lsls r1, 3 - add r1, r9 - str r0, [r1] - mov r2, r8 - ldr r1, [r2] - ldr r2, [r1, 0x4] - ldr r1, [r6] - ldr r3, [r1, 0x4] - ldr r7, [r0, 0x4] - ldr r1, _080A378C - add r1, r9 - ldr r4, _080A3790 - add r4, r9 - str r4, [sp, 0x3C] - movs r0, 0x89 - lsls r0, 3 - add r0, r9 - mov r10, r0 - ldrb r0, [r2] - strh r0, [r1] - ldrb r0, [r2, 0x2] - strh r0, [r1, 0x2] - ldrh r0, [r3] - strh r0, [r4] - adds r3, 0x2 - ldrh r0, [r3] - strh r0, [r4, 0x2] - adds r3, 0x2 - ldrh r0, [r3] - strh r0, [r4, 0x4] - adds r3, 0x2 - add r5, sp, 0x2C - ldr r1, _080A3794 - add r1, r9 - str r1, [sp, 0x48] - movs r2, 0x3 -_080A34FE: - ldrh r0, [r3] - strh r0, [r1] - adds r3, 0x2 - adds r1, 0x2 - subs r2, 0x1 - cmp r2, 0 - bge _080A34FE - ldrh r0, [r3] - movs r2, 0 - mov r8, r2 - ldr r4, [sp, 0x3C] - strh r0, [r4, 0xE] - ldrb r0, [r7] - mov r1, r10 - strb r0, [r1] - adds r7, 0x1 - ldrb r0, [r7] - strb r0, [r1, 0x1] - adds r7, 0x1 - ldrb r0, [r7] - strb r0, [r1, 0x2] - adds r7, 0x1 - ldrb r0, [r7] - strb r0, [r1, 0x3] - adds r7, 0x1 - ldrb r0, [r7] - strb r0, [r1, 0x4] - adds r7, 0x1 - ldrb r0, [r7] - strb r0, [r1, 0x5] - adds r7, 0x1 - ldrb r0, [r7] - strh r0, [r1, 0x6] - adds r7, 0x2 - ldrb r0, [r7] - strh r0, [r1, 0x8] - adds r7, 0x2 - ldrb r0, [r7] - strh r0, [r1, 0xA] - adds r7, 0x2 - ldr r4, _080A3798 - add r4, r9 - ldr r0, [r4] - str r0, [sp, 0x2C] - str r2, [r5, 0x4] - ldr r2, _080A379C - add r2, r9 - movs r3, 0x89 - lsls r3, 3 - add r3, r9 - adds r0, r5, 0 - adds r1, r7, 0 - bl sub_80A3908 - adds r7, r0, 0 - movs r0, 0x8D - lsls r0, 3 - add r0, r9 - str r7, [r0] - ldr r5, _080A37A0 - add r5, r9 - movs r6, 0x88 - lsls r6, 3 - add r6, r9 - ldr r2, _080A37A4 - movs r0, 0xA9 - lsls r0, 3 - add r0, r9 - ldr r3, [r0] - ldr r0, _080A37A8 - add r0, r9 - ldr r0, [r0] - str r0, [sp] - ldr r0, [sp, 0x34] - str r0, [sp, 0x4] - ldr r1, [sp, 0x38] - str r1, [sp, 0x8] - movs r0, 0x40 - str r0, [sp, 0xC] - mov r1, r10 - ldrb r0, [r1, 0x5] - str r0, [sp, 0x10] - ldr r0, [r4] - str r0, [sp, 0x14] - mov r0, r8 - str r0, [sp, 0x18] - adds r0, r5, 0 - adds r1, r6, 0 - bl sub_80ADD9C - ldr r0, [r5] - movs r1, 0 - bl GetFileDataPtr - ldr r0, [r6] - movs r1, 0 - bl GetFileDataPtr - movs r2, 0xA8 - lsls r2, 3 - add r2, r9 - ldr r0, [r4] - ldr r1, _080A37AC - add r1, r9 - movs r4, 0 - ldrsh r3, [r1, r4] - ldr r4, [r2] - adds r1, r7, 0 - mov r2, r10 - bl _call_via_r4 - movs r0, 0x80 - lsls r0, 2 - ldr r1, [sp, 0x3C] - strh r0, [r1, 0x4] - ldr r1, [sp, 0x48] - movs r2, 0 - adds r0, r1, 0x6 -_080A35EA: - strh r2, [r0] - subs r0, 0x2 - cmp r0, r1 - bge _080A35EA - movs r2, 0 - movs r0, 0xFA - ldr r4, [sp, 0x3C] - strh r0, [r4, 0xE] - ldr r1, _080A378C - add r1, r9 - movs r0, 0xC - strh r0, [r1] - ldr r0, _080A37B0 - add r0, r9 - strh r2, [r0] - ldr r0, _080A37A0 - add r0, r9 - ldr r0, [r0] - cmp r0, 0 - beq _080A36E6 - ldr r4, [r0, 0x4] - movs r7, 0 - str r7, [sp, 0x1C] - add r1, sp, 0x20 - movs r0, 0xFF - strb r0, [r1] - movs r0, 0x1 - negs r0, r0 - strb r0, [r1, 0x1] - strb r0, [r1, 0x2] - movs r0, 0 - strb r0, [r1, 0x3] - movs r5, 0 - ldr r0, _080A37B4 - add r0, r9 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r5, r0 - bge _080A36E6 - mov r2, sp - adds r2, 0x28 - str r2, [sp, 0x40] - mov r0, sp - adds r0, 0x29 - str r0, [sp, 0x44] - movs r1, 0x2A - add r1, sp - mov r10, r1 - movs r2, 0x2B - add r2, sp - mov r8, r2 -_080A3650: - adds r0, r7, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r7, r1, 16 - ldr r1, [sp, 0x1C] - bl sub_8003810 - adds r4, 0x4 - adds r6, r5, 0x1 - movs r5, 0xE -_080A3664: - ldrb r0, [r4] - ldr r1, [sp, 0x40] - strb r0, [r1] - ldrb r0, [r4, 0x1] - ldr r2, [sp, 0x44] - strb r0, [r2] - ldrb r0, [r4, 0x2] - mov r1, r10 - strb r0, [r1] - ldrb r0, [r4, 0x3] - mov r2, r8 - strb r0, [r2] - ldr r1, [sp, 0x28] - str r1, [sp, 0x24] - adds r0, r7, 0 - adds r2, r0, 0x1 - lsls r2, 16 - lsrs r7, r2, 16 - bl sub_8003810 - adds r4, 0x4 - subs r5, 0x1 - cmp r5, 0 - bge _080A3664 - adds r5, r6, 0 - cmp r5, 0xB - bgt _080A36A6 - ldr r0, _080A37B4 - add r0, r9 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r5, r0 - blt _080A3650 -_080A36A6: - ldr r0, _080A37B4 - add r0, r9 - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r5, r0 - bge _080A36E6 -_080A36B2: - adds r0, r7, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r7, r1, 16 - ldr r1, [sp, 0x1C] - bl sub_8003810 - adds r6, r5, 0x1 - movs r5, 0xE -_080A36C4: - adds r0, r7, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r7, r1, 16 - ldr r1, [sp, 0x20] - bl sub_8003810 - subs r5, 0x1 - cmp r5, 0 - bge _080A36C4 - adds r5, r6, 0 - ldr r0, _080A37B4 - add r0, r9 - movs r4, 0 - ldrsh r0, [r0, r4] - cmp r5, r0 - blt _080A36B2 -_080A36E6: - mov r4, r9 - movs r0, 0x88 - lsls r0, 3 - add r0, r9 - ldr r1, [r0] - cmp r1, 0 - beq _080A36FE - mov r0, r9 - adds r0, 0xE0 - movs r2, 0x20 - bl sub_8004AA4 -_080A36FE: - ldr r0, _080A37B8 - add r0, r9 - movs r1, 0 - str r1, [r0] - movs r0, 0x8E - lsls r0, 3 - add r0, r9 - strb r1, [r0] - ldr r0, _080A37BC - add r0, r9 - strb r1, [r0] - movs r0, 0 - movs r1, 0xD -_080A3718: - strh r0, [r4] - strh r0, [r4, 0x2] - str r0, [r4, 0x8] - str r0, [r4, 0x4] - subs r1, 0x1 - adds r4, 0x10 - cmp r1, 0 - bge _080A3718 - movs r1, 0 - movs r0, 0xF8 - lsls r0, 2 - add r0, r9 - movs r2, 0x1 -_080A3732: - strb r1, [r0] - strb r1, [r0, 0x1] - strh r1, [r0, 0x4] - strh r1, [r0, 0x2] - str r1, [r0, 0x8] - str r1, [r0, 0xC] - str r1, [r0, 0x14] - str r1, [r0, 0x10] - str r1, [r0, 0x1C] - str r1, [r0, 0x18] - str r1, [r0, 0x20] - str r1, [r0, 0x24] - adds r0, 0x28 - subs r2, 0x1 - cmp r2, 0 - bge _080A3732 - mov r0, r9 - movs r1, 0 - bl sub_80A3BB0 - movs r0, 0x91 - lsls r0, 3 - add r0, r9 - bl sub_80A3EB0 - ldr r1, _080A37C0 - add r1, r9 - movs r0, 0x1 - strb r0, [r1] -_080A376C: - add sp, 0x4C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080A377C: .4byte 0x00000444 -_080A3780: .4byte gUnknown_81188F0 -_080A3784: .4byte gGroundFileArchive -_080A3788: .4byte 0x00000434 -_080A378C: .4byte 0x00000464 -_080A3790: .4byte 0x00000454 -_080A3794: .4byte 0x0000045a -_080A3798: .4byte 0x00000544 -_080A379C: .4byte 0x0000052c -_080A37A0: .4byte 0x0000043c -_080A37A4: .4byte 0x06008000 -_080A37A8: .4byte 0x0000054c -_080A37AC: .4byte 0x0000053a -_080A37B0: .4byte 0x00000466 -_080A37B4: .4byte 0x0000052e -_080A37B8: .4byte 0x0000046c -_080A37BC: .4byte 0x00000471 -_080A37C0: .4byte 0x0000052a - thumb_func_end sub_80A3440 - thumb_func_start sub_80A37C4 sub_80A37C4: push {r4-r6,lr} diff --git a/include/code_8004AA0.h b/include/code_8004AA0.h index 100c497ef..ea28b2846 100644 --- a/include/code_8004AA0.h +++ b/include/code_8004AA0.h @@ -3,18 +3,7 @@ #include "file_system.h" #include "structs/rgb.h" - -// size: 0x18 -typedef struct unkStruct_202EE8C -{ - u32 unk0; - u16 unk4; - s16 unk6; - RGB *unk8; - RGB *unkC; - RGB *unk10; - RGB unk14; -} unkStruct_202EE8C; +#include "structs/str_202EE8C.h" extern unkStruct_202EE8C gUnknown_202EE8C[32]; diff --git a/include/constants/dungeon.h b/include/constants/dungeon.h index 982f4aa26..0b38c5a14 100644 --- a/include/constants/dungeon.h +++ b/include/constants/dungeon.h @@ -101,7 +101,8 @@ enum DungeonID DUNGEON_TEAM_RUMBLEROCK = 95, DUNGEON_RESCUE_TEAM_2 = 96, DUNGEON_RESCUE_TEAM_MAZE = 97, - NUM_DUNGEONS + NUM_DUNGEONS, + DUNGEON_INVALID, // 99 }; #define DUNGEON_FIRST_MAZE DUNGEON_NORMAL_MAZE_2 diff --git a/include/ground_map.h b/include/ground_map.h index 2b2729dc4..bb9fd7de7 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -2,6 +2,7 @@ #define GUARD_GROUND_MAP_H #include "structs/str_file_system.h" +#include "structs/str_202EE8C.h" typedef struct SubStruct_0 { @@ -65,6 +66,7 @@ typedef struct SubStruct_448 } SubStruct_448; #define UNK_0_ARR_COUNT 14 +#define UNK_E0_ARR_COUNT 32 #define UNK_3E0_ARR_COUNT 2 #define UNK_54C_ARR_COUNT 2 @@ -82,7 +84,7 @@ typedef struct SubStruct_545 typedef struct unkStruct_3001B70 { SubStruct_0 unk0[UNK_0_ARR_COUNT]; - u8 fillUnk[0x300]; + unkStruct_202EE8C unkE0[UNK_E0_ARR_COUNT]; SubStruct_3E0 unk3E0[UNK_3E0_ARR_COUNT]; OpenedFile *unk430; OpenedFile *unk434; @@ -102,9 +104,9 @@ typedef struct unkStruct_3001B70 u16 unk528; u8 unk52A; SubStruct_52C unk52C; - void *unk544; - void *unk548; - void *unk54C[UNK_54C_ARR_COUNT]; + u16 *unk544; + u32 *unk548; + u16 *unk54C[UNK_54C_ARR_COUNT]; u16 *unk554[UNK_54C_ARR_COUNT]; } unkStruct_3001B70; diff --git a/include/structs/str_202EE8C.h b/include/structs/str_202EE8C.h new file mode 100644 index 000000000..b12cea000 --- /dev/null +++ b/include/structs/str_202EE8C.h @@ -0,0 +1,18 @@ +#ifndef GUARD_STR_202EE8C_H +#define GUARD_STR_202EE8C_H + +#include "structs/rgb.h" + +// size: 0x18 +typedef struct unkStruct_202EE8C +{ + u32 unk0; + u16 unk4; + s16 unk6; + RGB *unk8; + RGB *unkC; + RGB *unk10; + RGB unk14; +} unkStruct_202EE8C; + +#endif // GUARD_STR_202EE8C_H diff --git a/include/unk_dungeon_load.h b/include/unk_dungeon_load.h new file mode 100644 index 000000000..e6b11461c --- /dev/null +++ b/include/unk_dungeon_load.h @@ -0,0 +1,9 @@ +#ifndef GUARD_UNK_DUNGEON_LOAD_H +#define GUARD_UNK_DUNGEON_LOAD_H + +#include "structs/str_file_system.h" +#include "structs/str_dungeon_location.h" + +void sub_80ADD9C(OpenedFile **a0, OpenedFile **a1, u32 *a2, u32 *a3, u16 *a4, DungeonLocation *a5, s32 a6, s32 a7, s32 a8, u16 *a9, s32 unused); + +#endif diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c index a0f39bd10..04fd190e8 100644 --- a/src/code_80A26CC.c +++ b/src/code_80A26CC.c @@ -471,6 +471,9 @@ UNUSED static const u8 *sub_80A2B28(u16 r0) #include "file_system.h" #include "code_8002774.h" #include "code_801D9E4.h" +#include "code_8004AA0.h" +#include "unk_dungeon_load.h" +#include "constants/dungeon.h" extern void sub_80A456C(unkStruct_3001B70 *, u32, const PixelPos *); extern const PixelPos gUnknown_81172B8; @@ -658,7 +661,7 @@ void sub_80A2E64(unkStruct_3001B70 *mapPtr) } // RGB? -u8* sub_80A3908(void * a0, const void * a1, void * a2, SubStruct_448 *); +u8* sub_80A3908(void * a0, const void * a1, SubStruct_52C * a2, SubStruct_448 *); void sub_80A37C4(u16 * a0, const u16 *a1, SubStruct_52C *a2, SubStruct_545 *a3); void _UncompressCell(void * a0, u16 *a1, const void * a2, SubStruct_52C *a3, SubStruct_545 *a4); @@ -860,4 +863,143 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) mapPtr->unk52A = 1; } +void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s32 a3) +{ + SubStruct_0 *sub0Ptr; + s32 k; + SubStruct_545 *mapPtr_454; + const u16 *file_434; + const void *file_438; + const void *file_430; + SubStruct_448 *mapPtr_448; + s32 unk0Id, sub3E0Id; + const struct unkStruct_81188F0 *dataPtr; + s16 *mapPtr_464; + u16 *unkPtrArray[2]; + s32 a1 = (s16) a1_; + + if (a1 == -1 || dungLoc->id == DUNGEON_INVALID) { + sub_80A2E64(mapPtr); + return; + } + + sub_80A2FBC(mapPtr, a1); + sub_80A2DD4(mapPtr); + mapPtr->unk444 = a1; + dataPtr = &gUnknown_81188F0[a1]; + mapPtr->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); + mapPtr->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive); + mapPtr->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive); + file_430 = mapPtr->unk430->data; + file_434 = mapPtr->unk434->data; + file_438 = mapPtr->unk438->data; + mapPtr_464 = mapPtr->unk464; + mapPtr_454 = &mapPtr->unk454; + mapPtr_448 = &mapPtr->unk448; + + mapPtr_464[0] = *(u8 *)(file_430); file_430 += 2; + mapPtr_464[1] = *(u8 *)(file_430); file_430 += 2; + + mapPtr_454->unk0 = *file_434++; + mapPtr_454->unk2 = *file_434++; + mapPtr_454->unk4 = *file_434++; + + for (k = 0; k < 4; k++) { + mapPtr_454->unk6[k] = *file_434++; + } + mapPtr_454->unkE = *file_434++; + + mapPtr_448->unk0 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk1 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk2 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk3 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk4 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk5 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk6 = *(u8 *)(file_438); file_438 += 2; + mapPtr_448->unk8 = *(u8 *)(file_438); file_438 += 2; + mapPtr_448->unkA = *(u8 *)(file_438); file_438 += 2; + + unkPtrArray[0] = mapPtr->unk544; + unkPtrArray[1] = NULL; + file_438 = sub_80A3908(unkPtrArray, file_438, &mapPtr->unk52C, &mapPtr->unk448); + mapPtr->unk468 = file_438; + sub_80ADD9C(&mapPtr->unk43C, &mapPtr->unk440, (void *)(VRAM + 0x8000), mapPtr->unk548, mapPtr->unk54C[0], dungLoc, a3, 0x40, mapPtr_448->unk5, mapPtr->unk544, 0); + // Unused return values + GetFileDataPtr(mapPtr->unk43C, 0); + GetFileDataPtr(mapPtr->unk440, 0); + + mapPtr->unk52C.unk14(mapPtr->unk544, file_438, mapPtr_448, mapPtr->unk52C.unkE); + mapPtr_454->unk4 = 0x200; + for (k = 0; k < 4; k++) { + mapPtr_454->unk6[k] = 0; + } + + mapPtr_454->unkE = 250; + mapPtr->unk464[0] = 12; + mapPtr->unk464[1] = 0; + if (mapPtr->unk43C != NULL) { + s32 i, j; + const struct S *strPtr = mapPtr->unk43C->data; + u16 r7 = 0; + struct S str0 = {0}; + struct S str1; + + str1.x0.x0[0] = 0xff; + str1.x0.x0[1] = 0xff; + str1.x0.x0[2] = 0xff; + str1.x0.x0[3] = 0; + + for (i = 0; i < 12 && i < mapPtr->unk52C.unk2; i++) { + sub_8003810(r7++, str0); + strPtr++; + for (j = 0; j < 15; j++) { + struct S str2 = {strPtr->x0.x0[0], strPtr->x0.x0[1], strPtr->x0.x0[2], strPtr->x0.x0[3]}; + sub_8003810(r7++, str2); + strPtr++; + } + } + for (; i < mapPtr->unk52C.unk2; i++) { + sub_8003810(r7++, str0); + for (j = 0; j < 15; j++) { + sub_8003810(r7++, str1); + } + } + } + + sub0Ptr = mapPtr->unk0; + if (mapPtr->unk440 != NULL) { + sub_8004AA4(mapPtr->unkE0, mapPtr->unk440, UNK_E0_ARR_COUNT); + } + mapPtr->unk46C = NULL; + mapPtr->unk470 = 0; + mapPtr->unk471 = 0; + + for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, sub0Ptr++) { + sub0Ptr->unk0 = 0; + sub0Ptr->unk2 = 0; + sub0Ptr->unk4 = sub0Ptr->unk8 = 0; + } + + for (sub3E0Id = 0; sub3E0Id < UNK_3E0_ARR_COUNT; sub3E0Id++) { + SubStruct_3E0 *sub3E0 = &mapPtr->unk3E0[sub3E0Id]; + sub3E0->unk0 = 0; + sub3E0->unk1 = 0; + sub3E0->unk4 = 0; + sub3E0->unk2 = 0; + sub3E0->unk8 = NULL; + sub3E0->unkC = 0; + sub3E0->unk12 = 0; + sub3E0->unk10 = 0; + sub3E0->unk1C = 0; + sub3E0->unk14 = 0; + sub3E0->unk20 = 0; + sub3E0->unk24 = 0; + } + sub_80A3BB0(mapPtr, 0); + sub_80A3EB0(&mapPtr->unk488); + mapPtr->unk52A = 1; + // bad sp alloc for compiler generated variables... + ASM_MATCH_TRICK(mapPtr_454->unk6[0]); +} + // diff --git a/src/unk_dungeon_load_maybe.c b/src/unk_dungeon_load_maybe.c index 7b8c8e936..77f8e880a 100644 --- a/src/unk_dungeon_load_maybe.c +++ b/src/unk_dungeon_load_maybe.c @@ -1,5 +1,6 @@ #include "global.h" #include "globaldata.h" +#include "unk_dungeon_load.h" #include "memory.h" #include "dungeon.h" #include "decompress_at.h" @@ -15,7 +16,7 @@ extern const u8 gUnknown_8108EC0[]; static s32 sub_80ADFB8(s32 a0, s32 a1, s32 a2, s32 a3, u16 *a4, s32 a5, u8 *a6, s32 a7); // This function is called when loading a transition between a dungeon and its summit, where the player can continue, save, or go back. -void sub_80ADD9C(OpenedFile **a0, OpenedFile **a1, u32 *a2, u32 *a3, u16 *a4, DungeonLocation *a5, s32 a6, s32 a7, s32 a8, u16 *a9) +void sub_80ADD9C(OpenedFile **a0, OpenedFile **a1, u32 *a2, u32 *a3, u16 *a4, DungeonLocation *a5, s32 a6, s32 a7, s32 a8, u16 *a9, s32 unused) { OpenedFile *file; s32 r8; From 3c29ff0535d60605ad59857398e3430cea18dcd0 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 5 Jun 2025 17:54:56 +0200 Subject: [PATCH 05/11] sub_80A3908 --- asm/code_80A26CC_1.s | 535 ------------------------------------------- include/ground_map.h | 4 +- src/code_80A26CC.c | 167 +++++++++++++- 3 files changed, 159 insertions(+), 547 deletions(-) diff --git a/asm/code_80A26CC_1.s b/asm/code_80A26CC_1.s index f13a348b7..b05cd0c45 100644 --- a/asm/code_80A26CC_1.s +++ b/asm/code_80A26CC_1.s @@ -7,541 +7,6 @@ - thumb_func_start sub_80A37C4 -sub_80A37C4: - push {r4-r6,lr} - adds r6, r2, 0 - adds r4, r1, 0 - adds r2, r0, 0 - movs r0, 0 - movs r1, 0xF -_080A37D0: - strh r0, [r2] - adds r2, 0x2 - subs r1, 0x1 - cmp r1, 0 - bge _080A37D0 - movs r0, 0x1 - movs r1, 0x4 - ldrsh r3, [r3, r1] - cmp r0, r3 - bge _080A37FE - adds r5, r3, 0 -_080A37E6: - adds r3, r0, 0x1 - movs r1, 0xF -_080A37EA: - ldrh r0, [r4] - strh r0, [r2] - adds r4, 0x2 - adds r2, 0x2 - subs r1, 0x1 - cmp r1, 0 - bge _080A37EA - adds r0, r3, 0 - cmp r0, r5 - blt _080A37E6 -_080A37FE: - movs r3, 0x6 - ldrsh r1, [r6, r3] - cmp r0, r1 - bge _080A3820 - ldr r3, _080A3828 - adds r4, r3, 0 - adds r5, r1, 0 -_080A380C: - adds r3, r0, 0x1 - movs r1, 0xF -_080A3810: - strh r4, [r2] - adds r2, 0x2 - subs r1, 0x1 - cmp r1, 0 - bge _080A3810 - adds r0, r3, 0 - cmp r0, r5 - blt _080A380C -_080A3820: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080A3828: .4byte 0x0000ffff - thumb_func_end sub_80A37C4 - - thumb_func_start _UncompressCell -_UncompressCell: - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r1, 0 - mov r8, r3 - ldr r3, [sp, 0x18] - adds r4, r2, 0 - adds r2, r0, 0 - mov r1, r8 - ldrh r0, [r1] - lsls r0, 12 - ldrh r1, [r1, 0x4] - orrs r0, r1 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r1, [r3] - ldr r0, _080A385C - cmp r1, r0 - bne _080A3860 - movs r0, 0x1 - strh r0, [r5] - movs r5, 0x4 - b _080A3890 - .align 2, 0 -_080A385C: .4byte 0x00020002 -_080A3860: - ldr r0, _080A3870 - cmp r1, r0 - bne _080A3874 - movs r0, 0x2 - strh r0, [r5] - movs r5, 0x9 - b _080A3890 - .align 2, 0 -_080A3870: .4byte 0x00030003 -_080A3874: - movs r0, 0 - strh r0, [r5] - ldr r0, _080A3888 - ldr r1, _080A388C - movs r4, 0 - ldrsh r2, [r3, r4] - movs r6, 0x2 - ldrsh r3, [r3, r6] - bl FatalError - .align 2, 0 -_080A3888: .4byte gUnknown_81172E8 -_080A388C: .4byte gUnknown_81172F4 -_080A3890: - movs r0, 0 - movs r1, 0x8 -_080A3894: - strh r0, [r2] - adds r2, 0x2 - subs r1, 0x1 - cmp r1, 0 - bge _080A3894 - movs r0, 0x1 - movs r7, 0xE - ldrsh r1, [r3, r7] - cmp r0, r1 - bge _080A38DC - mov r12, r1 -_080A38AA: - movs r1, 0 - adds r3, r0, 0x1 - cmp r1, r5 - bge _080A38C6 - adds r1, r5, 0 -_080A38B4: - ldrh r0, [r4] - adds r0, r6, r0 - strh r0, [r2] - adds r4, 0x2 - adds r2, 0x2 - subs r1, 0x1 - cmp r1, 0 - bne _080A38B4 - adds r1, r5, 0 -_080A38C6: - cmp r1, 0x8 - bgt _080A38D6 - movs r0, 0 -_080A38CC: - strh r0, [r2] - adds r2, 0x2 - adds r1, 0x1 - cmp r1, 0x8 - ble _080A38CC -_080A38D6: - adds r0, r3, 0 - cmp r0, r12 - blt _080A38AA -_080A38DC: - mov r1, r8 - movs r4, 0x8 - ldrsh r3, [r1, r4] - cmp r0, r3 - bge _080A38FE - movs r4, 0 - adds r5, r3, 0 -_080A38EA: - adds r3, r0, 0x1 - movs r1, 0x8 -_080A38EE: - strh r4, [r2] - adds r2, 0x2 - subs r1, 0x1 - cmp r1, 0 - bge _080A38EE - adds r0, r3, 0 - cmp r0, r5 - blt _080A38EA -_080A38FE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end _UncompressCell - - thumb_func_start sub_80A3908 -sub_80A3908: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - str r0, [sp] - str r2, [sp, 0x4] - mov r9, r3 - adds r6, r1, 0 - movs r2, 0 - ldr r1, [sp, 0x4] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r2, r0 - blt _080A392A - b _080A3B6C -_080A392A: - lsls r0, r2, 2 - ldr r4, [sp] - adds r0, r4 - ldr r0, [r0] - mov r12, r0 - movs r1, 0 - adds r2, 0x1 - str r2, [sp, 0x8] - mov r5, r9 - ldrb r5, [r5, 0x5] - cmp r1, r5 - blt _080A3944 - b _080A3B2A -_080A3944: - ldr r0, _080A39A4 - mov r10, r0 -_080A3948: - movs r2, 0 - mov r8, r2 - cmp r1, 0 - bne _080A3A18 - movs r3, 0x1 - str r3, [sp, 0xC] - mov r4, r9 - ldrb r4, [r4, 0x4] - cmp r1, r4 - blt _080A395E - b _080A3B04 -_080A395E: - ldrb r1, [r6] - adds r6, 0x1 - cmp r1, 0xBF - ble _080A39A8 - adds r2, r1, 0 - subs r2, 0xBF - cmp r1, 0xBF - ble _080A39A0 - ldr r5, _080A39A4 - adds r4, r5, 0 - adds r3, r2, 0 -_080A3974: - ldrb r1, [r6] - ldrb r0, [r6, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r6, 0x2] - lsls r0, 16 - orrs r1, r0 - adds r6, 0x3 - adds r0, r1, 0 - ands r0, r4 - mov r5, r12 - strh r0, [r5] - movs r0, 0x2 - add r12, r0 - asrs r1, 12 - ands r1, r4 - mov r5, r12 - strh r1, [r5] - add r12, r0 - subs r3, 0x1 - cmp r3, 0 - bne _080A3974 -_080A39A0: - lsls r0, r2, 1 - b _080A3A0C - .align 2, 0 -_080A39A4: .4byte 0x00000fff -_080A39A8: - cmp r1, 0x7F - ble _080A39EA - ldrb r2, [r6] - ldrb r0, [r6, 0x1] - lsls r0, 8 - orrs r2, r0 - ldrb r0, [r6, 0x2] - lsls r0, 16 - orrs r2, r0 - adds r6, 0x3 - adds r4, r1, 0 - subs r4, 0x7F - cmp r1, 0x7F - ble _080A39E6 - adds r0, r2, 0 - mov r1, r10 - ands r0, r1 - asrs r1, r2, 12 - mov r2, r10 - ands r1, r2 - adds r3, r4, 0 -_080A39D2: - mov r5, r12 - strh r0, [r5] - movs r2, 0x2 - add r12, r2 - mov r5, r12 - strh r1, [r5] - add r12, r2 - subs r3, 0x1 - cmp r3, 0 - bne _080A39D2 -_080A39E6: - lsls r0, r4, 1 - b _080A3A0C -_080A39EA: - movs r3, 0 - adds r0, r1, 0x1 - cmp r3, r1 - bgt _080A3A0A - movs r1, 0 - adds r3, r0, 0 -_080A39F6: - mov r2, r12 - strh r1, [r2] - movs r4, 0x2 - add r12, r4 - mov r5, r12 - strh r1, [r5] - add r12, r4 - subs r3, 0x1 - cmp r3, 0 - bne _080A39F6 -_080A3A0A: - lsls r0, 1 -_080A3A0C: - add r8, r0 - mov r0, r9 - ldrb r0, [r0, 0x4] - cmp r8, r0 - blt _080A395E - b _080A3B04 -_080A3A18: - mov r4, r12 - subs r4, 0x80 - adds r1, 0x1 - str r1, [sp, 0xC] - mov r1, r9 - ldrb r1, [r1, 0x4] - cmp r8, r1 - bge _080A3B04 -_080A3A28: - ldrb r1, [r6] - adds r6, 0x1 - cmp r1, 0xBF - ble _080A3A80 - adds r5, r1, 0 - subs r5, 0xBF - cmp r1, 0xBF - ble _080A3A78 - ldr r2, _080A3A7C - adds r7, r2, 0 - adds r3, r5, 0 -_080A3A3E: - ldrb r2, [r6] - ldrb r0, [r6, 0x1] - lsls r0, 8 - orrs r2, r0 - ldrb r0, [r6, 0x2] - lsls r0, 16 - orrs r2, r0 - adds r6, 0x3 - adds r0, r2, 0 - ands r0, r7 - ldrh r1, [r4] - eors r0, r1 - mov r1, r12 - strh r0, [r1] - adds r4, 0x2 - movs r0, 0x2 - add r12, r0 - asrs r2, 12 - ands r2, r7 - ldrh r0, [r4] - eors r2, r0 - mov r1, r12 - strh r2, [r1] - adds r4, 0x2 - movs r2, 0x2 - add r12, r2 - subs r3, 0x1 - cmp r3, 0 - bne _080A3A3E -_080A3A78: - lsls r0, r5, 1 - b _080A3AFA - .align 2, 0 -_080A3A7C: .4byte 0x00000fff -_080A3A80: - cmp r1, 0x7F - ble _080A3AD2 - ldrb r2, [r6] - ldrb r0, [r6, 0x1] - lsls r0, 8 - orrs r2, r0 - ldrb r0, [r6, 0x2] - lsls r0, 16 - orrs r2, r0 - adds r6, 0x3 - adds r7, r1, 0 - subs r7, 0x7F - cmp r1, 0x7F - ble _080A3ACE - adds r5, r2, 0 - mov r3, r10 - ands r5, r3 - asrs r2, 12 - ands r2, r3 - adds r3, r7, 0 -_080A3AA8: - ldrh r1, [r4] - adds r0, r5, 0 - eors r0, r1 - mov r1, r12 - strh r0, [r1] - adds r4, 0x2 - movs r0, 0x2 - add r12, r0 - ldrh r1, [r4] - adds r0, r2, 0 - eors r0, r1 - mov r1, r12 - strh r0, [r1] - adds r4, 0x2 - movs r0, 0x2 - add r12, r0 - subs r3, 0x1 - cmp r3, 0 - bne _080A3AA8 -_080A3ACE: - lsls r0, r7, 1 - b _080A3AFA -_080A3AD2: - movs r3, 0 - adds r2, r1, 0x1 - cmp r3, r1 - bgt _080A3AF8 - adds r3, r2, 0 -_080A3ADC: - ldrh r0, [r4] - mov r1, r12 - strh r0, [r1] - adds r4, 0x2 - movs r5, 0x2 - add r12, r5 - ldrh r0, [r4] - mov r1, r12 - strh r0, [r1] - adds r4, 0x2 - add r12, r5 - subs r3, 0x1 - cmp r3, 0 - bne _080A3ADC -_080A3AF8: - lsls r0, r2, 1 -_080A3AFA: - add r8, r0 - mov r2, r9 - ldrb r2, [r2, 0x4] - cmp r8, r2 - blt _080A3A28 -_080A3B04: - mov r3, r8 - cmp r3, 0x3F - bgt _080A3B1E - movs r0, 0 -_080A3B0C: - mov r4, r12 - strh r0, [r4] - movs r5, 0x2 - add r12, r5 - movs r1, 0x1 - add r8, r1 - mov r2, r8 - cmp r2, 0x3F - ble _080A3B0C -_080A3B1E: - ldr r1, [sp, 0xC] - mov r3, r9 - ldrb r3, [r3, 0x5] - cmp r1, r3 - bge _080A3B2A - b _080A3948 -_080A3B2A: - ldr r4, [sp, 0x4] - movs r5, 0x10 - ldrsh r0, [r4, r5] - cmp r1, r0 - bge _080A3B5E - movs r2, 0 -_080A3B36: - adds r1, 0x1 - str r1, [sp, 0xC] - movs r0, 0x3F - mov r8, r0 -_080A3B3E: - mov r1, r12 - strh r2, [r1] - movs r3, 0x2 - add r12, r3 - movs r4, 0x1 - negs r4, r4 - add r8, r4 - mov r5, r8 - cmp r5, 0 - bge _080A3B3E - ldr r1, [sp, 0xC] - ldr r3, [sp, 0x4] - movs r4, 0x10 - ldrsh r0, [r3, r4] - cmp r1, r0 - blt _080A3B36 -_080A3B5E: - ldr r2, [sp, 0x8] - ldr r5, [sp, 0x4] - movs r1, 0xC - ldrsh r0, [r5, r1] - cmp r2, r0 - bge _080A3B6C - b _080A392A -_080A3B6C: - adds r0, r6, 0 - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80A3908 thumb_func_start sub_80A3B80 sub_80A3B80: diff --git a/include/ground_map.h b/include/ground_map.h index bb9fd7de7..4ec83ee36 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -68,15 +68,15 @@ typedef struct SubStruct_448 #define UNK_0_ARR_COUNT 14 #define UNK_E0_ARR_COUNT 32 #define UNK_3E0_ARR_COUNT 2 - #define UNK_54C_ARR_COUNT 2 +#define UNK_545_UNK6_ARR_COUNT 4 typedef struct SubStruct_545 { s16 unk0; s16 unk2; s16 unk4; - s16 unk6[4]; + s16 unk6[UNK_545_UNK6_ARR_COUNT]; s16 unkE; } SubStruct_545; diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c index 04fd190e8..eb4381a38 100644 --- a/src/code_80A26CC.c +++ b/src/code_80A26CC.c @@ -472,6 +472,7 @@ UNUSED static const u8 *sub_80A2B28(u16 r0) #include "code_8002774.h" #include "code_801D9E4.h" #include "code_8004AA0.h" +#include "debug.h" #include "unk_dungeon_load.h" #include "constants/dungeon.h" @@ -660,9 +661,8 @@ void sub_80A2E64(unkStruct_3001B70 *mapPtr) mapPtr->unk52A = 1; } -// RGB? -u8* sub_80A3908(void * a0, const void * a1, SubStruct_52C * a2, SubStruct_448 *); -void sub_80A37C4(u16 * a0, const u16 *a1, SubStruct_52C *a2, SubStruct_545 *a3); +const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *a3); +void sub_80A37C4(void *vramDst, const u16 *src_, SubStruct_52C *a2, SubStruct_545 *a3); void _UncompressCell(void * a0, u16 *a1, const void * a2, SubStruct_52C *a3, SubStruct_545 *a4); extern const struct unkStruct_81188F0 gUnknown_81188F0[10]; @@ -724,7 +724,7 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) mapPtr_454->unk4 = *file_434++; sum = mapPtr_454->unk4; - for (k = 0; k < 4; k++) { + for (k = 0; k < UNK_545_UNK6_ARR_COUNT; k++) { mapPtr_454->unk6[k] = *file_434++; sum += mapPtr_454->unk6[k]; } @@ -762,7 +762,7 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) sub_80A37C4((void *)(VRAM + 0x8000 + mapPtr->unk52C.unk4 * 32), file_434, &mapPtr->unk52C, &mapPtr->unk454); _UncompressCell(mapPtr->unk548, &mapPtr->unk528, file_434 + ((mapPtr_454->unk4 - 1) * 16), &mapPtr->unk52C, &mapPtr->unk454); - file_438 = sub_80A3908(&mapPtr->unk54C, file_438, &mapPtr->unk52C, &mapPtr->unk448); + file_438 = sub_80A3908(mapPtr->unk54C, file_438, &mapPtr->unk52C, &mapPtr->unk448); mapPtr->unk468 = file_438; if (mapPtr->unk544 != NULL) { mapPtr->unk52C.unk14(mapPtr->unk544, file_438, mapPtr_448, mapPtr->unk52C.unkE); @@ -866,7 +866,7 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s32 a3) { SubStruct_0 *sub0Ptr; - s32 k; + s32 i; SubStruct_545 *mapPtr_454; const u16 *file_434; const void *file_438; @@ -904,8 +904,8 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s mapPtr_454->unk2 = *file_434++; mapPtr_454->unk4 = *file_434++; - for (k = 0; k < 4; k++) { - mapPtr_454->unk6[k] = *file_434++; + for (i = 0; i < UNK_545_UNK6_ARR_COUNT; i++) { + mapPtr_454->unk6[i] = *file_434++; } mapPtr_454->unkE = *file_434++; @@ -930,8 +930,8 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s mapPtr->unk52C.unk14(mapPtr->unk544, file_438, mapPtr_448, mapPtr->unk52C.unkE); mapPtr_454->unk4 = 0x200; - for (k = 0; k < 4; k++) { - mapPtr_454->unk6[k] = 0; + for (i = 0; i < UNK_545_UNK6_ARR_COUNT; i++) { + mapPtr_454->unk6[i] = 0; } mapPtr_454->unkE = 250; @@ -1002,4 +1002,151 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s ASM_MATCH_TRICK(mapPtr_454->unk6[0]); } +void sub_80A37C4(void *vramDst, const u16 *src_, SubStruct_52C *a2, SubStruct_545 *a3) +{ + const u16 *src = src_; + u16 *dst = vramDst; + s32 id, i; + + for (i = 0; i < 16; i++) { + *dst++ = 0; + } + for (id = 1; id < a3->unk4; id++) { + for (i = 0; i < 16; i++) { + *dst++ = *src++; + } + } + for (; id < a2->unk6; id++) { + for (i = 0; i < 16; i++) { + *dst++ = 0xFFFF; + } + } +} + +extern const DebugLocation gUnknown_81172E8; +extern const char gUnknown_81172F4[]; + +void _UncompressCell(void *dst_, u16 *a1, const void *src_, SubStruct_52C *a3, SubStruct_545 *a4) +{ + s32 id, i; + s32 n; + + const u16 *src = src_; + u16 *dst = dst_; + u16 r6 = (a3->unk0 << 12) | a3->unk4; + + if (a4->unk0 == 2 && a4->unk2 == 2) { + *a1 = 1; + n = 4; + } + else if (a4->unk0 == 3 && a4->unk2 == 3) { + *a1 = 2; + n = 9; + } + else { + *a1 = 0; + FatalError(&gUnknown_81172E8, gUnknown_81172F4, a4->unk0, a4->unk2); + } + + for (i = 0; i < 9; i++) { + *dst++ = 0; + } + for (id = 1; id < a4->unkE; id++) { + for (i = 0; i < n; i++) { + *dst++ = *src++ + r6; + } + for (; i < 9; i++) { + *dst++ = 0; + } + } + for (; id < a3->unk8; id++) { + for (i = 0; i < 9; i++) { + *dst++ = 0; + } + } +} + +// Tilemap decompression algorhitm? +const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *a3) +{ + s32 i, j, k, l; + const u8 *src = src_; + + for (i = 0; i < a2->unkC; i++) { + u16 *dst = dstArray[i]; + + for (j = 0; j < a3->unk5; j++) { + k = 0; + if (j == 0) { + while (k < a3->unk4) { + s32 val = *src++; + if (val > 191) { + for (l = 191; l < val; l++) { + s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; + *dst++ = dstVal & 0xFFF; + *dst++ = (dstVal >> 12) & 0xFFF; + } + k += (val - 191) * 2; + } + else if (val > 127) { + s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; + for (l = 127; l < val; l++) { + *dst++ = dstVal & 0xFFF; + *dst++ = (dstVal >> 12) & 0xFFF; + } + k += (val - 127) * 2; + } + else { + for (l = 0; l <= val; l++) { + *dst++ = 0; + *dst++ = 0; + } + k += (val + 1) * 2; + } + } + } + else { + u16 *ptrVal = dst - 64; + while (k < a3->unk4) { + s32 val = *src++; + if (val > 191) { + for (l = 191; l < val; l++) { + s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; + *dst++ = (dstVal & 0xFFF) ^ *ptrVal++; + *dst++ = ((dstVal >> 12) & 0xFFF) ^ *ptrVal++; + } + k += (val - 191) * 2; + } + else if (val > 127) { + s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; + for (l = 127; l < val; l++) { + *dst++ = (dstVal & 0xFFF) ^ *ptrVal++; + *dst++ = ((dstVal >> 12) & 0xFFF) ^ *ptrVal++; + } + k += (val - 127) * 2; + } + else { + for (l = 0; l <= val; l++) { + *dst++ = *ptrVal++; + *dst++ = *ptrVal++; + } + k += (val + 1) * 2; + } + } + } + + for (; k < 64; k++) { + *dst++ = 0; + } + } + for (; j < a2->unk10; j++) { + for (k = 0; k < 64; k++) { + *dst++ = 0; + } + } + } + + return src; +} + // From f0e6dc79cbd19a5fd0d689bdd446e82a1f578009 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 5 Jun 2025 18:49:56 +0200 Subject: [PATCH 06/11] sub_80A3BB0 --- asm/code_80A26CC_1.s | 239 ------------------------------------------- include/ground_map.h | 19 +++- src/code_80A26CC.c | 93 ++++++++++++++++- 3 files changed, 104 insertions(+), 247 deletions(-) diff --git a/asm/code_80A26CC_1.s b/asm/code_80A26CC_1.s index b05cd0c45..1d0f77a57 100644 --- a/asm/code_80A26CC_1.s +++ b/asm/code_80A26CC_1.s @@ -6,245 +6,6 @@ .text - - - thumb_func_start sub_80A3B80 -sub_80A3B80: - push {r4,lr} - adds r3, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - ldr r4, _080A3BA8 - adds r0, r3, r4 - ldr r0, [r0] - cmp r0, 0 - beq _080A3BA2 - adds r4, 0x4 - adds r0, r3, r4 - strb r1, [r0] - ldr r1, _080A3BAC - adds r0, r3, r1 - strb r2, [r0] -_080A3BA2: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080A3BA8: .4byte 0x0000046c -_080A3BAC: .4byte 0x00000471 - thumb_func_end sub_80A3B80 - - thumb_func_start sub_80A3BB0 -sub_80A3BB0: - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - adds r5, r0, 0 - lsls r1, 16 - asrs r1, 16 - adds r6, r1, 0 - movs r0, 0x91 - lsls r0, 3 - adds r0, r5 - mov r8, r0 - cmp r1, 0 - blt _080A3BD4 - cmp r1, 0x1 - ble _080A3BD4 - cmp r1, 0x4 - ble _080A3C00 -_080A3BD4: - ldr r1, _080A3BFC - adds r0, r5, r1 - movs r1, 0x1 - str r1, [r0] - movs r2, 0xA7 - lsls r2, 3 - adds r0, r5, r2 - movs r1, 0 - ldrsh r3, [r0, r1] - movs r0, 0 - cmp r6, 0x1 - bne _080A3BEE - movs r0, 0x1 -_080A3BEE: - str r0, [sp] - mov r0, r8 - adds r1, r5, 0 - movs r2, 0 - bl sub_80A3D40 - b _080A3C48 - .align 2, 0 -_080A3BFC: .4byte 0x00000474 -_080A3C00: - ldr r2, _080A3C88 - adds r0, r5, r2 - movs r7, 0x2 - str r7, [r0] - movs r0, 0xA7 - lsls r0, 3 - adds r4, r5, r0 - movs r2, 0 - ldrsh r0, [r4, r2] - subs r3, r0, 0x1 - movs r0, 0 - cmp r1, 0x4 - bne _080A3C1C - movs r0, 0x1 -_080A3C1C: - str r0, [sp] - mov r0, r8 - adds r1, r5, 0 - movs r2, 0 - bl sub_80A3D40 - movs r1, 0x9B - lsls r1, 3 - adds r0, r5, r1 - movs r1, 0 - ldrsh r2, [r4, r1] - subs r2, 0x1 - adds r3, r7, 0 - eors r3, r6 - negs r1, r3 - orrs r1, r3 - lsrs r1, 31 - str r1, [sp] - adds r1, r5, 0 - movs r3, 0x1 - bl sub_80A3D40 -_080A3C48: - movs r6, 0 - ldr r2, _080A3C88 - adds r0, r5, r2 - ldr r0, [r0] - cmp r6, r0 - bge _080A3CF0 - movs r0, 0x8F - lsls r0, 3 - adds r7, r5, r0 - mov r4, r8 -_080A3C5C: - adds r0, r5, 0 - adds r1, r6, 0 - ldr r2, _080A3C8C - bl sub_80A456C - movs r1, 0x4 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080A3C72 - cmp r0, 0x2 - beq _080A3CB4 -_080A3C72: - movs r2, 0 - ldrsh r0, [r4, r2] - cmp r0, 0x1 - beq _080A3C94 - cmp r0, 0x1 - ble _080A3C82 - cmp r0, 0x2 - beq _080A3C9C -_080A3C82: - ldr r0, _080A3C90 - b _080A3CD6 - .align 2, 0 -_080A3C88: .4byte 0x00000474 -_080A3C8C: .4byte gUnknown_8117314 -_080A3C90: .4byte sub_80A3EBC -_080A3C94: - ldr r0, _080A3C98 - b _080A3CD6 - .align 2, 0 -_080A3C98: .4byte sub_80A3EF4 -_080A3C9C: - ldrb r0, [r4, 0x6] - ldr r1, _080A3CAC - cmp r0, 0 - beq _080A3CA6 - ldr r1, _080A3CB0 -_080A3CA6: - str r1, [r4, 0x18] - b _080A3CD8 - .align 2, 0 -_080A3CAC: .4byte sub_80A4088 -_080A3CB0: .4byte sub_80A41C4 -_080A3CB4: - movs r1, 0 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080A3CCC - cmp r0, 0x1 - ble _080A3CC4 - cmp r0, 0x2 - beq _080A3CD4 -_080A3CC4: - ldr r0, _080A3CC8 - b _080A3CD6 - .align 2, 0 -_080A3CC8: .4byte sub_80A3ED4 -_080A3CCC: - ldr r0, _080A3CD0 - b _080A3CD6 - .align 2, 0 -_080A3CD0: .4byte sub_80A3F94 -_080A3CD4: - ldr r0, _080A3D34 -_080A3CD6: - str r0, [r4, 0x18] -_080A3CD8: - adds r0, r4, 0 - adds r1, r7, 0 - bl sub_80A3E14 - adds r7, 0x8 - adds r4, 0x50 - adds r6, 0x1 - ldr r2, _080A3D38 - adds r0, r5, r2 - ldr r0, [r0] - cmp r6, r0 - blt _080A3C5C -_080A3CF0: - ldr r1, _080A3D38 - adds r0, r5, r1 - ldr r6, [r0] - cmp r6, 0x1 - bgt _080A3D26 - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 4 - mov r2, r8 - adds r4, r0, r2 -_080A3D04: - adds r0, r5, 0 - adds r1, r6, 0 - ldr r2, _080A3D3C - bl sub_80A456C - movs r0, 0 - str r0, [sp] - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0 - movs r3, 0 - bl sub_80A3D40 - adds r4, 0x50 - adds r6, 0x1 - cmp r6, 0x1 - ble _080A3D04 -_080A3D26: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080A3D34: .4byte sub_80A4358 -_080A3D38: .4byte 0x00000474 -_080A3D3C: .4byte gUnknown_8117314 - thumb_func_end sub_80A3BB0 - thumb_func_start sub_80A3D40 sub_80A3D40: push {r4-r7,lr} diff --git a/include/ground_map.h b/include/ground_map.h index 4ec83ee36..1e51acbb5 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -3,6 +3,7 @@ #include "structs/str_file_system.h" #include "structs/str_202EE8C.h" +#include "structs/str_position.h" typedef struct SubStruct_0 { @@ -31,9 +32,17 @@ typedef struct SubStruct_3E0 typedef struct SubStruct_488 { - u8 fill0[0x18]; + s16 unk0; + u16 unk2; + s16 unk4; + u8 unk6; + s32 unk8; + s32 unkC; + s32 unk10; + s32 unk14; void (*unk18)(struct SubStruct_488 *); - u8 fill1C[0x84]; + s32 unk1C; + u8 fill1C[0x30]; } SubStruct_488; // size: 0x18? @@ -68,6 +77,7 @@ typedef struct SubStruct_448 #define UNK_0_ARR_COUNT 14 #define UNK_E0_ARR_COUNT 32 #define UNK_3E0_ARR_COUNT 2 +#define UNK_488_ARR_COUNT 2 #define UNK_54C_ARR_COUNT 2 #define UNK_545_UNK6_ARR_COUNT 4 @@ -99,8 +109,9 @@ typedef struct unkStruct_3001B70 const void *unk46C; u8 unk470; u8 unk471; - u8 fill472[0x488-0x472]; - struct SubStruct_488 unk488; + s32 unk474; + PixelPos unk478[UNK_488_ARR_COUNT]; + struct SubStruct_488 unk488[UNK_488_ARR_COUNT]; u16 unk528; u8 unk52A; SubStruct_52C unk52C; diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c index eb4381a38..fc5711291 100644 --- a/src/code_80A26CC.c +++ b/src/code_80A26CC.c @@ -463,7 +463,7 @@ UNUSED static const u8 *sub_80A2B28(u16 r0) return sub_80A2B18(GetScriptVarValue(NULL, GROUND_PLACE)); } -// TODO: Figure out if a new file starts here +// TODO: Figure out if a new file starts here. Edit: new file indeed starts here #include "ground_map.h" #include "text_1.h" @@ -657,7 +657,7 @@ void sub_80A2E64(unkStruct_3001B70 *mapPtr) } sub_80A3BB0(mapPtr, 0); - sub_80A3EB0(&mapPtr->unk488); + sub_80A3EB0(mapPtr->unk488); mapPtr->unk52A = 1; } @@ -859,7 +859,7 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) } sub_80A3BB0(mapPtr, 0); - sub_80A3EB0(&mapPtr->unk488); + sub_80A3EB0(mapPtr->unk488); mapPtr->unk52A = 1; } @@ -996,7 +996,7 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s sub3E0->unk24 = 0; } sub_80A3BB0(mapPtr, 0); - sub_80A3EB0(&mapPtr->unk488); + sub_80A3EB0(mapPtr->unk488); mapPtr->unk52A = 1; // bad sp alloc for compiler generated variables... ASM_MATCH_TRICK(mapPtr_454->unk6[0]); @@ -1149,4 +1149,89 @@ const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubSt return src; } +void sub_80A3B80(unkStruct_3001B70 *mapPtr, u8 a1, u8 a2) +{ + if (mapPtr->unk46C != NULL) { + mapPtr->unk470 = a1; + mapPtr->unk471 = a2; + } +} + +extern const PixelPos gUnknown_8117314; +void sub_80A3D40(SubStruct_488 *a0, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4); +void sub_80A3E14(SubStruct_488 *a0, PixelPos *a1); +void sub_80A3EBC(SubStruct_488 *a0); +void sub_80A3EF4(SubStruct_488 *a0); +void sub_80A4088(SubStruct_488 *a0); +void sub_80A41C4(SubStruct_488 *a0); +void sub_80A3ED4(SubStruct_488 *a0); +void sub_80A3F94(SubStruct_488 *a0); +void sub_80A4358(SubStruct_488 *a0); + +void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0_) +{ + s32 i; + // s16 memes strike yet again + s32 a0Match = (s16) a0_; + s32 a0 = a0Match; + + SubStruct_488 *map488 = mapPtr->unk488; + + switch (a0) { + default: + case 0: + case 1: + mapPtr->unk474 = 1; + sub_80A3D40(&map488[0], mapPtr, 0, mapPtr->unk52C.unkC, (a0 == 1)); + break; + case 2: + case 3: + case 4: + mapPtr->unk474 = 2; + sub_80A3D40(&map488[0], mapPtr, 0, mapPtr->unk52C.unkC - 1, (a0 == 4)); + sub_80A3D40(&map488[1], mapPtr, mapPtr->unk52C.unkC - 1, 1, (a0 != 2)); + break; + } + + for (i = 0; i < mapPtr->unk474; i++) { + sub_80A456C(mapPtr, i, &gUnknown_8117314); + switch (map488[i].unk4) { + default: + case 1: + switch (map488[i].unk0) { + default: + case 0: + map488[i].unk18 = sub_80A3EBC; + break; + case 1: + map488[i].unk18 = sub_80A3EF4; + break; + case 2: + map488[i].unk18 = (map488[i].unk6 != 0) ? sub_80A41C4 : sub_80A4088; + break; + } + break; + case 2: + switch (map488[i].unk0) { + default: + case 0: + map488[i].unk18 = sub_80A3ED4; + break; + case 1: + map488[i].unk18 = sub_80A3F94; + break; + case 2: + map488[i].unk18 = sub_80A4358; + break; + } + break; + } + sub_80A3E14(&map488[i], &mapPtr->unk478[i]); + } + for (i = mapPtr->unk474; i < UNK_488_ARR_COUNT; i++) { + sub_80A456C(mapPtr, i, &gUnknown_8117314); + sub_80A3D40(&map488[i], mapPtr, 0, 0, FALSE); + } +} + // From 3703625493ec3827b90389ae3f4e5ba5275293cf Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 5 Jun 2025 22:56:53 +0200 Subject: [PATCH 07/11] sub_80A3EF4 --- asm/code_80A26CC_1.s | 331 ----------------------------------- include/ground_map.h | 32 ++-- include/unk_dungeon_load.h | 2 +- src/code_80A26CC.c | 116 +++++++++++- src/unk_dungeon_load_maybe.c | 2 +- 5 files changed, 134 insertions(+), 349 deletions(-) diff --git a/asm/code_80A26CC_1.s b/asm/code_80A26CC_1.s index 1d0f77a57..e740ab04d 100644 --- a/asm/code_80A26CC_1.s +++ b/asm/code_80A26CC_1.s @@ -6,338 +6,7 @@ .text - thumb_func_start sub_80A3D40 -sub_80A3D40: - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r4, r0, 0 - adds r5, r1, 0 - mov r8, r3 - ldr r1, [sp, 0x1C] - movs r3, 0xA5 - lsls r3, 3 - adds r0, r5, r3 - ldrh r0, [r0] - strh r0, [r4] - strh r2, [r4, 0x2] - mov r7, r8 - strh r7, [r4, 0x4] - strb r1, [r4, 0x6] - ldr r1, _080A3E10 - adds r0, r5, r1 - ldrb r0, [r0] - str r0, [r4, 0x8] - subs r3, 0xDB - adds r0, r5, r3 - ldrb r0, [r0] - str r0, [r4, 0xC] - movs r7, 0x89 - lsls r7, 3 - adds r0, r5, r7 - ldrb r0, [r0] - lsls r0, 3 - str r0, [r4, 0x10] - subs r1, 0x3 - adds r0, r5, r1 - ldrb r0, [r0] - lsls r0, 3 - str r0, [r4, 0x14] - adds r3, 0xFB - adds r0, r5, r3 - ldr r0, [r0] - str r0, [r4, 0x1C] - movs r3, 0 - cmp r3, r8 - bge _080A3DE0 - adds r7, 0xF0 - adds r6, r5, r7 - movs r1, 0 - ldrsh r0, [r6, r1] - cmp r2, r0 - bge _080A3DE0 - lsls r0, r2, 2 - adds r7, 0x14 - adds r0, r7 - adds r1, r0, r5 - movs r0, 0x20 - adds r0, r4 - mov r12, r0 - movs r7, 0x28 - adds r7, r4 - mov r9, r7 -_080A3DB6: - ldr r0, [r1] - mov r7, r12 - adds r7, 0x4 - mov r12, r7 - subs r7, 0x4 - stm r7!, {r0} - ldr r0, [r1, 0x8] - mov r7, r9 - adds r7, 0x4 - mov r9, r7 - subs r7, 0x4 - stm r7!, {r0} - adds r3, 0x1 - adds r1, 0x4 - adds r2, 0x1 - cmp r3, r8 - bge _080A3DE0 - movs r7, 0 - ldrsh r0, [r6, r7] - cmp r2, r0 - blt _080A3DB6 -_080A3DE0: - cmp r3, 0x1 - bgt _080A3DF8 - movs r1, 0 - lsls r0, r3, 2 - adds r0, 0x20 - adds r0, r4 -_080A3DEC: - str r1, [r0] - str r1, [r0, 0x8] - adds r0, 0x4 - adds r3, 0x1 - cmp r3, 0x1 - ble _080A3DEC -_080A3DF8: - movs r0, 0x8F - lsls r0, 3 - adds r1, r5, r0 - adds r0, r4, 0 - bl sub_80A3E14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080A3E10: .4byte 0x0000044c - thumb_func_end sub_80A3D40 - thumb_func_start sub_80A3E14 -sub_80A3E14: - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r0, 0 - adds r0, r1, 0 - ldr r1, [r0] - mov r8, r1 - str r1, [r4, 0x30] - cmp r1, 0 - bge _080A3E2A - adds r1, 0x7 -_080A3E2A: - asrs r6, r1, 3 - str r6, [r4, 0x38] - ldr r7, [r0, 0x4] - str r7, [r4, 0x34] - adds r0, r7, 0 - cmp r7, 0 - bge _080A3E3A - adds r0, r7, 0x7 -_080A3E3A: - asrs r5, r0, 3 - str r5, [r4, 0x3C] - movs r3, 0 - ldrsh r2, [r4, r3] - cmp r2, 0x1 - beq _080A3E60 - cmp r2, 0x1 - bgt _080A3E50 - cmp r2, 0 - beq _080A3E56 - b _080A3EA4 -_080A3E50: - cmp r2, 0x2 - beq _080A3E7E - b _080A3EA4 -_080A3E56: - str r2, [r4, 0x40] - str r2, [r4, 0x44] - str r2, [r4, 0x48] - str r2, [r4, 0x4C] - b _080A3EA4 -_080A3E60: - lsrs r1, 31 - adds r1, r6, r1 - asrs r1, 1 - str r1, [r4, 0x40] - lsrs r0, 31 - adds r0, r5, r0 - asrs r0, 1 - str r0, [r4, 0x44] - lsls r1, 4 - mov r2, r8 - subs r1, r2, r1 - str r1, [r4, 0x48] - lsls r0, 4 - subs r0, r7, r0 - b _080A3EA2 -_080A3E7E: - adds r0, r6, 0 - movs r1, 0x3 - bl __divsi3 - str r0, [r4, 0x40] - adds r0, r5, 0 - movs r1, 0x3 - bl __divsi3 - str r0, [r4, 0x44] - lsls r0, r6, 3 - mov r3, r8 - subs r0, r3, r0 - str r0, [r4, 0x48] - adds r0, r7, 0 - movs r1, 0x18 - bl __modsi3 -_080A3EA2: - str r0, [r4, 0x4C] -_080A3EA4: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80A3E14 - - thumb_func_start sub_80A3EB0 -sub_80A3EB0: - push {lr} - ldr r1, [r0, 0x18] - bl _call_via_r1 - pop {r0} - bx r0 - thumb_func_end sub_80A3EB0 - - thumb_func_start sub_80A3EBC -sub_80A3EBC: - push {lr} - ldr r0, [r0, 0x28] - movs r2, 0 - movs r1, 0x80 - lsls r1, 3 -_080A3EC6: - strh r2, [r0] - adds r0, 0x2 - subs r1, 0x1 - cmp r1, 0 - bne _080A3EC6 - pop {r0} - bx r0 - thumb_func_end sub_80A3EBC - - thumb_func_start sub_80A3ED4 -sub_80A3ED4: - push {lr} - ldr r1, [r0, 0x28] - ldr r0, [r0, 0x2C] - movs r3, 0 - movs r2, 0x80 - lsls r2, 3 -_080A3EE0: - strh r3, [r1] - adds r1, 0x2 - strh r3, [r0] - adds r0, 0x2 - subs r2, 0x1 - cmp r2, 0 - bne _080A3EE0 - pop {r0} - bx r0 - thumb_func_end sub_80A3ED4 - - thumb_func_start sub_80A3EF4 -sub_80A3EF4: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - ldr r1, [r0, 0x44] - lsls r1, 6 - ldr r2, [r0, 0x40] - adds r1, r2 - lsls r1, 1 - ldr r2, [r0, 0x20] - adds r2, r1 - movs r1, 0 - mov r12, r1 - ldr r3, [r0, 0x28] - str r3, [sp, 0xC] - ldr r0, [r0, 0x1C] - mov r10, r0 - mov r0, sp - str r0, [sp, 0x8] -_080A3F1E: - adds r5, r2, 0 - movs r2, 0x80 - adds r2, r5 - mov r9, r2 - adds r1, 0x1 - mov r8, r1 - ldr r1, [sp, 0x8] - mov r3, r12 - lsls r0, r3, 1 - ldr r2, [sp, 0xC] - adds r0, r2 - movs r2, 0x1 -_080A3F36: - stm r1!, {r0} - adds r0, 0x40 - movs r3, 0x20 - add r12, r3 - subs r2, 0x1 - cmp r2, 0 - bge _080A3F36 - movs r4, 0 - mov r7, sp -_080A3F48: - ldrh r1, [r5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - mov r1, r10 - adds r3, r1, r0 - adds r5, 0x2 - adds r6, r4, 0x1 - adds r4, r7, 0 - movs r2, 0x1 -_080A3F5C: - ldr r0, [r4] - ldrh r1, [r3] - strh r1, [r0] - adds r3, 0x2 - adds r0, 0x2 - ldrh r1, [r3] - strh r1, [r0] - adds r3, 0x2 - adds r0, 0x2 - stm r4!, {r0} - subs r2, 0x1 - cmp r2, 0 - bge _080A3F5C - adds r4, r6, 0 - cmp r4, 0xF - ble _080A3F48 - mov r2, r9 - mov r1, r8 - cmp r1, 0xA - ble _080A3F1E - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80A3EF4 thumb_func_start sub_80A3F94 sub_80A3F94: diff --git a/include/ground_map.h b/include/ground_map.h index 1e51acbb5..051ec00d6 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -5,6 +5,12 @@ #include "structs/str_202EE8C.h" #include "structs/str_position.h" +#define UNK_0_ARR_COUNT 14 +#define UNK_E0_ARR_COUNT 32 +#define UNK_3E0_ARR_COUNT 2 +#define UNK_54C_ARR_COUNT 2 +#define UNK_545_UNK6_ARR_COUNT 4 + typedef struct SubStruct_0 { u16 unk0; @@ -30,19 +36,26 @@ typedef struct SubStruct_3E0 s32 unk24; } SubStruct_3E0; +// Note: not 100% about structs being PixelPos yet to verify + typedef struct SubStruct_488 { s16 unk0; u16 unk2; s16 unk4; - u8 unk6; + bool8 unk6; s32 unk8; s32 unkC; s32 unk10; s32 unk14; void (*unk18)(struct SubStruct_488 *); - s32 unk1C; - u8 fill1C[0x30]; + u16 *unk1C; + u16 *unk20[UNK_54C_ARR_COUNT]; + u16 *unk28[UNK_54C_ARR_COUNT]; + PixelPos unk30; + PixelPos unk38; + PixelPos unk40; + PixelPos unk48; } SubStruct_488; // size: 0x18? @@ -74,13 +87,6 @@ typedef struct SubStruct_448 u16 unkA; } SubStruct_448; -#define UNK_0_ARR_COUNT 14 -#define UNK_E0_ARR_COUNT 32 -#define UNK_3E0_ARR_COUNT 2 -#define UNK_488_ARR_COUNT 2 -#define UNK_54C_ARR_COUNT 2 -#define UNK_545_UNK6_ARR_COUNT 4 - typedef struct SubStruct_545 { s16 unk0; @@ -110,13 +116,13 @@ typedef struct unkStruct_3001B70 u8 unk470; u8 unk471; s32 unk474; - PixelPos unk478[UNK_488_ARR_COUNT]; - struct SubStruct_488 unk488[UNK_488_ARR_COUNT]; + PixelPos unk478[UNK_54C_ARR_COUNT]; + struct SubStruct_488 unk488[UNK_54C_ARR_COUNT]; u16 unk528; u8 unk52A; SubStruct_52C unk52C; u16 *unk544; - u32 *unk548; + u16 *unk548; u16 *unk54C[UNK_54C_ARR_COUNT]; u16 *unk554[UNK_54C_ARR_COUNT]; } unkStruct_3001B70; diff --git a/include/unk_dungeon_load.h b/include/unk_dungeon_load.h index e6b11461c..164691818 100644 --- a/include/unk_dungeon_load.h +++ b/include/unk_dungeon_load.h @@ -4,6 +4,6 @@ #include "structs/str_file_system.h" #include "structs/str_dungeon_location.h" -void sub_80ADD9C(OpenedFile **a0, OpenedFile **a1, u32 *a2, u32 *a3, u16 *a4, DungeonLocation *a5, s32 a6, s32 a7, s32 a8, u16 *a9, s32 unused); +void sub_80ADD9C(OpenedFile **a0, OpenedFile **a1, u32 *a2, void *a3, u16 *a4, DungeonLocation *a5, s32 a6, s32 a7, s32 a8, u16 *a9, s32 unused); #endif diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c index fc5711291..99520f33a 100644 --- a/src/code_80A26CC.c +++ b/src/code_80A26CC.c @@ -552,7 +552,7 @@ void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) void sub_80A2DD4(unkStruct_3001B70 *mapPtr); void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0); -void sub_80A3EB0(SubStruct_488 *mapSubstructPtr); +void sub_80A3EB0(SubStruct_488 *map488); void sub_80A2D00(unkStruct_3001B70 *mapPtr) { @@ -1207,7 +1207,7 @@ void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0_) map488[i].unk18 = sub_80A3EF4; break; case 2: - map488[i].unk18 = (map488[i].unk6 != 0) ? sub_80A41C4 : sub_80A4088; + map488[i].unk18 = (map488[i].unk6 != FALSE) ? sub_80A41C4 : sub_80A4088; break; } break; @@ -1228,10 +1228,120 @@ void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0_) } sub_80A3E14(&map488[i], &mapPtr->unk478[i]); } - for (i = mapPtr->unk474; i < UNK_488_ARR_COUNT; i++) { + for (i = mapPtr->unk474; i < UNK_54C_ARR_COUNT; i++) { sub_80A456C(mapPtr, i, &gUnknown_8117314); sub_80A3D40(&map488[i], mapPtr, 0, 0, FALSE); } } +void sub_80A3D40(SubStruct_488 *a0, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4) +{ + s32 i, j; + + a0->unk0 = mapPtr->unk528; + a0->unk2 = a2; + a0->unk4 = a3; + a0->unk6 = a4; + a0->unk8 = mapPtr->unk448.unk4; + a0->unkC = mapPtr->unk448.unk5; + a0->unk10 = mapPtr->unk448.unk0 * 8; + a0->unk14 = mapPtr->unk448.unk1 * 8; + a0->unk1C = mapPtr->unk548; + + for (i = 0, j = a2; i < a3 && j < mapPtr->unk52C.unkC; i++, j++) { + a0->unk20[i] = mapPtr->unk54C[j]; + a0->unk28[i] = mapPtr->unk554[j]; + } + for (; i < UNK_54C_ARR_COUNT; i++) { + a0->unk20[i] = NULL; + a0->unk28[i] = NULL; + } + + sub_80A3E14(a0, &mapPtr->unk478[0]); +} + +void sub_80A3E14(SubStruct_488 *a0, PixelPos *a1) +{ + a0->unk30.x = a1->x; + a0->unk38.x = a0->unk30.x / 8; + a0->unk30.y = a1->y; + a0->unk38.y = a0->unk30.y / 8; + + switch (a0->unk0) { + case 0: + a0->unk40.x = 0; + a0->unk40.y = 0; + a0->unk48.x = 0; + a0->unk48.y = 0; + break; + case 1: + a0->unk40.x = a0->unk38.x / 2; + a0->unk40.y = a0->unk38.y / 2; + a0->unk48.x = a0->unk30.x % 16; + a0->unk48.y = a0->unk30.y % 16; + break; + case 2: + a0->unk40.x = a0->unk38.x / 3; + a0->unk40.y = a0->unk38.y / 3; + a0->unk48.x = a0->unk30.x % 8; + a0->unk48.y = a0->unk30.y % 24; + break; + } +} + +void sub_80A3EB0(SubStruct_488 *map488) +{ + map488->unk18(map488); +} + +void sub_80A3EBC(SubStruct_488 *map488) +{ + s32 i; + u16 *dst = map488->unk28[0]; + + for (i = 0; i < 1024; i++) { + *dst++ = 0; + } +} + +void sub_80A3ED4(SubStruct_488 *map488) +{ + s32 i; + u16 *dst1 = map488->unk28[0]; + u16 *dst2 = map488->unk28[1]; + + for (i = 0; i < 1024; i++) { + *dst1++ = 0; + *dst2++ = 0; + } +} + +void sub_80A3EF4(SubStruct_488 *map488) +{ + s32 arrPtrId; + s32 i, j; + u16 *arrPtrs[2]; + u16 *ptr = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; + s32 unk28Id = 0; + + for (i = 0; i < 11; ptr += 64, i++) { + u16 *currPtr = ptr; + + for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { + arrPtrs[arrPtrId] = &map488->unk28[0][unk28Id]; + unk28Id += 32; + } + + for (j = 0; j < 16; j++) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = *currSrc++; + *currDst++ = *currSrc++; + arrPtrs[arrPtrId] = currDst; + } + } + } +} + // diff --git a/src/unk_dungeon_load_maybe.c b/src/unk_dungeon_load_maybe.c index 77f8e880a..b6e0554d6 100644 --- a/src/unk_dungeon_load_maybe.c +++ b/src/unk_dungeon_load_maybe.c @@ -16,7 +16,7 @@ extern const u8 gUnknown_8108EC0[]; static s32 sub_80ADFB8(s32 a0, s32 a1, s32 a2, s32 a3, u16 *a4, s32 a5, u8 *a6, s32 a7); // This function is called when loading a transition between a dungeon and its summit, where the player can continue, save, or go back. -void sub_80ADD9C(OpenedFile **a0, OpenedFile **a1, u32 *a2, u32 *a3, u16 *a4, DungeonLocation *a5, s32 a6, s32 a7, s32 a8, u16 *a9, s32 unused) +void sub_80ADD9C(OpenedFile **a0, OpenedFile **a1, u32 *a2, void *a3, u16 *a4, DungeonLocation *a5, s32 a6, s32 a7, s32 a8, u16 *a9, s32 unused) { OpenedFile *file; s32 r8; From fdf576263502f0e0b55ba945aaf3c9820eaa9675 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 6 Jun 2025 14:44:04 +0200 Subject: [PATCH 08/11] decompile code_80A26CC --- asm/code_80A26CC_1.s | 1537 ------------------------------------------ include/ground_map.h | 30 +- include/memory.h | 2 +- ld_script.ld | 1 - src/code_80A26CC.c | 729 +++++++++++++++++--- src/memory.c | 2 +- 6 files changed, 670 insertions(+), 1631 deletions(-) delete mode 100644 asm/code_80A26CC_1.s diff --git a/asm/code_80A26CC_1.s b/asm/code_80A26CC_1.s deleted file mode 100644 index e740ab04d..000000000 --- a/asm/code_80A26CC_1.s +++ /dev/null @@ -1,1537 +0,0 @@ - #include "asm/constants/gba_constants.inc" - #include "asm/macros.inc" - - .syntax unified - - .text - - - - - thumb_func_start sub_80A3F94 -sub_80A3F94: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x34 - ldr r1, [r0, 0x44] - lsls r1, 6 - ldr r2, [r0, 0x40] - adds r1, r2 - lsls r1, 1 - ldr r2, [r0, 0x20] - adds r3, r2, r1 - ldr r2, [r0, 0x24] - adds r2, r1 - movs r1, 0 - ldr r4, [r0, 0x28] - str r4, [sp, 0x2C] - ldr r5, [r0, 0x2C] - str r5, [sp, 0x18] - ldr r0, [r0, 0x1C] - str r0, [sp, 0x1C] - mov r0, sp - str r0, [sp, 0x10] - mov r4, sp - adds r4, 0x8 - str r4, [sp, 0x14] - movs r5, 0 - str r5, [sp, 0x30] -_080A3FCE: - mov r8, r3 - mov r12, r2 - mov r0, r8 - adds r0, 0x80 - str r0, [sp, 0x20] - mov r4, r12 - adds r4, 0x80 - str r4, [sp, 0x24] - adds r1, 0x1 - str r1, [sp, 0x28] - ldr r3, [sp, 0x14] - ldr r2, [sp, 0x10] - ldr r5, [sp, 0x30] - ldr r0, [sp, 0x18] - adds r1, r5, r0 - ldr r4, [sp, 0x2C] - adds r0, r5, r4 - movs r5, 0x1 -_080A3FF2: - stm r2!, {r0} - stm r3!, {r1} - adds r1, 0x40 - adds r0, 0x40 - ldr r4, [sp, 0x30] - adds r4, 0x40 - str r4, [sp, 0x30] - subs r5, 0x1 - cmp r5, 0 - bge _080A3FF2 - movs r2, 0 - ldr r5, [sp, 0x1C] - mov r9, r5 -_080A400C: - mov r0, r8 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - mov r1, r9 - adds r4, r1, r0 - movs r5, 0x2 - add r8, r5 - mov r0, r12 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - mov r1, r9 - adds r3, r1, r0 - add r12, r5 - movs r5, 0 - adds r2, 0x1 - mov r10, r2 - ldr r7, [sp, 0x14] - ldr r6, [sp, 0x10] -_080A4038: - ldr r1, [r6] - ldr r2, [r7] - ldrh r0, [r4] - strh r0, [r1] - adds r4, 0x2 - adds r1, 0x2 - ldrh r0, [r4] - strh r0, [r1] - adds r4, 0x2 - adds r1, 0x2 - ldrh r0, [r3] - strh r0, [r2] - adds r3, 0x2 - adds r2, 0x2 - ldrh r0, [r3] - strh r0, [r2] - adds r3, 0x2 - adds r2, 0x2 - stm r6!, {r1} - stm r7!, {r2} - adds r5, 0x1 - cmp r5, 0x1 - ble _080A4038 - mov r2, r10 - cmp r2, 0xF - ble _080A400C - ldr r3, [sp, 0x20] - ldr r2, [sp, 0x24] - ldr r1, [sp, 0x28] - cmp r1, 0xA - ble _080A3FCE - add sp, 0x34 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80A3F94 - - thumb_func_start sub_80A4088 -sub_80A4088: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - adds r4, r0, 0 - ldr r0, [r4, 0x38] - movs r1, 0x3 - bl __modsi3 - adds r7, r0, 0 - ldr r0, [r4, 0x44] - lsls r0, 6 - ldr r1, [r4, 0x40] - adds r0, r1 - lsls r0, 1 - ldr r1, [r4, 0x20] - adds r1, r0 - movs r0, 0 - mov r8, r0 - ldr r2, [r4, 0x28] - str r2, [sp, 0xC] - ldr r4, [r4, 0x1C] - mov r12, r4 -_080A40BA: - adds r5, r1, 0 - movs r1, 0x80 - adds r1, r5 - mov r9, r1 - adds r0, 0x1 - mov r10, r0 - mov r1, sp - mov r2, r8 - lsls r0, r2, 1 - ldr r2, [sp, 0xC] - adds r0, r2 - movs r3, 0x2 -_080A40D2: - stm r1!, {r0} - adds r0, 0x40 - movs r2, 0x20 - add r8, r2 - subs r3, 0x1 - cmp r3, 0 - bge _080A40D2 - cmp r7, 0 - beq _080A412E - ldrh r1, [r5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - mov r1, r12 - adds r2, r1, r0 - adds r5, 0x2 - cmp r7, 0x1 - bne _080A4116 - adds r2, 0x2 - mov r4, sp - movs r3, 0x2 -_080A40FC: - ldr r0, [r4] - ldrh r1, [r2] - strh r1, [r0] - adds r0, 0x2 - ldrh r1, [r2, 0x2] - strh r1, [r0] - adds r0, 0x2 - stm r4!, {r0} - adds r2, 0x6 - subs r3, 0x1 - cmp r3, 0 - bge _080A40FC - b _080A412E -_080A4116: - adds r2, 0x4 - mov r4, sp - movs r3, 0x2 -_080A411C: - ldr r1, [r4] - ldrh r0, [r2] - strh r0, [r1] - adds r1, 0x2 - stm r4!, {r1} - adds r2, 0x6 - subs r3, 0x1 - cmp r3, 0 - bge _080A411C -_080A412E: - movs r3, 0 -_080A4130: - ldrh r1, [r5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - mov r1, r12 - adds r2, r1, r0 - adds r5, 0x2 - adds r6, r3, 0x1 - mov r4, sp - movs r3, 0x2 -_080A4144: - ldr r1, [r4] - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - stm r4!, {r1} - subs r3, 0x1 - cmp r3, 0 - bge _080A4144 - adds r3, r6, 0 - cmp r3, 0x9 - ble _080A4130 - cmp r7, 0x1 - beq _080A41AA - ldrh r1, [r5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - mov r1, r12 - adds r2, r1, r0 - cmp r7, 0 - bne _080A4198 - mov r4, sp - movs r3, 0x2 -_080A4184: - ldm r4!, {r0} - ldrh r1, [r2] - strh r1, [r0] - ldrh r1, [r2, 0x2] - strh r1, [r0, 0x2] - adds r2, 0x6 - subs r3, 0x1 - cmp r3, 0 - bge _080A4184 - b _080A41AA -_080A4198: - mov r4, sp - movs r3, 0x2 -_080A419C: - ldm r4!, {r1} - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x6 - subs r3, 0x1 - cmp r3, 0 - bge _080A419C -_080A41AA: - mov r1, r9 - mov r0, r10 - cmp r0, 0x7 - ble _080A40BA - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80A4088 - - thumb_func_start sub_80A41C4 -sub_80A41C4: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - mov r8, r0 - ldr r0, [r0, 0x38] - movs r1, 0x3 - bl __modsi3 - str r0, [sp, 0xC] - mov r0, r8 - ldr r2, [r0, 0x44] - lsls r0, r2, 6 - mov r1, r8 - ldr r3, [r1, 0x40] - adds r0, r3 - lsls r0, 1 - ldr r1, [r1, 0x20] - adds r4, r1, r0 - movs r0, 0 - str r0, [sp, 0x10] - mov r1, r8 - ldr r0, [r1, 0xC] - subs r0, r2 - mov r10, r0 - ldr r0, [r1, 0x8] - subs r0, r3 - str r0, [sp, 0x14] - movs r2, 0 -_080A4202: - ldr r5, [sp, 0x14] - mov r3, r10 - cmp r3, 0 - ble _080A4212 - movs r0, 0x1 - negs r0, r0 - add r10, r0 - b _080A4222 -_080A4212: - mov r1, r8 - ldr r1, [r1, 0xC] - mov r10, r1 - mov r3, r8 - ldr r0, [r3, 0x40] - lsls r0, 1 - ldr r1, [r3, 0x20] - adds r4, r1, r0 -_080A4222: - adds r6, r4, 0 - mov r0, r8 - ldr r1, [r0, 0x28] - ldrh r7, [r4] - ldr r3, [r0, 0x1C] - mov r9, r3 - adds r0, r4, 0x2 - mov r12, r0 - adds r4, 0x80 - str r4, [sp, 0x18] - adds r2, 0x1 - str r2, [sp, 0x1C] - mov r2, sp - ldr r3, [sp, 0x10] - lsls r0, r3, 1 - adds r0, r1 - movs r3, 0x2 -_080A4244: - stm r2!, {r0} - adds r0, 0x40 - ldr r4, [sp, 0x10] - adds r4, 0x20 - str r4, [sp, 0x10] - subs r3, 0x1 - cmp r3, 0 - bge _080A4244 - ldr r0, [sp, 0xC] - cmp r0, 0 - beq _080A42B2 - lsls r0, r7, 3 - adds r0, r7 - lsls r0, 1 - mov r1, r9 - adds r2, r1, r0 - mov r6, r12 - ldr r3, [sp, 0xC] - cmp r3, 0x1 - bne _080A428C - adds r2, 0x2 - mov r4, sp - movs r3, 0x2 -_080A4272: - ldr r0, [r4] - ldrh r1, [r2] - strh r1, [r0] - adds r0, 0x2 - ldrh r1, [r2, 0x2] - strh r1, [r0] - adds r0, 0x2 - stm r4!, {r0} - adds r2, 0x6 - subs r3, 0x1 - cmp r3, 0 - bge _080A4272 - b _080A42A4 -_080A428C: - adds r2, 0x4 - mov r4, sp - movs r3, 0x2 -_080A4292: - ldr r1, [r4] - ldrh r0, [r2] - strh r0, [r1] - adds r1, 0x2 - stm r4!, {r1} - adds r2, 0x6 - subs r3, 0x1 - cmp r3, 0 - bge _080A4292 -_080A42A4: - subs r5, 0x1 - cmp r5, 0 - bgt _080A42B2 - mov r4, r8 - ldr r5, [r4, 0x8] - lsls r0, r5, 1 - subs r6, r0 -_080A42B2: - movs r3, 0 -_080A42B4: - ldrh r1, [r6] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - mov r1, r9 - adds r2, r1, r0 - adds r6, 0x2 - subs r5, 0x1 - adds r7, r3, 0x1 - mov r4, sp - movs r3, 0x2 -_080A42CA: - ldr r1, [r4] - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - stm r4!, {r1} - subs r3, 0x1 - cmp r3, 0 - bge _080A42CA - cmp r5, 0 - bgt _080A42F8 - mov r3, r8 - ldr r5, [r3, 0x8] - lsls r0, r5, 1 - subs r6, r0 -_080A42F8: - adds r3, r7, 0 - cmp r3, 0x9 - ble _080A42B4 - ldr r4, [sp, 0xC] - cmp r4, 0x1 - beq _080A433E - ldrh r1, [r6] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - mov r1, r9 - adds r2, r1, r0 - cmp r4, 0 - bne _080A432C - mov r4, sp - movs r3, 0x2 -_080A4318: - ldm r4!, {r0} - ldrh r1, [r2] - strh r1, [r0] - ldrh r1, [r2, 0x2] - strh r1, [r0, 0x2] - adds r2, 0x6 - subs r3, 0x1 - cmp r3, 0 - bge _080A4318 - b _080A433E -_080A432C: - mov r4, sp - movs r3, 0x2 -_080A4330: - ldm r4!, {r1} - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x6 - subs r3, 0x1 - cmp r3, 0 - bge _080A4330 -_080A433E: - ldr r4, [sp, 0x18] - ldr r2, [sp, 0x1C] - cmp r2, 0x7 - bgt _080A4348 - b _080A4202 -_080A4348: - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80A41C4 - - thumb_func_start sub_80A4358 -sub_80A4358: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x3C - adds r4, r0, 0 - ldr r0, [r4, 0x38] - movs r1, 0x3 - bl __modsi3 - str r0, [sp, 0x18] - ldr r0, [r4, 0x44] - lsls r0, 6 - ldr r1, [r4, 0x40] - adds r0, r1 - lsls r0, 1 - ldr r1, [r4, 0x20] - adds r2, r1, r0 - ldr r1, [r4, 0x24] - adds r1, r0 - movs r0, 0 - ldr r3, [r4, 0x28] - str r3, [sp, 0x24] - ldr r5, [r4, 0x2C] - str r5, [sp, 0x28] - ldr r4, [r4, 0x1C] - str r4, [sp, 0x20] - mov r3, sp - adds r3, 0xC - str r3, [sp, 0x1C] - movs r4, 0 - str r4, [sp, 0x38] -_080A439A: - mov r12, r2 - mov r8, r1 - mov r5, r12 - adds r5, 0x80 - str r5, [sp, 0x30] - adds r1, 0x80 - str r1, [sp, 0x34] - adds r0, 0x1 - str r0, [sp, 0x2C] - add r3, sp, 0xC - mov r2, sp - ldr r4, [sp, 0x38] - ldr r5, [sp, 0x28] - adds r1, r4, r5 - ldr r5, [sp, 0x24] - adds r0, r4, r5 - movs r5, 0x2 -_080A43BC: - stm r2!, {r0} - stm r3!, {r1} - adds r1, 0x40 - adds r0, 0x40 - ldr r4, [sp, 0x38] - adds r4, 0x40 - str r4, [sp, 0x38] - subs r5, 0x1 - cmp r5, 0 - bge _080A43BC - ldr r5, [sp, 0x18] - cmp r5, 0 - beq _080A445C - mov r0, r12 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - ldr r1, [sp, 0x20] - adds r4, r1, r0 - movs r3, 0x2 - add r12, r3 - mov r5, r8 - ldrh r1, [r5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - ldr r1, [sp, 0x20] - adds r3, r1, r0 - movs r5, 0x2 - add r8, r5 - ldr r0, [sp, 0x18] - cmp r0, 0x1 - bne _080A4434 - adds r4, 0x2 - adds r3, 0x2 - ldr r7, [sp, 0x1C] - mov r6, sp -_080A4408: - ldr r1, [r6] - ldr r2, [r7] - ldrh r0, [r4] - strh r0, [r1] - adds r1, 0x2 - ldrh r0, [r4, 0x2] - strh r0, [r1] - adds r1, 0x2 - ldrh r0, [r3] - strh r0, [r2] - adds r2, 0x2 - ldrh r0, [r3, 0x2] - strh r0, [r2] - adds r2, 0x2 - stm r6!, {r1} - stm r7!, {r2} - adds r4, 0x6 - adds r3, 0x6 - subs r5, 0x1 - cmp r5, 0 - bge _080A4408 - b _080A445C -_080A4434: - adds r4, 0x4 - adds r3, 0x4 - ldr r6, [sp, 0x1C] - mov r2, sp - movs r5, 0x2 -_080A443E: - ldr r1, [r2] - ldrh r0, [r4] - strh r0, [r1] - adds r1, 0x2 - stm r2!, {r1} - ldr r1, [r6] - ldrh r0, [r3] - strh r0, [r1] - adds r1, 0x2 - stm r6!, {r1} - adds r4, 0x6 - adds r3, 0x6 - subs r5, 0x1 - cmp r5, 0 - bge _080A443E -_080A445C: - movs r2, 0 - ldr r1, [sp, 0x20] - mov r9, r1 -_080A4462: - mov r3, r12 - ldrh r1, [r3] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - mov r5, r9 - adds r4, r5, r0 - movs r0, 0x2 - add r12, r0 - mov r3, r8 - ldrh r1, [r3] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - adds r3, r5, r0 - movs r5, 0x2 - add r8, r5 - movs r5, 0 - adds r2, 0x1 - mov r10, r2 - mov r7, sp - add r6, sp, 0xC -_080A448E: - ldr r1, [r7] - ldr r2, [r6] - ldrh r0, [r4] - strh r0, [r1] - adds r4, 0x2 - adds r1, 0x2 - ldrh r0, [r4] - strh r0, [r1] - adds r4, 0x2 - adds r1, 0x2 - ldrh r0, [r4] - strh r0, [r1] - adds r4, 0x2 - adds r1, 0x2 - ldrh r0, [r3] - strh r0, [r2] - adds r3, 0x2 - adds r2, 0x2 - ldrh r0, [r3] - strh r0, [r2] - adds r3, 0x2 - adds r2, 0x2 - ldrh r0, [r3] - strh r0, [r2] - adds r3, 0x2 - adds r2, 0x2 - stm r7!, {r1} - stm r6!, {r2} - adds r5, 0x1 - cmp r5, 0x2 - ble _080A448E - mov r2, r10 - cmp r2, 0x9 - ble _080A4462 - ldr r0, [sp, 0x18] - cmp r0, 0x1 - beq _080A453A - mov r3, r12 - ldrh r1, [r3] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - ldr r5, [sp, 0x20] - adds r4, r5, r0 - mov r0, r8 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 1 - adds r3, r5, r0 - ldr r1, [sp, 0x18] - cmp r1, 0 - bne _080A451E - ldr r7, [sp, 0x1C] - mov r6, sp - movs r5, 0x2 -_080A44FE: - ldm r6!, {r1} - ldm r7!, {r2} - ldrh r0, [r4] - strh r0, [r1] - ldrh r0, [r4, 0x2] - strh r0, [r1, 0x2] - ldrh r0, [r3] - strh r0, [r2] - ldrh r0, [r3, 0x2] - strh r0, [r2, 0x2] - adds r4, 0x6 - adds r3, 0x6 - subs r5, 0x1 - cmp r5, 0 - bge _080A44FE - b _080A453A -_080A451E: - ldr r6, [sp, 0x1C] - mov r2, sp - movs r5, 0x2 -_080A4524: - ldm r2!, {r1} - ldrh r0, [r4] - strh r0, [r1] - ldm r6!, {r1} - ldrh r0, [r3] - strh r0, [r1] - adds r4, 0x6 - adds r3, 0x6 - subs r5, 0x1 - cmp r5, 0 - bge _080A4524 -_080A453A: - ldr r2, [sp, 0x30] - ldr r1, [sp, 0x34] - ldr r0, [sp, 0x2C] - cmp r0, 0x7 - bgt _080A4546 - b _080A439A -_080A4546: - add sp, 0x3C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80A4358 - - thumb_func_start sub_80A4558 -sub_80A4558: - lsls r1, 3 - movs r3, 0x8F - lsls r3, 3 - adds r0, r3 - adds r0, r1 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [r2] - str r1, [r2, 0x4] - bx lr - thumb_func_end sub_80A4558 - - thumb_func_start sub_80A456C -sub_80A456C: - lsls r1, 3 - movs r3, 0x8F - lsls r3, 3 - adds r0, r3 - adds r0, r1 - ldr r1, [r2] - ldr r2, [r2, 0x4] - str r1, [r0] - str r2, [r0, 0x4] - bx lr - thumb_func_end sub_80A456C - - thumb_func_start sub_80A4580 -sub_80A4580: - push {r4,lr} - adds r3, r2, 0 - lsls r2, r1, 2 - adds r2, r1 - lsls r2, 4 - movs r1, 0x91 - lsls r1, 3 - adds r2, r1 - adds r2, r0, r2 - ldr r0, [r3] - cmp r0, 0 - bge _080A45AE - ldrb r0, [r2, 0x6] - ldr r4, [r3, 0x4] - cmp r0, 0 - beq _080A45CA - ldr r1, [r2, 0x10] -_080A45A2: - ldr r0, [r3] - adds r0, r1 - str r0, [r3] - cmp r0, 0 - blt _080A45A2 - b _080A45CC -_080A45AE: - ldr r1, [r2, 0x10] - ldr r4, [r3, 0x4] - cmp r0, r1 - blt _080A45CC - ldrb r0, [r2, 0x6] - cmp r0, 0 - beq _080A45C8 -_080A45BC: - ldr r0, [r3] - subs r0, r1 - str r0, [r3] - cmp r0, r1 - bge _080A45BC - b _080A45CC -_080A45C8: - subs r0, r1, 0x1 -_080A45CA: - str r0, [r3] -_080A45CC: - cmp r4, 0 - bge _080A45E4 - ldrb r0, [r2, 0x6] - cmp r0, 0 - beq _080A45FE - ldr r1, [r2, 0x14] -_080A45D8: - ldr r0, [r3, 0x4] - adds r0, r1 - str r0, [r3, 0x4] - cmp r0, 0 - blt _080A45D8 - b _080A4600 -_080A45E4: - ldr r1, [r2, 0x14] - cmp r4, r1 - blt _080A4600 - ldrb r0, [r2, 0x6] - cmp r0, 0 - beq _080A45FC -_080A45F0: - ldr r0, [r3, 0x4] - subs r0, r1 - str r0, [r3, 0x4] - cmp r0, r1 - bge _080A45F0 - b _080A4600 -_080A45FC: - subs r0, r1, 0x1 -_080A45FE: - str r0, [r3, 0x4] -_080A4600: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80A4580 - - thumb_func_start sub_80A4608 -sub_80A4608: - movs r3, 0x89 - lsls r3, 3 - adds r2, r0, r3 - ldrb r2, [r2] - str r2, [r1] - ldr r2, _080A461C - adds r0, r2 - ldrb r0, [r0] - str r0, [r1, 0x4] - bx lr - .align 2, 0 -_080A461C: .4byte 0x00000449 - thumb_func_end sub_80A4608 - - thumb_func_start sub_80A4620 -sub_80A4620: - movs r3, 0x89 - lsls r3, 3 - adds r2, r0, r3 - ldrb r2, [r2] - lsls r2, 3 - str r2, [r1] - ldr r2, _080A4638 - adds r0, r2 - ldrb r0, [r0] - lsls r0, 3 - str r0, [r1, 0x4] - bx lr - .align 2, 0 -_080A4638: .4byte 0x00000449 - thumb_func_end sub_80A4620 - - thumb_func_start GetDungeonBounds -GetDungeonBounds: - movs r3, 0 - str r3, [r1] - str r3, [r1, 0x4] - movs r3, 0x89 - lsls r3, 3 - adds r1, r0, r3 - ldrb r1, [r1] - lsls r1, 11 - str r1, [r2] - ldr r1, _080A465C - adds r0, r1 - ldrb r0, [r0] - lsls r0, 11 - str r0, [r2, 0x4] - bx lr - .align 2, 0 -_080A465C: .4byte 0x00000449 - thumb_func_end GetDungeonBounds - - thumb_func_start sub_80A4660 -sub_80A4660: - push {r4-r7,lr} - adds r6, r3, 0 - lsls r1, 24 - lsrs r5, r1, 24 - ldr r1, _080A4678 - adds r0, r1 - ldr r4, [r0] - cmp r4, 0 - bne _080A467C - movs r0, 0 - b _080A46B6 - .align 2, 0 -_080A4678: .4byte 0x00000544 -_080A467C: - ldr r0, [r2, 0x4] - lsls r0, 8 - ldr r1, [r2] - adds r0, r1 - ldr r1, _080A46BC - adds r0, r1 - adds r4, r0 - ldr r3, [r6, 0x4] - cmp r3, 0 - ble _080A46B4 - movs r7, 0x80 - lsls r7, 1 -_080A4694: - ldr r1, [r6] - adds r2, r4, 0 - cmp r1, 0 - ble _080A46AC -_080A469C: - ldrb r0, [r2] - ands r0, r5 - adds r2, 0x1 - cmp r0, 0 - bne _080A46B6 - subs r1, 0x1 - cmp r1, 0 - bgt _080A469C -_080A46AC: - adds r4, r7 - subs r3, 0x1 - cmp r3, 0 - bgt _080A4694 -_080A46B4: - movs r0, 0 -_080A46B6: - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080A46BC: .4byte 0x00000405 - thumb_func_end sub_80A4660 - - thumb_func_start sub_80A46C0 -sub_80A46C0: - push {r4-r7,lr} - adds r6, r3, 0 - lsls r1, 24 - lsrs r5, r1, 24 - ldr r1, _080A46D8 - adds r0, r1 - ldr r4, [r0] - cmp r4, 0 - bne _080A46DC -_080A46D2: - movs r0, 0 - b _080A4716 - .align 2, 0 -_080A46D8: .4byte 0x00000544 -_080A46DC: - ldr r0, [r2, 0x4] - lsls r0, 8 - ldr r1, [r2] - adds r0, r1 - ldr r1, _080A471C - adds r0, r1 - adds r4, r0 - ldr r3, [r6, 0x4] - cmp r3, 0 - ble _080A4714 - movs r7, 0x80 - lsls r7, 1 -_080A46F4: - ldr r1, [r6] - adds r2, r4, 0 - cmp r1, 0 - ble _080A470C -_080A46FC: - ldrb r0, [r2] - ands r0, r5 - adds r2, 0x1 - cmp r0, r5 - bne _080A46D2 - subs r1, 0x1 - cmp r1, 0 - bgt _080A46FC -_080A470C: - adds r4, r7 - subs r3, 0x1 - cmp r3, 0 - bgt _080A46F4 -_080A4714: - movs r0, 0x1 -_080A4716: - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080A471C: .4byte 0x00000405 - thumb_func_end sub_80A46C0 - - thumb_func_start sub_80A4720 -sub_80A4720: - lsls r1, 2 - ldr r3, _080A473C - adds r0, r3 - adds r0, r1 - ldr r1, [r2, 0x4] - lsls r1, 7 - ldr r3, [r0] - adds r3, r1 - ldr r0, [r2] - lsls r0, 1 - adds r3, r0 - ldrh r0, [r3] - bx lr - .align 2, 0 -_080A473C: .4byte 0x0000054c - thumb_func_end sub_80A4720 - - thumb_func_start sub_80A4740 -sub_80A4740: - push {r4,lr} - lsls r1, 2 - ldr r4, _080A4760 - adds r0, r4 - adds r0, r1 - ldr r1, [r2, 0x4] - lsls r1, 7 - ldr r4, [r0] - adds r4, r1 - ldr r0, [r2] - lsls r0, 1 - adds r4, r0 - strh r3, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080A4760: .4byte 0x0000054c - thumb_func_end sub_80A4740 - - thumb_func_start sub_80A4764 -sub_80A4764: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - mov r9, r0 - ldr r0, _080A47E8 - add r0, r9 - movs r2, 0 - ldrsh r1, [r0, r2] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - bne _080A4784 - b _080A49CE -_080A4784: - ldr r0, _080A47EC - add r0, r9 - movs r6, 0 - ldrsh r0, [r0, r6] - cmp r0, 0 - beq _080A4864 - mov r4, r9 - ldr r0, _080A47F0 - add r0, r9 - ldr r5, [r0] - ldr r0, _080A47F4 - add r0, r9 - movs r1, 0 - ldrsh r0, [r0, r1] - lsls r0, 20 - lsrs r6, r0, 16 - movs r7, 0 - ldr r0, _080A47F8 - add r0, r9 - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r7, r0 - bge _080A484C -_080A47B2: - ldr r1, [r4, 0x4] - cmp r1, 0 - beq _080A4832 - ldrh r0, [r4, 0x2] - subs r0, 0x1 - strh r0, [r4, 0x2] - lsls r0, 16 - cmp r0, 0 - bgt _080A4832 - ldrh r0, [r4] - subs r0, 0x1 - strh r0, [r4] - lsls r0, 16 - cmp r0, 0 - bgt _080A4808 - ldr r0, _080A47FC - add r0, r9 - ldrb r0, [r0] - cmp r0, 0 - beq _080A4800 - ldrh r0, [r5] - strh r0, [r4, 0x2] - ldrh r0, [r5, 0x2] - strh r0, [r4] - str r1, [r4, 0x8] - b _080A480C - .align 2, 0 -_080A47E8: .4byte 0x00000444 -_080A47EC: .4byte 0x00000466 -_080A47F0: .4byte 0x0000046c -_080A47F4: .4byte 0x0000052c -_080A47F8: .4byte 0x00000464 -_080A47FC: .4byte 0x00000471 -_080A4800: - strh r0, [r4] - strh r0, [r4, 0x2] - str r0, [r4, 0x8] - b _080A480C -_080A4808: - ldrh r0, [r5] - strh r0, [r4, 0x2] -_080A480C: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _080A4832 - movs r0, 0 - str r0, [sp] - adds r0, r6, 0 - movs r1, 0 - bl sub_8003810 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r0, 16 - ldr r1, [r4, 0x8] - movs r2, 0xF - bl sub_809971C - ldr r0, [r4, 0x8] - adds r0, 0x3C - str r0, [r4, 0x8] -_080A4832: - adds r7, 0x1 - adds r4, 0x10 - adds r5, 0x4 - adds r0, r6, 0 - adds r0, 0x10 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r0, _080A485C - add r0, r9 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r7, r0 - blt _080A47B2 -_080A484C: - movs r0, 0x8E - lsls r0, 3 - add r0, r9 - ldrb r1, [r0] - ldr r0, _080A4860 - add r0, r9 - strb r1, [r0] - b _080A48E6 - .align 2, 0 -_080A485C: .4byte 0x00000464 -_080A4860: .4byte 0x00000471 -_080A4864: - movs r0, 0x88 - lsls r0, 3 - add r0, r9 - ldr r0, [r0] - cmp r0, 0 - beq _080A48E6 - mov r4, r9 - adds r4, 0xE0 - movs r6, 0xA0 - movs r5, 0x1F -_080A4878: - adds r0, r4, 0 - movs r1, 0x1 - bl sub_8004D14 - lsls r0, 24 - cmp r0, 0 - beq _080A48DC - adds r0, r4, 0 - movs r1, 0x1 - bl sub_8004D40 - lsls r0, 24 - cmp r0, 0 - bne _080A48DC - ldrh r0, [r4, 0x6] - subs r0, 0x1 - strh r0, [r4, 0x6] - lsls r0, 16 - cmp r0, 0 - bgt _080A48DC - ldrh r0, [r4, 0x4] - strh r0, [r4, 0x6] - ldr r1, [r4, 0xC] - ldr r0, [r4, 0x10] - cmp r1, r0 - bcc _080A48B0 - ldr r0, [r4, 0x8] - str r0, [r4, 0xC] -_080A48B0: - ldr r1, [r4, 0xC] - ldm r1!, {r0} - str r0, [r4, 0x14] - str r1, [r4, 0xC] - ldrb r1, [r4, 0x14] - add r0, sp, 0x4 - strb r1, [r0] - ldrb r1, [r4, 0x15] - adds r0, 0x1 - strb r1, [r0] - ldrb r1, [r4, 0x16] - adds r0, 0x1 - strb r1, [r0] - ldrb r1, [r4, 0x17] - adds r0, 0x1 - strb r1, [r0] - ldr r1, [sp, 0x4] - str r1, [sp] - lsls r0, r6, 16 - lsrs r0, 16 - bl sub_8003810 -_080A48DC: - subs r5, 0x1 - adds r4, 0x18 - adds r6, 0x1 - cmp r5, 0 - bge _080A4878 -_080A48E6: - movs r5, 0 - movs r4, 0x1 -_080A48EA: - movs r2, 0xF8 - lsls r2, 2 - adds r0, r5, r2 - mov r6, r9 - adds r2, r6, r0 - ldrb r0, [r2] - cmp r0, 0 - beq _080A4942 - ldrh r1, [r2, 0x4] - subs r0, r1, 0x1 - strh r0, [r2, 0x4] - lsls r1, 16 - cmp r1, 0 - bgt _080A4942 - ldr r0, [r2, 0x14] - adds r0, 0x4 - str r0, [r2, 0x14] - ldr r1, [r2, 0x24] - lsrs r1, 1 - lsls r1, 1 - ldr r0, [r2, 0x1C] - adds r0, r1 - str r0, [r2, 0x1C] - ldrh r0, [r2, 0x2] - adds r0, 0x1 - movs r3, 0 - strh r0, [r2, 0x2] - ldr r1, [r2, 0xC] - lsls r0, 16 - asrs r0, 16 - movs r6, 0x2 - ldrsh r1, [r1, r6] - cmp r0, r1 - blt _080A4938 - ldr r0, [r2, 0x10] - str r0, [r2, 0x14] - ldr r0, [r2, 0x18] - str r0, [r2, 0x1C] - strh r3, [r2, 0x2] -_080A4938: - movs r0, 0x1 - strb r0, [r2, 0x1] - ldr r0, [r2, 0x14] - ldr r0, [r0] - strh r0, [r2, 0x4] -_080A4942: - adds r5, 0x28 - subs r4, 0x1 - cmp r4, 0 - bge _080A48EA - movs r4, 0x91 - lsls r4, 3 - add r4, r9 - movs r7, 0x8F - lsls r7, 3 - add r7, r9 - movs r0, 0 - mov r8, r0 - b _080A49BC -_080A495C: - adds r0, r4, 0 - adds r1, r7, 0 - bl sub_80A3E14 - adds r0, r4, 0 - bl sub_80A3EB0 - movs r6, 0 - movs r2, 0x2 - ldrsh r1, [r4, r2] - ldr r0, _080A4998 - add r0, r9 - movs r2, 0 - ldrsh r0, [r0, r2] - adds r5, r1, r0 - movs r1, 0x4 - ldrsh r0, [r4, r1] - movs r2, 0x1 - add r8, r2 - movs r1, 0x50 - adds r1, r4 - mov r10, r1 - adds r7, 0x8 - cmp r6, r0 - bge _080A49BA -_080A498E: - cmp r5, 0 - beq _080A499C - cmp r5, 0x1 - beq _080A49A6 - b _080A49AE - .align 2, 0 -_080A4998: .4byte 0x00000536 -_080A499C: - ldr r0, [r4, 0x48] - ldr r1, [r4, 0x4C] - bl SetBG2RegOffsets - b _080A49AE -_080A49A6: - ldr r0, [r4, 0x48] - ldr r1, [r4, 0x4C] - bl SetBG3RegOffsets -_080A49AE: - adds r6, 0x1 - adds r5, 0x1 - movs r2, 0x4 - ldrsh r0, [r4, r2] - cmp r6, r0 - blt _080A498E -_080A49BA: - mov r4, r10 -_080A49BC: - ldr r0, _080A49E0 - add r0, r9 - ldr r0, [r0] - cmp r8, r0 - blt _080A495C - ldr r1, _080A49E4 - add r1, r9 - movs r0, 0x1 - strb r0, [r1] -_080A49CE: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080A49E0: .4byte 0x00000474 -_080A49E4: .4byte 0x0000052a - thumb_func_end sub_80A4764 - - thumb_func_start sub_80A49E8 -sub_80A49E8: - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - ldr r0, _080A4A74 - adds r5, r6, r0 - movs r1, 0xFF - lsls r1, 2 - adds r4, r6, r1 - ldr r0, _080A4A78 - adds r0, r6 - mov r8, r0 - movs r7, 0x1 -_080A4A02: - ldrb r0, [r5] - cmp r0, 0 - beq _080A4A1C - ldr r0, [r4, 0x4] - ldr r1, [r4] - ldr r2, [r4, 0x8] - bl MemoryCopy32 - movs r0, 0 - strb r0, [r5] - movs r0, 0x1 - mov r1, r8 - strb r0, [r1] -_080A4A1C: - adds r5, 0x28 - adds r4, 0x28 - subs r7, 0x1 - cmp r7, 0 - bge _080A4A02 - ldr r1, _080A4A78 - adds r0, r6, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080A4A68 - movs r5, 0 - adds r1, 0xC - adds r0, r6, r1 - movs r1, 0 - ldrsh r4, [r0, r1] - movs r1, 0xA7 - lsls r1, 3 - adds r0, r6, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r5, r0 - bge _080A4A60 - movs r0, 0xA7 - lsls r0, 3 - adds r7, r6, r0 -_080A4A4E: - adds r0, r4, 0x2 - bl sub_80098F8 - adds r5, 0x1 - adds r4, 0x1 - movs r1, 0 - ldrsh r0, [r7, r1] - cmp r5, r0 - blt _080A4A4E -_080A4A60: - ldr r0, _080A4A78 - adds r1, r6, r0 - movs r0, 0 - strb r0, [r1] -_080A4A68: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080A4A74: .4byte 0x000003e1 -_080A4A78: .4byte 0x0000052a - thumb_func_end sub_80A49E8 - - .align 2,0 diff --git a/include/ground_map.h b/include/ground_map.h index 051ec00d6..76885b8e6 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -13,41 +13,45 @@ typedef struct SubStruct_0 { - u16 unk0; - u16 unk2; + s16 unk0; + s16 unk2; const void *unk4; const void *unk8; u8 fillC; } SubStruct_0; +struct UnkFileStruct +{ + u8 unk0; + s16 unk2; + void *unk4[0]; // This is most likely wrong, will need to be fixed. +}; + typedef struct SubStruct_3E0 { u8 unk0; u8 unk1; - u16 unk2; - u16 unk4; + s16 unk2; + s16 unk4; OpenedFile *unk8; - const void *unkC; + const struct UnkFileStruct *unkC; const void *unk10; - const void *unk12; const void *unk14; + const void *unk18; const void *unk1C; void *unk20; - s32 unk24; + u32 unk24; } SubStruct_3E0; -// Note: not 100% about structs being PixelPos yet to verify - typedef struct SubStruct_488 { s16 unk0; - u16 unk2; + s16 unk2; s16 unk4; bool8 unk6; s32 unk8; s32 unkC; - s32 unk10; - s32 unk14; + PixelPos unk10; void (*unk18)(struct SubStruct_488 *); u16 *unk1C; u16 *unk20[UNK_54C_ARR_COUNT]; @@ -55,7 +59,7 @@ typedef struct SubStruct_488 PixelPos unk30; PixelPos unk38; PixelPos unk40; - PixelPos unk48; + PixelPos bgRegOffsets; // Either bg2 or bg3 } SubStruct_488; // size: 0x18? diff --git a/include/memory.h b/include/memory.h index 5d3951b29..ca1b4baca 100644 --- a/include/memory.h +++ b/include/memory.h @@ -8,7 +8,7 @@ void MemoryClear16(u16 *dest, s32 size); void MemoryFill8(void *dest, u8 value, s32 size); void MemoryFill16(u16 *dest, u16 value, s32 size); void MemoryCopy8(void *dest, void *src, s32 size); -void MemoryCopy32(u32 *dest, u32 *src, s32 size); +void MemoryCopy32(u32 *dest, const u32 *src, s32 size); void *MemoryAlloc(s32 size, s32 group); void MemoryFree(void *a); diff --git a/ld_script.ld b/ld_script.ld index 617c95ba1..40a3a9b6e 100755 --- a/ld_script.ld +++ b/ld_script.ld @@ -335,7 +335,6 @@ SECTIONS { src/code_809D148.o(.text); src/ground_script.o(.text); src/code_80A26CC.o(.text); - asm/code_80A26CC_1.o(.text); src/ground_map.o(.text); asm/ground_map_1.o(.text); src/ground_map_1.o(.text); diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c index 99520f33a..cef99a259 100644 --- a/src/code_80A26CC.c +++ b/src/code_80A26CC.c @@ -472,12 +472,36 @@ UNUSED static const u8 *sub_80A2B28(u16 r0) #include "code_8002774.h" #include "code_801D9E4.h" #include "code_8004AA0.h" +#include "code_8009804.h" #include "debug.h" +#include "bg_control.h" #include "unk_dungeon_load.h" #include "constants/dungeon.h" -extern void sub_80A456C(unkStruct_3001B70 *, u32, const PixelPos *); +void sub_80A456C(unkStruct_3001B70 *mapPtr, s32 id, const PixelPos *srcPos); +void sub_80A2DD4(unkStruct_3001B70 *mapPtr); +void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0); +void sub_80A3EB0(SubStruct_488 *map488); +const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *a3); +void sub_80A37C4(void *vramDst, const u16 *src_, SubStruct_52C *a2, SubStruct_545 *a3); +void _UncompressCell(void * a0, u16 *a1, const void * a2, SubStruct_52C *a3, SubStruct_545 *a4); +void sub_80A3D40(SubStruct_488 *map488, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4); +void sub_80A3E14(SubStruct_488 *map488, PixelPos *a1); +void sub_80A3EBC(SubStruct_488 *map488); +void sub_80A3EF4(SubStruct_488 *map488); +void sub_80A4088(SubStruct_488 *map488); +void sub_80A41C4(SubStruct_488 *map488); +void sub_80A3ED4(SubStruct_488 *map488); +void sub_80A3F94(SubStruct_488 *map488); +void sub_80A4358(SubStruct_488 *map488); + +extern const DebugLocation gUnknown_81172E8; +extern const char gUnknown_81172F4[]; extern const PixelPos gUnknown_81172B8; +extern const PixelPos gUnknown_8117314; + +extern void sub_8003810(u16 param_1, struct S param_2); +extern void sub_809971C(u16 a0, const void *a1, int a2); void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) { @@ -537,10 +561,10 @@ void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) unkPtr->unk4 = 0; unkPtr->unk8 = NULL; unkPtr->unkC = 0; - unkPtr->unk12 = 0; + unkPtr->unk14 = 0; unkPtr->unk10 = 0; unkPtr->unk1C = 0; - unkPtr->unk14 = 0; + unkPtr->unk18 = 0; unkPtr->unk20 = 0; unkPtr->unk24 = 0; } @@ -550,10 +574,6 @@ void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) } } -void sub_80A2DD4(unkStruct_3001B70 *mapPtr); -void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0); -void sub_80A3EB0(SubStruct_488 *map488); - void sub_80A2D00(unkStruct_3001B70 *mapPtr) { s32 i; @@ -599,8 +619,6 @@ void sub_80A2DD4(unkStruct_3001B70 *mapPtr) TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk438); } -extern void sub_8003810(u32 param_1, struct S param_2); - void sub_80A2E64(unkStruct_3001B70 *mapPtr) { u16 r6; @@ -637,10 +655,10 @@ void sub_80A2E64(unkStruct_3001B70 *mapPtr) unkPtr->unk4 = 0; unkPtr->unk8 = NULL; unkPtr->unkC = 0; - unkPtr->unk12 = 0; + unkPtr->unk14 = 0; unkPtr->unk10 = 0; unkPtr->unk1C = 0; - unkPtr->unk14 = 0; + unkPtr->unk18 = 0; unkPtr->unk20 = 0; unkPtr->unk24 = 0; } @@ -661,22 +679,9 @@ void sub_80A2E64(unkStruct_3001B70 *mapPtr) mapPtr->unk52A = 1; } -const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *a3); -void sub_80A37C4(void *vramDst, const u16 *src_, SubStruct_52C *a2, SubStruct_545 *a3); -void _UncompressCell(void * a0, u16 *a1, const void * a2, SubStruct_52C *a3, SubStruct_545 *a4); - extern const struct unkStruct_81188F0 gUnknown_81188F0[10]; extern const FileArchive gGroundFileArchive; -extern void sub_809971C(u16 a0, const void *a1, int a2); - -struct UnkFileStruct -{ - u8 unk0; - s16 unk2; - void *unk4[0]; // This is most likely wrong, will need to be fixed. -}; - void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) { SubStruct_0 *sub0Ptr; @@ -816,8 +821,8 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) sub3E0->unkC = fileStr; r1 = &fileStr->unk4; r0 = r1 + fileStr->unk2 * 4; - sub3E0->unk10 = sub3E0->unk12 = r1; - sub3E0->unk14 = sub3E0->unk1C = r0; + sub3E0->unk10 = sub3E0->unk14 = r1; + sub3E0->unk18 = sub3E0->unk1C = r0; sub3E0->unk2 = 0; sub3E0->unk4 = (u32) fileStr->unk4[0]; // ? sub3E0->unk20 = vramPtr; @@ -832,10 +837,10 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) sub3E0->unk2 = 0; sub3E0->unk8 = NULL; sub3E0->unkC = 0; - sub3E0->unk12 = 0; + sub3E0->unk14 = 0; sub3E0->unk10 = 0; sub3E0->unk1C = 0; - sub3E0->unk14 = 0; + sub3E0->unk18 = 0; sub3E0->unk20 = 0; sub3E0->unk24 = 0; } @@ -988,10 +993,10 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s sub3E0->unk2 = 0; sub3E0->unk8 = NULL; sub3E0->unkC = 0; - sub3E0->unk12 = 0; + sub3E0->unk14 = 0; sub3E0->unk10 = 0; sub3E0->unk1C = 0; - sub3E0->unk14 = 0; + sub3E0->unk18 = 0; sub3E0->unk20 = 0; sub3E0->unk24 = 0; } @@ -1023,9 +1028,6 @@ void sub_80A37C4(void *vramDst, const u16 *src_, SubStruct_52C *a2, SubStruct_54 } } -extern const DebugLocation gUnknown_81172E8; -extern const char gUnknown_81172F4[]; - void _UncompressCell(void *dst_, u16 *a1, const void *src_, SubStruct_52C *a3, SubStruct_545 *a4) { s32 id, i; @@ -1157,17 +1159,6 @@ void sub_80A3B80(unkStruct_3001B70 *mapPtr, u8 a1, u8 a2) } } -extern const PixelPos gUnknown_8117314; -void sub_80A3D40(SubStruct_488 *a0, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4); -void sub_80A3E14(SubStruct_488 *a0, PixelPos *a1); -void sub_80A3EBC(SubStruct_488 *a0); -void sub_80A3EF4(SubStruct_488 *a0); -void sub_80A4088(SubStruct_488 *a0); -void sub_80A41C4(SubStruct_488 *a0); -void sub_80A3ED4(SubStruct_488 *a0); -void sub_80A3F94(SubStruct_488 *a0); -void sub_80A4358(SubStruct_488 *a0); - void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0_) { s32 i; @@ -1234,57 +1225,57 @@ void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0_) } } -void sub_80A3D40(SubStruct_488 *a0, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4) +void sub_80A3D40(SubStruct_488 *map488, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4) { s32 i, j; - a0->unk0 = mapPtr->unk528; - a0->unk2 = a2; - a0->unk4 = a3; - a0->unk6 = a4; - a0->unk8 = mapPtr->unk448.unk4; - a0->unkC = mapPtr->unk448.unk5; - a0->unk10 = mapPtr->unk448.unk0 * 8; - a0->unk14 = mapPtr->unk448.unk1 * 8; - a0->unk1C = mapPtr->unk548; + map488->unk0 = mapPtr->unk528; + map488->unk2 = a2; + map488->unk4 = a3; + map488->unk6 = a4; + map488->unk8 = mapPtr->unk448.unk4; + map488->unkC = mapPtr->unk448.unk5; + map488->unk10.x = mapPtr->unk448.unk0 * 8; + map488->unk10.y = mapPtr->unk448.unk1 * 8; + map488->unk1C = mapPtr->unk548; for (i = 0, j = a2; i < a3 && j < mapPtr->unk52C.unkC; i++, j++) { - a0->unk20[i] = mapPtr->unk54C[j]; - a0->unk28[i] = mapPtr->unk554[j]; + map488->unk20[i] = mapPtr->unk54C[j]; + map488->unk28[i] = mapPtr->unk554[j]; } for (; i < UNK_54C_ARR_COUNT; i++) { - a0->unk20[i] = NULL; - a0->unk28[i] = NULL; + map488->unk20[i] = NULL; + map488->unk28[i] = NULL; } - sub_80A3E14(a0, &mapPtr->unk478[0]); + sub_80A3E14(map488, &mapPtr->unk478[0]); } -void sub_80A3E14(SubStruct_488 *a0, PixelPos *a1) +void sub_80A3E14(SubStruct_488 *map488, PixelPos *a1) { - a0->unk30.x = a1->x; - a0->unk38.x = a0->unk30.x / 8; - a0->unk30.y = a1->y; - a0->unk38.y = a0->unk30.y / 8; + map488->unk30.x = a1->x; + map488->unk38.x = map488->unk30.x / 8; + map488->unk30.y = a1->y; + map488->unk38.y = map488->unk30.y / 8; - switch (a0->unk0) { + switch (map488->unk0) { case 0: - a0->unk40.x = 0; - a0->unk40.y = 0; - a0->unk48.x = 0; - a0->unk48.y = 0; + map488->unk40.x = 0; + map488->unk40.y = 0; + map488->bgRegOffsets.x = 0; + map488->bgRegOffsets.y = 0; break; case 1: - a0->unk40.x = a0->unk38.x / 2; - a0->unk40.y = a0->unk38.y / 2; - a0->unk48.x = a0->unk30.x % 16; - a0->unk48.y = a0->unk30.y % 16; + map488->unk40.x = map488->unk38.x / 2; + map488->unk40.y = map488->unk38.y / 2; + map488->bgRegOffsets.x = map488->unk30.x % 16; + map488->bgRegOffsets.y = map488->unk30.y % 16; break; case 2: - a0->unk40.x = a0->unk38.x / 3; - a0->unk40.y = a0->unk38.y / 3; - a0->unk48.x = a0->unk30.x % 8; - a0->unk48.y = a0->unk30.y % 24; + map488->unk40.x = map488->unk38.x / 3; + map488->unk40.y = map488->unk38.y / 3; + map488->bgRegOffsets.x = map488->unk30.x % 8; + map488->bgRegOffsets.y = map488->unk30.y % 24; break; } } @@ -1344,4 +1335,586 @@ void sub_80A3EF4(SubStruct_488 *map488) } } -// +void sub_80A3F94(SubStruct_488 *map488) +{ + s32 arrPtrId; + u16 *ptr1, *ptr2; + u16 *arrPtrs1[2]; + u16 *arrPtrs2[2]; + s32 unk28Id; + s32 i, j; + + ptr1 = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; + ptr2 = &map488->unk20[1][(map488->unk40.y * 64) + map488->unk40.x]; + unk28Id = 0; + for (i = 0; i < 11; ptr1 += 64, ptr2 += 64, i++) { + u16 *currPtr1 = ptr1; + u16 *currPtr2 = ptr2; + + for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { + arrPtrs1[arrPtrId] = &map488->unk28[0][unk28Id]; + arrPtrs2[arrPtrId] = &map488->unk28[1][unk28Id]; + unk28Id += 32; + } + + for (j = 0; j < 16; j++) { + u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; + u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; + for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { + u16 *currDst1 = arrPtrs1[arrPtrId]; + u16 *currDst2 = arrPtrs2[arrPtrId]; + *currDst1++ = *currSrc1++; + *currDst1++ = *currSrc1++; + *currDst2++ = *currSrc2++; + *currDst2++ = *currSrc2++; + arrPtrs1[arrPtrId] = currDst1; + arrPtrs2[arrPtrId] = currDst2; + } + } + } +} + +void sub_80A4088(SubStruct_488 *map488) +{ + s32 arrPtrId; + s32 i, j; + u16 *arrPtrs[3]; + s32 mod3 = map488->unk38.x % 3; + u16 *ptr = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; + s32 unk28Id = 0; + + for (i = 0; i < 8; ptr += 64, i++) { + u16 *currPtr = ptr; + + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + arrPtrs[arrPtrId] = &map488->unk28[0][unk28Id]; + unk28Id += 32; + } + + if (mod3 != 0) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + + if (mod3 == 1) { + currSrc++; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = currSrc[0]; + *currDst++ = currSrc[1]; + arrPtrs[arrPtrId] = currDst; + currSrc += 3; + } + } + else { + currSrc += 2; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = currSrc[0]; + arrPtrs[arrPtrId] = currDst; + currSrc += 3; + } + } + } + + for (j = 0; j < 10; j++) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = *currSrc++; + *currDst++ = *currSrc++; + *currDst++ = *currSrc++; + arrPtrs[arrPtrId] = currDst; + } + } + + if (mod3 != 1) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + if (mod3 == 0) { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + currDst[0] = currSrc[0]; + currDst[1] = currSrc[1]; + currSrc += 3; + } + } + else { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + currDst[0] = currSrc[0]; + currSrc += 3; + } + } + } + } +} + +void sub_80A41C4(SubStruct_488 *map488) +{ + s32 mod3; + s32 arrPtrId; + u16 *ptr; + u16 *arrPtrs[3]; + s32 unk28Id; + s32 i, j; + s32 sub1, sub2; + + // Screw you agbcc... + ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr); + + mod3 = map488->unk38.x % 3; + ptr = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; + unk28Id = 0; + sub1 = map488->unkC - map488->unk40.y; + sub2 = map488->unk8 - map488->unk40.x; + + for (i = 0; i < 8; ptr += 64, i++) { + u16 *currPtr; + s32 currSub2 = sub2; + + if (sub1 > 0) { + sub1--; + currPtr = ptr; + } + else { + sub1 = map488->unkC; + ptr = &map488->unk20[0][map488->unk40.x]; + currPtr = ptr; + } + + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + arrPtrs[arrPtrId] = &map488->unk28[0][unk28Id]; + unk28Id += 32; + } + + if (mod3 != 0) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + + if (mod3 == 1) { + currSrc++; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = currSrc[0]; + *currDst++ = currSrc[1]; + arrPtrs[arrPtrId] = currDst; + currSrc += 3; + } + } + else { + currSrc += 2; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + *arrPtrs[arrPtrId]++ = *currSrc; + currSrc += 3; + } + } + + currSub2--; + if (currSub2 <= 0) { + currSub2 = map488->unk8; + currPtr -= currSub2; + } + } + + for (j = 0; j < 10; j++) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = *currSrc++; + *currDst++ = *currSrc++; + *currDst++ = *currSrc++; + arrPtrs[arrPtrId] = currDst; + } + + if (--currSub2 <= 0) { + currSub2 = map488->unk8; + currPtr -= currSub2; + } + } + + // Interestingly enough this part is NOT present in Blue... + if (mod3 != 1) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + if (mod3 == 0) { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + currDst[0] = currSrc[0]; + currDst[1] = currSrc[1]; + currSrc += 3; + } + } + else { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + currDst[0] = currSrc[0]; + currSrc += 3; + } + } + } + } +} + +void sub_80A4358(SubStruct_488 *map488) +{ + s32 arrPtrId; + s32 i, j; + u16 *arrPtrs1[3]; + u16 *arrPtrs2[3]; + s32 mod3 = map488->unk38.x % 3; + u16 *ptr1 = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; + u16 *ptr2 = &map488->unk20[1][(map488->unk40.y * 64) + map488->unk40.x]; + s32 unk28Id = 0; + + // Stack memes again... + ASM_MATCH_TRICK(ptr2);ASM_MATCH_TRICK(ptr2);ASM_MATCH_TRICK(ptr2); + + for (i = 0; i < 8; ptr1 += 64, ptr2 += 64, i++) { + u16 *currPtr1 = ptr1; + u16 *currPtr2 = ptr2; + + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + arrPtrs1[arrPtrId] = &map488->unk28[0][unk28Id]; + arrPtrs2[arrPtrId] = &map488->unk28[1][unk28Id]; + unk28Id += 32; + } + + if (mod3 != 0) { + u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; + u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; + + if (mod3 == 1) { + currSrc1++; + currSrc2++; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst1, *currDst2; + currDst1 = arrPtrs1[arrPtrId]; + currDst2 = arrPtrs2[arrPtrId]; + *currDst1++ = currSrc1[0]; + *currDst1++ = currSrc1[1]; + *currDst2++ = currSrc2[0]; + *currDst2++ = currSrc2[1]; + arrPtrs1[arrPtrId] = currDst1; + arrPtrs2[arrPtrId] = currDst2; + currSrc1 += 3; + currSrc2 += 3; + } + } + else { + currSrc1 += 2; + currSrc2 += 2; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + *arrPtrs1[arrPtrId]++ = currSrc1[0]; + *arrPtrs2[arrPtrId]++ = currSrc2[0]; + currSrc1 += 3; + currSrc2 += 3; + } + } + } + + for (j = 0; j < 10; j++) { + u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; + u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst1 = arrPtrs1[arrPtrId]; + u16 *currDst2 = arrPtrs2[arrPtrId]; + *currDst1++ = *currSrc1++; + *currDst1++ = *currSrc1++; + *currDst1++ = *currSrc1++; + *currDst2++ = *currSrc2++; + *currDst2++ = *currSrc2++; + *currDst2++ = *currSrc2++; + arrPtrs1[arrPtrId] = currDst1; + arrPtrs2[arrPtrId] = currDst2; + } + } + + if (mod3 != 1) { + u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; + u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; + if (mod3 == 0) { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst1 = arrPtrs1[arrPtrId]; + u16 *currDst2 = arrPtrs2[arrPtrId]; + currDst1[0] = currSrc1[0]; + currDst1[1] = currSrc1[1]; + currDst2[0] = currSrc2[0]; + currDst2[1] = currSrc2[1]; + currSrc1 += 3; + currSrc2 += 3; + } + } + else { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst1, *currDst2; + + currDst1 = arrPtrs1[arrPtrId]; + currDst1[0] = currSrc1[0]; + currDst2 = arrPtrs2[arrPtrId]; + currDst2[0] = currSrc2[0]; + currSrc1 += 3; + currSrc2 += 3; + } + } + } + } +} + +void sub_80A4558(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *dstPos) +{ + *dstPos = mapPtr->unk478[id]; +} + +void sub_80A456C(unkStruct_3001B70 *mapPtr, s32 id, const PixelPos *srcPos) +{ + mapPtr->unk478[id] = *srcPos; +} + +void sub_80A4580(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos) +{ + SubStruct_488 *map488 = &mapPtr->unk488[id]; + + if (pixPos->x < 0) { + if (map488->unk6) { + do { + pixPos->x += map488->unk10.x; + } while (pixPos->x < 0); + } + else { + pixPos->x = 0; + } + } + else if (pixPos->x >= map488->unk10.x) { + if (map488->unk6) { + do { + pixPos->x -= map488->unk10.x; + } while (pixPos->x >= map488->unk10.x); + } + else { + pixPos->x = map488->unk10.x - 1; + } + } + + if (pixPos->y < 0) { + if (map488->unk6) { + do { + pixPos->y += map488->unk10.y; + } while (pixPos->y < 0); + } + else { + pixPos->y = 0; + } + } + else if (pixPos->y >= map488->unk10.y) { + if (map488->unk6) { + do { + pixPos->y -= map488->unk10.y; + } while (pixPos->y >= map488->unk10.y); + } + else { + pixPos->y = map488->unk10.y - 1; + } + } +} + +void sub_80A4608(unkStruct_3001B70 *mapPtr, PixelPos *dstPos) +{ + dstPos->x = mapPtr->unk448.unk0; + dstPos->y = mapPtr->unk448.unk1; +} + +UNUSED static void sub_80A4620(unkStruct_3001B70 *mapPtr, PixelPos *dstPos) +{ + dstPos->x = mapPtr->unk448.unk0 * 8; + dstPos->y = mapPtr->unk448.unk1 * 8; +} + +void GetDungeonBounds(unkStruct_3001B70 *mapPtr, PixelPos *dstPos1, PixelPos *dstPos2) +{ + dstPos1->x = 0; + dstPos1->y = 0; + dstPos2->x = mapPtr->unk448.unk0 << 11; + dstPos2->y = mapPtr->unk448.unk1 << 11; +} + +u8 sub_80A4660(unkStruct_3001B70 *mapPtr, u8 bits, PixelPos *pixPos1, PixelPos *boundary) +{ + s32 i, j; + u8 *currPtr; + void *ptr = mapPtr->unk544; + + if (ptr == NULL) + return 0; + + ptr += ((pixPos1->y * 256) + pixPos1->x + 0x405); + for (i = boundary->y; i > 0; i--) { + for (j = boundary->x, currPtr = ptr; j > 0; j--) { + u8 ret = *currPtr++ & bits; + if (ret) + return ret; + } + ptr += 256; + } + + return 0; +} + +u8 sub_80A46C0(unkStruct_3001B70 *mapPtr, u8 bits, PixelPos *pixPos1, PixelPos *boundary) +{ + s32 i, j; + u8 *currPtr; + void *ptr = mapPtr->unk544; + + if (ptr == NULL) + return 0; + + ptr += ((pixPos1->y * 256) + pixPos1->x + 0x405); + for (i = boundary->y; i > 0; i--) { + for (j = boundary->x, currPtr = ptr; j > 0; j--) { + u8 ret = *currPtr++ & bits; + if (ret != bits) + return 0; + } + ptr += 256; + } + + return 1; +} + +u16 sub_80A4720(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos) +{ + u16 *ptr = mapPtr->unk54C[id] + (pixPos->y * 64); + ptr += pixPos->x; + return *ptr; +} + +void sub_80A4740(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos, u32 dstVal) +{ + u16 *ptr = mapPtr->unk54C[id] + (pixPos->y * 64); + ptr += pixPos->x; + *ptr = dstVal; +} + +void sub_80A4764(unkStruct_3001B70 *mapPtr) +{ + s32 i, j; + s32 unk3E0Id; + SubStruct_488 *map488; + PixelPos *map478; + + if (mapPtr->unk444 == -1) + return; + + if (mapPtr->unk464[1] != 0) { + s32 i; + SubStruct_0 *sub0Ptr = mapPtr->unk0; + const u16 *ptr = mapPtr->unk46C; + u16 r6 = mapPtr->unk52C.unk0 * 16; + + for (i = 0; i < mapPtr->unk464[0]; i++, sub0Ptr++, ptr += 2, r6 += 16) { + if (sub0Ptr->unk4 != NULL && --sub0Ptr->unk2 <= 0) { + if (--sub0Ptr->unk0 <= 0) { + if (mapPtr->unk471) { + sub0Ptr->unk2 = ptr[0]; + sub0Ptr->unk0 = ptr[1]; + sub0Ptr->unk8 = sub0Ptr->unk4; + } + else { + sub0Ptr->unk0 = 0; + sub0Ptr->unk2 = 0; + sub0Ptr->unk8 = NULL; + } + } + else { + sub0Ptr->unk2 = ptr[0]; + } + + if (sub0Ptr->unk8 != NULL) { + struct S empty = {0}; + sub_8003810(r6, empty); + sub_809971C(r6 + 1, sub0Ptr->unk8, 15); + sub0Ptr->unk8 += 60; + } + } + } + + mapPtr->unk471 = mapPtr->unk470; + } + else if (mapPtr->unk440 != NULL) { + s32 i; + unkStruct_202EE8C *unkE0Ptr = mapPtr->unkE0; + s32 r6 = 160; + + for (i = 0; i < 32; i++, unkE0Ptr++, r6++) { + struct S color; + + if (sub_8004D14(unkE0Ptr, 1) && !sub_8004D40(unkE0Ptr, 1) && --unkE0Ptr->unk6 <= 0) { + unkE0Ptr->unk6 = unkE0Ptr->unk4; + if (unkE0Ptr->unkC >= unkE0Ptr->unk10) { + unkE0Ptr->unkC = unkE0Ptr->unk8; + } + unkE0Ptr->unk14 = *unkE0Ptr->unkC++; + color = (struct S) {unkE0Ptr->unk14.r, unkE0Ptr->unk14.g, unkE0Ptr->unk14.b, unkE0Ptr->unk14.unk4}; + sub_8003810(r6, color); + } + } + } + + for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { + SubStruct_3E0 *sub3E0Ptr = &mapPtr->unk3E0[unk3E0Id]; + + if (sub3E0Ptr->unk0 && sub3E0Ptr->unk4-- <= 0) { + sub3E0Ptr->unk14 += 4; + sub3E0Ptr->unk1C += (sub3E0Ptr->unk24 / 2) * 2; + if (++sub3E0Ptr->unk2 >= sub3E0Ptr->unkC->unk2) { + sub3E0Ptr->unk14 = sub3E0Ptr->unk10; + sub3E0Ptr->unk1C = sub3E0Ptr->unk18; + sub3E0Ptr->unk2 = 0; + } + sub3E0Ptr->unk1 = 1; + sub3E0Ptr->unk4 = *(u32 *)(sub3E0Ptr->unk14); + } + } + + map488 = mapPtr->unk488; + map478 = mapPtr->unk478; + for (i = 0; i < mapPtr->unk474; i++, map488++, map478++) { + s32 unk; + + sub_80A3E14(map488, map478); + sub_80A3EB0(map488); + for (j = 0, unk = map488->unk2 + mapPtr->unk52C.unkA; j < map488->unk4; j++, unk++) { + switch (unk) { + case 0: + SetBG2RegOffsets(map488->bgRegOffsets.x, map488->bgRegOffsets.y); + break; + case 1: + SetBG3RegOffsets(map488->bgRegOffsets.x, map488->bgRegOffsets.y); + break; + } + } + } + + mapPtr->unk52A = 1; +} + +void sub_80A49E8(unkStruct_3001B70 *mapPtr) +{ + s32 i; + s32 unk3E0Id; + + for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { + SubStruct_3E0 *sub3E0Ptr = &mapPtr->unk3E0[unk3E0Id]; + + if (sub3E0Ptr->unk1) { + MemoryCopy32(sub3E0Ptr->unk20, sub3E0Ptr->unk1C, sub3E0Ptr->unk24); + sub3E0Ptr->unk1 = FALSE; + mapPtr->unk52A = 1; + } + } + + if (mapPtr->unk52A) { + s32 unk; + for (i = 0, unk = mapPtr->unk52C.unkA; i < mapPtr->unk52C.unkC; i++, unk++) { + sub_80098F8(unk + 2); + } + mapPtr->unk52A = 0; + } +} diff --git a/src/memory.c b/src/memory.c index 78c669909..796870090 100644 --- a/src/memory.c +++ b/src/memory.c @@ -149,7 +149,7 @@ UNUSED static void MemoryCopy16(u16 *dest, u16 *src, s32 size) } } -void MemoryCopy32(u32 *dest, u32 *src, s32 size) +void MemoryCopy32(u32 *dest, const u32 *src, s32 size) { while (size > 0) { size -= 4; From ee2b85e8484fab5b5c91a303910f4f41a6896fd7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 6 Jun 2025 15:19:40 +0200 Subject: [PATCH 09/11] Split - new file ground_bg --- data/data_8115F5C_2.s | 233 ------- data/data_8115F5C_2_1.s | 206 ++++++ ld_script.ld | 3 + src/code_80A26CC.c | 1455 --------------------------------------- src/ground_bg.c | 1454 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 1663 insertions(+), 1688 deletions(-) create mode 100644 data/data_8115F5C_2_1.s create mode 100644 src/ground_bg.c diff --git a/data/data_8115F5C_2.s b/data/data_8115F5C_2.s index 275c4a9ff..5a2ba8100 100644 --- a/data/data_8115F5C_2.s +++ b/data/data_8115F5C_2.s @@ -644,236 +644,3 @@ gUnknown_8117298: @ 8117298 gUnknown_81172A8: @ 81172A8 .string "Square\0" .align 2,0 -.string "pksdir0\0" -.align 2,0 - -.global gUnknown_81172B8 -gUnknown_81172B8: @ 81172B8 -.4byte 0x00 -.4byte 0x00 - -.global GroundBGFile_Text -GroundBGFile_Text: @ Text -.string "../ground/ground_bg.c\0" -.align 2,0 - -.global UncompressCell_Text -UncompressCell_Text: @ Text -.string "_UncompressCell\0" -.align 2,0 - -.global gUnknown_81172E8 -gUnknown_81172E8: @ 81172E8 -.4byte GroundBGFile_Text -.byte 0xA0, 0x04, 0x00, 0x00 -.4byte UncompressCell_Text - -.global gUnknown_81172F4 -gUnknown_81172F4: @ 81172F4 -@ replacing .incbin "baserom.gba", 0x1172F4, 0x20 -.string "GroundBg cell type error %d %d\0" -.align 2, 0 - -.global gUnknown_8117314 -gUnknown_8117314: @ 8117314 -.byte 0x60, 0x00, 0x00, 0x00 -.byte 0x18, 0x00, 0x00, 0x00 -.string "pksdir0\0" -.align 2,0 - -.global gUnknown_8117324 -gUnknown_8117324: @ 8117324 -@ replacing .incbin "baserom.gba", 0x00117324, 0x18 -.byte 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x80, 0x03, 0xb0, 0x04, 0x01, 0x00, 0x01, 0x00, 0xbc, 0x00, 0x5e, 0x00, 0x00, 0x00 -.4byte sub_80A5204 - -.global gUnknown_811733C -gUnknown_811733C: @ 811733C -@ replacing .incbin "baserom.gba", 0x0011733c, 0x18 -.byte 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x04, 0xb0, 0x04, 0x00, 0x00, 0x02, 0x00, 0xbc, 0x00, 0x5e, 0x00, 0x00, 0x00 -.4byte sub_80A5204 - -.global gUnknown_8117354 -gUnknown_8117354: @ 8117354 -@ replacing .incbin "baserom.gba", 0x00117354, 0x18 -.byte 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x02, 0xb0, 0x04, 0x01, 0x00, 0x01, 0x00, 0xbc, 0x00, 0x5e, 0x00, 0x00, 0x00 -.4byte sub_80A5204 - -.global gGroundScriptNullCallbacks -gGroundScriptNullCallbacks: @ 811736C -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global gUnknown_81173C0 -gUnknown_81173C0: @ 81173C0 -.byte 0xb3, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x00, 0x00, 0x00, 0x01, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb7, 0x00, 0x00, 0x00, 0x02, 0x64, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xb9, 0x00, 0x00, 0x00, 0x03, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x00, 0x04, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbd, 0x00, 0x00, 0x00 -.byte 0x05, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x00, 0x06, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00, 0x09, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xc5, 0x00, 0x00, 0x00, 0x0a, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc7, 0x00, 0x00, 0x00, 0x0b, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x0c, 0x64, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xca, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcb, 0x00, 0x00, 0x00, 0x0e, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcd, 0x00, 0x00, 0x00 -.byte 0x0f, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xce, 0x00, 0x00, 0x00, 0x10, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x11, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xd1, 0x00, 0x00, 0x00, 0x12, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd2, 0x00, 0x00, 0x00, 0x13, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x00, 0x00, 0x00, 0x14, 0x64, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x00, 0x22, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd5, 0x00, 0x00, 0x00, 0x25, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0x00, 0x00, 0x00 -.byte 0x23, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd7, 0x00, 0x00, 0x00, 0x3c, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x00, 0x00, 0x00, 0x17, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xd9, 0x00, 0x00, 0x00, 0x1d, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0x00, 0x00, 0x00, 0x1a, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde, 0x00, 0x00, 0x00, 0x35, 0x64, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global GroundMap_FileText -GroundMap_FileText: @ 8117510 -.string "../ground/ground_map.c\0" -.align 2,0 - -.global GroundMap_Reset_Text -GroundMap_Reset_Text: @ Reset -.string "GroundMap_Reset\0" -.align 2,0 - -.global gUnknown_8117538 -gUnknown_8117538: @ 8117538 -.4byte GroundMap_FileText -.byte 0xf8, 0x00, 0x00, 0x00 -.4byte GroundMap_Reset_Text - -.global GroundMap_GetStationScript_Text -GroundMap_GetStationScript_Text: @ GetStationScript -.string "GroundMap_GetStationScript\0" -.align 2,0 - -.global gUnknown_8117560 -gUnknown_8117560: @ 8117560 -.4byte GroundMap_FileText -.byte 0x38, 0x01, 0x00, 0x00 -.4byte GroundMap_GetStationScript_Text - -.global gUnknown_811756C -gUnknown_811756C: @ 811756C -.string "GroundMap ExecuteStation %3d %3d %3d\0" -.align 2,0 - -.global gUnknown_8117594 -gUnknown_8117594: @ 8117594 -.string "GroundMap ExecuteEvent %3d %d ==================\0" -.align 2,0 - -.global GroundMap_ExecuteEventText -GroundMap_ExecuteEventText: @ ExecuteEventText -.string "GroundMap_ExecuteEvent\0" -.align 2,0 - -.global gUnknown_81175E0 -gUnknown_81175E0: @ 81175E0 -.4byte GroundMap_FileText -.byte 0x7D, 0x01, 0x00, 0x00 -.4byte GroundMap_ExecuteEventText - -.global gUnknown_81175EC -gUnknown_81175EC: @ 81175EC -.string "GroundMap ExecuteStation %3d %3d %3d %d ==================\0" -.align 2,0 - -.global GroundMap_ExecuteStationText -GroundMap_ExecuteStationText: @ ExecuteStationText -.string "GroundMap_ExecuteStation\0" -.align 2,0 - -.global gUnknown_8117644 -gUnknown_8117644: @ 8117644 -.4byte GroundMap_FileText -.4byte 0x199 -.4byte GroundMap_ExecuteStationText - -.global gUnknown_8117650 -gUnknown_8117650: @ 8117650 -.string "GroundMap ExecuteEnter %3d ==================\0" -.align 2,0 - -.global GroundMap_ExecuteEnterText -GroundMap_ExecuteEnterText: @ ExecuteEnterText -.string "GroundMap_ExecuteEnter\0" -.align 2,0 - -.global gUnknown_8117698 -gUnknown_8117698: @ 8117698 -.4byte GroundMap_FileText -.4byte 0x1B3 -.4byte GroundMap_ExecuteEnterText - -.global gUnknown_81176A4 -gUnknown_81176A4: @ 81176A4 -.string "GroundMap Select %3d\0" -.align 2,0 - -.global GroundMap_SelectText -GroundMap_SelectText: @ SelectText -.string "GroundMap_Select\0" -.align 2,0 - -.global gUnknown_81176D0 -gUnknown_81176D0: @ 81176D0 -.4byte GroundMap_FileText -.4byte 0x249 -.4byte GroundMap_SelectText - -.global gUnknown_81176DC -gUnknown_81176DC: @ 81176DC -.string "select map type error %d %d\0" -.align 2,0 - -.global gUnknown_81176F8 -gUnknown_81176F8: @ 81176F8 -.4byte 0 -.4byte 0 - -.global gUnknown_8117700 -gUnknown_8117700: @ 8117700 -.string "GroundMap SelectDungeon %3d\0" -.align 2,0 - -.global GroundMap_SelectDungeonText -GroundMap_SelectDungeonText: @ SelectDungeonText -.string "GroundMap_SelectDungeon\0" -.align 2,0 - -.global gUnknown_8117734 -gUnknown_8117734: @ 8117734 -.4byte GroundMap_FileText -.4byte 0x2C6 -.4byte GroundMap_SelectDungeonText - -.global gUnknown_8117740 -gUnknown_8117740: @ 8117740 -.string "map type error %d\0" -.align 2,0 - -.global gUnknown_8117754 -gUnknown_8117754: @ 8117754 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 - -.global GroundMap_Action_Text -GroundMap_Action_Text: @ Action -.string "GroundMap_Action\0" -.align 2,0 - -.global gUnknown_8117770 -gUnknown_8117770: @ 8117770 -.4byte GroundMap_FileText -.byte 0x7f, 0x05, 0x00, 0x00 -.4byte GroundMap_Action_Text -.string "pksdir0\0" -.align 2,0 - -.global gUnknown_8117784 -gUnknown_8117784: @ 8117784 -.byte 0x0d, 0x00, 0x01, 0x00, 0x80, 0x03, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x01, 0x00, 0xbc, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global gGroundWeatherSelect -gGroundWeatherSelect: @ 811779C -.string "GroundWeather Select %3d %3d\0" -.align 2,0 - -.global gUnknown_81177BC -gUnknown_81177BC: @ 81177BC -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 diff --git a/data/data_8115F5C_2_1.s b/data/data_8115F5C_2_1.s new file mode 100644 index 000000000..9c49edd39 --- /dev/null +++ b/data/data_8115F5C_2_1.s @@ -0,0 +1,206 @@ +.section .rodata + + +.align 2,0 + + + +.string "pksdir0\0" +.align 2,0 + +.global gUnknown_8117324 +gUnknown_8117324: @ 8117324 +@ replacing .incbin "baserom.gba", 0x00117324, 0x18 +.byte 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x80, 0x03, 0xb0, 0x04, 0x01, 0x00, 0x01, 0x00, 0xbc, 0x00, 0x5e, 0x00, 0x00, 0x00 +.4byte sub_80A5204 + +.global gUnknown_811733C +gUnknown_811733C: @ 811733C +@ replacing .incbin "baserom.gba", 0x0011733c, 0x18 +.byte 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x04, 0xb0, 0x04, 0x00, 0x00, 0x02, 0x00, 0xbc, 0x00, 0x5e, 0x00, 0x00, 0x00 +.4byte sub_80A5204 + +.global gUnknown_8117354 +gUnknown_8117354: @ 8117354 +@ replacing .incbin "baserom.gba", 0x00117354, 0x18 +.byte 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x02, 0xb0, 0x04, 0x01, 0x00, 0x01, 0x00, 0xbc, 0x00, 0x5e, 0x00, 0x00, 0x00 +.4byte sub_80A5204 + +.global gGroundScriptNullCallbacks +gGroundScriptNullCallbacks: @ 811736C +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global gUnknown_81173C0 +gUnknown_81173C0: @ 81173C0 +.byte 0xb3, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x00, 0x00, 0x00, 0x01, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb7, 0x00, 0x00, 0x00, 0x02, 0x64, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0xb9, 0x00, 0x00, 0x00, 0x03, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x00, 0x04, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbd, 0x00, 0x00, 0x00 +.byte 0x05, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x00, 0x06, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00, 0x09, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xc5, 0x00, 0x00, 0x00, 0x0a, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc7, 0x00, 0x00, 0x00, 0x0b, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x0c, 0x64, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0xca, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcb, 0x00, 0x00, 0x00, 0x0e, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcd, 0x00, 0x00, 0x00 +.byte 0x0f, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xce, 0x00, 0x00, 0x00, 0x10, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x11, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xd1, 0x00, 0x00, 0x00, 0x12, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd2, 0x00, 0x00, 0x00, 0x13, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x00, 0x00, 0x00, 0x14, 0x64, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x00, 0x22, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd5, 0x00, 0x00, 0x00, 0x25, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0x00, 0x00, 0x00 +.byte 0x23, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd7, 0x00, 0x00, 0x00, 0x3c, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x00, 0x00, 0x00, 0x17, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xd9, 0x00, 0x00, 0x00, 0x1d, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0x00, 0x00, 0x00, 0x1a, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde, 0x00, 0x00, 0x00, 0x35, 0x64, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global GroundMap_FileText +GroundMap_FileText: @ 8117510 +.string "../ground/ground_map.c\0" +.align 2,0 + +.global GroundMap_Reset_Text +GroundMap_Reset_Text: @ Reset +.string "GroundMap_Reset\0" +.align 2,0 + +.global gUnknown_8117538 +gUnknown_8117538: @ 8117538 +.4byte GroundMap_FileText +.byte 0xf8, 0x00, 0x00, 0x00 +.4byte GroundMap_Reset_Text + +.global GroundMap_GetStationScript_Text +GroundMap_GetStationScript_Text: @ GetStationScript +.string "GroundMap_GetStationScript\0" +.align 2,0 + +.global gUnknown_8117560 +gUnknown_8117560: @ 8117560 +.4byte GroundMap_FileText +.byte 0x38, 0x01, 0x00, 0x00 +.4byte GroundMap_GetStationScript_Text + +.global gUnknown_811756C +gUnknown_811756C: @ 811756C +.string "GroundMap ExecuteStation %3d %3d %3d\0" +.align 2,0 + +.global gUnknown_8117594 +gUnknown_8117594: @ 8117594 +.string "GroundMap ExecuteEvent %3d %d ==================\0" +.align 2,0 + +.global GroundMap_ExecuteEventText +GroundMap_ExecuteEventText: @ ExecuteEventText +.string "GroundMap_ExecuteEvent\0" +.align 2,0 + +.global gUnknown_81175E0 +gUnknown_81175E0: @ 81175E0 +.4byte GroundMap_FileText +.byte 0x7D, 0x01, 0x00, 0x00 +.4byte GroundMap_ExecuteEventText + +.global gUnknown_81175EC +gUnknown_81175EC: @ 81175EC +.string "GroundMap ExecuteStation %3d %3d %3d %d ==================\0" +.align 2,0 + +.global GroundMap_ExecuteStationText +GroundMap_ExecuteStationText: @ ExecuteStationText +.string "GroundMap_ExecuteStation\0" +.align 2,0 + +.global gUnknown_8117644 +gUnknown_8117644: @ 8117644 +.4byte GroundMap_FileText +.4byte 0x199 +.4byte GroundMap_ExecuteStationText + +.global gUnknown_8117650 +gUnknown_8117650: @ 8117650 +.string "GroundMap ExecuteEnter %3d ==================\0" +.align 2,0 + +.global GroundMap_ExecuteEnterText +GroundMap_ExecuteEnterText: @ ExecuteEnterText +.string "GroundMap_ExecuteEnter\0" +.align 2,0 + +.global gUnknown_8117698 +gUnknown_8117698: @ 8117698 +.4byte GroundMap_FileText +.4byte 0x1B3 +.4byte GroundMap_ExecuteEnterText + +.global gUnknown_81176A4 +gUnknown_81176A4: @ 81176A4 +.string "GroundMap Select %3d\0" +.align 2,0 + +.global GroundMap_SelectText +GroundMap_SelectText: @ SelectText +.string "GroundMap_Select\0" +.align 2,0 + +.global gUnknown_81176D0 +gUnknown_81176D0: @ 81176D0 +.4byte GroundMap_FileText +.4byte 0x249 +.4byte GroundMap_SelectText + +.global gUnknown_81176DC +gUnknown_81176DC: @ 81176DC +.string "select map type error %d %d\0" +.align 2,0 + +.global gUnknown_81176F8 +gUnknown_81176F8: @ 81176F8 +.4byte 0 +.4byte 0 + +.global gUnknown_8117700 +gUnknown_8117700: @ 8117700 +.string "GroundMap SelectDungeon %3d\0" +.align 2,0 + +.global GroundMap_SelectDungeonText +GroundMap_SelectDungeonText: @ SelectDungeonText +.string "GroundMap_SelectDungeon\0" +.align 2,0 + +.global gUnknown_8117734 +gUnknown_8117734: @ 8117734 +.4byte GroundMap_FileText +.4byte 0x2C6 +.4byte GroundMap_SelectDungeonText + +.global gUnknown_8117740 +gUnknown_8117740: @ 8117740 +.string "map type error %d\0" +.align 2,0 + +.global gUnknown_8117754 +gUnknown_8117754: @ 8117754 +.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00 + +.global GroundMap_Action_Text +GroundMap_Action_Text: @ Action +.string "GroundMap_Action\0" +.align 2,0 + +.global gUnknown_8117770 +gUnknown_8117770: @ 8117770 +.4byte GroundMap_FileText +.byte 0x7f, 0x05, 0x00, 0x00 +.4byte GroundMap_Action_Text +.string "pksdir0\0" +.align 2,0 + +.global gUnknown_8117784 +gUnknown_8117784: @ 8117784 +.byte 0x0d, 0x00, 0x01, 0x00, 0x80, 0x03, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x01, 0x00, 0xbc, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global gGroundWeatherSelect +gGroundWeatherSelect: @ 811779C +.string "GroundWeather Select %3d %3d\0" +.align 2,0 + +.global gUnknown_81177BC +gUnknown_81177BC: @ 81177BC +.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00 diff --git a/ld_script.ld b/ld_script.ld index 40a3a9b6e..de835e8a0 100755 --- a/ld_script.ld +++ b/ld_script.ld @@ -335,6 +335,7 @@ SECTIONS { src/code_809D148.o(.text); src/ground_script.o(.text); src/code_80A26CC.o(.text); + src/ground_bg.o(.text); src/ground_map.o(.text); asm/ground_map_1.o(.text); src/ground_map_1.o(.text); @@ -690,6 +691,8 @@ SECTIONS { data/data_8115F5C.o(.rodata); src/code_809A560.o(.rodata); data/data_8115F5C_2.o(.rodata); + src/ground_bg.o(.rodata); + data/data_8115F5C_2_1.o(.rodata); src/ground_sprite.o(.rodata); src/ground_sprite_data.o(.rodata); src/ground_sprite_monster.o(.rodata); diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c index cef99a259..2ef4247ae 100644 --- a/src/code_80A26CC.c +++ b/src/code_80A26CC.c @@ -463,1458 +463,3 @@ UNUSED static const u8 *sub_80A2B28(u16 r0) return sub_80A2B18(GetScriptVarValue(NULL, GROUND_PLACE)); } -// TODO: Figure out if a new file starts here. Edit: new file indeed starts here - -#include "ground_map.h" -#include "text_1.h" -#include "memory.h" -#include "file_system.h" -#include "code_8002774.h" -#include "code_801D9E4.h" -#include "code_8004AA0.h" -#include "code_8009804.h" -#include "debug.h" -#include "bg_control.h" -#include "unk_dungeon_load.h" -#include "constants/dungeon.h" - -void sub_80A456C(unkStruct_3001B70 *mapPtr, s32 id, const PixelPos *srcPos); -void sub_80A2DD4(unkStruct_3001B70 *mapPtr); -void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0); -void sub_80A3EB0(SubStruct_488 *map488); -const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *a3); -void sub_80A37C4(void *vramDst, const u16 *src_, SubStruct_52C *a2, SubStruct_545 *a3); -void _UncompressCell(void * a0, u16 *a1, const void * a2, SubStruct_52C *a3, SubStruct_545 *a4); -void sub_80A3D40(SubStruct_488 *map488, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4); -void sub_80A3E14(SubStruct_488 *map488, PixelPos *a1); -void sub_80A3EBC(SubStruct_488 *map488); -void sub_80A3EF4(SubStruct_488 *map488); -void sub_80A4088(SubStruct_488 *map488); -void sub_80A41C4(SubStruct_488 *map488); -void sub_80A3ED4(SubStruct_488 *map488); -void sub_80A3F94(SubStruct_488 *map488); -void sub_80A4358(SubStruct_488 *map488); - -extern const DebugLocation gUnknown_81172E8; -extern const char gUnknown_81172F4[]; -extern const PixelPos gUnknown_81172B8; -extern const PixelPos gUnknown_8117314; - -extern void sub_8003810(u16 param_1, struct S param_2); -extern void sub_809971C(u16 a0, const void *a1, int a2); - -void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) -{ - SubStruct_0 *unk0Ptr; - s32 id, unk0Id, unk3E0Id; - s32 i; - - mapPtr->unk52C = *a1; - mapPtr->unk548 = MemoryAlloc(mapPtr->unk52C.unk8 * 18, 6); - for (id = 0; id < mapPtr->unk52C.unkC; id++) { - mapPtr->unk554[id] = &gBgTilemaps[2 + mapPtr->unk52C.unkA + id][0][0]; - mapPtr->unk54C[id] = MemoryAlloc(mapPtr->unk52C.unk10 * 128, 6); - } - for (; id < UNK_54C_ARR_COUNT; id++) { - mapPtr->unk554[id] = NULL; - mapPtr->unk54C[id] = NULL; - } - - if (mapPtr->unk52C.unk14 != NULL) { - mapPtr->unk544 = MemoryAlloc(mapPtr->unk52C.unkE * 256, 6); - } - else { - mapPtr->unk544 = NULL; - } - - mapPtr->unk430 = NULL; - mapPtr->unk434 = NULL; - mapPtr->unk438 = NULL; - mapPtr->unk43C = NULL; - mapPtr->unk440 = NULL; - mapPtr->unk52A = 0; - mapPtr->unk444 = -1; - mapPtr->unk468 = 0; - mapPtr->unk448.unk0 = 0; - mapPtr->unk448.unk1 = 0; - mapPtr->unk448.unk2 = 0; - mapPtr->unk448.unk3 = 0; - mapPtr->unk448.unk4 = 0; - mapPtr->unk448.unk5 = 0; - unk0Ptr = &mapPtr->unk0[0]; - mapPtr->unk46C = 0; - mapPtr->unk470 = 0; - mapPtr->unk471 = 0; - - for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, unk0Ptr++) { - unk0Ptr->unk0 = 0; - unk0Ptr->unk2 = 0; - unk0Ptr->unk8 = 0; - unk0Ptr->unk4 = 0; - } - - for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { - SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[unk3E0Id]; - unkPtr->unk0 = 0; - unkPtr->unk1 = 0; - unkPtr->unk2 = 0; - unkPtr->unk4 = 0; - unkPtr->unk8 = NULL; - unkPtr->unkC = 0; - unkPtr->unk14 = 0; - unkPtr->unk10 = 0; - unkPtr->unk1C = 0; - unkPtr->unk18 = 0; - unkPtr->unk20 = 0; - unkPtr->unk24 = 0; - } - - for (i = 0; i < 2; i++) { - sub_80A456C(mapPtr, i, &gUnknown_81172B8); - } -} - -void sub_80A2D00(unkStruct_3001B70 *mapPtr) -{ - s32 i; - - sub_80A2DD4(mapPtr); - TRY_FREE_AND_SET_NULL(mapPtr->unk544); - FREE_AND_SET_NULL(mapPtr->unk548); - - for (i = 0; i < UNK_54C_ARR_COUNT; i++) { - if (mapPtr->unk554[i] != NULL) { - mapPtr->unk554[i] = NULL; - } - TRY_FREE_AND_SET_NULL(mapPtr->unk54C[i]); - } -} - -void sub_80A2D68(unkStruct_3001B70 *mapPtr) -{ - TRY_FREE_AND_SET_NULL(mapPtr->unk544); -} - -void sub_80A2D88(unkStruct_3001B70 *mapPtr) -{ - if (mapPtr->unk52C.unk14 != NULL) { - void *unk448 = &mapPtr->unk448; - mapPtr->unk544 = MemoryAlloc(mapPtr->unk52C.unkE * 256, 6); - mapPtr->unk52C.unk14(mapPtr->unk544, mapPtr->unk468, unk448, mapPtr->unk52C.unkE); - } -} - -void sub_80A2DD4(unkStruct_3001B70 *mapPtr) -{ - s32 i; - - for (i = 0; i < UNK_3E0_ARR_COUNT; i++) { - SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[i]; - TRY_CLOSE_FILE_AND_SET_NULL(unkPtr->unk8); - } - TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk43C); - TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk440); - TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk430); - TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk434); - TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk438); -} - -void sub_80A2E64(unkStruct_3001B70 *mapPtr) -{ - u16 r6; - s32 i, j; - SubStruct_0 *unk0Ptr; - s32 unk0Id, unk3E0Id; - - sub_80A2DD4(mapPtr); - mapPtr->unk444 = -1; - mapPtr->unk528 = 0; - mapPtr->unk448.unk0 = 0; - mapPtr->unk448.unk1 = 0; - mapPtr->unk448.unk2 = 0; - mapPtr->unk448.unk3 = 0; - mapPtr->unk448.unk4 = 0; - mapPtr->unk448.unk5 = 0; - unk0Ptr = &mapPtr->unk0[0]; - mapPtr->unk46C = 0; - mapPtr->unk470 = 0; - mapPtr->unk471 = 0; - - for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, unk0Ptr++) { - unk0Ptr->unk0 = 0; - unk0Ptr->unk2 = 0; - unk0Ptr->unk8 = 0; - unk0Ptr->unk4 = 0; - } - - for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { - SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[unk3E0Id]; - unkPtr->unk0 = 0; - unkPtr->unk1 = 0; - unkPtr->unk2 = 0; - unkPtr->unk4 = 0; - unkPtr->unk8 = NULL; - unkPtr->unkC = 0; - unkPtr->unk14 = 0; - unkPtr->unk10 = 0; - unkPtr->unk1C = 0; - unkPtr->unk18 = 0; - unkPtr->unk20 = 0; - unkPtr->unk24 = 0; - } - - r6 = mapPtr->unk52C.unk0 * 16; - for (i = 0; i < mapPtr->unk52C.unk2; i++) { - struct S str1 = {0}; - struct S str2 = {0xFF, 0xFF, 0xFF, 0}; - - sub_8003810(r6++, str1); - for (j = 0; j < 15; j++) { - sub_8003810(r6++, str2); - } - } - - sub_80A3BB0(mapPtr, 0); - sub_80A3EB0(mapPtr->unk488); - mapPtr->unk52A = 1; -} - -extern const struct unkStruct_81188F0 gUnknown_81188F0[10]; -extern const FileArchive gGroundFileArchive; - -void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) -{ - SubStruct_0 *sub0Ptr; - u16 r5; - s32 i, j, k; - const struct unkStruct_81188F0 *dataPtr; - s16 *mapPtr_464; - SubStruct_545 *mapPtr_454; - const u16 *file_434; - const void *file_438; - const void *file_430; - SubStruct_448 *mapPtr_448; - struct S str2; - struct S str1; - const void *r7; - s32 unk0Id; - s32 id; - void *vramPtr; - s32 sum; - s32 a1 = (s16) a1_; - - if (a1 == -1) { - sub_80A2E64(mapPtr); - return; - } - - sub_80A2DD4(mapPtr); - mapPtr->unk444 = a1; - dataPtr = &gUnknown_81188F0[a1]; - mapPtr->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); - mapPtr->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive); - mapPtr->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive); - file_430 = mapPtr->unk430->data; - file_434 = mapPtr->unk434->data; - file_438 = mapPtr->unk438->data; - mapPtr_464 = mapPtr->unk464; - mapPtr_454 = &mapPtr->unk454; - mapPtr_448 = &mapPtr->unk448; - - mapPtr_464[0] = *(u8 *)(file_430); file_430 += 2; - mapPtr_464[1] = *(u8 *)(file_430); file_430 += 2; - - mapPtr_454->unk0 = *file_434++; - mapPtr_454->unk2 = *file_434++; - mapPtr_454->unk4 = *file_434++; - - sum = mapPtr_454->unk4; - for (k = 0; k < UNK_545_UNK6_ARR_COUNT; k++) { - mapPtr_454->unk6[k] = *file_434++; - sum += mapPtr_454->unk6[k]; - } - mapPtr_454->unkE = *file_434++; - - mapPtr_448->unk0 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk1 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk2 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk3 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk4 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk5 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk6 = *(u8 *)(file_438); file_438 += 2; - mapPtr_448->unk8 = *(u8 *)(file_438); file_438 += 2; - mapPtr_448->unkA = *(u8 *)(file_438); file_438 += 2; - - r7 = file_430; - r5 = mapPtr->unk52C.unk0 * 16; - str2 = (struct S) {0}; - str1.x0.x0[0] = 0xff; - str1.x0.x0[1] = 0xff; - str1.x0.x0[2] = 0xff; - str1.x0.x0[3] = 0; - for (i = 0; i < mapPtr_464[0] && i < mapPtr->unk52C.unk2; i++) { - sub_8003810(r5++, str2); - sub_809971C(r5, r7, 15); - r5 += 15; - r7 += 60; - } - for (; i < mapPtr->unk52C.unk2; i++) { - sub_8003810(r5++, str2); - for (j = 0; j < 15; j++) { - sub_8003810(r5++, str1); - } - } - - sub_80A37C4((void *)(VRAM + 0x8000 + mapPtr->unk52C.unk4 * 32), file_434, &mapPtr->unk52C, &mapPtr->unk454); - _UncompressCell(mapPtr->unk548, &mapPtr->unk528, file_434 + ((mapPtr_454->unk4 - 1) * 16), &mapPtr->unk52C, &mapPtr->unk454); - file_438 = sub_80A3908(mapPtr->unk54C, file_438, &mapPtr->unk52C, &mapPtr->unk448); - mapPtr->unk468 = file_438; - if (mapPtr->unk544 != NULL) { - mapPtr->unk52C.unk14(mapPtr->unk544, file_438, mapPtr_448, mapPtr->unk52C.unkE); - } - - sub0Ptr = mapPtr->unk0; - unk0Id = 0; - if (mapPtr_464[1] != 0) { - const s16 *r3 = file_430 + (mapPtr_464[0] * 60); - const void *r6 = &r3[mapPtr_464[0] * 2]; - - mapPtr->unk46C = r3; - mapPtr->unk470 = 1; - mapPtr->unk471 = 1; - for (; unk0Id < mapPtr_464[0] && unk0Id < mapPtr->unk52C.unk2; unk0Id++, sub0Ptr++, r3 += 2) { - if (r3[1] > 0) { - sub0Ptr->unk4 = r6; - r6 += r3[1] * 60; - } - else { - sub0Ptr->unk4 = NULL; - } - sub0Ptr->unk0 = 0; - sub0Ptr->unk2 = 0; - sub0Ptr->unk8 = 0; - } - } - else { - mapPtr->unk46C = NULL; - mapPtr->unk470 = 0; - mapPtr->unk471 = 0; - } - - for (; unk0Id < UNK_0_ARR_COUNT; unk0Id++, sub0Ptr++) { - sub0Ptr->unk0 = 0; - sub0Ptr->unk2 = 0; - sub0Ptr->unk4 = sub0Ptr->unk8 = 0; - } - - vramPtr = (void *)(VRAM + 0x8000 + (mapPtr->unk52C.unk4 + mapPtr_454->unk4) * 32); - for (id = 0; id < 2; id++) { - SubStruct_3E0 *sub3E0 = &mapPtr->unk3E0[id]; - if (dataPtr->text4[id] != NULL) { - const struct UnkFileStruct *fileStr; - const void *r1, *r0; - - sub3E0->unk8 = OpenFileAndGetFileDataPtr(dataPtr->text4[id], &gGroundFileArchive); - sub3E0->unk0 = 1; - sub3E0->unk1 = 1; - fileStr = sub3E0->unk8->data; - sub3E0->unkC = fileStr; - r1 = &fileStr->unk4; - r0 = r1 + fileStr->unk2 * 4; - sub3E0->unk10 = sub3E0->unk14 = r1; - sub3E0->unk18 = sub3E0->unk1C = r0; - sub3E0->unk2 = 0; - sub3E0->unk4 = (u32) fileStr->unk4[0]; // ? - sub3E0->unk20 = vramPtr; - sub3E0->unk24 = mapPtr_454->unk6[id] * 32; - - vramPtr += mapPtr_454->unk6[id] * 32; - } - else { - sub3E0->unk0 = 0; - sub3E0->unk1 = 0; - sub3E0->unk4 = 0; - sub3E0->unk2 = 0; - sub3E0->unk8 = NULL; - sub3E0->unkC = 0; - sub3E0->unk14 = 0; - sub3E0->unk10 = 0; - sub3E0->unk1C = 0; - sub3E0->unk18 = 0; - sub3E0->unk20 = 0; - sub3E0->unk24 = 0; - } - } - for (; id < 4; id++) { - if (dataPtr->text4[id] != NULL) { - s32 n; - OpenedFile *file = OpenFileAndGetFileDataPtr(dataPtr->text4[id], &gGroundFileArchive); - const struct UnkFileStruct *fileStr = file->data; - u16 *r1 = (void *) fileStr->unk4; - r1 += fileStr->unk2 * 2; - - n = mapPtr_454->unk6[id] * 16; - for (k = 0; k < n; k++) { - *(u16 *)(vramPtr) = *r1; - r1++; - vramPtr += 2; - } - CloseFile(file); - } - } - - sub_80A3BB0(mapPtr, 0); - sub_80A3EB0(mapPtr->unk488); - mapPtr->unk52A = 1; -} - -void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s32 a3) -{ - SubStruct_0 *sub0Ptr; - s32 i; - SubStruct_545 *mapPtr_454; - const u16 *file_434; - const void *file_438; - const void *file_430; - SubStruct_448 *mapPtr_448; - s32 unk0Id, sub3E0Id; - const struct unkStruct_81188F0 *dataPtr; - s16 *mapPtr_464; - u16 *unkPtrArray[2]; - s32 a1 = (s16) a1_; - - if (a1 == -1 || dungLoc->id == DUNGEON_INVALID) { - sub_80A2E64(mapPtr); - return; - } - - sub_80A2FBC(mapPtr, a1); - sub_80A2DD4(mapPtr); - mapPtr->unk444 = a1; - dataPtr = &gUnknown_81188F0[a1]; - mapPtr->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); - mapPtr->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive); - mapPtr->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive); - file_430 = mapPtr->unk430->data; - file_434 = mapPtr->unk434->data; - file_438 = mapPtr->unk438->data; - mapPtr_464 = mapPtr->unk464; - mapPtr_454 = &mapPtr->unk454; - mapPtr_448 = &mapPtr->unk448; - - mapPtr_464[0] = *(u8 *)(file_430); file_430 += 2; - mapPtr_464[1] = *(u8 *)(file_430); file_430 += 2; - - mapPtr_454->unk0 = *file_434++; - mapPtr_454->unk2 = *file_434++; - mapPtr_454->unk4 = *file_434++; - - for (i = 0; i < UNK_545_UNK6_ARR_COUNT; i++) { - mapPtr_454->unk6[i] = *file_434++; - } - mapPtr_454->unkE = *file_434++; - - mapPtr_448->unk0 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk1 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk2 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk3 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk4 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk5 = *(u8 *)(file_438); file_438 += 1; - mapPtr_448->unk6 = *(u8 *)(file_438); file_438 += 2; - mapPtr_448->unk8 = *(u8 *)(file_438); file_438 += 2; - mapPtr_448->unkA = *(u8 *)(file_438); file_438 += 2; - - unkPtrArray[0] = mapPtr->unk544; - unkPtrArray[1] = NULL; - file_438 = sub_80A3908(unkPtrArray, file_438, &mapPtr->unk52C, &mapPtr->unk448); - mapPtr->unk468 = file_438; - sub_80ADD9C(&mapPtr->unk43C, &mapPtr->unk440, (void *)(VRAM + 0x8000), mapPtr->unk548, mapPtr->unk54C[0], dungLoc, a3, 0x40, mapPtr_448->unk5, mapPtr->unk544, 0); - // Unused return values - GetFileDataPtr(mapPtr->unk43C, 0); - GetFileDataPtr(mapPtr->unk440, 0); - - mapPtr->unk52C.unk14(mapPtr->unk544, file_438, mapPtr_448, mapPtr->unk52C.unkE); - mapPtr_454->unk4 = 0x200; - for (i = 0; i < UNK_545_UNK6_ARR_COUNT; i++) { - mapPtr_454->unk6[i] = 0; - } - - mapPtr_454->unkE = 250; - mapPtr->unk464[0] = 12; - mapPtr->unk464[1] = 0; - if (mapPtr->unk43C != NULL) { - s32 i, j; - const struct S *strPtr = mapPtr->unk43C->data; - u16 r7 = 0; - struct S str0 = {0}; - struct S str1; - - str1.x0.x0[0] = 0xff; - str1.x0.x0[1] = 0xff; - str1.x0.x0[2] = 0xff; - str1.x0.x0[3] = 0; - - for (i = 0; i < 12 && i < mapPtr->unk52C.unk2; i++) { - sub_8003810(r7++, str0); - strPtr++; - for (j = 0; j < 15; j++) { - struct S str2 = {strPtr->x0.x0[0], strPtr->x0.x0[1], strPtr->x0.x0[2], strPtr->x0.x0[3]}; - sub_8003810(r7++, str2); - strPtr++; - } - } - for (; i < mapPtr->unk52C.unk2; i++) { - sub_8003810(r7++, str0); - for (j = 0; j < 15; j++) { - sub_8003810(r7++, str1); - } - } - } - - sub0Ptr = mapPtr->unk0; - if (mapPtr->unk440 != NULL) { - sub_8004AA4(mapPtr->unkE0, mapPtr->unk440, UNK_E0_ARR_COUNT); - } - mapPtr->unk46C = NULL; - mapPtr->unk470 = 0; - mapPtr->unk471 = 0; - - for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, sub0Ptr++) { - sub0Ptr->unk0 = 0; - sub0Ptr->unk2 = 0; - sub0Ptr->unk4 = sub0Ptr->unk8 = 0; - } - - for (sub3E0Id = 0; sub3E0Id < UNK_3E0_ARR_COUNT; sub3E0Id++) { - SubStruct_3E0 *sub3E0 = &mapPtr->unk3E0[sub3E0Id]; - sub3E0->unk0 = 0; - sub3E0->unk1 = 0; - sub3E0->unk4 = 0; - sub3E0->unk2 = 0; - sub3E0->unk8 = NULL; - sub3E0->unkC = 0; - sub3E0->unk14 = 0; - sub3E0->unk10 = 0; - sub3E0->unk1C = 0; - sub3E0->unk18 = 0; - sub3E0->unk20 = 0; - sub3E0->unk24 = 0; - } - sub_80A3BB0(mapPtr, 0); - sub_80A3EB0(mapPtr->unk488); - mapPtr->unk52A = 1; - // bad sp alloc for compiler generated variables... - ASM_MATCH_TRICK(mapPtr_454->unk6[0]); -} - -void sub_80A37C4(void *vramDst, const u16 *src_, SubStruct_52C *a2, SubStruct_545 *a3) -{ - const u16 *src = src_; - u16 *dst = vramDst; - s32 id, i; - - for (i = 0; i < 16; i++) { - *dst++ = 0; - } - for (id = 1; id < a3->unk4; id++) { - for (i = 0; i < 16; i++) { - *dst++ = *src++; - } - } - for (; id < a2->unk6; id++) { - for (i = 0; i < 16; i++) { - *dst++ = 0xFFFF; - } - } -} - -void _UncompressCell(void *dst_, u16 *a1, const void *src_, SubStruct_52C *a3, SubStruct_545 *a4) -{ - s32 id, i; - s32 n; - - const u16 *src = src_; - u16 *dst = dst_; - u16 r6 = (a3->unk0 << 12) | a3->unk4; - - if (a4->unk0 == 2 && a4->unk2 == 2) { - *a1 = 1; - n = 4; - } - else if (a4->unk0 == 3 && a4->unk2 == 3) { - *a1 = 2; - n = 9; - } - else { - *a1 = 0; - FatalError(&gUnknown_81172E8, gUnknown_81172F4, a4->unk0, a4->unk2); - } - - for (i = 0; i < 9; i++) { - *dst++ = 0; - } - for (id = 1; id < a4->unkE; id++) { - for (i = 0; i < n; i++) { - *dst++ = *src++ + r6; - } - for (; i < 9; i++) { - *dst++ = 0; - } - } - for (; id < a3->unk8; id++) { - for (i = 0; i < 9; i++) { - *dst++ = 0; - } - } -} - -// Tilemap decompression algorhitm? -const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *a3) -{ - s32 i, j, k, l; - const u8 *src = src_; - - for (i = 0; i < a2->unkC; i++) { - u16 *dst = dstArray[i]; - - for (j = 0; j < a3->unk5; j++) { - k = 0; - if (j == 0) { - while (k < a3->unk4) { - s32 val = *src++; - if (val > 191) { - for (l = 191; l < val; l++) { - s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; - *dst++ = dstVal & 0xFFF; - *dst++ = (dstVal >> 12) & 0xFFF; - } - k += (val - 191) * 2; - } - else if (val > 127) { - s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; - for (l = 127; l < val; l++) { - *dst++ = dstVal & 0xFFF; - *dst++ = (dstVal >> 12) & 0xFFF; - } - k += (val - 127) * 2; - } - else { - for (l = 0; l <= val; l++) { - *dst++ = 0; - *dst++ = 0; - } - k += (val + 1) * 2; - } - } - } - else { - u16 *ptrVal = dst - 64; - while (k < a3->unk4) { - s32 val = *src++; - if (val > 191) { - for (l = 191; l < val; l++) { - s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; - *dst++ = (dstVal & 0xFFF) ^ *ptrVal++; - *dst++ = ((dstVal >> 12) & 0xFFF) ^ *ptrVal++; - } - k += (val - 191) * 2; - } - else if (val > 127) { - s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; - for (l = 127; l < val; l++) { - *dst++ = (dstVal & 0xFFF) ^ *ptrVal++; - *dst++ = ((dstVal >> 12) & 0xFFF) ^ *ptrVal++; - } - k += (val - 127) * 2; - } - else { - for (l = 0; l <= val; l++) { - *dst++ = *ptrVal++; - *dst++ = *ptrVal++; - } - k += (val + 1) * 2; - } - } - } - - for (; k < 64; k++) { - *dst++ = 0; - } - } - for (; j < a2->unk10; j++) { - for (k = 0; k < 64; k++) { - *dst++ = 0; - } - } - } - - return src; -} - -void sub_80A3B80(unkStruct_3001B70 *mapPtr, u8 a1, u8 a2) -{ - if (mapPtr->unk46C != NULL) { - mapPtr->unk470 = a1; - mapPtr->unk471 = a2; - } -} - -void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0_) -{ - s32 i; - // s16 memes strike yet again - s32 a0Match = (s16) a0_; - s32 a0 = a0Match; - - SubStruct_488 *map488 = mapPtr->unk488; - - switch (a0) { - default: - case 0: - case 1: - mapPtr->unk474 = 1; - sub_80A3D40(&map488[0], mapPtr, 0, mapPtr->unk52C.unkC, (a0 == 1)); - break; - case 2: - case 3: - case 4: - mapPtr->unk474 = 2; - sub_80A3D40(&map488[0], mapPtr, 0, mapPtr->unk52C.unkC - 1, (a0 == 4)); - sub_80A3D40(&map488[1], mapPtr, mapPtr->unk52C.unkC - 1, 1, (a0 != 2)); - break; - } - - for (i = 0; i < mapPtr->unk474; i++) { - sub_80A456C(mapPtr, i, &gUnknown_8117314); - switch (map488[i].unk4) { - default: - case 1: - switch (map488[i].unk0) { - default: - case 0: - map488[i].unk18 = sub_80A3EBC; - break; - case 1: - map488[i].unk18 = sub_80A3EF4; - break; - case 2: - map488[i].unk18 = (map488[i].unk6 != FALSE) ? sub_80A41C4 : sub_80A4088; - break; - } - break; - case 2: - switch (map488[i].unk0) { - default: - case 0: - map488[i].unk18 = sub_80A3ED4; - break; - case 1: - map488[i].unk18 = sub_80A3F94; - break; - case 2: - map488[i].unk18 = sub_80A4358; - break; - } - break; - } - sub_80A3E14(&map488[i], &mapPtr->unk478[i]); - } - for (i = mapPtr->unk474; i < UNK_54C_ARR_COUNT; i++) { - sub_80A456C(mapPtr, i, &gUnknown_8117314); - sub_80A3D40(&map488[i], mapPtr, 0, 0, FALSE); - } -} - -void sub_80A3D40(SubStruct_488 *map488, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4) -{ - s32 i, j; - - map488->unk0 = mapPtr->unk528; - map488->unk2 = a2; - map488->unk4 = a3; - map488->unk6 = a4; - map488->unk8 = mapPtr->unk448.unk4; - map488->unkC = mapPtr->unk448.unk5; - map488->unk10.x = mapPtr->unk448.unk0 * 8; - map488->unk10.y = mapPtr->unk448.unk1 * 8; - map488->unk1C = mapPtr->unk548; - - for (i = 0, j = a2; i < a3 && j < mapPtr->unk52C.unkC; i++, j++) { - map488->unk20[i] = mapPtr->unk54C[j]; - map488->unk28[i] = mapPtr->unk554[j]; - } - for (; i < UNK_54C_ARR_COUNT; i++) { - map488->unk20[i] = NULL; - map488->unk28[i] = NULL; - } - - sub_80A3E14(map488, &mapPtr->unk478[0]); -} - -void sub_80A3E14(SubStruct_488 *map488, PixelPos *a1) -{ - map488->unk30.x = a1->x; - map488->unk38.x = map488->unk30.x / 8; - map488->unk30.y = a1->y; - map488->unk38.y = map488->unk30.y / 8; - - switch (map488->unk0) { - case 0: - map488->unk40.x = 0; - map488->unk40.y = 0; - map488->bgRegOffsets.x = 0; - map488->bgRegOffsets.y = 0; - break; - case 1: - map488->unk40.x = map488->unk38.x / 2; - map488->unk40.y = map488->unk38.y / 2; - map488->bgRegOffsets.x = map488->unk30.x % 16; - map488->bgRegOffsets.y = map488->unk30.y % 16; - break; - case 2: - map488->unk40.x = map488->unk38.x / 3; - map488->unk40.y = map488->unk38.y / 3; - map488->bgRegOffsets.x = map488->unk30.x % 8; - map488->bgRegOffsets.y = map488->unk30.y % 24; - break; - } -} - -void sub_80A3EB0(SubStruct_488 *map488) -{ - map488->unk18(map488); -} - -void sub_80A3EBC(SubStruct_488 *map488) -{ - s32 i; - u16 *dst = map488->unk28[0]; - - for (i = 0; i < 1024; i++) { - *dst++ = 0; - } -} - -void sub_80A3ED4(SubStruct_488 *map488) -{ - s32 i; - u16 *dst1 = map488->unk28[0]; - u16 *dst2 = map488->unk28[1]; - - for (i = 0; i < 1024; i++) { - *dst1++ = 0; - *dst2++ = 0; - } -} - -void sub_80A3EF4(SubStruct_488 *map488) -{ - s32 arrPtrId; - s32 i, j; - u16 *arrPtrs[2]; - u16 *ptr = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; - s32 unk28Id = 0; - - for (i = 0; i < 11; ptr += 64, i++) { - u16 *currPtr = ptr; - - for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { - arrPtrs[arrPtrId] = &map488->unk28[0][unk28Id]; - unk28Id += 32; - } - - for (j = 0; j < 16; j++) { - u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; - for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { - u16 *currDst = arrPtrs[arrPtrId]; - *currDst++ = *currSrc++; - *currDst++ = *currSrc++; - arrPtrs[arrPtrId] = currDst; - } - } - } -} - -void sub_80A3F94(SubStruct_488 *map488) -{ - s32 arrPtrId; - u16 *ptr1, *ptr2; - u16 *arrPtrs1[2]; - u16 *arrPtrs2[2]; - s32 unk28Id; - s32 i, j; - - ptr1 = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; - ptr2 = &map488->unk20[1][(map488->unk40.y * 64) + map488->unk40.x]; - unk28Id = 0; - for (i = 0; i < 11; ptr1 += 64, ptr2 += 64, i++) { - u16 *currPtr1 = ptr1; - u16 *currPtr2 = ptr2; - - for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { - arrPtrs1[arrPtrId] = &map488->unk28[0][unk28Id]; - arrPtrs2[arrPtrId] = &map488->unk28[1][unk28Id]; - unk28Id += 32; - } - - for (j = 0; j < 16; j++) { - u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; - u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; - for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { - u16 *currDst1 = arrPtrs1[arrPtrId]; - u16 *currDst2 = arrPtrs2[arrPtrId]; - *currDst1++ = *currSrc1++; - *currDst1++ = *currSrc1++; - *currDst2++ = *currSrc2++; - *currDst2++ = *currSrc2++; - arrPtrs1[arrPtrId] = currDst1; - arrPtrs2[arrPtrId] = currDst2; - } - } - } -} - -void sub_80A4088(SubStruct_488 *map488) -{ - s32 arrPtrId; - s32 i, j; - u16 *arrPtrs[3]; - s32 mod3 = map488->unk38.x % 3; - u16 *ptr = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; - s32 unk28Id = 0; - - for (i = 0; i < 8; ptr += 64, i++) { - u16 *currPtr = ptr; - - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - arrPtrs[arrPtrId] = &map488->unk28[0][unk28Id]; - unk28Id += 32; - } - - if (mod3 != 0) { - u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; - - if (mod3 == 1) { - currSrc++; - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst = arrPtrs[arrPtrId]; - *currDst++ = currSrc[0]; - *currDst++ = currSrc[1]; - arrPtrs[arrPtrId] = currDst; - currSrc += 3; - } - } - else { - currSrc += 2; - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst = arrPtrs[arrPtrId]; - *currDst++ = currSrc[0]; - arrPtrs[arrPtrId] = currDst; - currSrc += 3; - } - } - } - - for (j = 0; j < 10; j++) { - u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst = arrPtrs[arrPtrId]; - *currDst++ = *currSrc++; - *currDst++ = *currSrc++; - *currDst++ = *currSrc++; - arrPtrs[arrPtrId] = currDst; - } - } - - if (mod3 != 1) { - u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; - if (mod3 == 0) { - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst = arrPtrs[arrPtrId]; - currDst[0] = currSrc[0]; - currDst[1] = currSrc[1]; - currSrc += 3; - } - } - else { - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst = arrPtrs[arrPtrId]; - currDst[0] = currSrc[0]; - currSrc += 3; - } - } - } - } -} - -void sub_80A41C4(SubStruct_488 *map488) -{ - s32 mod3; - s32 arrPtrId; - u16 *ptr; - u16 *arrPtrs[3]; - s32 unk28Id; - s32 i, j; - s32 sub1, sub2; - - // Screw you agbcc... - ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr); - - mod3 = map488->unk38.x % 3; - ptr = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; - unk28Id = 0; - sub1 = map488->unkC - map488->unk40.y; - sub2 = map488->unk8 - map488->unk40.x; - - for (i = 0; i < 8; ptr += 64, i++) { - u16 *currPtr; - s32 currSub2 = sub2; - - if (sub1 > 0) { - sub1--; - currPtr = ptr; - } - else { - sub1 = map488->unkC; - ptr = &map488->unk20[0][map488->unk40.x]; - currPtr = ptr; - } - - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - arrPtrs[arrPtrId] = &map488->unk28[0][unk28Id]; - unk28Id += 32; - } - - if (mod3 != 0) { - u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; - - if (mod3 == 1) { - currSrc++; - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst = arrPtrs[arrPtrId]; - *currDst++ = currSrc[0]; - *currDst++ = currSrc[1]; - arrPtrs[arrPtrId] = currDst; - currSrc += 3; - } - } - else { - currSrc += 2; - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - *arrPtrs[arrPtrId]++ = *currSrc; - currSrc += 3; - } - } - - currSub2--; - if (currSub2 <= 0) { - currSub2 = map488->unk8; - currPtr -= currSub2; - } - } - - for (j = 0; j < 10; j++) { - u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; - - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst = arrPtrs[arrPtrId]; - *currDst++ = *currSrc++; - *currDst++ = *currSrc++; - *currDst++ = *currSrc++; - arrPtrs[arrPtrId] = currDst; - } - - if (--currSub2 <= 0) { - currSub2 = map488->unk8; - currPtr -= currSub2; - } - } - - // Interestingly enough this part is NOT present in Blue... - if (mod3 != 1) { - u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; - if (mod3 == 0) { - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst = arrPtrs[arrPtrId]; - currDst[0] = currSrc[0]; - currDst[1] = currSrc[1]; - currSrc += 3; - } - } - else { - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst = arrPtrs[arrPtrId]; - currDst[0] = currSrc[0]; - currSrc += 3; - } - } - } - } -} - -void sub_80A4358(SubStruct_488 *map488) -{ - s32 arrPtrId; - s32 i, j; - u16 *arrPtrs1[3]; - u16 *arrPtrs2[3]; - s32 mod3 = map488->unk38.x % 3; - u16 *ptr1 = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; - u16 *ptr2 = &map488->unk20[1][(map488->unk40.y * 64) + map488->unk40.x]; - s32 unk28Id = 0; - - // Stack memes again... - ASM_MATCH_TRICK(ptr2);ASM_MATCH_TRICK(ptr2);ASM_MATCH_TRICK(ptr2); - - for (i = 0; i < 8; ptr1 += 64, ptr2 += 64, i++) { - u16 *currPtr1 = ptr1; - u16 *currPtr2 = ptr2; - - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - arrPtrs1[arrPtrId] = &map488->unk28[0][unk28Id]; - arrPtrs2[arrPtrId] = &map488->unk28[1][unk28Id]; - unk28Id += 32; - } - - if (mod3 != 0) { - u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; - u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; - - if (mod3 == 1) { - currSrc1++; - currSrc2++; - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst1, *currDst2; - currDst1 = arrPtrs1[arrPtrId]; - currDst2 = arrPtrs2[arrPtrId]; - *currDst1++ = currSrc1[0]; - *currDst1++ = currSrc1[1]; - *currDst2++ = currSrc2[0]; - *currDst2++ = currSrc2[1]; - arrPtrs1[arrPtrId] = currDst1; - arrPtrs2[arrPtrId] = currDst2; - currSrc1 += 3; - currSrc2 += 3; - } - } - else { - currSrc1 += 2; - currSrc2 += 2; - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - *arrPtrs1[arrPtrId]++ = currSrc1[0]; - *arrPtrs2[arrPtrId]++ = currSrc2[0]; - currSrc1 += 3; - currSrc2 += 3; - } - } - } - - for (j = 0; j < 10; j++) { - u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; - u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst1 = arrPtrs1[arrPtrId]; - u16 *currDst2 = arrPtrs2[arrPtrId]; - *currDst1++ = *currSrc1++; - *currDst1++ = *currSrc1++; - *currDst1++ = *currSrc1++; - *currDst2++ = *currSrc2++; - *currDst2++ = *currSrc2++; - *currDst2++ = *currSrc2++; - arrPtrs1[arrPtrId] = currDst1; - arrPtrs2[arrPtrId] = currDst2; - } - } - - if (mod3 != 1) { - u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; - u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; - if (mod3 == 0) { - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst1 = arrPtrs1[arrPtrId]; - u16 *currDst2 = arrPtrs2[arrPtrId]; - currDst1[0] = currSrc1[0]; - currDst1[1] = currSrc1[1]; - currDst2[0] = currSrc2[0]; - currDst2[1] = currSrc2[1]; - currSrc1 += 3; - currSrc2 += 3; - } - } - else { - for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { - u16 *currDst1, *currDst2; - - currDst1 = arrPtrs1[arrPtrId]; - currDst1[0] = currSrc1[0]; - currDst2 = arrPtrs2[arrPtrId]; - currDst2[0] = currSrc2[0]; - currSrc1 += 3; - currSrc2 += 3; - } - } - } - } -} - -void sub_80A4558(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *dstPos) -{ - *dstPos = mapPtr->unk478[id]; -} - -void sub_80A456C(unkStruct_3001B70 *mapPtr, s32 id, const PixelPos *srcPos) -{ - mapPtr->unk478[id] = *srcPos; -} - -void sub_80A4580(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos) -{ - SubStruct_488 *map488 = &mapPtr->unk488[id]; - - if (pixPos->x < 0) { - if (map488->unk6) { - do { - pixPos->x += map488->unk10.x; - } while (pixPos->x < 0); - } - else { - pixPos->x = 0; - } - } - else if (pixPos->x >= map488->unk10.x) { - if (map488->unk6) { - do { - pixPos->x -= map488->unk10.x; - } while (pixPos->x >= map488->unk10.x); - } - else { - pixPos->x = map488->unk10.x - 1; - } - } - - if (pixPos->y < 0) { - if (map488->unk6) { - do { - pixPos->y += map488->unk10.y; - } while (pixPos->y < 0); - } - else { - pixPos->y = 0; - } - } - else if (pixPos->y >= map488->unk10.y) { - if (map488->unk6) { - do { - pixPos->y -= map488->unk10.y; - } while (pixPos->y >= map488->unk10.y); - } - else { - pixPos->y = map488->unk10.y - 1; - } - } -} - -void sub_80A4608(unkStruct_3001B70 *mapPtr, PixelPos *dstPos) -{ - dstPos->x = mapPtr->unk448.unk0; - dstPos->y = mapPtr->unk448.unk1; -} - -UNUSED static void sub_80A4620(unkStruct_3001B70 *mapPtr, PixelPos *dstPos) -{ - dstPos->x = mapPtr->unk448.unk0 * 8; - dstPos->y = mapPtr->unk448.unk1 * 8; -} - -void GetDungeonBounds(unkStruct_3001B70 *mapPtr, PixelPos *dstPos1, PixelPos *dstPos2) -{ - dstPos1->x = 0; - dstPos1->y = 0; - dstPos2->x = mapPtr->unk448.unk0 << 11; - dstPos2->y = mapPtr->unk448.unk1 << 11; -} - -u8 sub_80A4660(unkStruct_3001B70 *mapPtr, u8 bits, PixelPos *pixPos1, PixelPos *boundary) -{ - s32 i, j; - u8 *currPtr; - void *ptr = mapPtr->unk544; - - if (ptr == NULL) - return 0; - - ptr += ((pixPos1->y * 256) + pixPos1->x + 0x405); - for (i = boundary->y; i > 0; i--) { - for (j = boundary->x, currPtr = ptr; j > 0; j--) { - u8 ret = *currPtr++ & bits; - if (ret) - return ret; - } - ptr += 256; - } - - return 0; -} - -u8 sub_80A46C0(unkStruct_3001B70 *mapPtr, u8 bits, PixelPos *pixPos1, PixelPos *boundary) -{ - s32 i, j; - u8 *currPtr; - void *ptr = mapPtr->unk544; - - if (ptr == NULL) - return 0; - - ptr += ((pixPos1->y * 256) + pixPos1->x + 0x405); - for (i = boundary->y; i > 0; i--) { - for (j = boundary->x, currPtr = ptr; j > 0; j--) { - u8 ret = *currPtr++ & bits; - if (ret != bits) - return 0; - } - ptr += 256; - } - - return 1; -} - -u16 sub_80A4720(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos) -{ - u16 *ptr = mapPtr->unk54C[id] + (pixPos->y * 64); - ptr += pixPos->x; - return *ptr; -} - -void sub_80A4740(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos, u32 dstVal) -{ - u16 *ptr = mapPtr->unk54C[id] + (pixPos->y * 64); - ptr += pixPos->x; - *ptr = dstVal; -} - -void sub_80A4764(unkStruct_3001B70 *mapPtr) -{ - s32 i, j; - s32 unk3E0Id; - SubStruct_488 *map488; - PixelPos *map478; - - if (mapPtr->unk444 == -1) - return; - - if (mapPtr->unk464[1] != 0) { - s32 i; - SubStruct_0 *sub0Ptr = mapPtr->unk0; - const u16 *ptr = mapPtr->unk46C; - u16 r6 = mapPtr->unk52C.unk0 * 16; - - for (i = 0; i < mapPtr->unk464[0]; i++, sub0Ptr++, ptr += 2, r6 += 16) { - if (sub0Ptr->unk4 != NULL && --sub0Ptr->unk2 <= 0) { - if (--sub0Ptr->unk0 <= 0) { - if (mapPtr->unk471) { - sub0Ptr->unk2 = ptr[0]; - sub0Ptr->unk0 = ptr[1]; - sub0Ptr->unk8 = sub0Ptr->unk4; - } - else { - sub0Ptr->unk0 = 0; - sub0Ptr->unk2 = 0; - sub0Ptr->unk8 = NULL; - } - } - else { - sub0Ptr->unk2 = ptr[0]; - } - - if (sub0Ptr->unk8 != NULL) { - struct S empty = {0}; - sub_8003810(r6, empty); - sub_809971C(r6 + 1, sub0Ptr->unk8, 15); - sub0Ptr->unk8 += 60; - } - } - } - - mapPtr->unk471 = mapPtr->unk470; - } - else if (mapPtr->unk440 != NULL) { - s32 i; - unkStruct_202EE8C *unkE0Ptr = mapPtr->unkE0; - s32 r6 = 160; - - for (i = 0; i < 32; i++, unkE0Ptr++, r6++) { - struct S color; - - if (sub_8004D14(unkE0Ptr, 1) && !sub_8004D40(unkE0Ptr, 1) && --unkE0Ptr->unk6 <= 0) { - unkE0Ptr->unk6 = unkE0Ptr->unk4; - if (unkE0Ptr->unkC >= unkE0Ptr->unk10) { - unkE0Ptr->unkC = unkE0Ptr->unk8; - } - unkE0Ptr->unk14 = *unkE0Ptr->unkC++; - color = (struct S) {unkE0Ptr->unk14.r, unkE0Ptr->unk14.g, unkE0Ptr->unk14.b, unkE0Ptr->unk14.unk4}; - sub_8003810(r6, color); - } - } - } - - for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { - SubStruct_3E0 *sub3E0Ptr = &mapPtr->unk3E0[unk3E0Id]; - - if (sub3E0Ptr->unk0 && sub3E0Ptr->unk4-- <= 0) { - sub3E0Ptr->unk14 += 4; - sub3E0Ptr->unk1C += (sub3E0Ptr->unk24 / 2) * 2; - if (++sub3E0Ptr->unk2 >= sub3E0Ptr->unkC->unk2) { - sub3E0Ptr->unk14 = sub3E0Ptr->unk10; - sub3E0Ptr->unk1C = sub3E0Ptr->unk18; - sub3E0Ptr->unk2 = 0; - } - sub3E0Ptr->unk1 = 1; - sub3E0Ptr->unk4 = *(u32 *)(sub3E0Ptr->unk14); - } - } - - map488 = mapPtr->unk488; - map478 = mapPtr->unk478; - for (i = 0; i < mapPtr->unk474; i++, map488++, map478++) { - s32 unk; - - sub_80A3E14(map488, map478); - sub_80A3EB0(map488); - for (j = 0, unk = map488->unk2 + mapPtr->unk52C.unkA; j < map488->unk4; j++, unk++) { - switch (unk) { - case 0: - SetBG2RegOffsets(map488->bgRegOffsets.x, map488->bgRegOffsets.y); - break; - case 1: - SetBG3RegOffsets(map488->bgRegOffsets.x, map488->bgRegOffsets.y); - break; - } - } - } - - mapPtr->unk52A = 1; -} - -void sub_80A49E8(unkStruct_3001B70 *mapPtr) -{ - s32 i; - s32 unk3E0Id; - - for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { - SubStruct_3E0 *sub3E0Ptr = &mapPtr->unk3E0[unk3E0Id]; - - if (sub3E0Ptr->unk1) { - MemoryCopy32(sub3E0Ptr->unk20, sub3E0Ptr->unk1C, sub3E0Ptr->unk24); - sub3E0Ptr->unk1 = FALSE; - mapPtr->unk52A = 1; - } - } - - if (mapPtr->unk52A) { - s32 unk; - for (i = 0, unk = mapPtr->unk52C.unkA; i < mapPtr->unk52C.unkC; i++, unk++) { - sub_80098F8(unk + 2); - } - mapPtr->unk52A = 0; - } -} diff --git a/src/ground_bg.c b/src/ground_bg.c new file mode 100644 index 000000000..66114f248 --- /dev/null +++ b/src/ground_bg.c @@ -0,0 +1,1454 @@ +#include "global.h" +#include "globaldata.h" +#include "ground_map.h" +#include "text_1.h" +#include "memory.h" +#include "file_system.h" +#include "code_8002774.h" +#include "code_801D9E4.h" +#include "code_8004AA0.h" +#include "code_8009804.h" +#include "debug.h" +#include "bg_control.h" +#include "unk_dungeon_load.h" +#include "constants/dungeon.h" + +extern const struct unkStruct_81188F0 gUnknown_81188F0[10]; +extern const FileArchive gGroundFileArchive; + +void sub_80A456C(unkStruct_3001B70 *mapPtr, s32 id, const PixelPos *srcPos); +static void sub_80A2DD4(unkStruct_3001B70 *mapPtr); +void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0); +static void sub_80A3EB0(SubStruct_488 *map488); +static const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *a3); +static void sub_80A37C4(void *vramDst, const u16 *src_, SubStruct_52C *a2, SubStruct_545 *a3); +static void _UncompressCell(void * a0, u16 *a1, const void * a2, SubStruct_52C *a3, SubStruct_545 *a4); +static void sub_80A3D40(SubStruct_488 *map488, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4); +static void sub_80A3E14(SubStruct_488 *map488, PixelPos *a1); +static void sub_80A3EBC(SubStruct_488 *map488); +static void sub_80A3EF4(SubStruct_488 *map488); +static void sub_80A4088(SubStruct_488 *map488); +static void sub_80A41C4(SubStruct_488 *map488); +static void sub_80A3ED4(SubStruct_488 *map488); +static void sub_80A3F94(SubStruct_488 *map488); +static void sub_80A4358(SubStruct_488 *map488); + +extern void sub_8003810(u16 param_1, struct S param_2); +extern void sub_809971C(u16 a0, const void *a1, int a2); + +static const PixelPos sPositionZero = {0, 0}; + +void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) +{ + SubStruct_0 *unk0Ptr; + s32 id, unk0Id, unk3E0Id; + s32 i; + + mapPtr->unk52C = *a1; + mapPtr->unk548 = MemoryAlloc(mapPtr->unk52C.unk8 * 18, 6); + for (id = 0; id < mapPtr->unk52C.unkC; id++) { + mapPtr->unk554[id] = &gBgTilemaps[2 + mapPtr->unk52C.unkA + id][0][0]; + mapPtr->unk54C[id] = MemoryAlloc(mapPtr->unk52C.unk10 * 128, 6); + } + for (; id < UNK_54C_ARR_COUNT; id++) { + mapPtr->unk554[id] = NULL; + mapPtr->unk54C[id] = NULL; + } + + if (mapPtr->unk52C.unk14 != NULL) { + mapPtr->unk544 = MemoryAlloc(mapPtr->unk52C.unkE * 256, 6); + } + else { + mapPtr->unk544 = NULL; + } + + mapPtr->unk430 = NULL; + mapPtr->unk434 = NULL; + mapPtr->unk438 = NULL; + mapPtr->unk43C = NULL; + mapPtr->unk440 = NULL; + mapPtr->unk52A = 0; + mapPtr->unk444 = -1; + mapPtr->unk468 = 0; + mapPtr->unk448.unk0 = 0; + mapPtr->unk448.unk1 = 0; + mapPtr->unk448.unk2 = 0; + mapPtr->unk448.unk3 = 0; + mapPtr->unk448.unk4 = 0; + mapPtr->unk448.unk5 = 0; + unk0Ptr = &mapPtr->unk0[0]; + mapPtr->unk46C = 0; + mapPtr->unk470 = 0; + mapPtr->unk471 = 0; + + for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, unk0Ptr++) { + unk0Ptr->unk0 = 0; + unk0Ptr->unk2 = 0; + unk0Ptr->unk8 = 0; + unk0Ptr->unk4 = 0; + } + + for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { + SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[unk3E0Id]; + unkPtr->unk0 = 0; + unkPtr->unk1 = 0; + unkPtr->unk2 = 0; + unkPtr->unk4 = 0; + unkPtr->unk8 = NULL; + unkPtr->unkC = 0; + unkPtr->unk14 = 0; + unkPtr->unk10 = 0; + unkPtr->unk1C = 0; + unkPtr->unk18 = 0; + unkPtr->unk20 = 0; + unkPtr->unk24 = 0; + } + + for (i = 0; i < 2; i++) { + sub_80A456C(mapPtr, i, &sPositionZero); + } +} + +void sub_80A2D00(unkStruct_3001B70 *mapPtr) +{ + s32 i; + + sub_80A2DD4(mapPtr); + TRY_FREE_AND_SET_NULL(mapPtr->unk544); + FREE_AND_SET_NULL(mapPtr->unk548); + + for (i = 0; i < UNK_54C_ARR_COUNT; i++) { + if (mapPtr->unk554[i] != NULL) { + mapPtr->unk554[i] = NULL; + } + TRY_FREE_AND_SET_NULL(mapPtr->unk54C[i]); + } +} + +void sub_80A2D68(unkStruct_3001B70 *mapPtr) +{ + TRY_FREE_AND_SET_NULL(mapPtr->unk544); +} + +void sub_80A2D88(unkStruct_3001B70 *mapPtr) +{ + if (mapPtr->unk52C.unk14 != NULL) { + void *unk448 = &mapPtr->unk448; + mapPtr->unk544 = MemoryAlloc(mapPtr->unk52C.unkE * 256, 6); + mapPtr->unk52C.unk14(mapPtr->unk544, mapPtr->unk468, unk448, mapPtr->unk52C.unkE); + } +} + +void sub_80A2DD4(unkStruct_3001B70 *mapPtr) +{ + s32 i; + + for (i = 0; i < UNK_3E0_ARR_COUNT; i++) { + SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[i]; + TRY_CLOSE_FILE_AND_SET_NULL(unkPtr->unk8); + } + TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk43C); + TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk440); + TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk430); + TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk434); + TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk438); +} + +void sub_80A2E64(unkStruct_3001B70 *mapPtr) +{ + u16 r6; + s32 i, j; + SubStruct_0 *unk0Ptr; + s32 unk0Id, unk3E0Id; + + sub_80A2DD4(mapPtr); + mapPtr->unk444 = -1; + mapPtr->unk528 = 0; + mapPtr->unk448.unk0 = 0; + mapPtr->unk448.unk1 = 0; + mapPtr->unk448.unk2 = 0; + mapPtr->unk448.unk3 = 0; + mapPtr->unk448.unk4 = 0; + mapPtr->unk448.unk5 = 0; + unk0Ptr = &mapPtr->unk0[0]; + mapPtr->unk46C = 0; + mapPtr->unk470 = 0; + mapPtr->unk471 = 0; + + for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, unk0Ptr++) { + unk0Ptr->unk0 = 0; + unk0Ptr->unk2 = 0; + unk0Ptr->unk8 = 0; + unk0Ptr->unk4 = 0; + } + + for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { + SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[unk3E0Id]; + unkPtr->unk0 = 0; + unkPtr->unk1 = 0; + unkPtr->unk2 = 0; + unkPtr->unk4 = 0; + unkPtr->unk8 = NULL; + unkPtr->unkC = 0; + unkPtr->unk14 = 0; + unkPtr->unk10 = 0; + unkPtr->unk1C = 0; + unkPtr->unk18 = 0; + unkPtr->unk20 = 0; + unkPtr->unk24 = 0; + } + + r6 = mapPtr->unk52C.unk0 * 16; + for (i = 0; i < mapPtr->unk52C.unk2; i++) { + struct S str1 = {0}; + struct S str2 = {0xFF, 0xFF, 0xFF, 0}; + + sub_8003810(r6++, str1); + for (j = 0; j < 15; j++) { + sub_8003810(r6++, str2); + } + } + + sub_80A3BB0(mapPtr, 0); + sub_80A3EB0(mapPtr->unk488); + mapPtr->unk52A = 1; +} + +void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) +{ + SubStruct_0 *sub0Ptr; + u16 r5; + s32 i, j, k; + const struct unkStruct_81188F0 *dataPtr; + s16 *mapPtr_464; + SubStruct_545 *mapPtr_454; + const u16 *file_434; + const void *file_438; + const void *file_430; + SubStruct_448 *mapPtr_448; + struct S str2; + struct S str1; + const void *r7; + s32 unk0Id; + s32 id; + void *vramPtr; + s32 sum; + s32 a1 = (s16) a1_; + + if (a1 == -1) { + sub_80A2E64(mapPtr); + return; + } + + sub_80A2DD4(mapPtr); + mapPtr->unk444 = a1; + dataPtr = &gUnknown_81188F0[a1]; + mapPtr->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); + mapPtr->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive); + mapPtr->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive); + file_430 = mapPtr->unk430->data; + file_434 = mapPtr->unk434->data; + file_438 = mapPtr->unk438->data; + mapPtr_464 = mapPtr->unk464; + mapPtr_454 = &mapPtr->unk454; + mapPtr_448 = &mapPtr->unk448; + + mapPtr_464[0] = *(u8 *)(file_430); file_430 += 2; + mapPtr_464[1] = *(u8 *)(file_430); file_430 += 2; + + mapPtr_454->unk0 = *file_434++; + mapPtr_454->unk2 = *file_434++; + mapPtr_454->unk4 = *file_434++; + + sum = mapPtr_454->unk4; + for (k = 0; k < UNK_545_UNK6_ARR_COUNT; k++) { + mapPtr_454->unk6[k] = *file_434++; + sum += mapPtr_454->unk6[k]; + } + mapPtr_454->unkE = *file_434++; + + mapPtr_448->unk0 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk1 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk2 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk3 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk4 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk5 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk6 = *(u8 *)(file_438); file_438 += 2; + mapPtr_448->unk8 = *(u8 *)(file_438); file_438 += 2; + mapPtr_448->unkA = *(u8 *)(file_438); file_438 += 2; + + r7 = file_430; + r5 = mapPtr->unk52C.unk0 * 16; + str2 = (struct S) {0}; + str1.x0.x0[0] = 0xff; + str1.x0.x0[1] = 0xff; + str1.x0.x0[2] = 0xff; + str1.x0.x0[3] = 0; + for (i = 0; i < mapPtr_464[0] && i < mapPtr->unk52C.unk2; i++) { + sub_8003810(r5++, str2); + sub_809971C(r5, r7, 15); + r5 += 15; + r7 += 60; + } + for (; i < mapPtr->unk52C.unk2; i++) { + sub_8003810(r5++, str2); + for (j = 0; j < 15; j++) { + sub_8003810(r5++, str1); + } + } + + sub_80A37C4((void *)(VRAM + 0x8000 + mapPtr->unk52C.unk4 * 32), file_434, &mapPtr->unk52C, &mapPtr->unk454); + _UncompressCell(mapPtr->unk548, &mapPtr->unk528, file_434 + ((mapPtr_454->unk4 - 1) * 16), &mapPtr->unk52C, &mapPtr->unk454); + file_438 = sub_80A3908(mapPtr->unk54C, file_438, &mapPtr->unk52C, &mapPtr->unk448); + mapPtr->unk468 = file_438; + if (mapPtr->unk544 != NULL) { + mapPtr->unk52C.unk14(mapPtr->unk544, file_438, mapPtr_448, mapPtr->unk52C.unkE); + } + + sub0Ptr = mapPtr->unk0; + unk0Id = 0; + if (mapPtr_464[1] != 0) { + const s16 *r3 = file_430 + (mapPtr_464[0] * 60); + const void *r6 = &r3[mapPtr_464[0] * 2]; + + mapPtr->unk46C = r3; + mapPtr->unk470 = 1; + mapPtr->unk471 = 1; + for (; unk0Id < mapPtr_464[0] && unk0Id < mapPtr->unk52C.unk2; unk0Id++, sub0Ptr++, r3 += 2) { + if (r3[1] > 0) { + sub0Ptr->unk4 = r6; + r6 += r3[1] * 60; + } + else { + sub0Ptr->unk4 = NULL; + } + sub0Ptr->unk0 = 0; + sub0Ptr->unk2 = 0; + sub0Ptr->unk8 = 0; + } + } + else { + mapPtr->unk46C = NULL; + mapPtr->unk470 = 0; + mapPtr->unk471 = 0; + } + + for (; unk0Id < UNK_0_ARR_COUNT; unk0Id++, sub0Ptr++) { + sub0Ptr->unk0 = 0; + sub0Ptr->unk2 = 0; + sub0Ptr->unk4 = sub0Ptr->unk8 = 0; + } + + vramPtr = (void *)(VRAM + 0x8000 + (mapPtr->unk52C.unk4 + mapPtr_454->unk4) * 32); + for (id = 0; id < 2; id++) { + SubStruct_3E0 *sub3E0 = &mapPtr->unk3E0[id]; + if (dataPtr->text4[id] != NULL) { + const struct UnkFileStruct *fileStr; + const void *r1, *r0; + + sub3E0->unk8 = OpenFileAndGetFileDataPtr(dataPtr->text4[id], &gGroundFileArchive); + sub3E0->unk0 = 1; + sub3E0->unk1 = 1; + fileStr = sub3E0->unk8->data; + sub3E0->unkC = fileStr; + r1 = &fileStr->unk4; + r0 = r1 + fileStr->unk2 * 4; + sub3E0->unk10 = sub3E0->unk14 = r1; + sub3E0->unk18 = sub3E0->unk1C = r0; + sub3E0->unk2 = 0; + sub3E0->unk4 = (u32) fileStr->unk4[0]; // ? + sub3E0->unk20 = vramPtr; + sub3E0->unk24 = mapPtr_454->unk6[id] * 32; + + vramPtr += mapPtr_454->unk6[id] * 32; + } + else { + sub3E0->unk0 = 0; + sub3E0->unk1 = 0; + sub3E0->unk4 = 0; + sub3E0->unk2 = 0; + sub3E0->unk8 = NULL; + sub3E0->unkC = 0; + sub3E0->unk14 = 0; + sub3E0->unk10 = 0; + sub3E0->unk1C = 0; + sub3E0->unk18 = 0; + sub3E0->unk20 = 0; + sub3E0->unk24 = 0; + } + } + for (; id < 4; id++) { + if (dataPtr->text4[id] != NULL) { + s32 n; + OpenedFile *file = OpenFileAndGetFileDataPtr(dataPtr->text4[id], &gGroundFileArchive); + const struct UnkFileStruct *fileStr = file->data; + u16 *r1 = (void *) fileStr->unk4; + r1 += fileStr->unk2 * 2; + + n = mapPtr_454->unk6[id] * 16; + for (k = 0; k < n; k++) { + *(u16 *)(vramPtr) = *r1; + r1++; + vramPtr += 2; + } + CloseFile(file); + } + } + + sub_80A3BB0(mapPtr, 0); + sub_80A3EB0(mapPtr->unk488); + mapPtr->unk52A = 1; +} + +void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s32 a3) +{ + SubStruct_0 *sub0Ptr; + s32 i; + SubStruct_545 *mapPtr_454; + const u16 *file_434; + const void *file_438; + const void *file_430; + SubStruct_448 *mapPtr_448; + s32 unk0Id, sub3E0Id; + const struct unkStruct_81188F0 *dataPtr; + s16 *mapPtr_464; + u16 *unkPtrArray[2]; + s32 a1 = (s16) a1_; + + if (a1 == -1 || dungLoc->id == DUNGEON_INVALID) { + sub_80A2E64(mapPtr); + return; + } + + sub_80A2FBC(mapPtr, a1); + sub_80A2DD4(mapPtr); + mapPtr->unk444 = a1; + dataPtr = &gUnknown_81188F0[a1]; + mapPtr->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); + mapPtr->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive); + mapPtr->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive); + file_430 = mapPtr->unk430->data; + file_434 = mapPtr->unk434->data; + file_438 = mapPtr->unk438->data; + mapPtr_464 = mapPtr->unk464; + mapPtr_454 = &mapPtr->unk454; + mapPtr_448 = &mapPtr->unk448; + + mapPtr_464[0] = *(u8 *)(file_430); file_430 += 2; + mapPtr_464[1] = *(u8 *)(file_430); file_430 += 2; + + mapPtr_454->unk0 = *file_434++; + mapPtr_454->unk2 = *file_434++; + mapPtr_454->unk4 = *file_434++; + + for (i = 0; i < UNK_545_UNK6_ARR_COUNT; i++) { + mapPtr_454->unk6[i] = *file_434++; + } + mapPtr_454->unkE = *file_434++; + + mapPtr_448->unk0 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk1 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk2 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk3 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk4 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk5 = *(u8 *)(file_438); file_438 += 1; + mapPtr_448->unk6 = *(u8 *)(file_438); file_438 += 2; + mapPtr_448->unk8 = *(u8 *)(file_438); file_438 += 2; + mapPtr_448->unkA = *(u8 *)(file_438); file_438 += 2; + + unkPtrArray[0] = mapPtr->unk544; + unkPtrArray[1] = NULL; + file_438 = sub_80A3908(unkPtrArray, file_438, &mapPtr->unk52C, &mapPtr->unk448); + mapPtr->unk468 = file_438; + sub_80ADD9C(&mapPtr->unk43C, &mapPtr->unk440, (void *)(VRAM + 0x8000), mapPtr->unk548, mapPtr->unk54C[0], dungLoc, a3, 0x40, mapPtr_448->unk5, mapPtr->unk544, 0); + // Unused return values + GetFileDataPtr(mapPtr->unk43C, 0); + GetFileDataPtr(mapPtr->unk440, 0); + + mapPtr->unk52C.unk14(mapPtr->unk544, file_438, mapPtr_448, mapPtr->unk52C.unkE); + mapPtr_454->unk4 = 0x200; + for (i = 0; i < UNK_545_UNK6_ARR_COUNT; i++) { + mapPtr_454->unk6[i] = 0; + } + + mapPtr_454->unkE = 250; + mapPtr->unk464[0] = 12; + mapPtr->unk464[1] = 0; + if (mapPtr->unk43C != NULL) { + s32 i, j; + const struct S *strPtr = mapPtr->unk43C->data; + u16 r7 = 0; + struct S str0 = {0}; + struct S str1; + + str1.x0.x0[0] = 0xff; + str1.x0.x0[1] = 0xff; + str1.x0.x0[2] = 0xff; + str1.x0.x0[3] = 0; + + for (i = 0; i < 12 && i < mapPtr->unk52C.unk2; i++) { + sub_8003810(r7++, str0); + strPtr++; + for (j = 0; j < 15; j++) { + struct S str2 = {strPtr->x0.x0[0], strPtr->x0.x0[1], strPtr->x0.x0[2], strPtr->x0.x0[3]}; + sub_8003810(r7++, str2); + strPtr++; + } + } + for (; i < mapPtr->unk52C.unk2; i++) { + sub_8003810(r7++, str0); + for (j = 0; j < 15; j++) { + sub_8003810(r7++, str1); + } + } + } + + sub0Ptr = mapPtr->unk0; + if (mapPtr->unk440 != NULL) { + sub_8004AA4(mapPtr->unkE0, mapPtr->unk440, UNK_E0_ARR_COUNT); + } + mapPtr->unk46C = NULL; + mapPtr->unk470 = 0; + mapPtr->unk471 = 0; + + for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, sub0Ptr++) { + sub0Ptr->unk0 = 0; + sub0Ptr->unk2 = 0; + sub0Ptr->unk4 = sub0Ptr->unk8 = 0; + } + + for (sub3E0Id = 0; sub3E0Id < UNK_3E0_ARR_COUNT; sub3E0Id++) { + SubStruct_3E0 *sub3E0 = &mapPtr->unk3E0[sub3E0Id]; + sub3E0->unk0 = 0; + sub3E0->unk1 = 0; + sub3E0->unk4 = 0; + sub3E0->unk2 = 0; + sub3E0->unk8 = NULL; + sub3E0->unkC = 0; + sub3E0->unk14 = 0; + sub3E0->unk10 = 0; + sub3E0->unk1C = 0; + sub3E0->unk18 = 0; + sub3E0->unk20 = 0; + sub3E0->unk24 = 0; + } + sub_80A3BB0(mapPtr, 0); + sub_80A3EB0(mapPtr->unk488); + mapPtr->unk52A = 1; + // bad sp alloc for compiler generated variables... + ASM_MATCH_TRICK(mapPtr_454->unk6[0]); +} + +void sub_80A37C4(void *vramDst, const u16 *src_, SubStruct_52C *a2, SubStruct_545 *a3) +{ + const u16 *src = src_; + u16 *dst = vramDst; + s32 id, i; + + for (i = 0; i < 16; i++) { + *dst++ = 0; + } + for (id = 1; id < a3->unk4; id++) { + for (i = 0; i < 16; i++) { + *dst++ = *src++; + } + } + for (; id < a2->unk6; id++) { + for (i = 0; i < 16; i++) { + *dst++ = 0xFFFF; + } + } +} + +static void _UncompressCell(void *dst_, u16 *a1, const void *src_, SubStruct_52C *a3, SubStruct_545 *a4) +{ + s32 id, i; + s32 n; + + const u16 *src = src_; + u16 *dst = dst_; + u16 r6 = (a3->unk0 << 12) | a3->unk4; + + if (a4->unk0 == 2 && a4->unk2 == 2) { + *a1 = 1; + n = 4; + } + else if (a4->unk0 == 3 && a4->unk2 == 3) { + *a1 = 2; + n = 9; + } + else { + *a1 = 0; + FatalError(DEBUG_LOC_PTR("../ground/ground_bg.c", 1184, "_UncompressCell"), _("GroundBg cell type error %d %d"), a4->unk0, a4->unk2); + } + + for (i = 0; i < 9; i++) { + *dst++ = 0; + } + for (id = 1; id < a4->unkE; id++) { + for (i = 0; i < n; i++) { + *dst++ = *src++ + r6; + } + for (; i < 9; i++) { + *dst++ = 0; + } + } + for (; id < a3->unk8; id++) { + for (i = 0; i < 9; i++) { + *dst++ = 0; + } + } +} + +// Tilemap decompression algorhitm? +static const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *a3) +{ + s32 i, j, k, l; + const u8 *src = src_; + + for (i = 0; i < a2->unkC; i++) { + u16 *dst = dstArray[i]; + + for (j = 0; j < a3->unk5; j++) { + k = 0; + if (j == 0) { + while (k < a3->unk4) { + s32 val = *src++; + if (val > 191) { + for (l = 191; l < val; l++) { + s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; + *dst++ = dstVal & 0xFFF; + *dst++ = (dstVal >> 12) & 0xFFF; + } + k += (val - 191) * 2; + } + else if (val > 127) { + s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; + for (l = 127; l < val; l++) { + *dst++ = dstVal & 0xFFF; + *dst++ = (dstVal >> 12) & 0xFFF; + } + k += (val - 127) * 2; + } + else { + for (l = 0; l <= val; l++) { + *dst++ = 0; + *dst++ = 0; + } + k += (val + 1) * 2; + } + } + } + else { + u16 *ptrVal = dst - 64; + while (k < a3->unk4) { + s32 val = *src++; + if (val > 191) { + for (l = 191; l < val; l++) { + s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; + *dst++ = (dstVal & 0xFFF) ^ *ptrVal++; + *dst++ = ((dstVal >> 12) & 0xFFF) ^ *ptrVal++; + } + k += (val - 191) * 2; + } + else if (val > 127) { + s32 dstVal = src[0] | (src[1] << 8) | (src[2] << 16); src += 3; + for (l = 127; l < val; l++) { + *dst++ = (dstVal & 0xFFF) ^ *ptrVal++; + *dst++ = ((dstVal >> 12) & 0xFFF) ^ *ptrVal++; + } + k += (val - 127) * 2; + } + else { + for (l = 0; l <= val; l++) { + *dst++ = *ptrVal++; + *dst++ = *ptrVal++; + } + k += (val + 1) * 2; + } + } + } + + for (; k < 64; k++) { + *dst++ = 0; + } + } + for (; j < a2->unk10; j++) { + for (k = 0; k < 64; k++) { + *dst++ = 0; + } + } + } + + return src; +} + +void sub_80A3B80(unkStruct_3001B70 *mapPtr, u8 a1, u8 a2) +{ + if (mapPtr->unk46C != NULL) { + mapPtr->unk470 = a1; + mapPtr->unk471 = a2; + } +} + +static const PixelPos sUnknownPosition = {96, 24}; + +void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0_) +{ + s32 i; + // s16 memes strike yet again + s32 a0Match = (s16) a0_; + s32 a0 = a0Match; + + SubStruct_488 *map488 = mapPtr->unk488; + + switch (a0) { + default: + case 0: + case 1: + mapPtr->unk474 = 1; + sub_80A3D40(&map488[0], mapPtr, 0, mapPtr->unk52C.unkC, (a0 == 1)); + break; + case 2: + case 3: + case 4: + mapPtr->unk474 = 2; + sub_80A3D40(&map488[0], mapPtr, 0, mapPtr->unk52C.unkC - 1, (a0 == 4)); + sub_80A3D40(&map488[1], mapPtr, mapPtr->unk52C.unkC - 1, 1, (a0 != 2)); + break; + } + + for (i = 0; i < mapPtr->unk474; i++) { + sub_80A456C(mapPtr, i, &sUnknownPosition); + switch (map488[i].unk4) { + default: + case 1: + switch (map488[i].unk0) { + default: + case 0: + map488[i].unk18 = sub_80A3EBC; + break; + case 1: + map488[i].unk18 = sub_80A3EF4; + break; + case 2: + map488[i].unk18 = (map488[i].unk6 != FALSE) ? sub_80A41C4 : sub_80A4088; + break; + } + break; + case 2: + switch (map488[i].unk0) { + default: + case 0: + map488[i].unk18 = sub_80A3ED4; + break; + case 1: + map488[i].unk18 = sub_80A3F94; + break; + case 2: + map488[i].unk18 = sub_80A4358; + break; + } + break; + } + sub_80A3E14(&map488[i], &mapPtr->unk478[i]); + } + for (i = mapPtr->unk474; i < UNK_54C_ARR_COUNT; i++) { + sub_80A456C(mapPtr, i, &sUnknownPosition); + sub_80A3D40(&map488[i], mapPtr, 0, 0, FALSE); + } +} + +static void sub_80A3D40(SubStruct_488 *map488, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4) +{ + s32 i, j; + + map488->unk0 = mapPtr->unk528; + map488->unk2 = a2; + map488->unk4 = a3; + map488->unk6 = a4; + map488->unk8 = mapPtr->unk448.unk4; + map488->unkC = mapPtr->unk448.unk5; + map488->unk10.x = mapPtr->unk448.unk0 * 8; + map488->unk10.y = mapPtr->unk448.unk1 * 8; + map488->unk1C = mapPtr->unk548; + + for (i = 0, j = a2; i < a3 && j < mapPtr->unk52C.unkC; i++, j++) { + map488->unk20[i] = mapPtr->unk54C[j]; + map488->unk28[i] = mapPtr->unk554[j]; + } + for (; i < UNK_54C_ARR_COUNT; i++) { + map488->unk20[i] = NULL; + map488->unk28[i] = NULL; + } + + sub_80A3E14(map488, &mapPtr->unk478[0]); +} + +void sub_80A3E14(SubStruct_488 *map488, PixelPos *a1) +{ + map488->unk30.x = a1->x; + map488->unk38.x = map488->unk30.x / 8; + map488->unk30.y = a1->y; + map488->unk38.y = map488->unk30.y / 8; + + switch (map488->unk0) { + case 0: + map488->unk40.x = 0; + map488->unk40.y = 0; + map488->bgRegOffsets.x = 0; + map488->bgRegOffsets.y = 0; + break; + case 1: + map488->unk40.x = map488->unk38.x / 2; + map488->unk40.y = map488->unk38.y / 2; + map488->bgRegOffsets.x = map488->unk30.x % 16; + map488->bgRegOffsets.y = map488->unk30.y % 16; + break; + case 2: + map488->unk40.x = map488->unk38.x / 3; + map488->unk40.y = map488->unk38.y / 3; + map488->bgRegOffsets.x = map488->unk30.x % 8; + map488->bgRegOffsets.y = map488->unk30.y % 24; + break; + } +} + +static void sub_80A3EB0(SubStruct_488 *map488) +{ + map488->unk18(map488); +} + +static void sub_80A3EBC(SubStruct_488 *map488) +{ + s32 i; + u16 *dst = map488->unk28[0]; + + for (i = 0; i < 1024; i++) { + *dst++ = 0; + } +} + +static void sub_80A3ED4(SubStruct_488 *map488) +{ + s32 i; + u16 *dst1 = map488->unk28[0]; + u16 *dst2 = map488->unk28[1]; + + for (i = 0; i < 1024; i++) { + *dst1++ = 0; + *dst2++ = 0; + } +} + +static void sub_80A3EF4(SubStruct_488 *map488) +{ + s32 arrPtrId; + s32 i, j; + u16 *arrPtrs[2]; + u16 *ptr = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; + s32 unk28Id = 0; + + for (i = 0; i < 11; ptr += 64, i++) { + u16 *currPtr = ptr; + + for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { + arrPtrs[arrPtrId] = &map488->unk28[0][unk28Id]; + unk28Id += 32; + } + + for (j = 0; j < 16; j++) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = *currSrc++; + *currDst++ = *currSrc++; + arrPtrs[arrPtrId] = currDst; + } + } + } +} + +static void sub_80A3F94(SubStruct_488 *map488) +{ + s32 arrPtrId; + u16 *ptr1, *ptr2; + u16 *arrPtrs1[2]; + u16 *arrPtrs2[2]; + s32 unk28Id; + s32 i, j; + + ptr1 = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; + ptr2 = &map488->unk20[1][(map488->unk40.y * 64) + map488->unk40.x]; + unk28Id = 0; + for (i = 0; i < 11; ptr1 += 64, ptr2 += 64, i++) { + u16 *currPtr1 = ptr1; + u16 *currPtr2 = ptr2; + + for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { + arrPtrs1[arrPtrId] = &map488->unk28[0][unk28Id]; + arrPtrs2[arrPtrId] = &map488->unk28[1][unk28Id]; + unk28Id += 32; + } + + for (j = 0; j < 16; j++) { + u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; + u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; + for (arrPtrId = 0; arrPtrId < 2; arrPtrId++) { + u16 *currDst1 = arrPtrs1[arrPtrId]; + u16 *currDst2 = arrPtrs2[arrPtrId]; + *currDst1++ = *currSrc1++; + *currDst1++ = *currSrc1++; + *currDst2++ = *currSrc2++; + *currDst2++ = *currSrc2++; + arrPtrs1[arrPtrId] = currDst1; + arrPtrs2[arrPtrId] = currDst2; + } + } + } +} + +static void sub_80A4088(SubStruct_488 *map488) +{ + s32 arrPtrId; + s32 i, j; + u16 *arrPtrs[3]; + s32 mod3 = map488->unk38.x % 3; + u16 *ptr = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; + s32 unk28Id = 0; + + for (i = 0; i < 8; ptr += 64, i++) { + u16 *currPtr = ptr; + + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + arrPtrs[arrPtrId] = &map488->unk28[0][unk28Id]; + unk28Id += 32; + } + + if (mod3 != 0) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + + if (mod3 == 1) { + currSrc++; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = currSrc[0]; + *currDst++ = currSrc[1]; + arrPtrs[arrPtrId] = currDst; + currSrc += 3; + } + } + else { + currSrc += 2; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = currSrc[0]; + arrPtrs[arrPtrId] = currDst; + currSrc += 3; + } + } + } + + for (j = 0; j < 10; j++) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = *currSrc++; + *currDst++ = *currSrc++; + *currDst++ = *currSrc++; + arrPtrs[arrPtrId] = currDst; + } + } + + if (mod3 != 1) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + if (mod3 == 0) { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + currDst[0] = currSrc[0]; + currDst[1] = currSrc[1]; + currSrc += 3; + } + } + else { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + currDst[0] = currSrc[0]; + currSrc += 3; + } + } + } + } +} + +static void sub_80A41C4(SubStruct_488 *map488) +{ + s32 mod3; + s32 arrPtrId; + u16 *ptr; + u16 *arrPtrs[3]; + s32 unk28Id; + s32 i, j; + s32 sub1, sub2; + + // Screw you agbcc... + ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr);ASM_MATCH_TRICK(ptr); + + mod3 = map488->unk38.x % 3; + ptr = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; + unk28Id = 0; + sub1 = map488->unkC - map488->unk40.y; + sub2 = map488->unk8 - map488->unk40.x; + + for (i = 0; i < 8; ptr += 64, i++) { + u16 *currPtr; + s32 currSub2 = sub2; + + if (sub1 > 0) { + sub1--; + currPtr = ptr; + } + else { + sub1 = map488->unkC; + ptr = &map488->unk20[0][map488->unk40.x]; + currPtr = ptr; + } + + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + arrPtrs[arrPtrId] = &map488->unk28[0][unk28Id]; + unk28Id += 32; + } + + if (mod3 != 0) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + + if (mod3 == 1) { + currSrc++; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = currSrc[0]; + *currDst++ = currSrc[1]; + arrPtrs[arrPtrId] = currDst; + currSrc += 3; + } + } + else { + currSrc += 2; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + *arrPtrs[arrPtrId]++ = *currSrc; + currSrc += 3; + } + } + + currSub2--; + if (currSub2 <= 0) { + currSub2 = map488->unk8; + currPtr -= currSub2; + } + } + + for (j = 0; j < 10; j++) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + *currDst++ = *currSrc++; + *currDst++ = *currSrc++; + *currDst++ = *currSrc++; + arrPtrs[arrPtrId] = currDst; + } + + if (--currSub2 <= 0) { + currSub2 = map488->unk8; + currPtr -= currSub2; + } + } + + // Interestingly enough this part is NOT present in Blue... + if (mod3 != 1) { + u16 *currSrc = &map488->unk1C[*currPtr++ * 9]; + if (mod3 == 0) { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + currDst[0] = currSrc[0]; + currDst[1] = currSrc[1]; + currSrc += 3; + } + } + else { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst = arrPtrs[arrPtrId]; + currDst[0] = currSrc[0]; + currSrc += 3; + } + } + } + } +} + +static void sub_80A4358(SubStruct_488 *map488) +{ + s32 arrPtrId; + s32 i, j; + u16 *arrPtrs1[3]; + u16 *arrPtrs2[3]; + s32 mod3 = map488->unk38.x % 3; + u16 *ptr1 = &map488->unk20[0][(map488->unk40.y * 64) + map488->unk40.x]; + u16 *ptr2 = &map488->unk20[1][(map488->unk40.y * 64) + map488->unk40.x]; + s32 unk28Id = 0; + + // Stack memes again... + ASM_MATCH_TRICK(ptr2);ASM_MATCH_TRICK(ptr2);ASM_MATCH_TRICK(ptr2); + + for (i = 0; i < 8; ptr1 += 64, ptr2 += 64, i++) { + u16 *currPtr1 = ptr1; + u16 *currPtr2 = ptr2; + + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + arrPtrs1[arrPtrId] = &map488->unk28[0][unk28Id]; + arrPtrs2[arrPtrId] = &map488->unk28[1][unk28Id]; + unk28Id += 32; + } + + if (mod3 != 0) { + u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; + u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; + + if (mod3 == 1) { + currSrc1++; + currSrc2++; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst1, *currDst2; + currDst1 = arrPtrs1[arrPtrId]; + currDst2 = arrPtrs2[arrPtrId]; + *currDst1++ = currSrc1[0]; + *currDst1++ = currSrc1[1]; + *currDst2++ = currSrc2[0]; + *currDst2++ = currSrc2[1]; + arrPtrs1[arrPtrId] = currDst1; + arrPtrs2[arrPtrId] = currDst2; + currSrc1 += 3; + currSrc2 += 3; + } + } + else { + currSrc1 += 2; + currSrc2 += 2; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + *arrPtrs1[arrPtrId]++ = currSrc1[0]; + *arrPtrs2[arrPtrId]++ = currSrc2[0]; + currSrc1 += 3; + currSrc2 += 3; + } + } + } + + for (j = 0; j < 10; j++) { + u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; + u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst1 = arrPtrs1[arrPtrId]; + u16 *currDst2 = arrPtrs2[arrPtrId]; + *currDst1++ = *currSrc1++; + *currDst1++ = *currSrc1++; + *currDst1++ = *currSrc1++; + *currDst2++ = *currSrc2++; + *currDst2++ = *currSrc2++; + *currDst2++ = *currSrc2++; + arrPtrs1[arrPtrId] = currDst1; + arrPtrs2[arrPtrId] = currDst2; + } + } + + if (mod3 != 1) { + u16 *currSrc1 = &map488->unk1C[*currPtr1++ * 9]; + u16 *currSrc2 = &map488->unk1C[*currPtr2++ * 9]; + if (mod3 == 0) { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst1 = arrPtrs1[arrPtrId]; + u16 *currDst2 = arrPtrs2[arrPtrId]; + currDst1[0] = currSrc1[0]; + currDst1[1] = currSrc1[1]; + currDst2[0] = currSrc2[0]; + currDst2[1] = currSrc2[1]; + currSrc1 += 3; + currSrc2 += 3; + } + } + else { + for (arrPtrId = 0; arrPtrId < 3; arrPtrId++) { + u16 *currDst1, *currDst2; + + currDst1 = arrPtrs1[arrPtrId]; + currDst1[0] = currSrc1[0]; + currDst2 = arrPtrs2[arrPtrId]; + currDst2[0] = currSrc2[0]; + currSrc1 += 3; + currSrc2 += 3; + } + } + } + } +} + +void sub_80A4558(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *dstPos) +{ + *dstPos = mapPtr->unk478[id]; +} + +void sub_80A456C(unkStruct_3001B70 *mapPtr, s32 id, const PixelPos *srcPos) +{ + mapPtr->unk478[id] = *srcPos; +} + +void sub_80A4580(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos) +{ + SubStruct_488 *map488 = &mapPtr->unk488[id]; + + if (pixPos->x < 0) { + if (map488->unk6) { + do { + pixPos->x += map488->unk10.x; + } while (pixPos->x < 0); + } + else { + pixPos->x = 0; + } + } + else if (pixPos->x >= map488->unk10.x) { + if (map488->unk6) { + do { + pixPos->x -= map488->unk10.x; + } while (pixPos->x >= map488->unk10.x); + } + else { + pixPos->x = map488->unk10.x - 1; + } + } + + if (pixPos->y < 0) { + if (map488->unk6) { + do { + pixPos->y += map488->unk10.y; + } while (pixPos->y < 0); + } + else { + pixPos->y = 0; + } + } + else if (pixPos->y >= map488->unk10.y) { + if (map488->unk6) { + do { + pixPos->y -= map488->unk10.y; + } while (pixPos->y >= map488->unk10.y); + } + else { + pixPos->y = map488->unk10.y - 1; + } + } +} + +void sub_80A4608(unkStruct_3001B70 *mapPtr, PixelPos *dstPos) +{ + dstPos->x = mapPtr->unk448.unk0; + dstPos->y = mapPtr->unk448.unk1; +} + +UNUSED static void sub_80A4620(unkStruct_3001B70 *mapPtr, PixelPos *dstPos) +{ + dstPos->x = mapPtr->unk448.unk0 * 8; + dstPos->y = mapPtr->unk448.unk1 * 8; +} + +void GetDungeonBounds(unkStruct_3001B70 *mapPtr, PixelPos *dstPos1, PixelPos *dstPos2) +{ + dstPos1->x = 0; + dstPos1->y = 0; + dstPos2->x = mapPtr->unk448.unk0 << 11; + dstPos2->y = mapPtr->unk448.unk1 << 11; +} + +u8 sub_80A4660(unkStruct_3001B70 *mapPtr, u8 bits, PixelPos *pixPos1, PixelPos *boundary) +{ + s32 i, j; + u8 *currPtr; + void *ptr = mapPtr->unk544; + + if (ptr == NULL) + return 0; + + ptr += ((pixPos1->y * 256) + pixPos1->x + 0x405); + for (i = boundary->y; i > 0; i--) { + for (j = boundary->x, currPtr = ptr; j > 0; j--) { + u8 ret = *currPtr++ & bits; + if (ret) + return ret; + } + ptr += 256; + } + + return 0; +} + +u8 sub_80A46C0(unkStruct_3001B70 *mapPtr, u8 bits, PixelPos *pixPos1, PixelPos *boundary) +{ + s32 i, j; + u8 *currPtr; + void *ptr = mapPtr->unk544; + + if (ptr == NULL) + return 0; + + ptr += ((pixPos1->y * 256) + pixPos1->x + 0x405); + for (i = boundary->y; i > 0; i--) { + for (j = boundary->x, currPtr = ptr; j > 0; j--) { + u8 ret = *currPtr++ & bits; + if (ret != bits) + return 0; + } + ptr += 256; + } + + return 1; +} + +u16 sub_80A4720(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos) +{ + u16 *ptr = mapPtr->unk54C[id] + (pixPos->y * 64); + ptr += pixPos->x; + return *ptr; +} + +void sub_80A4740(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos, u32 dstVal) +{ + u16 *ptr = mapPtr->unk54C[id] + (pixPos->y * 64); + ptr += pixPos->x; + *ptr = dstVal; +} + +void sub_80A4764(unkStruct_3001B70 *mapPtr) +{ + s32 i, j; + s32 unk3E0Id; + SubStruct_488 *map488; + PixelPos *map478; + + if (mapPtr->unk444 == -1) + return; + + if (mapPtr->unk464[1] != 0) { + s32 i; + SubStruct_0 *sub0Ptr = mapPtr->unk0; + const u16 *ptr = mapPtr->unk46C; + u16 r6 = mapPtr->unk52C.unk0 * 16; + + for (i = 0; i < mapPtr->unk464[0]; i++, sub0Ptr++, ptr += 2, r6 += 16) { + if (sub0Ptr->unk4 != NULL && --sub0Ptr->unk2 <= 0) { + if (--sub0Ptr->unk0 <= 0) { + if (mapPtr->unk471) { + sub0Ptr->unk2 = ptr[0]; + sub0Ptr->unk0 = ptr[1]; + sub0Ptr->unk8 = sub0Ptr->unk4; + } + else { + sub0Ptr->unk0 = 0; + sub0Ptr->unk2 = 0; + sub0Ptr->unk8 = NULL; + } + } + else { + sub0Ptr->unk2 = ptr[0]; + } + + if (sub0Ptr->unk8 != NULL) { + struct S empty = {0}; + sub_8003810(r6, empty); + sub_809971C(r6 + 1, sub0Ptr->unk8, 15); + sub0Ptr->unk8 += 60; + } + } + } + + mapPtr->unk471 = mapPtr->unk470; + } + else if (mapPtr->unk440 != NULL) { + s32 i; + unkStruct_202EE8C *unkE0Ptr = mapPtr->unkE0; + s32 r6 = 160; + + for (i = 0; i < 32; i++, unkE0Ptr++, r6++) { + struct S color; + + if (sub_8004D14(unkE0Ptr, 1) && !sub_8004D40(unkE0Ptr, 1) && --unkE0Ptr->unk6 <= 0) { + unkE0Ptr->unk6 = unkE0Ptr->unk4; + if (unkE0Ptr->unkC >= unkE0Ptr->unk10) { + unkE0Ptr->unkC = unkE0Ptr->unk8; + } + unkE0Ptr->unk14 = *unkE0Ptr->unkC++; + color = (struct S) {unkE0Ptr->unk14.r, unkE0Ptr->unk14.g, unkE0Ptr->unk14.b, unkE0Ptr->unk14.unk4}; + sub_8003810(r6, color); + } + } + } + + for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { + SubStruct_3E0 *sub3E0Ptr = &mapPtr->unk3E0[unk3E0Id]; + + if (sub3E0Ptr->unk0 && sub3E0Ptr->unk4-- <= 0) { + sub3E0Ptr->unk14 += 4; + sub3E0Ptr->unk1C += (sub3E0Ptr->unk24 / 2) * 2; + if (++sub3E0Ptr->unk2 >= sub3E0Ptr->unkC->unk2) { + sub3E0Ptr->unk14 = sub3E0Ptr->unk10; + sub3E0Ptr->unk1C = sub3E0Ptr->unk18; + sub3E0Ptr->unk2 = 0; + } + sub3E0Ptr->unk1 = 1; + sub3E0Ptr->unk4 = *(u32 *)(sub3E0Ptr->unk14); + } + } + + map488 = mapPtr->unk488; + map478 = mapPtr->unk478; + for (i = 0; i < mapPtr->unk474; i++, map488++, map478++) { + s32 unk; + + sub_80A3E14(map488, map478); + sub_80A3EB0(map488); + for (j = 0, unk = map488->unk2 + mapPtr->unk52C.unkA; j < map488->unk4; j++, unk++) { + switch (unk) { + case 0: + SetBG2RegOffsets(map488->bgRegOffsets.x, map488->bgRegOffsets.y); + break; + case 1: + SetBG3RegOffsets(map488->bgRegOffsets.x, map488->bgRegOffsets.y); + break; + } + } + } + + mapPtr->unk52A = 1; +} + +void sub_80A49E8(unkStruct_3001B70 *mapPtr) +{ + s32 i; + s32 unk3E0Id; + + for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { + SubStruct_3E0 *sub3E0Ptr = &mapPtr->unk3E0[unk3E0Id]; + + if (sub3E0Ptr->unk1) { + MemoryCopy32(sub3E0Ptr->unk20, sub3E0Ptr->unk1C, sub3E0Ptr->unk24); + sub3E0Ptr->unk1 = FALSE; + mapPtr->unk52A = 1; + } + } + + if (mapPtr->unk52A) { + s32 unk; + for (i = 0, unk = mapPtr->unk52C.unkA; i < mapPtr->unk52C.unkC; i++, unk++) { + sub_80098F8(unk + 2); + } + mapPtr->unk52A = 0; + } +} From a443314d483c8e4841fb46b02968856fec9205c6 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 6 Jun 2025 16:58:54 +0200 Subject: [PATCH 10/11] use new macros --- include/ground_map.h | 6 +- src/code_802DB28.c | 4 +- src/code_809A560.c | 16 +- src/dungeon_misc.c | 5 +- src/felicity_bank.c | 3 +- src/ground_bg.c | 444 ++++++++++++++++++------------------ src/ground_map.c | 8 +- src/ground_map_1.c | 10 +- src/ground_map_2.c | 20 +- src/gulpin_shop.c | 3 +- src/gulpin_shop_801FB50.c | 3 +- src/kangaskhan_storage1.c | 3 +- src/kecleon_bros1.c | 3 +- src/luminous_cave.c | 3 +- src/makuhita_dojo1.c | 3 +- src/mission_reward.c | 6 +- src/post_office_guide1.c | 3 +- src/save_write.c | 3 +- src/thank_you_wonder_mail.c | 6 +- src/wigglytuff_shop3.c | 3 +- src/wonder_mail.c | 3 +- src/wonder_mail_2.c | 6 +- src/wonder_mail_6.c | 3 +- 23 files changed, 267 insertions(+), 300 deletions(-) diff --git a/include/ground_map.h b/include/ground_map.h index 76885b8e6..a5a5725c3 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -101,7 +101,7 @@ typedef struct SubStruct_545 } SubStruct_545; // size: 0x55C -typedef struct unkStruct_3001B70 +typedef struct GroundBg { SubStruct_0 unk0[UNK_0_ARR_COUNT]; unkStruct_202EE8C unkE0[UNK_E0_ARR_COUNT]; @@ -129,9 +129,9 @@ typedef struct unkStruct_3001B70 u16 *unk548; u16 *unk54C[UNK_54C_ARR_COUNT]; u16 *unk554[UNK_54C_ARR_COUNT]; -} unkStruct_3001B70; +} GroundBg; -extern unkStruct_3001B70 *gGroundMapDungeon_3001B70; +extern GroundBg *gGroundMapDungeon_3001B70; void GroundMap_Reset(void); diff --git a/src/code_802DB28.c b/src/code_802DB28.c index 2c9d80c0d..159003be3 100644 --- a/src/code_802DB28.c +++ b/src/code_802DB28.c @@ -75,9 +75,7 @@ void sub_802DC00(void) if (sUnknown_203B2FC != NULL) { if (sUnknown_203B2FC->monPortrait.faceFile != NULL) CloseFile(sUnknown_203B2FC->monPortrait.faceFile); - - MemoryFree(sUnknown_203B2FC); - sUnknown_203B2FC = NULL; + FREE_AND_SET_NULL(sUnknown_203B2FC); } } diff --git a/src/code_809A560.c b/src/code_809A560.c index 33c4c08b5..8059de96e 100644 --- a/src/code_809A560.c +++ b/src/code_809A560.c @@ -314,11 +314,7 @@ void sub_809A83C(s16 param_1) temp->monPortrait.spriteId = 0; strcpy(gFormatBuffer_Monsters[param_1], sInvalidText); strcpy(gFormatBuffer_Names[param_1], sInvalidText); - if(temp->faceFile) - { - CloseFile(temp->faceFile); - temp->faceFile = NULL; - } + TRY_CLOSE_FILE_AND_SET_NULL(temp->faceFile); } bool8 sub_809A8B8(s32 param_1, s32 param_2) @@ -331,10 +327,7 @@ bool8 sub_809A8B8(s32 param_1, s32 param_2) u8 uVar9 = 1; u8 byte1 = 0; - if (unkPtr->faceFile != NULL) { - CloseFile(unkPtr->faceFile); - unkPtr->faceFile = NULL; - } + TRY_CLOSE_FILE_AND_SET_NULL(unkPtr->faceFile); sub_80A7DDC(&local_28,&local_26); if (local_28 >= 10 && local_28 <= 29) { @@ -508,10 +501,7 @@ bool8 sub_809AC7C(s32 a0_, s32 a1_, s32 a2_) u8 a2 = (u8) a2_; struct unkStruct_3001B64_sub *unkPtr = &gUnknown_3001B64->unk43C[a0]; - if (unkPtr->faceFile != NULL) { - CloseFile(unkPtr->faceFile); - unkPtr->faceFile = NULL; - } + TRY_CLOSE_FILE_AND_SET_NULL(unkPtr->faceFile); if (unkPtr->speciesID >= 0 && r5 != -1 && unkPtr->speciesID != 0) { if (a2 != 0x15) { diff --git a/src/dungeon_misc.c b/src/dungeon_misc.c index a003d9496..d3e836968 100644 --- a/src/dungeon_misc.c +++ b/src/dungeon_misc.c @@ -224,10 +224,7 @@ void CloseAllSpriteFiles(void) s32 i; for (i = 0; i < MONSTER_MAX; i++) { - if (gDungeon->sprites[i] != NULL) { - CloseFile(gDungeon->sprites[i]); - gDungeon->sprites[i] = NULL; - } + TRY_CLOSE_FILE_AND_SET_NULL(gDungeon->sprites[i]); } } diff --git a/src/felicity_bank.c b/src/felicity_bank.c index 582673074..f14290bd4 100644 --- a/src/felicity_bank.c +++ b/src/felicity_bank.c @@ -116,8 +116,7 @@ void DestroyFelicityBank(void) { if (sFelicityBankWork != NULL) { CloseFile(sFelicityBankWork->monPortrait.faceFile); - MemoryFree(sFelicityBankWork); - sFelicityBankWork = NULL; + FREE_AND_SET_NULL(sFelicityBankWork); } } diff --git a/src/ground_bg.c b/src/ground_bg.c index 66114f248..dcb45e20f 100644 --- a/src/ground_bg.c +++ b/src/ground_bg.c @@ -16,14 +16,14 @@ extern const struct unkStruct_81188F0 gUnknown_81188F0[10]; extern const FileArchive gGroundFileArchive; -void sub_80A456C(unkStruct_3001B70 *mapPtr, s32 id, const PixelPos *srcPos); -static void sub_80A2DD4(unkStruct_3001B70 *mapPtr); -void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0); +void sub_80A456C(GroundBg *groundBg, s32 id, const PixelPos *srcPos); +static void sub_80A2DD4(GroundBg *groundBg); +void sub_80A3BB0(GroundBg *groundBg, s32 a0); static void sub_80A3EB0(SubStruct_488 *map488); static const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *a3); static void sub_80A37C4(void *vramDst, const u16 *src_, SubStruct_52C *a2, SubStruct_545 *a3); static void _UncompressCell(void * a0, u16 *a1, const void * a2, SubStruct_52C *a3, SubStruct_545 *a4); -static void sub_80A3D40(SubStruct_488 *map488, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4); +static void sub_80A3D40(SubStruct_488 *map488, GroundBg *groundBg, s32 a2, s32 a3, bool8 a4); static void sub_80A3E14(SubStruct_488 *map488, PixelPos *a1); static void sub_80A3EBC(SubStruct_488 *map488); static void sub_80A3EF4(SubStruct_488 *map488); @@ -38,48 +38,48 @@ extern void sub_809971C(u16 a0, const void *a1, int a2); static const PixelPos sPositionZero = {0, 0}; -void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) +void sub_80A2B40(GroundBg *groundBg, const SubStruct_52C *a1) { SubStruct_0 *unk0Ptr; s32 id, unk0Id, unk3E0Id; s32 i; - mapPtr->unk52C = *a1; - mapPtr->unk548 = MemoryAlloc(mapPtr->unk52C.unk8 * 18, 6); - for (id = 0; id < mapPtr->unk52C.unkC; id++) { - mapPtr->unk554[id] = &gBgTilemaps[2 + mapPtr->unk52C.unkA + id][0][0]; - mapPtr->unk54C[id] = MemoryAlloc(mapPtr->unk52C.unk10 * 128, 6); + groundBg->unk52C = *a1; + groundBg->unk548 = MemoryAlloc(groundBg->unk52C.unk8 * 18, 6); + for (id = 0; id < groundBg->unk52C.unkC; id++) { + groundBg->unk554[id] = &gBgTilemaps[2 + groundBg->unk52C.unkA + id][0][0]; + groundBg->unk54C[id] = MemoryAlloc(groundBg->unk52C.unk10 * 128, 6); } for (; id < UNK_54C_ARR_COUNT; id++) { - mapPtr->unk554[id] = NULL; - mapPtr->unk54C[id] = NULL; + groundBg->unk554[id] = NULL; + groundBg->unk54C[id] = NULL; } - if (mapPtr->unk52C.unk14 != NULL) { - mapPtr->unk544 = MemoryAlloc(mapPtr->unk52C.unkE * 256, 6); + if (groundBg->unk52C.unk14 != NULL) { + groundBg->unk544 = MemoryAlloc(groundBg->unk52C.unkE * 256, 6); } else { - mapPtr->unk544 = NULL; + groundBg->unk544 = NULL; } - mapPtr->unk430 = NULL; - mapPtr->unk434 = NULL; - mapPtr->unk438 = NULL; - mapPtr->unk43C = NULL; - mapPtr->unk440 = NULL; - mapPtr->unk52A = 0; - mapPtr->unk444 = -1; - mapPtr->unk468 = 0; - mapPtr->unk448.unk0 = 0; - mapPtr->unk448.unk1 = 0; - mapPtr->unk448.unk2 = 0; - mapPtr->unk448.unk3 = 0; - mapPtr->unk448.unk4 = 0; - mapPtr->unk448.unk5 = 0; - unk0Ptr = &mapPtr->unk0[0]; - mapPtr->unk46C = 0; - mapPtr->unk470 = 0; - mapPtr->unk471 = 0; + groundBg->unk430 = NULL; + groundBg->unk434 = NULL; + groundBg->unk438 = NULL; + groundBg->unk43C = NULL; + groundBg->unk440 = NULL; + groundBg->unk52A = 0; + groundBg->unk444 = -1; + groundBg->unk468 = 0; + groundBg->unk448.unk0 = 0; + groundBg->unk448.unk1 = 0; + groundBg->unk448.unk2 = 0; + groundBg->unk448.unk3 = 0; + groundBg->unk448.unk4 = 0; + groundBg->unk448.unk5 = 0; + unk0Ptr = &groundBg->unk0[0]; + groundBg->unk46C = 0; + groundBg->unk470 = 0; + groundBg->unk471 = 0; for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, unk0Ptr++) { unk0Ptr->unk0 = 0; @@ -89,7 +89,7 @@ void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) } for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { - SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[unk3E0Id]; + SubStruct_3E0 *unkPtr = &groundBg->unk3E0[unk3E0Id]; unkPtr->unk0 = 0; unkPtr->unk1 = 0; unkPtr->unk2 = 0; @@ -105,75 +105,75 @@ void sub_80A2B40(unkStruct_3001B70 *mapPtr, const SubStruct_52C *a1) } for (i = 0; i < 2; i++) { - sub_80A456C(mapPtr, i, &sPositionZero); + sub_80A456C(groundBg, i, &sPositionZero); } } -void sub_80A2D00(unkStruct_3001B70 *mapPtr) +void sub_80A2D00(GroundBg *groundBg) { s32 i; - sub_80A2DD4(mapPtr); - TRY_FREE_AND_SET_NULL(mapPtr->unk544); - FREE_AND_SET_NULL(mapPtr->unk548); + sub_80A2DD4(groundBg); + TRY_FREE_AND_SET_NULL(groundBg->unk544); + FREE_AND_SET_NULL(groundBg->unk548); for (i = 0; i < UNK_54C_ARR_COUNT; i++) { - if (mapPtr->unk554[i] != NULL) { - mapPtr->unk554[i] = NULL; + if (groundBg->unk554[i] != NULL) { + groundBg->unk554[i] = NULL; } - TRY_FREE_AND_SET_NULL(mapPtr->unk54C[i]); + TRY_FREE_AND_SET_NULL(groundBg->unk54C[i]); } } -void sub_80A2D68(unkStruct_3001B70 *mapPtr) +void sub_80A2D68(GroundBg *groundBg) { - TRY_FREE_AND_SET_NULL(mapPtr->unk544); + TRY_FREE_AND_SET_NULL(groundBg->unk544); } -void sub_80A2D88(unkStruct_3001B70 *mapPtr) +void sub_80A2D88(GroundBg *groundBg) { - if (mapPtr->unk52C.unk14 != NULL) { - void *unk448 = &mapPtr->unk448; - mapPtr->unk544 = MemoryAlloc(mapPtr->unk52C.unkE * 256, 6); - mapPtr->unk52C.unk14(mapPtr->unk544, mapPtr->unk468, unk448, mapPtr->unk52C.unkE); + if (groundBg->unk52C.unk14 != NULL) { + void *unk448 = &groundBg->unk448; + groundBg->unk544 = MemoryAlloc(groundBg->unk52C.unkE * 256, 6); + groundBg->unk52C.unk14(groundBg->unk544, groundBg->unk468, unk448, groundBg->unk52C.unkE); } } -void sub_80A2DD4(unkStruct_3001B70 *mapPtr) +void sub_80A2DD4(GroundBg *groundBg) { s32 i; for (i = 0; i < UNK_3E0_ARR_COUNT; i++) { - SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[i]; + SubStruct_3E0 *unkPtr = &groundBg->unk3E0[i]; TRY_CLOSE_FILE_AND_SET_NULL(unkPtr->unk8); } - TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk43C); - TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk440); - TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk430); - TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk434); - TRY_CLOSE_FILE_AND_SET_NULL(mapPtr->unk438); + TRY_CLOSE_FILE_AND_SET_NULL(groundBg->unk43C); + TRY_CLOSE_FILE_AND_SET_NULL(groundBg->unk440); + TRY_CLOSE_FILE_AND_SET_NULL(groundBg->unk430); + TRY_CLOSE_FILE_AND_SET_NULL(groundBg->unk434); + TRY_CLOSE_FILE_AND_SET_NULL(groundBg->unk438); } -void sub_80A2E64(unkStruct_3001B70 *mapPtr) +void sub_80A2E64(GroundBg *groundBg) { u16 r6; s32 i, j; SubStruct_0 *unk0Ptr; s32 unk0Id, unk3E0Id; - sub_80A2DD4(mapPtr); - mapPtr->unk444 = -1; - mapPtr->unk528 = 0; - mapPtr->unk448.unk0 = 0; - mapPtr->unk448.unk1 = 0; - mapPtr->unk448.unk2 = 0; - mapPtr->unk448.unk3 = 0; - mapPtr->unk448.unk4 = 0; - mapPtr->unk448.unk5 = 0; - unk0Ptr = &mapPtr->unk0[0]; - mapPtr->unk46C = 0; - mapPtr->unk470 = 0; - mapPtr->unk471 = 0; + sub_80A2DD4(groundBg); + groundBg->unk444 = -1; + groundBg->unk528 = 0; + groundBg->unk448.unk0 = 0; + groundBg->unk448.unk1 = 0; + groundBg->unk448.unk2 = 0; + groundBg->unk448.unk3 = 0; + groundBg->unk448.unk4 = 0; + groundBg->unk448.unk5 = 0; + unk0Ptr = &groundBg->unk0[0]; + groundBg->unk46C = 0; + groundBg->unk470 = 0; + groundBg->unk471 = 0; for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, unk0Ptr++) { unk0Ptr->unk0 = 0; @@ -183,7 +183,7 @@ void sub_80A2E64(unkStruct_3001B70 *mapPtr) } for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { - SubStruct_3E0 *unkPtr = &mapPtr->unk3E0[unk3E0Id]; + SubStruct_3E0 *unkPtr = &groundBg->unk3E0[unk3E0Id]; unkPtr->unk0 = 0; unkPtr->unk1 = 0; unkPtr->unk2 = 0; @@ -198,8 +198,8 @@ void sub_80A2E64(unkStruct_3001B70 *mapPtr) unkPtr->unk24 = 0; } - r6 = mapPtr->unk52C.unk0 * 16; - for (i = 0; i < mapPtr->unk52C.unk2; i++) { + r6 = groundBg->unk52C.unk0 * 16; + for (i = 0; i < groundBg->unk52C.unk2; i++) { struct S str1 = {0}; struct S str2 = {0xFF, 0xFF, 0xFF, 0}; @@ -209,12 +209,12 @@ void sub_80A2E64(unkStruct_3001B70 *mapPtr) } } - sub_80A3BB0(mapPtr, 0); - sub_80A3EB0(mapPtr->unk488); - mapPtr->unk52A = 1; + sub_80A3BB0(groundBg, 0); + sub_80A3EB0(groundBg->unk488); + groundBg->unk52A = 1; } -void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) +void sub_80A2FBC(GroundBg *groundBg, s32 a1_) { SubStruct_0 *sub0Ptr; u16 r5; @@ -236,22 +236,22 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) s32 a1 = (s16) a1_; if (a1 == -1) { - sub_80A2E64(mapPtr); + sub_80A2E64(groundBg); return; } - sub_80A2DD4(mapPtr); - mapPtr->unk444 = a1; + sub_80A2DD4(groundBg); + groundBg->unk444 = a1; dataPtr = &gUnknown_81188F0[a1]; - mapPtr->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); - mapPtr->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive); - mapPtr->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive); - file_430 = mapPtr->unk430->data; - file_434 = mapPtr->unk434->data; - file_438 = mapPtr->unk438->data; - mapPtr_464 = mapPtr->unk464; - mapPtr_454 = &mapPtr->unk454; - mapPtr_448 = &mapPtr->unk448; + groundBg->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); + groundBg->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive); + groundBg->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive); + file_430 = groundBg->unk430->data; + file_434 = groundBg->unk434->data; + file_438 = groundBg->unk438->data; + mapPtr_464 = groundBg->unk464; + mapPtr_454 = &groundBg->unk454; + mapPtr_448 = &groundBg->unk448; mapPtr_464[0] = *(u8 *)(file_430); file_430 += 2; mapPtr_464[1] = *(u8 *)(file_430); file_430 += 2; @@ -278,43 +278,43 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) mapPtr_448->unkA = *(u8 *)(file_438); file_438 += 2; r7 = file_430; - r5 = mapPtr->unk52C.unk0 * 16; + r5 = groundBg->unk52C.unk0 * 16; str2 = (struct S) {0}; str1.x0.x0[0] = 0xff; str1.x0.x0[1] = 0xff; str1.x0.x0[2] = 0xff; str1.x0.x0[3] = 0; - for (i = 0; i < mapPtr_464[0] && i < mapPtr->unk52C.unk2; i++) { + for (i = 0; i < mapPtr_464[0] && i < groundBg->unk52C.unk2; i++) { sub_8003810(r5++, str2); sub_809971C(r5, r7, 15); r5 += 15; r7 += 60; } - for (; i < mapPtr->unk52C.unk2; i++) { + for (; i < groundBg->unk52C.unk2; i++) { sub_8003810(r5++, str2); for (j = 0; j < 15; j++) { sub_8003810(r5++, str1); } } - sub_80A37C4((void *)(VRAM + 0x8000 + mapPtr->unk52C.unk4 * 32), file_434, &mapPtr->unk52C, &mapPtr->unk454); - _UncompressCell(mapPtr->unk548, &mapPtr->unk528, file_434 + ((mapPtr_454->unk4 - 1) * 16), &mapPtr->unk52C, &mapPtr->unk454); - file_438 = sub_80A3908(mapPtr->unk54C, file_438, &mapPtr->unk52C, &mapPtr->unk448); - mapPtr->unk468 = file_438; - if (mapPtr->unk544 != NULL) { - mapPtr->unk52C.unk14(mapPtr->unk544, file_438, mapPtr_448, mapPtr->unk52C.unkE); + sub_80A37C4((void *)(VRAM + 0x8000 + groundBg->unk52C.unk4 * 32), file_434, &groundBg->unk52C, &groundBg->unk454); + _UncompressCell(groundBg->unk548, &groundBg->unk528, file_434 + ((mapPtr_454->unk4 - 1) * 16), &groundBg->unk52C, &groundBg->unk454); + file_438 = sub_80A3908(groundBg->unk54C, file_438, &groundBg->unk52C, &groundBg->unk448); + groundBg->unk468 = file_438; + if (groundBg->unk544 != NULL) { + groundBg->unk52C.unk14(groundBg->unk544, file_438, mapPtr_448, groundBg->unk52C.unkE); } - sub0Ptr = mapPtr->unk0; + sub0Ptr = groundBg->unk0; unk0Id = 0; if (mapPtr_464[1] != 0) { const s16 *r3 = file_430 + (mapPtr_464[0] * 60); const void *r6 = &r3[mapPtr_464[0] * 2]; - mapPtr->unk46C = r3; - mapPtr->unk470 = 1; - mapPtr->unk471 = 1; - for (; unk0Id < mapPtr_464[0] && unk0Id < mapPtr->unk52C.unk2; unk0Id++, sub0Ptr++, r3 += 2) { + groundBg->unk46C = r3; + groundBg->unk470 = 1; + groundBg->unk471 = 1; + for (; unk0Id < mapPtr_464[0] && unk0Id < groundBg->unk52C.unk2; unk0Id++, sub0Ptr++, r3 += 2) { if (r3[1] > 0) { sub0Ptr->unk4 = r6; r6 += r3[1] * 60; @@ -328,9 +328,9 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) } } else { - mapPtr->unk46C = NULL; - mapPtr->unk470 = 0; - mapPtr->unk471 = 0; + groundBg->unk46C = NULL; + groundBg->unk470 = 0; + groundBg->unk471 = 0; } for (; unk0Id < UNK_0_ARR_COUNT; unk0Id++, sub0Ptr++) { @@ -339,9 +339,9 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) sub0Ptr->unk4 = sub0Ptr->unk8 = 0; } - vramPtr = (void *)(VRAM + 0x8000 + (mapPtr->unk52C.unk4 + mapPtr_454->unk4) * 32); + vramPtr = (void *)(VRAM + 0x8000 + (groundBg->unk52C.unk4 + mapPtr_454->unk4) * 32); for (id = 0; id < 2; id++) { - SubStruct_3E0 *sub3E0 = &mapPtr->unk3E0[id]; + SubStruct_3E0 *sub3E0 = &groundBg->unk3E0[id]; if (dataPtr->text4[id] != NULL) { const struct UnkFileStruct *fileStr; const void *r1, *r0; @@ -395,12 +395,12 @@ void sub_80A2FBC(unkStruct_3001B70 *mapPtr, s32 a1_) } } - sub_80A3BB0(mapPtr, 0); - sub_80A3EB0(mapPtr->unk488); - mapPtr->unk52A = 1; + sub_80A3BB0(groundBg, 0); + sub_80A3EB0(groundBg->unk488); + groundBg->unk52A = 1; } -void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s32 a3) +void sub_80A3440(GroundBg *groundBg, s32 a1_, DungeonLocation *dungLoc, s32 a3) { SubStruct_0 *sub0Ptr; s32 i; @@ -416,23 +416,23 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s s32 a1 = (s16) a1_; if (a1 == -1 || dungLoc->id == DUNGEON_INVALID) { - sub_80A2E64(mapPtr); + sub_80A2E64(groundBg); return; } - sub_80A2FBC(mapPtr, a1); - sub_80A2DD4(mapPtr); - mapPtr->unk444 = a1; + sub_80A2FBC(groundBg, a1); + sub_80A2DD4(groundBg); + groundBg->unk444 = a1; dataPtr = &gUnknown_81188F0[a1]; - mapPtr->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); - mapPtr->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive); - mapPtr->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive); - file_430 = mapPtr->unk430->data; - file_434 = mapPtr->unk434->data; - file_438 = mapPtr->unk438->data; - mapPtr_464 = mapPtr->unk464; - mapPtr_454 = &mapPtr->unk454; - mapPtr_448 = &mapPtr->unk448; + groundBg->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); + groundBg->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive); + groundBg->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive); + file_430 = groundBg->unk430->data; + file_434 = groundBg->unk434->data; + file_438 = groundBg->unk438->data; + mapPtr_464 = groundBg->unk464; + mapPtr_454 = &groundBg->unk454; + mapPtr_448 = &groundBg->unk448; mapPtr_464[0] = *(u8 *)(file_430); file_430 += 2; mapPtr_464[1] = *(u8 *)(file_430); file_430 += 2; @@ -456,27 +456,27 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s mapPtr_448->unk8 = *(u8 *)(file_438); file_438 += 2; mapPtr_448->unkA = *(u8 *)(file_438); file_438 += 2; - unkPtrArray[0] = mapPtr->unk544; + unkPtrArray[0] = groundBg->unk544; unkPtrArray[1] = NULL; - file_438 = sub_80A3908(unkPtrArray, file_438, &mapPtr->unk52C, &mapPtr->unk448); - mapPtr->unk468 = file_438; - sub_80ADD9C(&mapPtr->unk43C, &mapPtr->unk440, (void *)(VRAM + 0x8000), mapPtr->unk548, mapPtr->unk54C[0], dungLoc, a3, 0x40, mapPtr_448->unk5, mapPtr->unk544, 0); + file_438 = sub_80A3908(unkPtrArray, file_438, &groundBg->unk52C, &groundBg->unk448); + groundBg->unk468 = file_438; + sub_80ADD9C(&groundBg->unk43C, &groundBg->unk440, (void *)(VRAM + 0x8000), groundBg->unk548, groundBg->unk54C[0], dungLoc, a3, 0x40, mapPtr_448->unk5, groundBg->unk544, 0); // Unused return values - GetFileDataPtr(mapPtr->unk43C, 0); - GetFileDataPtr(mapPtr->unk440, 0); + GetFileDataPtr(groundBg->unk43C, 0); + GetFileDataPtr(groundBg->unk440, 0); - mapPtr->unk52C.unk14(mapPtr->unk544, file_438, mapPtr_448, mapPtr->unk52C.unkE); + groundBg->unk52C.unk14(groundBg->unk544, file_438, mapPtr_448, groundBg->unk52C.unkE); mapPtr_454->unk4 = 0x200; for (i = 0; i < UNK_545_UNK6_ARR_COUNT; i++) { mapPtr_454->unk6[i] = 0; } mapPtr_454->unkE = 250; - mapPtr->unk464[0] = 12; - mapPtr->unk464[1] = 0; - if (mapPtr->unk43C != NULL) { + groundBg->unk464[0] = 12; + groundBg->unk464[1] = 0; + if (groundBg->unk43C != NULL) { s32 i, j; - const struct S *strPtr = mapPtr->unk43C->data; + const struct S *strPtr = groundBg->unk43C->data; u16 r7 = 0; struct S str0 = {0}; struct S str1; @@ -486,7 +486,7 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s str1.x0.x0[2] = 0xff; str1.x0.x0[3] = 0; - for (i = 0; i < 12 && i < mapPtr->unk52C.unk2; i++) { + for (i = 0; i < 12 && i < groundBg->unk52C.unk2; i++) { sub_8003810(r7++, str0); strPtr++; for (j = 0; j < 15; j++) { @@ -495,7 +495,7 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s strPtr++; } } - for (; i < mapPtr->unk52C.unk2; i++) { + for (; i < groundBg->unk52C.unk2; i++) { sub_8003810(r7++, str0); for (j = 0; j < 15; j++) { sub_8003810(r7++, str1); @@ -503,13 +503,13 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s } } - sub0Ptr = mapPtr->unk0; - if (mapPtr->unk440 != NULL) { - sub_8004AA4(mapPtr->unkE0, mapPtr->unk440, UNK_E0_ARR_COUNT); + sub0Ptr = groundBg->unk0; + if (groundBg->unk440 != NULL) { + sub_8004AA4(groundBg->unkE0, groundBg->unk440, UNK_E0_ARR_COUNT); } - mapPtr->unk46C = NULL; - mapPtr->unk470 = 0; - mapPtr->unk471 = 0; + groundBg->unk46C = NULL; + groundBg->unk470 = 0; + groundBg->unk471 = 0; for (unk0Id = 0; unk0Id < UNK_0_ARR_COUNT; unk0Id++, sub0Ptr++) { sub0Ptr->unk0 = 0; @@ -518,7 +518,7 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s } for (sub3E0Id = 0; sub3E0Id < UNK_3E0_ARR_COUNT; sub3E0Id++) { - SubStruct_3E0 *sub3E0 = &mapPtr->unk3E0[sub3E0Id]; + SubStruct_3E0 *sub3E0 = &groundBg->unk3E0[sub3E0Id]; sub3E0->unk0 = 0; sub3E0->unk1 = 0; sub3E0->unk4 = 0; @@ -532,9 +532,9 @@ void sub_80A3440(unkStruct_3001B70 *mapPtr, s32 a1_, DungeonLocation *dungLoc, s sub3E0->unk20 = 0; sub3E0->unk24 = 0; } - sub_80A3BB0(mapPtr, 0); - sub_80A3EB0(mapPtr->unk488); - mapPtr->unk52A = 1; + sub_80A3BB0(groundBg, 0); + sub_80A3EB0(groundBg->unk488); + groundBg->unk52A = 1; // bad sp alloc for compiler generated variables... ASM_MATCH_TRICK(mapPtr_454->unk6[0]); } @@ -683,43 +683,43 @@ static const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2 return src; } -void sub_80A3B80(unkStruct_3001B70 *mapPtr, u8 a1, u8 a2) +void sub_80A3B80(GroundBg *groundBg, u8 a1, u8 a2) { - if (mapPtr->unk46C != NULL) { - mapPtr->unk470 = a1; - mapPtr->unk471 = a2; + if (groundBg->unk46C != NULL) { + groundBg->unk470 = a1; + groundBg->unk471 = a2; } } static const PixelPos sUnknownPosition = {96, 24}; -void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0_) +void sub_80A3BB0(GroundBg *groundBg, s32 a0_) { s32 i; // s16 memes strike yet again s32 a0Match = (s16) a0_; s32 a0 = a0Match; - SubStruct_488 *map488 = mapPtr->unk488; + SubStruct_488 *map488 = groundBg->unk488; switch (a0) { default: case 0: case 1: - mapPtr->unk474 = 1; - sub_80A3D40(&map488[0], mapPtr, 0, mapPtr->unk52C.unkC, (a0 == 1)); + groundBg->unk474 = 1; + sub_80A3D40(&map488[0], groundBg, 0, groundBg->unk52C.unkC, (a0 == 1)); break; case 2: case 3: case 4: - mapPtr->unk474 = 2; - sub_80A3D40(&map488[0], mapPtr, 0, mapPtr->unk52C.unkC - 1, (a0 == 4)); - sub_80A3D40(&map488[1], mapPtr, mapPtr->unk52C.unkC - 1, 1, (a0 != 2)); + groundBg->unk474 = 2; + sub_80A3D40(&map488[0], groundBg, 0, groundBg->unk52C.unkC - 1, (a0 == 4)); + sub_80A3D40(&map488[1], groundBg, groundBg->unk52C.unkC - 1, 1, (a0 != 2)); break; } - for (i = 0; i < mapPtr->unk474; i++) { - sub_80A456C(mapPtr, i, &sUnknownPosition); + for (i = 0; i < groundBg->unk474; i++) { + sub_80A456C(groundBg, i, &sUnknownPosition); switch (map488[i].unk4) { default: case 1: @@ -751,38 +751,38 @@ void sub_80A3BB0(unkStruct_3001B70 *mapPtr, s32 a0_) } break; } - sub_80A3E14(&map488[i], &mapPtr->unk478[i]); + sub_80A3E14(&map488[i], &groundBg->unk478[i]); } - for (i = mapPtr->unk474; i < UNK_54C_ARR_COUNT; i++) { - sub_80A456C(mapPtr, i, &sUnknownPosition); - sub_80A3D40(&map488[i], mapPtr, 0, 0, FALSE); + for (i = groundBg->unk474; i < UNK_54C_ARR_COUNT; i++) { + sub_80A456C(groundBg, i, &sUnknownPosition); + sub_80A3D40(&map488[i], groundBg, 0, 0, FALSE); } } -static void sub_80A3D40(SubStruct_488 *map488, unkStruct_3001B70 *mapPtr, s32 a2, s32 a3, bool8 a4) +static void sub_80A3D40(SubStruct_488 *map488, GroundBg *groundBg, s32 a2, s32 a3, bool8 a4) { s32 i, j; - map488->unk0 = mapPtr->unk528; + map488->unk0 = groundBg->unk528; map488->unk2 = a2; map488->unk4 = a3; map488->unk6 = a4; - map488->unk8 = mapPtr->unk448.unk4; - map488->unkC = mapPtr->unk448.unk5; - map488->unk10.x = mapPtr->unk448.unk0 * 8; - map488->unk10.y = mapPtr->unk448.unk1 * 8; - map488->unk1C = mapPtr->unk548; + map488->unk8 = groundBg->unk448.unk4; + map488->unkC = groundBg->unk448.unk5; + map488->unk10.x = groundBg->unk448.unk0 * 8; + map488->unk10.y = groundBg->unk448.unk1 * 8; + map488->unk1C = groundBg->unk548; - for (i = 0, j = a2; i < a3 && j < mapPtr->unk52C.unkC; i++, j++) { - map488->unk20[i] = mapPtr->unk54C[j]; - map488->unk28[i] = mapPtr->unk554[j]; + for (i = 0, j = a2; i < a3 && j < groundBg->unk52C.unkC; i++, j++) { + map488->unk20[i] = groundBg->unk54C[j]; + map488->unk28[i] = groundBg->unk554[j]; } for (; i < UNK_54C_ARR_COUNT; i++) { map488->unk20[i] = NULL; map488->unk28[i] = NULL; } - sub_80A3E14(map488, &mapPtr->unk478[0]); + sub_80A3E14(map488, &groundBg->unk478[0]); } void sub_80A3E14(SubStruct_488 *map488, PixelPos *a1) @@ -1191,19 +1191,19 @@ static void sub_80A4358(SubStruct_488 *map488) } } -void sub_80A4558(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *dstPos) +void sub_80A4558(GroundBg *groundBg, s32 id, PixelPos *dstPos) { - *dstPos = mapPtr->unk478[id]; + *dstPos = groundBg->unk478[id]; } -void sub_80A456C(unkStruct_3001B70 *mapPtr, s32 id, const PixelPos *srcPos) +void sub_80A456C(GroundBg *groundBg, s32 id, const PixelPos *srcPos) { - mapPtr->unk478[id] = *srcPos; + groundBg->unk478[id] = *srcPos; } -void sub_80A4580(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos) +void sub_80A4580(GroundBg *groundBg, s32 id, PixelPos *pixPos) { - SubStruct_488 *map488 = &mapPtr->unk488[id]; + SubStruct_488 *map488 = &groundBg->unk488[id]; if (pixPos->x < 0) { if (map488->unk6) { @@ -1248,31 +1248,31 @@ void sub_80A4580(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos) } } -void sub_80A4608(unkStruct_3001B70 *mapPtr, PixelPos *dstPos) +void sub_80A4608(GroundBg *groundBg, PixelPos *dstPos) { - dstPos->x = mapPtr->unk448.unk0; - dstPos->y = mapPtr->unk448.unk1; + dstPos->x = groundBg->unk448.unk0; + dstPos->y = groundBg->unk448.unk1; } -UNUSED static void sub_80A4620(unkStruct_3001B70 *mapPtr, PixelPos *dstPos) +UNUSED static void sub_80A4620(GroundBg *groundBg, PixelPos *dstPos) { - dstPos->x = mapPtr->unk448.unk0 * 8; - dstPos->y = mapPtr->unk448.unk1 * 8; + dstPos->x = groundBg->unk448.unk0 * 8; + dstPos->y = groundBg->unk448.unk1 * 8; } -void GetDungeonBounds(unkStruct_3001B70 *mapPtr, PixelPos *dstPos1, PixelPos *dstPos2) +void GetDungeonBounds(GroundBg *groundBg, PixelPos *dstPos1, PixelPos *dstPos2) { dstPos1->x = 0; dstPos1->y = 0; - dstPos2->x = mapPtr->unk448.unk0 << 11; - dstPos2->y = mapPtr->unk448.unk1 << 11; + dstPos2->x = groundBg->unk448.unk0 << 11; + dstPos2->y = groundBg->unk448.unk1 << 11; } -u8 sub_80A4660(unkStruct_3001B70 *mapPtr, u8 bits, PixelPos *pixPos1, PixelPos *boundary) +u8 sub_80A4660(GroundBg *groundBg, u8 bits, PixelPos *pixPos1, PixelPos *boundary) { s32 i, j; u8 *currPtr; - void *ptr = mapPtr->unk544; + void *ptr = groundBg->unk544; if (ptr == NULL) return 0; @@ -1290,11 +1290,11 @@ u8 sub_80A4660(unkStruct_3001B70 *mapPtr, u8 bits, PixelPos *pixPos1, PixelPos * return 0; } -u8 sub_80A46C0(unkStruct_3001B70 *mapPtr, u8 bits, PixelPos *pixPos1, PixelPos *boundary) +u8 sub_80A46C0(GroundBg *groundBg, u8 bits, PixelPos *pixPos1, PixelPos *boundary) { s32 i, j; u8 *currPtr; - void *ptr = mapPtr->unk544; + void *ptr = groundBg->unk544; if (ptr == NULL) return 0; @@ -1312,40 +1312,40 @@ u8 sub_80A46C0(unkStruct_3001B70 *mapPtr, u8 bits, PixelPos *pixPos1, PixelPos * return 1; } -u16 sub_80A4720(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos) +u16 sub_80A4720(GroundBg *groundBg, s32 id, PixelPos *pixPos) { - u16 *ptr = mapPtr->unk54C[id] + (pixPos->y * 64); + u16 *ptr = groundBg->unk54C[id] + (pixPos->y * 64); ptr += pixPos->x; return *ptr; } -void sub_80A4740(unkStruct_3001B70 *mapPtr, s32 id, PixelPos *pixPos, u32 dstVal) +void sub_80A4740(GroundBg *groundBg, s32 id, PixelPos *pixPos, u32 dstVal) { - u16 *ptr = mapPtr->unk54C[id] + (pixPos->y * 64); + u16 *ptr = groundBg->unk54C[id] + (pixPos->y * 64); ptr += pixPos->x; *ptr = dstVal; } -void sub_80A4764(unkStruct_3001B70 *mapPtr) +void sub_80A4764(GroundBg *groundBg) { s32 i, j; s32 unk3E0Id; SubStruct_488 *map488; PixelPos *map478; - if (mapPtr->unk444 == -1) + if (groundBg->unk444 == -1) return; - if (mapPtr->unk464[1] != 0) { + if (groundBg->unk464[1] != 0) { s32 i; - SubStruct_0 *sub0Ptr = mapPtr->unk0; - const u16 *ptr = mapPtr->unk46C; - u16 r6 = mapPtr->unk52C.unk0 * 16; + SubStruct_0 *sub0Ptr = groundBg->unk0; + const u16 *ptr = groundBg->unk46C; + u16 r6 = groundBg->unk52C.unk0 * 16; - for (i = 0; i < mapPtr->unk464[0]; i++, sub0Ptr++, ptr += 2, r6 += 16) { + for (i = 0; i < groundBg->unk464[0]; i++, sub0Ptr++, ptr += 2, r6 += 16) { if (sub0Ptr->unk4 != NULL && --sub0Ptr->unk2 <= 0) { if (--sub0Ptr->unk0 <= 0) { - if (mapPtr->unk471) { + if (groundBg->unk471) { sub0Ptr->unk2 = ptr[0]; sub0Ptr->unk0 = ptr[1]; sub0Ptr->unk8 = sub0Ptr->unk4; @@ -1369,11 +1369,11 @@ void sub_80A4764(unkStruct_3001B70 *mapPtr) } } - mapPtr->unk471 = mapPtr->unk470; + groundBg->unk471 = groundBg->unk470; } - else if (mapPtr->unk440 != NULL) { + else if (groundBg->unk440 != NULL) { s32 i; - unkStruct_202EE8C *unkE0Ptr = mapPtr->unkE0; + unkStruct_202EE8C *unkE0Ptr = groundBg->unkE0; s32 r6 = 160; for (i = 0; i < 32; i++, unkE0Ptr++, r6++) { @@ -1392,7 +1392,7 @@ void sub_80A4764(unkStruct_3001B70 *mapPtr) } for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { - SubStruct_3E0 *sub3E0Ptr = &mapPtr->unk3E0[unk3E0Id]; + SubStruct_3E0 *sub3E0Ptr = &groundBg->unk3E0[unk3E0Id]; if (sub3E0Ptr->unk0 && sub3E0Ptr->unk4-- <= 0) { sub3E0Ptr->unk14 += 4; @@ -1407,14 +1407,14 @@ void sub_80A4764(unkStruct_3001B70 *mapPtr) } } - map488 = mapPtr->unk488; - map478 = mapPtr->unk478; - for (i = 0; i < mapPtr->unk474; i++, map488++, map478++) { + map488 = groundBg->unk488; + map478 = groundBg->unk478; + for (i = 0; i < groundBg->unk474; i++, map488++, map478++) { s32 unk; sub_80A3E14(map488, map478); sub_80A3EB0(map488); - for (j = 0, unk = map488->unk2 + mapPtr->unk52C.unkA; j < map488->unk4; j++, unk++) { + for (j = 0, unk = map488->unk2 + groundBg->unk52C.unkA; j < map488->unk4; j++, unk++) { switch (unk) { case 0: SetBG2RegOffsets(map488->bgRegOffsets.x, map488->bgRegOffsets.y); @@ -1426,29 +1426,29 @@ void sub_80A4764(unkStruct_3001B70 *mapPtr) } } - mapPtr->unk52A = 1; + groundBg->unk52A = 1; } -void sub_80A49E8(unkStruct_3001B70 *mapPtr) +void sub_80A49E8(GroundBg *groundBg) { s32 i; s32 unk3E0Id; for (unk3E0Id = 0; unk3E0Id < UNK_3E0_ARR_COUNT; unk3E0Id++) { - SubStruct_3E0 *sub3E0Ptr = &mapPtr->unk3E0[unk3E0Id]; + SubStruct_3E0 *sub3E0Ptr = &groundBg->unk3E0[unk3E0Id]; if (sub3E0Ptr->unk1) { MemoryCopy32(sub3E0Ptr->unk20, sub3E0Ptr->unk1C, sub3E0Ptr->unk24); sub3E0Ptr->unk1 = FALSE; - mapPtr->unk52A = 1; + groundBg->unk52A = 1; } } - if (mapPtr->unk52A) { + if (groundBg->unk52A) { s32 unk; - for (i = 0, unk = mapPtr->unk52C.unkA; i < mapPtr->unk52C.unkC; i++, unk++) { + for (i = 0, unk = groundBg->unk52C.unkA; i < groundBg->unk52C.unkC; i++, unk++) { sub_80098F8(unk + 2); } - mapPtr->unk52A = 0; + groundBg->unk52A = 0; } } diff --git a/src/ground_map.c b/src/ground_map.c index 74fb23546..712c5c46b 100644 --- a/src/ground_map.c +++ b/src/ground_map.c @@ -8,7 +8,7 @@ #include "memory.h" IWRAM_INIT GroundMapAction *gGroundMapAction = {NULL}; -IWRAM_INIT unkStruct_3001B70 *gGroundMapDungeon_3001B70 = {NULL}; +IWRAM_INIT GroundBg *gGroundMapDungeon_3001B70 = {NULL}; extern GroundMapAction *gGroundMapAction; @@ -31,9 +31,9 @@ extern bool8 GroundScriptNotify(void *, s32); extern const CallbackData gGroundScriptNullCallbacks; extern const DebugLocation gUnknown_8117538[]; -extern void sub_80A2D00(unkStruct_3001B70 *); -extern void sub_80A2D68(unkStruct_3001B70 *); -extern void sub_80A2D88(unkStruct_3001B70 *); +extern void sub_80A2D00(GroundBg *); +extern void sub_80A2D68(GroundBg *); +extern void sub_80A2D88(GroundBg *); void AllocGroundMapAction(void) { diff --git a/src/ground_map_1.c b/src/ground_map_1.c index 92bb22274..6accbfa2b 100644 --- a/src/ground_map_1.c +++ b/src/ground_map_1.c @@ -9,8 +9,8 @@ extern DebugLocation gUnknown_8117770; extern s16 HandleAction(Action *action, DebugLocation *debug); extern void sub_80A4740(void *, s32, s32 *, u32); extern u32 sub_80A4720(void *, s32, s32 *); -extern u8 sub_80A46C0(unkStruct_3001B70 *, u32, s32, s32); -extern u8 sub_80A4660(unkStruct_3001B70 *, u32, s32, s32); +extern u8 sub_80A46C0(GroundBg *, u32, s32, s32); +extern u8 sub_80A4660(GroundBg *, u32, s32, s32); u8 sub_80A5934(s32 param_1, s32 param_2, s32 param_3) { @@ -42,9 +42,9 @@ void GroundMap_Action(void) } extern u8 sub_809D248(PixelPos *r0); -extern void sub_80A4580(unkStruct_3001B70 *, u32, PixelPos *); -extern void sub_80A456C(unkStruct_3001B70 *, u32, const PixelPos *); -extern void sub_80A4764(unkStruct_3001B70 *); +extern void sub_80A4580(GroundBg *, u32, PixelPos *); +extern void sub_80A456C(GroundBg *, u32, const PixelPos *); +extern void sub_80A4764(GroundBg *); extern GroundMapAction *gGroundMapAction; diff --git a/src/ground_map_2.c b/src/ground_map_2.c index 67af26f74..b45999882 100644 --- a/src/ground_map_2.c +++ b/src/ground_map_2.c @@ -7,22 +7,22 @@ #include "memory.h" IWRAM_INIT unkStruct_3001B74 *gUnknown_3001B74 = {NULL}; -IWRAM_INIT unkStruct_3001B70 *gUnknown_3001B78 = {NULL}; +IWRAM_INIT GroundBg *gUnknown_3001B78 = {NULL}; extern const u8 gUnknown_8117784[]; extern const s16 gUnknown_811E5F4[][2]; extern const u8 gGroundWeatherSelect[]; extern const s32 gUnknown_81177BC[]; -extern void sub_80A3BB0(unkStruct_3001B70 *, u32); -extern void sub_80A2D00(unkStruct_3001B70 *); -extern void sub_80A2B40(unkStruct_3001B70 *, const u8 *); -extern void sub_80A2FBC(unkStruct_3001B70 *, u32); -extern void sub_80A49E8(unkStruct_3001B70 *); -extern void sub_80A456C(unkStruct_3001B70 *, u32, const s32 *); -extern void sub_80A4580(unkStruct_3001B70 *, u32, s32 *); +extern void sub_80A3BB0(GroundBg *, u32); +extern void sub_80A2D00(GroundBg *); +extern void sub_80A2B40(GroundBg *, const u8 *); +extern void sub_80A2FBC(GroundBg *, u32); +extern void sub_80A49E8(GroundBg *); +extern void sub_80A456C(GroundBg *, u32, const s32 *); +extern void sub_80A4580(GroundBg *, u32, s32 *); extern void sub_80A56C0(s32 *); -extern void sub_80A4764(unkStruct_3001B70 *); +extern void sub_80A4764(GroundBg *); static void sub_80A62D0(void); @@ -62,7 +62,7 @@ void sub_80A5EDC(u8 param_1) } if (param_1) { - gUnknown_3001B78 = MemoryAlloc(sizeof(unkStruct_3001B70), 6); + gUnknown_3001B78 = MemoryAlloc(sizeof(GroundBg), 6); sub_80A2B40(gUnknown_3001B78, gUnknown_8117784); sub_80A2FBC(gUnknown_3001B78, -1); } diff --git a/src/gulpin_shop.c b/src/gulpin_shop.c index be915522a..2d33c621e 100644 --- a/src/gulpin_shop.c +++ b/src/gulpin_shop.c @@ -95,8 +95,7 @@ void DestroyGulpinShop(void) { if (sGulpinShopWork != NULL) { CloseFile(sGulpinShopWork->monPortrait.faceFile); - MemoryFree(sGulpinShopWork); - sGulpinShopWork = NULL; + FREE_AND_SET_NULL(sGulpinShopWork); } } diff --git a/src/gulpin_shop_801FB50.c b/src/gulpin_shop_801FB50.c index 3f4f11a1b..2169b6d96 100644 --- a/src/gulpin_shop_801FB50.c +++ b/src/gulpin_shop_801FB50.c @@ -178,8 +178,7 @@ void sub_801FD7C(void) { if (gUnknown_203B27C) { CloseFile(gUnknown_203B27C->monPortrait.faceFile); - MemoryFree(gUnknown_203B27C); - gUnknown_203B27C = NULL; + FREE_AND_SET_NULL(gUnknown_203B27C); } } diff --git a/src/kangaskhan_storage1.c b/src/kangaskhan_storage1.c index 4baf0d997..7a30403ee 100644 --- a/src/kangaskhan_storage1.c +++ b/src/kangaskhan_storage1.c @@ -130,8 +130,7 @@ void DeleteKangaskhanStorage(void) { if (gKangaskhanStorageWork != NULL) { CloseFile(gKangaskhanStorageWork->monPortrait.faceFile); - MemoryFree(gKangaskhanStorageWork); - gKangaskhanStorageWork = NULL; + FREE_AND_SET_NULL(gKangaskhanStorageWork); } } diff --git a/src/kecleon_bros1.c b/src/kecleon_bros1.c index 91f891d89..fed069a7b 100644 --- a/src/kecleon_bros1.c +++ b/src/kecleon_bros1.c @@ -232,8 +232,7 @@ void DeleteKecleonBros(void) { if (sKecleonBrosWork1 != NULL) { CloseFile(sKecleonBrosWork1->monPortrait.faceFile); - MemoryFree(sKecleonBrosWork1); - sKecleonBrosWork1 = NULL; + FREE_AND_SET_NULL(sKecleonBrosWork1); } } diff --git a/src/luminous_cave.c b/src/luminous_cave.c index 71347a7c2..17b3631e2 100644 --- a/src/luminous_cave.c +++ b/src/luminous_cave.c @@ -164,8 +164,7 @@ void CleanLuminousCave(void) { if (sLuminousCaveWork != NULL) { CloseFile(sLuminousCaveWork->unk104); - MemoryFree(sLuminousCaveWork); - sLuminousCaveWork = NULL; + FREE_AND_SET_NULL(sLuminousCaveWork); } } diff --git a/src/makuhita_dojo1.c b/src/makuhita_dojo1.c index d400915cf..dc59c12e5 100644 --- a/src/makuhita_dojo1.c +++ b/src/makuhita_dojo1.c @@ -136,8 +136,7 @@ void MakuhitaDojo_Delete(void) { if (sMakuhitaDojoWork1 != NULL) { CloseFile(sMakuhitaDojoWork1->monPortrait.faceFile); - MemoryFree(sMakuhitaDojoWork1); - sMakuhitaDojoWork1 = NULL; + FREE_AND_SET_NULL(sMakuhitaDojoWork1); } } diff --git a/src/mission_reward.c b/src/mission_reward.c index 6feede231..755517e15 100644 --- a/src/mission_reward.c +++ b/src/mission_reward.c @@ -158,12 +158,10 @@ u32 sub_802F298(void) void sub_802F2C0(void) { - if(gUnknown_203B310 != NULL) - { + if (gUnknown_203B310 != NULL) { if(gUnknown_203B310->monPortrait.faceFile != 0) CloseFile(gUnknown_203B310->monPortrait.faceFile); - MemoryFree(gUnknown_203B310); - gUnknown_203B310 = NULL; + FREE_AND_SET_NULL(gUnknown_203B310); } } diff --git a/src/post_office_guide1.c b/src/post_office_guide1.c index 327b37e45..914c8de1c 100644 --- a/src/post_office_guide1.c +++ b/src/post_office_guide1.c @@ -112,8 +112,7 @@ void CleanHelperPelipper(void) if (sPostOfficeHelper != NULL) { if (sPostOfficeHelper->monPortrait.faceFile != NULL) CloseFile(sPostOfficeHelper->monPortrait.faceFile); - MemoryFree(sPostOfficeHelper); - sPostOfficeHelper = NULL; + FREE_AND_SET_NULL(sPostOfficeHelper); } } diff --git a/src/save_write.c b/src/save_write.c index 5e7bc37d7..3c1cd0333 100644 --- a/src/save_write.c +++ b/src/save_write.c @@ -131,8 +131,7 @@ void FinishWriteSavePak(void) if (sSavePakWrite != NULL) { if (sSavePakWrite->monPortrait.faceFile != NULL) CloseFile(sSavePakWrite->monPortrait.faceFile); - MemoryFree(sSavePakWrite); - sSavePakWrite = NULL; + FREE_AND_SET_NULL(sSavePakWrite); } sub_80993E4(); } diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 5c8d01da7..48b589fca 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -405,11 +405,9 @@ u32 ThankYouMailPelipperCallback(void) void CleanThankYouMailPelipper(void) { - if(sUnknown_203B2C4 != NULL) - { + if (sUnknown_203B2C4 != NULL) { CloseFile(sUnknown_203B2C4->monPortrait.faceFile); - MemoryFree(sUnknown_203B2C4); - sUnknown_203B2C4 = NULL; + FREE_AND_SET_NULL(sUnknown_203B2C4); sub_8030DE4(); FreeItemDescriptionWindow(); sub_803084C(); diff --git a/src/wigglytuff_shop3.c b/src/wigglytuff_shop3.c index bb5dc4bcb..a5f8cf327 100644 --- a/src/wigglytuff_shop3.c +++ b/src/wigglytuff_shop3.c @@ -124,8 +124,7 @@ void CleanWigglytuffShop(void) { if (sWigglytuffShop3Work) { CloseFile(sWigglytuffShop3Work->monPortrait.faceFile); - MemoryFree(sWigglytuffShop3Work); - sWigglytuffShop3Work = NULL; + FREE_AND_SET_NULL(sWigglytuffShop3Work); } } diff --git a/src/wonder_mail.c b/src/wonder_mail.c index 903b52ecd..4023407a5 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -398,8 +398,7 @@ void sub_80282FC(void) { if (sUnknown_203B2C0 != NULL) { CloseFile(sUnknown_203B2C0->monPortrait.faceFile); - MemoryFree(sUnknown_203B2C0); - sUnknown_203B2C0 = NULL; + FREE_AND_SET_NULL(sUnknown_203B2C0); sub_8031E10(); FriendList_Free(); sub_803084C(); diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c index 045b02580..a31c34c03 100644 --- a/src/wonder_mail_2.c +++ b/src/wonder_mail_2.c @@ -128,11 +128,9 @@ u32 sub_802B358(void) void sub_802B3B8(void) { - if(sUnknown_203B2C8 != NULL) - { + if (sUnknown_203B2C8 != NULL) { CloseFile(sUnknown_203B2C8->monPortrait.faceFile); - MemoryFree(sUnknown_203B2C8); - sUnknown_203B2C8 = NULL; + FREE_AND_SET_NULL(sUnknown_203B2C8); } } diff --git a/src/wonder_mail_6.c b/src/wonder_mail_6.c index 6a365f34e..7cc6aaaf1 100644 --- a/src/wonder_mail_6.c +++ b/src/wonder_mail_6.c @@ -166,8 +166,7 @@ void sub_80310B4(void) sub_803084C(); if (gUnknown_203B328 != NULL) { CloseFile(gUnknown_203B328->monPortrait.faceFile); - MemoryFree(gUnknown_203B328); - gUnknown_203B328 = NULL; + FREE_AND_SET_NULL(gUnknown_203B328); } } From bf077a679adef8078b367db7653f49587e2cfd01 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 6 Jun 2025 18:13:18 +0200 Subject: [PATCH 11/11] some renames --- asm/ground_map_1.s | 14 ++-- include/ground_bg.h | 9 +++ include/ground_map.h | 132 ------------------------------- include/structs/str_ground_bg.h | 136 ++++++++++++++++++++++++++++++++ src/ground_bg.c | 27 ++++--- src/ground_map.c | 4 +- src/ground_map_1.c | 1 + src/ground_map_2.c | 9 +-- 8 files changed, 174 insertions(+), 158 deletions(-) create mode 100644 include/ground_bg.h create mode 100644 include/structs/str_ground_bg.h diff --git a/asm/ground_map_1.s b/asm/ground_map_1.s index a0dab581d..35246e030 100644 --- a/asm/ground_map_1.s +++ b/asm/ground_map_1.s @@ -26,7 +26,7 @@ GroundMap_Select: ldr r0, [r4] cmp r0, 0 beq _080A4E08 - bl sub_80A2D00 + bl GroundBg_FreeAll ldr r0, [r4] bl MemoryFree movs r0, 0 @@ -47,7 +47,7 @@ _080A4E08: bne _080A4E4C ldr r1, _080A4E48 adds r0, r2, 0 - bl sub_80A2B40 + bl GroundBg_Init ldr r0, [r4] adds r1, r5, 0 bl sub_80A2FBC @@ -97,7 +97,7 @@ _080A4EA8: ldr r0, _080A4EC0 ldr r0, [r0] ldr r1, _080A4EC4 - bl sub_80A2B40 + bl GroundBg_Init ldr r1, _080A4EC8 movs r2, 0x80 lsls r2, 5 @@ -152,7 +152,7 @@ _080A4F20: ldr r0, _080A4FA0 ldr r0, [r0] ldr r1, _080A4FA4 - bl sub_80A2B40 + bl GroundBg_Init movs r0, 0x1 bl sub_80A5EDC _080A4F30: @@ -385,7 +385,7 @@ GroundMap_SelectDungeon: ldr r0, [r7] cmp r0, 0 beq _080A5110 - bl sub_80A2D00 + bl GroundBg_FreeAll ldr r0, [r7] bl MemoryFree movs r0, 0 @@ -413,7 +413,7 @@ _080A5110: _080A5138: ldr r1, _080A515C adds r0, r2, 0 - bl sub_80A2B40 + bl GroundBg_Init ldr r0, [r7] adds r1, r6, 0 bl sub_80A2FBC @@ -447,7 +447,7 @@ _080A5188: .4byte gUnknown_8117740 _080A518C: ldr r1, _080A51FC adds r0, r2, 0 - bl sub_80A2B40 + bl GroundBg_Init movs r0, 0x1 bl sub_80A5EDC ldr r0, [r7] diff --git a/include/ground_bg.h b/include/ground_bg.h new file mode 100644 index 000000000..1f2db829e --- /dev/null +++ b/include/ground_bg.h @@ -0,0 +1,9 @@ +#ifndef GUARD_GROUND_BG_H +#define GUARD_GROUND_BG_H + +#include "structs/str_ground_bg.h" + +void GroundBg_Init(GroundBg *groundBg, const SubStruct_52C *a1); +void GroundBg_FreeAll(GroundBg *groundBg); + +#endif // GUARD_GROUND_BG_H diff --git a/include/ground_map.h b/include/ground_map.h index a5a5725c3..5d35c3ee3 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -1,138 +1,6 @@ #ifndef GUARD_GROUND_MAP_H #define GUARD_GROUND_MAP_H -#include "structs/str_file_system.h" -#include "structs/str_202EE8C.h" -#include "structs/str_position.h" - -#define UNK_0_ARR_COUNT 14 -#define UNK_E0_ARR_COUNT 32 -#define UNK_3E0_ARR_COUNT 2 -#define UNK_54C_ARR_COUNT 2 -#define UNK_545_UNK6_ARR_COUNT 4 - -typedef struct SubStruct_0 -{ - s16 unk0; - s16 unk2; - const void *unk4; - const void *unk8; - u8 fillC; -} SubStruct_0; - -struct UnkFileStruct -{ - u8 unk0; - s16 unk2; - void *unk4[0]; // This is most likely wrong, will need to be fixed. -}; - -typedef struct SubStruct_3E0 -{ - u8 unk0; - u8 unk1; - s16 unk2; - s16 unk4; - OpenedFile *unk8; - const struct UnkFileStruct *unkC; - const void *unk10; - const void *unk14; - const void *unk18; - const void *unk1C; - void *unk20; - u32 unk24; -} SubStruct_3E0; - -typedef struct SubStruct_488 -{ - s16 unk0; - s16 unk2; - s16 unk4; - bool8 unk6; - s32 unk8; - s32 unkC; - PixelPos unk10; - void (*unk18)(struct SubStruct_488 *); - u16 *unk1C; - u16 *unk20[UNK_54C_ARR_COUNT]; - u16 *unk28[UNK_54C_ARR_COUNT]; - PixelPos unk30; - PixelPos unk38; - PixelPos unk40; - PixelPos bgRegOffsets; // Either bg2 or bg3 -} SubStruct_488; - -// size: 0x18? -typedef struct SubStruct_52C -{ - s16 unk0; // 0x52C - s16 unk2; // 0x52E - s16 unk4; // 0x530 - s16 unk6; // 0x532 - s16 unk8; // 0x534 - s16 unkA; // 0x536 - s16 unkC; // 0x538 - s16 unkE; // 0x53A - s16 unk10; // 0x53C - s16 unk12; // 0x53E - void (*unk14)(void *, const void *, void *, s32); // TODO: fix void * to proper ptr types 0x540 -} SubStruct_52C; - -typedef struct SubStruct_448 -{ - u8 unk0; - u8 unk1; - u8 unk2; - u8 unk3; - u8 unk4; - u8 unk5; - u16 unk6; - u16 unk8; - u16 unkA; -} SubStruct_448; - -typedef struct SubStruct_545 -{ - s16 unk0; - s16 unk2; - s16 unk4; - s16 unk6[UNK_545_UNK6_ARR_COUNT]; - s16 unkE; -} SubStruct_545; - -// size: 0x55C -typedef struct GroundBg -{ - SubStruct_0 unk0[UNK_0_ARR_COUNT]; - unkStruct_202EE8C unkE0[UNK_E0_ARR_COUNT]; - SubStruct_3E0 unk3E0[UNK_3E0_ARR_COUNT]; - OpenedFile *unk430; - OpenedFile *unk434; - OpenedFile *unk438; - OpenedFile *unk43C; - OpenedFile *unk440; - s16 unk444; - SubStruct_448 unk448; - SubStruct_545 unk454; - s16 unk464[2]; - const void *unk468; - const void *unk46C; - u8 unk470; - u8 unk471; - s32 unk474; - PixelPos unk478[UNK_54C_ARR_COUNT]; - struct SubStruct_488 unk488[UNK_54C_ARR_COUNT]; - u16 unk528; - u8 unk52A; - SubStruct_52C unk52C; - u16 *unk544; - u16 *unk548; - u16 *unk54C[UNK_54C_ARR_COUNT]; - u16 *unk554[UNK_54C_ARR_COUNT]; -} GroundBg; - -extern GroundBg *gGroundMapDungeon_3001B70; - void GroundMap_Reset(void); void AllocGroundMapAction(void); diff --git a/include/structs/str_ground_bg.h b/include/structs/str_ground_bg.h new file mode 100644 index 000000000..6730820e9 --- /dev/null +++ b/include/structs/str_ground_bg.h @@ -0,0 +1,136 @@ +#ifndef GUARD_STR_GROUND_BG_H +#define GUARD_STR_GROUND_BG_H + +#include "structs/str_file_system.h" +#include "structs/str_202EE8C.h" +#include "structs/str_position.h" + +#define UNK_0_ARR_COUNT 14 +#define UNK_E0_ARR_COUNT 32 +#define UNK_3E0_ARR_COUNT 2 +#define UNK_54C_ARR_COUNT 2 +#define UNK_545_UNK6_ARR_COUNT 4 + +typedef struct SubStruct_0 +{ + s16 unk0; + s16 unk2; + const void *unk4; + const void *unk8; + u8 fillC; +} SubStruct_0; + +struct UnkFileStruct +{ + u8 unk0; + s16 unk2; + void *unk4[0]; // This is most likely wrong, will need to be fixed. +}; + +typedef struct SubStruct_3E0 +{ + u8 unk0; + u8 unk1; + s16 unk2; + s16 unk4; + OpenedFile *unk8; + const struct UnkFileStruct *unkC; + const void *unk10; + const void *unk14; + const void *unk18; + const void *unk1C; + void *unk20; + u32 unk24; +} SubStruct_3E0; + +typedef struct SubStruct_488 +{ + s16 unk0; + s16 unk2; + s16 unk4; + bool8 unk6; + s32 unk8; + s32 unkC; + PixelPos unk10; + void (*unk18)(struct SubStruct_488 *); + u16 *unk1C; + u16 *unk20[UNK_54C_ARR_COUNT]; + u16 *unk28[UNK_54C_ARR_COUNT]; + PixelPos unk30; + PixelPos unk38; + PixelPos unk40; + PixelPos bgRegOffsets; // Either bg2 or bg3 +} SubStruct_488; + +// size: 0x18? +typedef struct SubStruct_52C +{ + s16 unk0; // 0x52C + s16 unk2; // 0x52E + s16 unk4; // 0x530 + s16 unk6; // 0x532 + s16 unk8; // 0x534 + s16 unkA; // 0x536 + s16 unkC; // 0x538 + s16 unkE; // 0x53A + s16 unk10; // 0x53C + s16 unk12; // 0x53E + void (*unk14)(void *, const void *, void *, s32); // TODO: fix void * to proper ptr types 0x540 +} SubStruct_52C; + +typedef struct SubStruct_448 +{ + u8 unk0; + u8 unk1; + u8 unk2; + u8 unk3; + u8 unk4; + u8 unk5; + u16 unk6; + u16 unk8; + u16 unkA; +} SubStruct_448; + +typedef struct SubStruct_545 +{ + s16 unk0; + s16 unk2; + s16 unk4; + s16 unk6[UNK_545_UNK6_ARR_COUNT]; + s16 unkE; +} SubStruct_545; + +// size: 0x55C +typedef struct GroundBg +{ + SubStruct_0 unk0[UNK_0_ARR_COUNT]; + unkStruct_202EE8C unkE0[UNK_E0_ARR_COUNT]; + SubStruct_3E0 unk3E0[UNK_3E0_ARR_COUNT]; + OpenedFile *unk430; + OpenedFile *unk434; + OpenedFile *unk438; + OpenedFile *unk43C; + OpenedFile *unk440; + s16 unk444; + SubStruct_448 unk448; + SubStruct_545 unk454; + s16 unk464[2]; + const void *unk468; + const void *unk46C; + u8 unk470; + u8 unk471; + s32 unk474; + PixelPos unk478[UNK_54C_ARR_COUNT]; + struct SubStruct_488 unk488[UNK_54C_ARR_COUNT]; + u16 unk528; + u8 unk52A; + SubStruct_52C unk52C; + u16 *unk544; + u16 *unk548; + u16 *unk54C[UNK_54C_ARR_COUNT]; + u16 *unk554[UNK_54C_ARR_COUNT]; +} GroundBg; + +extern GroundBg *gGroundMapDungeon_3001B70; + +#endif // GUARD_STR_GROUND_BG_H diff --git a/src/ground_bg.c b/src/ground_bg.c index dcb45e20f..3c5ca4376 100644 --- a/src/ground_bg.c +++ b/src/ground_bg.c @@ -1,5 +1,6 @@ #include "global.h" #include "globaldata.h" +#include "ground_bg.h" #include "ground_map.h" #include "text_1.h" #include "memory.h" @@ -13,11 +14,13 @@ #include "unk_dungeon_load.h" #include "constants/dungeon.h" +// This file most likely deals with map loading and writing to VRAM. It even has a custom decompression function. + extern const struct unkStruct_81188F0 gUnknown_81188F0[10]; extern const FileArchive gGroundFileArchive; void sub_80A456C(GroundBg *groundBg, s32 id, const PixelPos *srcPos); -static void sub_80A2DD4(GroundBg *groundBg); +static void CloseOpenedFiles(GroundBg *groundBg); void sub_80A3BB0(GroundBg *groundBg, s32 a0); static void sub_80A3EB0(SubStruct_488 *map488); static const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *a3); @@ -38,7 +41,7 @@ extern void sub_809971C(u16 a0, const void *a1, int a2); static const PixelPos sPositionZero = {0, 0}; -void sub_80A2B40(GroundBg *groundBg, const SubStruct_52C *a1) +void GroundBg_Init(GroundBg *groundBg, const SubStruct_52C *a1) { SubStruct_0 *unk0Ptr; s32 id, unk0Id, unk3E0Id; @@ -109,11 +112,11 @@ void sub_80A2B40(GroundBg *groundBg, const SubStruct_52C *a1) } } -void sub_80A2D00(GroundBg *groundBg) +void GroundBg_FreeAll(GroundBg *groundBg) { s32 i; - sub_80A2DD4(groundBg); + CloseOpenedFiles(groundBg); TRY_FREE_AND_SET_NULL(groundBg->unk544); FREE_AND_SET_NULL(groundBg->unk548); @@ -139,7 +142,7 @@ void sub_80A2D88(GroundBg *groundBg) } } -void sub_80A2DD4(GroundBg *groundBg) +static void CloseOpenedFiles(GroundBg *groundBg) { s32 i; @@ -161,7 +164,7 @@ void sub_80A2E64(GroundBg *groundBg) SubStruct_0 *unk0Ptr; s32 unk0Id, unk3E0Id; - sub_80A2DD4(groundBg); + CloseOpenedFiles(groundBg); groundBg->unk444 = -1; groundBg->unk528 = 0; groundBg->unk448.unk0 = 0; @@ -240,7 +243,7 @@ void sub_80A2FBC(GroundBg *groundBg, s32 a1_) return; } - sub_80A2DD4(groundBg); + CloseOpenedFiles(groundBg); groundBg->unk444 = a1; dataPtr = &gUnknown_81188F0[a1]; groundBg->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); @@ -421,7 +424,7 @@ void sub_80A3440(GroundBg *groundBg, s32 a1_, DungeonLocation *dungLoc, s32 a3) } sub_80A2FBC(groundBg, a1); - sub_80A2DD4(groundBg); + CloseOpenedFiles(groundBg); groundBg->unk444 = a1; dataPtr = &gUnknown_81188F0[a1]; groundBg->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive); @@ -601,7 +604,7 @@ static void _UncompressCell(void *dst_, u16 *a1, const void *src_, SubStruct_52C } // Tilemap decompression algorhitm? -static const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *a3) +static const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2, SubStruct_448 *mapPtr_448) { s32 i, j, k, l; const u8 *src = src_; @@ -609,10 +612,10 @@ static const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2 for (i = 0; i < a2->unkC; i++) { u16 *dst = dstArray[i]; - for (j = 0; j < a3->unk5; j++) { + for (j = 0; j < mapPtr_448->unk5; j++) { k = 0; if (j == 0) { - while (k < a3->unk4) { + while (k < mapPtr_448->unk4) { s32 val = *src++; if (val > 191) { for (l = 191; l < val; l++) { @@ -641,7 +644,7 @@ static const u8 *sub_80A3908(u16 **dstArray, const void *src_, SubStruct_52C *a2 } else { u16 *ptrVal = dst - 64; - while (k < a3->unk4) { + while (k < mapPtr_448->unk4) { s32 val = *src++; if (val > 191) { for (l = 191; l < val; l++) { diff --git a/src/ground_map.c b/src/ground_map.c index 712c5c46b..d34f9aa50 100644 --- a/src/ground_map.c +++ b/src/ground_map.c @@ -1,6 +1,7 @@ #include "global.h" #include "debug.h" #include "event_flag.h" +#include "ground_bg.h" #include "ground_main.h" #include "ground_map.h" #include "ground_map_2.h" @@ -31,7 +32,6 @@ extern bool8 GroundScriptNotify(void *, s32); extern const CallbackData gGroundScriptNullCallbacks; extern const DebugLocation gUnknown_8117538[]; -extern void sub_80A2D00(GroundBg *); extern void sub_80A2D68(GroundBg *); extern void sub_80A2D88(GroundBg *); @@ -60,7 +60,7 @@ void GroundMap_Reset(void) ActionResetScriptData((Action *)gGroundMapAction, gUnknown_8117538); if (gGroundMapDungeon_3001B70 != NULL) { - sub_80A2D00(gGroundMapDungeon_3001B70); + GroundBg_FreeAll(gGroundMapDungeon_3001B70); MemoryFree(gGroundMapDungeon_3001B70); gGroundMapDungeon_3001B70 = NULL; } diff --git a/src/ground_map_1.c b/src/ground_map_1.c index 6accbfa2b..f03947cbe 100644 --- a/src/ground_map_1.c +++ b/src/ground_map_1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "ground_bg.h" #include "ground_map.h" #include "ground_map_2.h" #include "ground_script.h" diff --git a/src/ground_map_2.c b/src/ground_map_2.c index b45999882..31638ff1c 100644 --- a/src/ground_map_2.c +++ b/src/ground_map_2.c @@ -2,6 +2,7 @@ #include "code_800558C.h" #include "debug.h" #include "event_flag.h" +#include "ground_bg.h" #include "ground_map.h" #include "ground_map_2.h" #include "memory.h" @@ -9,14 +10,12 @@ IWRAM_INIT unkStruct_3001B74 *gUnknown_3001B74 = {NULL}; IWRAM_INIT GroundBg *gUnknown_3001B78 = {NULL}; -extern const u8 gUnknown_8117784[]; +extern const SubStruct_52C gUnknown_8117784; extern const s16 gUnknown_811E5F4[][2]; extern const u8 gGroundWeatherSelect[]; extern const s32 gUnknown_81177BC[]; extern void sub_80A3BB0(GroundBg *, u32); -extern void sub_80A2D00(GroundBg *); -extern void sub_80A2B40(GroundBg *, const u8 *); extern void sub_80A2FBC(GroundBg *, u32); extern void sub_80A49E8(GroundBg *); extern void sub_80A456C(GroundBg *, u32, const s32 *); @@ -56,14 +55,14 @@ void sub_80A5EDC(u8 param_1) gUnknown_3001B74->unk2 = param_1; if (gUnknown_3001B78 != NULL) { - sub_80A2D00(gUnknown_3001B78); + GroundBg_FreeAll(gUnknown_3001B78); MemoryFree(gUnknown_3001B78); gUnknown_3001B78 = NULL; } if (param_1) { gUnknown_3001B78 = MemoryAlloc(sizeof(GroundBg), 6); - sub_80A2B40(gUnknown_3001B78, gUnknown_8117784); + GroundBg_Init(gUnknown_3001B78, &gUnknown_8117784); sub_80A2FBC(gUnknown_3001B78, -1); } }