7 files changed, 29 insertions, 28 deletions
diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm
index b3854b7b..528d355e 100755
--- a/engine/gamefreak.asm
+++ b/engine/gamefreak.asm
@@ -5,11 +5,11 @@ LoadShootingStarGraphics: ; 70000 (1c:4000)
 	ld [rOBP1], a ; $ff49
 	call Func_3040
 	call Func_3061
-	ld de, AnimationTileset2 + $30 ; $4757 ; star tile (top left quadrant)
+	ld de, AnimationTileset2 ; $4757 ; star tile (top left quadrant)
 	ld hl, vChars1 + $200
 	ld bc, (BANK(AnimationTileset2) << 8) + $01
 	call CopyVideoData
-	ld de, AnimationTileset2 + $130 ; $481e ; star tile (bottom left quadrant)
+	ld de, AnimationTileset2 + $100 ; $481e ; star tile (bottom left quadrant)
 	ld hl, vChars1 + $210
 	ld bc, (BANK(AnimationTileset2) << 8) + $01
 	call CopyVideoData
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm
index 8c7ca55f..0bd906c7 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -152,7 +152,7 @@ Func_7030e: ; 7030e (1c:430e)
 	call GetPartyMonName
 	call Func_70348
 	ld a, [wTrainerEngageDistance]
-	ld [wcf91], a
+	ld [wWhichPokemon], a
 	callab Func_fce18 ; 3f:4e18
 	jr nc, .asm_70336
 	ld e,$22
diff --git a/engine/joypad.asm b/engine/joypad.asm
index bca84b33..f73d77b2 100644
--- a/engine/joypad.asm
+++ b/engine/joypad.asm
@@ -43,7 +43,6 @@ _Joypad:: ; c02d (3:402d)
 	cp A_BUTTON + B_BUTTON + SELECT + START ; soft reset
 	jp z, TrySoftReset
 
-	ld b, a
 	ld a, [hJoyLast]
 	ld e, a
 	xor b
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index eb23c80c..23e24b23 100755
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -18,9 +18,10 @@ AnimateHealingMachine: ; 7048b (1c:448b)
 	call Func_7055a
 	ld a, $4
 	ld [wMusicHeaderPointer], a
-	ld a, $ff
-	ld [wc0ee], a
-	call PlaySound
+	call StopAllMusic
+	;ld a, $ff
+	;ld [wc0ee], a
+	;call PlaySound
 .asm_704ba
 	ld a, [wMusicHeaderPointer]
 	and a
@@ -40,7 +41,6 @@ AnimateHealingMachine: ; 7048b (1c:448b)
 	ld [wc0f0], a
 	jr nz, .asm_704e6
 	call StopAllMusic
-	call PlaySound
 	ld a, $2 ; BANK(Music_PkmnHealed)
 	ld [wc0ef], a
 .asm_704e6
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 43d3ec9c..fc0a3a6c 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -38,8 +38,8 @@ EnterMapAnim: ; 70567 (1c:4567)
 	ld [wd431], a
 .restoreDefaultMusic
 	call PlayDefaultMusic
-	call Func_151d
 .done
+	call Func_151d
 	jp RestoreFacingDirectionAndYScreenPos
 .dungeonWarpAnimation
 	ld c, 50
@@ -393,8 +393,8 @@ Func_70816: ; 70816 (1c:4816)
 	call DelayFrames
 	ld hl, wd736
 	set 6, [hl]
-	ld de, RedSprite ; $4180
 	ld hl, vNPCSprites
+	ld de, RedSprite ; $4180
 	ld b, BANK(RedSprite)
 	ld c, $c
 	call CopyVideoData
diff --git a/engine/palettes.asm b/engine/palettes.asm
index 0624b61f..2536fefc 100755
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -546,6 +546,8 @@ LoadSGB: ; 721f8 (1c:61f8)
 .onDMG
 	ret
 .onSGB
+	ld a, $1
+	ld [wOnSGB], a
 	di
 	call Func_72247
 	ei
@@ -566,7 +568,7 @@ LoadSGB: ; 721f8 (1c:61f8)
 	call Func_722d7
 	call ClearVram
 	ld hl, MaskEnCancelPacket
-	jp SendSGBPacket
+	jp Func_721b4
 
 Func_72247: ; 72247 (1c:6247)
 	ld hl, PointerTable_7225b
@@ -577,7 +579,7 @@ Func_72247: ; 72247 (1c:6247)
 	push hl
 	ld h, [hl]
 	ld l, a
-	call SendSGBPacket
+	call Func_721b4
 	pop hl
 	inc hl
 	pop bc
