Karathan
/
source_of_the_sovereign
mirror of https://github.com/SBird1337/source_of_the_sovereign
Watch 1
Star 0
Fork 0
Code Issues Releases 0 Wiki Activity
Browse Source

Pymap_Constants.h angepasst, neue Carun City Indoor Maps und Tilesets hinzugefügt

dragonflysots 7 years ago
parent
6806647496
commit
ba9b5fce14
3 changed files with 31 additions and 72 deletions
Unified View Show Diff Stats
  1. 20
    52
      data/string/map_names.s
  2. 1
    1
      sots-private
  3. 10
    19
      src/include/pymap_constants.h

+ 20
- 52
data/string/map_names.s View File

6 
 map_name_table:
 6 
 map_name_table:
7 
 .word str_map_name_hesperia
 7 
 .word str_map_name_hesperia
8 
 .word str_map_name_carun
 8 
 .word str_map_name_carun
9 
-.word str_map_name_unuma
10 
-.word str_map_name_urbania
11 
-.word str_map_name_route_1
12 
-.word str_map_name_route_2
13 
-.word str_map_name_route_3
14 
-.word str_map_name_route_4
15 
-.word str_map_name_route_5
16 
-.word str_map_name_wald_von_yelnia
17 
-.word str_map_name_tundra_hq
18 
-.word str_map_name_baum_des_lebens
19 
-.word str_map_name_hoehle_der_weachter
9 
+.word str_map_name_hesperiapfad
10 
+.word str_map_name_hesperiazweig
11 
+.word str_map_name_carunpfad
12 
+.word str_map_name_invalid
13 
+.word str_map_name_invalid
14 
+.word str_map_name_invalid
15 
+.word str_map_name_invalid
16 
+.word str_map_name_invalid
17 
+.word str_map_name_invalid
18 
+.word str_map_name_invalid
19 
+.word str_map_name_invalid
20 
 .word str_map_name_invalid
 20 
 .word str_map_name_invalid
21 
 .word str_map_name_invalid
 21 
 .word str_map_name_invalid
22 
 .word str_map_name_invalid
 22 
 .word str_map_name_invalid
75 
 .string LAN_DE "Carun City"
 75 
 .string LAN_DE "Carun City"
76 
 .string LAN_EN "Carun City"
 76 
 .string LAN_EN "Carun City"
77
77
78 
-str_map_name_unuma:
79 
-.string LAN_DE "Unuma"
80 
-.string LAN_EN "Unuma"
81 
-
82 
-str_map_name_urbania:
83 
-.string LAN_DE "Urbania City"
84 
-.string LAN_EN "Urbania City"
85 
-
86 
-str_map_name_route_1:
87 
-.string LAN_DE "Route 1"
88 
-.string LAN_EN "Route 1"
89 
-
90 
-str_map_name_route_2:
91 
-.string LAN_DE "Route 2"
92 
-.string LAN_EN "Route 2"
93 
-
94 
-str_map_name_route_3:
95 
-.string LAN_DE "Route 3"
96 
-.string LAN_EN "Route 3"
97 
-
98 
-str_map_name_route_4:
99 
-.string LAN_DE "Route 4"
100 
-.string LAN_EN "Route 4"
101 
-
102 
-str_map_name_route_5:
103 
-.string LAN_DE "Route 5"
104 
-.string LAN_EN "Route 5"
105 
-
106 
-str_map_name_wald_von_yelnia:
107 
-.string LAN_DE "Wald von Yelnia"
108 
-.string LAN_EN "Forest of Yelnia"
109 
-
110 
-str_map_name_tundra_hq:
111 
-.string LAN_DE "Team Tundra HQ"
112 
-.string LAN_EN "Team Tundra HQ"
78 
+str_map_name_hesperiapfad:
79 
+.string LAN_DE "Hesperiapfad"
80 
+.string LAN_EN "Hesperia Trail"
113
81
114 
-str_map_name_baum_des_lebens:
115 
-.string LAN_DE "Baum des Lebens"
116 
-.string LAN_EN "Tree of Life"
82 
+str_map_name_hesperiazweig:
83 
+.string LAN_DE "Hesperiazweig"
84 
+.string LAN_EN "Hesperia Branch"
117
85
118 
-str_map_name_hoehle_der_weachter:
119 
-.string LAN_DE "Höhle der Wächter"
120 
-.string LAN_EN "Cave of the Guardians"
86 
+str_map_name_carunpfad:
87 
+.string LAN_DE "Carunpfad"
88 
+.string LAN_EN "Carun Trail"
121
89
122 
 str_map_name_invalid:
 90 
 str_map_name_invalid:
123 
 .string LAN_DE "Invalider Name"
 91 
 .string LAN_DE "Invalider Name"

+ 1
- 1
sots-private

1 
-Subproject commit 71aa657f2bf6170cafac60cf8f03a08181d26d02
1 
+Subproject commit 11a55641db15a31571d97ad44a4a335b7e978f79

+ 10
- 19
src/include/pymap_constants.h View File

1 
+@ARM Assembly macro definitions for map_namespaces
2 
+
3 
+
4 
+.equ MAP_HESPERIA, 0x58
5 
+.equ MAP_CARUN_CITY, 0x59
6 
+.equ MAP_HESPERIAPFAD, 0x60
7 
+.equ MAP_HESPERIAZWEIG, 0x61
8 
+.equ MAP_CARUNPFAD, 0x62
9 
+.equ MAP_TRAINERSCHULE, 0x62
10 
+
1 
 @ARM Assembly macro definitions for item
11 
 @ARM Assembly macro definitions for item
2
12
3
13
1779
1789
1780
1790
1781
1791
1782 
-@ARM Assembly macro definitions for map_namespaces
1783 
-
1784 
-
1785 
-.equ MAP_HESPERIA, 0x58
1786 
-.equ MAP_CARUN_CITY, 0x59
1787 
-.equ MAP_UNUMA, 0x5a
1788 
-.equ MAP_URBANIA_CITY, 0x5b
1789 
-.equ MAP_ROUTE_1, 0x5c
1790 
-.equ MAP_ROUTE_2, 0x5d
1791 
-.equ MAP_ROUTE_3, 0x5e
1792 
-.equ MAP_ROUTE_4, 0x5f
1793 
-.equ MAP_ROUTE_5, 0x60
1794 
-.equ MAP_WALD_VON_YELNIA, 0x61
1795 
-.equ MAP_TEAM_TUNDRA_HQ, 0x62
1796 
-.equ MAP_BAUM_DES_LEBENS, 0x63
1797 
-.equ MAP_HOEHLE_DER_WEACHTER, 0x64
1798 
-
1799 
-
1800 
-
1801 
 @ARM Assembly macro definitions for map_showname
1792 
 @ARM Assembly macro definitions for map_showname
1802
1793
1803
1794