x

.gitignore

@@ -66,3 +66,5 @@ _Deparsed_XSubs.pm
 *.sna
 __pycache__
 .vscode/settings.json
+.vscode/c_cpp_properties.json
+.vscode/tasks.json

.vscode/c_cpp_properties.json

@@ -1,17 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Mac",
-            "includePath": [
-                "${default}",
-                "${workspaceFolder}/**"
-            ],
-            "defines": [],
-            "macFrameworkPath": [],
-            "cStandard": "gnu17",
-            "cppStandard": "gnu++14",
-            "intelliSenseMode": "macos-gcc-arm"
-        }
-    ],
-    "version": 4
-}

.vscode/tasks.json

@@ -1,28 +0,0 @@
-{
-    "tasks": [
-        {
-            "type": "cppbuild",
-            "label": "C/C++: gcc-10 build active file",
-            "command": "/usr/local/bin/gcc-10",
-            "args": [
-                "-fdiagnostics-color=always",
-                "-g",
-                "${file}",
-                "-o",
-                "${fileDirname}/${fileBasenameNoExtension}"
-            ],
-            "options": {
-                "cwd": "${fileDirname}"
-            },
-            "problemMatcher": [
-                "$gcc"
-            ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "detail": "Task generated by Debugger."
-        }
-    ],
-    "version": "2.0.0"
-}

src/room.c

@@ -2240,17 +2240,13 @@ u32 sub_0804CD0C() {
 
 #if defined(DEMO_USA) || defined(DEMO_JP)
 void nullsub_251() {
-<<<<<<< HEAD
-    if (gSaveHeader->saveFileId != 0 && GetInventoryValue(0x40) == 0) {
-=======
 #ifdef DEMO_USA
-    if (gUnk_02000000->saveFileId != 0 && GetInventoryValue(0x40) == 0) {
+    if (gSaveHeader->saveFileId != 0 && GetInventoryValue(0x40) == 0) {
 #else
 #ifdef DEMO_JP
     if (GetInventoryValue(0x40) == 0) {
 #endif
 #endif
->>>>>>> upstream/master
         SetTileType(0x365, 0x349, 1);
         SetTileType(0x365, 0x34a, 1);
         SetTileType(0x365, 0x34b, 1);

src/textbox.c

@@ -499,6 +499,9 @@ static void PaletteChange(TextRender* this, u32 id) {
     this->_50.unk2 = temp;
 }
 
+const u8 gUnk_08107C0F[] = { 0x8, 0x1e, 0x4, 0x12, 0x0 };
+const u8 gUnk_08107C14[] = { 0x8, 0x1e, 0x8, 0xFE, 0x0 };
+
 #ifdef EU
 ASM_FUNC("asm/non_matching/eu/TextBoxHandlerQuestion.inc", static void TextDispEnquiry(TextRender* ctb))
 #else
@@ -508,20 +511,17 @@ static void TextDispEnquiry(TextRender* this) {
     u32 doSwitch;
     const u8* src;
 
-    static const u8 arr1[] = { 0x8, 0x1e, 0x4, 0x12, 0x0 };
-    static const u8 arr2[] = { 0x8, 0x1e, 0x8, 0xFE, 0x0 };
-
     choiceIdx = gMessageChoices.currentChoice;
     switch (gInput.newKeys) {
         case START_BUTTON:
         case A_BUTTON:
             nextTextIdx = gMessageChoices.unk_10[choiceIdx];
             if (nextTextIdx == 0) {
-                src = arr2;
+                src = gUnk_08107C14;
             } else {
                 this->message.textIndex = nextTextIdx;
                 sub_0805EEB4(&this->curToken, nextTextIdx);
-                src = arr1;
+                src = gUnk_08107C0F;
             }
             sub_0805EF40(&this->curToken, src);
             gUnk_02000040.unk_01 = gMessageChoices.currentChoice;