Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix triple newlines left over from removing address comments

Browse Source
This commit is contained in:
Rangi
2018-06-24 23:22:50 -04:00
parent 91f914718a
commit 67d1364c7a
193 changed files with 3 additions and 1965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
engine/menus/start_menu.asm
View File

@@ -10,7 +10,6 @@
const STARTMENUITEM_POKEGEAR ; 7
const STARTMENUITEM_QUIT ; 8
StartMenu::
call ClearWindowData
@@ -157,7 +156,6 @@ StartMenu::
call FinishExitMenu
ret
.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
@@ -235,7 +233,6 @@ StartMenu::
db "Quit and"
next "be judged.@"
.OpenMenu:
ld a, [wMenuSelection]
call .GetMenuAccountTextPointer
@@ -276,7 +273,6 @@ endr
pop de
ret
.GetMenuAccountTextPointer:
ld e, a
ld d, 0
@@ -289,7 +285,6 @@ rept 6
endr
ret
.SetUpMenuItems:
xor a
ld [wWhichIndexSet], a
@@ -349,7 +344,6 @@ endr
ld [wMenuItemsList], a
ret
.FillMenuList:
xor a
ld hl, wMenuItemsList
@@ -409,14 +403,12 @@ endr
farcall StartMenu_PrintBugContestStatus
ret
StartMenu_Exit:
; Exit the menu.
ld a, 1
ret
StartMenu_Quit:
; Retire from the bug catching contest.
@@ -437,7 +429,6 @@ StartMenu_Quit:
text_jump UnknownText_0x1c1a6c
db "@"
StartMenu_Save:
; Save the game.
@@ -450,7 +441,6 @@ StartMenu_Save:
ld a, 1
ret
StartMenu_Option:
; Game options.
@@ -459,7 +449,6 @@ StartMenu_Option:
ld a, 6
ret
StartMenu_Status:
; Player status.
@@ -469,7 +458,6 @@ StartMenu_Status:
ld a, 0
ret
StartMenu_Pokedex:
ld a, [wPartyCount]
@@ -484,7 +472,6 @@ StartMenu_Pokedex:
ld a, 0
ret
StartMenu_Pokegear:
call FadeToMenu
@@ -493,7 +480,6 @@ StartMenu_Pokegear:
ld a, 0
ret
StartMenu_Pack:
call FadeToMenu
@@ -510,7 +496,6 @@ StartMenu_Pack:
ld a, 4
ret
StartMenu_Pokemon:
ld a, [wPartyCount]
@@ -657,7 +642,6 @@ CantUseItemText:
text_jump UnknownText_0x1c1b03
db "@"
PartyMonItemName:
ld a, [wCurItem]
ld [wd265], a
@@ -665,14 +649,12 @@ PartyMonItemName:
call CopyName1
ret
CancelPokemonAction:
farcall InitPartyMenuWithCancel
farcall UnfreezeMonIcons
ld a, 1
ret
PokemonActionSubmenu:
hlcoord 1, 15
lb bc, 2, 18
@@ -717,7 +699,6 @@ PokemonActionSubmenu:
dbw MONMENUITEM_MOVE, ManagePokemonMoves
dbw MONMENUITEM_MAIL, MonMailAction
SwitchPartyMons:
; Don't try if there's nothing to switch!
@@ -769,7 +750,6 @@ SwitchPartyMons:
call CancelPokemonAction
ret
GiveTakePartyMonItem:
; Eggs can't hold items!
@@ -810,7 +790,6 @@ GiveTakePartyMonItem:
ld a, 3
ret
.GiveItem:
farcall DepositSellInitPackBuffers
@@ -842,7 +821,6 @@ GiveTakePartyMonItem:
.quit
ret
TryGiveItemToPartymon:
call SpeechTextBox
@@ -906,7 +884,6 @@ TryGiveItemToPartymon:
.abort
ret
GivePartyItem:
call GetPartyItemLocation
@@ -920,7 +897,6 @@ GivePartyItem:
.done
ret
TakePartyItem:
call SpeechTextBox
@@ -955,7 +931,6 @@ TakePartyItem:
.asm_12c9a
ret
GiveTakeItemMenuData:
db MENU_SPRITE_ANIMS | MENU_BACKUP_TILES ; flags
menu_coords 12, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
@@ -968,7 +943,6 @@ GiveTakeItemMenuData:
db "GIVE@"
db "TAKE@"
TookAndMadeHoldText:
text_jump UnknownText_0x1c1b2c
db "@"
@@ -1001,7 +975,6 @@ CantBeHeldText:
text_jump UnknownText_0x1c1c09
db "@"
GetPartyItemLocation:
push af
ld a, MON_ITEM
@@ -1009,14 +982,12 @@ GetPartyItemLocation:
pop af
ret
ReceiveItemFromPokemon:
ld a, 1
ld [wItemQuantityChangeBuffer], a
ld hl, wNumItems
jp ReceiveItem
GiveItemToPokemon:
ld a, 1
ld [wItemQuantityChangeBuffer], a
@@ -1028,7 +999,6 @@ StartMenuYesNo:
call YesNoBox
jp ExitMenu
ComposeMailMessage:
ld de, wTempMailMessage
farcall _ComposeMailMessage
@@ -1130,7 +1100,6 @@ MonMailAction:
ld a, $3
ret
.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 12, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
@@ -1144,7 +1113,6 @@ MonMailAction:
db "TAKE@"
db "QUIT@"
.mailwilllosemessagetext
; The MAIL will lose its message. OK?
text_jump UnknownText_0x1c1c22
@@ -1175,7 +1143,6 @@ MonMailAction:
text_jump UnknownText_0x1c1cc4
db "@"
OpenPartyStats:
call LoadStandardMenuHeader
call ClearSprites
@@ -1189,7 +1156,6 @@ OpenPartyStats:
ld a, 0
ret
MonMenu_Cut:
farcall CutFunction
ld a, [wFieldMoveSucceeded]
@@ -1203,7 +1169,6 @@ MonMenu_Cut:
ld a, $3
ret
MonMenu_Fly:
farcall FlyFunction
ld a, [wFieldMoveSucceeded]