- Remove trailing whitespace

- Indent with single tabs, not spaces - Colons after labels - Capitalize BANK, HIGH, and LOW - dbw BANK(X), X -> dba X
author: Rangi <remy.oukaour+rangi@gmail.com> 2020-09-20 13:58:03 -0400
committer: Rangi <remy.oukaour+rangi@gmail.com> 2020-09-20 13:58:03 -0400
commit: fac958b280056922a1828b71a04d84a36e1e807a (patch)
tree: c094adc59182b253a61defb5fb85de7a9d77b7cc /engine
parent: bfb981f1885d21cc59d2656e84c87bb8d64a089c (diff)
20 files changed, 1209 insertions, 1208 deletions
diff --git a/engine/bcd.asm b/engine/bcd.asm
index 2e1e812..7b7c1b8 100755
--- a/engine/bcd.asm
+++ b/engine/bcd.asm
@@ -1,5 +1,5 @@
 INCLUDE "constants.asm"
-	
+
 SECTION "engine/bcd.asm", ROMX
 
 AddBCD: ; 03:4de3
@@ -15,10 +15,10 @@ AddBCD: ; 03:4de3
 	dec c
 	jr nz, .add
 	jr nc, .done
-	
+
 	ld a, $99
 	inc de
-	
+
 .fill
 	ld [de], a
 	inc de
@@ -44,7 +44,7 @@ SubBCD: ; 03:4df9
 	jr nc, .done
 	ld a, 0
 	inc de
-	
+
 .fill
 	ld [de], a
 	inc de
diff --git a/engine/dumps/bank01.asm b/engine/dumps/bank01.asm
index fd57ba1..3495b00 100755
--- a/engine/dumps/bank01.asm
+++ b/engine/dumps/bank01.asm
@@ -109,32 +109,32 @@ Table416b:
 
 Unknown41eb: ; 01:41eb
 	db $00, $01, $02, $03
-	
+
 Unknown41ef: ; 01:41ef
 	db $80, $81, $82, $83
-	
+
 Unknown41f3: ; 01:41f3
 	db $04, $05, $06, $07
-	
+
 Unknown41f7: ; 01:41f7
 	db $84, $85, $86, $87
-	
+
 Unknown41fb: ; 01:41fb
 	db $08, $09, $0a, $0b
-	
+
 Unknown41ff: ; 01:41ff
 	db $88, $89, $8a, $8b
-	
+
 Unknown4203: ; 01:4203
 	db $00, $00, $00, $00
 	db $08, $00, $08, $00
 	db $02, $08, $08, $03
-	
+
 Unknown420f: ; 01:420f
 	db $00, $08, $20, $00
 	db $00, $20, $08, $08
 	db $22, $08, $00, $23
-	
+
 Table421b: ; 01:421b
 	dw Unknown423b
 	dw Unknown424b
@@ -152,13 +152,13 @@ Table421b: ; 01:421b
 	dw Unknown42cb
 	dw Unknown42ab
 	dw Unknown42cb
-	
+
 Unknown423b: ; 01:423b
 	db $00, $00, $00, $00
 	db $00, $08, $01, $00
 	db $08, $00, $02, $02
 	db $08, $08, $03, $03
-	
+
 Unknown424b: ; 01:424b
 	db $00, $00, $80, $00
 	db $00, $08, $81, $00
@@ -170,49 +170,49 @@ Unknown425b: ; 01:425b
 	db $00, $00, $81, $20
 	db $08, $08, $82, $22
 	db $08, $00, $83, $23
-	
+
 Unknown426b: ; 01:426b
 	db $00, $00, $04, $00
 	db $00, $08, $05, $00
 	db $08, $00, $06, $02
 	db $08, $08, $07, $03
-	
+
 Unknown427b: ; 01:427b
 	db $00, $00, $84, $00
 	db $00, $08, $85, $00
 	db $08, $00, $86, $02
 	db $08, $08, $87, $03
-	
+
 Unknown428b: ; 01:428b
 	db $00, $08, $84, $20
 	db $00, $00, $85, $20
 	db $08, $08, $86, $22
 	db $08, $00, $87, $23
-	
+
 Unknown429b: ; 01:429b
 	db $00, $00, $08, $00
 	db $00, $08, $09, $00
 	db $08, $00, $0a, $02
 	db $08, $08, $0b, $03
-	
+
 Unknown42ab: ; 01:42ab
 	db $00, $08, $08, $20
 	db $00, $00, $09, $20
 	db $08, $08, $0a, $22
 	db $08, $00, $0b, $23
-	
+
 Unknown42bb: ; 01:42bb
 	db $00, $00, $88, $00
 	db $00, $08, $89, $00
 	db $08, $00, $8a, $02
 	db $08, $08, $8b, $03
-	
+
 Unknown42cb: ; 01:42cb
 	db $00, $08, $88, $20
 	db $00, $00, $89, $20
 	db $08, $08, $8a, $22
 	db $08, $00, $8b, $23
-	
+
 Function42db: ; 01:42db
 	ld bc, wCmdQueue
 	ld a, $01
@@ -256,7 +256,7 @@ Function42db: ; 01:42db
 	ld h, [hl]
 	ld l, a
 	jp hl
-	
+
 Table431d::
 	dw Function4333
 	dw Function439e
@@ -264,14 +264,14 @@ Table431d::
 	dw Function4374
 	dw Function4374
 	dw Function43c9
-	
+
 Table4329::
 	dw Function4334
 	dw Function4452
 	dw Function4459
 	dw Function446c
 	dw Function4495
-	
+
 Function4333: ; 01:4333
 	ret
 
@@ -338,11 +338,11 @@ Function4366: ; 01:4366
 Function4374: ; 01:4374
 	ld de, Table437a
 	jp Function4358
-	
+
 Table437a: ; 01:437a
 	dw Function437e
 	dw Function439b
-	
+
 Function437e: ; 01:437e
 	call Function4341
 	ld hl, $000e
@@ -360,14 +360,14 @@ Function437e: ; 01:437e
 	ld hl, $0007
 	add hl, bc
 	ld [hl], a
-	
+
 Function439b: ; 01:439b
 	jp Function4402
 
 Function439e: ; 01:439e
 	ld de, Table43a4
 	jp Function4358
-	
+
 Table43a4: ; 01:43a4
 	dw Function43a8
 	dw Function43c6
@@ -464,11 +464,11 @@ Function4402: ; 01:4402
 Function4430: ; 01:4430
 	ld hl, Table4436
 	jp Function4358
-	
+
 Table4436: ; 01:4436
 	dw Function443a
 	dw Function444f
-	
+
 Function443a: ; 01:443a
 	call Function4341
 	ld hl, $000b
@@ -549,39 +549,39 @@ Function4495: ; 01:4495
 	add hl, bc
 	ld [hl], a
 	ret
-	
+
 Table44ab: ; 01:44ab
 	dw Unknown44b5
 	dw Unknown44b6
 	dw Unknown44c7
 	dw Unknown44d0
 	dw Unknown44e1
-	
+
 Unknown44b5: ; 01:44b5
 	db $00
-	
+
 Unknown44b6: ; 01:44b6
 	db $04, $00, $00, $00
 	db $00, $00, $08, $01
 	db $00, $08, $00, $02
 	db $00, $08, $08, $03, $00
-	
+
 Unknown44c7: ; 01:44c7
 	db $02, $00, $00, $00
 	db $00, $00, $08, $00, $20
-	
+
 Unknown44d0: ; 01:44d0
 	db $04, $00, $00, $00
 	db $00, $00, $08, $00
 	db $00, $08, $00, $00
 	db $00, $08, $08, $00, $00
-	
+
 Unknown44e1: ; 01:44e1
 	db $04, $00, $00, $00
 	db $40, $00, $08, $00
 	db $40, $08, $00, $00
 	db $40, $08, $08, $00, $40
-	
+
 Function44f2: ; 01:44f2
 	ld hl, $0008
 	add hl, bc
@@ -605,7 +605,7 @@ Function44f2: ; 01:44f2
 	ld h, [hl]
 	ld l, a
 	jp hl
-	
+
 Table4516::
 	dw Function486a
 	dw Function47b8
@@ -627,13 +627,13 @@ Table4516::
 	dw Function4a05
 	dw Function4a8b
 	dw Function4869
-	
+
 Function453e: ; 01:453e
 	ld hl, $000a
 	add hl, bc
 	ld [hl], $02
 	ret
-	
+
 Function4545: ; 01:4545
 	ld hl, $0005
 	add hl, bc
@@ -644,7 +644,7 @@ Function4545: ; 01:4545
 	ld a, [hl]
 	ld hl, Table4558
 	jp CallJumptable
-	
+
 Table4558: ; 01:4558
 	dw Function4560
 	dw Function4567
@@ -729,7 +729,7 @@ Function45a0: ; 01:45a0
 	add hl, bc
 	ld [hl], a
 	ret
-	
+
 Unknown45d0: ; 01:45d0
 	db $00, $0C, $04, $08
 
@@ -806,7 +806,7 @@ Function4636: ; 01:4636
 	res 7, [hl]
 	and a
 	ret
-	
+
 Function4644: ; 01:4644
 	ld hl, $0005
 	add hl, bc
@@ -860,7 +860,7 @@ Function4678: ; 01:4678
 	add hl, bc
 	ld [hl], $ff
 	ret
-	
+
 Function468a: ; 01:468a
 	and $0f
 	ld hl, $0006
@@ -938,7 +938,7 @@ Function46e5: ; 01:46e5
 	ld a, [hli]
 	ld h, [hl]
 	ret
-	
+
 Function46f9: ; 01:46f9
 	ld hl, $0006
 	add hl, bc
@@ -950,10 +950,10 @@ Function46f9: ; 01:46f9
 	add hl, de
 	ld a, [hl]
 	ret
-	
+
 Table4708: ; 01:4708
 	db $00, $01, $10
-	
+
 Table470b: ; 01:470b
 	db $01, $00, $ff
 	db $10, $01, $ff
@@ -1068,7 +1068,7 @@ Function47b8: ; 01:47b8
 	and $1f
 	ld hl, Table47c5
 	jp CallJumptable
-	
+
 Table47c5: ; 01:47c5
 	dw Function47fb
 	dw Function4812
@@ -1205,7 +1205,7 @@ Function486a: ; 01:486a
 	add hl, bc
 	ld [hl], a
 	ret
-	
+
 Function488c: ; 01:488c
 	call Function468a
 	call Function771e
@@ -1262,7 +1262,7 @@ Function48da: ; 01:48da
 	add hl, bc
 	ld [hl], a
 	jp Function4b65
-	
+
 Function48f5: ; 01:48f5
 	ld hl, $0008
 	add hl, bc
@@ -1368,11 +1368,11 @@ Function497a: ; 01:497a
 	add hl, bc
 	ld [hl], a
 	ret
-	
+
 Table4994: ; 01:4994
 	db $00, $FF, $FE, $FD
 	db $FC, $FD, $FE, $FF
-	
+
 Function499c: ; 01:499c
 	call Function46f9
 	ld hl, $001f
@@ -1411,7 +1411,7 @@ Function499c: ; 01:499c
 	add hl, bc
 	ld [hl], $02
 	ret
-	
+
 Unknown49dc: ; 01:49dc
 	db $FC, $FB, $FA, $F9
 	db $F8, $F7, $F6, $F5
@@ -1431,13 +1431,13 @@ Function49fc: ; 01:49fc
 Function4a05: ; 01:4a05
 	ld de, Table4a0b
 	jp Function47ab
-	
+
 Table4a0b: ; 01:4a0b
 	dw Function4a13
 	dw Function4a28
 	dw Function4a38
 	dw Function4a53
-	
+
 Function4a13: ; 01:4a13
 	ld hl, $001e
 	add hl, bc
@@ -1503,7 +1503,7 @@ Function4a53: ; 01:4a53
 	ld [hl], $00
 	call Function4792
 	ret
-	
+
 Function4a82: ; 01:4a82
 	ld hl, $0008
 	add hl, bc
@@ -1513,7 +1513,7 @@ Function4a82: ; 01:4a82
 Function4a8b: ; 01:4a8b
 	ld de, Table4a91
 	jp Function47ab
-	
+
 Table4a91: ; 01:4a91
 	dw Function4a9f
 	dw Function4aaf
@@ -1555,7 +1555,7 @@ Function4ab8: ; 01:4ab8
 	ld [hl], $10
 	call Function4799
 	ret
-	
+
 Function4ad4: ; 01:4ad4
 	ld hl, $000a
 	add hl, bc
@@ -1583,7 +1583,7 @@ Function4af6: ; 01:4af6
 	ld [hl], $10
 	call Function4799
 	ret
-	
+
 Function4b00: ; 01:4b00
 	ld hl, $000a
 	add hl, bc
@@ -1605,10 +1605,10 @@ Function4b0c: ; 01:4b0c
 	ld [hl], $00
 	call Function4792
 	ret
-	
+
 Function4b22: ; 01:4b22
 	call Function4792
-	
+
 Function4b25: ; 01:4b25
 	ret
 
@@ -1630,10 +1630,10 @@ Function4b26: ; 01:4b26
 	add hl, de
 	ld [hl], a
 	ret
-	
+
 Unknown4b42: ; 01:4b42
 	db $01, $01, $FC, $02, $00, $08
-	
+
 Function4b48: ; 01:4b48
 	ld e, a
 	add a
@@ -1653,7 +1653,7 @@ Function4b48: ; 01:4b48
 
 Unknown4b5f: ; 01:4b5f
 	db $05, $04, $FC, $02, $02, $08
-	
+
 Function4b65: ; 01:4b65
 	ld hl, $000a
 	add hl, bc
@@ -1733,7 +1733,7 @@ Function4bc9: ; 01:4bc9
 	add hl, bc
 	ld [hl], $ff
 	ret
-	
+
 Function4bed: ; 01:4bed
 	ld a, [wPlayerMovement]
 	jp Function4c37
@@ -1798,7 +1798,7 @@ Function4c37: ; 01:4c37
 	ld h, [hl]
 	ld l, a
 	jp hl
-	
+
 Table4c48: ; 01:4c48
 	dw Function4d94
 	dw Function4d98
@@ -2238,7 +2238,7 @@ Function4ed5: ; 01:4ed5
 Table4edb: ; 01:4edb
 	dw Function4edf
 	dw Function4efb
-	
+
 Function4edf: ; 01:4edf
 	call Function46d3
 	call Function499c
@@ -2271,12 +2271,12 @@ Function4efb: ; 01:4efb
 Function4f14: ; 01:4f14
 	ld de, Table4f1a
 	jp Function47ab
-	
+
 Table4f1a: ; 01:4f1a
 	dw Function4f20
 	dw Function4f40
 	dw Function4f4b
-	
+
 Function4f20: ; 01:4f20
 	call Function499c
 	call Function4750
@@ -2916,7 +2916,7 @@ Function52dc: ; 01:52dc
 	add hl, de
 	call PrintPlayTime
 	ret
-	
+
 SECTION "engine/dumps/bank01.asm@Function5388", ROMX
 
 Function5388: ; 01:5388
@@ -2955,7 +2955,7 @@ Function53b0: ; 01:53b0
 	ld [wce66], a
 	call CloseSRAM
 	ret
-	
+
 SECTION "engine/dumps/bank01.asm@ReanchorBGMap_NoOAMUpdate", ROMX
 
 ReanchorBGMap_NoOAMUpdate: ; 01:63d8
@@ -3016,7 +3016,7 @@ LoadFonts_NoOAMUpdate: ; 01:6437
 	ld a, $90
 	ldh [hWY], a
 	ret
-	
+
 
 Function6445: ; 01:6445
 	call BackUpTilesToBuffer
@@ -3182,7 +3182,7 @@ Function6445: ; 01:6445
 .sub_658a
 	scf
 	ret
-	
+
 Text658c: ; 01:658c
 	text_from_ram wcd11
 	text "は　あたらしく"
@@ -3198,7 +3198,7 @@ Text65a5: ; 01:65a5
 	sound_dex_fanfare_50_79
 	text_waitbutton
 	text_end
-	
+
 Text65a8: ; 01:65a8
 	text "どの　わざを"
 	next "わすれさせたい？"
@@ -3207,30 +3207,30 @@ Text65a8: ; 01:65a8
 Text65b9: ; 01:65b9
 	text "それでは<⋯⋯>　"
 	text_end
-	
+
 Text65c1: ; 01:65c1
 	text_from_ram wStringBuffer2
 	text "を"
 	line "おぼえるのを　あきらめますか？"
 	done
-	
+
 Text65d7: ; 01:65d7
 	text_from_ram wcd11
 	text "は　"
 	text_end
-	
+
 Text65de: ; 01:65de
 	text_from_ram wStringBuffer2
 	text "を"
 	line "おぼえずに　おわった！"
 	prompt
-	
+
 Text65f0: ; 01:65f0
 	text_from_ram wcd11
 	text "は　あたらしく"
 	line ""
 	text_end
-	
+
 Text65fd: ; 01:65fd
 	text_from_ram wStringBuffer2
 	text "を　おぼえたい<⋯⋯>！"
@@ -3249,11 +3249,11 @@ Text662e: ; 01:662e
 	text "の　かわりに"
 	line "ほかの　わざを　わすれさせますか？"
 	done
-	
+
 Text664b: ; 01:664b
 	text "１　２の　<⋯⋯>"
 	text_end
-	
+
 Text6653: ; 01:6653
 	text_exit
 	start_asm
@@ -3263,17 +3263,17 @@ Text6653: ; 01:6653
 	pop de
 	ld hl, Text6661
 	ret
-	
+
 Text6661:  ; 01:6661
 	text "　ポカン！"
 	text_end
-	
+
 Text6668: ; 01:6668
 	text_exit
 	text ""
 	para ""
 	text_end
-	
+
 Text666c: ; 01:666c
 	text_from_ram wcd11
 	text "は　"
@@ -3285,7 +3285,7 @@ Text6673: ; 01:6673
 	line "つかいかたを　きれいに　わすれた！"
 	para "そして<⋯⋯>！"
 	prompt
-	
+
 Text6691: ; 01:6691
 	text "それは　たいせつなわざです"
 	line "わすれさせることは　できません！"
@@ -3340,7 +3340,7 @@ Function66b1: ; 01:66b1
 	ldh [hConnectionStripLength], a
 	ldh [hSpriteOffset], a
 	ret
-	
+
 Table66fa: ; 01:66fa
 	db $32, $21, $34, $24
 	db $34, $21, $45, $55
@@ -3407,13 +3407,13 @@ Function6713: ; 01:6713
 .sub_6784
 	call CloseWindow
 	ret
-	
+
 Text6788: ; 01:6788
 	text_from_ram wStringBuffer1
 	text "に"
 	line "ニックネームを　つけますか？"
 	done
-	
+
 Function679d: ; 01:679d
 	ld de, wFieldMoveScriptID
 	push de
@@ -3482,12 +3482,12 @@ CorrectNickErrors: ; 01:67d5
 	pop de
 	pop bc
 	ret
-	
+
 Table6805:: ; 01:6805
 	db $00, $05, $14, $19, $1d
 	db $26, $35, $3a, $49, $7f
 	db $ff
-	
+
 SECTION "engine/dumps/bank01.asm@Function771e", ROMX
 
 Function771e: ; 01:771e
@@ -3569,7 +3569,7 @@ Function77a1: ; 01:77a1
 	add hl, bc
 	ld e, [hl]
 	jr _CheckObjectCollision
-	
+
 Function77ad: ; 01:77ad
 	ldh a, [hConnectionStripLength]
 	call GetObjectStruct
@@ -4048,7 +4048,7 @@ Function7a93: ; 01:7a93
 	add $f7
 	ld [hl], a
 	ret
-	
+
 Text7bad: ; 01:7bad
 	db "はなしの　はやさ"
 	next "　はやい　　　　ふつう　　　　おそい"
@@ -4075,15 +4075,15 @@ Text7c12: ; 01:7c12
 Text7c17: ; 01:7c17
 	db "　わく　を　かえる　"
 	text_end
-	
+
 Table7c22: ; 01:7c22
 	db $0F
-	
+
 Table7c23: ; 01:7c23
 	db $05, $08, $03
 	db $01, $01, $08
 	db $FF
-	
+
 Unknown7c2a: ; 01:7c2a
 rept 491
 	db $39, $00
diff --git a/engine/dumps/bank02.asm b/engine/dumps/bank02.asm
index 500091e..5f373b6 100755
--- a/engine/dumps/bank02.asm
+++ b/engine/dumps/bank02.asm
@@ -56,7 +56,7 @@ Function806c: ; 02:406c
 	ld a, $ff
 	ld [wObjectFollow_Leader], a
 	ret
-	
+
 Function807b: ; 02:407b
 	ld a, $01
 	ld hl, Data8089
@@ -152,7 +152,7 @@ Function80eb: ; 02:40eb
 	add hl, de
 	set 5, [hl]
 	ret
-	
+
 Function811a: ; 02:411a
 	ldh a, [hConnectionStripLength]
 	ld e, a
@@ -306,7 +306,7 @@ Function81f8: ; 02:41f8
 	add hl, de
 	ld [hl], a
 	ret
-	
+
 Function820d: ; 02:420d
 	push af
 	ldh a, [hConnectionStripLength]
@@ -360,7 +360,7 @@ Function824c: ; 02:424c
 	ret z
 	ld hl, Table8259
 	jp CallJumptable
-	
+
 Table8259: ; 02:4259
 	dw Function8299
 	dw Function8292
@@ -411,7 +411,7 @@ Function8292: ; 02:4292
 Function8299: ; 02:4299
 	ld a, [wYCoord]
 	add $09
-	
+
 Function829e: ; 02:429e
 	ld d, a
 	ld a, [wXCoord]
@@ -669,7 +669,7 @@ Function8425: ; 02:4425
 	ld [wVBCopyFarDst], a
 	ld a, d
 	ld [wVBCopyFarDst+1], a
-	
+
 Function842d: ; 02:442d
 	ld a, b
 	ld [wVBCopyFarSize], a
@@ -768,7 +768,7 @@ Function84b8: ; 02:44b8
 	jp Function842d
 
 SECTION "engine/dumps/bank02.asm@QueueFollowerFirstStep", ROMX
-	
+
 QueueFollowerFirstStep: ; 02:45df
 	call Function85f2
 	jr c, .sub_85ec
@@ -914,7 +914,7 @@ Function86a0: ; 02:46a0
 	and $03
 	jr z, .sub_86b4
 	ret
-	
+
 FlyMap: ; 02:46cb
 	ld hl, hJoyDebounceSrc
 	ld a, [hl]
@@ -1011,10 +1011,10 @@ Function8747: ; 02:4747
 	ret z
 	ld [wFlyDestination], a
 	ret
-	
+
 Text8776: ; 02:4776
 	db "とびさき　を　えらんでください@"
-	
+
 Function8786: ; 02:4786
 	ld a, [wFlyDestination]
 	push af
@@ -1059,7 +1059,7 @@ Function8786: ; 02:4786
 
 Text87e4: ; 02:47e4
 	db "の　すみか@"
-	
+
 Function87ea: ; 02:47ea
 	ld a, [wFlyDestination]
 	and $10
@@ -1195,7 +1195,7 @@ Function88b3: ; 02:48b3
 	add hl, bc
 	ld [hl], $08
 	ret
-	
+
 TownMapTilemap: ; 02:48da
 	db $04, $05
 	db $19, $01
@@ -1352,44 +1352,44 @@ TownMapTilemap: ; 02:48da
 	db $10, $01
 	db $04, $01
 	db $00
-	
+
 SECTION "engine/dumps/bank02.asm@Data8a17", ROMX
 
 Data8a17: ; 02:4a17
 	db $0b
 	db $ff
-	
+
 	db $01, $0a, $03, $00, $02, $00, $05, $01, $03, $01, $04, $02, $0d, $02
 	db $0d, $03, $0d, $05, $04, $02, $04, $06, $07
 	db $ff
-	
+
 	db $05, $08
 	db $ff
-	
+
 	db $06
 	db $ff
