diff options
| author | IIMarckus <iimarckus@gmail.com> | 2011-12-26 17:22:34 -0700 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2011-12-26 17:22:34 -0700 |
| commit | d5c498a7ec074aaef1a7074ec8cbd254d100826d (patch) | |
| tree | f22d660b185b25e85d3f344a2b9e636855cdfecd | |
| parent | 4a6d81aea2e9ff583336f11268981dd463d25734 (diff) | |
Remove TX_NULL; it is obsoleted by db "@"
hg-commit-id: 9fdfeb4cbdf0
| -rw-r--r-- | constants.asm | 4 | ||||
| -rw-r--r-- | pokered.asm | 22 |
2 files changed, 11 insertions, 15 deletions
diff --git a/constants.asm b/constants.asm index 30a62ca1..6338441b 100644 --- a/constants.asm +++ b/constants.asm @@ -53,10 +53,6 @@ TX_FAR: MACRO db BANK(\1) ENDM -TX_NULL: MACRO - db $50 - ENDM - ; wram locations W_AICOUNT EQU $CCDF ; number of times remaining that AI action can occur diff --git a/pokered.asm b/pokered.asm index 4c048d88..c1d3ef98 100644 --- a/pokered.asm +++ b/pokered.asm @@ -615,7 +615,7 @@ Char00Text: ; “%d ERROR.” db $17 dw $6696 db $22 - TX_NULL + db "@" Char52: ; player’s name push de @@ -4408,31 +4408,31 @@ ItemUseBallText00: ;$5937 db $17 dw $6729 db $29 - TX_NULL + db "@" ItemUseBallText01: ;$593c ;"You missed the pokemon!" db $17 dw $675f db $29 - TX_NULL + db "@" ItemUseBallText02: ;$5941 ;"Darn! The pokemon broke free!" db $17 dw $6775 db $29 - TX_NULL + db "@" ItemUseBallText03: ;$5946 ;"Aww! It appeared to be caught!" db $17 dw $6791 db $29 - TX_NULL + db "@" ItemUseBallText04: ;$594b ;"Shoot! It was so close too!" db $17 dw $67b2 db $29 - TX_NULL + db "@" ItemUseBallText05: ;$5950 ;"All right! {MonName} was caught!" ;play sound @@ -4440,19 +4440,19 @@ ItemUseBallText05: ;$5950 dw $67cf db $29 db $12,$06 - TX_NULL + db "@" ItemUseBallText07: ;$5957 ;"X was transferred to Bill's PC" db $17 dw $67ee db $29 - TX_NULL + db "@" ItemUseBallText08: ;$595c ;"X was transferred to someone's PC" db $17 dw $6810 db $29 - TX_NULL + db "@" ItemUseBallText06: ;$5961 ;"New DEX data will be added..." @@ -4461,7 +4461,7 @@ ItemUseBallText06: ;$5961 dw $6835 db $29 db $13,$06 - TX_NULL + db "@" ItemUseTownMap: ;03:5968 ld a,[$d057] ;in-battle or outside @@ -4545,7 +4545,7 @@ ItemUseText00: ;03:65e8 db $17 dw $4009 db $2A - TX_NULL + db "@" INCBIN "baserom.gbc",$E5F2,$E919 - $E5F2 ; super rod data |