summaryrefslogtreecommitdiff
path: root/engine/menu
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-06 01:22:22 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-06 01:22:22 -0500
commita070bdcb21310c7d17b4fd057852f788fdfd61ca (patch)
treeca50135e03b11b93e4c20ae2313742fcd728f595 /engine/menu
parent3af22139a90e9484221344ae6d34d737faa07608 (diff)
Clean up white space
Diffstat (limited to 'engine/menu')
-rw-r--r--engine/menu/bills_pc.asm6
-rw-r--r--engine/menu/link_menu.asm64
-rwxr-xr-xengine/menu/main_menu.asm6
-rw-r--r--engine/menu/options.asm40
-rwxr-xr-xengine/menu/players_pc.asm2
-rwxr-xr-xengine/menu/pokedex.asm4
6 files changed, 61 insertions, 61 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index a3f6f7fc..43d4d6ef 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -183,7 +183,7 @@ BillsPCMenu: ; 21495 (8:5495)
jp z, BillsPCChangeBox ; change box
cp $4
jp z, BillsPCPrintBox
-
+
ExitBillsPC: ; 2153e (8:553e)
ld a, [wFlags_0xcd60]
bit 3, a ; accessing Bill's PC through another PC?
@@ -356,7 +356,7 @@ BillsPCRelease: ; 21690 (8:5690)
ld hl, PikachuUnhappyText
call PrintText
jp BillsPCMenu
-
+
BillsPCChangeBox: ; 216e7 (8:56e7)
callba ChangeBox
jp BillsPCMenu
@@ -540,7 +540,7 @@ PikachuUnhappyText: ; 21853 (8:5853)
ReleaseWhichMonText: ; 21858 (8:5858)
TX_FAR _ReleaseWhichMonText
db "@"
-
+
OnceReleasedText: ; 2185d (8:585d)
TX_FAR _OnceReleasedText
db "@"
diff --git a/engine/menu/link_menu.asm b/engine/menu/link_menu.asm
index 73e19038..becefd47 100644
--- a/engine/menu/link_menu.asm
+++ b/engine/menu/link_menu.asm
@@ -175,7 +175,7 @@ Func_f531b:: ; f531b (3d:531b)
ld [wUnknownSerialCounter+1],a
and a
ret
-
+
Func_f5476:: ; f5476 (3d:5476)
ld hl,ColosseumIneligibleText
call PrintText
@@ -207,7 +207,7 @@ PokeCup:: ; f548e (3d:548e)
dec b
jr nz,.loop
dec hl
- dec hl
+ dec hl
cp [hl] ; is third mon second mon?
jp z,DuplicateSpecies
dec hl ; wPartySpecies
@@ -253,7 +253,7 @@ PikaCup:: ; f54e4 (3d:54e4)
dec b
jr nz,.loop
dec hl
- dec hl
+ dec hl
cp [hl] ; is third mon second mon?
jp z,DuplicateSpecies
dec hl ; wPartySpecies
@@ -285,7 +285,7 @@ PikaCup:: ; f54e4 (3d:54e4)
jp nc,CombinedLevelsAbove50
xor a
ret
-
+
PetitCup:: ; f553a (3d:553a)
ld hl,wPartyCount
ld a,[hli]
@@ -299,7 +299,7 @@ PetitCup:: ; f553a (3d:553a)
dec b
jr nz,.loop
dec hl
- dec hl
+ dec hl
cp [hl] ; is third mon second mon?
jp z,DuplicateSpecies
dec hl ; wPartySpecies
@@ -406,7 +406,7 @@ PetitCup:: ; f553a (3d:553a)
jp nc,CombinedLevelsAbove80
xor a
ret
-
+
NotThreeMonsInParty:: ; f561d (3d:516d)
ld hl,Colosseum3MonsText
call PrintText
@@ -418,67 +418,67 @@ MewInParty:: ; f5626 (3d:f5626)
call PrintText
ld a,$2
ret
-
+
DuplicateSpecies:: ; f562f (3d:f562f)
ld hl,ColosseumDifferentMonsText
call PrintText
ld a,$3
ret
-
+
LevelAbove55:: ; f5638 (3d:5638)
ld hl,ColosseumMaxL55Text
call PrintText
ld a,$4
ret
-
+
LevelUnder50:: ; f5641 (3d:5641)
ld hl,ColosseumMinL50Text
call PrintText
ld a,$5
ret
-
+
CombinedLevelsGreaterThan155:: ; f5641 (3d:564a)
ld hl,ColosseumTotalL155Text
call PrintText
ld a,$6
ret
-
+
LevelAbove30:: ; f5653 (3d:5653)
ld hl,ColosseumMaxL30Text
call PrintText
ld a,$7
ret
-
+
LevelUnder25:: ; f565c (3d:565c)
ld hl,ColosseumMinL25Text
call PrintText
ld a,$8
ret
-
+
CombinedLevelsAbove80:: ; f5665 (3d:5665)
ld hl,ColosseumTotalL80Text
call PrintText
ld a,$9
ret
-
+
LevelAbove20:: ; f566e (3d:566e)
ld hl,ColosseumMaxL20Text
call PrintText
ld a,$a
ret
-
+
LevelUnder15:: ; f5677 (3d:5677)
ld hl,ColosseumMinL15Text
call PrintText
ld a,$b
ret
-
+
CombinedLevelsAbove50:: ; f5680 (3d:5680)
ld hl,ColosseumTotalL50Text
call PrintText
ld a,$c
ret
-
+
asm_f5689:: ; f5689 (3d:5689)
pop af
pop bc
@@ -489,7 +489,7 @@ asm_f5689:: ; f5689 (3d:5689)
call PrintText
ld a,$d
ret
-
+
asm_f569b:: ; f569b (3d:569b)
pop af
pop bc
@@ -500,7 +500,7 @@ asm_f569b:: ; f569b (3d:569b)
call PrintText
ld a,$e
ret
-
+
asm_f56ad:: ; f56ad (3d:56ad)
ld a,[hl]
ld [wd11e],a
@@ -509,7 +509,7 @@ asm_f56ad:: ; f56ad (3d:56ad)
call PrintText
ld a,$f
ret
-
+
Func_f56bd:: ; f56bd (3d:56bd)
xor a
ld [H_AUTOBGTRANSFERENABLED],a
@@ -537,31 +537,31 @@ Func_f56bd:: ; f56bd (3d:56bd)
ld a,$1
ld [H_AUTOBGTRANSFERENABLED],a
ret
-
+
PointerTable_f56ee:: ; f56ee (3d:56ee)
dw Text_f56f4
dw Text_f5728
dw Text_f575b
-
+
Text_f56f4:: ; f56f4 (3d:56f4)
db "LVs of 3<pkmn>:50-55"
next "Sum of LVs:155 MAX"
next "MEW can't attend.@"
-
+
Text_f5728:: ; f5728 (3d:5728)
db "LVs of 3<pkmn>:15-20"
next "Sum of LVs:50 MAX"
next "MEW can't attend.@"
-
+
Text_f575b:: ; f575b (3d:575b)
db "3 Basic <pkmn>.LV25-30"
next "Sum of LVs:80 MAX"
next "6′8″ and 44lb MAX@"
-
+
Text_f5791:: ; f5791 (3d:5791)
db "View"
next "Rules@"
-
+
Text_f579c:: ; f579c (3d:579c)
db "# Cup"
next "Pika Cup"
@@ -623,7 +623,7 @@ ColosseumHeightText:: ; f57f8 (3d:57f8)
ColosseumWeightText:: ; f57fd (3d:57fd)
TX_FAR _ColosseumWeightText ; a0b9f
db "@"
-
+
ColosseumEvolvedText:: ; f5802 (3d:5802)
TX_FAR _ColosseumEvolvedText ; a0bbb
db "@"
@@ -631,7 +631,7 @@ ColosseumEvolvedText:: ; f5802 (3d:5802)
ColosseumIneligibleText:: ; f5807 (3d:5807)
TX_FAR _ColosseumIneligibleText ; a0bd4
db "@"
-
+
LinkMenu: ; f580c (3d:580c)
xor a
ld [wLetterPrintingDelayFlags], a
@@ -854,7 +854,7 @@ LinkMenu: ; f580c (3d:580c)
ld e,"▷"
call Func_f59ec
jp .choseCancel
-
+
.asm_f59cd
ld hl,ColosseumVersionText
call PrintText
@@ -870,7 +870,7 @@ LinkMenu: ; f580c (3d:580c)
jp c,.choseCancel
ld a,$f0
jp .next
-
+
Func_f59ec:: ; f59ec (3d:59ec)
ld a, b
Coorda 6, 5
@@ -883,7 +883,7 @@ Func_f59ec:: ; f59ec (3d:59ec)
ld c, 40
call DelayFrames
ret
-
+
ColosseumWhereToText: ; f5a02 (3d:5a02)
TX_FAR _ColosseumWhereToText
db "@"
@@ -899,7 +899,7 @@ ColosseumCanceledText: ; f5a0c (3d:5a0c)
ColosseumVersionText: ; f5a11 (3d:5a11)
TX_FAR _ColosseumVersionText ; 28:4c47
db "@"
-
+
TextTerminator_f5a16: ; f5a16 (3d:5a16)
db "@"
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 48346a02..94504ffb 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -139,11 +139,11 @@ Func_5cc1: ; 5cc1 (1:5cc1)
ld hl, NotEnoughMemoryText
call PrintText
ret
-
-NotEnoughMemoryText: ; 5ccd (1:5ccd)
+
+NotEnoughMemoryText: ; 5ccd (1:5ccd)
TX_FAR _NotEnoughMemoryText
db "@"
-
+
StartNewGame: ; 5cd2 (1:5cd2)
ld hl, wd732
res 1, [hl]
diff --git a/engine/menu/options.asm b/engine/menu/options.asm
index 5d3c82cb..ff629839 100644
--- a/engine/menu/options.asm
+++ b/engine/menu/options.asm
@@ -39,7 +39,7 @@ OptionMenuJumpTable: ; 41ca4 (10:5ca4)
dw OptionsMenu_Dummy
dw OptionsMenu_Dummy
dw OptionsMenu_Cancel
-
+
OptionsMenu_TextSpeed: ; 41cb4 (10:5cb4)
call Func_41d07
ld a, [hJoy5]
@@ -83,19 +83,19 @@ OptionsMenu_TextSpeed: ; 41cb4 (10:5cb4)
call PlaceString
and a
ret
-
+
TextSpeedStringsPointerTable: ; 41cf2 (10:5cf2)
dw FastText
dw MidText
dw SlowText
-
+
FastText: ; 41cf9 (10:5cf9)
db "FAST@"
MidText: ; 41cfd (10:5cfd)
db "MID @"
SlowText: ; 41d02 (10:5d02)
db "SLOW@"
-
+
Func_41d07: ; 41d07 (10:5d07)
ld a, [wOptions]
and $f
@@ -115,7 +115,7 @@ Func_41d07: ; 41d07 (10:5d07)
ld c, $0
lb de, 5, 3
ret
-
+
OptionsMenu_BattleAnimations: ; 41d26 (10:5d26)
ld a, [hJoy5]
and D_RIGHT | D_LEFT
@@ -141,16 +141,16 @@ OptionsMenu_BattleAnimations: ; 41d26 (10:5d26)
call PlaceString
and a
ret
-
+
AnimationOptionStringsPointerTable: ; 41d52 (10:5d52)
dw AnimationOnText
dw AnimationOffText
-
+
AnimationOnText: ; 41d56 (10:5d56)
db "ON @"
AnimationOffText: ; 41d5a (10:5d5a)
db "OFF@"
-
+
OptionsMenu_BattleStyle: ; 41d5e (10:5d5e)
ld a, [hJoy5]
and D_LEFT | D_RIGHT
@@ -177,16 +177,16 @@ OptionsMenu_BattleStyle: ; 41d5e (10:5d5e)
call PlaceString
and a
ret
-
+
BattleStyleOptionStringsPointerTable: ; 41d8c (10:5d8c)
dw BattleStyleShiftText
dw BattleStyleSetText
-
+
BattleStyleShiftText: ; 41d90 (10:5d90)
db "SHIFT@"
BattleStyleSetText: ; 41d96 (10:5d96)
db "SET @"
-
+
OptionsMenu_SpeakerSettings: ; 41d9c (10:5d9c)
ld a, [wOptions]
and $30
@@ -235,7 +235,7 @@ SpeakerOptionStringsPointerTable: ; 41ddc (10:5ddc)
dw Earphone1SoundText
dw Earphone2SoundText
dw Earphone3SoundText
-
+
MonoSoundText: ; 41de4 (10:5de4)
db "MONO @"
Earphone1SoundText: ; 41dee (10:5dee)
@@ -244,7 +244,7 @@ Earphone2SoundText: ; 41df8 (10:5df8)
db "EARPHONE2@"
Earphone3SoundText: ; 41e02 (10:5e02)
db "EARPHONE3@"
-
+
OptionsMenu_GBPrinterBrightness: ; 41e0c (10:5e0c)
call Func_41e7b
ld a, [hJoy5]
@@ -285,14 +285,14 @@ OptionsMenu_GBPrinterBrightness: ; 41e0c (10:5e0c)
call PlaceString
and a
ret
-
+
GBPrinterOptionStringsPointerTable: ; 41e44 (10:5e44)
dw LightestPrintText
dw LighterPrintText
dw NormalPrintText
dw DarkerPrintText
dw DarkestPrintText
-
+
LightestPrintText: ; 41e4e (10:5e4e)
db "LIGHTEST@"
LighterPrintText: ; 41e57 (10:5e57)
@@ -303,7 +303,7 @@ DarkerPrintText: ; 41e69 (10:5e69)
db "DARKER @"
DarkestPrintText: ; 41e72 (10:5e72)
db "DARKEST @"
-
+
Func_41e7b: ; 41e7b (10:5e7b)
ld a, [wd498]
and a
@@ -347,7 +347,7 @@ OptionsMenu_Cancel: ; 41ead (10:5ead)
.pressedCancel
scf
ret
-
+
Func_41eb7: ; 41eb7 (10:5eb7)
ld hl, wOptionsCursorLocation
ld a, [hJoy5]
@@ -387,7 +387,7 @@ Func_41eb7: ; 41eb7 (10:5eb7)
dec [hl]
scf
ret
-
+
Func_41ee9: ; 41ee9 (10:5ee9)
coord hl, 1, 1
ld de, SCREEN_WIDTH
@@ -431,13 +431,13 @@ Func_41f06: ; 41f06 (10:5f06)
ld [H_AUTOBGTRANSFERENABLED], a
call Delay3
ret
-
+
AllOptionsText: ; 41f3e (10:5f3e)
db "TEXT SPEED :"
next "ANIMATION :"
next "BATTLESTYLE:"
next "SOUND:"
next "PRINT:@"
-
+
OptionMenuCancelText: ; 41f73 (10:5f73)
db "CANCEL@" \ No newline at end of file
diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm
index 1fcf1f49..38cdf2f6 100755
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -13,7 +13,7 @@ PlayerPC: ; 778e (1:778e)
call PlaySound
ld hl, TurnedOnPC2Text
call PrintText
-
+
PlayerPCMenu: ; 790c (1:790c)
ld hl, wd730
set 6, [hl]
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 298816c1..68339dff 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -461,7 +461,7 @@ ShowPokedexDataInternal: ; 40323 (10:4323)
ld a, $77 ; max volume
ld [rNR50], a
ret
-
+
HeightWeightText: ; 40370 (10:4370)
db "HT ?", $60, "??", $61
next "WT ???lb@"
@@ -656,7 +656,7 @@ Func_404bc: ; 404bc (10:44bc)
res 3, a
ld [hFlags_0xFFFA], a
ret
-
+
; draws a line of tiles
; INPUT:
; b = tile ID