-	
+
 	db $ff
-	
+
 	db $0e, $09, $06, $0e, $08, $0a, $0a
 	db $08, $09, $00, $00, $09, $0c, $00
 	db $ff
-	
+
 	db $ff
-	
+
 	db $ff
-	
+
 	db $0b
 	db $ff
-	
+
 	db $ff
-	
+
 	db $04, $03
 	db $ff
-	
+
 	db $04
 	db $ff
-	
+
 	db $08, $08
 	db $ff
 
@@ -1557,7 +1557,7 @@ Function8bd5: ; 02:4bd5
 	ld bc, $8102
 	call PrintNumber
 	ret
-	
+
 Function8bfd: ; 02:4bfd
 	ld a, [wJumptableIndex]
 	ld e, a
@@ -1579,7 +1579,7 @@ Table8c0c: ; 02:4c0c
 	dw Function8d62
 	dw Function8e6c
 	dw Function8e9e
-	
+
 Function8c1c: ; 02:4c1c
 	ld hl, wJumptableIndex
 	inc [hl]
@@ -1656,7 +1656,7 @@ DrawMap: ; 02:4c7c
 	add $18
 	ld [hl], a
 	ret
-	
+
 Function8cab: ; 02:4cab
 	ld hl, hJoyDown
 	ld a, [hl]
@@ -1665,7 +1665,7 @@ Function8cab: ; 02:4cab
 	xor a
 	ld [wJumptableIndex], a
 	ret
-	
+
 Function8cb7: ; 02:4cb7
 	call Function8c1c
 	call Function8eaa
@@ -1740,7 +1740,7 @@ Function8cb7: ; 02:4cb7
 	xor a
 	ld [wcb61], a
 	ret
-	
+
 Function8d62: ; 02:4d62
 	ld hl, hJoyDown
 	ld a, [hl]
@@ -1749,7 +1749,7 @@ Function8d62: ; 02:4d62
 	xor a
 	ld [wJumptableIndex], a
 	ret
-	
+
 Function8d6e: ; 02:4d6e
 	ld hl, wcb61
 	ld e, [hl]
@@ -1886,12 +1886,12 @@ Function8dfd: ; 02:4dfd
 	ld h, [hl]
 	ld l, a
 	jp hl
-	
+
 Function8e2c: ; 02:4e2c
 	pop bc
 	scf
 	ret
-	
+
 Table8e2f: ; 02:4e2f
 	dw Data8e4d
 	dw Data8e4d
@@ -1913,21 +1913,21 @@ Data8e4d: ; 02:4e4d
 	db $10, $02
 	dw Function8e66
 	dw Function8e66
-	
+
 	db $20, $05
 	dw Function8e66
 	dw Function8e66
-	
+
 	db $40, $07
 	dw Function8e66
 	dw Function8e66
-	
+
 	db $48, $09
 	dw Function8e66
 	dw Function8e66
-	
+
 	db $00
-	
+
 Function8e66: ; 02:4e66
 	ld d, $00
 	call PlayMusic
@@ -2012,7 +2012,7 @@ Function8eca: ; 02:4eca
 
 Data8ef5: ; 02:4ef5
 	db $00, $18, $30, $00
-	
+
 Function8ef9: ; 02:4ef9
 	dec c
 	dec c
@@ -2079,7 +2079,7 @@ SetTitleBGDecorationBorder: ; 02:51d2
 	ld b, $54
 	call Function91ef
 	ret
-	
+
 Function91ef: ; 02:51ef
 	xor a
 	ld c, $14
@@ -2282,10 +2282,10 @@ Function93bb: ; 02:53bb
 Table93cc: ; 02:53cc
 	dw Data986c
 	dw Data996c
-	
+
 	dw Data987c
 	dw Data998c
-	
+
 	dw Data986c
 	dw Data999c
 
diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm
index 2c2a21c..456c903 100755
--- a/engine/dumps/bank03.asm
+++ b/engine/dumps/bank03.asm
@@ -281,7 +281,7 @@ Functionca68: ; 03:4a68
 	pop hl
 .sub_caa0
 	ret
-	
+
 
 SECTION "engine/dumps/bank03.asm@Functiond41d", ROMX
 
@@ -337,7 +337,7 @@ Textd491: ; 03:5491
 	text "それは　とても　たいせつなモノです"
 	line "すてることは　できません！"
 	prompt
-	
+
 Functiond4b2: ; 03:54b2
 	push hl
 	push bc
@@ -385,7 +385,7 @@ Functiond4e6: ; 03:54e6
 	ret
 .sub_d4f8
 	jr Functiond505
-	
+
 Functiond4fa: ; 03:54fa
 	call Functiond51e
 	ld hl, Function8261
@@ -2239,7 +2239,7 @@ Texte1c3: ; 03:61c3
 	text "に"
 	line "なまえを　つけますか？"
 	done
-	
+
 Functione1d5: ; 03:61d5
 	call Functione284
 	ret c
@@ -2272,11 +2272,11 @@ Functione1d5: ; 03:61d5
 	call LoadFontExtra
 	call CloseWindow
 	ret
-	
+
 Texte224: ; 03:6224
 	text "なんに　するん？"
 	done
-	
+
 Datae22e: ; 03:622e
 	db $40, $00, $00, $11, $0e
 	dw Datae236
@@ -2287,10 +2287,10 @@ Datae236: ; 03:6236
 	dw Datae27c
 	db $8a, $1f
 	dw Texte23e
-	
+
 Texte23e: ; 03:623e
 	db "#の　ようすをみる@"
-	
+
 Texte248: ; 03:6248
 	db "#を　つれていく@"
 
@@ -2305,7 +2305,7 @@ Texte260: ; 03:6260
 
 Texte26a: ; 03:626a
 	db "さようなら@"
-	
+
 Tablee270: ; 03:6270
 	dw Functione5c5
 	dw Functione31b
@@ -2342,7 +2342,7 @@ Functione2a6: ; 03:62a6
 .sub_e2ae
 	and a
 	ret
-	
+
 Functione2b0: ; 03:72b0
 	ld a, [wPartyCount]
 	and a
@@ -2516,7 +2516,7 @@ Datae414: ; 03:6414
 	db $38, $64, $00, $00, $00, $03, $9d, $64
 	db $0a, $01, $02, $03, $04, $05, $06, $07
 	db $08, $09, $0a, $ff
-	
+
 Functione438: ; 03:6438
 	push de
 	ld a, [wMenuSelection]
@@ -2539,7 +2539,7 @@ Functione438: ; 03:6438
 	pop hl
 	call PlaceString
 	ret
-	
+
 Texte461: ; 03:6461
 	db "・.０１　@"
 	db "・.０２　@"
@@ -2551,7 +2551,7 @@ Texte461: ; 03:6461
 	db "・.０８　@"
 	db "・.０９　@"
 	db "・.１０　@"
-	
+
 Functione49d: ; 03:649d
 	ld h, d
 	ld l, e
@@ -2569,7 +2569,7 @@ Functione49d: ; 03:649d
 	ld de, Texte4ca
 	call PlaceString
 	ret
-	
+
 Texte4bf: ; 03:64bf
 	db "あずかっている#"
 	next "　@"
@@ -2594,7 +2594,7 @@ Functione4ce: ; 03:64ce
 	ld a, [hl]
 	call CloseSRAM
 	ret
-	
+
 Datae4e7: ; 03:64e7
 	db $02, $00, $a0
 	db $02, $48, $a5
@@ -2643,7 +2643,7 @@ Functione53e: ; 03:653e
 Functione54d: ; 03:654d
 	ld a, [wMenuSelection]
 	ret
-	
+
 Texte551: ; 03:6551
 	text "#　ボックスを　かえると"
 	line "どうじに　レポートが　かかれます"
@@ -2672,7 +2672,7 @@ Datae5a5: ; 03:65a5
 	db $40, $06, $00, $0e, $0e
 	dw Datae5ad
 	db $01
-	
+
 Datae5ad: ; 03:65ad
 	db $80, $03
 	db "ボックスきりかえ@"
@@ -2801,38 +2801,38 @@ Functione6a4: ; 03:66a4
 Texte6d0: ; 03:66d0
 	text "#を　えらんだ！"
 	prompt
-	
+
 Tablee6da: ; 03:66da
 	dw Datae6e0
 	dw wcd3c
 	dw wcd46
-	
+
 Datae6e0: ; 03:66e0
 	db $40, $03, $05, $0b, $12
 	dw Datae6e8
 	db $01
-	
+
 Datae6e8: ; 03:e6e8
 	db $00, $04
-	
+
 Datae6ea: ; 03:66ea
 	db $08, $01, $00, $aa, $d6, $09, $a6
 	db $47, $09, $ba, $47, $00, $00, $00
-	
+
 Datae6f8: ; 03:66f8
 	dw Datae6fe
 	dw wcd3c
 	dw wcd46
-	
+
 Datae6fe: ; 03:66fe
 	db $40, $03, $05, $0b, $12
 	dw Datae706
 	db $01
-	
+
 Datae706: ; 03:6706
 	db $00, $04, $08, $01, $00, $83, $da, $09
 	db $ab, $47, $09, $c1, $47, $00, $00, $00
-	
+
 Datae716: ; 03:6716
 	dw Datae71c
 	dw wcd3c
@@ -2842,7 +2842,7 @@ Datae71c: ; 03:671c
 	db $40, $04, $01, $0b, $13, $24, $67, $01
 	db $00, $04, $00, $01, $00, $83, $da, $09
 	db $d8, $47, $00, $00, $00, $00, $00, $00
-	
+
 Function6734: ; 03:6734
 	call RefreshScreen
 	call LowVolume
@@ -3423,11 +3423,11 @@ Textebdc: ; 03:6bdc
 	text "おしい！"
 	line "あと　ちょっとの　ところだったのに！"
 	prompt
-	
+
 Textebf5: ; 03:6bf5
 	text "やったー！"
 	line "@"
-	
+
 Textebfd: ; 03:6bfd
 	text_from_ram wBattleMonNickname
 	text "を　つかまえたぞ！@"
@@ -3538,7 +3538,7 @@ Functionecd5: ; 03:6cd5
 	call PlayMapMusic
 	call Function1fea
 	ret
-	
+
 Functioned00: ; 03:6d00
 	ld a, [wBattleMode]
 	and a
@@ -3651,7 +3651,7 @@ Textedd2: ; 03:6dd2
 	text "の"
 	line "きそ　ポイントが　あがった！"
 	prompt
-	
+
 
 
 Textede7: ; 03:6de7
@@ -3664,7 +3664,7 @@ Tableedf7: ; 03:6df7
 	dw Textee0f
 	dw Textee17
 	dw Textee1c
-	
+
 Textee01: ; 03:6e01
 	db "たいりょく@"
 
@@ -3679,7 +3679,7 @@ Textee17: ; 03:6e17
 
 Textee1c: ; 03:6e1c
 	db "とくしゅのうりょく@"
-	
+
 Functionee26: ; 03:6e26
 	ld a, [wCurItem]
 	ld hl, Dataee38
@@ -3694,14 +3694,14 @@ Functionee26: ; 03:6e26
 	ld c, a
 	ld b, $00
 	ret
-	
+
 Dataee38: ; 03:6e38
 	db $1a, $00
 	db $1b, $02
 	db $1c, $04
 	db $1d, $06
 	db $1f, $08
-	
+
 Functionee42: ; 03:6e42
 	ld a, [wBattleMode]
 	and a
@@ -3865,7 +3865,7 @@ Functionef17: ; 03:6f17
 	ld c, [hl]
 	pop hl
 	ret
-	
+
 Dataef77: ; 03:6f77
 	db $09, $f0, $08
 	db $0a, $f1, $10
@@ -3874,7 +3874,7 @@ Dataef77: ; 03:6f77
 	db $0d, $f4, $40
 	db $26, $f6, $ff
 	db $ff, $00, $00
-	
+
 Functionef8c: ; 03:6f8c
 	ld a, [wPartyCount]
 	and a
@@ -3923,7 +3923,7 @@ Functionef8c: ; 03:6f8c
 
 Functionefed: ; 03:6fed
 	ret
-	
+
 Functionefee: ; 03:6fee
 	ld a, [wPartyCount]
 	and a
@@ -4014,7 +4014,7 @@ Functionf05b: ; 03:705b
 	call Functionf0d8
 	call Functionf7a2
 	jp Functionf104
-	
+
 Functionf0af: ; 03:70af
 	ret
 
@@ -4175,7 +4175,7 @@ Functionf195: ; 03:7195
 	ld a, [wHPBarNewHP]
 	ld e, a
 	ret
-	
+
 Functionf19e: ; 03:719e
 	ld a, $22
 	call GetPartyParamLocation
@@ -4226,7 +4226,7 @@ Functionf1ce: ; 03:71ce
 	ldh a, [hQuotient+2]
 	ld e, a
 	ret
-	
+
 Functionf1e9: ; 03:71e9
 	push hl
 	ld a, [wCurItem]
@@ -4249,7 +4249,7 @@ Functionf1e9: ; 03:71e9
 	ld d, [hl]
 	pop hl
 	ret
-	
+
 Dataf203: ; 03:7203
 	db $2e, $32, $00
 	db $2f, $3c, $00
@@ -4258,7 +4258,7 @@ Dataf203: ; 03:7203
 	db $11, $32, $00
 	db $12, $14, $00
 	db $ff, $00, $00
-	
+
 Functionf218: ; 03:7218
 	ld a, [wcd3c]
 	dec a
@@ -4343,7 +4343,7 @@ Textf2a6: ; 03:72a6
 	text "その#には　"
 	line "つかえません"
 	done
-	
+
 Functionf2b5: ; 03:72b5
 	xor a
 	ld [wFieldMoveSucceeded], a
@@ -4519,7 +4519,7 @@ Textf3da: ; 03:73da
 Textf3ec: ; 03:73ec
 	text "<PLAYER>は"
 	line "#のふえを　ふいてみた！@"
-	
+
 Functionf3fd: ; 03:73fd
 	ld b, $08
 	ld a, [wBattleMode]
@@ -4541,16 +4541,16 @@ Functionf413: ; 03:7413
 	call MenuTextBox
 	call CloseWindow
 	ret
-	
+
 Textf424: ; 03:7424
 	text "あなたの　コイン"
 	line "@"
-	
+
 Textf42f: ; 03:742f
 	deciram wd15b, 2, 4
 	text "まい"
 	prompt
-	
+
 Functionf437: ; 03:7437
 	call Functionf49f
 	jp c, Functionf7dd
@@ -4585,7 +4585,7 @@ Functionf444: ; 03:7444
 
 Dataf46a: ; 03:746a
 	db $0a, $9d, $0a, $47
-	
+
 Functionf46e: ; 03:746e
 	call Functionf49f
 	jp c, Functionf7dd
@@ -5033,7 +5033,7 @@ Functionf7f4: ; 03:77f4
 	xor a
 	ld [wFieldMoveSucceeded], a
 	jp PrintText
-	
+
 Textf7fb: ; 03:77fb
 	text "オーキドの　ことば<⋯⋯>"
 	line "<PLAYER>よ！　こういうものには"
@@ -5051,7 +5051,7 @@ Textf832: ; 03:7832
 Textf841: ; 03:7841
 	text "つかっても　こうかがないよ"
 	prompt
-	
+
 Textf850: ; 03:7850
 	text "<TRAINER>に　ボールを　はじかれた！"
 	prompt
@@ -5105,7 +5105,7 @@ Textf8ea: ; 03:78ea
 	text_from_ram wStringBuffer2
 	text "から　おりた"
 	prompt
-	
+
 SECTION "engine/dumps/bank03.asm@Functionf960", ROMX
 
 Functionf960: ; 03:7960
@@ -5168,7 +5168,7 @@ Functionf960: ; 03:7960
 Functionf9c9: ; 03:79c9
 	ld a, [wWhichPokemon]
 	call AddNTimes
-	
+
 Functionf9cf: ; 03:79cf
 	ld a, [w2DMenuDataEnd]
 	ld c, a
@@ -5212,7 +5212,7 @@ Functionf9d9: ; 03:79d9
 	ld c, [hl]
 	ld e, $01
 	ret
-	
+
 Datafa08: ; 03:7a08
 	dbw $00, Datafa6c
 	dbw $01, Datafa6c
@@ -5248,7 +5248,7 @@ Datafa08: ; 03:7a08
 	dbw $e3, Datafaa2
 	dbw $e4, Datafaa2
 	db $ff
-	
+
 Datafa6c: ; 03:7a6c
 	db $02, $0f, $18, $0f, $47
 
@@ -5450,7 +5450,7 @@ Datafc30: ; 03:7c30
 	db $40, $04, $0d, $0b, $13
 	dw Datafc38
 	db $01
-	
+
 Datafc38: ; 03:7c38
 	db $80, $03
 	db "あずける@"
@@ -5620,12 +5620,12 @@ Textfdc7: ; 03:7dc7
 	text_from_ram wStringBuffer1
 	text "は　すでに"
 	line "@"
-	
+
 Textfdd2: ; 03:7dd2
 	text_from_ram wStringBuffer2
 	text "を　おぼえています"
 	prompt
-	
+
 Textfde0: ; 03:7de0
 	db "います"
 	prompt
@@ -5656,7 +5656,7 @@ Functionfdf3: ; 03:7df3
 	call PrintText
 	scf
 	ret
-	
+
 Textfe0a: ; 03:7e0a
 	text_from_ram wStringBuffer1
 	text "は　すでに"
@@ -5666,7 +5666,7 @@ Textfe15: ; 03:7e15
 	text_from_ram wStringBuffer2
 	text "を　おぼえています"
 	prompt
-	
+
 Datafe23: ; 03:7e23
 	db $e0, $22, $47, $24, $80, $a3, $01, $50
 	db $02, $85, $b0, $09, $35, $51, $2c, $08
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index b62292b..64d1c29 100755
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -20,7 +20,7 @@ CutFunction: ; 03:4fab
 	ld a, [wFieldMoveScriptID]
 	ld hl, .CutScriptTable
 	jp CallJumptable
-	
+
 .CutScriptTable ; 03:4fc5
 	init_script_table
 	add_script TryCut
@@ -79,7 +79,7 @@ GetCutReplacementBlock: ; 03:5015
 	jr nz, .loop
 	scf
 	ret
-	
+
 CutReplacementBlocks: ; 03:5023
 ; replacement block, facing block
 	db $30, $25
@@ -109,7 +109,7 @@ CheckCuttableTile: ; 03:502c
 	set_script FailCut
 	xor a
 	ret
-	
+
 IsCuttableTile: ; 03:5057
 	ld hl, CuttableTiles
 	ld c, a
@@ -121,7 +121,7 @@ IsCuttableTile: ; 03:5057
 	jr nz, .loop
 	scf
 	ret
-	
+
 CuttableTiles: ; 03:5064
 	db $81
 	db $82
@@ -135,7 +135,7 @@ FailCut: ; 03:5069
 	scf
 	ld a, SCRIPT_FAIL
 	ret
-	
+
 Text_CantUseCutHere: ; 03:5073
 	text "ここでは　つかえません"
 	prompt
@@ -171,12 +171,12 @@ CutScript: ; 03:508C
 	call Function1fea
 	scf
 	ret
-	
-Text_CutItDown ; 03:50c4
+
+Text_CutItDown: ; 03:50c4
 	text_from_ram wStringBuffer2
 	text "　は　"
 	line "くさかりを　つかった！"
-	prompt	
+	prompt
 
 SurfFunction: ; 03:50d8
 	call .ResetScriptID
@@ -236,7 +236,7 @@ Text_CantSurfHere: ; 03:5133
 	text "ここでは　のることが"
 	next "できません"
 	prompt
-	
+
 SurfScript: ; 03:5145
 	call RefreshScreen
 	ld hl, wPartyMonNicknames
@@ -262,7 +262,7 @@ Text_UsedSurf: ; 03:5171
 	text_from_ram wPlayerName
 	text "を　のせた！"
 	prompt
-	
+
 MovePlayerIntoWater: ; 03:5185
 	call InitMovementBuffer
 	call .get_movement_direction
@@ -377,7 +377,7 @@ FlyScript: ; 03:5254
 	ldh [hMapEntryMethod], a
 	jpab Functionfcc24
 
-	
+
 DigFunction: ; 03:5260
 	call .ResetScriptID
 .next
@@ -393,7 +393,7 @@ DigFunction: ; 03:5260
 	and $FF - SCRIPT_FINISHED_MASK
 	ld [wFieldMoveSucceeded], a
 	ret
-	
+
 .ResetScriptID
 	xor a
 	ld [wFieldMoveScriptID], a
@@ -433,7 +433,7 @@ FailDig: ; 03:52a8
 Text_CantUseDigHere: ; 03:52b4
 	text "ここでは　つかえません！"
 	prompt
-	
+
 DigScript: ; 03:52c2
 	ld hl, wDigWarpNumber
 	ld de, wNextWarp
@@ -445,7 +445,7 @@ DigScript: ; 03:52c2
 
 EmptyFunctiond2da: ; 03:52da
 	ret
-	
+
 TeleportFunction: ; 03:52db
 	xor a
 	ld [wFieldMoveScriptID], a
@@ -462,7 +462,7 @@ TeleportFunction: ; 03:52db
 	and $FF - SCRIPT_FINISHED_MASK
 	ld [wFieldMoveSucceeded], a
 	ret
-	
+
 .TeleportScriptTable
 	init_script_table
 	add_script TryTeleport
@@ -481,8 +481,8 @@ TryTeleport: ; 03:52fc
 .success
 	set_script CheckIfSpawnPoint
 	ret
-	
-CheckIfSpawnPoint ; 03:5313
+
+CheckIfSpawnPoint: ; 03:5313
 	ld a, [wLastSpawnMapGroup]
 	ld d, a
 	ld a, [wLastSpawnMapNumber]
@@ -535,7 +535,7 @@ TeleportScript: ; 03:5375
 	ld a, MAPSETUP_TELEPORT
 	ldh [hMapEntryMethod], a
 	jpab Functionfcc24
-	
+
 Text_ReturnToLastMonCenter: ; 03:5395
 	text "さいごに　たちよった"
 	line "#センターにもどります"
diff --git a/engine/intro.asm b/engine/intro.asm
index 4cda00c..8b88859 100644
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -19,7 +19,7 @@ DemoStart:: ; 558D
 	ldh [rOBP0], a
 	call DemoSetUpPlayer
 	jp IntroCleanup
-	
+
 GameStart:: ; 55BB
 	ld de, OakPic
 	lb bc, BANK(OakPic), $00
@@ -94,7 +94,7 @@ GameStart:: ; 55BB
 	call Bankswitch
 	ld c, $04
 	call DelayFrames
-	
+
 IntroCleanup:: ; 568E
 	ld de, ShrinkPic1
 	lb bc, BANK(ShrinkPic1), $00
@@ -122,7 +122,7 @@ IntroCleanup:: ; 568E
 	ld a, $00
 	ld [wd638], a
 	ld [wd637], a
-	
+
 OverworldStart::
 	call SetUpGameEntry
 	ld hl, wDebugFlags
@@ -131,7 +131,7 @@ OverworldStart::
 	ld hl, wd4a9
 	set 0, [hl]
 	jp Function2a85
-	
+
 SetUpGameEntry:: ; 56E8
 	ld a, $04
 	ld [wd65e], a
@@ -149,16 +149,16 @@ SetUpGameEntry:: ; 56E8
 	ld bc, wd65e - wMapGroup
 	call CopyBytes
 	ret
-	
+
 GameStartPlacement:: ; 570D
-	db $01 ; map group 
+	db $01 ; map group
 	db MAP_PLAYER_HOUSE_2F ; map
 	dwcoord 15, 45 ; screen anchor
 	db $04 ; metatile x
 	db $04 ; metatile y
 	db $00 ; in-metatile x
 	db $01 ; in-metatile y
-	
+
 DebugSetUpPlayer:: ; 5715
 	call SetPlayerNamesDebug
 	ld a, $0F
@@ -184,17 +184,17 @@ DebugSetUpPlayer:: ; 5715
 	ld [hl], $01
 	call Function40fd
 	ret
