mirror of
https://github.com/pmret/papermario.git
synced 2024-11-10 04:52:34 +01:00
Match create_popup_menu (#628)
* Match create_popup_menu * Delete create_popup_menu.s
This commit is contained in:
JoshDuMan
GitHub
parent
0f67c8c425
commit
0c8d01e00e
@ -924,10 +924,11 @@ void func_800F4D28(PopupMessage* popup, s32 x, s32 y) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef NON_EQUIVALENT
|
|
||||||
void create_popup_menu(PopupMenu* popup) {
|
void create_popup_menu(PopupMenu* popup) {
|
||||||
PopupMenu* otherPopup;
|
PopupMenu* otherPopup;
|
||||||
s8 entryCount;
|
s8 entryCount;
|
||||||
|
s32 initialPos;
|
||||||
|
s32 numEntries;
|
||||||
|
|
||||||
D_8010D69A = func_800E98D4();
|
D_8010D69A = func_800E98D4();
|
||||||
func_800E9894();
|
func_800E9894();
|
||||||
@ -947,34 +948,36 @@ void create_popup_menu(PopupMenu* popup) {
|
|||||||
}
|
}
|
||||||
D_8010D698 = 0;
|
D_8010D698 = 0;
|
||||||
}
|
}
|
||||||
otherPopup = gPopupMenu;
|
|
||||||
D_8010D68E = 1;
|
D_8010D68E = 1;
|
||||||
D_8010D640 = 0;
|
|
||||||
D_8010D648 = otherPopup->initialPos;
|
|
||||||
if (otherPopup->initialPos >= otherPopup->numEntries) {
|
|
||||||
D_8010D648 = otherPopup->numEntries - 1;
|
|
||||||
}
|
|
||||||
D_8010D68F = 6;
|
D_8010D68F = 6;
|
||||||
|
D_8010D640 = 0;
|
||||||
|
|
||||||
|
initialPos = gPopupMenu->initialPos;
|
||||||
|
numEntries = gPopupMenu->numEntries;
|
||||||
|
D_8010D648 = initialPos;
|
||||||
|
if (initialPos >= numEntries) {
|
||||||
|
D_8010D648 = numEntries - 1;
|
||||||
|
}
|
||||||
D_8010D654 = 0;
|
D_8010D654 = 0;
|
||||||
D_8010D64C = D_8010D648;
|
D_8010D64C = D_8010D648;
|
||||||
entryCount = otherPopup->numEntries;
|
|
||||||
|
|
||||||
|
entryCount = gPopupMenu->numEntries;
|
||||||
D_8010D656 = entryCount;
|
D_8010D656 = entryCount;
|
||||||
if (entryCount > 6) {
|
if (D_8010D68F < entryCount) {
|
||||||
D_8010D656 = 6;
|
D_8010D656 = 6;
|
||||||
}
|
}
|
||||||
|
|
||||||
D_8010D655 = 6;
|
D_8010D655 = 6;
|
||||||
if (gPopupMenu->numEntries < 6) {
|
if (gPopupMenu->numEntries < D_8010D68F) {
|
||||||
D_8010D655 = gPopupMenu->numEntries;
|
D_8010D655 = gPopupMenu->numEntries;
|
||||||
}
|
}
|
||||||
|
|
||||||
D_8010D650 = 255;
|
D_8010D650 = 255;
|
||||||
D_8010D691 = 4;
|
D_8010D691 = 4;
|
||||||
D_8010D692 = 6;
|
D_8010D692 = 6;
|
||||||
D_8010D694 = create_generic_entity_frontUI(popup_menu_update, NULL);
|
D_8010D694 = create_generic_entity_frontUI(popup_menu_update, NULL);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
INCLUDE_ASM(void, "8a860_len_3f30", create_popup_menu, PopupMenu* popup);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4FC4);
|
INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4FC4);
|
||||||
|
|
||||||
|
|||||||
@ -1,106 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel create_popup_menu
|
|
||||||
/* 8E2F0 800F4E40 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
||||||
/* 8E2F4 800F4E44 AFB00010 */ sw $s0, 0x10($sp)
|
|
||||||
/* 8E2F8 800F4E48 AFBF0014 */ sw $ra, 0x14($sp)
|
|
||||||
/* 8E2FC 800F4E4C 0C03A635 */ jal func_800E98D4
|
|
||||||
/* 8E300 800F4E50 0080802D */ daddu $s0, $a0, $zero
|
|
||||||
/* 8E304 800F4E54 3C018011 */ lui $at, %hi(D_8010D69A)
|
|
||||||
/* 8E308 800F4E58 A022D69A */ sb $v0, %lo(D_8010D69A)($at)
|
|
||||||
/* 8E30C 800F4E5C 0C03A625 */ jal func_800E9894
|
|
||||||
/* 8E310 800F4E60 00000000 */ nop
|
|
||||||
/* 8E314 800F4E64 0C03A5E3 */ jal open_status_menu_short
|
|
||||||
/* 8E318 800F4E68 00000000 */ nop
|
|
||||||
/* 8E31C 800F4E6C 3C048011 */ lui $a0, %hi(D_8010D699)
|
|
||||||
/* 8E320 800F4E70 2484D699 */ addiu $a0, $a0, %lo(D_8010D699)
|
|
||||||
/* 8E324 800F4E74 3C068011 */ lui $a2, %hi(D_8010D698)
|
|
||||||
/* 8E328 800F4E78 24C6D698 */ addiu $a2, $a2, %lo(D_8010D698)
|
|
||||||
/* 8E32C 800F4E7C 3C018011 */ lui $at, %hi(gPopupMenu)
|
|
||||||
/* 8E330 800F4E80 AC30D69C */ sw $s0, %lo(gPopupMenu)($at)
|
|
||||||
/* 8E334 800F4E84 A600032C */ sh $zero, 0x32c($s0)
|
|
||||||
/* 8E338 800F4E88 AE00031C */ sw $zero, 0x31c($s0)
|
|
||||||
/* 8E33C 800F4E8C AE000320 */ sw $zero, 0x320($s0)
|
|
||||||
/* 8E340 800F4E90 A0800000 */ sb $zero, ($a0)
|
|
||||||
/* 8E344 800F4E94 8E030318 */ lw $v1, 0x318($s0)
|
|
||||||
/* 8E348 800F4E98 24050001 */ addiu $a1, $zero, 1
|
|
||||||
/* 8E34C 800F4E9C 28620064 */ slti $v0, $v1, 0x64
|
|
||||||
/* 8E350 800F4EA0 1440000C */ bnez $v0, .L800F4ED4
|
|
||||||
/* 8E354 800F4EA4 A0C50000 */ sb $a1, ($a2)
|
|
||||||
/* 8E358 800F4EA8 2462FF9C */ addiu $v0, $v1, -0x64
|
|
||||||
/* 8E35C 800F4EAC AE020318 */ sw $v0, 0x318($s0)
|
|
||||||
/* 8E360 800F4EB0 0040182D */ daddu $v1, $v0, $zero
|
|
||||||
/* 8E364 800F4EB4 28620064 */ slti $v0, $v1, 0x64
|
|
||||||
/* 8E368 800F4EB8 14400005 */ bnez $v0, .L800F4ED0
|
|
||||||
/* 8E36C 800F4EBC A0850000 */ sb $a1, ($a0)
|
|
||||||
/* 8E370 800F4EC0 2462FF9C */ addiu $v0, $v1, -0x64
|
|
||||||
/* 8E374 800F4EC4 AE020318 */ sw $v0, 0x318($s0)
|
|
||||||
/* 8E378 800F4EC8 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* 8E37C 800F4ECC A0820000 */ sb $v0, ($a0)
|
|
||||||
.L800F4ED0:
|
|
||||||
/* 8E380 800F4ED0 A0C00000 */ sb $zero, ($a2)
|
|
||||||
.L800F4ED4:
|
|
||||||
/* 8E384 800F4ED4 3C058011 */ lui $a1, %hi(gPopupMenu)
|
|
||||||
/* 8E388 800F4ED8 8CA5D69C */ lw $a1, %lo(gPopupMenu)($a1)
|
|
||||||
/* 8E38C 800F4EDC 24020001 */ addiu $v0, $zero, 1
|
|
||||||
/* 8E390 800F4EE0 3C018011 */ lui $at, %hi(D_8010D68E)
|
|
||||||
/* 8E394 800F4EE4 A022D68E */ sb $v0, %lo(D_8010D68E)($at)
|
|
||||||
/* 8E398 800F4EE8 24020006 */ addiu $v0, $zero, 6
|
|
||||||
/* 8E39C 800F4EEC 3C018011 */ lui $at, %hi(D_8010D68F)
|
|
||||||
/* 8E3A0 800F4EF0 A022D68F */ sb $v0, %lo(D_8010D68F)($at)
|
|
||||||
/* 8E3A4 800F4EF4 8CA20328 */ lw $v0, 0x328($a1)
|
|
||||||
/* 8E3A8 800F4EF8 8CA40324 */ lw $a0, 0x324($a1)
|
|
||||||
/* 8E3AC 800F4EFC 3C038011 */ lui $v1, %hi(D_8010D648)
|
|
||||||
/* 8E3B0 800F4F00 2463D648 */ addiu $v1, $v1, %lo(D_8010D648)
|
|
||||||
/* 8E3B4 800F4F04 3C018011 */ lui $at, %hi(D_8010D640)
|
|
||||||
/* 8E3B8 800F4F08 AC20D640 */ sw $zero, %lo(D_8010D640)($at)
|
|
||||||
/* 8E3BC 800F4F0C AC620000 */ sw $v0, ($v1)
|
|
||||||
/* 8E3C0 800F4F10 0044102A */ slt $v0, $v0, $a0
|
|
||||||
/* 8E3C4 800F4F14 14400002 */ bnez $v0, .L800F4F20
|
|
||||||
/* 8E3C8 800F4F18 2482FFFF */ addiu $v0, $a0, -1
|
|
||||||
/* 8E3CC 800F4F1C AC620000 */ sw $v0, ($v1)
|
|
||||||
.L800F4F20:
|
|
||||||
/* 8E3D0 800F4F20 8C620000 */ lw $v0, ($v1)
|
|
||||||
/* 8E3D4 800F4F24 3C048011 */ lui $a0, %hi(D_8010D656)
|
|
||||||
/* 8E3D8 800F4F28 2484D656 */ addiu $a0, $a0, %lo(D_8010D656)
|
|
||||||
/* 8E3DC 800F4F2C 3C018011 */ lui $at, %hi(D_8010D654)
|
|
||||||
/* 8E3E0 800F4F30 A020D654 */ sb $zero, %lo(D_8010D654)($at)
|
|
||||||
/* 8E3E4 800F4F34 3C018011 */ lui $at, %hi(D_8010D64C)
|
|
||||||
/* 8E3E8 800F4F38 AC22D64C */ sw $v0, %lo(D_8010D64C)($at)
|
|
||||||
/* 8E3EC 800F4F3C 90A20327 */ lbu $v0, 0x327($a1)
|
|
||||||
/* 8E3F0 800F4F40 24030006 */ addiu $v1, $zero, 6
|
|
||||||
/* 8E3F4 800F4F44 A0820000 */ sb $v0, ($a0)
|
|
||||||
/* 8E3F8 800F4F48 00021600 */ sll $v0, $v0, 0x18
|
|
||||||
/* 8E3FC 800F4F4C 00021603 */ sra $v0, $v0, 0x18
|
|
||||||
/* 8E400 800F4F50 0062102A */ slt $v0, $v1, $v0
|
|
||||||
/* 8E404 800F4F54 54400001 */ bnel $v0, $zero, .L800F4F5C
|
|
||||||
/* 8E408 800F4F58 A0830000 */ sb $v1, ($a0)
|
|
||||||
.L800F4F5C:
|
|
||||||
/* 8E40C 800F4F5C 8CA20324 */ lw $v0, 0x324($a1)
|
|
||||||
/* 8E410 800F4F60 3C048011 */ lui $a0, %hi(D_8010D655)
|
|
||||||
/* 8E414 800F4F64 2484D655 */ addiu $a0, $a0, %lo(D_8010D655)
|
|
||||||
/* 8E418 800F4F68 28420006 */ slti $v0, $v0, 6
|
|
||||||
/* 8E41C 800F4F6C 10400003 */ beqz $v0, .L800F4F7C
|
|
||||||
/* 8E420 800F4F70 A0830000 */ sb $v1, ($a0)
|
|
||||||
/* 8E424 800F4F74 90A20327 */ lbu $v0, 0x327($a1)
|
|
||||||
/* 8E428 800F4F78 A0820000 */ sb $v0, ($a0)
|
|
||||||
.L800F4F7C:
|
|
||||||
/* 8E42C 800F4F7C 240200FF */ addiu $v0, $zero, 0xff
|
|
||||||
/* 8E430 800F4F80 3C018011 */ lui $at, %hi(D_8010D650)
|
|
||||||
/* 8E434 800F4F84 AC22D650 */ sw $v0, %lo(D_8010D650)($at)
|
|
||||||
/* 8E438 800F4F88 24020004 */ addiu $v0, $zero, 4
|
|
||||||
/* 8E43C 800F4F8C 3C04800F */ lui $a0, %hi(popup_menu_update)
|
|
||||||
/* 8E440 800F4F90 24841A10 */ addiu $a0, $a0, %lo(popup_menu_update)
|
|
||||||
/* 8E444 800F4F94 3C018011 */ lui $at, %hi(D_8010D691)
|
|
||||||
/* 8E448 800F4F98 A022D691 */ sb $v0, %lo(D_8010D691)($at)
|
|
||||||
/* 8E44C 800F4F9C 3C018011 */ lui $at, %hi(D_8010D692)
|
|
||||||
/* 8E450 800F4FA0 A023D692 */ sb $v1, %lo(D_8010D692)($at)
|
|
||||||
/* 8E454 800F4FA4 0C048C8F */ jal create_generic_entity_frontUI
|
|
||||||
/* 8E458 800F4FA8 0000282D */ daddu $a1, $zero, $zero
|
|
||||||
/* 8E45C 800F4FAC 8FBF0014 */ lw $ra, 0x14($sp)
|
|
||||||
/* 8E460 800F4FB0 8FB00010 */ lw $s0, 0x10($sp)
|
|
||||||
/* 8E464 800F4FB4 3C018011 */ lui $at, %hi(D_8010D694)
|
|
||||||
/* 8E468 800F4FB8 AC22D694 */ sw $v0, %lo(D_8010D694)($at)
|
|
||||||
/* 8E46C 800F4FBC 03E00008 */ jr $ra
|
|
||||||
/* 8E470 800F4FC0 27BD0018 */ addiu $sp, $sp, 0x18
|
|
||||||
Loading…
Reference in New Issue
Block a user