Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-27 03:18:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #217 from DizzyEggg/dungeon_map_access

Browse Source 
dungeon_map_access
This commit is contained in:
AnonymousRandomPerson
2024-09-19 19:48:22 -04:00
committed by GitHub
parent c4dd5fe96e 02af0c5636
commit 5e7f03534a
6 changed files with 726 additions and 2117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1940
asm/dungeon_map_access.s
View File

File diff suppressed because it is too large Load Diff

21
include/structs/map.h
View File

@@ -9,15 +9,18 @@
enum TerrainType
{
TERRAIN_TYPE_NORMAL = 1 << 0,
TERRAIN_TYPE_SECONDARY = 1 << 1, // Water or lava depending on the dungeon.
TERRAIN_TYPE_UNK_2 = 1 << 2,
TERRAIN_TYPE_NATURAL_JUNCTION = 1 << 3,
TERRAIN_TYPE_IMPASSABLE_WALL = 1 << 4,
TERRAIN_TYPE_SHOP = 1 << 5,
TERRAIN_TYPE_IN_MONSTER_HOUSE = 1 << 6,
TERRAIN_TYPE_UNK_8 = 1 << 8,
TERRAIN_TYPE_STAIRS = 1 << 9,
TERRAIN_TYPE_NORMAL = 1 << 0, // x1
TERRAIN_TYPE_SECONDARY = 1 << 1, // Water or lava depending on the dungeon. x2
TERRAIN_TYPE_UNK_2 = 1 << 2, // x4
TERRAIN_TYPE_NATURAL_JUNCTION = 1 << 3, // x8
TERRAIN_TYPE_IMPASSABLE_WALL = 1 << 4, // x10
TERRAIN_TYPE_SHOP = 1 << 5, // x20
TERRAIN_TYPE_IN_MONSTER_HOUSE = 1 << 6, // x40
TERRAIN_TYPE_UNK_8 = 1 << 8, // x100
TERRAIN_TYPE_STAIRS = 1 << 9, // x200
TERRAIN_TYPE_UNK_x400 = 1 << 10,
TERRAIN_TYPE_UNK_x800 = 1 << 11,
TERRAIN_TYPE_UNK_x1000 = 1 << 12,
};
enum CrossableTerrain

13
include/structs/str_dungeon.h
View File

@@ -240,10 +240,15 @@ typedef struct Dungeon
/* 0x104C4 */ RoomData roomData[MAX_ROOM_COUNT];
/* 0x10844 */ s16 naturalJunctionListCounts[MAX_ROOM_COUNT];
/* 0x10884 */ Position naturalJunctionList[MAX_ROOM_COUNT][MAX_ROOM_COUNT]; // Arrays of room exits for each room.
u8 unk11884[0x1194];
u8 fill12A18[0x12C24 - 0x12A18];
u16 unk11884[250][9];
u16 unk12A18[20][9];
u16 unk12B80[9];
u16 unk12B92[36];
u16 unk12BDA[9];
u16 unk12BEC[9];
u16 unk12BFE[19];
u8 unk12C24[0x930];
u8 fill13554[0x1356C - 0x13554];
u16 unk13554[12];
u8 unk1356C;
u8 fill1356D[0x13570 - 0x1356D];
/* 0x13570 */ u8 unk13570;
@@ -271,7 +276,7 @@ typedef struct Dungeon
/* 0x181E4 */ OpenedFile *paletFile;
/* 0x181E8 */ unkDungeonGlobal_unk181E8_sub unk181e8;
u8 fill18220[0x1C06C - 0x18220];
u32 unk1C06C;
u32 unk1C06C;
u8 fill1C070[0x1C570 - 0x1C070];
u8 unk1C570;
u8 unk1C571;

2
ld_script.txt
View File