- 
+
 DebugFillPokedex:: ; 5755
 	ld b, $1F
 	ld a, $FF
 .loop
 	ld [hl+], a
 	dec b
-	jr nz, .loop 
+	jr nz, .loop
 	ld [hl], $07
 	ret
-	
+
 FillBagWithList:: ; 5760
 	ld hl, wNumBagItems
 .loop
@@ -203,37 +203,37 @@ FillBagWithList:: ; 5760
 	jr z, .yump
 	ld [wCurItem], a
 	inc de
-	ld a, [de] 
+	ld a, [de]
 	inc de
 	ld [wItemQuantity], a
 	call ReceiveItem
 	jr .loop
 .yump
 	ret
-	
+
 DebugBagItems:: ; 5777
-	db ITEM_IMPORTANT_BAG, $01 
-	db ITEM_BAG, $01 
-	db ITEM_TM_HOLDER, $01 
-	db ITEM_BALL_HOLDER, $01 
-	db ITEM_BICYCLE, $01 
-	db ITEM_MAIL, $06 
-	db ITEM_ULTRA_BALL, $1E 
-	db ITEM_POKE_BALL, $63 
-	db ITEM_POTION, $1E 
-	db ITEM_RARE_CANDY, $14 
-	db ITEM_MOON_STONE, $63 
-	db ITEM_FULL_HEAL, $63 
-	db ITEM_PROTEIN, $63 
-	db ITEM_QUICK_NEEDLE, $63 
-	db ITEM_SNAKESKIN, $63 
-	db ITEM_KINGS_ROCK, $63 
-	db ITEM_FLEE_FEATHER, $63 
-	db ITEM_FOCUS_ORB, $63 
-	db ITEM_SHARP_SCYTHE, $63 
-	db ITEM_DETECT_ORB, $63 
+	db ITEM_IMPORTANT_BAG, $01
+	db ITEM_BAG, $01
+	db ITEM_TM_HOLDER, $01
+	db ITEM_BALL_HOLDER, $01
+	db ITEM_BICYCLE, $01
+	db ITEM_MAIL, $06
+	db ITEM_ULTRA_BALL, $1E
+	db ITEM_POKE_BALL, $63
+	db ITEM_POTION, $1E
+	db ITEM_RARE_CANDY, $14
+	db ITEM_MOON_STONE, $63
+	db ITEM_FULL_HEAL, $63
+	db ITEM_PROTEIN, $63
+	db ITEM_QUICK_NEEDLE, $63
+	db ITEM_SNAKESKIN, $63
+	db ITEM_KINGS_ROCK, $63
+	db ITEM_FLEE_FEATHER, $63
+	db ITEM_FOCUS_ORB, $63
+	db ITEM_SHARP_SCYTHE, $63
+	db ITEM_DETECT_ORB, $63
 	db $FF
-	
+
 GiveRandomPokemon:: ; 57A0
 	and a
 	ret z
@@ -246,9 +246,9 @@ GiveRandomPokemon:: ; 57A0
 	dec a
 	jr nz, .loop
 	ret
- 
+
 GiveRandomJohto::  ; 57B0
-.loop  
+.loop
 	call Random
 	and $03
 	jr z, .loop
@@ -262,7 +262,7 @@ GiveRandomJohto::  ; 57B0
 	ld a, $8D
 	ld [wPartyMon1 + 1], a
 	ret
-  
+
 GiveKantoStarters:: ; 57C8
 	ld a, $03
 	ld b, $20
@@ -274,7 +274,7 @@ GiveKantoStarters:: ; 57C8
 	ld b, $24
 	call GivePokemon
 	ret
-	
+
 GivePokemon:: ; 57DE
 	ld [wMonDexIndex], a
 	ld a, b
@@ -282,7 +282,7 @@ GivePokemon:: ; 57DE
 	ld a, $10
 	call Predef
 	ret
-	
+
 AddRandomPokemonToBox: ; 57EB
 	and a
 	ret z
@@ -302,9 +302,9 @@ AddRandomPokemonToBox: ; 57EB
 	dec a
 	jr nz, .loop
 	ret
-	
+
 RandomUnder246:: ; 5818
-.loop	
+.loop
 	call Random
 	and a
 	jr z, .loop
@@ -321,7 +321,7 @@ FillTMs:: ; 5823
 	dec b
 	jr nz, .loop
 	ret
-	
+
 DebugGiveKeyItems:: ; 582F
 	ld hl, DebugKeyItemsList
 	ld de, wKeyItems
@@ -343,7 +343,7 @@ DebugKeyItemsList:: ; 5844
 	db ITEM_BAG
 	db ITEM_BICYCLE
 	db $FF
-	
+
 DemoSetUpPlayer:: ; 5849
 	ld hl, wPlayerName
 	ld de, DemoPlayerName
@@ -356,130 +356,130 @@ DemoSetUpPlayer:: ; 5849
 	call FillBagWithList
 	call GiveRandomJohto
 	ret
-	
+
 DemoItemList:: ; 5868
-	db ITEM_POKE_BALL, $05 
-	db ITEM_POTION, $0A 
-	db ITEM_FULL_HEAL, $0A 
-	db ITEM_STIMULUS_ORB, $01 
-	db ITEM_FOCUS_ORB, $01 
+	db ITEM_POKE_BALL, $05
+	db ITEM_POTION, $0A
+	db ITEM_FULL_HEAL, $0A
+	db ITEM_STIMULUS_ORB, $01
+	db ITEM_FOCUS_ORB, $01
 	db $FF
-	
+
 DemoPlayerName:: ; 5873
 	db "サトシ@"
-	
+
 DemoRivalName:: ; 5877
 	db "シゲル@"
-	
+
 OakSpeechDemo:: ; 587B
-	text "ようこそ" 
+	text "ようこそ"
 	line "ポケット　モンスターの　せかいへ！"
 	cont "ごぞんじ　わしが　オーキドじゃ！"
-	
+
 	para "きょう　きみに　きてもらったのは"
 	line "ほかでもない"
 	cont "あたらしい　ずかんづくりを"
 	cont "てつだって　ほしいのじゃ！"
-	
+
 	para "もちろん"
 	line "きみの　パートナーとなる　ポケモンと"
 	cont "りュックは　ようい　しておる"
-	
+
 	para "りュックの　なかには"
 	line "キズぐすりと"
 	cont "モンスターボールが"
 	cont "はいっておるから　あんしんじゃ！"
-	
+
 	para "すでに　きみの　ライバルは"
 	line "しゅっぱつ　しとる"
-	
+
 	para "まけないよう　がんばって　くれい！"
 	prompt
-	
+
 OakSpeech1:: ; 5956
 	text "いやあ　またせた！"
-	
+
 	para "ポケット　モンスターの　せかいへ"
 	line "ようこそ！"
-	
+
 	para "わたしの　なまえは　オーキド"
-	
+
 	para "みんなからは　#　はかせと"
 	line "したわれて　おるよ"
 	prompt
-	
+
 OakSpeech2:: ; 599F
 	text "きみも　もちろん"
 	line "しっているとは　おもうが"
-	
+
 	para "この　せかいには"
 	line "ポケット　モンスターと　よばれる"
 	cont "いきもの　たちが"
 	cont "いたるところに　すんでいる！"
 	prompt
-	
+
 OakSpeech3:: ; 59E8
 	text "その　#　という　いきものを"
 	line "ひとは　ぺットに　したり"
 	cont "しょうぶに　つかったり"
 	cont "そして・・・"
-	
+
 	para "わたしは　この　#の"
 	line "けんきゅうを　してる　というわけだ"
 	prompt
-	
+
 OakSpeech4:: ; 5A35
 	text "では　はじめに　きみの　なまえを"
 	line "おしえて　もらおう！"
 	prompt
-	
+
 OakSpeech5:: ; 5A52
 	text "そして　この　しょうねんは"
 	line "きみの　おさななじみであり"
 	cont"ライバルである"
-	
+
 	para "・・・えーと？"
 	line "なまえは　なんて　いったかな？"
 	prompt
-	
+
 OakSpeech6:: ; 5A8F
 	text "さて　きみの　きねんすべき"
 	line "たびだちのひを"
 	cont "きろくしておこう！"
-	
+
 	para "じかんも　なるべく　せいかくにな！"
 	prompt
-	
+
 OakSpeech7:: ; 5AC2
 	text "<PLAYER>！"
-	
+
 	para "いよいよ　これから"
 	line "きみの　ものがたりの　はじまりだ！"
-	
+
 	para "ゆめと　ぼうけんと！"
 	line "ポケット　モンスターの　せかいへ！"
-	
+
 	para "レッツ　ゴー！"
 	done
-	
+
 SetPlayerNamesDebug:: ; 5B07
 	ld hl, DebugPlayerName
 	ld de, wPlayerName
 	call CopyNameDebug
 	ld hl, DebugRivalName
 	ld de, wRivalName
-	
+
 CopyNameDebug:
 	ld bc, PLAYER_NAME_LENGTH
 	call CopyBytes
 	ret
-	
+
 DebugPlayerName: ; 5B1D
 	db "コージ@"
-	
+
 DebugRivalName: ; 5B21
 	db "レッド@"
-	
+
 ChoosePlayerName:: ; 5B25
 	call PanPortraitRight
 	ld hl, PlayerNameMenuHeader
@@ -490,7 +490,7 @@ ChoosePlayerName:: ; 5B25
 	ld de, wPlayerName
 	call SaveCustomName
 	jr .farjump
-	
+
 .loop
 	ld b, $01
 	ld de, wPlayerName
@@ -498,7 +498,7 @@ ChoosePlayerName:: ; 5B25
 	ld a, [wPlayerName]
 	cp "@"
 	jr z, .loop
-	
+
 	call GBFadeOutToWhite
 	call ClearTileMap
 	call LoadFontExtra
@@ -511,20 +511,20 @@ ChoosePlayerName:: ; 5B25
 	ld hl, ChoosePlayerNameEndText
 	call PrintText
 	ret
-	
+
 ChoosePlayerNameEndText: ; 5B6F
 	text "ふむ・・・"
 	line "<PLAYER>　と　いうんだな！"
 	prompt
-	
+
 PlayerNameMenuHeader: ; 5B81
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 00, 00, 10, 11
 	dw PlayerNameMenuData
 	db 01 ; initial selection
-	
-PlayerNameMenuData; 5B89
-	db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B 
+
+PlayerNameMenuData: ; 5B89
+	db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B
 	db 04 ; items
 	db "じぶんできめる@"
 	db "ゴールド@"
@@ -543,7 +543,7 @@ ChooseRivalName:: ; 5BA9
 	ld de, wRivalName
 	call SaveCustomName
 	jr .farjump
-	
+
 .loop
 	ld b, $02
 	ld de, wRivalName
@@ -551,7 +551,7 @@ ChooseRivalName:: ; 5BA9
 	ld a, [wRivalName]
 	cp "@"
 	jr z, .loop
-	
+
 	call GBFadeOutToWhite
 	call ClearTileMap
 	call LoadFontExtra
@@ -564,20 +564,20 @@ ChooseRivalName:: ; 5BA9
 	ld hl, ChooseRivalNameEndText
 	call PrintText
 	ret
-	
+
 ChooseRivalNameEndText: ; 5BF3
 	text "そうか　そうだったな"
 	line "<RIVAL>　という　なまえだ"
 	prompt
-	
+
 RivalNameMenuHeader: ; 5C0A
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 00, 00, 10, 11
-	dw RivalNameMenuData 
+	dw RivalNameMenuData
 	db 01 ; initial selection
-	
+
 RivalNameMenuData: ; 5C12
-	db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B 
+	db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B
 	db 04 ; items
 	db "じぶんできめる@"
 	db "シルバー@"
@@ -585,7 +585,7 @@ RivalNameMenuData: ; 5C12
 	db "ジョン@"
 	db 3
 	db "なまえこうほ@"
-	
+
 MomNamePrompt:: ; 5C31
 	ld hl, MomNameMenuHeader
 	call NamingWindow
@@ -595,7 +595,7 @@ MomNamePrompt:: ; 5C31
 	ld de, wMomsName
 	call SaveCustomName
 	jr .escape
-	
+
 .loop
 	ld b, $03
 	ld de, wMomsName
@@ -603,7 +603,7 @@ MomNamePrompt:: ; 5C31
 	ld a, [wMomsName]
 	cp "@"
 	jr z, .loop
-	
+
 	call ClearPalettes
 	call ClearTileMap
 	callab Function140d9
@@ -612,15 +612,15 @@ MomNamePrompt:: ; 5C31
 	call WaitBGMap
 .escape
 	ret
-	
+
 MomNameMenuHeader: ; 5C71
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 00, 00, 10, 11
 	dw .MomNameMenuData
 	db 01 ; initial selection
-	
+
 .MomNameMenuData: ; 5C79
-	db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B 
+	db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B
 	db 04 ; items
 	db "じぶんで　きめる@"
 	db "おかあさん@"
@@ -628,7 +628,7 @@ MomNameMenuHeader: ; 5C71
 	db "かあちゃん@"
 	db 3
 	db "なまえこうほ@"
-	
+
 NamingWindow:: ; 5C9B
 	; loads the menu header put into hl
 	call LoadMenuHeader
@@ -638,13 +638,13 @@ NamingWindow:: ; 5C9B
 	call CopyNameFromMenu
 	call CloseWindow
 	ret
-	
+
 SaveCustomName:: ; 5CAC
 	ld hl, wStringBuffer2
 	ld bc, PLAYER_NAME_LENGTH
 	call CopyBytes
 	ret
-	
+
 PanPortraitRight:: ; 5CB6
 	hlcoord 5, 4
 	ld d, $06
@@ -665,7 +665,7 @@ PanPortraitRight:: ; 5CB6
 	dec hl
 	dec c
 	jr nz, .innerLoop
-	
+
 	call WaitBGMap
 	pop bc
 	pop hl
@@ -673,7 +673,7 @@ PanPortraitRight:: ; 5CB6
 	dec b ; passed c - how many tiles right to pan?
 	jr nz, .loop
 	ret
-	
+
 PanPortraitLeft:: ; 5CD7
 	hlcoord 12, 4
 	ld b, $06
@@ -689,7 +689,7 @@ PanPortraitLeft:: ; 5CD7
 	inc hl
 	dec c
 	jr nz, .innerloop
-	
+
 	call WaitBGMap
 	pop bc
 	pop hl
@@ -697,11 +697,11 @@ PanPortraitLeft:: ; 5CD7
 	dec b
 	jr nz, .loop
 	ret
-	
+
 MenuCallSettings:: ; 5CF3
 	call SettingsScreen
 	ret
-	
+
 FadeInIntroPic: ; 5CF7
 	ld hl, IntroFadePalettes
 	ld b, 6
@@ -713,7 +713,7 @@ FadeInIntroPic: ; 5CF7
 	dec b
 	jr nz, .next
 	ret
-	
+
 IntroFadePalettes:
 	db %01010100
 	db %10101000
@@ -721,12 +721,12 @@ IntroFadePalettes:
 	db %11111000
 	db %11110100
 	db %11100100
-	
+
 MovePicLeft: ; 5D0E
 	ld a, 119
 	ldh [hWX], a
 	call DelayFrame
-	
+
 	ld a, %11100100
 	ldh [rBGP], a
 .next
@@ -737,7 +737,7 @@ MovePicLeft: ; 5D0E
 	ret z
 	ldh [hWX], a
 	jr .next
-	
+
 IntroDisplayPicCenteredOrUpperRight:: ; 5D27
 ; b = bank
 ; de = address of compressed pic
@@ -766,7 +766,7 @@ IntroDisplayPicCenteredOrUpperRight:: ; 5D27
 	ld bc, $0707
 	predef PlaceGraphic
 	ret
-	
+
 LoadStartingSprites: ; 5D5D
 	ld de, GoldSpriteGFX
 	lb bc, BANK(GoldSpriteGFX), $0C
@@ -790,11 +790,11 @@ LoadStartingSprites: ; 5D5D
 	dec c
 	jr nz, .loop
 	ret
-	
+
 GameStartSprites: ; 5D80
-	db $50, $48, $00 
-	db $50, $50, $01 
+	db $50, $48, $00
+	db $50, $50, $01
 	db $58, $48, $02
 	db $58, $50, $03
-	
+
 ; 5D8C
diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm
index d09a75a..33b5e4d 100755
--- a/engine/items/inventory.asm
+++ b/engine/items/inventory.asm
@@ -11,7 +11,7 @@ _ReceiveItem: ; 03:4AA1
 	dec a
 	ld hl, .Pockets
 	jp CallJumptable
-	
+
 .Pockets: ; 03:4ABA
 	dw .Item
 	dw .KeyItem
@@ -39,7 +39,7 @@ _ReceiveItem: ; 03:4AA1
 	ld c, a
 	call GetTMHMNumber
 	jp ReceiveTMHM
-	
+
 
 _TossItem: ; 03:4AE0
 	call DoesHLEqualwNumBagItems
@@ -50,31 +50,31 @@ _TossItem: ; 03:4AE0
 	dec a
 	ld hl, .Pockets
 	jp CallJumptable
-	
+
 .Pockets ; 03:4AF8
 	dw .Item
 	dw .KeyItem
 	dw .Ball
 	dw .TMHM
-	
+
 .Ball ; 03:4B00
 	pop hl
 	ld a, [wCurItem]
 	ld c, a
 	call GetBallIndex
 	jp TossBall
-	
+
 .TMHM ; 03:4B0B
 	pop hl
 	ld a, [wCurItem]
 	ld c, a
 	call GetTMHMNumber
 	jp TossTMHM
-	
+
 .KeyItem ; 03:4B16
 	pop hl
 	jp TossKeyItem
-	
+
 .Item ; 03:4B1A
 	pop hl
 
@@ -91,13 +91,13 @@ _CheckItem: ; 03:4B1E
 	dec a
 	ld hl, .Pockets
 	jp CallJumptable
-	
+
 .Pockets ; 03:4B36
 	dw .Item
 	dw .KeyItem
 	dw .Ball
 	dw .TMHM
-	
+
 .Ball ; 03:4B3E
 	pop hl
 	ld a, [wCurItem]
@@ -111,14 +111,14 @@ _CheckItem: ; 03:4B1E
 	ld c, a
 	call GetTMHMNumber
 	jp CheckTMHM
-	
+
 .KeyItem ; 03:4B54
 	pop hl
 	jp CheckKeyItems
-	
+
 .Item ; 03:4B58
 	pop hl
-	
+
 .not_bag
 	jp CheckTheItem
 
@@ -139,7 +139,7 @@ PutItemInPocket: ; 03:4B64
 	ld a, [wCurItem]
 	ld c, a
 	ld b, 0
-	
+
 ; will add the item once the total
 ; available space (b) exceeds the
 ; amount being added
@@ -161,22 +161,22 @@ PutItemInPocket: ; 03:4B64
 .next
 	inc hl
 	jr .loop
-	
+
 .terminator
 	call GetPocketCapacity
 	ld a, [de]
 	cp c
 	jr c, .can_add
-	
+
 	and a
 	ret
-	
+
 .can_add
 	ld h, d
 	ld l, e
 	ld a, [wCurItem]
 	ld c, a
-	
+
 .loop2
 	inc hl
 	ld a, [hli]
@@ -184,7 +184,7 @@ PutItemInPocket: ; 03:4B64
 	jr z, .terminator2
 	cp c
 	jr nz, .loop2
-	
+
 	ld a, [wItemQuantity]
 	add [hl]
 	cp a, 100
@@ -200,7 +200,7 @@ PutItemInPocket: ; 03:4B64
 	sub 99
 	ld [wItemQuantity], a
 	jr .loop2
-	
+
 .terminator2
 	dec hl
 	ld a, [wCurItem]
@@ -211,12 +211,12 @@ PutItemInPocket: ; 03:4B64
 	ld h, d
 	ld l, e
 	inc [hl]
-	
+
 .done
 	scf
 	ret
 
-	
+
 GetPocketCapacity: ; 03:4BC1
 	ld c, MAX_ITEMS
 	ld a, e
@@ -225,12 +225,12 @@ GetPocketCapacity: ; 03:4BC1
 	ld a, d
 	cp HIGH(wNumBagItems)
 	ret z
-	
+
 .not_bag
 	ld c, MAX_PC_ITEMS
 	ret
 
-	
+
 RemoveItemFromPocket: ;03:4BCF
 	ld d, h
 	ld e, l
@@ -246,12 +246,12 @@ RemoveItemFromPocket: ;03:4BCF
 	ld a, [hl]
 	sub b
 	jr c, .underflow
-	
+
 	ld [hl], a
 	ld [wItemQuantityBuffer], a
 	and a
 	jr nz, .done
-	
+
 ; if the remaining quantity is zero
 ; then erase the slot by shifting
 ; the subsequent data upwards
@@ -260,7 +260,7 @@ RemoveItemFromPocket: ;03:4BCF
 	ld c, l
 	inc hl
 	inc hl
-	
+
 .loop
 	ld a, [hli]
 	ld [bc], a
@@ -270,20 +270,20 @@ RemoveItemFromPocket: ;03:4BCF
 	ld h, d
 	ld l, e
 	dec [hl]
-	
+
 .done
 	scf
 	ret
-	
+
 .underflow
 	and a
 	ret
-	
-	
+
+
 CheckTheItem: ; 03:4BFD
 	ld a, [wCurItem]
 	ld c, a
-	
+
 .loop
 	inc hl
 	ld a, [hli]
@@ -291,15 +291,15 @@ CheckTheItem: ; 03:4BFD
 	jr z, .fail
 	cp c
 	jr nz, .loop
-	
+
 	scf
 	ret
-	
+
 .fail
 	and a
 	ret
 
-	
+
 ReceiveKeyItem: ; 03:4C0E
 	ld hl, wNumKeyItems
 	ld a, [hli]
@@ -315,12 +315,12 @@ ReceiveKeyItem: ; 03:4C0E
 	inc [hl]
 	scf
 	ret
-	
+
 .full_pack
 	and a
 	ret
-	
-	
+
+
 TossKeyItem: ; 03:4C28
 	ld hl, wNumKeyItems
 	dec [hl]
@@ -332,7 +332,7 @@ TossKeyItem: ; 03:4C28
 	ld d, h
 	ld e, l
 	inc hl
-	
+
 ; erase this item by shifting
 ; all subsequent data upwards
 .loop
@@ -343,13 +343,13 @@ TossKeyItem: ; 03:4C28
 	jr nz, .loop
 	scf
 	ret
-	
-	
+
+
 CheckKeyItems: ; 03:4C40
 	ld a, [wCurItem]
 	ld c, a
 	ld hl, wKeyItems
-	
+
 .loop
 	ld a, [hli]
 	cp c
@@ -359,12 +359,12 @@ CheckKeyItems: ; 03:4C40
 
 	and a
 	ret
-	
+
 .done
 	scf
 	ret
-	
-	
+
+
 ; get index of ball item id c from BallItems
 GetBallIndex: ; 03:4C53
 	ld a, c
@@ -380,8 +380,8 @@ GetBallIndex: ; 03:4C53
 	pop hl
 	ld c, a
 	ret
-	
-	
+
+
 ; get ball item id at index c in BallItems
 GetBallByIndex: ; 03:4c66
 	push bc
@@ -394,8 +394,8 @@ GetBallByIndex: ; 03:4c66
 	pop bc
 	ld c, a
 	ret
-	
-	
+
+
 BallItems: ; 03:4C73
 	db ITEM_MASTER_BALL
 	db ITEM_ULTRA_BALL
@@ -415,7 +415,7 @@ EmptyBallPocket: ; 03:4C78
 	ld [hli], a
 	ld [hl], -1
 	ret
-	
+
 
 ReceiveBall: ; 03:4C80
 	ld hl, wBallQuantities
@@ -429,22 +429,22 @@ ReceiveBall: ; 03:4C80
 	ld a, [hl]
 	and a
 	jr nz, .done
