falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

progress

This commit is contained in:
Ethan Roseman 2020-11-10 13:38:00 -05:00
parent c61554b7e9
commit 012dd951e1
2 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s
View File

@ -463,8 +463,8 @@ glabel func_8024240C_96B5CC
/* 96BCDC 80242B1C 3C013F80 */ lui $at, 0x3f80
/* 96BCE0 80242B20 44810000 */ mtc1 $at, $f0
/* 96BCE4 80242B24 27A20054 */ addiu $v0, $sp, 0x54
/* 96BCE8 80242B28 3C018025 */ lui $at, 0x8025
/* 96BCEC 80242B2C AC20EF80 */ sw $zero, -0x1080($at)
/* 96BCE8 80242B28 3C018025 */ lui $at, %hi(gPauseMenuTabs)
/* 96BCEC 80242B2C AC20EF80 */ sw $zero, %lo(gPauseMenuTabs)($at)
/* 96BCF0 80242B30 AFA20010 */ sw $v0, 0x10($sp)
/* 96BCF4 80242B34 3C018025 */ lui $at, 0x8025
/* 96BCF8 80242B38 E420EF84 */ swc1 $f0, -0x107c($at)
@ -611,8 +611,8 @@ glabel func_8024240C_96B5CC
/* 96BF10 80242D50 00000000 */ nop
/* 96BF14 80242D54 3C108025 */ lui $s0, 0x8025
/* 96BF18 80242D58 2610F010 */ addiu $s0, $s0, -0xff0
/* 96BF1C 80242D5C 3C048025 */ lui $a0, 0x8025
/* 96BF20 80242D60 2484EF80 */ addiu $a0, $a0, -0x1080
/* 96BF1C 80242D5C 3C048025 */ lui $a0, %hi(gPauseMenuTabs)
/* 96BF20 80242D60 2484EF80 */ addiu $a0, $a0, %lo(gPauseMenuTabs)
/* 96BF24 80242D64 3C038025 */ lui $v1, 0x8025
/* 96BF28 80242D68 2463EF84 */ addiu $v1, $v1, -0x107c
/* 96BF2C 80242D6C 3C078025 */ lui $a3, 0x8025

54
src/code_135EE0.c
View File

@ -14,6 +14,46 @@ INCLUDE_ASM(s32, "code_135EE0", func_80242BAC);
INCLUDE_ASM(s32, "code_135EE0", func_80242D04);
INCLUDE_ASM(s32, "code_135EE0", pause_interp_cursor);
// void pause_interp_cursor(void) {
// s32 targetPosX;
// s32 posX;
// s32 targetPosY;
// s32 posY;
// s32 xDelta;
// s32 yDelta;
// s32 temp_v0;
// s32 temp_v0_2;
// targetPosX = gPauseMenuTargetPos[0];
// posX = gPauseMenuCursorPos[0];
// targetPosY = gPauseMenuTargetPos[1];
// posY = gPauseMenuCursorPos[1];
// xDelta = (targetPosX - posX) * 0.5;
// yDelta = (targetPosY - posY) * 0.5;
// if ((targetPosX != posX) || (targetPosY != posY)) {
// if ((xDelta == 0) && (yDelta == 0)) {
// gPauseMenuCursorPos[0] = targetPosX;
// gPauseMenuCursorPos[1] = targetPosY;
// }
// }
// gPauseMenuCursorPos[0] += xDelta;
// gPauseMenuCursorPos[1] += yDelta;
// if (gPauseMenuCursorTargetOpacity == 0) {
// gPauseMenuCursorOpacity -= 128;
// if (gPauseMenuCursorOpacity < 0) {
// gPauseMenuCursorOpacity = 0;
// }
// } else {
// gPauseMenuCursorOpacity += 32;
// if (gPauseMenuCursorOpacity > 255) {
// gPauseMenuCursorOpacity = 255;
// }
// }
// gPauseMenuCursorTargetOpacity = 255;
// }
INCLUDE_ASM(s32, "code_135EE0", func_80242F90);
@ -67,6 +107,20 @@ INCLUDE_ASM(s32, "code_135EE0", pause_interp_vertical_scroll);
#endif
INCLUDE_ASM(s32, "code_135EE0", pause_update_cursor);
/*void pause_update_cursor(s32 arg0, s32 offsetX, s32 offsetY) {
s32 opacity;
pause_interp_cursor();
opacity = gPauseMenuCursorOpacity;
if (opacity > 0) {
if (opacity > 255) {
opacity = 255;
}
icon_set_opacity(gPauseMenuCommonIconIDs[0], opacity);
set_icon_render_pos(gPauseMenuCommonIconIDs[0], offsetX + gPauseMenuCursorPos[0], offsetY + gPauseMenuCursorPos[1]);
draw_icon_2(gPauseMenuCommonIconIDs[0]);
}
}*/
void func_80243568(void) {
}