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 /mobile/fixed_words.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'mobile/fixed_words.asm')
| -rwxr-xr-x | mobile/fixed_words.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index a0f65599c..b3f33fafe 100755 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -322,11 +322,11 @@ Function11c1b9: ; 11c1b9 call SetPalettes call DisableLCD ld hl, GFX_11d67e - ld de, VTiles2 + ld de, vTiles2 ld bc, $60 call CopyBytes ld hl, LZ_11d6de - ld de, VTiles0 + ld de, vTiles0 call Decompress call EnableLCD farcall ReloadMapPart @@ -4209,7 +4209,7 @@ MobileEZChatCategoryPointers: ; 11daac ; 11f220 MobileEZChatData_WordAndPageCounts: -macro_11f220: macro +macro_11f220: MACRO ; parameter: number of words db \1 ; 12 words per page (0-based indexing) @@ -4218,7 +4218,7 @@ if \1 % 12 == 0 x = x +- 1 endc db x -endm +ENDM macro_11f220 18 ; 01: Types macro_11f220 36 ; 02: Greetings macro_11f220 69 ; 03: People @@ -4240,10 +4240,10 @@ EZChat_SortedWords: ; allocated size for each. ; These arrays are expanded dynamically to accomodate ; any Pokemon you've seen that starts with each kana.\ -macro_11f23c: macro +macro_11f23c: MACRO dw x - w3_d000, \1 x = x + 2 * \1 -endm +ENDM x = $d012 macro_11f23c $2f ; a macro_11f23c $1e ; i |