nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Bump LUS version (#2849)

Browse Source 
* Bump LUS version

* Removes the "now" boolean from the LUS resource bridge functions.

* Bump LUS

* More LUS bump

* Update soh/soh/resource/importer/AudioSampleFactory.cpp

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
This commit is contained in:
Kenix3
2023-05-07 20:18:54 -04:00
committed by GitHub
parent f31a841789
commit 91bd693ff6
59 changed files with 233 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
soh/src/code/main.c
View File

@@ -4,6 +4,7 @@
#include "global.h"
#include "vt.h"
#include "stdio.h"
#include <soh/Enhancements/bootcommands.h>
#include "soh/OTRGlobals.h"

5
soh/src/code/z_map_exp.c
View File

@@ -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];

4
soh/src/code/z_player_lib.c
View File

@@ -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) {

2
soh/src/code/z_room.c
View File

@@ -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;
}