Browse Source

default name and intro skip

SBird1337 6 years ago
parent
commit
5d8efea93a
3 changed files with 6 additions and 1 deletions
  1. 3
    0
      patches/game_engine/quick_hacks.asm
  2. 1
    1
      sots-private
  3. 2
    0
      src/specials/custom_specials.c

+ 3
- 0
patches/game_engine/quick_hacks.asm View File

@@ -94,3 +94,6 @@ PLAYER_S_M EQU 0x0
94 94
 ldr r0, =whiteout_hook|1
95 95
 bx r0
96 96
 .pool
97
+
98
+.org 0x0812EB54
99
+.word 0x08056644|1 //new game callback, skip the intro

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit adf100f20915ccef902e8373ae7b9400051a66b1
1
+Subproject commit a98c3fe40455aa1763b8bbeda3fc81f848884789

+ 2
- 0
src/specials/custom_specials.c View File

@@ -95,8 +95,10 @@ static special_func special_routines[12] = {
95 95
 void sp_set_rival(void) {
96 96
     if (saveblock2->gender == GENDER_MALE) {
97 97
         pstrcpy(&(saveblock1->rival_name[0]), &name_rival_female[0]);
98
+        pstrcpy(&(saveblock2->name[0]), &name_rival_male[0]);
98 99
     } else {
99 100
         pstrcpy(&(saveblock1->rival_name[0]), &name_rival_male[0]);
101
+        pstrcpy(&(saveblock2->name[0]), &name_rival_female[0]);
100 102
     }
101 103
 }
102 104