-
Notifications
You must be signed in to change notification settings - Fork 817
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor the Unown wall word data (#1131)
- Loading branch information
Showing
4 changed files
with
50 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,23 @@ | ||
MACRO unownwall | ||
for n, CHARLEN(\1) | ||
DEF x = CHARSUB(\1, n + 1) | ||
if x == "-" | ||
db $64 | ||
elif x >= "Y" | ||
db 2 * (x - "Y") + $60 | ||
elif x >= "Q" | ||
db 2 * (x - "Q") + $40 | ||
elif x >= "I" | ||
db 2 * (x - "I") + $20 | ||
else | ||
db 2 * (x - "A") | ||
endc | ||
endr | ||
db -1 ; end | ||
ENDM | ||
; strings correspond to UNOWNWORDS_* constants (see constants/script_constants.asm) | ||
DEF UNOWNWORD_{d:UNOWNWORDS_ESCAPE} EQUS "ESCAPE" | ||
DEF UNOWNWORD_{d:UNOWNWORDS_LIGHT} EQUS "LIGHT" | ||
DEF UNOWNWORD_{d:UNOWNWORDS_WATER} EQUS "WATER" | ||
DEF UNOWNWORD_{d:UNOWNWORDS_HO_OH} EQUS "HO-OH" | ||
|
||
UnownWalls: | ||
; UNOWNWORDS_ESCAPE | ||
; db $08, $44, $04, $00, $2e, $08, -1 | ||
unownwall "ESCAPE" | ||
; UNOWNWORDS_LIGHT | ||
; db $26, $20, $0c, $0e, $46, -1 | ||
unownwall "LIGHT" | ||
; UNOWNWORDS_WATER | ||
; db $4c, $00, $46, $08, $42, -1 | ||
unownwall "WATER" | ||
; UNOWNWORDS_HO_OH | ||
; db $0e, $2c, $64, $2c, $0e, -1 | ||
unownwall "HO-OH" | ||
; entries correspond to UNOWNWORDS_* constants | ||
list_start UnownWalls | ||
for x, NUM_UNOWN_WALLS | ||
li "{UNOWNWORD_{d:x}}" | ||
endr | ||
assert_list_length NUM_UNOWN_WALLS | ||
|
||
MenuHeaders_UnownWalls: | ||
; UNOWNWORDS_ESCAPE | ||
db MENU_BACKUP_TILES ; flags | ||
menu_coords 3, 4, 16, 9 | ||
; UNOWNWORDS_LIGHT | ||
db MENU_BACKUP_TILES ; flags | ||
menu_coords 4, 4, 15, 9 | ||
; UNOWNWORDS_WATER | ||
db MENU_BACKUP_TILES ; flags | ||
menu_coords 4, 4, 15, 9 | ||
; UNOWNWORDS_HO_OH | ||
db MENU_BACKUP_TILES ; flags | ||
menu_coords 4, 4, 15, 9 | ||
; entries correspond to UNOWNWORDS_* constants | ||
table_width UNOWN_WALL_MENU_HEADER_SIZE, MenuHeaders_UnownWalls | ||
for x, NUM_UNOWN_WALLS | ||
DEF n = CHARLEN("{UNOWNWORD_{d:x}}") | ||
db MENU_BACKUP_TILES ; flags | ||
menu_coords 9 - n, 4, 10 + n, 9 | ||
endr | ||
assert_table_length NUM_UNOWN_WALLS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters