Browse Source

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

DragonflySotS 6 years ago
parent
commit
c95093f4eb

+ 9
- 4
data/trainer/trainer_pkmn_data.s View File

98
 .global pokemon_von_id_92
98
 .global pokemon_von_id_92
99
 .global pokemon_von_id_93
99
 .global pokemon_von_id_93
100
 
100
 
101
+
101
 .align 2
102
 .align 2
102
 pokemon_von_id_1:
103
 pokemon_von_id_1:
103
 .hword 0
104
 .hword 0
448
 .hword 4
449
 .hword 4
449
 .hword PKMN_KOKUNA
450
 .hword PKMN_KOKUNA
450
 .hword 0x0
451
 .hword 0x0
452
+.hword 0
453
+.hword 5
454
+.hword PKMN_SAFCON
455
+.hword 0x0
456
+.hword 0
457
+.hword 5
458
+.hword PKMN_PANEKON
459
+.hword 0x0
451
 .hword 0xFFFF
460
 .hword 0xFFFF
452
 
461
 
453
 .align 2
462
 .align 2
671
 .hword 6
680
 .hword 6
672
 .hword PKMN_WEBARAK
681
 .hword PKMN_WEBARAK
673
 .hword 0x0
682
 .hword 0x0
674
-.hword 0
675
-.hword 7
676
-.hword PKMN_VOLBEAT
677
-.hword 0x0
678
 .hword 0xFFFF
683
 .hword 0xFFFF
679
 
684
 
680
 .align 2
685
 .align 2

+ 1
- 1
sots-private

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

+ 4
- 2
src/include/script/language.h View File

33
 .equ FLAG_ORDEN_8, 0x827
33
 .equ FLAG_ORDEN_8, 0x827
34
 
34
 
35
 @@ LED NAMES
35
 @@ LED NAMES
36
-.equ LED_CARUN_CITY, 0x1
36
+.equ LED_CARUN_CITY_LINKS, 0x1
37
 .equ LED_ROUTE_2, 0x2
37
 .equ LED_ROUTE_2, 0x2
38
 .equ LED_ROUTE_3, 0x3
38
 .equ LED_ROUTE_3, 0x3
39
-.equ LED_URBANIA_CITY, 0x4
39
+.equ LED_URBANIA_CITY_LINKS, 0x4
40
 .equ LED_ROUTE_5, 0x5
40
 .equ LED_ROUTE_5, 0x5
41
 .equ LED_ROUTE_6, 0x6
41
 .equ LED_ROUTE_6, 0x6
42
+.equ LED_CARUN_CITY_RECHTS, 0x7
43
+.equ LED_URBANIA_CITY_RECHTS, 0x8
42
 
44
 
43
 @@ Flag operands
45
 @@ Flag operands
44
 .equ B_T, 0x0
46
 .equ B_T, 0x0

+ 1
- 1
src/overworld/tileset_animation/text_animator.c View File

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