-	
+
 ; increase the ball pocket size if
 ; this ball's previous quantity was 0
 	ld a, [wNumBallItems]
 	inc a
 	ld [wNumBallItems], a
-	
+
 .done
 	ld [hl], b
 	scf
 	ret
-	
+
 .overflow
 	and a
 	ret
-	
+
 
 TossBall: ; 03:4C9F
 	ld hl, wBallQuantities
@@ -456,7 +456,7 @@ TossBall: ; 03:4C9F
 	sub b
 	jr c, .underflow
 	jr nz, .done
-	
+
 ; increase the ball pocket size if
 ; this ball's new quantity is 0
 	ld b, a
@@ -464,18 +464,18 @@ TossBall: ; 03:4C9F
 	dec a
 	ld [wNumBallItems], a
 	ld a, b
-	
+
 .done
 	ld [hl], a
 	ld [wItemQuantityBuffer], a
 	scf
 	ret
-	
+
 .underflow
 	and a
 	ret
-	
-	
+
+
 CheckBall: ; 03:4CC0
 	ld hl, wBallQuantities
 	ld b, 0
@@ -486,7 +486,7 @@ CheckBall: ; 03:4CC0
 	scf
 	ret
 
-	
+
 ReceiveTMHM: ; 03:4CCB
 	ld b, 0
 	ld hl, wTMsHMs
@@ -498,12 +498,12 @@ ReceiveTMHM: ; 03:4CCB
 	ld [hl], a
 	scf
 	ret
-	
+
 .overflow
 	and a
 	ret
-	
-	
+
+
 TossTMHM: ; 03:4CDE
 	ld b, 0
 	ld hl, wTMsHMs
@@ -513,7 +513,7 @@ TossTMHM: ; 03:4CDE
 	ld a, [hl]
 	sub b
 	jr c, .underflow
-	
+
 	ld [hl], a
 	ld [wItemQuantityBuffer], a
 	scf
@@ -523,7 +523,7 @@ TossTMHM: ; 03:4CDE
 	and a
 	ret
 
-	
+
 CheckTMHM: ; 03:4CF4
 	ld b, 0
 	ld hl, wTMsHMs
@@ -537,18 +537,18 @@ CheckTMHM: ; 03:4CF4
 GetTMHMNumber: ; 03:4CFF
 	ld a, c
 	ld c, 0
-	
+
 	sub ITEM_TM01
 	jr c, .not_machine
-	
+
 	cp ITEM_C8 - ITEM_TM01
 	jr z, .not_machine
 	jr c, .finish
-	
+
 	inc c
 	cp ITEM_E1 - ITEM_TM01
 	jr z, .not_machine
-	
+
 	jr c, .finish
 	inc c
 
@@ -560,7 +560,7 @@ GetTMHMNumber: ; 03:4CFF
 	ld c, a
 	scf
 	ret
-	
+
 .not_machine
 	and a
 	ret
@@ -600,7 +600,7 @@ GetItemAmount: ; 03:4e10
 	ld b, 0
 	and a
 	ret
-	
+
 ; Returns the amount of item b in b
 CheckAmountInItemPocket: ; 03:4E1C
 	ld hl, wItems
@@ -633,7 +633,7 @@ CheckAmountInKeyItems: ; 03:4E2B
 	ld b, 1
 	scf
 	ret
-	
+
 SECTION "engine/items/inventory.asm@_CheckTossableItem", ROMX
 
 ; Return 1 in wItemAttributeParamBuffer and
@@ -680,7 +680,7 @@ CheckItemMenu: ; 03:53D9
 	and $f
 	ld [wItemAttributeParamBuffer], a
 	ret
-	
+
 ; Get attribute a of wCurItem.
 GetItemAttr: ; 03:53E6
 	push hl
@@ -707,7 +707,7 @@ ItemAttr_ReturnCarry: ; 03:5405
 	ld [wItemAttributeParamBuffer], a
 	scf
 	ret
-	
+
 ; Return the price of wCurItem in de.
 GetItemPrice: ; 03:540C
 	push hl
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm
index efe8c27..f3290fe 100644
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -3,20 +3,20 @@ INCLUDE "constants.asm"
 SECTION "engine/items/tmhm.asm", ROMX
 
 CanLearnTMHMMove: ; 04:528f
-; Gets the index of TM or HM with move ID wce32, 
+; Gets the index of TM or HM with move ID wce32,
 ; then checks the corresponding flag in wMonDexIndex's learnset.
 ; Sets register c to 1 if TM/HM is in learnset OR if debug is enabled.
 	ld a, [wDebugFlags]
 	ld c, 01
 	bit 1, a
 	ret nz
-	
+
 	ld a, [wMonDexIndex]
 	ld [wCurSpecies], a
 	call GetMonHeader
 	ld hl, wMonHLearnset
 	push hl
-	
+
 	ld a, [wce32]
 	ld b, a
 	ld c, 0
@@ -27,7 +27,7 @@ CanLearnTMHMMove: ; 04:528f
 	jr z, .jump
 	inc c
 	jr .loop
-	
+
 .jump
 	pop hl
 	ld b, 2 ;CHECK_FLAG
diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm
index 37c399e..9289084 100644
--- a/engine/menu/debug_menu.asm
+++ b/engine/menu/debug_menu.asm
@@ -29,7 +29,7 @@ DebugJumpTable:: ; 4064
 	dw DebugMenuOptionSubGames
 	dw DebugMenuOptionMonsterTest
 	dw DebugMenuOptionName
-	
+
 DebugMenuHeader: ; 4070
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 05, 02, SCREEN_WIDTH - 7, SCREEN_HEIGHT - 1
@@ -37,12 +37,12 @@ DebugMenuHeader: ; 4070
 	db 01 ; default option
 
 .MenuData: ; 4078
-	db $A0 
+	db $A0
 	db 0 ; items
 	dw DebugMenuItems
-	db $8A, $1F 
+	db $8A, $1F
 	dw .Strings
-	
+
 .Strings
 	db "ファイト@"
 	db "フィールド@"
@@ -50,22 +50,22 @@ DebugMenuHeader: ; 4070
 	db "サブゲーム@"
 	db "モンスター@"
 	db "なまえ@"
-	
+
 DebugMenuItems:
-	db 06 
-	db 00 
-	db 01 
-	db 02 
-	db 03 
-	db 04 
-	db 05 
+	db 06
+	db 00
+	db 01
+	db 02
+	db 03
+	db 04
+	db 05
 	db -1
 
 DebugMenuOptionField:: ; 40A8
 	ld hl, wDebugFlags
 	set DEBUG_FIELD_F, [hl] ; set debug mode
 	jp StartNewGame
-	
+
 DebugMenuOptionFight:: ; 40B0
 	ld hl, wDebugFlags
 	set DEBUG_BATTLE_F, [hl]
@@ -96,7 +96,7 @@ DebugMenuOptionMonsterTest:: ; 40CB
 	callab MonsterTest
 	ld a, $e4
 	ldh [rBGP], a
-	
+
 Function40eb::
 	jp DebugMenu
 
@@ -105,5 +105,5 @@ DebugMenuOptionName:: ; 40EE
 	ld a, $e4
 	ldh [rBGP], a
 	jp DebugMenu
-	
+
 ; 40FD
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index bbd827e..02ec29d 100644
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -18,7 +18,7 @@ InitializeNewGameWRAM:
 	ld bc, $1164
 	xor a
 	call ByteFill
-	
+
 	; Lots of other setup.
 
 	pop af
@@ -61,7 +61,7 @@ InitializeNewGameWRAM:
 
 	ld a, $B8
 	ld [wd15f], a
-	
+
 	ld hl, wUnknownListLengthd1ea
 	ld a, ITEM_REPEL
 	ld [wCurItem], a
@@ -88,7 +88,7 @@ InitializeByteList:
 SECTION "engine/menu/main_menu.asm@MainMenu", ROMX
 
 MainMenu:: ; 01:53CC
-	ld hl, wd4a9 
+	ld hl, wd4a9
 	res 0, [hl]
 	call ClearTileMap
 	call GetMemSGBLayout
@@ -273,7 +273,7 @@ PlayerInfoText:
 	next "#ずかん　　　　ひき"
 	next "プレイじかん"
 	text_end
-	
+
 StartNewGame:: ; 555C
 	ld de, MUSIC_NONE
 	call PlayMusic
@@ -292,5 +292,5 @@ StartNewGame:: ; 555C
 	jp z, DemoStart
 	call DebugSetUpPlayer
 	jp IntroCleanup
-	
+
 ; 558D
diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm
index d1278fc..6a8f433 100644
--- a/engine/menu/start_menu.asm
+++ b/engine/menu/start_menu.asm
@@ -27,12 +27,12 @@ DisplayStartMenu: ; 04:5DBE
 	jp CallJumptable
 
 .StartMenuEntriesReturnTable: ; 04:5DFC
-	dw .RefreshStartDisplay  
-	dw .MainReturn  
-	dw .exit  
-	dw .UpdateTime  
-	dw .ExitAndHookFF 
-	
+	dw .RefreshStartDisplay
+	dw .MainReturn
+	dw .exit
+	dw .UpdateTime
+	dw .ExitAndHookFF
+
 .MainReturn
 	call .WaitForARelease
 	call LoadFontExtra
@@ -42,39 +42,39 @@ DisplayStartMenu: ; 04:5DBE
 	call Function1fea
 	call UpdateTimePals
 	ret
-	
+
 .unused ; 04:5E16
 	call .WaitForARelease
 	call LoadFontExtra
 	call CloseWindow
 	jr .UpdateTime
-	
+
 .WaitForARelease
 	call GetJoypad
 	ldh a, [hJoyDown]
 	bit A_BUTTON_F, a
 	jr nz, .WaitForARelease
 	ret
-	
+
 .ExitAndHookFF: ; 04:5E2B
 	call ExitMenu
 	ld a, $FF
 	ldh [hStartmenuCloseAndSelectHookEnable], a
 	jr .UpdateTime
-	
+
 .StartMenuHeader: ; 04:5E34
 	db MENU_BACKUP_TILES
 	menu_coords $0C, 00, $13, $11
 	dw .MenuData
 	db 1 ; default option
-	
+
 .MenuData: ; 04:5E3C
-	db $A8
-	db 0 ; items 
+	db $A8 ; flags
+	db 0 ; items
 	dw StartMenuItems
 	db $8A, $1F
 	dw .Strings
-	
+
 .Strings: ; 04:5E44
 	db "ずかん@"
 	db "ポケモン@"
@@ -85,62 +85,62 @@ DisplayStartMenu: ; 04:5DBE
 	db "とじる@"
 	db "わくせん@"
 	db "りセット@"
-	
+
 StartMenuJumpTable: ; 04:5E6C
-	dw StartMenu_Pokedex 
+	dw StartMenu_Pokedex
 	dw StartMenu_Party
 	dw StartMenu_Backpack
 	dw StartMenu_TrainerCard
 	dw StartMenu_Save
 	dw StartMenu_Settings
-	dw StartMenu_Exit 
+	dw StartMenu_Exit
 	dw StartMenu_TrainerGear
 	dw StartMenu_Reset
-	
+
 StartMenuItems: ; 04:5E7E
-	db 4 
-	db START_SAVE 
-	db START_OPTIONS 
-	db START_TRAINERCARD 
-	db START_EXIT 
+	db 4
+	db START_SAVE
+	db START_OPTIONS
+	db START_TRAINERCARD
+	db START_EXIT
+	db -1
+
+	db 5
+	db START_PARTY
+	db START_TRAINERCARD
+	db START_SAVE
+	db START_OPTIONS
+	db START_EXIT
 	db -1
-	
-	db 5 
-	db START_PARTY 
-	db START_TRAINERCARD 
-	db START_SAVE 
-	db START_OPTIONS 
-	db START_EXIT 
-	db -1 
-	
-	db 6 
-	db START_POKEDEX 
-	db START_PARTY 
-	db START_TRAINERCARD 
-	db START_SAVE 
-	db START_OPTIONS 
-	db START_EXIT 
-	db -1 
-	
-	db 7 
-	db START_POKEDEX 
-	db START_PARTY 
-	db START_BACKPACK 
-	db START_TRAINERCARD 
-	db START_SAVE 
-	db START_OPTIONS 
-	db START_EXIT 
-	db -1 
-	
+
 	db 6
-	db START_POKEDEX 
-	db START_PARTY 
-	db START_BACKPACK 
-	db START_TRAINERCARD 
-	db START_OPTIONS 
-	db START_EXIT 
+	db START_POKEDEX
+	db START_PARTY
+	db START_TRAINERCARD
+	db START_SAVE
+	db START_OPTIONS
+	db START_EXIT
 	db -1
-	
+
+	db 7
+	db START_POKEDEX
+	db START_PARTY
+	db START_BACKPACK
+	db START_TRAINERCARD
+	db START_SAVE
+	db START_OPTIONS
+	db START_EXIT
+	db -1
+
+	db 6
+	db START_POKEDEX
+	db START_PARTY
+	db START_BACKPACK
+	db START_TRAINERCARD
+	db START_OPTIONS
+	db START_EXIT
+	db -1
+
 GetStartMenuState: ; 04:5EA4
 ; Stores one of four values to wActiveBackpackPocket
 ; based on story flags and debug mode.
@@ -167,30 +167,30 @@ GetStartMenuState: ; 04:5EA4
 	ld a, b
 	ld [wActiveBackpackPocket], a
 	ret
-	
+
 StartMenu_Exit: ; 04:5ECF
 ; Exits the menu
 	ld a, 1
 	ret
-	
+
 StartMenu_TrainerGear: ; 04:5ED2
 	callab TrainerGear
 	ld a, 0
 	ret
-	
+
 StartMenu_Reset: ; 04:5EDD
 	ld hl, DisplayResetDialog
 	ld a, BANK(DisplayResetDialog)
 	call DisplayResetDialog ; should be farcall
 	ld a, 0
 	ret
-	
+
 StartMenu_Save: ; 04:5EE8
 	predef Function143e0
 	call UpdateSprites
 	ld a, 0
 	ret
-	
+
 StartMenu_Settings: ; 04:5EF3
 	call LoadStandardMenuHeader
 	xor a
@@ -207,12 +207,12 @@ StartMenu_Settings: ; 04:5EF3
 	call UpdateTimePals
 	ld a, 0
 	ret
-	
-StartMenu_TrainerCard ; 04:5F1F
+
+StartMenu_TrainerCard: ; 04:5F1F
 	call _TrainerCard
 	ld a, 0
 	ret
-	
+
 _TrainerCard: ; 04:5F25
 	call LoadStandardMenuHeader
 	ldh a, [hMapAnims]
@@ -230,7 +230,7 @@ _TrainerCard: ; 04:5F25
 	pop af
 	ldh [hMapAnims], a
 	ret
-	
+
 StartMenu_Pokedex: ; 04:5F4F
 	call LoadStandardMenuHeader
 	predef Function40000
@@ -243,61 +243,61 @@ StartMenu_Pokedex: ; 04:5F4F
 	call UpdateTimePals
 	ld a, 0
 	ret
-	
+
 UnusedToolPocketData: ; 04:5F6F
-	dw ToolsPocketHeader 
-	dw wRegularItemsCursor 
-	dw wRegularItemsScrollPosition 
-	
+	dw ToolsPocketHeader
+	dw wRegularItemsCursor
+	dw wRegularItemsScrollPosition
+
 ToolsPocketHeader: ; 04:5F75
-	db MENU_BACKUP_TILES ; flags 
-	menu_coords 03, 03, $11, $0A 
-	dw .ToolsPocketData 
-	db 1 
-	
+	db MENU_BACKUP_TILES ; flags
+	menu_coords 03, 03, $11, $0A
+	dw .ToolsPocketData
+	db 1
+
 .ToolsPocketData ; 04:5F7D
-	db $AD 
+	db $AD
 	db 4, 9, 2, 0
-	dw wNumBagItems 
-	
-	dbw BANK(Function2473b), Function2473b
-	dbw BANK(Function24783), Function24783  
-	dbw BANK(Function241ef), Function241ef
-	
+	dw wNumBagItems
+
+	dba Function2473b
+	dba Function24783
+	dba Function241ef
+
 	dw KeyItemsPocketHeader
 	dw wBackpackAndKeyItemsCursor
-	dw wBackpackAndKeyItemsScrollPosition 
-	
+	dw wBackpackAndKeyItemsScrollPosition
+
 KeyItemsPocketHeader: ; 04:5F93
-	db MENU_BACKUP_TILES ; flags 
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 03, 03, $11, $0A
 	dw .KeyPocketData
-	db 1 
-	
+	db 1
+
 .KeyPocketData ; 04:5F9B
-	db $AD 
-	db 4, 9, 1, 0 
+	db $AD
+	db 4, 9, 1, 0
 	dw wNumKeyItems
-	
-	dbw BANK(Function2473b), Function2473b
-	dbw BANK(Function24783), Function24783 
-	dbw BANK(Function241ef), Function241ef 
-	
+
+	dba Function2473b
+	dba Function24783
+	dba Function241ef
+
 BackpackMenuHeader: ; 04:5FAB
-	db MENU_BACKUP_TILES ; flags 
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 03, 03, $11, $0A
 	dw .BackpackData
-	db 01 
-	
+	db 01
+
 .BackpackData ; 04:5FB3
-	db $A1 
-	db 4, 9, 2, 0 
-	dw wNumBagItems 
-	
-	dbw BANK(Function2473b), Function2473b
-	dbw BANK(Function24783), Function24783 
-	dbw BANK(Function241ef), Function241ef 
-	
+	db $A1
+	db 4, 9, 2, 0
+	dw wNumBagItems
+
+	dba Function2473b
+	dba Function24783
+	dba Function241ef
+
 GetPocket2Status: ; 04:5FC3
 ; puts 2 in wActiveBackpackPocket if pocket 2 has items
 ; otherwise puts 1 in
@@ -309,7 +309,7 @@ GetPocket2Status: ; 04:5FC3
 	ld a, 1
 	ld [wActiveBackpackPocket], a
 	ret
-	
+
 FlipPocket2Status: ; 04:5FD3
 ; stores 1 in wactivebackpocket if it's currently 2
 ; and vice versa
@@ -317,7 +317,7 @@ FlipPocket2Status: ; 04:5FD3
 	cp 2
 	ld a, 1
 	jr z, .skip
-	ld a, 2 
+	ld a, 2
 .skip
 	ld [wActiveBackpackPocket], a
 	ret
@@ -332,7 +332,7 @@ CheckItemsQuantity: ; 04:5FE2
 	ret nz
 	scf
 	ret
-	
+
 DrawBackpack: ; 04:5FEE
 	ld hl, wVramState
 	res 0, [hl]
@@ -344,13 +344,13 @@ DrawBackpack: ; 04:5FEE
 	ld c, $0F
 	call DrawTextBox
 	ret
-	
+
 ; 04:600C
 	ld hl, wVramState
 	set 0, [hl]
 	call ExitMenu
 	ret
-	
+
 StartMenu_Backpack: ; 04:6015
 	call CheckItemsQuantity
 	jr c, .NoItems
@@ -380,13 +380,13 @@ StartMenu_Backpack: ; 04:6015
 	call LoadFontExtra
 	pop af
 	ret
-	
+
 .NoItems
 	call DrawNoItemsText ; 6371
 	scf
 	ld a, 0
 	ret
-	
+
 DebugBackpackLoop: ; 04:6056
 ; checks the field debug flag, if set this runs
 ; otherwise NondebugBackpackLoop runs
@@ -406,16 +406,16 @@ DebugBackpackLoop: ; 04:6056
 	ld a, [wRegularItemsScrollPosition]
 	ld [wMenuScrollPosition], a
 	call ScrollingMenu
-	
+
 	ld a, [wMenuScrollPosition]
 	ld [wRegularItemsScrollPosition], a
 	ld a, [wMenuCursorY]
 	ld [wRegularItemsCursor], a
 	jp HandleBackpackInput
-	
+
 .ToolsPocketText ; 04:608F
 	db "　　　　　　ふつうの　どうぐ　　　　　　@"
-	
+
 .NoTools
 	ld hl, KeyItemsPocketHeader
 	call CopyMenuHeader
@@ -426,16 +426,16 @@ DebugBackpackLoop: ; 04:6056
 	ld a, [wBackpackAndKeyItemsScrollPosition]
 	ld [wMenuScrollPosition], a
 	call ScrollingMenu
-	
+
 	ld a, [wMenuScrollPosition]
 	ld [wBackpackAndKeyItemsScrollPosition], a
 	ld a, [wMenuCursorY]
 	ld [wBackpackAndKeyItemsCursor], a
 	jr HandleBackpackInput
-	
+
 KeyItemsPocketText: ; 04:60CD
 	db "　　　　　　だいじな　もの　　　　　　　@"
-	
+
 NondebugBackpackLoop: ; 04:60E2
 	ld hl, BackpackMenuHeader
 	call CopyMenuHeader
@@ -446,16 +446,16 @@ NondebugBackpackLoop: ; 04:60E2
 	ld a, [wBackpackAndKeyItemsScrollPosition]
 	ld [wMenuScrollPosition], a
 	call ScrollingMenu
-	
+
 	ld a, [wMenuScrollPosition]
 	ld [wBackpackAndKeyItemsScrollPosition], a
 	ld a, [wMenuCursorY]
 	ld [wBackpackAndKeyItemsCursor], a
 	jr HandleBackpackInput
-	
+
 BackpackHeaderText: ; 04:610B
 	db "　　　　　　りュックの　なか　　　　　@"
-	
+
 HandleBackpackInput: ; 04:611F
 	ld a, [wMenuJoypad]
 	cp A_BUTTON
@@ -469,33 +469,33 @@ HandleBackpackInput: ; 04:611F
 	cp SELECT
 	jp z, .BackpackSelect
 	jp .exit
-	
+
 .BackpackSwapPocket ; 04:613E
 	call FlipPocket2Status
 	xor a
 	ld [wSelectedSwapPosition], a
 	jp .exit
-	
+
 .BackpackSelect ; 04:6148
 	callab Function245c5
 	jp .exit
-	
+
 .exit ; 04:6153
 	jp DebugBackpackLoop
-	
+
 .UnusedNoItems ; 04:6156
 	call DrawNoItemsText
 	scf
 	ret
-	
+
 .BackpackBack ; 04:615B
 	scf
 	ret
-	
+
 .BackpackA ; 04:615D
 	and a
 	ret
-	
+
 BackpackSelected: ; 04:615F
 	callab Function243af
 	call PlaceHollowCursor
@@ -504,23 +504,23 @@ BackpackSelected: ; 04:615F
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, .BagSelectJumptable
 	jp CallJumptable
-	
+
 .BagSelectJumptable: ; 04:617E
-	dw SelectItem  
+	dw SelectItem
 	dw .UnknownSelection
-	dw BallPocketLoop  
-	dw .SwapPocket  
-	dw SelectItem  
-	dw SelectItem  
-	dw SelectItem 
+	dw BallPocketLoop
+	dw .SwapPocket
+	dw SelectItem
+	dw SelectItem
+	dw SelectItem
 
-.SwapPocket ; 04:618C	
+.SwapPocket ; 04:618C
 	call FlipPocket2Status
 	xor a
 	ld [wSelectedSwapPosition], a
 	and a
 	ret
-	
+
 .UnknownSelection ; 04:6195
 	call LoadStandardMenuHeader
 	callab Function2d2fc
@@ -528,7 +528,7 @@ BackpackSelected: ; 04:615F
 	call DrawBackpack
 	and a
 	ret
-	
+
 BallPocketLoop: ; 04:61A8
 	call BallPocket
 	jr c, .exit
@@ -536,9 +536,9 @@ BallPocketLoop: ; 04:61A8
 	ret c
 	jr BallPocketLoop
 .exit
-	and a 
+	and a
 	ret
-	
+
 SelectItem: ; 04:61B5
 	call ItemUseMenu
 	jr c, .skip1
@@ -552,9 +552,9 @@ SelectItem: ; 04:61B5
 .skip1
 	and a
 	ret
-	
+
 ItemUseMenu: ; 04:61CE
