Merge pull request #189 from X-R-G-B/add-explanation-ski

Add explanation for skip tp
X-R-G-B · May 8, 2022 · f2dae11 · f2dae11
2 parents 7933df0 + 3804a04
commit f2dae11
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/assets/data/npc/magician_intro.json b/assets/data/npc/magician_intro.json
@@ -9,6 +9,7 @@
         "Appuie sur 'A' pour continuer",
         "HE OH",
         "reveil toi chakal",
-        "Attention tu rentre dans un flashback"
+        "Attention tu rentre dans un flashback",
+        "si ca prend trop longtemps,\nAppui sur 'entrer'"
     ]
 }
diff --git a/assets/data/story_mode/stage_0.json b/assets/data/story_mode/stage_0.json
@@ -223,5 +223,5 @@
             }
         }
     },
-    "spawn": [75, 85]
+    "spawn": [45, 115]
 }
diff --git a/src/player/stat_upgrade/stats_component.c b/src/player/stat_upgrade/stats_component.c
@@ -5,9 +5,10 @@
 ** stats_component
 */
 
-#include "my_rpg.h"
 #include "my_bgs_button_generator.h"
 #include "my_bgs.h"
+#include "my_rpg.h"
+#include "main_menu.h"
 #include "macro.h"
 
 static const char STATS_UPGRADE[] = "./assets/data/player/stats_upgrade.json";
-Original file line number
+Diff line change
@@ Expand Up / @@ -223,5 +223,5 @@ @@
                 }
             }
         },
-        "spawn": [75, 85]
+        "spawn": [45, 115]
     }