Sync with the recent updates to pokecrystal.

9 files changed, 63 insertions, 68 deletions

diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm
index 41d4841c..9a16b224 100644
--- a/engine/battle/ai/scoring.asm
+++ b/engine/battle/ai/scoring.asm
@@ -1537,7 +1537,7 @@ AI_Smart_Spite:
 	dec [hl]
 	ret
 
-Function_0x38d16:
+Function_0x38cf7:
 	jp AIDiscourageMove
 
 AI_Smart_DestinyBond:
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index af102990..3814348d 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -5964,7 +5964,7 @@ LoadEnemyMon:
 ; Fill stats
 	ld de, wEnemyMonMaxHP
 	ld b, FALSE
-	ld hl, wEnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1) ; wLinkBattleRNs + 7 ; ?
+	ld hl, wEnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1)
 	predef CalcMonStats
 
 ; If we're in a trainer battle,
@@ -8036,7 +8036,7 @@ ShowLinkBattleParticipantsAfterEnd:
 	ld a, BANK(sLinkBattleStats)
 	call OpenSRAM
 
-	call AddLastBattleToLinkRecord
+	call AddLastLinkBattleToLinkRecord
 	call ReadAndPrintLinkBattleRecord
 
 	call CloseSRAM
@@ -8052,6 +8052,9 @@ ShowLinkBattleParticipantsAfterEnd:
 .Draw:
 	db "  DRAW@"
 
+LINK_BATTLE_RECORD_LENGTH EQUS "(sLinkBattleRecord1End - sLinkBattleRecord1)" ; 18
+NUM_LINK_BATTLE_RECORDS EQUS "((sLinkBattleStatsEnd - sLinkBattleRecord) / LINK_BATTLE_RECORD_LENGTH)" ; 5
+
 _DisplayLinkRecord:
 	ld a, BANK(sLinkBattleStats)
 	call OpenSRAM
@@ -8077,7 +8080,7 @@ ReadAndPrintLinkBattleRecord:
 	call ClearSprites
 	call .PrintBattleRecord
 	hlcoord 0, 8
-	ld b, 5
+	ld b, NUM_LINK_BATTLE_RECORDS
 	ld de, sLinkBattleRecord + 2
 .loop
 	push bc
@@ -8094,7 +8097,7 @@ ReadAndPrintLinkBattleRecord:
 	ld h, d
 	ld l, e
 	ld de, wceed
-	ld bc, 10
+	ld bc, NAME_LENGTH - 1
 	call CopyBytes
 	ld a, "@"
 	ld [de], a
@@ -8131,7 +8134,7 @@ ReadAndPrintLinkBattleRecord:
 	call PlaceString
 .next
 	pop hl
-	ld bc, 18
+	ld bc, LINK_BATTLE_RECORD_LENGTH
 	add hl, bc
 	ld d, h
 	ld e, l
@@ -8300,7 +8303,7 @@ GetRoamMonSpecies:
 	ld hl, wRoamMon3Species
 	ret
 
-AddLastBattleToLinkRecord:
+AddLastLinkBattleToLinkRecord:
 	ld hl, wOTPlayerID
 	ld de, wStringBuffer1
 	ld bc, 2
@@ -8308,10 +8311,10 @@ AddLastBattleToLinkRecord:
 	ld hl, wOTPlayerName
 	ld bc, NAME_LENGTH - 1
 	call CopyBytes
-	ld hl, sLinkBattleStats - 12
+	ld hl, sLinkBattleStats - (LINK_BATTLE_RECORD_LENGTH - 6)
 	call .StoreResult
 	ld hl, sLinkBattleRecord
-	ld d, 5
+	ld d, NUM_LINK_BATTLE_RECORDS
 .loop
 	push hl
 	inc hl
@@ -8322,17 +8325,17 @@ AddLastBattleToLinkRecord:
 	and a
 	jr z, .copy
 	push de
-	ld bc, 12
+	ld bc, LINK_BATTLE_RECORD_LENGTH - 6
 	ld de, wStringBuffer1
 	call CompareBytesLong
 	pop de
 	pop hl
 	jr c, .done
-	ld bc, 18
+	ld bc, LINK_BATTLE_RECORD_LENGTH
 	add hl, bc
 	dec d
 	jr nz, .loop
-	ld bc, -18
+	ld bc, -LINK_BATTLE_RECORD_LENGTH
 	add hl, bc
 	push hl
 
@@ -8340,7 +8343,7 @@ AddLastBattleToLinkRecord:
 	ld d, h
 	ld e, l
 	ld hl, wStringBuffer1
-	ld bc, 12
+	ld bc, LINK_BATTLE_RECORD_LENGTH - 6
 	call CopyBytes
 	ld b, 6
 	xor a
@@ -8359,12 +8362,12 @@ AddLastBattleToLinkRecord:
 	ld a, [wBattleResult]
 	and $f
 	cp LOSE
-	ld bc, sLinkBattleWins + 1 - (sLinkBattleStats - 12)
+	ld bc, (sLinkBattleRecord1Wins - sLinkBattleRecord1) + 1
 	jr c, .okay ; WIN
-	ld bc, sLinkBattleLosses + 1 - (sLinkBattleStats - 12)
+	ld bc, (sLinkBattleRecord1Losses - sLinkBattleRecord1) + 1
 	jr z, .okay ; LOSE
 	; DRAW
-	ld bc, sLinkBattleDraws + 1 - (sLinkBattleStats - 12)
+	ld bc, (sLinkBattleRecord1Draws - sLinkBattleRecord1) + 1
 .okay
 	add hl, bc
 	call .CheckOverflow
