Merge branch 'master' of github.com:SBird1337/source_of_the_sovereign

data/overworld/wild_pokemon_data.s

@@ -322,42 +322,42 @@ grass_data_24:
 
 .align 2 
 grass_data_25:
-.byte 0x5
+.byte 0x1
 .byte 0x0, 0x0, 0x0
 .word pkmn_grass_data_6
 .hword 0xFFFF
 
 .align 2 
 grass_data_26:
-.byte 0x5
+.byte 0x1
 .byte 0x0, 0x0, 0x0
 .word pkmn_grass_data_6
 .hword 0xFFFF
 
 .align 2 
 grass_data_27:
-.byte 0x5
+.byte 0x1
 .byte 0x0, 0x0, 0x0
 .word pkmn_grass_data_6
 .hword 0xFFFF
 
 .align 2 
 grass_data_28:
-.byte 0x5
+.byte 0x1
 .byte 0x0, 0x0, 0x0
 .word pkmn_grass_data_6
 .hword 0xFFFF
 
 .align 2 
 grass_data_29:
-.byte 0x5
+.byte 0x1
 .byte 0x0, 0x0, 0x0
 .word pkmn_grass_data_6
 .hword 0xFFFF
 
 .align 2 
 grass_data_30:
-.byte 0x5
+.byte 0x1
 .byte 0x0, 0x0, 0x0
 .word pkmn_grass_data_6
 .hword 0xFFFF

src/include/pymap_constants.h

@@ -140,6 +140,7 @@
 .equ VALUE_HESPERIA_BRUECKE, 0x8
 .equ VALUE_MAPSCRIPT_HESPERIAGRABEN, 0x9
 .equ VALUE_VOR_DEM_REBERARUNNEL, 0xa
+.equ VALUE_MAPSCRIPT_OST_REBERA_GEB, 0xb
 
 
 
@@ -148,6 +149,22 @@
 
 .equ VAR_XPOS, 0x5054
 .equ VAR_YPOS, 0x5055
+.equ VAR_LASTPLAYERFACE, 0x5056
+.equ VAR_LASTBANK, 0x5057
+.equ VAR_LASTMAP, 0x5058
+.equ VAR_LASTWARP, 0x5059
+
+
+
+@ARM Assembly macro definitions for raetsel_var
+
+
+.equ VAR_HESGRABEN_SCHALTER_1, 0x505a
+.equ VAR_HESGRABEN_SCHALTER_2, 0x505b
+.equ VAR_HESGRABEN_SCHALTER_3, 0x505c
+.equ VAR_HESGRABEN_SCHALTER_4, 0x505d
+.equ VAR_HESGRABEN_SCHALTER_5, 0x505e
+.equ VAR_HESGRABEN_SCHALTER_6, 0x505f