mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-10 07:06:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some comments and label names for GetFuserId

Browse Source
This commit is contained in:
Catobat
2023-05-05 23:19:04 +02:00
parent 8a7e928461
commit 52e635f57b
3 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common.c
+2 -2
View File
@@ -1075,7 +1075,7 @@ KinstoneId GetFusionToOffer(Entity* entity) {
case KINSTONE_NEEDS_REPLACEMENT: // offered fusion completed with someone else
case KINSTONE_NONE: // no fusion offered yet
offeredFusion = fuserFusionData[5];
if (offeredFusion == KINSTONE_NONE || offeredFusion == 0xFF || CheckKinstoneFused(offeredFusion) == 0) {
if (offeredFusion == KINSTONE_NONE || offeredFusion == KINSTONE_RANDOM || CheckKinstoneFused(offeredFusion) == 0) {
break;
}
case KINSTONE_JUST_FUSED: // previous fusion completed
@@ -1083,7 +1083,7 @@ KinstoneId GetFusionToOffer(Entity* entity) {
fuserProgress++;
offeredFusion = fuserFusionData[5];
}
if (offeredFusion == 0xFF) { // random shared fusion
if (offeredFusion == KINSTONE_RANDOM) { // random shared fusion
offeredFusion = GetRandomSharedFusion(fuserData);
}
if (offeredFusion == KINSTONE_NONE) { // end of fusion list
src/npc/cucco.c
+1 -1
View File
@@ -136,4 +136,4 @@ void (*const Cucco_Actions[])(Entity*) = {
};
const u16 Cucco_Sounds[] = { SFX_VO_CUCCO1, SFX_VO_CUCCO2, SFX_VO_CUCCO3, SFX_VO_CUCCO4 };
const u16 Cucco_Messages[] = { TEXT_INDEX(TEXT_MINISH, 0Xb4), TEXT_INDEX(TEXT_MINISH, 0xb5) };
const u16 Cucco_Messages[] = { TEXT_INDEX(TEXT_MINISH, 0xb4), TEXT_INDEX(TEXT_MINISH, 0xb5) };