Browse Source

some new scripts

dragonflysots 6 years ago
parent
commit
85b4c57568
3 changed files with 24 additions and 7 deletions
  1. 6
    6
      data/overworld/wild_pokemon_data.s
  2. 1
    1
      sots-private
  3. 17
    0
      src/include/pymap_constants.h

+ 6
- 6
data/overworld/wild_pokemon_data.s View File

322
 
322
 
323
 .align 2 
323
 .align 2 
324
 grass_data_25:
324
 grass_data_25:
325
-.byte 0x5
325
+.byte 0x1
326
 .byte 0x0, 0x0, 0x0
326
 .byte 0x0, 0x0, 0x0
327
 .word pkmn_grass_data_6
327
 .word pkmn_grass_data_6
328
 .hword 0xFFFF
328
 .hword 0xFFFF
329
 
329
 
330
 .align 2 
330
 .align 2 
331
 grass_data_26:
331
 grass_data_26:
332
-.byte 0x5
332
+.byte 0x1
333
 .byte 0x0, 0x0, 0x0
333
 .byte 0x0, 0x0, 0x0
334
 .word pkmn_grass_data_6
334
 .word pkmn_grass_data_6
335
 .hword 0xFFFF
335
 .hword 0xFFFF
336
 
336
 
337
 .align 2 
337
 .align 2 
338
 grass_data_27:
338
 grass_data_27:
339
-.byte 0x5
339
+.byte 0x1
340
 .byte 0x0, 0x0, 0x0
340
 .byte 0x0, 0x0, 0x0
341
 .word pkmn_grass_data_6
341
 .word pkmn_grass_data_6
342
 .hword 0xFFFF
342
 .hword 0xFFFF
343
 
343
 
344
 .align 2 
344
 .align 2 
345
 grass_data_28:
345
 grass_data_28:
346
-.byte 0x5
346
+.byte 0x1
347
 .byte 0x0, 0x0, 0x0
347
 .byte 0x0, 0x0, 0x0
348
 .word pkmn_grass_data_6
348
 .word pkmn_grass_data_6
349
 .hword 0xFFFF
349
 .hword 0xFFFF
350
 
350
 
351
 .align 2 
351
 .align 2 
352
 grass_data_29:
352
 grass_data_29:
353
-.byte 0x5
353
+.byte 0x1
354
 .byte 0x0, 0x0, 0x0
354
 .byte 0x0, 0x0, 0x0
355
 .word pkmn_grass_data_6
355
 .word pkmn_grass_data_6
356
 .hword 0xFFFF
356
 .hword 0xFFFF
357
 
357
 
358
 .align 2 
358
 .align 2 
359
 grass_data_30:
359
 grass_data_30:
360
-.byte 0x5
360
+.byte 0x1
361
 .byte 0x0, 0x0, 0x0
361
 .byte 0x0, 0x0, 0x0
362
 .word pkmn_grass_data_6
362
 .word pkmn_grass_data_6
363
 .hword 0xFFFF
363
 .hword 0xFFFF

+ 1
- 1
sots-private

1
-Subproject commit 822e246698cb198d4236b2a776391e0806307e09
1
+Subproject commit 6183eec64bd528e098512be52166141b25c4d1a1

+ 17
- 0
src/include/pymap_constants.h View File

140
 .equ VALUE_HESPERIA_BRUECKE, 0x8
140
 .equ VALUE_HESPERIA_BRUECKE, 0x8
141
 .equ VALUE_MAPSCRIPT_HESPERIAGRABEN, 0x9
141
 .equ VALUE_MAPSCRIPT_HESPERIAGRABEN, 0x9
142
 .equ VALUE_VOR_DEM_REBERARUNNEL, 0xa
142
 .equ VALUE_VOR_DEM_REBERARUNNEL, 0xa
143
+.equ VALUE_MAPSCRIPT_OST_REBERA_GEB, 0xb
143
 
144
 
144
 
145
 
145
 
146
 
148
 
149
 
149
 .equ VAR_XPOS, 0x5054
150
 .equ VAR_XPOS, 0x5054
150
 .equ VAR_YPOS, 0x5055
151
 .equ VAR_YPOS, 0x5055
152
+.equ VAR_LASTPLAYERFACE, 0x5056
153
+.equ VAR_LASTBANK, 0x5057
154
+.equ VAR_LASTMAP, 0x5058
155
+.equ VAR_LASTWARP, 0x5059
156
+
157
+
158
+
159
+@ARM Assembly macro definitions for raetsel_var
160
+
161
+
162
+.equ VAR_HESGRABEN_SCHALTER_1, 0x505a
163
+.equ VAR_HESGRABEN_SCHALTER_2, 0x505b
164
+.equ VAR_HESGRABEN_SCHALTER_3, 0x505c
165
+.equ VAR_HESGRABEN_SCHALTER_4, 0x505d
166
+.equ VAR_HESGRABEN_SCHALTER_5, 0x505e
167
+.equ VAR_HESGRABEN_SCHALTER_6, 0x505f
151
 
168
 
152
 
169
 
153
 
170