Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-26 22:40:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up related Tile stuff

Browse Source
This commit is contained in:
Mateon1 2024-11-16 19:29:02 +01:00
parent 8103f5e693
commit a9ff59b103
No known key found for this signature in database
GPG Key ID: 6A6067123E4CAF6E
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/data_80F59C8.s
View File

@ -522,14 +522,14 @@ gUnknown_80F69A8: @ 80F69A8
.byte 0x69, 0x72, 0x30, 0x00, 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00, 0x70, 0x6b, 0x73, 0x64
.byte 0x69, 0x72, 0x30, 0x00, 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
.global gUnknown_80F69D4
gUnknown_80F69D4: @ 80F69D4
.global gOtherOobTile
gOtherOobTile: @ 80F69D4
@ replacing .incbin "baserom.gba", 0xF69D4, 0x18
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global gUnknown_80F69EC
gUnknown_80F69EC: @ 80F69EC
.global gWaterOobTile
gWaterOobTile: @ 80F69EC
@ replacing .incbin "baserom.gba", 0xF69EC, 0x18
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

5
include/dungeon_map_access.h
View File

@ -3,11 +3,6 @@
#include "structs/map.h"
typedef struct unkStruct_202F190
{
Tile *unk0[6];
} unkStruct_202F190;
const Tile *GetTile(s32 x, s32 y);
Tile *GetTileMut(s32 x, s32 y);

18
src/dungeon_map_access.c
View File

@ -16,8 +16,8 @@
#include "game_options.h"
#include "dungeon_visibility.h"
extern const unkStruct_202F190 gUnknown_80F69D4;
extern const unkStruct_202F190 gUnknown_80F69EC;
extern const Tile gOtherOobTile;
extern const Tile gWaterOobTile;
extern u8 gUnknown_80F6A04[];
extern u8 gUnknown_80F6A10[];
extern u8 gUnknown_80F6A28[];
@ -32,9 +32,9 @@ extern const s16 gUnknown_80F6C06[];
EWRAM_DATA OpenedFile *gDungeonPaletteFile = {0};
EWRAM_DATA unkStruct_202EE8C gUnknown_202EE8C[32] = {0};
EWRAM_DATA OpenedFile *gUnknown_202F18C = {0};
EWRAM_DATA unkStruct_202F190 gOutOfBoundsTileData = {0};
EWRAM_DATA Tile gOutOfBoundsTileData = {0};
EWRAM_DATA_2 const unkStruct_202F190 *gUnknown_203B430 = {0};
EWRAM_DATA_2 const Tile *gCurTilesetOobTile = {0};
extern u8 sub_8043CE4(u32);
extern void sub_80402AC(s32, s32);
@ -48,15 +48,15 @@ const Tile *GetTile(s32 x, s32 y)
{
return gDungeon->tilePointers[y][x];
}
return (Tile *) gUnknown_203B430->unk0;
return gCurTilesetOobTile;
}
Tile *GetTileMut(s32 x, s32 y)
{
if (x < 0 || y < 0 || x >= DUNGEON_MAX_SIZE_X || y >= DUNGEON_MAX_SIZE_Y)
{
Tile *tile = (Tile *) gOutOfBoundsTileData.unk0;
gOutOfBoundsTileData = *gUnknown_203B430;
Tile *tile = &gOutOfBoundsTileData;
gOutOfBoundsTileData = *gCurTilesetOobTile;
return tile;
}
return gDungeon->tilePointers[y][x];
@ -139,10 +139,10 @@ void sub_8049820(void)
void sub_8049840(void)
{
if (sub_8043CE4(gDungeon->tileset) != 0) {
gUnknown_203B430 = &gUnknown_80F69EC;
gCurTilesetOobTile = &gWaterOobTile;
}
else {
gUnknown_203B430 = &gUnknown_80F69D4;
gCurTilesetOobTile = &gOtherOobTile;
}
}