dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Get all map constants from include/ rather than constants/

Browse Source
This commit is contained in:
Marcus Huderle
2018-06-14 22:00:09 -05:00
parent 0c8cfc2297
commit acc1a5d446
621 changed files with 1839 additions and 2454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
asm/macros/map.inc
View File

@@ -1,38 +1,8 @@
.macro new_map_group
inc cur_map_group
.set cur_map_num, 0
.macro map map_id
.byte \map_id >> 8 @ map group
.byte \map_id & 0xFF @ map num
.endm
.macro map_group map_name
.set GROUP_\map_name, cur_map_group
.set MAP_\map_name, cur_map_num
inc cur_map_num
.endm
.macro map map_name
.byte GROUP_\map_name
.byte MAP_\map_name
.endm
.macro warp_map map_name
.byte MAP_\map_name
.byte GROUP_\map_name
.endm
.macro heal_location map_name, x, y
.byte GROUP_\map_name
.byte MAP_\map_name
.2byte \x
.2byte \y
.space 2
.endm
.equiv GROUP_NONE, 0x7f
.equiv MAP_NONE, 0x7f
.equiv GROUP_UNDEFINED, 0xff
.equiv MAP_UNDEFINED, 0xff
.macro map_script type, address
.byte \type
.4byte \address
@@ -56,10 +26,11 @@
inc _num_npcs
.endm
.macro warp_def x, y, byte, warp, map
.macro warp_def x, y, byte, warp, map_id
.2byte \x, \y
.byte \byte, \warp
warp_map \map
.byte \map_id & 0xFF @ map num
.byte \map_id >> 8 @ map group
inc _num_warps
.endm
@@ -107,7 +78,7 @@
.equiv connection_dive, 5
.equiv connection_emerge, 6
.macro connection direction, offset, map, filler
.macro connection direction, offset, map
.4byte connection_\direction
.4byte \offset
map \map