Преглед на файлове

add default player name, resolves #30

SBird1337 преди 6 години
родител
ревизия
8a6ca2551d
променени са 3 файла, в които са добавени 21 реда и са изтрити 0 реда
  1. 1
    0
      main.asm
  2. 4
    0
      patches/game_engine/intro.asm
  3. 16
    0
      src/game_engine/intro_name.c

+ 1
- 0
main.asm Целия файл

@@ -64,6 +64,7 @@
64 64
 .include "patches/game_engine/localization.asm"
65 65
 .include "patches/game_engine/start_menu.asm"
66 66
 .include "patches/game_engine/script_replace.asm"
67
+.include "patches/game_engine/intro.asm"
67 68
 
68 69
 //.include "battle_engine/patches/battle_hooks.s"
69 70
 

+ 4
- 0
patches/game_engine/intro.asm Целия файл

@@ -0,0 +1,4 @@
1
+.org 0x08131754
2
+ldr r2, =name_set_hero_rival+1
3
+bx r2
4
+.pool

+ 16
- 0
src/game_engine/intro_name.c Целия файл

@@ -0,0 +1,16 @@
1
+#include <agb_debug.h>
2
+#include <pokeagb/pokeagb.h>
3
+
4
+extern pchar name_rival_male[5];
5
+extern pchar name_rival_female[5];
6
+
7
+void name_set_hero_rival(bool naming_turn_rival, u8 name_rival) {
8
+    if (!naming_turn_rival) {
9
+        pstrcpy(&saveblock2->name[0],
10
+                (saveblock2->gender == GENDER_MALE) ? &name_rival_male[0] : &name_rival_female[0]);
11
+    } else {
12
+        (void)name_rival;
13
+        pstrcpy(&saveblock1->rival_name[0],
14
+                (saveblock2->gender == GENDER_MALE) ? &name_rival_female[0] : &name_rival_male[0]);
15
+    }
16
+}