From f1ea15bbfe8528143ace793b050891a9b1f99d03 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 17:13:57 +0100 Subject: Consolidate Special function names --- engine/start_menu.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/start_menu.asm') diff --git a/engine/start_menu.asm b/engine/start_menu.asm index 913bf3780..64a740d2a 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -25,12 +25,12 @@ StartMenu:: ; 125cd call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap farcall LoadFonts_NoOAMUpdate call .DrawBugContestStatus - call UpdateTimePals + call Special_UpdateTimePals jr .Select .Reopen: call UpdateSprites - call UpdateTimePals + call Special_UpdateTimePals call .SetUpMenuItems ld a, [wBattleMenuCursorBuffer] ld [wMenuCursorBuffer], a @@ -78,7 +78,7 @@ StartMenu:: ; 125cd call ExitMenu .ReturnEnd2: call CloseText - call UpdateTimePals + call Special_UpdateTimePals ret .GetInput: -- cgit v1.2.3 From d7970f749ac23786728926109be430ab732f19e6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 18:49:25 +0100 Subject: Consistent predef function names --- engine/start_menu.asm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'engine/start_menu.asm') diff --git a/engine/start_menu.asm b/engine/start_menu.asm index 64a740d2a..7a2274b08 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -25,12 +25,12 @@ StartMenu:: ; 125cd call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap farcall LoadFonts_NoOAMUpdate call .DrawBugContestStatus - call Special_UpdateTimePals + call UpdateTimePals jr .Select .Reopen: call UpdateSprites - call Special_UpdateTimePals + call UpdateTimePals call .SetUpMenuItems ld a, [wBattleMenuCursorBuffer] ld [wMenuCursorBuffer], a @@ -78,7 +78,7 @@ StartMenu:: ; 125cd call ExitMenu .ReturnEnd2: call CloseText - call Special_UpdateTimePals + call UpdateTimePals ret .GetInput: @@ -593,7 +593,7 @@ HasNoItems: ; 129d5 TossItemFromPC: ; 129f4 push de - call PartyMonItemName + call Predef_PartyMonItemName farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a @@ -616,7 +616,7 @@ TossItemFromPC: ; 129f4 pop hl ld a, [CurItemQuantity] call TossItem - call PartyMonItemName + call Predef_PartyMonItemName ld hl, .TossedThisMany call MenuTextBox call ExitMenu @@ -668,7 +668,7 @@ CantUseItemText: ; 12a67 ; 12a6c -PartyMonItemName: ; 12a6c +Predef_PartyMonItemName: ; 12a6c ld a, [CurItem] ld [wd265], a call GetItemName @@ -862,7 +862,7 @@ GiveTakePartyMonItem: ; 12b60 TryGiveItemToPartymon: ; 12bd9 call SpeechTextBox - call PartyMonItemName + call Predef_PartyMonItemName call GetPartyItemLocation ld a, [hl] and a @@ -1225,7 +1225,7 @@ OpenPartyStats: ; 12e00 xor a ld [MonType], a call LowVolume - predef StatsScreenInit + predef Predef_StatsScreenInit call MaxVolume call Call_ExitMenu ld a, 0 @@ -1792,7 +1792,7 @@ SetUpMoveScreenBG: ; 13172 hlcoord 5, 1 call PlaceString push bc - farcall CopyPkmnToTempMon + farcall Predef_CopyPkmnToTempMon pop hl call PrintLevel ld hl, PlayerHPPal @@ -1809,7 +1809,7 @@ SetUpMoveList: ; 131ef ld [hBGMapMode], a ld [wMoveSwapBuffer], a ld [MonType], a - predef CopyPkmnToTempMon + predef Predef_CopyPkmnToTempMon ld hl, TempMonMoves ld de, wListMoves_MoveIndicesBuffer ld bc, NUM_MOVES @@ -1817,9 +1817,9 @@ SetUpMoveList: ; 131ef ld a, SCREEN_WIDTH * 2 ld [Buffer1], a hlcoord 2, 3 - predef ListMoves + predef Predef_ListMoves hlcoord 10, 4 - predef ListMovePP + predef Predef_ListMovePP call WaitBGMap call SetPalettes ld a, [wNumMoves] @@ -1863,7 +1863,7 @@ PlaceMoveData: ; 13256 ld a, [CurMove] ld b, a hlcoord 2, 12 - predef PrintMoveType + predef Predef_PrintMoveType ld a, [CurMove] dec a ld hl, Moves + MOVE_POWER @@ -1886,7 +1886,7 @@ PlaceMoveData: ; 13256 .description hlcoord 1, 14 - predef PrintMoveDesc + predef Predef_PrintMoveDesc ld a, $1 ld [hBGMapMode], a ret -- cgit v1.2.3 From b4e087167f3263342bbe01b5256f42fcf2d726af Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 19:38:56 +0100 Subject: More unreferenced labels and unused text --- engine/start_menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/start_menu.asm') diff --git a/engine/start_menu.asm b/engine/start_menu.asm index 7a2274b08..8f7488435 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -1268,7 +1268,7 @@ MonMenu_Fly: ; 12e30 ld a, $0 ret -.Unused: +.Unreferenced: ld a, $1 ret ; 12e55 -- cgit v1.2.3 From aa9a0a900ddeaa79a05f1b93458a8b19ae170d69 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 20:00:14 +0100 Subject: No more mobile EQUS ret (replace with Stubbed_ + ret) --- engine/start_menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/start_menu.asm') diff --git a/engine/start_menu.asm b/engine/start_menu.asm index 8f7488435..76ad7ce25 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -1255,7 +1255,7 @@ MonMenu_Fly: ; 12e30 jr z, .Fail cp $0 jr z, .Error - farcall TrainerRankings_Fly + farcall StubbedTrainerRankings_Fly ld b, $4 ld a, $2 ret -- cgit v1.2.3