diff options
| author | vulcandth <vulcandth@gmail.com> | 2022-06-06 16:25:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-06 17:25:31 -0400 |
| commit | 6b5be9129cabe72b9f775b02db1bf7e7169153da (patch) | |
| tree | d92012450c70f90bf8086bed32ec3dc87b68b332 /home | |
| parent | Improved Virtual Console patch identifiers (#357) (diff) | |
| download | pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.gz pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.xz pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.zip | |
RGBDS syntax updates (#358)
New MACRO and DEF syntax
Diffstat (limited to 'home')
| -rw-r--r-- | home/init.asm | 2 | ||||
| -rw-r--r-- | home/print_num.asm | 22 | ||||
| -rw-r--r-- | home/text.asm | 2 | ||||
| -rw-r--r-- | home/text_script.asm | 2 | ||||
| -rw-r--r-- | home/vblank.asm | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/home/init.asm b/home/init.asm index e5840e65..81e75586 100644 --- a/home/init.asm +++ b/home/init.asm @@ -8,7 +8,7 @@ SoftReset:: Init:: ; Program init. -rLCDC_DEFAULT EQU %11100011 +DEF rLCDC_DEFAULT EQU %11100011 ; * LCD enabled ; * Window tile map at $9C00 ; * Window display enabled diff --git a/home/print_num.asm b/home/print_num.asm index e2628b1f..ef202239 100644 --- a/home/print_num.asm +++ b/home/print_num.asm @@ -59,20 +59,20 @@ PrintNumber:: cp 6 jr z, .hundred_thousands -print_digit: MACRO +MACRO print_digit -IF (\1) / $10000 - ld a, \1 / $10000 % $100 -ELSE - xor a -ENDC + IF (\1) / $10000 + ld a, \1 / $10000 % $100 + ELSE + xor a + ENDC ldh [hPowerOf10 + 0], a -IF (\1) / $100 - ld a, \1 / $100 % $100 -ELSE - xor a -ENDC + IF (\1) / $100 + ld a, \1 / $100 % $100 + ELSE + xor a + ENDC ldh [hPowerOf10 + 1], a ld a, \1 / $1 % $100 diff --git a/home/text.asm b/home/text.asm index 244c6fdb..b1f5e55c 100644 --- a/home/text.asm +++ b/home/text.asm @@ -123,7 +123,7 @@ TextIDErrorText:: ; "[hSpriteIndexOrTextID] ERROR." text_far _TextIDErrorText text_end -print_name: MACRO +MACRO print_name push de ld de, \1 jr PlaceCommandCharacter diff --git a/home/text_script.asm b/home/text_script.asm index 39bc3f5b..9e1ba275 100644 --- a/home/text_script.asm +++ b/home/text_script.asm @@ -66,7 +66,7 @@ DisplayTextID:: ; check first byte of text for special cases -dict2: MACRO +MACRO dict2 cp \1 jr nz, .not\@ \2 diff --git a/home/vblank.asm b/home/vblank.asm index 4c7abc20..b8b46ba7 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -93,7 +93,7 @@ DelayFrame:: ; Wait for the next vblank interrupt. ; As a bonus, this saves battery. -NOT_VBLANKED EQU 1 +DEF NOT_VBLANKED EQU 1 ld a, NOT_VBLANKED ldh [hVBlankOccurred], a |