Move some data into game_0fd660.c

This commit is contained in:
Ryan Dwyer
2020-03-22 16:08:52 +10:00
parent 0a96375754
commit ae83a859c7
2 changed files with 36 additions and 41 deletions
-41
View File
@@ -1355,44 +1355,3 @@ struct menu_dialog menudialog_datalost = {
0x00000020,
NULL,
};
u32 var80071934 = 0x00000000;
u32 var80071938 = 0x00000000;
u32 var8007193c = 0x00000000;
u32 var80071940 = 0xff666600;
u32 var80071944 = 0xffff0000;
u32 var80071948 = 0x4444ff00;
u32 var8007194c = 0xff00ff00;
u32 var80071950 = 0x00ffff00;
u32 var80071954 = 0xff885500;
u32 var80071958 = 0x8800ff00;
u32 var8007195c = 0x88445500;
// 17980
struct menu_item menuitems_picktarget[] = {
{ MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x0000005a, 0x00000000, menuhandler000fd6f0 },
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
// 179a8
struct menu_dialog menudialog_picktarget = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS(492), // "Pick Target"
menuitems_picktarget,
menudialogMpPickTarget,
0x00000000,
NULL,
};
u32 var800719a0 = 0x00010203;
u32 var800719a4 = 0x04050607;
u32 var800719a8 = 0x08000000;
u32 var800719ac = 0xff00004f;
u32 var800719b0 = 0x3f00008f;
u32 var800719b4 = 0xff4f00ff;
u32 var800719b8 = 0xffff7fff;
u32 var800719bc = 0xff4f00ff;
u32 var800719c0 = 0xff4f00ff;
u32 var800719c4 = 0x00000000;
u32 var800719c8 = 0x00000000;
u32 var800719cc = 0x00000000;
+36
View File
@@ -47,6 +47,15 @@ void mpOpenPickTarget(void)
}
}
u32 var80071940 = 0xff666600;
u32 var80071944 = 0xffff0000;
u32 var80071948 = 0x4444ff00;
u32 var8007194c = 0xff00ff00;
u32 var80071950 = 0x00ffff00;
u32 var80071954 = 0xff885500;
u32 var80071958 = 0x8800ff00;
u32 var8007195c = 0x88445500;
GLOBAL_ASM(
glabel menuhandler000fd6f0
.late_rodata
@@ -494,6 +503,23 @@ bool menudialogMpPickTarget(u32 operation, struct menu_dialog *dialog, struct me
return false;
}
// 17980
struct menu_item menuitems_picktarget[] = {
{ MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x0000005a, 0x00000000, menuhandler000fd6f0 },
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
// 179a8
struct menu_dialog menudialog_picktarget = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS(492), // "Pick Target"
menuitems_picktarget,
menudialogMpPickTarget,
0x00000000,
NULL,
};
void activemenuSetAiBuddyTemperament(bool aggressive)
{
s32 i;
@@ -3046,6 +3072,16 @@ glabel func0f100128
/* f100acc: 00000000 */ sll $zero,$zero,0x0
);
u32 var800719a0 = 0x00010203;
u32 var800719a4 = 0x04050607;
u32 var800719a8 = 0x08000000;
u32 var800719ac = 0xff00004f;
u32 var800719b0 = 0x3f00008f;
u32 var800719b4 = 0xff4f00ff;
u32 var800719b8 = 0xffff7fff;
u32 var800719bc = 0xff4f00ff;
u32 var800719c0 = 0xff4f00ff;
GLOBAL_ASM(
glabel func0f100ad0
/* f100ad0: 27bdfe28 */ addiu $sp,$sp,-472