@@ -645,7 +647,7 @@ CheckSGB: ; 7226d (1c:626d)
 
 Func_722ce: ; 722ce (1c:62ce)
 	ld hl, MltReq1Packet
-	call SendSGBPacket
+	call Func_721b4
 	jp Wait7000
 
 Func_722d7: ; 722d7 (1c:62d7)
@@ -682,7 +684,7 @@ Func_722d7: ; 722d7 (1c:62d7)
 	ld a, $e3
 	ld [rLCDC], a ; $ff40
 	pop hl
-	call SendSGBPacket
+	call Func_721b4
 	xor a
 	ld [rBGP], a ; $ff47
 	call Func_72520
@@ -717,9 +719,9 @@ Func_72328: ; 72328 (1c:6328)
 	ret
 .asm_7233e
 	push de
-	call SendSGBPacket
+	call Func_721b4
 	pop hl
-	jp SendSGBPacket
+	jp Func_721b4
 
 Func_72346: ; 72346 (1c:6346)
 	ld a,[hl]
@@ -770,7 +772,7 @@ Func_72346: ; 72346 (1c:6346)
 	ld a,$2
 	call Func_7240f
 	ld a,$5
-	call Func_7240f
+	call Func_724df
 	
 	pop hl
 	ld a,[hli]
@@ -827,7 +829,7 @@ Func_723fe:: ; 723fe (1c:63fe)
 	add hl,hl
 	add hl,hl
 	add hl,hl
-	ld de,SuperPalettes ; not exactly sure if actually super palettes
+	ld de,Pointer_72af9 ; not exactly sure if actually super palettes
 	add hl,de
 	ld a,l
 	ld e,a
@@ -934,7 +936,7 @@ Func_724a2:: ; 724a2 (1c:64a2)
 	ld h,a
 	ld de,wdef6
 	add hl,de
-	ld de,wdee9
+	ld de,wdeea
 	ld c,$8
 .loop
 	ld a,[de]
@@ -1036,9 +1038,9 @@ Func_72524:: ; 72524 (1c:6524)
 	call Func_7240f
 	ld a,$1
 	call Func_724a2
-	ld a,[wdee5]
-	ld e,a
 	ld a,[wdee6]
+	ld e,a
+	ld a,[wdee7]
 	ld d,a
 	xor a
 	call Func_7240f
@@ -1135,7 +1137,7 @@ Func_725be:: ; 725be (1c:65be)
 	ret
 
 Pointer_725e2:: ; 725e2 (1c:65e2)	
-	db $0c,$11,$66,$21,$66,$41,$66,$51,$61,$81,$1a,$66,$2d
+	db $0c,$11,$66,$21,$66,$41,$66,$51,$66,$61,$66,$81,$66,$a1,$66,$2d
 	db $cf,$5b,$cc,$31,$67,$2c,$cf,$51,$67
 	
 Func_725fb: ; 725fb (1c:65fb)
diff --git a/engine/town_map.asm b/engine/town_map.asm
index 6b12c04b..535756b8 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -1,5 +1,5 @@
 DisplayTownMap: ; 70eb7 (1c:4eb7)
-	;call LoadTownMap
+	call LoadTownMap
 	ld hl, wUpdateSpritesEnabled
 	ld a, [hl]
 	push af
@@ -47,7 +47,7 @@ Func_70f08: ; 70f08 (1c:4f08)
 	ld a, $4
 	ld [wcd5b], a
 	ld hl, wOAMBuffer + $10
-	call Func_71279
+	call Func_71302
 	pop hl
 	ld de, wcd6d
 .loop
@@ -105,9 +105,9 @@ Func_70f08: ; 70f08 (1c:4f08)
 	jp Func_70ef4
 .asm_70f87
 	ld a,[hJoy5]
-	and D_DOWN | D_UP | B_BUTTON | A_BUTTON
+	and D_DOWN | D_UP
 	ret z
-	callab PrintBeginningBattleText
+	callab Func_f0000
 	ret
 	
 INCLUDE "data/town_map_order.asm"
@@ -561,7 +561,7 @@ Func_7137a: ; 7137a (1c:537a)
 	jr .asm_71384
 .asm_7138a
 	inc hl
-	jr .asm_71384
+	jr .asm_71396
 .asm_7138d
 	ld hl, ExternalMapEntries ; $539c
 	ld c, a
@@ -569,7 +569,7 @@ Func_7137a: ; 7137a (1c:537a)
 	add hl, bc
 	add hl, bc
 	add hl, bc
-.asm_7130d
+.asm_71396
 	ld a, [hli]
 	ld [de], a
 	ld a, [hli]