Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #503 from Rangi42/master

Browse Source 
Factor wMisc into meaningful parts; move most code out of home.asm
This commit is contained in:
yenatch
2018-04-09 21:30:24 -04:00
committed by GitHub
parent e4b41fad4f 53ff57ca66
commit 40b537d45b
59 changed files with 1652 additions and 1610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
data/events/unown_walls.asm
View File

@@ -2,20 +2,14 @@ unownwall: MACRO
rept _NARG
if \1 == "-"
x = $64
else
if \1 >= "Y"
elif \1 >= "Y"
x = 2 * (\1 - "Y") + $60
else
if \1 >= "Q"
elif \1 >= "Q"
x = 2 * (\1 - "Q") + $40
else
if \1 >= "I"
elif \1 >= "I"
x = 2 * (\1 - "I") + $20
else
x = 2 * (\1 - "A")
endc
endc
endc
endc
db x
shift
@@ -25,16 +19,16 @@ ENDM
UnownWalls: ; 8aebc
; UNOWNWORDS_ESCAPE
; db $08, $44, $04, $00, $2e, $08, $ff
; db $08, $44, $04, $00, $2e, $08, -1
unownwall "E", "S", "C", "A", "P", "E"
; UNOWNWORDS_LIGHT
; db $26, $20, $0c, $0e, $46, $ff
; db $26, $20, $0c, $0e, $46, -1
unownwall "L", "I", "G", "H", "T"
; UNOWNWORDS_WATER
; db $4c, $00, $46, $08, $42, $ff
; db $4c, $00, $46, $08, $42, -1
unownwall "W", "A", "T", "E", "R"
; UNOWNWORDS_HO_OH
; db $0e, $2c, $64, $2c, $0e, $ff
; db $0e, $2c, $64, $2c, $0e, -1
unownwall "H", "O", "-", "O", "H"
; 8aed5

16
data/maps/attributes.asm
View File

@@ -27,39 +27,39 @@ connection: MACRO
if "\1" == "north"
map_id \3
dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5
dw wOverworldMap + \4 + 3
dw wOverworldMapBlocks + \4 + 3
db \6
db \3_WIDTH
db \3_HEIGHT * 2 - 1
db (\4 - \5) * -2
dw wOverworldMap + \3_HEIGHT * (\3_WIDTH + 6) + 1
dw wOverworldMapBlocks + \3_HEIGHT * (\3_WIDTH + 6) + 1
elif "\1" == "south"
map_id \3
dw \2_Blocks + \5
dw wOverworldMap + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3
dw wOverworldMapBlocks + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3
db \6
db \3_WIDTH
db 0
db (\4 - \5) * -2
dw wOverworldMap + \3_WIDTH + 7
dw wOverworldMapBlocks + \3_WIDTH + 7
elif "\1" == "west"
map_id \3
dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3
dw wOverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3)
dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3)
db \6
db \3_WIDTH
db (\4 - \5) * -2
db \3_WIDTH * 2 - 1
dw wOverworldMap + \3_WIDTH * 2 + 6
dw wOverworldMapBlocks + \3_WIDTH * 2 + 6
elif "\1" == "east"
map_id \3
dw \2_Blocks + (\3_WIDTH * \5)
dw wOverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3
dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3
db \6
db \3_WIDTH
db (\4 - \5) * -2
db 0
dw wOverworldMap + \3_WIDTH + 7
dw wOverworldMapBlocks + \3_WIDTH + 7
endc
ENDM