summaryrefslogtreecommitdiff
path: root/soh/src/code/z_construct.c
diff options
context:
space:
mode:
authorlouist103 <35883445+louist103@users.noreply.github.com>2023-06-27 19:53:35 -0400
committerGitHub <noreply@github.com>2023-06-27 19:53:35 -0400
commitacfc04d0acdfc83f4dce326844779195bfc51197 (patch)
tree60d25ea9d39667d6e634471123bdc3928c1320a6 /soh/src/code/z_construct.c
parent7c5efb278582a7b438f58a804dd38c6795c8e0c9 (diff)
Add an error for implicit functions (#3017)
* Add the flag and fix errors * switch assert and skin matrix * new LUS * Use normal assert * hopefully fix WiiU Signed-off-by: Louis <louist103@pop-os.localdomain> --------- Signed-off-by: Louis <louist103@pop-os.localdomain> Co-authored-by: Louis <louist103@pop-os.localdomain> Co-authored-by: Christopher Leggett <chris@leggett.dev>
Diffstat (limited to 'soh/src/code/z_construct.c')
-rw-r--r--soh/src/code/z_construct.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/soh/src/code/z_construct.c b/soh/src/code/z_construct.c
index 1aae3fcf8..b95902cc5 100644
--- a/soh/src/code/z_construct.c
+++ b/soh/src/code/z_construct.c
@@ -1,5 +1,6 @@
#include "global.h"
#include <textures/do_action_static/do_action_static.h>
+#include <assert.h>
void func_80110990(PlayState* play) {
Map_Destroy(play);
@@ -37,7 +38,7 @@ void func_801109B0(PlayState* play) {
osSyncPrintf("parameter->parameterSegment=%x\n", interfaceCtx->parameterSegment);
- ASSERT(interfaceCtx->parameterSegment != NULL);
+ assert(interfaceCtx->parameterSegment != NULL);
DmaMgr_SendRequest1(interfaceCtx->parameterSegment, (uintptr_t)_parameter_staticSegmentRomStart, parameterSize,
__FILE__, 162);
@@ -46,7 +47,7 @@ void func_801109B0(PlayState* play) {
osSyncPrintf("DOアクション テクスチャ初期=%x\n", 0x480); // "DO Action Texture Initialization"
osSyncPrintf("parameter->do_actionSegment=%x\n", interfaceCtx->doActionSegment);
- ASSERT(interfaceCtx->doActionSegment != NULL);
+ assert(interfaceCtx->doActionSegment != NULL);
interfaceCtx->doActionSegment[0] = gAttackDoActionENGTex;
interfaceCtx->doActionSegment[1] = gCheckDoActionENGTex;
@@ -59,7 +60,7 @@ void func_801109B0(PlayState* play) {
osSyncPrintf("アイコンアイテム テクスチャ初期=%x\n", 0x4000);
osSyncPrintf("parameter->icon_itemSegment=%x\n", interfaceCtx->iconItemSegment);
- ASSERT(interfaceCtx->iconItemSegment != NULL);
+ assert(interfaceCtx->iconItemSegment != NULL);
osSyncPrintf("Register_Item[%x, %x, %x, %x]\n", gSaveContext.equips.buttonItems[0],
gSaveContext.equips.buttonItems[1], gSaveContext.equips.buttonItems[2],
@@ -154,7 +155,7 @@ void Message_Init(PlayState* play) {
osSyncPrintf("message->fukidashiSegment=%x\n", msgCtx->textboxSegment);
osSyncPrintf("吹き出しgame_alloc=%x\n", 0x2200); // "Textbox game_alloc=%x"
- ASSERT(msgCtx->textboxSegment != NULL);
+ assert(msgCtx->textboxSegment != NULL);
Font_LoadOrderedFont(&play->msgCtx.font);