Merge branch 'master' into tilemap-docs

This commit is contained in:
octorock
2023-12-28 14:59:23 +01:00
495 changed files with 14619 additions and 16191 deletions
+1 -1
View File
@@ -168,7 +168,7 @@ void sub_080A6E70(void) {
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, frameIndex);
for (i = 0; i < 8; i++) {
if ((gSave.windcrests & (1 << (i + 0x18))) != 0) {
if (IS_BIT_SET(gSave.windcrests, i + 24)) {
sub_080A6EE0(i);
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, 0x5c);
}
+1 -1
View File
@@ -38,7 +38,7 @@ void Subtask_MapHint_0(void) {
gScreen.lcd.displayControl = gScreen.lcd.displayControl & 0xf7ff;
SetColor(0, gPaletteBuffer[81]);
val = gUnk_08128F4C[gUI.field_0x3];
gSave.field_0x20 |= val;
gSave.map_hints |= val;
gGenericMenu.unk10.h[1] = val & gGenericMenu.unk10.h[0];
gGenericMenu.unk10.h[0] = 0;
gMenu.transitionTimer = 60;