-; loads SelectedItemMenu if not debug, 
+; loads SelectedItemMenu if not debug,
 ; DebugSelectedItemMenu if debug
 	ld a, [wDebugFlags]
 	bit DEBUG_FIELD_F, a
@@ -570,68 +570,68 @@ ItemUseMenu: ; 04:61CE
 	call VerticalMenu
 	call CloseWindow
 	ret
-	
+
 DebugSelectedItemMenu: ; 04:61EF
 	db MENU_BACKUP_TILES
-	menu_coords $0D, $0A, $13, $10 
+	menu_coords $0D, $0A, $13, $10
 	dw .DebugSelectedItemMenuText
-	db 01 
-	
+	db 01
+
 .DebugSelectedItemMenuText
-	db $C0 
-	db 3 
+	db $C0
+	db 3
 	db "つかう@" ; use
 	db "すてる@" ; toss
 	db "とうろく@" ; register
-	
+
 SelectedItemMenu: ; 04:6206
 	db MENU_BACKUP_TILES
-	menu_coords $0E, $0A, $13, $0E 
+	menu_coords $0E, $0A, $13, $0E
 	dw .SelectedItemMenuText
-	db 01 
-	
+	db 01
+
 .SelectedItemMenuText
-	db $C0 
-	db 2 
+	db $C0
+	db 2
 	db "つかう@" ; use
 	db "すてる@" ; toss
-	
+
 TossItemSelection: ; 04:6218
 	ld de, wNumBagItems
 	call TryTossItem
 	and a
 	ret
-	
+
 RegisterItemSelection: ; 04:6220
 	call TryRegisterItem
 	and a
 	ret
-	
+
 UseItemSelection: ; 04:6225
 	callab CheckItemMenu
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, .UseItemJumptable
 	jp CallJumptable
-	
+
 .UseItemJumptable: ; 04:6236 ; jumptable
-	dw .FailedMove  
-	dw .unusable 
-	dw .unusable 
-	dw .unusable 
-	dw .SimpleItem 
+	dw .FailedMove
+	dw .unusable
+	dw .unusable
+	dw .unusable
+	dw .SimpleItem
 	dw .SpriteItem
 	dw .FieldMove
-	
+
 .unusable ; 04:6244
 	call PrintCantUseText
 	and a
 	ret
-	
+
 .SimpleItem: ; 04:6249
 	call UseItem
 	and a
 	ret
-	
+
 .SpriteItem: ; 04:624E
 ; might be a better name for this once
 ; bank 5 gets sorted out
@@ -641,7 +641,7 @@ UseItemSelection: ; 04:6225
 	call DrawBackpack
 	and a
 	ret
-	
+
 .FieldMove: ; 04:625C
 	call UseItem
 	ld a, [wFieldMoveSucceeded]
@@ -650,14 +650,14 @@ UseItemSelection: ; 04:6225
 	scf
 	ld a, 4
 	ret
-	
+
 .FailedMove ; 04:6269
 	call PrintCantUseText
 	and a
 	ret
-	
+
 TryTossItem: ; 04:626E
-	push de 
+	push de
 	call LoadItemData
 	callab _CheckTossableItem
 	ld a, [wItemAttributeParamBuffer]
@@ -687,76 +687,76 @@ TryTossItem: ; 04:626E
 	call ExitMenu
 	and a
 	ret
-	
+
 .TossFail ; 04:62BD ;25
 	call CantDropItem
 .TossReturn
 	pop hl
 	scf
 	ret
-	
+
 .TossedText: ; 04:62C3
-	db 1 
-	dw wStringBuffer2 
+	db 1
+	dw wStringBuffer2
 	text "を　"
 	line "いくつ　すてますか？"
 	done
-	
+
 .TossVerifyText: ; 04:62D5
-	db 1 
+	db 1
 	dw wStringBuffer2
-	text "を　@"	
-	db 9 
+	text "を　@"
+	db 9
 	dw wItemQuantity
-	db $12 
+	db $12
 	text "こ"
 	line "すててもよろしいですか？"
 	done
-	
+
 .TossedTextCopy: ; 04:62F0
-	db 1 
+	db 1
 	dw wStringBuffer1
 	text "を"
 	line "すてました！<PROMPT>"
-	
+
 CantDropItem: ; 04:62FD
 	ld hl, .CantDropItemText
 	call MenuTextBoxBackup
 	ret
-	
+
 .CantDropItemText: ; 04:6304
 	text "それは　とても　たいせつなモノです"
 	line "すてることは　できません！<PROMPT>"
-	
+
 PrintCantUseHM: ; 04:6325
 	ld hl, .CantUseHMText
 	call MenuTextBoxBackup
 	ret
-	
+
 .CantUseHMText: ; 04:632C
 	text "かいはつちゅう　です"
 	line "いまは　つかえません<PROMPT>"
-	
+
 PrintCantUseText: ; 04:6343
 	ld hl, .CantUseHereText
 	call MenuTextBoxBackup
 	ret
-	
+
 .CantUseHereText: ; 04:634A
 	text "オーキドの　ことば<⋯⋯>"
 	line "<PLAYER>よ！　こういうものには"
 	cont "つかいどきが　あるのじゃ！<PROMPT>"
-	
+
 DrawNoItemsText: ; 04:6371
 	ld hl, .NoItemsText
 	call MenuTextBoxBackup
 	ret
-	
+
 .NoItemsText: ; 04:6378
 	text "どうぐ　をひとつも<NEXT>もっていません！<PROMPT>"
-	
+
 BallPocket: ; 04:638C
-	xor a 
+	xor a
 	ldh [hBGMapMode], a
 	ld hl, .BallPocketHeader
 	call CopyMenuHeader
@@ -779,27 +779,29 @@ BallPocket: ; 04:638C
 .jmp2
 	scf
 	ret
-	
+
 .BallHolderText: ; 04:63B9
 	db "　　　　　ボール　ホルダ　　　　　　@"
-	
-.BallPocketHeader: ; 04:63CC 
-	db MENU_BACKUP_TILES 
+
+.BallPocketHeader: ; 04:63CC
+	db MENU_BACKUP_TILES
 	menu_coords 03, 03, $11, $0A
-	dw .MenuData 
-	db 1 
-	
+	dw .MenuData
+	db 1
+
 .MenuData: ; 04:63D4
 	db SCROLLINGMENU_ENABLE_FUNCTION3 ; flags
 	db 4, 8 ; rows, columns
-	db $80 ; horizontal spacing? 
-	dbw 0, wNumBallItems 
+	db $80 ; horizontal spacing?
+	db 0 ; ???
+	dw wNumBallItems
+
 	dba Function24774
 	dba Function24783
 	dba Function241ef
-	
+
 DrawBackpackTitleRow: ; 04:63E4
-	push de 
+	push de
 	hlcoord 0, 0
 	ld de, .BlankLine
 	call PlaceString
@@ -807,17 +809,17 @@ DrawBackpackTitleRow: ; 04:63E4
 	hlcoord 0, 1
 	call PlaceString
 	ret
-	
+
 .BlankLine: ; 04:63F6
 	db "　　　　　　　　　　　　　　　　　　　　@"
-	
+
 LoadItemData: ; 04:640B
 	ld a, [wCurItem]
 	ld [wce37], a
 	call GetItemName
 	call CopyStringToStringBuffer2
 	ret
-	
+
 StartMenuLoadSprites: ; 04:6418
 	call DisableLCD
 	ld a, 6
@@ -832,22 +834,22 @@ StartMenuLoadSprites: ; 04:6418
 	call EnableLCD
 	call GetMemSGBLayout
 	ret
-	
+
 TryRegisterItem: ; 04:6440
 	callab CheckItemMenu
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, .RegisterItemJumptable
 	jp CallJumptable
-	
+
 .RegisterItemJumptable ; 04:6451
-	dw PrintCantRegisterToolText 
-	dw PrintCantRegisterToolText 
-	dw PrintCantRegisterToolText 
-	dw PrintCantRegisterToolText 
-	dw RegisterItem 
-	dw RegisterItem 
-	dw RegisterItem 
-	
+	dw PrintCantRegisterToolText
+	dw PrintCantRegisterToolText
+	dw PrintCantRegisterToolText
+	dw PrintCantRegisterToolText
+	dw RegisterItem
+	dw RegisterItem
+	dw RegisterItem
+
 RegisterItem: ; 04:645F
 	ld a, [wItemIndex]
 	inc a
@@ -867,22 +869,22 @@ RegisterItem: ; 04:645F
 	ld hl, .RegisteredItemText
 	call MenuTextBoxBackup
 	ret
-	
+
 .RegisteredItemText: ; 04:6487
-	db 1 
+	db 1
 	dw wStringBuffer2
 	text "を　"
 	line "べんりボタンに　とうろくした！<PROMPT>"
-	
+
 PrintCantRegisterToolText: ; 04:649E
 	ld hl, .CantRegisterToolText
 	call MenuTextBoxBackup
 	ret
-	
+
 .CantRegisterToolText: ; 04:64A5
 	text "そのどうぐは　"
 	line "とうろくできません！<PROMPT>"
-	
+
 StartMenu_Party: ; 04:64B9
 	ld a, [wPartyCount]
 	and a
@@ -892,14 +894,14 @@ StartMenu_Party: ; 04:64B9
 .partynonzero
 	call LoadStandardMenuHeader
 	callab Function50756
-	
+
 HandleSelectedPokemon: ; 04:64CD
 	xor a
 	ld [wcdb9], a
 	ld [wSelectedSwapPosition], a
 	predef Function50774
 	jr PartyPrompt.partypromptreturn
-	
+
 PartyPrompt: ; 04:64DB
 	ld a, [wWhichPokemon]
 	inc a
@@ -926,7 +928,7 @@ PartyPromptExit: ; 04:64FB
 	call UpdateTimePals
 	pop af
 	ret
-	
+
 SelectedPokemonSubmenu: ; 04:6513
 	hlcoord 1, 13
 	lb bc, 4, $12
@@ -944,32 +946,32 @@ SelectedPokemonSubmenu: ; 04:6513
 	ld l, a
 	ld a, [wd163]
 	jp hl
-	
+
 PartyJumpTable: ; 04:653E
-	dbw 1, PartyTryCut 
-	dbw 2, PartyTryFly 
-	dbw 3, PartyTrySurf 
-	dbw 4, PartyCantUseMove 
-	dbw 5, PartyCantUseMove 
-	dbw 6, PartyCantUseMove 
-	dbw 7, PartyCantUseMove 
-	dbw 8, PartyTryDig 
-	dbw 9, PartyTryTeleport 
-	dbw 10, PartyCalculateHealth 
-	dbw 11, PartyPokemonSummary 
-	dbw 12, PartyCheckLessThanTwo 
-	dbw 13, PartyHeldItem 
+	dbw 1, PartyTryCut
+	dbw 2, PartyTryFly
+	dbw 3, PartyTrySurf
+	dbw 4, PartyCantUseMove
+	dbw 5, PartyCantUseMove
+	dbw 6, PartyCantUseMove
+	dbw 7, PartyCantUseMove
+	dbw 8, PartyTryDig
+	dbw 9, PartyTryTeleport
+	dbw 10, PartyCalculateHealth
+	dbw 11, PartyPokemonSummary
+	dbw 12, PartyCheckLessThanTwo
+	dbw 13, PartyHeldItem
 	dbw 14, HandleSelectedPokemon
 	dbw 15, PartyPokemonSummary2
-	dbw 16, PartyMailMenu 
-	
+	dbw 16, PartyMailMenu
+
 PartyCheckLessThanTwo: ; 04:656E
 ; might have to do with switch?
 	ld a, [wPartyCount]
 	cp 2
 	jp c, HandleSelectedPokemon
 	jp PartyPrompt
-	
+
 PartyHeldItem: ; 04:6579
 	callab Function_8f1cb
 	ld hl, .HoldItemMenu
@@ -995,7 +997,7 @@ PartyHeldItem: ; 04:6579
 	call CloseWindow
 .jump
 	jp HandleSelectedPokemon
-	
+
 .PartyGiveHeldItem ; 04:65B9
 	call LoadStandardMenuHeader
 	call ClearPalettes
@@ -1039,7 +1041,7 @@ PartyHeldItem: ; 04:6579
 	ld hl, ItemWasEquippedText
 	call MenuTextBoxBackup
 	jr .CheckMail
-	
+
 .NoItem
 	ld a, 1
 	ld [wItemQuantity], a
@@ -1055,7 +1057,7 @@ PartyHeldItem: ; 04:6579
 	cp ITEM_MAIL
 	call z, PartyGiveMail
 	jr .ExitGiveItem
-	
+
 .GiveItem ; 04:664B
 	ld a, [wce37]
 	ld [wCurItem], a
@@ -1063,7 +1065,7 @@ PartyHeldItem: ; 04:6579
 	ld hl, PartyItemRecieveBagFullText
 	call MenuTextBoxBackup
 	jr .ExitGiveItem
-	
+
 .CantGive ; 04:665C
 	ld hl, .CantBeEquippedText
 	call MenuTextBoxBackup
@@ -1072,7 +1074,7 @@ PartyHeldItem: ; 04:6579
 	call LoadFontsBattleExtra
 	call ExitMenu
 	ret
-	
+
 .PartyTryRecieveItem ; 04:666C
 	call SpeechTextBox
 	call GetPartyItemOffset
@@ -1099,127 +1101,127 @@ PartyHeldItem: ; 04:6579
 	call MenuTextBoxBackup
 .escape
 	ret
-	
+
 .HoldItemMenu ; 04:66A1 ; verticalmenu
 	db STATICMENU_NO_TOP_SPACING | STATICMENU_PLACE_TITLE
-	menu_coords 4, 4, $e, 9 
-	dw .HoldItemMenuText 
-	db 1 
+	menu_coords 4, 4, $e, 9
+	dw .HoldItemMenuText
+	db 1
 
 .HoldItemMenuText ;04:66A9
-	db $80 
-	
-	db 2 
-	db "そうびを　する@" 
-	db "そうびを　はずす@" 
-	
+	db $80
+
+	db 2
+	db "そうびを　する@"
+	db "そうびを　はずす@"
+
 .CantBeEquippedText ; 04:66BC
-	db 1 
+	db 1
 	dw wStringBuffer1
 	text "を　そうびすることは"
 	line "できません<PROMPT>"
-	
-ItemWasEquippedText ; 04:66D1
-	db 1 
-	dw wcd11 
+
+ItemWasEquippedText: ; 04:66D1
+	db 1
+	dw wcd11
 	text "は　そうび　していた"
 	line "@"
 
 .UnusedText1 ; 04:66E1
-	db 1 
+	db 1
 	dw wStringBuffer1
 	text "を　はずして"
 	para "@"
-	
+
 .UnusedText2 ; 04:66ED
-	db 1 
+	db 1
 	dw wStringBuffer2
-	text "を　そうびした！<PROMPT>" 
-	
+	text "を　そうびした！<PROMPT>"
+
 ItemPrompt66FA: ; 04:66FA
-	db 1 
-	dw wcd11 
+	db 1
+	dw wcd11
 	text "は　@"
-	
+
 .UnusedText3 ; 04:6701
-	db 1 
+	db 1
 	dw wStringBuffer2
 	text "を"
-	line "そうびした！<PROMPT>" 
-	
+	line "そうびした！<PROMPT>"
+
 PartyNoItemToRecieveText: ; 04:670E
-	db 1 
-	dw wcd11 
+	db 1
+	dw wcd11
 	text "は　なにも"
-	line "そうび　していません！<PROMPT>" 
-	
+	line "そうび　していません！<PROMPT>"
+
 PartyItemRecieveBagFullText: ; 04:6724
 	text "どうぐが　いっぱいで"
-	line "そうびを　はずせません！<PROMPT>" 
-	
+	line "そうびを　はずせません！<PROMPT>"
+
 ItemPrompt673D: ; 04:673D
-	db 1 
-	dw wcd11  
-	text "から　@" 
-	
+	db 1
+	dw wcd11
+	text "から　@"
+
 .UnusedText4 ; 04:6745
-	db 1 
+	db 1
 	dw wStringBuffer1
 	text "を"
-	line "はずしました！<PROMPT>" 
-	
+	line "はずしました！<PROMPT>"
+
 ItemPrompt6753: ; 04:6753
-	db 1 
-	dw wcd11 
+	db 1
+	dw wcd11
 	text "は　@"
-	
+
 .UnusedText5; 04:675A
-	db 1 
+	db 1
 	dw wStringBuffer1
 	text "を"
 	line "すでに　そうび　しています"
 	para "そうびしている　どうぐを"
 	line "とりかえますか？"
-	done 
-	
+	done
+
 GetPartyItemOffset: ; 04:6784
 	push af
 	ld a, 1
 	call GetPartyParamLocation
 	pop af
 	ret
-	
+
 PartyRecieveItem: ; 04:678C
 	ld a, 1
 	ld [wItemQuantity], a
 	ld hl, wNumBagItems
 	call ReceiveItem
 	ret
-	
-UnusedHandleItemJumptable; 04:6798
+
+UnusedHandleItemJumptable: ; 04:6798
 	callab CheckItemMenu
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, UnusedItemJumptable
 	jp CallJumptable
-	
+
 UnusedItemJumptable: ; 04:67A9
-	dw EmptyFunction127b7 
-	dw PartyGiveMail 
-	dw PartyBallPocket 
-	dw ChangeBackpackPocket 
-	dw EmptyFunction127b7 
-	dw EmptyFunction127b7 
-	dw EmptyFunction127b7 
-	
+	dw EmptyFunction127b7
+	dw PartyGiveMail
+	dw PartyBallPocket
+	dw ChangeBackpackPocket
+	dw EmptyFunction127b7
+	dw EmptyFunction127b7
+	dw EmptyFunction127b7
+
 EmptyFunction127b7: ; 04:67B7
 	ret
-	
+
 ChangeBackpackPocket: ; 04:67B8
 	call FlipPocket2Status
 	xor a
 	ld [wSelectedSwapPosition], a
 	ret
-	
+
 PartyBallPocket: ; 04:67C0
 	call BallPocket
 	jr c, .exit
@@ -1228,7 +1230,7 @@ PartyBallPocket: ; 04:67C0
 	jr PartyBallPocket
 .exit
 	ret
-	
+
 PartyGiveMail: ; 04:67CC
 	call LoadStandardMenuHeader
 	ld de, wMovementBufferCount
@@ -1251,7 +1253,7 @@ PartyGiveMail: ; 04:67CC
 	call CopyBytes
 	call CloseSRAM
 	ret
-	
+
 PartyMailMenu: ; 04:6806
 	ld hl, .MailMenu
 	call LoadMenuHeader
@@ -1313,44 +1315,44 @@ PartyMailMenu: ; 04:6806
 .exit
 	call CloseWindow
 	jp HandleSelectedPokemon
-	
+
 .MailFull ; 04:689D
 	ld hl, .MailFullText
 	call MenuTextBoxBackup
 	jr .exit
-	
+
 .MailMenu ; 04:68A5
-	db MENU_BACKUP_TILES 
-	menu_coords 04, 04, $0E, $0B 
+	db MENU_BACKUP_TILES
+	menu_coords 04, 04, $0E, $0B
 	dw .MailMenuStrings
 	db 01
-	
+
 .MailMenuStrings ; 04:68AD
 
-	db $80 
+	db $80
 	db 3
 	db "メールを　よむ@"
 	db "メールを　はずす@"
 	db "やめる@"
-	
+
 .MessageRemoveMail ; 04:68C4
 	text "メールを　はずすと　メッセージが"
 	line "きえてしまいますが　いいですか？"
 	done
-	
+
 .DrawNick ; 04:68E7
-	db 1 
+	db 1
 	dw wStringBuffer1
 	text "から　@"
-	
+
 .DeleteMailText ; 04:68EF
 	text "メールを"
 	line "はずしました！<PROMPT>"
-	
+
 .MailFullText ; 04:68FD
 	text "どうぐが　いっぱいで"
 	line "メールを　はずせません！<PROMPT>"
-	
+
 PartyPokemonSummary: ; 04:6916
 	call LoadStandardMenuHeader
 	call ClearSprites
@@ -1362,7 +1364,7 @@ PartyPokemonSummary: ; 04:6916
 	call ReloadFontAndTileset
 	call Call_ExitMenu
 	jp HandleSelectedPokemon
-	
+
 PartyTryCut: ; 04:6934
 	callab CutFunction
 	ld a, [wFieldMoveSucceeded]
@@ -1370,7 +1372,7 @@ PartyTryCut: ; 04:6934
 	jp nz, HandleSelectedPokemon
 	ld a, 4
 	jp PartyPromptExit
-	
+
 PartyTryFly: ; 04:6949
 	bit 2, a
 	jp z, PrintNeedNewBadgeText
@@ -1380,11 +1382,11 @@ PartyTryFly: ; 04:6949
 	jp nz, HandleSelectedPokemon
 	ld a, 4
 	jp PartyPromptExit
-	
+
 PartyCantUseMove: ; 04:6963
 	call PrintCantUseHM
 	jp HandleSelectedPokemon
-	
+
 PartyTryTeleport: ; 04:6969
 	callab TeleportFunction
 	ld a, [wFieldMoveSucceeded]
@@ -1392,7 +1394,7 @@ PartyTryTeleport: ; 04:6969
 	jp z, HandleSelectedPokemon
 	ld a, 4
 	jp PartyPromptExit
-	
+
 PartyTrySurf: ; 04:697D
 	bit 4, a
 	jp z, PrintNeedNewBadgeText
@@ -1402,7 +1404,7 @@ PartyTrySurf: ; 04:697D
 	jp z, HandleSelectedPokemon
 	ld a, 4
 	jp PartyPromptExit
-	
+
 PartyTryDig: ; 04:6996
 	callab DigFunction
 	ld a, [wFieldMoveSucceeded]
@@ -1410,7 +1412,7 @@ PartyTryDig: ; 04:6996
 	jp nz, HandleSelectedPokemon
 	ld a, 4
 	jp PartyPromptExit
-	
+
 PartyCalculateHealth: ; 04:69AB
 	ld a, MON_MAXHP ; might be wrong, was $24
 	call GetPartyParamLocation
@@ -1432,24 +1434,24 @@ PartyCalculateHealth: ; 04:69AB
 	jp nc, PrintNotHealthyEnoughText
 	callab Functionf218
 	jp HandleSelectedPokemon
-	
+
 PrintNotHealthyEnoughText: ; 04:69D9
 	ld hl, NotHealthyEnoughText
 	call PrintText
 	jp HandleSelectedPokemon
-	
+
 NotHealthyEnoughText: ; 04:69E2
 	text "たいりょくが　たりません！<PROMPT>"
-	
+
 PrintNeedNewBadgeText: ; 04:69F1
 	ld hl, NeedNewBadgeText
 	call PrintText
 	jp HandleSelectedPokemon
-	
+
 NeedNewBadgeText: ; 04:69FA
 	text "あたらしい　バッジを　てにするまで"
 	line "まだ　つかえません！<PROMPT>"
-	
+
 PartyPokemonSummary2: ; 04:6A18
 	ld hl, wce5f
 	ld a, [hl]
@@ -1460,7 +1462,7 @@ PartyPokemonSummary2: ; 04:6A18
 	ld [wce5f], a
 	call ClearBGPalettes
 	jp HandleSelectedPokemon
-	
+
 PokeSummary: ; 04:6A2C
 	call ClearBGPalettes
 	call ClearTileMap
@@ -1573,7 +1575,7 @@ PartySelectionInputs: ; 04:6AF9
 	ld de, PartyTypeText
 	call PlaceString
 	ld a, [wCurSpecies]
-	ld b, a 
+	ld b, a
 	hlcoord 5, 12
 	predef Function500a0
 	ld a, [wCurSpecies]
@@ -1598,7 +1600,7 @@ PartySelectionInputs: ; 04:6AF9
 	hlcoord 1, 14
 	predef Function2d663
 	jp PartySelectionInputs
-	
+
 .DrawMovePokeText ; 04:6B84
 	hlcoord 1, 11
 	lb bc, 6, $12
