Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030

Browse Source 
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
This commit is contained in:
Eduardo Quezada committed 2022-10-30 12:30:38 -03:00
2 parents 93dd8786ee c76beed989
commit e4a439aa46
578 files changed
+31627 -25653
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

asm/macros/event.inc
+1 -1
View File
@@ -469,7 +469,7 @@
formatwarp \map, \a, \b, \c
.endm
@ Sets the dynamic warp destination. Warps with a destination map of MAP_NONE will target this destination.
@ Sets the dynamic warp destination. Warps with a destination map of MAP_DYNAMIC will target this destination.
@ Warp commands can be given either the id of which warp location to go to on the destination map
@ or a pair of x/y coordinates to go to directly on the destination map.
.macro setdynamicwarp map:req, a, b, c