- 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/menu
parent: bfb981f1885d21cc59d2656e84c87bb8d64a089c (diff)
4 files changed, 557 insertions, 556 deletions
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
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/menu
parent	bfb981f1885d21cc59d2656e84c87bb8d64a089c (diff)