Habe paar Bugs gefixt: fix #44, fix #43, fix #42, fix #41, fix #40, fix #35, fix #34, fix #32

data/trainer/trainer_pkmn_data.s

@@ -98,6 +98,7 @@
 .global pokemon_von_id_92
 .global pokemon_von_id_93
 
+
 .align 2
 pokemon_von_id_1:
 .hword 0
@@ -448,6 +449,14 @@ pokemon_von_id_31:
 .hword 4
 .hword PKMN_KOKUNA
 .hword 0x0
+.hword 0
+.hword 5
+.hword PKMN_SAFCON
+.hword 0x0
+.hword 0
+.hword 5
+.hword PKMN_PANEKON
+.hword 0x0
 .hword 0xFFFF
 
 .align 2
@@ -671,10 +680,6 @@ pokemon_von_id_46:
 .hword 6
 .hword PKMN_WEBARAK
 .hword 0x0
-.hword 0
-.hword 7
-.hword PKMN_VOLBEAT
-.hword 0x0
 .hword 0xFFFF
 
 .align 2

sots-private

@@ -1 +1 @@
-Subproject commit 0cbf3129152ec8ee056e4589e01b49963c68a934
+Subproject commit 7bbcfe10d4ea8ee8b03d97482d6c48e9e9d8d461

src/include/script/language.h

@@ -33,12 +33,14 @@
 .equ FLAG_ORDEN_8, 0x827
 
 @@ LED NAMES
-.equ LED_CARUN_CITY, 0x1
+.equ LED_CARUN_CITY_LINKS, 0x1
 .equ LED_ROUTE_2, 0x2
 .equ LED_ROUTE_3, 0x3
-.equ LED_URBANIA_CITY, 0x4
+.equ LED_URBANIA_CITY_LINKS, 0x4
 .equ LED_ROUTE_5, 0x5
 .equ LED_ROUTE_6, 0x6
+.equ LED_CARUN_CITY_RECHTS, 0x7
+.equ LED_URBANIA_CITY_RECHTS, 0x8
 
 @@ Flag operands
 .equ B_T, 0x0

src/overworld/tileset_animation/text_animator.c

@@ -12,7 +12,7 @@
 #define CANVAS_FIRST ((u8 *)(574 * 0x20 + 0x06000000))
 #define CANVAS_SECOND ((u8 *)(592 * 0x20 + 0x06000000))
 
-static const char *map_texts[] = {"--------", "← Carun City", "Route 2 →", "← Route 3", "← Urbania City", "Route 5 →", "← Route 6", NULL};
+static const char *map_texts[] = {"--------", "← Carun City", "Route 2 →", "← Route 3", "← Urbania City", "Route 5 →", "← Route 6", "Carun City →", "Urbania City →", NULL};
 
 /*
  * Tile IDs: