izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update Parameter_Static

Browse Source
This commit is contained in:
engineer124
2021-12-27 23:52:50 +11:00
parent 91b27a606c
commit f956c25aa9
3 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/misc/parameter_static.xml → assets/xml/interface/parameter_static.xml
+37 -34
View File
@@ -20,7 +20,7 @@
<Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32" Offset="0x1760"/>
<Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32" Offset="0x1B60"/>
<Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32" Offset="0x1F60"/>
<Texture Name="gClockIconTex" OutName="clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2360"/>
<Texture Name="gTimerClockIconTex" OutName="timer_clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2360"/>
<Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2460"/>
<Texture Name="gOcarinaATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x24A0"/>
@@ -32,6 +32,7 @@
<Texture Name="gSceneTitleCardGradientTex" OutName="scene_title_card_gradient" Format="i8" Width="64" Height="1" Offset="0x2AA0"/>
<!-- All four versions of Tatl textures are identical -->
<Texture Name="gTatlCUpENGTex" OutName="tatl_c_up_eng" Format="ia4" Width="32" Height="12" Offset="0x2AE0"/>
<Texture Name="gTatlCUpGERTex" OutName="tatl_c_up_ger" Format="ia4" Width="32" Height="12" Offset="0x2BA0"/>
<Texture Name="gTatlCUpFRATex" OutName="tatl_c_up_fra" Format="ia4" Width="32" Height="12" Offset="0x2C60"/>
@@ -43,6 +44,8 @@
<Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgba16" Width="8" Height="8" Offset="0x3EA0"/>
<Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x3F20"/>
<Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x3FA0"/>
<!-- Looking through the lens of the pictograph box -->
<Texture Name="gPictoBoxFocusIconTex" OutName="picto_box_focus_icon" Format="i4" Width="32" Height="16" Offset="0x42A0"/>
<Texture Name="gPictoBoxFocusBorderTex" OutName="picto_box_focus_border" Format="ia4" Width="16" Height="16" Offset="0x43A0"/>
<Texture Name="gPictoBoxFocusTextTex" OutName="picto_box_focus_text" Format="i4" Width="32" Height="8" Offset="0x4420"/>
@@ -76,41 +79,41 @@
<Texture Name="gMagicBarMidTex" OutName="magic_bar_mid" Format="ia8" Width="24" Height="16" Offset="0x4E20"/>
<Texture Name="gMagicBarFillTex" OutName="magic_bar_fill" Format="ia8" Width="8" Height="8" Offset="0x4FA0"/>
<Texture Name="gThreeDayTimerDiamondTex" OutName="three_day_timer_diamond" Format="ia8" Width="40" Height="32" Offset="0x4FE0"/>
<Texture Name="gThreeDayTimerMoonHourTex" OutName="three_day_timer_moon_hour" Format="ia8" Width="24" Height="24" Offset="0x54E0"/>
<Texture Name="gThreeDayTimerSunHourTex" OutName="three_day_timer_sun_hour" Format="ia8" Width="24" Height="24" Offset="0x5720"/>
<!-- May be Height="48" vs. Height="50" -->
<Texture Name="gThreeDayTimerDialBoarderTex" OutName="three_day_timer_dial_boarder" Format="i4" Width="64" Height="48" Offset="0x5960"/>
<Texture Name="gThreeDayTimerHourLinesTex" OutName="three_day_timer_hour_lines" Format="i4" Width="64" Height="35" Offset="0x5F60"/>
<Texture Name="gThreeDayTimerStarMinuteTex" OutName="three_day_timer_star_minute" Format="i4" Width="16" Height="16" Offset="0x63C0"/>
<Texture Name="gThreeDayTimerHour12Tex" OutName="three_day_timer_hour_12" Format="i4" Width="16" Height="11" Offset="0x6440"/>
<Texture Name="gThreeDayTimerHour1Tex" OutName="three_day_timer_hour_1" Format="i4" Width="16" Height="11" Offset="0x6498"/>
<Texture Name="gThreeDayTimerHour2Tex" OutName="three_day_timer_hour_2" Format="i4" Width="16" Height="11" Offset="0x64F0"/>
<Texture Name="gThreeDayTimerHour3Tex" OutName="three_day_timer_hour_3" Format="i4" Width="16" Height="11" Offset="0x6548"/>
<Texture Name="gThreeDayTimerHour4Tex" OutName="three_day_timer_hour_4" Format="i4" Width="16" Height="11" Offset="0x65A0"/>
<Texture Name="gThreeDayTimerHour5Tex" OutName="three_day_timer_hour_5" Format="i4" Width="16" Height="11" Offset="0x65F8"/>
<Texture Name="gThreeDayTimerHour6Tex" OutName="three_day_timer_hour_6" Format="i4" Width="16" Height="11" Offset="0x6650"/>
<Texture Name="gThreeDayTimerHour7Tex" OutName="three_day_timer_hour_7" Format="i4" Width="16" Height="11" Offset="0x66A8"/>
<Texture Name="gThreeDayTimerHour8Tex" OutName="three_day_timer_hour_8" Format="i4" Width="16" Height="11" Offset="0x6700"/>
<Texture Name="gThreeDayTimerHour9Tex" OutName="three_day_timer_hour_9" Format="i4" Width="16" Height="11" Offset="0x6758"/>
<Texture Name="gThreeDayTimerHour10Tex" OutName="three_day_timer_hour_10" Format="i4" Width="16" Height="11" Offset="0x67B0"/>
<Texture Name="gThreeDayTimerHour11Tex" OutName="three_day_timer_hour_11" Format="i4" Width="16" Height="11" Offset="0x6808"/>
<!-- The analog clock from day one until midnight of the final day -->
<Texture Name="gThreeDayClockDiamondTex" OutName="three_day_clock_diamond" Format="ia8" Width="40" Height="32" Offset="0x4FE0"/>
<Texture Name="gThreeDayClockMoonHourTex" OutName="three_day_clock_moon_hour" Format="ia8" Width="24" Height="24" Offset="0x54E0"/>
<Texture Name="gThreeDayClockSunHourTex" OutName="three_day_clock_sun_hour" Format="ia8" Width="24" Height="24" Offset="0x5720"/>
<Texture Name="gThreeDayClockBorderTex" OutName="three_day_clock_border" Format="i4" Width="64" Height="48" Offset="0x5960"/>
<Texture Name="gThreeDayClockHourLinesTex" OutName="three_day_clock_hour_lines" Format="i4" Width="64" Height="35" Offset="0x5F60"/>
<Texture Name="gThreeDayClockStarMinuteTex" OutName="three_day_clock_star_minute" Format="i4" Width="16" Height="16" Offset="0x63C0"/>
<Texture Name="gThreeDayClockHour12Tex" OutName="three_day_clock_hour_12" Format="i4" Width="16" Height="11" Offset="0x6440"/>
<Texture Name="gThreeDayClockHour1Tex" OutName="three_day_clock_hour_1" Format="i4" Width="16" Height="11" Offset="0x6498"/>
<Texture Name="gThreeDayClockHour2Tex" OutName="three_day_clock_hour_2" Format="i4" Width="16" Height="11" Offset="0x64F0"/>
<Texture Name="gThreeDayClockHour3Tex" OutName="three_day_clock_hour_3" Format="i4" Width="16" Height="11" Offset="0x6548"/>
<Texture Name="gThreeDayClockHour4Tex" OutName="three_day_clock_hour_4" Format="i4" Width="16" Height="11" Offset="0x65A0"/>
<Texture Name="gThreeDayClockHour5Tex" OutName="three_day_clock_hour_5" Format="i4" Width="16" Height="11" Offset="0x65F8"/>
<Texture Name="gThreeDayClockHour6Tex" OutName="three_day_clock_hour_6" Format="i4" Width="16" Height="11" Offset="0x6650"/>
<Texture Name="gThreeDayClockHour7Tex" OutName="three_day_clock_hour_7" Format="i4" Width="16" Height="11" Offset="0x66A8"/>
<Texture Name="gThreeDayClockHour8Tex" OutName="three_day_clock_hour_8" Format="i4" Width="16" Height="11" Offset="0x6700"/>
<Texture Name="gThreeDayClockHour9Tex" OutName="three_day_clock_hour_9" Format="i4" Width="16" Height="11" Offset="0x6758"/>
<Texture Name="gThreeDayClockHour10Tex" OutName="three_day_clock_hour_10" Format="i4" Width="16" Height="11" Offset="0x67B0"/>
<Texture Name="gThreeDayClockHour11Tex" OutName="three_day_clock_hour_11" Format="i4" Width="16" Height="11" Offset="0x6808"/>
<!-- The timer until moon crash after midnight of the final day -->
<Texture Name="gFinalHoursTimerDigit0Tex" OutName="final_hours_timer_digit_0" Format="i8" Width="8" Height="8" Offset="0x6860"/>
<Texture Name="gFinalHoursTimerDigit1Tex" OutName="final_hours_timer_digit_1" Format="i8" Width="8" Height="8" Offset="0x68A0"/>
<Texture Name="gFinalHoursTimerDigit2Tex" OutName="final_hours_timer_digit_2" Format="i8" Width="8" Height="8" Offset="0x68E0"/>
<Texture Name="gFinalHoursTimerDigit3Tex" OutName="final_hours_timer_digit_3" Format="i8" Width="8" Height="8" Offset="0x6920"/>
<Texture Name="gFinalHoursTimerDigit4Tex" OutName="final_hours_timer_digit_4" Format="i8" Width="8" Height="8" Offset="0x6960"/>
<Texture Name="gFinalHoursTimerDigit5Tex" OutName="final_hours_timer_digit_5" Format="i8" Width="8" Height="8" Offset="0x69A0"/>
<Texture Name="gFinalHoursTimerDigit6Tex" OutName="final_hours_timer_digit_6" Format="i8" Width="8" Height="8" Offset="0x69E0"/>
<Texture Name="gFinalHoursTimerDigit7Tex" OutName="final_hours_timer_digit_7" Format="i8" Width="8" Height="8" Offset="0x6A20"/>
<Texture Name="gFinalHoursTimerDigit8Tex" OutName="final_hours_timer_digit_8" Format="i8" Width="8" Height="8" Offset="0x6A60"/>
<Texture Name="gFinalHoursTimerDigit9Tex" OutName="final_hours_timer_digit_9" Format="i8" Width="8" Height="8" Offset="0x6AA0"/>
<Texture Name="gFinalHoursTimerColonTex" OutName="final_hours_timer_colon" Format="i8" Width="8" Height="8" Offset="0x6AE0"/>
<Texture Name="gFinalHoursTimerFrameTex" OutName="final_hours_timer_frame" Format="ia4" Width="80" Height="13" Offset="0x6B20"/>
<!-- The digital clock until moon crash after midnight of the final day -->
<Texture Name="gFinalHoursClockDigit0Tex" OutName="final_hours_clock_digit_0" Format="i8" Width="8" Height="8" Offset="0x6860"/>
<Texture Name="gFinalHoursClockDigit1Tex" OutName="final_hours_clock_digit_1" Format="i8" Width="8" Height="8" Offset="0x68A0"/>
<Texture Name="gFinalHoursClockDigit2Tex" OutName="final_hours_clock_digit_2" Format="i8" Width="8" Height="8" Offset="0x68E0"/>
<Texture Name="gFinalHoursClockDigit3Tex" OutName="final_hours_clock_digit_3" Format="i8" Width="8" Height="8" Offset="0x6920"/>
<Texture Name="gFinalHoursClockDigit4Tex" OutName="final_hours_clock_digit_4" Format="i8" Width="8" Height="8" Offset="0x6960"/>
<Texture Name="gFinalHoursClockDigit5Tex" OutName="final_hours_clock_digit_5" Format="i8" Width="8" Height="8" Offset="0x69A0"/>
<Texture Name="gFinalHoursClockDigit6Tex" OutName="final_hours_clock_digit_6" Format="i8" Width="8" Height="8" Offset="0x69E0"/>
<Texture Name="gFinalHoursClockDigit7Tex" OutName="final_hours_clock_digit_7" Format="i8" Width="8" Height="8" Offset="0x6A20"/>
<Texture Name="gFinalHoursClockDigit8Tex" OutName="final_hours_clock_digit_8" Format="i8" Width="8" Height="8" Offset="0x6A60"/>
<Texture Name="gFinalHoursClockDigit9Tex" OutName="final_hours_clock_digit_9" Format="i8" Width="8" Height="8" Offset="0x6AA0"/>
<Texture Name="gFinalHoursClockColonTex" OutName="final_hours_clock_colon" Format="i8" Width="8" Height="8" Offset="0x6AE0"/>
<Texture Name="gFinalHoursClockFrameTex" OutName="final_hours_clock_frame" Format="ia4" Width="80" Height="13" Offset="0x6B20"/>
<Texture Name="gMinigameCountdownGoTex" OutName="minigame_go" Format="ia8" Width="40" Height="32" Offset="0x6D28"/>
<Texture Name="gMinigameCountdownGoTex" OutName="minigame_countdown_go" Format="ia8" Width="40" Height="32" Offset="0x6D28"/>
<Texture Name="gMinigameCountdown1Tex" OutName="minigame_countdown_1" Format="ia8" Width="24" Height="32" Offset="0x7228"/>
<Texture Name="gMinigameCountdown2Tex" OutName="minigame_countdown_2" Format="ia8" Width="24" Height="32" Offset="0x7528"/>
<Texture Name="gMinigameCountdown3Tex" OutName="minigame_countdown_3" Format="ia8" Width="24" Height="32" Offset="0x7828"/>
spec
+1 -1
View File
@@ -9313,7 +9313,7 @@ beginseg
name "parameter_static"
compress
romalign 0x1000
include "build/assets/misc/parameter_static/parameter_static.o"
include "build/assets/interface/parameter_static/parameter_static.o"
number 2
endseg
src/code/z_parameter.c
+27 -30
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "misc/parameter_static/parameter_static.h"
#include "interface/parameter_static/parameter_static.h"
void Map_Update(GlobalContext* globalCtx);
u8 func_800FE4A8();
@@ -1843,12 +1843,12 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
};
// threeDayTimerHourTexs
static TexturePtr D_801BFB6C[] = {
gThreeDayTimerHour12Tex, gThreeDayTimerHour1Tex, gThreeDayTimerHour2Tex, gThreeDayTimerHour3Tex,
gThreeDayTimerHour4Tex, gThreeDayTimerHour5Tex, gThreeDayTimerHour6Tex, gThreeDayTimerHour7Tex,
gThreeDayTimerHour8Tex, gThreeDayTimerHour9Tex, gThreeDayTimerHour10Tex, gThreeDayTimerHour11Tex,
gThreeDayTimerHour12Tex, gThreeDayTimerHour1Tex, gThreeDayTimerHour2Tex, gThreeDayTimerHour3Tex,
gThreeDayTimerHour4Tex, gThreeDayTimerHour5Tex, gThreeDayTimerHour6Tex, gThreeDayTimerHour7Tex,
gThreeDayTimerHour8Tex, gThreeDayTimerHour9Tex, gThreeDayTimerHour10Tex, gThreeDayTimerHour11Tex,
gThreeDayClockHour12Tex, gThreeDayClockHour1Tex, gThreeDayClockHour2Tex, gThreeDayClockHour3Tex,
gThreeDayClockHour4Tex, gThreeDayClockHour5Tex, gThreeDayClockHour6Tex, gThreeDayClockHour7Tex,
gThreeDayClockHour8Tex, gThreeDayClockHour9Tex, gThreeDayClockHour10Tex, gThreeDayClockHour11Tex,
gThreeDayClockHour12Tex, gThreeDayClockHour1Tex, gThreeDayClockHour2Tex, gThreeDayClockHour3Tex,
gThreeDayClockHour4Tex, gThreeDayClockHour5Tex, gThreeDayClockHour6Tex, gThreeDayClockHour7Tex,
gThreeDayClockHour8Tex, gThreeDayClockHour9Tex, gThreeDayClockHour10Tex, gThreeDayClockHour11Tex,
};
static s16 D_801BFBCC = 0; // clockInvDiamondPrimRed
static s16 D_801BFBD0 = 0; // clockInvDiamondPrimGreen
@@ -1870,9 +1870,9 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
static s16 D_801BFC10[] = { 100, 0 }; // finalHoursClockFrameEnvBlueTargets
// finalHoursCounterDigitTex
static TexturePtr D_801BFC14[] = {
gFinalHoursTimerDigit0Tex, gFinalHoursTimerDigit1Tex, gFinalHoursTimerDigit2Tex, gFinalHoursTimerDigit3Tex,
gFinalHoursTimerDigit4Tex, gFinalHoursTimerDigit5Tex, gFinalHoursTimerDigit6Tex, gFinalHoursTimerDigit7Tex,
gFinalHoursTimerDigit8Tex, gFinalHoursTimerDigit9Tex, gFinalHoursTimerColonTex,
gFinalHoursClockDigit0Tex, gFinalHoursClockDigit1Tex, gFinalHoursClockDigit2Tex, gFinalHoursClockDigit3Tex,
gFinalHoursClockDigit4Tex, gFinalHoursClockDigit5Tex, gFinalHoursClockDigit6Tex, gFinalHoursClockDigit7Tex,
gFinalHoursClockDigit8Tex, gFinalHoursClockDigit9Tex, gFinalHoursClockColonTex,
};
// finalHoursDigitSlotPosXOffset
static s16 D_801BFC40[] = {
@@ -1954,7 +1954,7 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0,
PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0);
OVERLAY_DISP = func_8010D9F4(OVERLAY_DISP, gThreeDayTimerHourLinesTex, 4, 64, 35, 96, 180,
OVERLAY_DISP = func_8010D9F4(OVERLAY_DISP, gThreeDayClockHourLinesTex, 4, 64, 35, 96, 180,
128, 35, 1, 6, 0, 1 << 10, 1 << 10);
/**
@@ -1969,7 +1969,7 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
//! resulting in this reading into the next texture. This results in a white
//! dot in the bottom center of the clock. For the three-day clock, this is
//! covered by the diamond. However, it can be seen by the final-hours clock.
OVERLAY_DISP = func_8010D9F4(OVERLAY_DISP, gThreeDayTimerDialBoarderTex, 4, 64, 50, 96, 168,
OVERLAY_DISP = func_8010D9F4(OVERLAY_DISP, gThreeDayClockDialBorderTex, 4, 64, 50, 96, 168,
128, 50, 1, 6, 0, 1 << 10, 1 << 10);
if (((CURRENT_DAY >= 4) || ((CURRENT_DAY == 3) && ((0, gSaveContext.save.time) >= 5) &&
@@ -2016,7 +2016,7 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 0, 170, 100, D_801BFB2C);
}
OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gThreeDayTimerDiamondTex, 40, 32, 140, 190,
OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gThreeDayClockDiamondTex, 40, 32, 140, 190,
40, 32, 1 << 10, 1 << 10);
/**
@@ -2048,7 +2048,6 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
}
sp1D0 = ((((0, gSaveContext.save.time)) * 1.3183594f) / 3600.0f) * 3600.0f;
sp1D0 = (s16)((0, gSaveContext.save.time) * 1.3183594f) - sp1D0;
func_8012C8D4(globalCtx->state.gfxCtx);
@@ -2072,7 +2071,7 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(OVERLAY_DISP++, &interfaceCtx->actionVtx[12], 4, 0);
gDPLoadTextureBlock_4b(OVERLAY_DISP++, gThreeDayTimerStarMinuteTex, G_IM_FMT_I, 16, 16,
gDPLoadTextureBlock_4b(OVERLAY_DISP++, gThreeDayClockStarMinuteTex, G_IM_FMT_I, 16, 16,
0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0);
@@ -2094,7 +2093,6 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
/**
* Draw Three-Day Clock's Sun for the Day-Time Hours Tracker
*/
time = gSaveContext.save.time;
sp1D8 = Math_SinS(time) * -40.0f;
temp_f14 = Math_CosS(time) * -34.0f;
@@ -2110,7 +2108,7 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(OVERLAY_DISP++, &interfaceCtx->actionVtx[16], 4, 0);
OVERLAY_DISP = func_8010DC58(OVERLAY_DISP, gThreeDayTimerSunHourTex, 24, 24, 0);
OVERLAY_DISP = func_8010DC58(OVERLAY_DISP, gThreeDayClockSunHourTex, 24, 24, 0);
/**
* Draw Three-Day Clock's Moon for the Night-Time Hours Tracker
@@ -2128,7 +2126,7 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(OVERLAY_DISP++, &interfaceCtx->actionVtx[20], 4, 0);
OVERLAY_DISP = func_8010DC58(OVERLAY_DISP, gThreeDayTimerMoonHourTex, 24, 24, 0);
OVERLAY_DISP = func_8010DC58(OVERLAY_DISP, gThreeDayClockMoonHourTex, 24, 24, 0);
/**
* Cuts off Three-Day Clock's Hour Digits when they dip below the clock
@@ -2139,9 +2137,9 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
/**
* Draws Three-Day Clock's Hour Digit Above the Sun
*/
// Rotates Three-Day Clock's Hour Digit To Above the Sun
sp1CC = gSaveContext.save.time * 0.000096131f;
// Rotates Three-Day Clock's Hour Digit To Above the Sun
Matrix_InsertTranslation(0.0f, XREG(43) / 10.0f, 0.0f, MTXMODE_NEW);
Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
Matrix_InsertZRotation_f(-(sp1CC - 3.15f), MTXMODE_APPLY);
@@ -2166,7 +2164,6 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
* Draws Three-Day Clock's Hour Digit Above the Moon
*/
// Rotates Three-Day Clock's Hour Digit To Above the Moon
Matrix_InsertTranslation(0.0f, XREG(43) / 10.0f, 0.0f, MTXMODE_NEW);
Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
Matrix_InsertZRotation_f(-sp1CC, MTXMODE_APPLY);
@@ -2242,7 +2239,7 @@ void Interface_DrawClock(GlobalContext* globalCtx) {
gDPSetEnvColor(OVERLAY_DISP++, sFinalHoursClockFrameEnvRed,
sFinalHoursClockFrameEnvGreen, sFinalHoursClockFrameEnvBlue, 0);
OVERLAY_DISP = func_8010D9F4(OVERLAY_DISP, gFinalHoursTimerFrameTex, 3, 80, 13, 119,
OVERLAY_DISP = func_8010D9F4(OVERLAY_DISP, gFinalHoursClockFrameTex, 3, 80, 13, 119,
202, 80, 13, 0, 0, 0, 1 << 10, 1 << 10);
temp_a1_7 =
@@ -2317,12 +2314,12 @@ u16 D_801BFB38[] = {
CLOCK_TIME(20, 0), CLOCK_TIME(21, 0), CLOCK_TIME(22, 0), CLOCK_TIME(23, 0), CLOCK_TIME(24, 0) - 1,
};
TexturePtr D_801BFB6C[] = {
gThreeDayTimerHour12Tex, gThreeDayTimerHour1Tex, gThreeDayTimerHour2Tex, gThreeDayTimerHour3Tex,
gThreeDayTimerHour4Tex, gThreeDayTimerHour5Tex, gThreeDayTimerHour6Tex, gThreeDayTimerHour7Tex,
gThreeDayTimerHour8Tex, gThreeDayTimerHour9Tex, gThreeDayTimerHour10Tex, gThreeDayTimerHour11Tex,
gThreeDayTimerHour12Tex, gThreeDayTimerHour1Tex, gThreeDayTimerHour2Tex, gThreeDayTimerHour3Tex,
gThreeDayTimerHour4Tex, gThreeDayTimerHour5Tex, gThreeDayTimerHour6Tex, gThreeDayTimerHour7Tex,
gThreeDayTimerHour8Tex, gThreeDayTimerHour9Tex, gThreeDayTimerHour10Tex, gThreeDayTimerHour11Tex,
gThreeDayClockHour12Tex, gThreeDayClockHour1Tex, gThreeDayClockHour2Tex, gThreeDayClockHour3Tex,
gThreeDayClockHour4Tex, gThreeDayClockHour5Tex, gThreeDayClockHour6Tex, gThreeDayClockHour7Tex,
gThreeDayClockHour8Tex, gThreeDayClockHour9Tex, gThreeDayClockHour10Tex, gThreeDayClockHour11Tex,
gThreeDayClockHour12Tex, gThreeDayClockHour1Tex, gThreeDayClockHour2Tex, gThreeDayClockHour3Tex,
gThreeDayClockHour4Tex, gThreeDayClockHour5Tex, gThreeDayClockHour6Tex, gThreeDayClockHour7Tex,
gThreeDayClockHour8Tex, gThreeDayClockHour9Tex, gThreeDayClockHour10Tex, gThreeDayClockHour11Tex,
};
s16 D_801BFBCC = 0; // color R
s16 D_801BFBD0 = 155; // color G
@@ -2343,9 +2340,9 @@ s16 D_801BFC08[] = { 100, 0 };
s16 D_801BFC0C[] = { 30, 0 };
s16 D_801BFC10[] = { 100, 0 };
TexturePtr D_801BFC14[] = {
gFinalHoursTimerDigit0Tex, gFinalHoursTimerDigit1Tex, gFinalHoursTimerDigit2Tex, gFinalHoursTimerDigit3Tex,
gFinalHoursTimerDigit4Tex, gFinalHoursTimerDigit5Tex, gFinalHoursTimerDigit6Tex, gFinalHoursTimerDigit7Tex,
gFinalHoursTimerDigit8Tex, gFinalHoursTimerDigit9Tex, gFinalHoursTimerColonTex,
gFinalHoursClockDigit0Tex, gFinalHoursClockDigit1Tex, gFinalHoursClockDigit2Tex, gFinalHoursClockDigit3Tex,
gFinalHoursClockDigit4Tex, gFinalHoursClockDigit5Tex, gFinalHoursClockDigit6Tex, gFinalHoursClockDigit7Tex,
gFinalHoursClockDigit8Tex, gFinalHoursClockDigit9Tex, gFinalHoursClockColonTex,
};
s16 D_801BFC40[] = {
0x007F, 0x0088, 0x0090, 0x0097, 0x00A0, 0x00A8, 0x00AF, 0x00B8,