@@ -8386,8 +8389,8 @@ AddLastBattleToLinkRecord:
 	ret
 
 .FindOpponentAndAppendRecord:
-	ld b, 5
-	ld hl, sLinkBattleRecord + 17
+	ld b, NUM_LINK_BATTLE_RECORDS
+	ld hl, sLinkBattleRecord1End - 1
 	ld de, wceed
 .loop3
 	push bc
@@ -8405,7 +8408,7 @@ AddLastBattleToLinkRecord:
 	ld a, c
 	ld [de], a
 	inc de
-	ld bc, 18
+	ld bc, LINK_BATTLE_RECORD_LENGTH
 	add hl, bc
 	pop bc
 	dec b
@@ -8454,26 +8457,26 @@ AddLastBattleToLinkRecord:
 .done2
 	push bc
 	ld a, b
-	ld bc, 18
+	ld bc, LINK_BATTLE_RECORD_LENGTH
 	ld hl, sLinkBattleRecord
 	call AddNTimes
 	push hl
 	ld de, wceed
-	ld bc, 18
+	ld bc, LINK_BATTLE_RECORD_LENGTH
 	call CopyBytes
 	pop hl
 	pop bc
 	push hl
 	ld a, c
-	ld bc, 18
+	ld bc, LINK_BATTLE_RECORD_LENGTH
 	ld hl, sLinkBattleRecord
 	call AddNTimes
 	pop de
 	push hl
-	ld bc, 18
+	ld bc, LINK_BATTLE_RECORD_LENGTH
 	call CopyBytes
 	ld hl, wceed
-	ld bc, 18
+	ld bc, LINK_BATTLE_RECORD_LENGTH
 	pop de
 	call CopyBytes
 	ret
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
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index dd39d6de..92524d92 100755
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -1303,15 +1303,15 @@ Palettes_a265: INCLUDE "gfx/pals/silver_a265.pal"
 ENDC
 
 IF DEF(_GOLD)
-SGBBorderMap: INCBIN "gfx/sgb_border/gold.map"
-SGBBorderPalettes: INCLUDE "gfx/sgb_border/gold.pal"
-SGBBorder: INCBIN "gfx/sgb_border/gold.2bpp"
+SGBBorderMap: INCBIN "gfx/sgb/gold_border.sgb.tilemap"
+SGBBorderPalettes: INCLUDE "gfx/sgb/gold_border.pal"
+SGBBorder: INCBIN "gfx/sgb/gold_border.2bpp"
 ENDC
 
 IF DEF(_SILVER)
-SGBBorderMap: INCBIN "gfx/sgb_border/silver.map"
-SGBBorderPalettes: INCLUDE "gfx/sgb_border/silver.pal"
-SGBBorder: INCBIN "gfx/sgb_border/silver.2bpp"
+SGBBorderMap: INCBIN "gfx/sgb/silver_border.sgb.tilemap"
+SGBBorderPalettes: INCLUDE "gfx/sgb/silver_border.pal"
+SGBBorder: INCBIN "gfx/sgb/silver_border.2bpp"
 ENDC
 
 Palettes_ad2d:
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 74eb21f4..b4092ec7 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -1436,7 +1436,7 @@ Function6434:
 .asm_646b
 	ld hl, wce63
 	inc [hl]
-	xor a
+	xor a ; MUSIC_NONE
 	ld [wMusicFadeID], a
 	ld [wMusicFadeID + 1], a
 	ld hl, wMusicFade
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
index ba50fb25..794fa074 100644
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@@ -371,7 +371,7 @@ SetUpFiveStepWildEncounterCooldown:
 	ld [wWildEncounterCooldown], a
 	ret
 
-ret_968d7:
+ret_96804:
 	ret
 
 SetMinTwoStepWildEncounterCooldown:
@@ -763,7 +763,7 @@ PlayerMovement:
 	ret
 
 .jump:
-	call ret_968d7 ; mobile
+	call ret_96804
 	xor a
 	ld c, a
 	ret
@@ -963,7 +963,7 @@ DoPlayerEvent:
 
 PlayerEventScriptPointers:
 ; entries correspond to PLAYEREVENT_* constants
-	dba Invalid_0x96c2d          ; PLAYEREVENT_NONE
+	dba Invalid_0x96b60          ; PLAYEREVENT_NONE
 	dba SeenByTrainerScript      ; PLAYEREVENT_SEENBYTRAINER
 	dba TalkToTrainerScript      ; PLAYEREVENT_TALKTOTRAINER
 	dba FindItemInBallScript     ; PLAYEREVENT_ITEMBALL
@@ -973,9 +973,9 @@ PlayerEventScriptPointers:
 	dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT
 	dba HatchEggScript           ; PLAYEREVENT_HATCH
 	dba ChangeDirectionScript    ; PLAYEREVENT_JOYCHANGEFACING
-	dba Invalid_0x96c2d          ; (NUM_PLAYER_EVENTS)
+	dba Invalid_0x96b60          ; (NUM_PLAYER_EVENTS)
 
-Invalid_0x96c2d:
+Invalid_0x96b60:
 	end
 
 ; unused
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 7c5bfe55..7659c42d 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -479,11 +479,11 @@ Script_verbosegiveitem:
 	ld de, GiveItemScript
 	jp ScriptCall
 
-ret_96f76:
+ret_96e71:
 	ret
 
 GiveItemScript:
-	callasm ret_96f76
+	callasm ret_96e71
 	writetext ReceivedItemText
 	iffalse .Full
 	waitsfx