@@ -1607,7 +1609,7 @@ PartySelectionInputs: ; 04:6AF9
 	ld de, PartyMoveText
 	call PlaceString
 	jp PartySelectionInputs
-	
+
 .PartyPokeDetailsAdvancePage ; 04:6B99
 	ld hl, wWhichPokemon
 	inc [hl]
@@ -1616,7 +1618,7 @@ PartySelectionInputs: ; 04:6AF9
 	jp nz, PokeSummary
 	dec [hl]
 	jp PartySelectionInputs
-	
+
 .PartyPokeDetailsBackPage ; 04:6BA8
 	ld hl, wWhichPokemon
 	ld a, [hl]
@@ -1624,7 +1626,7 @@ PartySelectionInputs: ; 04:6AF9
 	jp z, PartySelectionInputs
 	dec [hl]
 	jp PokeSummary
-	
+
 .PartyPokeSelect ; 04:6BB4
 	ld a, [wSelectedSwapPosition]
 	and a
@@ -1661,7 +1663,7 @@ PartySelectionInputs: ; 04:6AF9
 	lb bc, 8, $12
 	call ClearBox
 	jp SummaryDrawPoke
-	
+
 SwapEntries: ; 04:6C06
 ; values at (hl + [cursor place]-1)
 ; and (hl + [wSelectedSwapPosition] -1) get swapped
@@ -1685,7 +1687,7 @@ SwapEntries: ; 04:6C06
 	ld a, b
 	ld [de], a
 	ret
-	
+
 PartySelectionBackOut: ; 04:6C20
 	xor a
 	ld [wSelectedSwapPosition], a
@@ -1694,7 +1696,7 @@ PartySelectionBackOut: ; 04:6C20
 	call ClearSprites
 	call ClearTileMap
 	ret
-	
+
 PartyMenuAttributes: ; 04:6C30
 ; cursor y
 ; cursor y
@@ -1704,42 +1706,42 @@ PartyMenuAttributes: ; 04:6C30
 ; ?
 ; distance between items (hi: y, lo: x)
 ; allowed buttons (mask)
-	db 3, 1 
-	db 3, 1 
-	db $40, $00 
-	dn 2, 0 
-	db $F3 
-	
+	db 3, 1
+	db 3, 1
+	db $40, $00
+	dn 2, 0
+	db $F3
+
 PartyTypeText: ; 04:6C38
 	db "タイプ/　　　　　いりょく/@"
-	
+
 PartyPokeDivider: ; 04:6C47
 	db "ーーー@"
-	
+
 PartyMoveText: ; 04:6C4B
 	db "どこに　いどうしますか？@"
-	
+
 CheckRegisteredItem: ; 04:6C58
 	call .RegisteredItem
 	ret
-	
+
 .RegisteredItem ; 04:6C5C
 	call GetRegisteredItemID
 	jr c, .NotRegistered
 	call UseRegisteredItem
 	ret
-	
+
 .NotRegistered ; 04:6C65
 	call RefreshScreen
 	ld hl, .NothingRegisteredText
 	call MenuTextBoxBackup
 	call Function1fea
 	ret
-	
+
 .NothingRegisteredText: ; 04:6C72
 	text "べんりボタンを　おした！"
 	line "⋯しかしなにもおきない！<PROMPT>"
-	
+
 GetRegisteredItemID: ; 04:6C8D
 ; if you can use the registered item, sets the ID to a
 ; otherwise sets 0 to a and sets the carry flag
@@ -1748,11 +1750,11 @@ GetRegisteredItemID: ; 04:6C8D
 	jr z, .CantUse
 	bit 7, a
 	jr nz, .IsKey
-	dec a 
+	dec a
 	ld hl, wNumBagItems
 	cp [hl]
 	jr nc, .CantUse
-	inc hl 
+	inc hl
 	ld [wItemIndex], a
 	ld e, a
 	ld d, 0
@@ -1789,28 +1791,28 @@ GetRegisteredItemID: ; 04:6C8D
 	ld [wRegisteredItemQuantity], a
 	scf
 	ret
-	
+
 UseRegisteredItem: ; 04:6CD9
 	callab CheckItemMenu
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, .RegisteredItemJumptable
 	jp CallJumptable
-	
+
 .RegisteredItemJumptable ; 04:6CEA
-	dw .CantUse2 
-	dw .CantUse 
+	dw .CantUse2
+	dw .CantUse
 	dw .CantUse
 	dw .CantUse
-	dw .overworld 
-	dw .FieldMove  
-	
+	dw .overworld
+	dw .FieldMove
+
 .CantUse ; 04:6CF6
 	call RefreshScreen
 	call PrintCantUseText
 	call Function1fea
 	and a
 	ret
-	
+
 .UnusedSimpleUse ; 04:6D01
 	call RefreshScreen
 	call UseItem
@@ -1829,7 +1831,7 @@ UseRegisteredItem: ; 04:6CD9
 	call Function1fea
 	and a
 	ret
-	
+
 .FieldMove ; 04:6D25
 	call UseItem
 	ld a, [wFieldMoveSucceeded]
@@ -1840,14 +1842,14 @@ UseRegisteredItem: ; 04:6CD9
 	ldh [hStartmenuCloseAndSelectHookEnable], a
 	ld a, 4
 	ret
-	
+
 .CantUse2
 	call RefreshScreen
 	call PrintCantUseText
 	call Function1fea
 	and a
 	ret
-	
+
 TrainerCardLoop: ; 04:6D41
 	ld a, [wVramState]
 	push af
@@ -1864,8 +1866,8 @@ TrainerCardLoop: ; 04:6D41
 	pop af
 	ld [wVramState], a
 	ret
-	
-ClearTrainerCardJumptable; 04:6D5E
+
+ClearTrainerCardJumptable: ; 04:6D5E
 ; sets four bytes at wJumpTableIndex to 0
 	call ClearPalettes
 	ld hl, wJumptableIndex
@@ -1879,7 +1881,7 @@ ClearTrainerCardJumptable; 04:6D5E
 	ld b, $0D
 	call GetSGBLayout
 	ret
-	
+
 HandleTrainerCardJumptable: ; 04:6D75
 	ld a, [wJumptableIndex]
 	ld e, a
@@ -1891,27 +1893,27 @@ HandleTrainerCardJumptable: ; 04:6D75
 	ld h, [hl]
 	ld l, a
 	jp hl
-	
+
 .TrainerCardJumptable: ; 04:6D84
-	dw TrainerCardMainPage 
-	dw .IncreaseJumpTableIndex 
-	dw .IncreaseJumpTableIndex 
-	dw .SetPalAndIncJumpTable 
-	dw TrainerCardMainInputs 
-	dw TrainerCardScroll 
-	dw .IncreaseJumpTableIndex 
-	dw .IncreaseJumpTableIndex 
-	dw TrainerCardClearTileMap 
-	dw .IncreaseJumpTableIndex 
-	dw .IncreaseJumpTableIndex 
-	dw TrainerCardSetWindowY 
-	dw TrainerCardBadgePage 
-	dw .IncreaseJumpTableIndex 
-	dw .IncreaseJumpTableIndex 
-	dw .SetPalAndIncJumpTable 
-	dw TrainerCardBadgeInput 
-	dw TrainerCardSetClearFlag 
-	
+	dw TrainerCardMainPage
+	dw .IncreaseJumpTableIndex
+	dw .IncreaseJumpTableIndex
+	dw .SetPalAndIncJumpTable
+	dw TrainerCardMainInputs
+	dw TrainerCardScroll
+	dw .IncreaseJumpTableIndex
+	dw .IncreaseJumpTableIndex
+	dw TrainerCardClearTileMap
+	dw .IncreaseJumpTableIndex
+	dw .IncreaseJumpTableIndex
+	dw TrainerCardSetWindowY
+	dw TrainerCardBadgePage
+	dw .IncreaseJumpTableIndex
+	dw .IncreaseJumpTableIndex
+	dw .SetPalAndIncJumpTable
+	dw TrainerCardBadgeInput
+	dw TrainerCardSetClearFlag
+
 .SetPalAndIncJumpTable: ; 04:6DA8
 	call SetPalettes
 .IncreaseJumpTableIndex: ; 04:6DAB
@@ -1919,7 +1921,7 @@ HandleTrainerCardJumptable: ; 04:6D75
 	inc a
 	ld [wJumptableIndex], a
 	ret
-	
+
 TrainerCardMainPage: ; 04:6DB3
 	call ClearPalettes
 	call ClearTileMap
@@ -1940,7 +1942,7 @@ TrainerCardMainPage: ; 04:6DB3
 	ld [wFlyDestination], a
 	and a
 	ret
-	
+
 TrainerCardMainInputs: ; 04:6DE3
 	call EmptyFunction12e37
 	call GetJoypad
@@ -1948,7 +1950,7 @@ TrainerCardMainInputs: ; 04:6DE3
 	ld a, [hl]
 	and D_LEFT
 	jr nz, .left
-	ld a, [hl] 
+	ld a, [hl]
 	and D_RIGHT
 	jr nz, .right
 	ld a, [hl]
@@ -1993,7 +1995,7 @@ TrainerCardMainInputs: ; 04:6DE3
 
 EmptyFunction12e37: ; 04:6E37
 	ret
-	
+
 TrainerCardScroll: ; 04:6E38
 	ld a, $90
 	ldh [hWY], a
@@ -2004,9 +2006,9 @@ TrainerCardScroll: ; 04:6E38
 	ld [wJumptableIndex], a
 	and a
 	ret
-	
+
 TrainerCardClearTileMap: ; 04:6E49
-	xor a 
+	xor a
 	ldh [hWY], a
 	ld a, $98
 	ldh [hBGMapAddress +1], a
@@ -2016,7 +2018,7 @@ TrainerCardClearTileMap: ; 04:6E49
 	ld [wJumptableIndex], a
 	and a
 	ret
-	
+
 TrainerCardSetWindowY: ; 04:6E5C
 	ldh a, [hWY]
 	cp $90
@@ -2025,7 +2027,7 @@ TrainerCardSetWindowY: ; 04:6E5C
 	ldh [hWY], a
 	and a
 	ret
-	
+
 TrainerCardClearPals: ; 04:6E68
 	call ClearPalettes
 	ld a, $90
@@ -2035,9 +2037,9 @@ TrainerCardClearPals: ; 04:6E68
 	ld [wJumptableIndex], a
 	and a
 	ret
-	
+
 TrainerCardBadgePage: ; 04:6E78
-	call ClearPalettes 
+	call ClearPalettes
 	call DisableLCD
 	ld hl, TrainerCardLeadersGFX
 	ld de, vTileset
@@ -2052,7 +2054,7 @@ TrainerCardBadgePage: ; 04:6E78
 	ld [wJumptableIndex], a
 	and a
 	ret
-	
+
 TrainerCardBadgeInput: ; 04:6E9E
 	call GetJoypad
 	ld hl, hJoyDown
@@ -2064,11 +2066,11 @@ TrainerCardBadgeInput: ; 04:6E9E
 .skip
 	and a
 	ret
-	
+
 TrainerCardSetClearFlag: ; 04:6EB0
 	scf
 	ret
-	
+
 TrainerCardDrawProtag: ; 04:6EB2
 	ld de, ProtagonistPic
 	ld a, BANK(ProtagonistPic)
@@ -2083,7 +2085,7 @@ TrainerCardDrawProtag: ; 04:6EB2
 	ld de, vChars2 tile $30
 	call InterlaceMergeSpriteBuffers
 	ret
-	
+
 PlaceMiscTilesTrainerCard: ; 04:6ED5
 	ld a, $30
 	ldh [hGraphicStartTile], a
@@ -2091,7 +2093,7 @@ PlaceMiscTilesTrainerCard: ; 04:6ED5
 	lb bc, 7, 7
 	predef PlaceGraphic
 	ret
-	
+
 DrawTrainerCardMainPage: ; 04:6EE5
 	hlcoord 0, 0
 	ld d, 5
@@ -2145,31 +2147,31 @@ DrawTrainerCardMainPage: ; 04:6EE5
 	hlcoord 4, 16
 	ld [hl], "▶"
 	ret
-	
+
 TrainerCardText: ; 04:6F7A
 	db "なまえ/<NEXT><NEXT>おこづかい<NEXT><NEXT>#ずかん@"
-	
+
 TrainerCardDexEntriesText: ; 04:6F8C
 	db "ひき@"
-	
+
 TrainerCardNameTiles: ; 04:6F8F
-	db $0A, $0C, $0D, $0E, $0F, $FF 
-	
+	db $0A, $0C, $0D, $0E, $0F, $FF
+
 TrainerCardIDNoTiles: ; 04:6F95
 	db $22, $23, $FF
 
-TrainerCardNameUnderlineTiles: ; 04:6F98	
-	db $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $0B, $FF 
+TrainerCardNameUnderlineTiles: ; 04:6F98
+	db $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $0B, $FF
 
 TrainerCardStatusTiles: ; 04:6FA6
-	db $0A, $10, $11, $12, $13, $FF 
-	
+	db $0A, $10, $11, $12, $13, $FF
+
 TrainerCardBadgesOutlineTiles: ; 04:6FAC
-	db $03, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $02, $7F, $14, $15, $16, $17, $18, $19, $1A, $1B, $1C, $1D, $7F, $7F, $7F, $FE, $BA, $7F, $7F, $7F, $05, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $FF 
-	
+	db $03, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $02, $7F, $14, $15, $16, $17, $18, $19, $1A, $1B, $1C, $1D, $7F, $7F, $7F, $FE, $BA, $7F, $7F, $7F, $05, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $FF
+
 TrainerCardBadgesTextTiles: ; 04:6FE9
 	db $1E, $1F, $20, $7F, $7F, $7F, $7F, $1B, $1C, $1D, $FF
-	
+
 DrawTrainerCaseBadgePage: ; 04:6FF4
 	hlcoord 0, 0
 	ld d, $0E
@@ -2184,25 +2186,25 @@ DrawTrainerCaseBadgePage: ; 04:6FF4
 	ld de, TrainerCardBadgeSilhouettesTiles
 	call PlaceTrainerCardTiles
 	ret
-	
+
 TrainerCardLeagueBadgesTextTiles: ; 04:7018
 	db "#りーグバッジ@"
-	
+
 TrainerCardBadgesTiles: ; 04:7020
 	db $0A, $0B, $0C, $0D, $0E, $FF
-	
+
 TrainerCardBadgeSilhouettesTiles: ; 04:7026
 	db $07, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $07, $07, $02, $18, $58, $59, $5A, $19, $5B, $5C, $5D, $1A, $6B, $6C, $6D, $1B, $78, $79, $7A, $7F, $07, $07, $02, $7F, $20, $21, $22, $7F, $23, $24, $25, $7F, $26, $27, $28, $7F, $29, $2A, $2B, $7F, $07, $07, $02, $7F, $30, $31, $32, $7F, $33, $34, $35, $7F, $36, $37, $38, $7F, $39, $3A, $3B, $7F, $07, $07, $02, $7F, $40, $41, $42, $7F, $43, $44, $45, $7F, $46, $47, $48, $7F, $49, $4A, $4B, $7F, $07, $07, $05, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $04, $07, $07, $7F, $1C, $68, $69, $6A, $1D, $7E, $6F, $6F, $1E, $5E, $5F, $6E, $1F, $7B, $7C, $7D, $02, $07, $07, $7F, $7F, $2C, $2D, $2E, $7F, $2F, $50, $51, $7F, $52, $53, $54, $7F, $55, $56, $57, $02, $07, $07, $7F, $7F, $3C, $3D, $3E, $7F, $3F, $60, $61, $7F, $62, $63, $64, $7F, $65, $66, $67, $02, $07, $07, $7F, $7F, $4C, $4D, $4E, $7F, $4F, $70, $71, $7F, $72, $73, $74, $7F, $75, $76, $77, $02, $07, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $02, $07, $7F, $7F, $10, $7F, $11, $7F, $12, $7F, $13, $7F, $14, $7F, $15, $7F, $16, $7F, $17, $7F, $02, $07, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $06, $07, $FF
-	
+
 PlaceTrainerCardTiles: ; 04:712B
 ; takes the tiles from de and places them at hl until FF is found.
-	ld a, [de] 
+	ld a, [de]
 	cp $FF
 	ret z
 	ld [hli], a
 	inc de
 	jr PlaceTrainerCardTiles
-	
+
 PlaceTrainerCardBGTile: ; 04:7133
 ; puts tile $07 (chequered background) at coord hl.
 ; d controls how many times biggerloop loops.
@@ -2212,7 +2214,7 @@ PlaceTrainerCardBGTile: ; 04:7133
 	ld [hli], a
 	dec e
 	jr nz, .loop
-	
+
 	ld a, $07
 	ld [hli], a
 	ld e, $11
@@ -2220,7 +2222,7 @@ PlaceTrainerCardBGTile: ; 04:7133
 	inc hl
 	dec e
 	jr nz, .ScanLoop
-	
+
 	ld a, 9
 	ld [hli], a
 	ld a, 7
@@ -2233,12 +2235,12 @@ PlaceTrainerCardBGTile: ; 04:7133
 	inc hl
 	dec e
 	jr nz, .InnerLoop
-	
+
 	ld a, 7
 	ld [hli], a
 	dec d
 	jr nz, .OuterLoop
-	
+
 	ld a, 7
 	ld [hli], a
 	ld a, 8
@@ -2248,7 +2250,7 @@ PlaceTrainerCardBGTile: ; 04:7133
 	inc hl
 	dec e
 	jr nz, .ScanLoop2
-	
+
 	ld a, 7
 	ld [hli], a
 	ld e, $14
@@ -2258,5 +2260,5 @@ PlaceTrainerCardBGTile: ; 04:7133
 	dec e
 	jr nz, .LastLoop
 	ret
-	
+
 ; end of section
diff --git a/engine/menu/text_entry.asm b/engine/menu/text_entry.asm
index 00f1290..609e711 100644
--- a/engine/menu/text_entry.asm
+++ b/engine/menu/text_entry.asm
@@ -1,11 +1,11 @@
 INCLUDE "constants.asm"
-	
+
 SECTION "engine/menu/text_entry.asm@naming", ROMX
 
 NAMINGSCREEN_UNDERSCORE EQU "♀"
 NAMINGSCREEN_HYPHEN     EQU "♂"
 NAMINGSCREEN_END        EQU $F0
-	
+
 NamingScreen: ; 04:53F4
 	ld hl, wNamingScreenDestinationPointer
 	ld [hl], e
@@ -30,7 +30,7 @@ NamingScreen: ; 04:53F4
 .loop
 	call NamingScreenJoypadLoop
 	jr nc, .loop
-	
+
 	pop af
 	ldh [hJoyDebounceSrc], a
 	pop af
@@ -39,7 +39,7 @@ NamingScreen: ; 04:53F4
 	ld [wce5f], a
 	call ClearJoypad
 	ret
-	
+
 .SetUpNamingScreen: ; 04:542B
 	call ClearBGPalettes
 	ld b, SGB_DIPLOMA
@@ -58,7 +58,7 @@ NamingScreen: ; 04:53F4
 	ldh [rOBP0], a
 	call NamingScreenInitNameEntry
 	ret
-	
+
 GetNamingScreenSetup: ; 04:5455
 ; wNamingScreenType selects which entry in the table below to jump to
 	ld a, [wNamingScreenType]
@@ -72,17 +72,17 @@ GetNamingScreenSetup: ; 04:5455
 	ld h, [hl]
 	ld l, a
 	jp hl
-	
+
 .Jumptable: ; 04:5466
-	dw .Pokemon 
-	dw .Player 
-	dw .Rival 
-	dw .Mom 
-	dw .Box 
-	dw .Pokemon 
-	dw .Pokemon 
-	dw .Pokemon 
-	
+	dw .Pokemon
+	dw .Player
+	dw .Rival
+	dw .Mom
+	dw .Box
+	dw .Pokemon
+	dw .Pokemon
+	dw .Pokemon
+
 .Pokemon: ; 04:5476
 	ld hl, Function8f0e3
 	ld a, BANK(Function8f0e3)
@@ -100,7 +100,7 @@ GetNamingScreenSetup: ; 04:5455
 
 .NicknameText ; 04:5495
 	db "のニックネームは？@"
-	
+
 .Player: ; 04:549F
 	ld de, GoldSpriteGFX
 	call .LoadSprite
@@ -109,10 +109,10 @@ GetNamingScreenSetup: ; 04:5455
 	call PlaceString
 	call .StoreSpriteIconParams
 	ret
-	
+
 .NameText: ; 04:54B2
 	db "あなた　の　なまえは？@"
-	
+
 .Rival: ; 04:54BE
 	ld de, SilverSpriteGFX
 	call .LoadSprite
@@ -121,23 +121,23 @@ GetNamingScreenSetup: ; 04:5455
 	call PlaceString
 	call .StoreSpriteIconParams
 	ret
-	
+
 .RivalText: ; 04:54D1
 ; the ret just preceeding this would make the first word Rival.
 	db "ライバル　の　なまえは？@"
-	
+
 .Mom: ; 04:54DE
 	ld de, MomSpriteGFX
 	call .LoadSprite
 	hlcoord 5, 2
-	ld de, .MomText 
-	call PlaceString 
-	call .StoreSpriteIconParams 
+	ld de, .MomText
+	call PlaceString
+	call .StoreSpriteIconParams
 	ret
-	
+
 .MomText: ; 04:54F1
 	db "ははおや　の　なまえは？@"
-	
+
 .Box: ; 04:54FE
 	ld de, PokeBallSpriteGFX
 	ld hl, vChars0
@@ -158,13 +158,13 @@ GetNamingScreenSetup: ; 04:5455
 	call PlaceString
 	call .StoreBoxIconParams
 	ret
-	
+
 .BoxText: ; 04:552D
 	db "バンク　の　なまえは？@"
-	
+
 .LoadSprite: ; 04:5539
 ; copies the sprite at de into the top of VRAM, as well as the sprite $C0 after de
-	push de 
+	push de
 	ld hl, vChars0
 	lb bc, BANK(GoldSpriteGFX), $04
 	call Request2bpp
@@ -184,7 +184,7 @@ GetNamingScreenSetup: ; 04:5455
 	ld a, $41
 	call InitSpriteAnimStruct
 	ret
-	
+
 .StoreSpriteIconParams: ; 04:5564
 	ld a, $05
 	ld [wNamingScreenMaxNameLength], a
@@ -194,7 +194,7 @@ GetNamingScreenSetup: ; 04:5455
 	ld a, h
 	ld [wNamingScreenStringEntryCoordX], a
 	ret
-	
+
 .StoreBoxIconParams: ; 04:5575
 	ld a, $08
 	ld [wNamingScreenMaxNameLength], a
@@ -204,7 +204,7 @@ GetNamingScreenSetup: ; 04:5455
 	ld a, h
 	ld [wNamingScreenStringEntryCoordX], a
 	ret
-	
+
 NamingScreen_InitText: ; 04:5586
 ; fills the tilemap with ■, then clears a 12x17 box at 1,1
 ; next it places the tiles at 04:58B3 onto the screen at 2,9 (tiles form an 11x8 box)
@@ -222,25 +222,25 @@ NamingScreen_InitText: ; 04:5586
 	hlcoord 2, 9
 	ld de, TextEntryChars
 	ld b, $08
-	
+
 .outerloop
 	ld c, $11
-	
+
 .innerloop
 	ld a, [de]
 	ld [hl+], a
 	inc de
 	dec c
 	jr nz, .innerloop
-	
+
 	inc hl
 	inc hl
 	inc hl
 	dec b
 	jr nz, .outerloop
 	ret
-	
-	
+
+
 NamingScreenJoypadLoop: ; 04:55BD
 	call GetJoypadDebounced
 	ld a, [wJumptableIndex]
@@ -252,7 +252,7 @@ NamingScreenJoypadLoop: ; 04:55BD
 	call DelayFrame
 	and a
 	ret
-	
+
 .leap ; 04:55DA
 ; kills sprites and resets screen position
 	callab InitEffectObject
