SBird1337 hace 6 años
padre
commit
4c92c83d3b
Se han modificado 3 ficheros con 11 adiciones y 3 borrados
  1. 1
    1
      g3headers
  2. 4
    2
      patches/game_engine/quick_hacks.asm
  3. 6
    0
      src/game_engine/intro_name.c

+ 1
- 1
g3headers

@@ -1 +1 @@
1
-Subproject commit 083c36df58968b714fdec0b76c6d7df0208d708f
1
+Subproject commit 07b29e81680ced24934c10161ff706c0949e4723

+ 4
- 2
patches/game_engine/quick_hacks.asm Ver fichero

@@ -95,5 +95,7 @@ ldr r0, =whiteout_hook|1
95 95
 bx r0
96 96
 .pool
97 97
 
98
-//.org 0x0812EB54
99
-//.word 0x08056644|1 //new game callback, skip the intro
98
+.org 0x0812EB2C
99
+ldr r0, =launch_tutorial|1
100
+bx r0
101
+.pool

+ 6
- 0
src/game_engine/intro_name.c Ver fichero

@@ -13,4 +13,10 @@ void name_set_hero_rival(bool naming_turn_rival, u8 name_rival) {
13 13
         pstrcpy(&saveblock1->rival_name[0],
14 14
                 (saveblock2->gender == GENDER_MALE) ? &name_rival_female[0] : &name_rival_male[0]);
15 15
     }
16
+}
17
+
18
+void launch_tutorial(void) {
19
+    pstrcpy(&saveblock2->name[0], &name_rival_male[0]);
20
+    pstrcpy(&saveblock1->rival_name[0], &name_rival_female[0]);
21
+    set_callback2(c2_new_game); //skip launching of tutorial probably...
16 22
 }