From 8c6ae625aef6d07741cd8925f422f43ae24b198c Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Fri, 21 Feb 2025 16:03:51 -0800 Subject: Ultralib Update (#233) * git subrepo pull (merge) lib/ultralib subrepo: subdir: "lib/ultralib" merged: "74f0eee" upstream: origin: "git@github.com:decompals/ultralib.git" branch: "main" commit: "2717d45" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93" * New ultralib fixes * Update some includes in tools * git subrepo commit (merge) lib/ultralib subrepo: subdir: "lib/ultralib" merged: "3a702eaf" upstream: origin: "git@github.com:decompals/ultralib.git" branch: "main" commit: "48f9f908" git-subrepo: version: "0.4.9" origin: "git@github.com:ingydotnet/git-subrepo.git" commit: "ea10886" * Update warnings file --- src/code/lbrtc/7220C0.c | 4 ++-- src/code/lbrtc/722570.c | 4 ++-- src/code/lbrtc/722AB0.c | 4 ++-- src/code/m_demo.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/code') diff --git a/src/code/lbrtc/7220C0.c b/src/code/lbrtc/7220C0.c index efbf300..9a7887c 100644 --- a/src/code/lbrtc/7220C0.c +++ b/src/code/lbrtc/7220C0.c @@ -1,6 +1,6 @@ #include "lbrtc.h" -#include "lib/ultralib/src/io/siint.h" -#include "lib/ultralib/src/io/controller.h" +#include "PRinternal/siint.h" +#include "PRinternal/controller.h" s32 func_800FE420_jp(OSMesgQueue* mq, OSRTCTime* time) { u8 status; diff --git a/src/code/lbrtc/722570.c b/src/code/lbrtc/722570.c index 010815d..2af92d3 100644 --- a/src/code/lbrtc/722570.c +++ b/src/code/lbrtc/722570.c @@ -1,6 +1,6 @@ #include "lbrtc.h" -#include "lib/ultralib/src/io/siint.h" -#include "lib/ultralib/src/io/controller.h" +#include "PRinternal/siint.h" +#include "PRinternal/controller.h" OSTimer __contRTCTimer; OSMesgQueue __contRTCMesgQ; diff --git a/src/code/lbrtc/722AB0.c b/src/code/lbrtc/722AB0.c index 0c1ed89..9199271 100644 --- a/src/code/lbrtc/722AB0.c +++ b/src/code/lbrtc/722AB0.c @@ -1,7 +1,7 @@ #include "lbrtc.h" #include "lb_rtc.h" -#include "lib/ultralib/src/io/siint.h" -#include "lib/ultralib/src/io/controller.h" +#include "PRinternal/siint.h" +#include "PRinternal/controller.h" u16 total_days_internal[2][lbRTC_MONTHS_MAX + 1] = { // Standard year diff --git a/src/code/m_demo.c b/src/code/m_demo.c index a317b24..97e5309 100644 --- a/src/code/m_demo.c +++ b/src/code/m_demo.c @@ -3,7 +3,7 @@ #include "overlays/actors/player_actor/m_player.h" #include "m_msg_main.h" #include "m_player_lib.h" -#include "lib/ultralib/include/ido/memory.h" +#include "memory.h" #include "libc/math.h" #include "m_field_info.h" #include "audio.h" -- cgit v1.2.3