@@ -283,7 +283,7 @@ NamingScreenJoypadLoop: ; 04:55BD
 	ld a, $01
 	ldh [hBGMapMode], a
 	ret
-	
+
 .RunJumpTable: ; 04:560C
 	ld a, [wJumptableIndex]
 	ld e, a
@@ -295,11 +295,11 @@ NamingScreenJoypadLoop: ; 04:55BD
 	ld h, [hl]
 	ld l, a
 	jp hl
-	
+
 .JumpTable: ; 04:561B
-	dw .InitCursor  
+	dw .InitCursor
 	dw .ReadButtons
-	
+
 .InitCursor: ; 04:561F
 	ld de, $5818
 	ld a, $39
@@ -311,7 +311,7 @@ NamingScreenJoypadLoop: ; 04:55BD
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
-	
+
 .ReadButtons: ; 04:5634
 ; if A or B were pressed, clear hJoypadSum after calling functions; if start, set 7 in the jumptable??
 	ld hl, hJoypadSum
@@ -325,7 +325,7 @@ NamingScreenJoypadLoop: ; 04:55BD
 	and START
 	jr nz, .jumpstart
 	ret
-	
+
 .jumpa ; 04:5647
 	call NamingScreenGetLastCharacter
 	cp NAMINGSCREEN_END
@@ -334,19 +334,19 @@ NamingScreenJoypadLoop: ; 04:55BD
 	xor a
 	ldh [hJoypadSum], a
 	ret
-	
+
 .jumpb ; 04:5655
 	call NamingScreenDeleteCharacter
 	xor a
 	ldh [hJoypadSum], a
 	ret
-	
+
 .jumpstart ; 04:565C
 	call NamingScreenStoreEntry
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
-	
+
 .GetDPad: ; 04:5665
 	ld hl, hJoySum
 	ld a, [hl]
@@ -362,7 +362,7 @@ NamingScreenJoypadLoop: ; 04:55BD
 	and D_RIGHT
 	jr nz, .rightjump
 	ret
-	
+
 .rightjump ; 04:567D
 	ld hl, $000C
 	add hl, bc
@@ -371,11 +371,11 @@ NamingScreenJoypadLoop: ; 04:55BD
 	jr nc, .skip1
 	inc [hl]
 	jr .escape
-	
+
 .skip1
 	ld [hl], $00
 	jr .escape
-	
+
 .leftjump
 	ld hl, $000C
 	add hl, bc
@@ -384,10 +384,10 @@ NamingScreenJoypadLoop: ; 04:55BD
 	jr z, .skip2
 	dec [hl]
 	jr .escape
-.skip2	
+.skip2
 	ld [hl], $0E
-	jr .escape 
-	
+	jr .escape
+
 .downjump
 	ld hl, $000D
 	add hl, bc
@@ -395,11 +395,11 @@ NamingScreenJoypadLoop: ; 04:55BD
 	cp $07
 	jr nc, .skip3
 	inc [hl]
-	jr .escape 
+	jr .escape
 .skip3
 	ld [hl], $00
 	jr .escape
-	
+
 .upjump ; 04:56AC :24
 	ld hl, $000D
 	add hl, bc
@@ -433,13 +433,13 @@ NamingScreenJoypadLoop: ; 04:55BD
 	add hl, bc
 	ld [hl], a
 	ret
-	
+
 LetterOffsetsTable1: ; 04:56DE
 	db $00, $08, $10, $18, $20, $30, $38, $40, $48, $50, $60, $68, $70, $78, $80
-	
+
 LetterOffsetsTable2:; 04:56ED
 	db $00, $08, $10, $18, $20, $28, $30, $38
-	
+
 NamingScreenTryAddCharacter: ; 04:56F5
 	ld a, [wNamingScreenLastCharacter]
 	ld hl, Dakutens
@@ -447,7 +447,7 @@ NamingScreenTryAddCharacter: ; 04:56F5
 	jr z, .jump
 	ld hl, Handakutens
 	cp "ﾟ"
-	jr z, .jump 
+	jr z, .jump
 	ld a, [wNamingScreenMaxNameLength]
 	ld c, a
 	ld a, [wNamingScreenCurNameLength]
@@ -464,7 +464,7 @@ NamingScreenTryAddCharacter: ; 04:56F5
 	ret z
 	ld [hl], NAMINGSCREEN_UNDERSCORE
 	ret
-	
+
 .jump ; 04:5724
 	ld a, [wNamingScreenCurNameLength]
 	and a
@@ -491,7 +491,7 @@ NamingScreenTryAddCharacter: ; 04:56F5
 	ld hl, wNamingScreenCurNameLength
 	inc [hl]
 	ret
-	
+
 Dakutens: ; 04:5748
 	db "かがきぎくぐけげこご"
 	db "さざしじすずせぜそぞ"
@@ -500,14 +500,14 @@ Dakutens: ; 04:5748
 	db "カガキギクグケゲコゴ"
 	db "サザシジスズセゼソゾ"
 	db "タダチヂツヅテデトド"
-	db "ハバヒビフブへべホボ" 
+	db "ハバヒビフブへべホボ"
 	db $FF
-	
+
 Handakutens: ; 04:5799
 	db "はぱひぴふぷへぺほぽ"
-	db "ハパヒピフプへぺホポ" 
-	db $FF 
-	
+	db "ハパヒピフプへぺホポ"
+	db $FF
+
 NamingScreenDeleteCharacter: ; 04:57AE
 	ld hl, wNamingScreenCurNameLength
 	ld a, [hl]
@@ -522,7 +522,7 @@ NamingScreenDeleteCharacter: ; 04:57AE
 	ret nz
 	ld [hl], NAMINGSCREEN_HYPHEN
 	ret
-	
+
 NamingScreenGetTextCursorPosition: ; 04:57C2
 	push af
 	ld hl, wNamingScreenDestinationPointer
@@ -535,7 +535,7 @@ NamingScreenGetTextCursorPosition: ; 04:57C2
 	add hl, de
 	pop af
 	ret
-	
+
 NamingScreenInitNameEntry: ; 04:57D2
 	ld hl, wNamingScreenDestinationPointer
 	ld a, [hli]
@@ -553,7 +553,7 @@ NamingScreenInitNameEntry: ; 04:57D2
 	jr nz, .loop
 	ld [hl], "@"
 	ret
-	
+
 NamingScreenStoreEntry: ; 04:57E9
 	ld hl, wNamingScreenDestinationPointer
 	ld a, [hli]
@@ -567,14 +567,14 @@ NamingScreenStoreEntry: ; 04:57E9
 	jr z, .terminator
 	cp NAMINGSCREEN_UNDERSCORE
 	jr nz, .notterminator
-.terminator	
+.terminator
 	ld [hl], "@"
 .notterminator
 	inc hl
 	dec c
 	jr nz, .loop
 	ret
-	
+
 NamingScreenGetLastCharacter: ; 04:5803
 	ld hl, wNamingScreenCursorObjectPointer
 	ld c, [hl]
@@ -601,7 +601,7 @@ NamingScreenGetLastCharacter: ; 04:5803
 	srl a
 	srl a
 	srl a
-	ld d, a 
+	ld d, a
 	hlcoord 0, 0
 	ld bc, $0014
 .loop
@@ -611,45 +611,45 @@ NamingScreenGetLastCharacter: ; 04:5803
 	add hl, bc
 	dec d
 	jr .loop
-	
+
 .done
-	add hl, de 
+	add hl, de
 	ld a, [hl]
 	ld [wNamingScreenLastCharacter], a
 	ret
-	
+
 LoadNamingScreenGFX: ; 04:5843
 	call ClearSprites
 	callab InitEffectObject
 	call LoadFont
-	
+
 	ld de, TextScreenGFX_End
 	ld hl, vChars1 tile $70
 	lb bc, BANK(TextScreenGFX_End), 1
 	call Get1bpp
-	
+
 	ld de, TextScreenGFX_Hyphen
 	ld hl, vChars1 tile $6F
 	lb bc, BANK(TextScreenGFX_Hyphen), 1
 	call Get1bpp
-	
+
 	ld de, TextScreenGFX_Underscore
 	ld hl, vChars1 tile $75
 	lb bc, BANK(TextScreenGFX_Underscore), 1
 	call Get1bpp
-	
+
 	ld de, vChars2 tile $60
 	ld hl, TrainerCardGFX
 	ld bc, $10
 	ld a, BANK(TrainerCardGFX)
 	call FarCopyData
-	
+
 	ld de, vChars0 tile $7f
 	ld hl, PokedexBorderGFX
 	ld bc, $10
 	ld a, BANK(PokedexBorderGFX)
 	call FarCopyData
-	
+
 	ld a, $26
 	ld hl, wc41a
 	ld [hli], a
@@ -690,17 +690,17 @@ ComposeMailMessage: ; 04:59EB
 .innerloop
 	call DoMailEntry
 	jr nc, .innerloop
-	
+
 	ld a, [wFlyDestination]
 	bit 7, a
 	jr nz, .outerloop
-	
+
 	pop af
 	ldh [hJoyDebounceSrc], a
 	pop af
 	ldh [hMapAnims], a
 	ret
-	
+
 .firstruncheck; 04:5A1B
 	ld hl, wFlyDestination
 	ld a, [hl]
@@ -712,7 +712,7 @@ ComposeMailMessage: ; 04:59EB
 .skip
 	call .InitBlankMail
 	ret
-	
+
 .InitBlankMail: ; 04:5A2C
 	call ClearBGPalettes
 	ld b, 8 ;diploma?
@@ -760,7 +760,7 @@ ComposeMailMessage: ; 04:59EB
 	add hl, de
 	ld [hl], "<NEXT>"
 	ret
-	
+
 InitMailText: ; 04:5A96
 	hlcoord 5, 2
 	ld de, MailPromptText
@@ -768,10 +768,10 @@ InitMailText: ; 04:5A96
 	ld a, $21
 	ld [wNamingScreenMaxNameLength], a
 	ret
-	
+
 MailPromptText: ; 04:5AA5
 	db "メールを　かいてね@"
-	
+
 InitCharSet: ; 04:5AAF
 	call WaitForAutoBgMapTransfer
 	ld hl, wTileMap
@@ -789,7 +789,7 @@ InitCharSet: ; 04:5AAF
 	ld b, $8
 .outerloop
 	ld c, $11
-.innerloop	
+.innerloop
 	ld a, [de]
 	ld [hli], a
 	inc de
@@ -801,7 +801,7 @@ InitCharSet: ; 04:5AAF
 	dec b
 	jr nz, .outerloop
 	ret
-	
+
 DoMailEntry: ; 04:5AE6
 	call GetJoypadDebounced
 	ld a, [wJumptableIndex]
@@ -816,7 +816,7 @@ DoMailEntry: ; 04:5AE6
 	call DelayFrame
 	and a
 	ret
-	
+
 .exit_mail ; 04:5B0A
 	callab InitEffectObject
 	call ClearSprites
@@ -825,7 +825,7 @@ DoMailEntry: ; 04:5AE6
 	ldh [hSCY], a
 	scf
 	ret
-	
+
 .Update: ; 04:5B1C
 	xor a
 	ldh [hBGMapMode], a
@@ -841,7 +841,7 @@ DoMailEntry: ; 04:5AE6
 	ld a, 1
 	ldh [hBGMapMode], a
 	ret
-	
+
 .DoJumpTable: ; 04:5B39
 	ld a, [wJumptableIndex]
 	ld e, a
@@ -853,16 +853,16 @@ DoMailEntry: ; 04:5AE6
 	ld h, [hl]
 	ld l, a
 	jp hl
-	
+
 .Jumptable: ; 04:5B48
-	dw .blinkcursor  
+	dw .blinkcursor
 	dw .processjoypad
 
 .blinkcursor ; 04:5B4C
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
-	
+
 .processjoypad; 04:5B51
 	ld hl, hJoypadSum
 	ld a, [hl]
@@ -878,7 +878,7 @@ DoMailEntry: ; 04:5AE6
 	and SELECT
 	jr nz, .selectjump
 	ret
-	
+
 .ajump ; 04:5B69
 	call NamingScreenGetLastCharacter
 	cp "円"
@@ -922,7 +922,7 @@ DoMailEntry: ; 04:5AE6
 	ld [hl], a
 	set 7, [hl]
 	ret
-	
+
 SECTION "engine/menu/text_entry.asm@mail2", ROMX
 
 SetupMail: ; 04:5C31
@@ -977,7 +977,7 @@ SetupMail: ; 04:5C31
 	add hl, de
 	ld [hl], "<NEXT>"
 	ret
-	
+
 DrawMailLoadedText: ; 04:5CA9
 	hlcoord 5, 2
 	ld de, MailLoadedText
@@ -985,10 +985,10 @@ DrawMailLoadedText: ; 04:5CA9
 	ld a, $21
 	ld [wNamingScreenMaxNameLength], a
 	ret
-	
+
 MailLoadedText: ; 04:5CB8
 	db "スアケシ！！！@" ; should be "MAIL!!!" since the bold english font is loaded into vChars1
-	
+
 DrawMail: ; 04:5CC0
 	call WaitForAutoBgMapTransfer
 	hlcoord 0, 0
@@ -1012,7 +1012,7 @@ DrawMail: ; 04:5CC0
 	ld c, $10
 	call DrawMailTextExtra
 	ret
-	
+
 DrawMailRow: ; 04:5CFC
 	ld c, $07
 	call .loop
@@ -1029,22 +1029,21 @@ DrawMailRow: ; 04:5CFC
 	inc hl
 	inc hl
 	ld c, $05
-	
+
 .loop ; 04:5D15
-	ld [hli], a 
+	ld [hli], a
 	inc a
 	dec c
 	jr nz, .loop
 	ret
-	
+
 DrawMailTextExtra: ; 04:5D1B
-	ld a, [de] 
+	ld a, [de]
 	inc de
 	ld [hli], a
 	dec c
 	jr nz, DrawMailTextExtra
 	ret
-	
+
 MailTextExtra: ; 04:5D22
 	db "？！１２３４５　　６７８９０ー円"
-	
-\ No newline at end of file
diff --git a/engine/overworld/object_collision.asm b/engine/overworld/object_collision.asm
index 5c3b0b1..31f43a8 100644
--- a/engine/overworld/object_collision.asm
+++ b/engine/overworld/object_collision.asm
@@ -91,7 +91,7 @@ _CheckObjectCollision: ; 01:77dd
 .collision
 	scf
 	ret
-	
+
 SECTION "engine/overworld/object_collision.asm@_CheckPlayerObjectCollision", ROMX
 
 ; Sets the carry flag if the player will collide with another sprite's current or next position
@@ -102,7 +102,7 @@ _CheckPlayerObjectCollision: ; 01:7894
 	ld e, a
 	ld bc, wObjectStructs
 	xor a
-	
+
 .loop
 	ldh [hObjectStructIndexBuffer], a
 	ld hl, OBJECT_SPRITE
@@ -120,13 +120,13 @@ _CheckPlayerObjectCollision: ; 01:7894
 	ld a, [hl]
 	cp d
 	jr nz, .check_last_position
-	
+
 ; skip the player sprite
 	ldh a, [hObjectStructIndexBuffer]
 	cp PLAYER_OBJECT_INDEX
 	jr z, .next
 	jr .collision
-	
+
 .check_last_position
 	ld hl, OBJECT_MAP_Y
 	add hl, bc
@@ -151,7 +151,7 @@ _CheckPlayerObjectCollision: ; 01:7894
 	jr nz, .loop
 	xor a
 	ret
-	
+
 .collision
 	scf
 	ret
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 2b772fa..c2975c2 100644
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -28,7 +28,7 @@ UnusedOverworldMovementCheck:: ; 03:4003
 
 SetPlayerIdle: ; 03:402c
 	ld a, NO_MOVEMENT
-	
+
 SetPlayerMovement: ; 03:402e
 	ld [wPlayerMovement], a
 	ld a, [wPlayerLastMapX]
@@ -58,7 +58,7 @@ _CheckMovementWalkOrBike: ; 03:4045
 .idle
 	ld a, NO_MOVEMENT
 	ret
-	
+
 .check_right
 	ld a, [wPlayerLastMapX]
 	inc a
@@ -158,7 +158,7 @@ _CheckMovementDebug: ; 03:40f2
 	jr nz, .move_right
 	ld a, NO_MOVEMENT
 	ret
-	
+
 .move_down
 	ld a, [wTileDown]
 	cp -1
@@ -166,7 +166,7 @@ _CheckMovementDebug: ; 03:40f2
 	ret nz
 	ld a, JUMP_UP
 	ret
-	
+
 .move_up
 	ld a, [wTileUp]
 	cp -1
@@ -174,7 +174,7 @@ _CheckMovementDebug: ; 03:40f2
 	ret nz
 	ld a, JUMP_DOWN
 	ret
-	
+
 .move_left
 	ld a, [wTileLeft]
 	cp -1
@@ -182,7 +182,7 @@ _CheckMovementDebug: ; 03:40f2
 	ret nz
 	ld a, JUMP_RIGHT
 	ret
-	
+
 .move_right
 	ld a, [wTileRight]
 	cp -1
@@ -260,11 +260,11 @@ CheckSkateDown:  ; 03:4177
 	jr z, .slow
 	ld a, FAST_STEP_DOWN
 	ret
-	
+
 .slow
 	ld a, STEP_DOWN
 	ret
-	
+
 .collision
 	ld a, STANDING
 	ld [wSkatingDirection], a
@@ -285,17 +285,17 @@ CheckSkateUp: ; 03:41ab
 	jr nz, .collision
 	ld a, FAST_JUMP_UP
 	ret
-	
+
 .can_skate
 	call OldIsTileCollisionGrass
 	jr z, .slow
 	ld a, FAST_STEP_UP
 	ret
-	
+
 .slow
 	ld a, STEP_UP
 	ret
-	
+
 .collision
 	ld a, STANDING
 	ld [wSkatingDirection], a
@@ -316,7 +316,7 @@ CheckSkateLeft: ; 03:41db
 	jr nz, .collision
 	ld a, FAST_JUMP_LEFT
 	ret
-	
+
 .can_skate
 	call OldIsTileCollisionGrass
 	jr z, .slow
@@ -326,7 +326,7 @@ CheckSkateLeft: ; 03:41db
 .slow
 	ld a, STEP_LEFT
 	ret
-	
+
 .collision
 	ld a, STANDING
 	ld [wSkatingDirection], a
@@ -357,7 +357,7 @@ CheckSkateRight: ; 03:420b
 .slow
 	ld a, STEP_RIGHT
 	ret
-	
+
 .collision
 	ld a, STANDING
 	ld [wSkatingDirection], a
@@ -1081,7 +1081,7 @@ GetCollisionType::
 	ret
 
 SECTION "engine/overworld/player_movement.asm@Rest of Player Movement", ROMX
-	
+
 _UnusedReturnFalse:: ; 03:4764
 	xor a
 	ret
@@ -1152,7 +1152,7 @@ GetPlayerSprite: ; 05:400a
 	ld [wPlayerSprite], a
 	ld [wPlayerObjectSprite], a
 	ret
-	
+
 PlayerSpriteTable: ; 03:402d
 ; state, sprite
 	db PLAYER_NORMAL, SPRITE_GOLD
diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm
index 0d3b7a2..77da684 100755
--- a/engine/overworld/spawn_points.asm
+++ b/engine/overworld/spawn_points.asm
@@ -28,7 +28,7 @@ LoadSpawnPoint: ; 03:4791
 	pop de
 	pop hl
 	ret
-	
+
 IsSpawnPoint: ; 03:47b6
 ; Checks if the map loaded in de is a spawn point.
 ; Returns carry if it's a spawn point.
diff --git a/engine/palettes.asm b/engine/palettes.asm
index 782bede..1f8f4df 100644
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -3,111 +3,111 @@ INCLUDE "constants.asm"
 SECTION "engine/palettes.asm@Overworld fade", ROMX
 
 OverworldFadeIn:: ; 23:433e
-    ld c, 0
-    call GetFadeStep
-    ld b, 4
-    call FadeTowardsWhite
-    ret
+	ld c, 0
+	call GetFadeStep
+	ld b, 4
+	call FadeTowardsWhite
+	ret
 
 OverworldFadeOut:: ; 23:4349
-    ld c, 9
-    call GetFadeStep
-    ld b, 4
-    call FadeTowardsBlack
-    ret
+	ld c, 9
+	call GetFadeStep
+	ld b, 4
+	call FadeTowardsBlack
+	ret
 
 
 ; TODO: merge this
 SECTION "engine/palettes.asm@Palette fading, part 2?", ROMX
 
 ApplyPalettesAtHL:: ; 23:43d1
-    push hl
-    ld a, [hli]
-    ld [rBGP], a
-    ld a, [hli]
-    ld [rOBP0], a
-    ld a, [hli]
-    ld [rOBP1], a
-    pop hl
-    ret
+	push hl
+	ld a, [hli]
+	ld [rBGP], a
+	ld a, [hli]
+	ld [rOBP0], a
+	ld a, [hli]
+	ld [rOBP1], a
+	pop hl
+	ret
 
 FadeTowardsWhite:: ; 23:43dd
-    call ApplyPalettesAtHL
-    inc hl
-    inc hl
-    inc hl
-    ld c, 8
-    call DelayFrames
-    dec b
-    jr nz, FadeTowardsWhite
-    ret
+	call ApplyPalettesAtHL
+	inc hl
+	inc hl
+	inc hl
+	ld c, 8
+	call DelayFrames
+	dec b
+	jr nz, FadeTowardsWhite
+	ret
 
 FadeTowardsBlack:: ; 23:43ec
-    call ApplyPalettesAtHL
-    dec hl
-    dec hl
-    dec hl
-    ld c, 8
-    call DelayFrames
-    dec b
-    jr nz, FadeTowardsBlack
-    ret
+	call ApplyPalettesAtHL
+	dec hl
+	dec hl
+	dec hl
+	ld c, 8
+	call DelayFrames
+	dec b
+	jr nz, FadeTowardsBlack
+	ret
 
 GetFadeStep:: ; 23:43fb
-    ld a, [wTimeOfDayPal]
-    and 3
-    push bc
-    ld c, a
-    ld b, 0
-    ld hl, .sequences
-    add hl, bc
-    add hl, bc
-    ld a, [hli]
-    ld h, [hl]
-    ld l, a
-    pop bc
-    ld b, 0
-    add hl, bc
-    ret
+	ld a, [wTimeOfDayPal]
+	and 3
+	push bc
+	ld c, a
+	ld b, 0
+	ld hl, .sequences
+	add hl, bc
+	add hl, bc
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	pop bc
+	ld b, 0
+	add hl, bc
+	ret
 
 .sequences
-    dw .sequence0
-    dw .sequence1
-    dw .sequence2
-    dw .sequence3
+	dw .sequence0
+	dw .sequence1
+	dw .sequence2
+	dw .sequence3
 
 .sequence0
-    db $ff, $ff, $ff
-    db $fe, $fe, $fe
-    db $f9, $e4, $e4
-    db $e4, $d0, $d0
-    db $90, $80, $80
-    db $40, $40, $40
-    db $00, $00, $00
+	db $ff, $ff, $ff
+	db $fe, $fe, $fe
+	db $f9, $e4, $e4
+	db $e4, $d0, $d0
+	db $90, $80, $80
+	db $40, $40, $40
+	db $00, $00, $00
 
 .sequence1
-    db $ff, $ff, $ff
-    db $fe, $fe, $fe
-    db $f9, $e4, $e4
-    db $e9, $d0, $d0
-    db $90, $80, $80
-    db $40, $40, $40
-    db $00, $00, $00
+	db $ff, $ff, $ff
+	db $fe, $fe, $fe
+	db $f9, $e4, $e4
+	db $e9, $d0, $d0
+	db $90, $80, $80
+	db $40, $40, $40
+	db $00, $00, $00
 
 .sequence2
