diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2016-02-22 12:05:26 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2016-02-22 12:05:26 +0100 |
| commit | b3b437ab2902e70504b1e1f80a40c946d8f8c55d (patch) | |
| tree | be180df500ae758b622a39ab7b365f6ade7da250 /src | |
| parent | 0a642f8f1442397c75e06b14ae0da3f7f0af3241 (diff) | |
text_hl macro
Diffstat (limited to 'src')
| -rwxr-xr-x | src/engine/bank1.asm | 4 | ||||
| -rwxr-xr-x | src/engine/home.asm | 6 | ||||
| -rwxr-xr-x | src/macros.asm | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm index 57905c3..47a4e94 100755 --- a/src/engine/bank1.asm +++ b/src/engine/bank1.asm @@ -622,11 +622,11 @@ CheckIfActiveCardParalyzedOrAsleep: ; 4918 (1:4918) ret .paralyzed: - ld hl, $0025 + text_hl Text0025 ; paralyzed jr .returnWithStatusCondition .asleep: - ld hl, $0024 + text_hl Text0024 ; asleep .returnWithStatusCondition: scf diff --git a/src/engine/home.asm b/src/engine/home.asm index 148da07..57bf830 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -5877,13 +5877,13 @@ CheckIfCantAttackDueToAttackEffect:: ; 33c1 (0:33c1) call GetTurnDuelistVariable or a ret z - ld hl, $0100 ;tail wag + text_hl Text0100 ;tail wag cp $05 jr z, .returnWithCantAttack - ld hl, $0101 ;leer + text_hl Text0101 ;leer cp $06 jr z, .returnWithCantAttack - ld hl, $0102 ;bone attack + text_hl Text0102 ;bone attack cp $0b jr z, .returnWithCantAttack or a diff --git a/src/macros.asm b/src/macros.asm index f1a850d..75a2ea7 100755 --- a/src/macros.asm +++ b/src/macros.asm @@ -42,6 +42,10 @@ GLOBAL \1_ const_value = const_value + 1 ENDM +text_hl: MACRO + ld hl, \1_ +ENDM + SGB: MACRO db \1 * 8 + \2 ; sgb_command * 8 + length ENDM |