diff options
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/main.c | 1 | ||||
| -rw-r--r-- | soh/src/code/z_map_exp.c | 5 | ||||
| -rw-r--r-- | soh/src/code/z_player_lib.c | 4 | ||||
| -rw-r--r-- | soh/src/code/z_room.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/soh/src/code/main.c b/soh/src/code/main.c index 7ecff0b63..b59a825c1 100644 --- a/soh/src/code/main.c +++ b/soh/src/code/main.c @@ -4,6 +4,7 @@ #include "global.h" #include "vt.h" +#include "stdio.h" #include <soh/Enhancements/bootcommands.h> #include "soh/OTRGlobals.h" diff --git a/soh/src/code/z_map_exp.c b/soh/src/code/z_map_exp.c index af1c1784d..0c267af62 100644 --- a/soh/src/code/z_map_exp.c +++ b/soh/src/code/z_map_exp.c @@ -413,7 +413,7 @@ void Map_InitData(PlayState* play, s16 room) { //gMapData->owMinimapTexSize[mapIndex], __FILE__, __LINE__); if (sEntranceIconMapIndex < 24) { - play->interfaceCtx.mapSegment[0] = GetResourceDataByName(minimapTableOW[sEntranceIconMapIndex], true); + play->interfaceCtx.mapSegment[0] = GetResourceDataByName(minimapTableOW[sEntranceIconMapIndex]); play->interfaceCtx.mapSegmentName[0] = minimapTableOW[sEntranceIconMapIndex]; } @@ -447,7 +447,8 @@ void Map_InitData(PlayState* play, s16 room) { //((gMapData->dgnMinimapTexIndexOffset[mapIndex] + room) * 0xFF0), //0xFF0, __FILE__, __LINE__); - play->interfaceCtx.mapSegment[0] = GetResourceDataByName(minimapTableDangeon[gMapData->dgnMinimapTexIndexOffset[mapIndex] + room], true); + play->interfaceCtx.mapSegment[0] = GetResourceDataByName( + minimapTableDangeon[gMapData->dgnMinimapTexIndexOffset[mapIndex] + room]); play->interfaceCtx.mapSegmentName[0] = minimapTableDangeon[gMapData->dgnMinimapTexIndexOffset[mapIndex] + room]; R_COMPASS_OFFSET_X = gMapData->roomCompassOffsetX[mapIndex][room]; R_COMPASS_OFFSET_Y = gMapData->roomCompassOffsetY[mapIndex][room]; diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 01d5e0409..d556fcc30 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -332,8 +332,8 @@ void Player_SetBootData(PlayState* play, Player* this) { // Custom method used to determine if we're using a custom model for link uint8_t Player_IsCustomLinkModel() { - return (LINK_IS_ADULT && GetResourceIsCustomByName(gLinkAdultSkel, true)) || - (LINK_IS_CHILD && GetResourceIsCustomByName(gLinkChildSkel, true)); + return (LINK_IS_ADULT && GetResourceIsCustomByName(gLinkAdultSkel)) || + (LINK_IS_CHILD && GetResourceIsCustomByName(gLinkChildSkel)); } s32 Player_InBlockingCsMode(PlayState* play, Player* this) { diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c index f30bb5b03..3d5acfe40 100644 --- a/soh/src/code/z_room.c +++ b/soh/src/code/z_room.c @@ -273,7 +273,7 @@ void func_8009638C(Gfx** displayList, void* source, void* tlut, u16 width, u16 h bg->b.imageFlip = 0; if (ResourceMgr_ResourceIsBackground((char*) source)) { - char* blob = (char*) GetResourceDataByName((char*) source, true); + char* blob = (char*) GetResourceDataByName((char *) source); swapAndConvertJPEG(blob); bg->b.imagePtr = (uintptr_t) blob; } |