summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-01 18:13:31 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-01 18:13:31 -0500
commit010b450834bd595b961582aea5e5771632510ef9 (patch)
tree7a13777e9b276b0472acf9301199e185c495652b /engine
parent31c407bb3de7328f9e80f006052c23ffcfbbfe39 (diff)
Prepare to merge
Diffstat (limited to 'engine')
-rw-r--r--engine/color.asm24
-rw-r--r--engine/scripting.asm6
-rw-r--r--engine/specials.asm2
3 files changed, 19 insertions, 13 deletions
diff --git a/engine/color.asm b/engine/color.asm
index ed65f59df..9fde4d77d 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1,6 +1,12 @@
INCLUDE "predef/sgb.asm"
+SHINY_ATK_BIT EQU 5
+SHINY_DEF_VAL EQU 10
+SHINY_SPD_VAL EQU 10
+SHINY_SPC_VAL EQU 10
+LO_NYBBLE EQU $0f
+HI_NYBBLE EQU $f0
CheckShininess: ; 8a68
; Check if a mon is shiny by DVs at bc.
@@ -11,25 +17,25 @@ CheckShininess: ; 8a68
; Attack
ld a, [hl]
- and %0010 << 4
+ and 1 << SHINY_ATK_BIT
jr z, .NotShiny
; Defense
ld a, [hli]
- and %1111
- cp %1010
+ and LO_NYBBLE
+ cp SHINY_DEF_VAL
jr nz, .NotShiny
; Speed
ld a, [hl]
- and %1111 << 4
- cp %1010 << 4
+ and HI_NYBBLE
+ cp SHINY_SPD_VAL << 4
jr nz, .NotShiny
; Special
ld a, [hl]
- and %1111
- cp %1010
+ and LO_NYBBLE
+ cp SHINY_SPC_VAL
jr nz, .NotShiny
.Shiny
@@ -53,7 +59,7 @@ CheckContestMon: ; 8a88
; Defense
ld a, [hli]
- and $f
+ and LO_NYBBLE
cp 10
jr c, .Bad
@@ -64,7 +70,7 @@ CheckContestMon: ; 8a88
; Special
ld a, [hl]
- and $f
+ and LO_NYBBLE
cp 10
jr c, .Bad
diff --git a/engine/scripting.asm b/engine/scripting.asm
index a6b0b074c..c7c17b8d7 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -608,7 +608,7 @@ Script_verbosegiveitem2: ; 0x96f8e
call GetScriptByte
call GetVarAction
ld a, [de]
- ld [wd10c], a
+ ld [wItemQuantityChangeBuffer], a
ld hl, NumItems
call ReceiveItem
ld a, 1
@@ -2344,7 +2344,7 @@ Script_giveitem: ; 0x977ca
.ok
ld [CurItem], a
call GetScriptByte
- ld [wd10c], a
+ ld [wItemQuantityChangeBuffer], a
ld hl, NumItems
call ReceiveItem
jr nc, .full ; 0x977e3 $6
@@ -2368,7 +2368,7 @@ Script_takeitem: ; 0x977f0
call GetScriptByte
ld [CurItem], a
call GetScriptByte
- ld [wd10c], a
+ ld [wItemQuantityChangeBuffer], a
ld a, $ff
ld [wd107], a
ld hl, NumItems
diff --git a/engine/specials.asm b/engine/specials.asm
index d283a88de..ef53daedc 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -333,7 +333,7 @@ Special_GetMysteryGiftItem: ; c309
ld a, [sMysteryGiftItem]
ld [CurItem], a
ld a, $1
- ld [wd10c], a
+ ld [wItemQuantityChangeBuffer], a
ld hl, NumItems
call ReceiveItem
jr nc, .asm_c33d