mirror of
https://github.com/YohannDR/mzm.git
synced 2024-10-07 02:23:20 +00:00
Match TextStartMessage and improve TextProcessFileScreenPopUp
This commit is contained in:
parent
1103a82f7a
commit
f6562c29ee
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
This is a work in progress decompilation of Metroid - Zero Mission.
|
This is a work in progress decompilation of Metroid - Zero Mission.
|
||||||
|
|
||||||
2460/2721 functions decompiled (90.41%, 261 left)
|
2461/2721 functions decompiled (90.44%, 260 left)
|
||||||
Progress can be seen here : https://docs.google.com/spreadsheets/d/1X8XarD5evY8ZI7r_GQqh1pYmdVMbBcINYfRBUlogmKY/edit#gid=0
|
Progress can be seen here : https://docs.google.com/spreadsheets/d/1X8XarD5evY8ZI7r_GQqh1pYmdVMbBcINYfRBUlogmKY/edit#gid=0
|
||||||
|
|
||||||
**This decomp is not shiftable, don't use it as a base to work on anything**
|
**This decomp is not shiftable, don't use it as a base to work on anything**
|
||||||
|
26
src/text.c
26
src/text.c
@ -376,19 +376,17 @@ void unk_6f0a8(u8 textID, u8 gfxSlot, u8 param_3)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief 6f258 | 34 | Starts a new message
|
||||||
|
*
|
||||||
|
* @param textID Text ID
|
||||||
|
* @param gfxSlot Graphics slot
|
||||||
|
*/
|
||||||
void TextStartMessage(u8 textID, u8 gfxSlot)
|
void TextStartMessage(u8 textID, u8 gfxSlot)
|
||||||
{
|
{
|
||||||
// https://decomp.me/scratch/NdHu7
|
|
||||||
|
|
||||||
register u32 messageID asm("r1");
|
|
||||||
|
|
||||||
gCurrentMessage = sMessage_Empty;
|
gCurrentMessage = sMessage_Empty;
|
||||||
|
|
||||||
messageID = textID;
|
|
||||||
if (textID > 0x23)
|
|
||||||
messageID = 0x23;
|
|
||||||
|
|
||||||
gCurrentMessage.messageID = messageID;
|
gCurrentMessage.messageID = textID > MESSAGE_ENEMY_LOCATION_ABNORMAL ? MESSAGE_ENEMY_LOCATION_ABNORMAL : textID;
|
||||||
gCurrentMessage.gfxSlot = gfxSlot;
|
gCurrentMessage.gfxSlot = gfxSlot;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -528,7 +526,6 @@ u8 TextProcessFileScreenPopUp(void)
|
|||||||
|
|
||||||
i32 i;
|
i32 i;
|
||||||
u32* dst;
|
u32* dst;
|
||||||
i32 flag;
|
|
||||||
|
|
||||||
switch (gCurrentMessage.stage)
|
switch (gCurrentMessage.stage)
|
||||||
{
|
{
|
||||||
@ -551,16 +548,9 @@ u8 TextProcessFileScreenPopUp(void)
|
|||||||
case 1:
|
case 1:
|
||||||
case 4:
|
case 4:
|
||||||
gCurrentMessage.indent = 0;
|
gCurrentMessage.indent = 0;
|
||||||
flag = TRUE;
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
flag = FALSE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flag)
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (gCurrentMessage.line > 3)
|
if (gCurrentMessage.line > 3)
|
||||||
break;
|
break;
|
||||||
i--;
|
i--;
|
||||||
@ -571,6 +561,8 @@ u8 TextProcessFileScreenPopUp(void)
|
|||||||
gCurrentMessage.line++;
|
gCurrentMessage.line++;
|
||||||
gCurrentMessage.stage++;
|
gCurrentMessage.stage++;
|
||||||
return gCurrentMessage.line;
|
return gCurrentMessage.line;
|
||||||
|
|
||||||
|
case 2:
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user