-    db $ff, $ff, $ff
-    db $fe, $fe, $ff
-    db $f9, $e4, $ff
-    db $f9, $d0, $ff
-    db $90, $80, $90
-    db $40, $40, $40
-    db $00, $00, $00
+	db $ff, $ff, $ff
+	db $fe, $fe, $ff
+	db $f9, $e4, $ff
+	db $f9, $d0, $ff
+	db $90, $80, $90
+	db $40, $40, $40
+	db $00, $00, $00
 
 .sequence3
-    db $ff, $ff, $ff
-    db $fe, $fe, $fe
-    db $f9, $e4, $e4
-    db $e8, $d0, $d0
-    db $90, $80, $80
-    db $40, $40, $40
-    db $00, $00, $00
+	db $ff, $ff, $ff
+	db $fe, $fe, $fe
+	db $f9, $e4, $e4
+	db $e8, $d0, $d0
+	db $90, $80, $80
+	db $40, $40, $40
+	db $00, $00, $00
diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm
index e3b95f7..929af05 100755
--- a/engine/pokemon/health.asm
+++ b/engine/pokemon/health.asm
@@ -12,19 +12,19 @@ HealParty: ; 03:4d6f
 	jr z, .party_done
 	push hl
 	push de
-	
+
 ; Clear the status
 	ld hl, MON_STATUS
 	add hl, de
 	xor a
 	ld [hli], a
 	ld [hl], a
-	
+
 ; Reset the PP
 	ld hl, MON_MOVES
 	add hl, de
 	ld b, NUM_MOVES
-	
+
 .move_loop
 	push hl
 	push bc
@@ -46,14 +46,14 @@ HealParty: ; 03:4d6f
 	and PP_UP_MASK
 	add b
 	ld [hl], a
-	
+
 .next_move
 	pop bc
 	pop hl
 	inc hl
 	dec b
 	jr nz, .move_loop
-	
+
 ; Reset the HP
 	pop de
 	push de
@@ -94,9 +94,9 @@ HealParty: ; 03:4d6f
 	dec b
 	jr nz, .pp_up
 	ret
-	
+
 SECTION "engine/pokemon/health.asm@HP Bar", ROMX
-	
+
 ComputeHPBarPixels: ; 03:4e3c
 	push hl
 	xor a
@@ -139,7 +139,7 @@ ComputeHPBarPixels: ; 03:4e3c
 	ret nz
 	ld e, 1
 	ret
-		
+
 UpdateHPBar: ; 03:4e7c
 	ld a, [wHPBarOldHP]
 	ld c, a
@@ -178,7 +178,7 @@ UpdateHPBar: ; 03:4e7c
 	call UpdateHPBar_CompareNewHPToOldHP
 	jr z, .animate_hp_bar_done
 	jr nc, .hp_increase
-	
+
 ;hp_decrease
 	dec bc
 	ld a, c
@@ -225,7 +225,7 @@ UpdateHPBar: ; 03:4e7c
 	ld a, 1
 	call UpdateHPBar_AnimateHPBar
 	jp WaitBGMap
-	
+
 ; animates the HP bar going up or down for (a) ticks (two waiting frames each)
 ; stops prematurely if bar is filled up
 ; e: current health (in pixels) to start with
@@ -257,7 +257,7 @@ UpdateHPBar_AnimateHPBar: ; 03:4F11
 	pop af
 	pop hl
 	ret
-	
+
 ; compares old HP and new HP and sets c and z flags accordingly
 UpdateHPBar_CompareNewHPToOldHP: ; 03:4F37
 	ld a, d
@@ -266,7 +266,7 @@ UpdateHPBar_CompareNewHPToOldHP: ; 03:4F37
 	ld a, e
 	sub c
 	ret
-	
+
 ; calcs HP difference between bc and de (into de)
 UpdateHPBar_CalcHPDifference: ; 03:4F3D
 	ld a, d
@@ -296,7 +296,7 @@ UpdateHPBar_CalcHPDifference: ; 03:4F3D
 	jr nz, .new_hp_greater
 	ld de, 0
 	ret
-	
+
 UpdateHPBar_PrintHPNumber: ; 03:4F5B
 	push af
 	push de
diff --git a/engine/title.asm b/engine/title.asm
index 4b63412..11f80a0 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -3,34 +3,34 @@ INCLUDE "constants.asm"
 SECTION "engine/title.asm@Title screen", ROMX
 
 IntroSequence::
-	callab GameFreakIntro	; Bank $39 
+	callab GameFreakIntro	; Bank $39
 	jr c, TitleSequenceStart
 	ld a, [wTitleSequenceOpeningType]
 	and a
 	jr z, .opening_sequence
-	
+
 .pikachu_minigame
-	callab PikachuMiniGame	; Bank $38 
+	callab PikachuMiniGame	; Bank $38
 	jr TitleSequenceStart
 
 .opening_sequence
-	callab OpeningCutscene	; Bank $39 
+	callab OpeningCutscene	; Bank $39
 
 TitleSequenceStart::
 	call TitleSequenceInit
-	callab SetTitleBGDecorationBorder	; Bank $02 
-	
+	callab SetTitleBGDecorationBorder	; Bank $02
+
 .loop
-	call TitleScreenMain 
+	call TitleScreenMain
 	jr nc, .loop
-	
+
 	call ClearBGPalettes
 	call ClearSprites
 	ld a, $01
 	ldh [hBGMapMode], a
 	call ClearTileMap
 	call UpdateTimePals
-	
+
 	ld a, [wJumptableIndex + 1]
 	ld e, a
 	ld d, 0
@@ -40,31 +40,31 @@ TitleSequenceStart::
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	
+
 	jp hl
 
 TitleScreenJumpTable::
 	dw MainMenu
-	dw DebugMenu 
+	dw DebugMenu
 	dw SRAMClearMenu
 	dw IntroSequence
 
 TitleSequenceInit::
 	call ClearPalettes
-	
+
 	xor a
 	ldh [hMapAnims], a
 	ldh [hSCY], a
 	ldh [hSCX], a
-	
-	ld de, MUSIC_NONE	; Stop the music. 
+
+	ld de, MUSIC_NONE	; Stop the music.
 	call PlayMusic
-	
+
 	call ClearTileMap
 	call DisableLCD
 	call ClearSprites
-	
-	callba InitEffectObject	; Bank $23 
+
+	callba InitEffectObject	; Bank $23
 	ld hl, vChars0
 	ld bc, vBGMap0 - vChars0
 
@@ -81,70 +81,70 @@ TitleSequenceInit::
 	ld bc, 13 tiles
 	ld a, BANK(TitleScreenGFX)
 	call FarCopyData
-	
+
 	ld hl, TitleScreenVersionGFX
 	ld de, vChars2 + 96 tiles
 	ld bc, 24 tiles
 	ld a, BANK(TitleScreenVersionGFX)
 	call FarCopyData
-	
+
 	ld hl, TitleScreenHoOhGFX
 	ld de, vChars2
 	ld bc, 49 tiles
 	ld a, BANK(TitleScreenHoOhGFX)
 	call FarCopyData
-	
+
 	ld hl, TitleScreenLogoGFX
 	ld de, vChars1
 	ld bc, 58 tiles
 	ld a, BANK(TitleScreenLogoGFX)
 	call FarCopyData
-	
+
 	ld hl, TitleScreenGoldLogoGFX
 	ld de, vChars0 + 186 tiles
 	ld bc, 20 tiles
 	ld a, BANK(TitleScreenGoldLogoGFX)
 	call FarCopyData
-	
+
 	call SetTitleGfx
 	ld hl, wTileMapBackup
 	ld a, $24
 	ld [hli], a
 	ld a, $00
 	ld [hli], a
-	
+
 	ld hl, vBGMap0
 	ld bc, 128 tiles
 	ld a, "　"
 	call ByteFill
-	
+
 	ld b, $06
 	call GetSGBLayout
 	call EnableLCD
-	ld a, $01	
+	ld a, $01
 	ldh [hBGMapMode], a
 	call WaitBGMap
 	xor a
 	ldh [hBGMapMode], a
 	ld hl, wJumptableIndex
-	ld [hli], a	; (Possibly wJumptableIndex from Crystal) 
-	ld [hli], a	; (Possibly wIntroSceneFrameCounter from Crystal) 
-	ld [hli], a	; (Possibly wTitleScreenTimer from Crystal) 
-	ld [hl], a	; (Possibly wTitleScreenTimer + 1 from Crystal) 
-	
+	ld [hli], a	; (Possibly wJumptableIndex from Crystal)
+	ld [hli], a	; (Possibly wIntroSceneFrameCounter from Crystal)
+	ld [hli], a	; (Possibly wTitleScreenTimer from Crystal)
+	ld [hl], a	; (Possibly wTitleScreenTimer + 1 from Crystal)
+
 	call .load_position_table
-		
-	
+
+
 	ld a, %00011010
 	ldh [rBGP], a
 	ld a, %11100100
 	ldh [rOBP0], a
 	ret
-	
+
 .load_position_table:
 	ld hl, FirePositionTable
-	ld c, 6	; Load 6 flying objects on the screen. 
-	
+	ld c, 6	; Load 6 flying objects on the screen.
+
 .set_fire_note_loop
 	push bc
 	ld e, [hl]
@@ -152,7 +152,7 @@ TitleSequenceInit::
 	ld d, [hl]
 	inc hl
 	push hl
-	ld a, $2E	; Title fire/note object effect type? 
+	ld a, $2E	; Title fire/note object effect type?
 	call InitSpriteAnimStruct
 	pop hl
 	pop bc
@@ -168,15 +168,15 @@ FirePositionTable::
 	dw $7CB0
 	dw $8800
 
-TitleFireGFX:: INCBIN "gfx/title/fire.2bpp"	; 5EB8-5F37 
-TitleNotesGFX:: INCBIN "gfx/title/notes.2bpp"	; 5F38=5FB7 
+TitleFireGFX:: INCBIN "gfx/title/fire.2bpp"	; 5EB8-5F37
+TitleNotesGFX:: INCBIN "gfx/title/notes.2bpp"	; 5F38=5FB7
 
 TitleScreenMain::
 	ld a, [wJumptableIndex]
 	bit 7, a
 	jr nz, .exit
 	call TitleScreenSequence
-	callba EffectObjectJumpNoDelay	; Bank $23 
+	callba EffectObjectJumpNoDelay	; Bank $23
 	call DelayFrame
 	and a
 	ret
@@ -195,47 +195,47 @@ TitleScreenSequence::
 	ld h, [hl]
 	ld l, a
 	jp hl
-	
+
 TitleScreenSequenceTable::
-	dw TitleSeq_Start 
-	dw TitleSeq_LoadPokemonLogo 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_MoveTitle 
-	dw TitleSeq_MoveTitleEnd 
-	dw TitleSeq_InitFlashTitle 
+	dw TitleSeq_Start
+	dw TitleSeq_LoadPokemonLogo
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_MoveTitle
+	dw TitleSeq_MoveTitleEnd
+	dw TitleSeq_InitFlashTitle
 	dw TitleSeq_FlashTitle
 
-	dw TitleSeq_PMJapaneseChara 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_WaitForNextSequence 
-	dw TitleSeq_PMSubtitle 
-	dw TitleSeq_IncreaseJumpTableIndex 
+	dw TitleSeq_PMJapaneseChara
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_WaitForNextSequence
+	dw TitleSeq_PMSubtitle
+	dw TitleSeq_IncreaseJumpTableIndex
 	dw TitleSeq_IncreaseJumpTableIndex
 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_WaitForNextSequence 
-	dw TitleSeq_Version 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_WaitForNextSequence 
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_WaitForNextSequence
+	dw TitleSeq_Version
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_WaitForNextSequence
 	dw TitleSeq_CopyRight
 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_WaitForNextSequence 
-	dw TitleSeq_HoOh 
-	dw TitleSeq_IncreaseJumpTableIndex 
-	dw TitleSeq_IncreaseJumpTableIndex 
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_WaitForNextSequence
+	dw TitleSeq_HoOh
+	dw TitleSeq_IncreaseJumpTableIndex
+	dw TitleSeq_IncreaseJumpTableIndex
 	dw TitleSeq_IncreaseJumpTableIndex
 
-	dw TitleSeq_WaitForNextSequence 
-	dw TitleSeq_PressButtonInit 
-	dw TitleSeq_TitleScreenInputAndTimeout 
+	dw TitleSeq_WaitForNextSequence
+	dw TitleSeq_PressButtonInit
+	dw TitleSeq_TitleScreenInputAndTimeout
 	dw TitleSeq_FadeMusicOut
 
 TitleSeq_IncreaseJumpTableIndex::
@@ -262,13 +262,13 @@ TitleSeq_LoadPokemonLogo::
 	call TitleSeq_IncreaseJumpTableIndex
 	ld a, $01
 	ldh [hBGMapMode], a
-	ret	
-	
-TitleSeq_Start:: 
+	ret
+
+TitleSeq_Start::
 	call TitleSeq_IncreaseJumpTableIndex
 	push de
 	ld de, $002D
-	call PlaySFX	; Play "Swish" sound 
+	call PlaySFX	; Play "Swish" sound
 	pop de
 	ld a, $80
 	ld [wJumptableIndex + 2], a
@@ -277,7 +277,7 @@ TitleSeq_Start::
 	ldh [hLCDCPointer], a
 	ret
 
-TitleSeq_MoveTitle:: 
+TitleSeq_MoveTitle::
 	xor a
 	ldh [hBGMapMode], a
 	ld hl, wJumptableIndex + 2
@@ -297,14 +297,14 @@ TitleSeq_MoveTitle::
 
 .nextseq
 	call TitleSeq_IncreaseJumpTableIndex
-	ret	
-	
+	ret
+
 TitleSeq_MoveTitleEnd::
 	xor a
 	ldh [hLCDCPointer], a
 	call TitleSeq_IncreaseJumpTableIndex
 	ld de, MUSIC_TITLE
-	call PlayMusic	; Play "Title Theme" 
+	call PlayMusic	; Play "Title Theme"
 	ret
 
 TitleSeq_InitFlashTitle::
@@ -315,7 +315,7 @@ TitleSeq_InitFlashTitle::
 	ld [wJumptableIndex + 3], a
 	ret
 
-TitleSeq_FlashTitle:: 
+TitleSeq_FlashTitle::
 	ld hl, wJumptableIndex + 3
 	ld a, [hl]
 	and a
@@ -362,7 +362,7 @@ TitleSeq_Version::
 	ldh [hBGMapMode], a
 	ret
 
-TitleSeq_CopyRight:: 
+TitleSeq_CopyRight::
 	call PrintCopyRight
 	ld a, $10
 	ld [wJumptableIndex + 2], a
@@ -384,12 +384,12 @@ TitleSeq_PressButtonInit::
 	ld hl, wJumptableIndex
 	inc [hl]
 	ld hl, wJumptableIndex + 2
-	ld de, DecodeNybble0Table - 3	; DecodeNybble0Table - 3 = $0C00 
+	ld de, DecodeNybble0Table - 3	; DecodeNybble0Table - 3 = $0C00
 	ld [hl], e
 	inc hl
 	ld [hl], d
-	ret	
-	
+	ret
+
 TitleSeq_TitleScreenInputAndTimeout::
 	ld hl, wJumptableIndex + 2
 	ld e, [hl]
@@ -403,29 +403,29 @@ TitleSeq_TitleScreenInputAndTimeout::
 	dec hl
 	ld [hl], e
 	call GetJoypad
-	ld hl, hJoyState 
+	ld hl, hJoyState
 	ld a, [hl]
-	and D_UP | B_BUTTON | SELECT	; UP + B + SELECT brings you to the SRAM clear screen. 
+	and D_UP | B_BUTTON | SELECT	; UP + B + SELECT brings you to the SRAM clear screen.
 	cp D_UP | B_BUTTON | SELECT
 	jr z, .psbtn_sramclear
 	ld a, [hl]
-	and SELECT	; SELECT will bring you to the debug menu. 
+	and SELECT	; SELECT will bring you to the debug menu.
 	jr nz, .psbtn_gotodebug
 	ld a, [hl]
 	and $09
 	ret z
-	
+
 .psbtn_play
-	ld a, $00	; MainMenu 
+	ld a, $00	; MainMenu
 	jr .psbtn_nextseq
 
 .psbtn_gotodebug
-	ld a, $01	; DebugMenu 
+	ld a, $01	; DebugMenu
 	jr .psbtn_nextseq
 
 .psbtn_sramclear
 	ld a, $02
-	
+
 .psbtn_nextseq
 	ld [wJumptableIndex + 1], a
 	ld hl, wJumptableIndex
@@ -436,12 +436,12 @@ TitleSeq_TitleScreenInputAndTimeout::
 	ld hl, wJumptableIndex
 	inc [hl]
 	xor a
-	ld [wMusicFadeID], a 
+	ld [wMusicFadeID], a
 	ld [wMusicFadeID + 1], a
 	ld hl, wMusicFade
 	ld [hl], 8
-	ret	
-	
+	ret
+
 TitleSeq_FadeMusicOut::
 	ld a, [wMusicFade]
 	and a
@@ -450,7 +450,7 @@ TitleSeq_FadeMusicOut::
 	ld [wJumptableIndex + 1], a
 	ld hl, wJumptableIndex
 	set 7, [hl]
-	ret	
+	ret
 
 SetLYOverrides::
 	ld hl, wLYOverrides
@@ -471,7 +471,7 @@ PrintVersion::
 	coord hl, 4, 1
 	ld b, $09
 	ld a, $60
-	
+
 LoadPrintArea::
 	ld [hli], a
 	inc a
@@ -493,12 +493,12 @@ PrintPokemonLogo::
 	coord hl, 1, 2
 	ld a, $80
 	ld bc, $0E04
-	
+
 PrintBoxArea::
 	ld de, SCREEN_WIDTH
 	push bc
 	push hl
-	
+
 .xloop
 	ld [hli], a
 	inc a
@@ -510,19 +510,19 @@ PrintBoxArea::
 	dec c
 	jr nz, PrintBoxArea
 	ret
-	
+
 PrintCopyRight::
 	coord hl, 3, 17
 	ld a, $41
 	ld b, $0D
-	
+
 .loop
 	ld [hli], a
 	inc a
 	dec b
 	jr nz, .loop
 	ret
-	
+
 SRAMClearMenu::
 	call ClearTileMap
 	call GetMemSGBLayout
@@ -549,7 +549,7 @@ SRAMClear_WinPOS::
 	db 0
 	db 7,14,11,19
 	dw SRAMClear_TextChoice ; menu data
-	db 1 ; default option 
+	db 1 ; default option
 
 SRAMClear_TextChoice::
 	db %11000000
@@ -570,9 +570,9 @@ IntroCopyRightInfo::
 	jp PlaceString
 
 IntroCopyRightInfo_Text::
-	db $60, $61, $62, $63, $6D, $6E, $6F, $70, $71, $72, $4E	; "(C)1997 Nintendo\n" 
-	db $60, $61, $62, $63, $73, $74, $75, $76, $77, $78, $6B, $6C, $4E	; "(C)1997 Creatures Inc.\n" 
-	db $60, $61, $62, $63, $64, $65, $66, $67, $68, $69, $6A, $6B, $6C, $50	; "(C)1997 GAME FREAK Inc.{EOL}" 
+	db $60, $61, $62, $63, $6D, $6E, $6F, $70, $71, $72, $4E	; "(C)1997 Nintendo\n"
+	db $60, $61, $62, $63, $73, $74, $75, $76, $77, $78, $6B, $6C, $4E	; "(C)1997 Creatures Inc.\n"
+	db $60, $61, $62, $63, $64, $65, $66, $67, $68, $69, $6A, $6B, $6C, $50	; "(C)1997 GAME FREAK Inc.{EOL}"
 
 Set_HoOh::
 	coord hl, 7, 9
@@ -591,7 +591,7 @@ Set_HoOh::
 	jr nz, .loop
 	ret
 
-; Unused code, looks like it sets the font type for the logo? 
+; Unused code, looks like it sets the font type for the logo?
 SetTitleFont::
 	ld de, vChars1
 	ld hl, TitleScreenLogoGFX
@@ -599,15 +599,15 @@ SetTitleFont::
 	ld a, $04
 	jp FarCopyDataDouble
 
-; Sets the type of art that will be displayed on the title screen 
-; depending on wTitleSequenceOpeningType. 
+; Sets the type of art that will be displayed on the title screen
+; depending on wTitleSequenceOpeningType.
 SetTitleGfx::
 	ld hl, wTitleSequenceOpeningType
 	ld a, [hl]
 	xor $01
 	ld [hl], a
 	jr nz, .flame
-	
+
 .note
 	ld hl, TitleNotesGFX
 	jr SetTitleGfxNext
diff --git a/engine/unknown11d32.asm b/engine/unknown11d32.asm
index 9c0a4c1..a4bb40b 100644
--- a/engine/unknown11d32.asm
+++ b/engine/unknown11d32.asm
@@ -7,17 +7,17 @@ Unknown11d32: ; 04:5D32
 	ld a, [hl]
 	and D_UP
 	jr nz, .upJump
-	ld a, [hl] 
+	ld a, [hl]
 	and D_DOWN
 	jr nz, .downJump
 	ld a, [hl]
 	and D_LEFT
 	jr nz, .leftJump
-	ld a, [hl] 
+	ld a, [hl]
 	and D_RIGHT
 	jr nz, .rightJump
 	ret
-	
+
 .rightJump; 04:5D4A
 	ld hl, $000C
 	add hl, bc
@@ -84,9 +84,9 @@ Unknown11d32: ; 04:5D32
 	add hl, bc
 	ld [hl], a
 	ret
-	
+
 .Offsets1: ; 04:5DAB
-	db $00, $08, $10, $18, $20, $28, $30, $48, $50, $58, $60, $68, $70, $78 
-	
+	db $00, $08, $10, $18, $20, $28, $30, $48, $50, $58, $60, $68, $70, $78
+
 .Offsets2: ; 04:5DB9
 	db $00, $08, $18, $20, $30
diff --git a/engine/unknown_boxes.asm b/engine/unknown_boxes.asm
index 1dd3de3..378cfdf 100644
--- a/engine/unknown_boxes.asm
+++ b/engine/unknown_boxes.asm
@@ -4,7 +4,7 @@ SECTION "engine/unknown_boxes.asm", ROMX
 
 Function1130a: ; 04:530A
 	ret
-	
+
 Function1130b: ; 04:530B
 	ld a, [wPartyCount]
 	cp PARTY_LENGTH
@@ -28,7 +28,7 @@ Function1130b: ; 04:530B
 	call PrintText
 	scf
 	ret
-.fullbox	
+.fullbox
 	ld hl, BoxFullText
 	call PrintText
 	and a
@@ -38,7 +38,7 @@ Function1130b: ; 04:530B
 	predef Functiond886
 	scf
 	ret
-	
+
 RecievePokemon: ; 04:5357
 	ld a, [wMonDexIndex]
 	push af
@@ -53,17 +53,17 @@ RecievePokemon: ; 04:5357
 	call GetPokemonName
 	ld hl, RecievePokemonText
 	jp PrintText
-	
+
 RecievePokemonText: ; 04:5377
 	text "<PLAYER>は"
 	line "@"
-	
+
 	db $01, $26, $CD
-	
+
 	text "を　てにいれた！@"
-	
-	db $0B, "@" 
-	
+
+	db $0B, "@"
+
 BoxCantHoldText: ; 04:538B
 	text "#を　もちきれないので"
 	line "<PC>の　ボックス@"
@@ -73,7 +73,7 @@ BoxCantHoldText: ; 04:538B
 	db $01, $17, $DF
 	text "を　てんそうした！"
 	done
-	
+
 BoxFullText: ; 04:53B6
 	text "#を　もちきれません！"
 	para "ボックスも　いっぱいで"
author	Rangi <remy.oukaour+rangi@gmail.com>	2020-09-20 13:58:03 -0400
committer	Rangi <remy.oukaour+rangi@gmail.com>	2020-09-20 13:58:03 -0400
commit	fac958b280056922a1828b71a04d84a36e1e807a (patch)
tree	c094adc59182b253a61defb5fb85de7a9d77b7cc /engine
parent	bfb981f1885d21cc59d2656e84c87bb8d64a089c (diff)