Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-01-18 19:13:12 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

map_header: MapHeader_IsBuilding -> MapHeader_IsInBuilding

Browse Source
This commit is contained in:
tgsm 2024-12-29 13:59:27 -06:00
parent 966de81263
commit 802bad769f
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_01_021E90C0.inc
View File

@ -22,7 +22,7 @@
.public Camera_AdjustPerspectiveAngle
.public Camera_GetPerspectiveAngle
.public GF_AssertFail
.public MapHeader_IsBuilding
.public MapHeader_IsInBuilding
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnvironment

2
asm/overlay_01_021E90C0.s
View File

@ -2181,7 +2181,7 @@ ov01_021EA1F4: ; 0x021EA1F4
ldr r0, [r0, #0x20]
add r4, r1, #0
ldr r0, [r0]
bl MapHeader_IsBuilding
bl MapHeader_IsInBuilding
cmp r0, #0
beq _021EA214
cmp r4, #0x3f

2
include/map_header.h
View File

@ -81,7 +81,7 @@ void MapHeader_GetWorldMapCoords(u32 mapId, s16 *x, s16 *y);
BOOL MapHeader_IsTeleportAllowed(u32 mapId);
BOOL MapHeader_MapIsOnMainMatrix(u32 mapId);
BOOL MapHeader_IsCave(u32 mapId);
BOOL MapHeader_IsBuilding(u32 mapId);
BOOL MapHeader_IsInBuilding(u32 mapId);
BOOL MapHeader_IsOutdoors(u32 mapId);
BOOL MapHeader_MapIsUnionRoom(u32 mapId);
BOOL MapHeader_MapIsAmitySquare(u32 mapId);

2
src/field/draw_map_name.c
View File

@ -188,7 +188,7 @@ void FieldDrawMapName_Reset(FieldDrawMapNameInfo *info) {
}
void FieldSystem_DrawMapNameAnimation(FieldSystem *fieldSystem) {
if (MapHeader_GetAreaIcon(fieldSystem->location->mapId) == 0 || MapHeader_IsBuilding(fieldSystem->location->mapId)) {
if (MapHeader_GetAreaIcon(fieldSystem->location->mapId) == 0 || MapHeader_IsInBuilding(fieldSystem->location->mapId)) {
return;
}

2
src/map_header.c
View File

@ -208,7 +208,7 @@ BOOL MapHeader_IsCave(u32 mapId) {
return MapHeader_GetMapType(mapId) == MAP_TYPE_CAVE;
}
BOOL MapHeader_IsBuilding(u32 mapId) {
BOOL MapHeader_IsInBuilding(u32 mapId) {
return MapHeader_GetMapType(mapId) == MAP_TYPE_INTERIOR || MapHeader_GetMapType(mapId) == MAP_TYPE_POKEMON_CENTER;
}

8
src/unk_02055BF0.c
View File

@ -103,7 +103,7 @@ void sub_02055CD8(FieldSystem *fieldSystem, int mapID, int warpID, int x, int y,
} else {
if (MapHeader_IsOutdoors(mapID)) {
var = 5;
} else if (MapHeader_IsBuilding(mapID)) {
} else if (MapHeader_IsInBuilding(mapID)) {
var = 6;
} else {
GF_ASSERT(FALSE);
@ -113,14 +113,14 @@ void sub_02055CD8(FieldSystem *fieldSystem, int mapID, int warpID, int x, int y,
if (MapHeader_IsOutdoors(otherID)) {
if (MapHeader_IsCave(mapID)) {
var = 4;
} else if (MapHeader_IsBuilding(mapID)) {
} else if (MapHeader_IsInBuilding(mapID)) {
var = 6;
} else {
GF_ASSERT(FALSE);
}
} else if (MapHeader_IsBuilding(otherID)) {
} else if (MapHeader_IsInBuilding(otherID)) {
if (!MapHeader_IsOutdoors(mapID)) {
if (MapHeader_IsBuilding(mapID)) {
if (MapHeader_IsInBuilding(mapID)) {
var = 6;
} else if (!MapHeader_IsCave(mapID)) {
GF_ASSERT(FALSE);