diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-11-01 20:07:38 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-02 10:07:38 +1100 |
| commit | f276d2b0e618f7fc95a35b629161561489203f39 (patch) | |
| tree | bde1366107e427c1b6b5cf32db2eb7912a0d7bb0 /src/code/z_parameter.c | |
| parent | 42e1c438e1e78e3a298c71734cb7e699a990c94c (diff) | |
Enable `-Wint-conversion` warning (#1266)
* fixing some warnings
* more pointer fixing
* Use `-Wno-int-conversion` on audio files
* more progress
* fix
* more pointer fixes
* kinda progress
* Fix remaining casts
* Format
* fix merge
* fix warnings
* fix parameter
* use SEGMENT_ROM_START_OFFSET a bit more
* format
* fix audio warnings
* some more fixes
* fix en_go
* review
* review
* whoops, missing cast
* review
* review
* ->data
* format
* review
* fix
* asPtr
* fix
* Update src/code/sched.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
* fix in EnDnh
* improve format
* engo
* format
* fix
* format
* Update include/z64.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* TexturePtr
* fix warnings
* fix warnings
* format
* fix
* review
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index cbfcd0481..898de0b41 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -916,8 +916,8 @@ void Interface_NewDay(PlayState* play, s32 day) { } // Loads day number from week_static for the three-day clock - DmaMgr_SendRequest0((u32)play->interfaceCtx.doActionSegment + 0x780, - (u32)SEGMENT_ROM_START(week_static) + i * 0x510, 0x510); + DmaMgr_SendRequest0((void*)(play->interfaceCtx.doActionSegment + 0x780), + SEGMENT_ROM_START_OFFSET(week_static, i * 0x510), 0x510); // i is used to store sceneId for (i = 0; i < ARRAY_COUNT(gSaveContext.save.saveInfo.permanentSceneFlags); i++) { @@ -7121,7 +7121,8 @@ void Interface_Init(PlayState* play) { interfaceCtx->doActionSegment = THA_AllocTailAlign16(&play->state.tha, 0xC90); DmaMgr_SendRequest0(interfaceCtx->doActionSegment, SEGMENT_ROM_START(do_action_static), 0x300); - DmaMgr_SendRequest0(interfaceCtx->doActionSegment + 0x300, SEGMENT_ROM_START(do_action_static) + 0x480, 0x180); + DmaMgr_SendRequest0(interfaceCtx->doActionSegment + 0x300, SEGMENT_ROM_START_OFFSET(do_action_static, 0x480), + 0x180); Interface_NewDay(play, CURRENT_DAY); |