Sync with the recent updates to pokecrystal.

3 files changed, 22 insertions, 30 deletions

diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
index fd8015a9..4f55fd78 100644
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
@@ -125,7 +125,7 @@ INCLUDE "data/events/bug_contest_winners.asm"
 
 BugContest_GetPlayersResult:
 	ld hl, wBugContestThirdPlaceWinnerID
-	ld de, - BUG_CONTESTANT_SIZE
+	ld de, -BUG_CONTESTANT_SIZE
 	ld b, 3 ; 3rd, 2nd, or 1st
 .loop
 	ld a, [hl]
@@ -210,7 +210,7 @@ DetermineContestWinners:
 CopyTempContestant:
 ; Could've just called CopyBytes.
 	ld de, wBugContestTempWinnerID
-rept BUG_CONTESTANT_SIZE + -1
+rept BUG_CONTESTANT_SIZE - 1
 	ld a, [de]
 	inc de
 	ld [hli], a
diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm
index 9770c35b..7d2262af 100755
--- a/engine/events/heal_machine_anim.asm
+++ b/engine/events/heal_machine_anim.asm
@@ -134,25 +134,25 @@ ENDM
 	ret
 
 .PC_ElmsLab_OAM:
-	dsprite   4, 0,   4, 2, $7c, PAL_OW_TREE | OBP_NUM
-	dsprite   4, 0,   4, 6, $7c, PAL_OW_TREE | OBP_NUM
-	dsprite   4, 6,   4, 0, $7d, PAL_OW_TREE | OBP_NUM
-	dsprite   4, 6,   5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
-	dsprite   5, 3,   4, 0, $7d, PAL_OW_TREE | OBP_NUM
-	dsprite   5, 3,   5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
-	dsprite   6, 0,   4, 0, $7d, PAL_OW_TREE | OBP_NUM
-	dsprite   6, 0,   5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
+	dbsprite   4,   4, 2, 0, $7c, PAL_OW_TREE | OBP_NUM
+	dbsprite   4,   4, 6, 0, $7c, PAL_OW_TREE | OBP_NUM
+	dbsprite   4,   4, 0, 6, $7d, PAL_OW_TREE | OBP_NUM
+	dbsprite   5,   4, 0, 6, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
+	dbsprite   4,   5, 0, 3, $7d, PAL_OW_TREE | OBP_NUM
+	dbsprite   5,   5, 0, 3, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
+	dbsprite   4,   6, 0, 0, $7d, PAL_OW_TREE | OBP_NUM
+	dbsprite   5,   6, 0, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
 
 .HealMachineGFX:
 INCBIN "gfx/overworld/heal_machine.2bpp"
 
 .HOF_OAM:
-	dsprite   7, 4,  10, 1, $7d, PAL_OW_TREE | OBP_NUM
-	dsprite   7, 4,  10, 6, $7d, PAL_OW_TREE | OBP_NUM
-	dsprite   7, 3,   9, 5, $7d, PAL_OW_TREE | OBP_NUM
-	dsprite   7, 3,  11, 2, $7d, PAL_OW_TREE | OBP_NUM
-	dsprite   7, 1,   9, 1, $7d, PAL_OW_TREE | OBP_NUM
-	dsprite   7, 1,  11, 5, $7d, PAL_OW_TREE | OBP_NUM
+	dbsprite  10,   7, 1, 4, $7d, PAL_OW_TREE | OBP_NUM
+	dbsprite  10,   7, 6, 4, $7d, PAL_OW_TREE | OBP_NUM
+	dbsprite   9,   7, 5, 3, $7d, PAL_OW_TREE | OBP_NUM
+	dbsprite  11,   7, 2, 3, $7d, PAL_OW_TREE | OBP_NUM
+	dbsprite   9,   7, 1, 1, $7d, PAL_OW_TREE | OBP_NUM
+	dbsprite  11,   7, 5, 1, $7d, PAL_OW_TREE | OBP_NUM
 
 .LoadPalettes:
 	call IsCGB
@@ -171,15 +171,7 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
 	ret
 
 .palettes
-	rst $38
-	ld a, a
-	ld a, a
-	ld a, [hl+]
-	rst $38
-	inc b
-	nop
-	nop
-;INCLUDE "gfx/overworld/heal_machine.pal"
+INCLUDE "gfx/overworld/heal_machine.pal"
 
 .FlashPalettes8Times:
 	ld c, 8
diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm
index 893e8e6d..0d67ae72 100644
--- a/engine/events/print_unown.asm
+++ b/engine/events/print_unown.asm
@@ -112,7 +112,7 @@ _UnownPrinter:
 	ld a, [hl]
 	and a
 	jr nz, .wrap_around_left
-	ld [hl], 26 + 1
+	ld [hl], NUM_UNOWN + 1
 .wrap_around_left
 	dec [hl]
 	jr .return
@@ -120,7 +120,7 @@ _UnownPrinter:
 .press_right
 	ld hl, wJumptableIndex
 	ld a, [hl]
-	cp 26
+	cp NUM_UNOWN
 	jr c, .wrap_around_right
 	ld [hl], -1
 .wrap_around_right
@@ -132,7 +132,7 @@ _UnownPrinter:
 
 .UpdateUnownFrontpic:
 	ld a, [wJumptableIndex]
-	cp 26
+	cp NUM_UNOWN
 	jr z, .vacant
 	inc a
 	ld [wUnownLetter], a
@@ -158,9 +158,9 @@ _UnownPrinter:
 	hlcoord 1, 9
 	ld de, UnownDexVacantString
 	call PlaceString
-	xor a ; sDecompressScratch
+	xor a ; sScratch
 	call OpenSRAM
-	ld hl, sDecompressScratch
+	ld hl, sScratch
 	ld bc, $31 tiles
 	xor a
 	call ByteFill