dragonflysots vor 5 Jahren
Ursprung
Commit
4ee9f2e654
3 geänderte Dateien mit 63 neuen und 1 gelöschten Zeilen
  1. 1
    1
      sots-private
  2. 61
    0
      src/include/pymap_constants.h
  3. 1
    0
      src/include/script/language.h

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 8d1e7fe039b4dd27c89e93edd080621d663d1ff1
1
+Subproject commit 726511fef0d63e039540e34539ae4b6bea4866bd

+ 61
- 0
src/include/pymap_constants.h Datei anzeigen

@@ -38,6 +38,11 @@
38 38
 .equ FLAG_SCHOOL_MOVESPRITE, 0x501
39 39
 .equ FLAG_HIDE_RIVAL_SCHOOL, 0x502
40 40
 .equ FLAG_HIDE_RIVAL_SCHOOL_OUT, 0x503
41
+.equ FLAG_LABOR_MOVESPRITE1, 0x504
42
+.equ FLAG_HIDE_IDAN_LABOR, 0x505
43
+.equ FLAG_HIDE_ACHIM_LABOR, 0x506
44
+.equ FLAG_HIDE_RIVALE_LABOR, 0x507
45
+.equ FLAG_LABOR_MOVESPRITE2, 0x508
41 46
 
42 47
 
43 48
 
@@ -61,6 +66,62 @@
61 66
 
62 67
 
63 68
 
69
+@ARM Assembly macro definitions for starter_pokemon_var
70
+
71
+
72
+.equ VAR_STARTER_PLAYER_POKEMON, 0x5052
73
+.equ VALUE_STARTER_BISASAM, 0x1
74
+.equ VALUE_STARTER_GLUMANDA, 0x2
75
+.equ VALUE_STARTER_SCHIGGY, 0x3
76
+.equ VALUE_STARTER_ENDIVIE, 0x4
77
+.equ VALUE_STARTER_FEURIGEL, 0x5
78
+.equ VALUE_STARTER_KARNIMANI, 0x6
79
+.equ VALUE_STARTER_GECKARBOR, 0x7
80
+.equ VALUE_STARTER_FLEMMLI, 0x8
81
+.equ VALUE_STARTER_HYDROPI, 0x9
82
+.equ VALUE_STARTER_CHELAST, 0xa
83
+.equ VALUE_STARTER_PANFLAM, 0xb
84
+.equ VALUE_STARTER_PLINFA, 0xc
85
+.equ VALUE_STARTER_SERPIFEU, 0xd
86
+.equ VALUE_STARTER_FLOINK, 0xe
87
+.equ VALUE_STARTER_OTTARO, 0xf
88
+.equ VALUE_STARTER_IGAMARO, 0x10
89
+.equ VALUE_STARTER_FYNX, 0x11
90
+.equ VALUE_STARTER_FROXY, 0x12
91
+.equ VALUE_STARTER_BAUZ, 0x13
92
+.equ VALUE_STARTER_FLAMIAU, 0x14
93
+.equ VALUE_STARTER_ROBBALL, 0x15
94
+
95
+
96
+
97
+@ARM Assembly macro definitions for rivale_pokemon_var
98
+
99
+
100
+.equ VAR_STARTER_RIVALE_POKEMON, 0x5053
101
+.equ VALUE_STARTER_GLUMANDA, 0x1
102
+.equ VALUE_STARTER_SCHIGGY, 0x2
103
+.equ VALUE_STARTER_BISASAM, 0x3
104
+.equ VALUE_STARTER_FEURIGEL, 0x4
105
+.equ VALUE_STARTER_KRANIMANI, 0x5
106
+.equ VALUE_STARTER_ENDIVIE, 0x6
107
+.equ VALUE_STARTER_FLEMMLI, 0x7
108
+.equ VALUE_STARTER_HYDROPI, 0x8
109
+.equ VALUE_STARTER_GECKARBOR, 0x9
110
+.equ VALUE_STARTER_PANFLAM, 0xa
111
+.equ VALUE_STARTER_PLINFA, 0xb
112
+.equ VALUE_STARTER_CHELAST, 0xc
113
+.equ VALUE_STARTER_FLOINK, 0xd
114
+.equ VALUE_STARTER_OTTARO, 0xe
115
+.equ VALUE_STARTER_SERPIFEU, 0xf
116
+.equ VALUE_STARTER_FYNX, 0x10
117
+.equ VALUE_STARTER_FROXY, 0x11
118
+.equ VALUE_STARTER_IGAMARO, 0x12
119
+.equ VALUE_STARTER_FLAMIAU, 0x13
120
+.equ VALUE_STARTER_ROBBALL, 0x14
121
+.equ VALUE_STARTER_BAUZ, 0x15
122
+
123
+
124
+
64 125
 @ARM Assembly macro definitions for story_var
65 126
 
66 127
 

+ 1
- 0
src/include/script/language.h Datei anzeigen

@@ -77,6 +77,7 @@
77 77
 .equ EMOT_SCHOCKIERT, 0x8
78 78
 .equ EMOT_BOESESLACHEN, 0x9
79 79
 .equ EMOT_GENERVT, 0xa
80
+.equ EMOT_ERFREUT, 0xb
80 81
 
81 82
 @@@@@@@@@@@@@@@@@ Macro
82 83