diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /home/text.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'home/text.asm')
| -rw-r--r-- | home/text.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/home/text.asm b/home/text.asm index 39d9a3ed1..7cf3c2c60 100644 --- a/home/text.asm +++ b/home/text.asm @@ -200,21 +200,21 @@ NextChar:: ; 1083 jp PlaceNextChar CheckDict:: ; 1087 -dict: macro +dict: MACRO if \1 == 0 and a else cp \1 endc jp z, \2 -endm +ENDM -dict2: macro +dict2: MACRO cp \1 jr nz, ._\@ ld a, \2 ._\@: -endm +ENDM dict "<DAY>", Char15 dict "<LINE>", LineChar @@ -309,11 +309,11 @@ Char15:: ; 117b ; 1186 -print_name: macro +print_name: MACRO push de ld de, \1 jp PlaceCommandCharacter -endm +ENDM PrintMomsName: print_name MomsName ; 1186 PrintPlayerName: print_name PlayerName ; 118d @@ -400,7 +400,7 @@ PlaceGenderedPlayerName:: ; 1252 call PlaceString ld h, b ld l, c - ld a, [PlayerGender] + ld a, [wPlayerGender] bit 0, a ld de, String_kun jr z, PlaceCommandCharacter |