diff options
| author | Catobat <69204835+Catobat@users.noreply.github.com> | 2023-05-05 23:19:04 +0200 |
|---|---|---|
| committer | Catobat <69204835+Catobat@users.noreply.github.com> | 2023-05-05 23:19:04 +0200 |
| commit | 52e635f57b990232cbef832a64c12f60b7ab209e (patch) | |
| tree | d8f3a05ae530cf1a9f3be2026dce5222003e9722 /src | |
| parent | 8a7e9284611426901c67478849610d4615601f1a (diff) | |
Some comments and label names for GetFuserId
Diffstat (limited to 'src')
| -rw-r--r-- | src/common.c | 4 | ||||
| -rw-r--r-- | src/npc/cucco.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/common.c b/src/common.c index e3f962b4..064082a9 100644 --- a/src/common.c +++ b/src/common.c @@ -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 diff --git a/src/npc/cucco.c b/src/npc/cucco.c index 62926b8f..28709607 100644 --- a/src/npc/cucco.c +++ b/src/npc/cucco.c @@ -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) }; |