diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-02-27 11:09:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 11:09:09 -0600 |
| commit | 96b32412d82bdee2756b1a300b05d2647da9ad1f (patch) | |
| tree | 677858a17041e829c8a442be2b16b43e20d2a341 /src/constants/text_constants.asm | |
| parent | 24f40989d472407dc51653f2a671348126c6e816 (diff) | |
| parent | 43d4b8644de2ffb3b1fc13638081cd228c4b2c74 (diff) | |
Merge pull request #35 from xCrystal/master
Lots of bank0 and some bank1 disasm, labeling and corrections ; Many constants related to duels, cards, and WRAM structs ; Replace hardcoded WRAM addresses with generic labels ; Style clean up ; Format SGB packets ; Reorganize some gfx files
Diffstat (limited to 'src/constants/text_constants.asm')
| -rw-r--r--[-rwxr-xr-x] | src/constants/text_constants.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/constants/text_constants.asm b/src/constants/text_constants.asm index 674037e..062f5e4 100755..100644 --- a/src/constants/text_constants.asm +++ b/src/constants/text_constants.asm @@ -6,15 +6,15 @@ TX_RAM1 EQU $09 TX_RAM2 EQU $0B TX_RAM3 EQU $0C -text EQUS "db TX_START," -line EQUS "db TX_LINE," +text EQUS "db TX_START, " +line EQUS "db TX_LINE, " done EQUS "db TX_END" -TX_FIRE EQUS "$05,$01" -TX_GRASS EQUS "$05,$02" -TX_LIGHTNING EQUS "$05,$03" -TX_WATER EQUS "$05,$04" -TX_FIGHTING EQUS "$05,$05" -TX_PSYCHIC EQUS "$05,$06" -TX_COLORLESS EQUS "$05,$07" -TX_LVL EQUS "$05,$11" +TX_FIRE EQUS "$05, $01" +TX_GRASS EQUS "$05, $02" +TX_LIGHTNING EQUS "$05, $03" +TX_WATER EQUS "$05, $04" +TX_FIGHTING EQUS "$05, $05" +TX_PSYCHIC EQUS "$05, $06" +TX_COLORLESS EQUS "$05, $07" +TX_LVL EQUS "$05, $11" |