@@ -229,8 +229,6 @@ SECTIONS {
src/code_8048480.o(.text);
src/dungeon_ai_item_weight.o(.text);
src/dungeon_map_access.o(.text);
asm/dungeon_map_access.o(.text);
src/dungeon_map_access_1.o(.text);
src/tile_types.o(.text);
asm/code_804AFAC.o(.text);
src/code_804AFAC.o(.text);

713
src/dungeon_map_access.c
View File

@@ -1,4 +1,5 @@
#include "global.h"
#include "dungeon_map_access.h"
#include "code_8004AA0.h"
#include "constants/walkable_tile.h"
#include "decompress.h"
@@ -6,8 +7,14 @@
#include "structs/str_dungeon.h"
#include "tile_types.h"
#include "random.h"
#include "text1.h"
#include "dungeon_engine.h"
#include "dungeon_movement.h"
#include "dungeon_leader.h"
#include "dungeon_util.h"
#include "code_8009804.h"
#include "game_options.h"
#include "dungeon_visibility.h"
extern unkStruct_202F190 gUnknown_80F69D4;
extern unkStruct_202F190 gUnknown_80F69EC;
@@ -19,6 +26,8 @@ extern u8 gUnknown_80F6A34[];
extern u8 gUnknown_80F6A40[];
extern u8 gUnknown_8108EC0[];
extern const struct FileArchive gDungeonFileArchive;
extern const s16 gUnknown_80F6A4A[];
extern const s16 gUnknown_80F6C06[];
EWRAM_DATA OpenedFile *gDungeonPaletteFile = {0};
EWRAM_DATA unkStruct_202EE8C gUnknown_202EE8C[32] = {0};
@@ -28,7 +37,7 @@ EWRAM_DATA unkStruct_202F190 gUnknown_202F190 = {0};
EWRAM_DATA_2 unkStruct_202F190 *gUnknown_203B430 = {0};
extern u8 sub_8043CE4(u32);
extern void sub_80402AC(s32, s32);
extern int sprintf(char *, const char *, ...);
void sub_8049BB0(s32, s32);
void sub_80498A8(s32, s32);
@@ -57,7 +66,7 @@ void sub_80495E4(void)
{
s32 YCoord;
s32 XCoord;
for(YCoord = 0; YCoord < DUNGEON_MAX_SIZE_Y; YCoord++)
{
for(XCoord = 0; XCoord < DUNGEON_MAX_SIZE_X; XCoord++)
@@ -75,7 +84,7 @@ void LoadDungeonTilesetAssets(void)
OpenedFile *file;
OpenedFile *file_1;
u8 fileName [12];
sprintf(fileName,gUnknown_80F6A04,gUnknown_8108EC0[gDungeon->tileset]); // b%02dfon
file = OpenFileAndGetFileDataPtr(fileName,&gDungeonFileArchive);
DecompressATGlobalFile((u32 *)0x06008000,0,file);
@@ -86,7 +95,7 @@ void LoadDungeonTilesetAssets(void)
sprintf(fileName,gUnknown_80F6A1C,gUnknown_8108EC0[gDungeon->tileset]); // b%02dcel
file_1 = OpenFileAndGetFileDataPtr(fileName,&gDungeonFileArchive);
DecompressATFile(gDungeon->unk11884,0x1194,file_1);
DecompressATFile((void*)gDungeon->unk11884,0x1194,file_1);
CloseFile(file_1);
if (gDungeon->tileset < 0x40) {
@@ -137,12 +146,11 @@ void sub_8049840(void)
}
}
void sub_8049884(void)
{
s32 XCoord;
s32 YCoord;
for(YCoord = 0; YCoord < DUNGEON_MAX_SIZE_Y; YCoord++)
{
for(XCoord = 0; XCoord < DUNGEON_MAX_SIZE_X; XCoord++) {
@@ -165,7 +173,7 @@ void sub_80498A8(int x,int y)
u16 sp_0x20; // sp 0x20
int r4;
s32 r7; // r7
if (x < 0) {
return;
}
@@ -325,7 +333,7 @@ void sub_8049B8C(void)
{
s32 XCoord;
s32 YCoord;
for(YCoord = 0; YCoord < DUNGEON_MAX_SIZE_Y; YCoord++)
{
for(XCoord = 0; XCoord < DUNGEON_MAX_SIZE_X; XCoord++) {
@@ -333,3 +341,692 @@ void sub_8049B8C(void)
}
}
}
void sub_8049BB0(s32 x, s32 y)
{
s32 i;
u32 terrainFlags;
u32 flags[6];
u32 var_4C[8];
bool8 var_2C[8];
flags[0] = 0;
flags[1] = 0;
flags[2] = 0;
flags[3] = 0;
terrainFlags = GetTile(x, y+1)->terrainType & (TERRAIN_TYPE_NORMAL | TERRAIN_TYPE_SECONDARY);
var_4C[0] = terrainFlags;
var_4C[1] = GetTile(x+1, y+1)->terrainType & (TERRAIN_TYPE_NORMAL | TERRAIN_TYPE_SECONDARY);
var_4C[2] = GetTile(x+1, y)->terrainType & (TERRAIN_TYPE_NORMAL | TERRAIN_TYPE_SECONDARY);
var_4C[3] = GetTile(x+1, y-1)->terrainType & (TERRAIN_TYPE_NORMAL | TERRAIN_TYPE_SECONDARY);
var_4C[4] = GetTile(x, y-1)->terrainType & (TERRAIN_TYPE_NORMAL | TERRAIN_TYPE_SECONDARY);
var_4C[5] = GetTile(x-1, y-1)->terrainType & (TERRAIN_TYPE_NORMAL | TERRAIN_TYPE_SECONDARY);
var_4C[6] = GetTile(x-1, y)->terrainType & (TERRAIN_TYPE_NORMAL | TERRAIN_TYPE_SECONDARY);
var_4C[7] = GetTile(x-1, y+1)->terrainType & (TERRAIN_TYPE_NORMAL | TERRAIN_TYPE_SECONDARY);
if (var_4C[0] == TERRAIN_TYPE_NORMAL)
flags[CROSSABLE_TERRAIN_REGULAR] |= 1;
if (var_4C[2] == TERRAIN_TYPE_NORMAL)
flags[CROSSABLE_TERRAIN_REGULAR] |= 4;
if (var_4C[4] == TERRAIN_TYPE_NORMAL)
flags[CROSSABLE_TERRAIN_REGULAR] |= 0x10;
if (var_4C[6] == TERRAIN_TYPE_NORMAL)
flags[CROSSABLE_TERRAIN_REGULAR] |= 0x40;
if (var_4C[0] != 0 && var_4C[1] == TERRAIN_TYPE_NORMAL && var_4C[2] != 0)
flags[CROSSABLE_TERRAIN_REGULAR] |= 2;
if (var_4C[2] != 0 && var_4C[3] == TERRAIN_TYPE_NORMAL && var_4C[4] != 0)
flags[CROSSABLE_TERRAIN_REGULAR] |= 8;
if (var_4C[4] != 0 && var_4C[5] == TERRAIN_TYPE_NORMAL && var_4C[6] != 0)
flags[CROSSABLE_TERRAIN_REGULAR] |= 0x20;
if (var_4C[6] != 0 && var_4C[7] == TERRAIN_TYPE_NORMAL && var_4C[0] != 0)
flags[CROSSABLE_TERRAIN_REGULAR] |= 0x80;
for (i = 0; i < 8; i++) {
if (var_4C[i] == TERRAIN_TYPE_NORMAL || var_4C[i] == TERRAIN_TYPE_SECONDARY)
var_2C[i] = TRUE;
else
var_2C[i] = FALSE;
}
if (var_2C[0])
flags[CROSSABLE_TERRAIN_LIQUID] |= 1;
if (var_2C[2])
flags[CROSSABLE_TERRAIN_LIQUID] |= 4;
if (var_2C[4])
flags[CROSSABLE_TERRAIN_LIQUID] |= 0x10;
if (var_2C[6])
flags[CROSSABLE_TERRAIN_LIQUID] |= 0x40;
if (var_4C[0] != 0 && var_2C[1] && var_4C[2] != 0)
flags[CROSSABLE_TERRAIN_LIQUID] |= 2;
if (var_4C[2] != 0 && var_2C[3] && var_4C[4] != 0)
flags[CROSSABLE_TERRAIN_LIQUID] |= 8;
if (var_4C[4] != 0 && var_2C[5] && var_4C[6] != 0)
flags[CROSSABLE_TERRAIN_LIQUID] |= 0x20;
if (var_4C[6] != 0 && var_2C[7] && var_4C[0] != 0)
flags[CROSSABLE_TERRAIN_LIQUID] |= 0x80;
if (var_4C[0] != 0)
flags[2] |= 1;
if (var_4C[2] != 0)
flags[2] |= 4;
if (var_4C[4] != 0)
flags[2] |= 0x10;
if (var_4C[6] != 0)
flags[2] |= 0x40;
if (var_4C[0] != 0 && var_4C[1] != 0 && var_4C[2] != 0)
flags[CROSSABLE_TERRAIN_CREVICE] |= 2;
if (var_4C[2] != 0 && var_4C[3] != 0 && var_4C[4] != 0)
flags[CROSSABLE_TERRAIN_CREVICE] |= 8;
if (var_4C[4] != 0 && var_4C[5] != 0 && var_4C[6] != 0)
flags[CROSSABLE_TERRAIN_CREVICE] |= 0x20;
if (var_4C[6] != 0 && var_4C[7] != 0 && var_4C[0] != 0)
flags[CROSSABLE_TERRAIN_CREVICE] |= 0x80;
flags[3] = 0xFF;
if (x <= 1)
flags[CROSSABLE_TERRAIN_WALL] = 0x1F;
if (y <= 1)
flags[CROSSABLE_TERRAIN_WALL] &= ~(0x8 | 0x10 | 0x20);
if (x > 53)
flags[CROSSABLE_TERRAIN_WALL] &= ~(0x2 | 0x4 | 0x8);
if (y > 29)
flags[CROSSABLE_TERRAIN_WALL] &= ~(0x80 | 0x1 | 0x2);
GetTileSafe(x, y)->walkableNeighborFlags[CROSSABLE_TERRAIN_REGULAR] = flags[CROSSABLE_TERRAIN_REGULAR];
GetTileSafe(x, y)->walkableNeighborFlags[CROSSABLE_TERRAIN_LIQUID] = flags[CROSSABLE_TERRAIN_LIQUID];
GetTileSafe(x, y)->walkableNeighborFlags[CROSSABLE_TERRAIN_CREVICE] = flags[CROSSABLE_TERRAIN_CREVICE];
GetTileSafe(x, y)->walkableNeighborFlags[CROSSABLE_TERRAIN_WALL] = flags[CROSSABLE_TERRAIN_WALL];
}
void sub_8049ED4(void)
{
bool32 hallucinating, unk1820F;
u16 *src;
Tile *tile;
s32 r7;
s32 i;
s32 r10;
s32 j;
s32 x, y;
s32 r8;
s32 var_48, var_44;
Dungeon *dungeon = gDungeon;
hallucinating = dungeon->unk181e8.hallucinating;
unk1820F = dungeon->unk181e8.unk1820F;
x = dungeon->unk181e8.cameraPixelPos.x >> 3;
r10 = gUnknown_80F6A4A[30 + x];
var_48 = gUnknown_80F6C06[30 + x];
for (i = 0; i <= 30; i++) {
y = (dungeon->unk181e8.cameraPixelPos.y >> 3) - 1;
x &= 0x1F;
r8 = gUnknown_80F6A4A[30 + y];
var_44 = gUnknown_80F6C06[30 + y];
r7 = r10 + (r8 * 3);
tile = GetTile(var_48, var_44);
if (tile->terrainType & TERRAIN_TYPE_UNK_x1000) {
src = &dungeon->unk12BEC[r7];
}
else if (tile->terrainType & TERRAIN_TYPE_SHOP) {
src = &dungeon->unk12BDA[r7];
}
else if (hallucinating) {
src = &dungeon->unk11884[tile->unk8][r7];
}
else if (tile->unk4 & 4) {
src = &dungeon->unk12BFE[r7];
}
else
{
Entity *tileObject = tile->object;
if (tileObject != NULL) {
if (GetEntityType(tileObject) == ENTITY_TRAP && (tileObject->isVisible || unk1820F)) {
u8 trapType = tileObject->info->flags;
src = &dungeon->unk12A18[trapType][r7];
}
else {
src = &dungeon->unk11884[tile->unk8][r7];
}
}
else if (tile->terrainType & TERRAIN_TYPE_STAIRS) {
src = &dungeon->unk12A18[dungeon->unk3A12][r7];
}
else {
src = &dungeon->unk11884[tile->unk8][r7];
}
}
for (j = 0; j < 23; j++) {
y &= 0x1F;
gUnknown_202B038[3][y][x] = *src;
src += 3;
y++;
r8++;
if (r8 == 3)
{
r8 = 0;
var_44++;
r7 = r10;
tile = GetTile(var_48, var_44);
if (tile->terrainType & TERRAIN_TYPE_SHOP) {
src = &dungeon->unk12BDA[r7];
}
else if (tile->terrainType & TERRAIN_TYPE_UNK_x1000) {
src = &dungeon->unk12BEC[r7];
}
else if (hallucinating) {
src = &dungeon->unk11884[tile->unk8][r7];
}
else if (tile->unk4 & 4) {
src = &dungeon->unk12BFE[r7];
}
else
{
Entity *tileObject = tile->object;
if (tileObject != NULL) {
if (GetEntityType(tileObject) == ENTITY_TRAP && (tileObject->isVisible || unk1820F)) {
u8 trapType = tileObject->info->flags;
src = &dungeon->unk12A18[trapType][r7];
}
else {
src = &dungeon->unk11884[tile->unk8][r7];
}
}
else if (tile->terrainType & TERRAIN_TYPE_STAIRS) {
src = &dungeon->unk12A18[dungeon->unk3A12][r7];
}
else {
src = &dungeon->unk11884[tile->unk8][r7];
}
}
}
}
x++;
r10++;
if (r10 == 3) {
r10 = 0;
var_48++;
}
}
sub_80098F8(3);
}
void sub_804A1F0(s32 a0, s32 a1)
{
Tile *tile;
u16 *src;
bool32 hallucinating, unk1820F;
s32 xTemp, yTemp;
s32 i;
s32 r8;
s32 r10;
s32 r6;
s32 var_2C;
s32 var_28;
s32 x, y;
Dungeon *dungeon = gDungeon;
hallucinating = dungeon->unk181e8.hallucinating;
unk1820F = dungeon->unk181e8.unk1820F;
xTemp = dungeon->unk181e8.cameraPixelPos.x + a0;
yTemp = dungeon->unk181e8.cameraPixelPos.y + a1;
yTemp >>= 3;
x = xTemp >> 3;
y = yTemp - 1;
var_28 = gUnknown_80F6A4A[30 + x];
var_2C = gUnknown_80F6C06[30 + x];
r8 = gUnknown_80F6A4A[30 + y];
r10 = gUnknown_80F6C06[30 + y];
r6 = var_28 + r8 * 3;
tile = GetTile(var_2C, r10);
if (tile->terrainType & TERRAIN_TYPE_SHOP) {
src = &dungeon->unk12BDA[r6];
}
else if (tile->terrainType & TERRAIN_TYPE_UNK_x1000) {
src = &dungeon->unk12BEC[r6];
}
else if (hallucinating) {
src = &dungeon->unk11884[tile->unk8][r6];
}
else
{
Entity *tileObject = tile->object;
if (tileObject != NULL) {
if (GetEntityType(tileObject) == ENTITY_TRAP && (tileObject->isVisible || unk1820F)) {
u8 trapType = tileObject->info->flags;
src = &dungeon->unk12A18[trapType][r6];
}
else {
src = &dungeon->unk11884[tile->unk8][r6];
}
}
else if (tile->terrainType & TERRAIN_TYPE_STAIRS) {
src = &dungeon->unk12A18[dungeon->unk3A12][r6];
}
else {
src = &dungeon->unk11884[tile->unk8][r6];
}
}
for (i = 0; i < 23; i++) {
x &= 0x1F;
y &= 0x1F;
gUnknown_202B038[3][y][x] = *src;
src += 3;
y++;
r8++;
if (r8 == 3) {
r8 = 0;
r10++;
r6 = var_28;
tile = GetTile(var_2C, r10);
if (tile->terrainType & TERRAIN_TYPE_SHOP) {
src = &dungeon->unk12BDA[r6];
}
else if (tile->terrainType & TERRAIN_TYPE_UNK_x1000) {
src = &dungeon->unk12BEC[r6];
}
else if (hallucinating) {
src = &dungeon->unk11884[tile->unk8][r6];
}
else
{
Entity *tileObject = tile->object;
if (tileObject != NULL) {
if (GetEntityType(tileObject) == ENTITY_TRAP && (tileObject->isVisible || unk1820F)) {
u8 trapType = tileObject->info->flags;
src = &dungeon->unk12A18[trapType][r6];
}
else {
src = &dungeon->unk11884[tile->unk8][r6];
}
}
else if (tile->terrainType & TERRAIN_TYPE_STAIRS) {
src = &dungeon->unk12A18[dungeon->unk3A12][r6];
}
else {
src = &dungeon->unk11884[tile->unk8][r6];
}
}
}
}
sub_80098F8(3);
}
void sub_804A49C(s32 a0, s32 a1)
{
Tile *tile;
u16 *src;
bool32 hallucinating, unk1820F;
s32 xTemp, yTemp;
s32 i;
s32 var_2C;
s32 r10;
s32 r6;
s32 var_28;
s32 r9;
s32 x, y;
Dungeon *dungeon = gDungeon;
hallucinating = dungeon->unk181e8.hallucinating;
unk1820F = dungeon->unk181e8.unk1820F;
xTemp = dungeon->unk181e8.cameraPixelPos.x + a0;
yTemp = dungeon->unk181e8.cameraPixelPos.y + a1;
x = xTemp >> 3;
y = yTemp >> 3;
r9 = gUnknown_80F6A4A[30 + x];
r10 = gUnknown_80F6C06[30 + x];
var_28 = gUnknown_80F6A4A[30 + y];
var_2C = gUnknown_80F6C06[30 + y];
r6 = r9 + var_28 * 3;
tile = GetTile(r10, var_2C);
if (tile->terrainType & TERRAIN_TYPE_SHOP) {
src = &dungeon->unk12BDA[r6];
}
else if (tile->terrainType & TERRAIN_TYPE_UNK_x1000) {
src = &dungeon->unk12BEC[r6];
}
else if (hallucinating) {
src = &dungeon->unk11884[tile->unk8][r6];
}
else
{
Entity *tileObject = tile->object;
if (tileObject != NULL) {
if (GetEntityType(tileObject) == ENTITY_TRAP && (tileObject->isVisible || unk1820F)) {
u8 trapType = tileObject->info->flags;
src = &dungeon->unk12A18[trapType][r6];
}
else {
src = &dungeon->unk11884[tile->unk8][r6];
}
}
else if (tile->terrainType & TERRAIN_TYPE_STAIRS) {
src = &dungeon->unk12A18[dungeon->unk3A12][r6];
}
else {
src = &dungeon->unk11884[tile->unk8][r6];
}
}
for (i = 0; i < 31; i++) {
x &= 0x1F;
y &= 0x1F;
gUnknown_202B038[3][y][x] = *src;
src++;
x++;
r9++;
if (r9 == 3) {
r9 = 0;
r10++;
r6 = var_28 * 3;
tile = GetTile(r10, var_2C);
if (tile->terrainType & TERRAIN_TYPE_SHOP) {
src = &dungeon->unk12BDA[r6];
}
else if (tile->terrainType & TERRAIN_TYPE_UNK_x1000) {
src = &dungeon->unk12BEC[r6];
}
else if (hallucinating) {
src = &dungeon->unk11884[tile->unk8][r6];
}
else
{
Entity *tileObject = tile->object;
if (tileObject != NULL) {
if (GetEntityType(tileObject) == ENTITY_TRAP && (tileObject->isVisible || unk1820F)) {
u8 trapType = tileObject->info->flags;
src = &dungeon->unk12A18[trapType][r6];
}
else {
src = &dungeon->unk11884[tile->unk8][r6];
}
}
else if (tile->terrainType & TERRAIN_TYPE_STAIRS) {
src = &dungeon->unk12A18[dungeon->unk3A12][r6];
}
else {
src = &dungeon->unk11884[tile->unk8][r6];
}
}
}
}
sub_80098F8(3);
}
void sub_804A728(Position *pos, s32 a1, u8 a2, u8 a3)
{
Position spArray[6];
u16 *src;
s32 k;
Entity *leader;
s32 i, j;
s32 adjacentX, adjacentY;
s32 r5;
s32 r10;
s32 r9;
Position var_48;
s32 var_38, var_34;
s32 x, x2, y;
Dungeon *dungeon = gDungeon;
leader = GetLeader();
x = dungeon->unk181e8.cameraPixelPos.x >> 3;
x2 = x;
gDungeon->unk181e8.unk1821A = a3;
i = pos->x;
j = pos->y;
adjacentX = gAdjacentTileOffsets[a1].x;
adjacentY = gAdjacentTileOffsets[a1].y;
for (k = 0; k < 6; k++) {
spArray[k].x = i;
spArray[k].y = j;
i += adjacentX;
j += adjacentY;
}
var_38 = gUnknown_80F6A4A[30 + x2];
r10 = gUnknown_80F6C06[30 + x2];
for (i = 0; i < 31; i++) {
y = dungeon->unk181e8.cameraPixelPos.y >> 3;
var_34 = gUnknown_80F6A4A[30 + y];
r9 = gUnknown_80F6C06[30 + y];
r5 = var_38 + var_34 * 3;
var_48.x = r10;
var_48.y = r9;
if (a2 != 0) {
if (r10 == pos->x && r9 == pos->y) {
src = &dungeon->unk12B92[r5];
}
else {
src = &dungeon->unk13554[r5];
}
}
else if (!sub_807049C(leader, &var_48) && sub_8045AAC(leader, &var_48)) {
for (k = 0; k < 6; k++) {
if (spArray[k].x == r10 && spArray[k].y == r9)
break;
}
if (k == 6) {
if (gGameOptionsRef->gridEnable) {
src = &dungeon->unk12B80[r5];
}
else {
src = &dungeon->unk13554[r5];
}
}
else {
src = &dungeon->unk12B92[r5];
}
}
else {
src = &dungeon->unk13554[r5];
}
for (j = 0; j < 21; j++) {
x &= 0x1F;
y &= 0x1F;
gUnknown_202B038[2][y][x] = *src;
src += 3;
y++;
var_34++;
if (var_34 == 3) {
var_34 = 0;
r9++;
r5 = var_38;
var_48.x = r10;
var_48.y = r9;
if (a2 != 0) {
if (r10 == pos->x && r9 == pos->y) {
src = &dungeon->unk12B92[r5];
}
else {
src = &dungeon->unk13554[r5];
}
}
else if (!sub_807049C(leader, &var_48) && sub_8045AAC(leader, &var_48)) {
for (k = 0; k < 6; k++) {
if (spArray[k].x == r10 && spArray[k].y == r9)
break;
}
if (k == 6) {
if (gGameOptionsRef->gridEnable) {
src = &dungeon->unk12B80[r5];
}
else {
src = &dungeon->unk13554[r5];
}
}
else {
src = &dungeon->unk12B92[r5];
}
}
else {
src = &dungeon->unk13554[r5];
}
}
}
x++;
var_38++;
if (var_38 == 3) {
var_38 = 0;
r10++;
}
}
sub_80098F8(2);
}
void sub_804AA60(void)
{
s32 i;
s32 j;
for(i = 0; i < 0x20; i++)
{
for(j = 0; j < 0x20; j++)
{
gUnknown_202B038[2][i][j] = 0;
}
}
sub_80098F8(2);
gDungeon->unk181e8.unk1821A = 0;
}
void sub_804AAAC(void)
{
s32 x;
s32 y;
struct Tile *tile;
for(y = 0; y < DUNGEON_MAX_SIZE_Y; y++)
{
for(x = 0; x < DUNGEON_MAX_SIZE_X; x++)
{
tile = GetTileSafe(x,y);
tile->unk4 = 0;
}
}
}
void sub_804AAD4(void)
{
struct Tile *tile;
struct RoomData *room1;
struct RoomData *room2;
s32 roomIndex;
int x;
int y;
s32 maxRooms;
s32 index;
for(index = 0; index < MAX_ROOM_COUNT; index++)
{
gDungeon->roomData[index].unk0 = 0;
gDungeon->roomData[index].unk1 = 0;
gDungeon->roomData[index].bottomRightCornerX = 9999;
gDungeon->roomData[index].bottomRightCornerY = 9999;
gDungeon->roomData[index].topLeftCornerX = 0xd8f1;
gDungeon->roomData[index].topLeftCornerY = 0xd8f1;
}
maxRooms = 0;
for(y = 0; y < DUNGEON_MAX_SIZE_Y; y++)
{
for(x = 0; x < DUNGEON_MAX_SIZE_X; x++)
{
tile = GetTile(x,y);
roomIndex = tile->room;
if (roomIndex != CORRIDOR_ROOM) {
room1 = &gDungeon->roomData[roomIndex];
room1->unk0 = 1;
if (room1->bottomRightCornerX > x) {
room1->bottomRightCornerX = x;
}
if (room1->bottomRightCornerY > y) {
room1->bottomRightCornerY = y;
}
if (room1->topLeftCornerX < x + 1) {
room1->topLeftCornerX = x + 1;
}
if (room1->topLeftCornerY < y + 1) {
room1->topLeftCornerY = y + 1;
}
if (maxRooms < roomIndex) {
maxRooms = roomIndex;
}
}
}
}
for(index = 0; index < MAX_ROOM_COUNT; index++)
{
room2 = &gDungeon->roomData[index];
if(room2 ->unk0 != 0)
{
room2->unkC = (room2->bottomRightCornerX - 1) * 24;
room2->unk10 = (room2->bottomRightCornerY - 1) * 24;
room2->unk14 = (room2->topLeftCornerX + 1) * 24;
room2->unk18 = (room2->topLeftCornerY + 1) * 24;
}
}
gDungeon->unk104C0 = maxRooms + 1;
}
void sub_804AC20(Position *pos)
{
s32 y;
struct Tile *tile2;
struct Tile *tile;
s32 yMax;
u32 visibilityRange;
s32 xMin;
s32 x;
s32 xMax;
s32 yMin;
s32 roomIndex;
struct RoomData *room;
tile2 = GetTile(pos->x,pos->y);
roomIndex = tile2->room;
visibilityRange = gDungeon->unk181e8.visibilityRange;
if (!gDungeon->unk181e8.blinded) {
if (visibilityRange == 0) {
visibilityRange = 2;
}
if (roomIndex == CORRIDOR_ROOM) {
xMin = pos->x - visibilityRange;
yMin = pos->y - visibilityRange;
xMax = pos->x + visibilityRange;
yMax = pos->y + visibilityRange;
}
else {
room = &gDungeon->roomData[roomIndex];
if (room->unk1 != 0) {
return;
}
room->unk1 = 1;
xMin = room->bottomRightCornerX - 1;
yMin = room->bottomRightCornerY - 1;
xMax = room->topLeftCornerX;
yMax = room->topLeftCornerY;
}
for (y = yMin; y <= yMax; y++) {
for (x = xMin; x <= xMax; x++) {
tile = GetTileSafe(x,y);
tile->unk4 = tile->unk4 | 3;
sub_80402AC(x,y);
}
}
}
}

154
src/dungeon_map_access_1.c
View File

@@ -1,154 +0,0 @@
#include "global.h"
#include "code_8009804.h"
#include "dungeon_engine.h"
#include "structs/str_dungeon.h"
#include "dungeon_map_access.h"
#include "file_system.h"
#include "random.h"
#include "text1.h"
#include "tile_types.h"
extern void sub_80402AC(s32, s32);
void sub_804AA60(void) {
s32 i;
s32 j;
for(i = 0; i < 0x20; i++)
{
for(j = 0; j < 0x20; j++)
{
gUnknown_202B038[2][i][j] = 0;
}
}
sub_80098F8(2);
gDungeon->unk181e8.unk1821A = 0;
}
void sub_804AAAC(void)
{
s32 x;
s32 y;
struct Tile *tile;
for(y = 0; y < DUNGEON_MAX_SIZE_Y; y++)
{
for(x = 0; x < DUNGEON_MAX_SIZE_X; x++)
{
tile = GetTileSafe(x,y);
tile->unk4 = 0;
}
}
}
void sub_804AAD4(void)
{
struct Tile *tile;
struct RoomData *room1;
struct RoomData *room2;
s32 roomIndex;
int x;
int y;
s32 maxRooms;
s32 index;
for(index = 0; index < MAX_ROOM_COUNT; index++)
{
gDungeon->roomData[index].unk0 = 0;
gDungeon->roomData[index].unk1 = 0;
gDungeon->roomData[index].bottomRightCornerX = 9999;
gDungeon->roomData[index].bottomRightCornerY = 9999;
gDungeon->roomData[index].topLeftCornerX = 0xd8f1;
gDungeon->roomData[index].topLeftCornerY = 0xd8f1;
}
maxRooms = 0;
for(y = 0; y < DUNGEON_MAX_SIZE_Y; y++)
{
for(x = 0; x < DUNGEON_MAX_SIZE_X; x++)
{
tile = GetTile(x,y);
roomIndex = tile->room;
if (roomIndex != CORRIDOR_ROOM) {
room1 = &gDungeon->roomData[roomIndex];
room1->unk0 = 1;
if (room1->bottomRightCornerX > x) {
room1->bottomRightCornerX = x;
}
if (room1->bottomRightCornerY > y) {
room1->bottomRightCornerY = y;
}
if (room1->topLeftCornerX < x + 1) {
room1->topLeftCornerX = x + 1;
}
if (room1->topLeftCornerY < y + 1) {
room1->topLeftCornerY = y + 1;
}
if (maxRooms < roomIndex) {
maxRooms = roomIndex;
}
}
}
}
for(index = 0; index < MAX_ROOM_COUNT; index++)
{
room2 = &gDungeon->roomData[index];
if(room2 ->unk0 != 0)
{
room2->unkC = (room2->bottomRightCornerX - 1) * 24;
room2->unk10 = (room2->bottomRightCornerY - 1) * 24;
room2->unk14 = (room2->topLeftCornerX + 1) * 24;
room2->unk18 = (room2->topLeftCornerY + 1) * 24;
}
}
gDungeon->unk104C0 = maxRooms + 1;
}
void sub_804AC20(Position *pos)
{
s32 y;
struct Tile *tile2;
struct Tile *tile;
s32 yMax;
u32 visibilityRange;
s32 xMin;
s32 x;
s32 xMax;
s32 yMin;
s32 roomIndex;
struct RoomData *room;
tile2 = GetTile(pos->x,pos->y);
roomIndex = tile2->room;
visibilityRange = gDungeon->unk181e8.visibilityRange;
if (!gDungeon->unk181e8.blinded) {
if (visibilityRange == 0) {
visibilityRange = 2;
}
if (roomIndex == CORRIDOR_ROOM) {
xMin = pos->x - visibilityRange;
yMin = pos->y - visibilityRange;
xMax = pos->x + visibilityRange;
yMax = pos->y + visibilityRange;
}
else {
room = &gDungeon->roomData[roomIndex];
if (room->unk1 != 0) {
return;
}
room->unk1 = 1;
xMin = room->bottomRightCornerX - 1;
yMin = room->bottomRightCornerY - 1;
xMax = room->topLeftCornerX;
yMax = room->topLeftCornerY;
}
for (y = yMin; y <= yMax; y++) {
for (x = xMin; x <= xMax; x++) {
tile = GetTileSafe(x,y);
tile->unk4 = tile->unk4 | 3;
sub_80402AC(x,y);
}
}
}
}