diff options
Diffstat (limited to 'engine/menu')
-rwxr-xr-x | engine/menu/diploma.asm | 2 | ||||
-rw-r--r-- | engine/menu/draw_start_menu.asm | 2 | ||||
-rwxr-xr-x | engine/menu/main_menu.asm | 2 | ||||
-rwxr-xr-x | engine/menu/naming_screen.asm | 2 | ||||
-rwxr-xr-x | engine/menu/party_menu.asm | 4 | ||||
-rwxr-xr-x | engine/menu/pc.asm | 4 | ||||
-rwxr-xr-x | engine/menu/players_pc.asm | 2 | ||||
-rwxr-xr-x | engine/menu/prize_menu.asm | 2 | ||||
-rwxr-xr-x | engine/menu/start_sub_menus.asm | 16 | ||||
-rw-r--r-- | engine/menu/swap_items.asm | 2 | ||||
-rw-r--r-- | engine/menu/text_box.asm | 2 | ||||
-rwxr-xr-x | engine/menu/vending_machine.asm | 2 |
12 files changed, 21 insertions, 21 deletions
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 09ba123e..e53ef58f 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -1,4 +1,4 @@ -DisplayDiploma: +DisplayDiploma:: call SaveScreenTilesToBuffer2 call GBPalWhiteOutWithDelay3 call ClearScreen diff --git a/engine/menu/draw_start_menu.asm b/engine/menu/draw_start_menu.asm index 11777dc6..21e444e9 100644 --- a/engine/menu/draw_start_menu.asm +++ b/engine/menu/draw_start_menu.asm @@ -1,5 +1,5 @@ ; function that displays the start menu -DrawStartMenu: +DrawStartMenu:: CheckEvent EVENT_GOT_POKEDEX ; menu with pokedex coord hl, 10, 0 diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 5be6bb28..8eda6744 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -312,7 +312,7 @@ StartNewGame: call DelayFrames ; enter map after using a special warp or loading the game from the main menu -SpecialEnterMap: +SpecialEnterMap:: xor a ld [hJoyPressed], a ld [hJoyHeld], a diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 91723da1..e2973988 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -53,7 +53,7 @@ DoYouWantToNicknameText: TX_FAR _DoYouWantToNicknameText db "@" -DisplayNameRaterScreen: +DisplayNameRaterScreen:: ld hl, wBuffer xor a ld [wUpdateSpritesEnabled], a diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 8323d0eb..41b6074b 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -17,14 +17,14 @@ ; f6: health returned ; f7: revitalized ; f8: leveled up -DrawPartyMenu_: +DrawPartyMenu_:: xor a ld [H_AUTOBGTRANSFERENABLED], a call ClearScreen call UpdateSprites callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics -RedrawPartyMenu_: +RedrawPartyMenu_:: ld a, [wPartyMenuTypeOrMessageID] cp SWAP_MONS_PARTY_MENU jp z, .printMessage diff --git a/engine/menu/pc.asm b/engine/menu/pc.asm index 5639bd99..6ec45f2e 100755 --- a/engine/menu/pc.asm +++ b/engine/menu/pc.asm @@ -1,4 +1,4 @@ -ActivatePC: +ActivatePC:: call SaveScreenTilesToBuffer2 ld a, SFX_TURN_ON_PC call PlaySound @@ -115,7 +115,7 @@ AccessedMyPCText: db "@" ; removes one of the specified item ID [hItemToRemoveID] from bag (if existent) -RemoveItemByID: +RemoveItemByID:: ld hl, wBagItems ld a, [hItemToRemoveID] ld b, a diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm index bc2be4ef..403632fa 100755 --- a/engine/menu/players_pc.asm +++ b/engine/menu/players_pc.asm @@ -1,4 +1,4 @@ -PlayerPC: +PlayerPC:: ld hl, wd730 set 6, [hl] ld a, ITEM_NAME diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index bcd0d4ea..5e08bb8f 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -1,4 +1,4 @@ -CeladonPrizeMenu: +CeladonPrizeMenu:: ld b, COIN_CASE call IsItemInBag jr nz, .havingCoinCase diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 04efe711..b81769a2 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -1,4 +1,4 @@ -StartMenu_Pokedex: +StartMenu_Pokedex:: predef ShowPokedexMenu call LoadScreenTilesFromBuffer2 ; restore saved screen call Delay3 @@ -6,7 +6,7 @@ StartMenu_Pokedex: call UpdateSprites jp RedisplayStartMenu -StartMenu_Pokemon: +StartMenu_Pokemon:: ld a, [wPartyCount] and a jp z, RedisplayStartMenu @@ -284,7 +284,7 @@ StartMenu_Pokemon: db "@" ; writes a blank tile to all possible menu cursor positions on the party menu -ErasePartyMenuCursors: +ErasePartyMenuCursors:: coord hl, 0, 1 ld bc, 2 * 20 ; menu cursor positions are 2 rows apart ld a, 6 ; 6 menu cursor positions @@ -299,7 +299,7 @@ ItemMenuLoop: call LoadScreenTilesFromBuffer2DisableBGTransfer ; restore saved screen call RunDefaultPaletteCommand -StartMenu_Item: +StartMenu_Item:: ld a, [wLinkState] dec a ; is the player in the Colosseum or Trade Centre? jr nz, .notInCableClubRoom @@ -450,7 +450,7 @@ INCLUDE "data/party_items.asm" INCLUDE "data/overworld_items.asm" -StartMenu_TrainerInfo: +StartMenu_TrainerInfo:: call GBPalWhiteOut call ClearScreen call UpdateSprites @@ -638,7 +638,7 @@ TrainerInfo_DrawVerticalLine: jr nz, .loop ret -StartMenu_SaveReset: +StartMenu_SaveReset:: ld a, [wd72e] bit 6, a ; is the player using the link feature? jp nz, Init @@ -646,7 +646,7 @@ StartMenu_SaveReset: call LoadScreenTilesFromBuffer2 ; restore saved screen jp HoldTextDisplayOpen -StartMenu_Option: +StartMenu_Option:: xor a ld [H_AUTOBGTRANSFERENABLED], a call ClearScreen @@ -657,7 +657,7 @@ StartMenu_Option: call UpdateSprites jp RedisplayStartMenu -SwitchPartyMon: +SwitchPartyMon:: call SwitchPartyMon_InitVarOrSwapData ; swap data ld a, [wSwappedMenuItem] call SwitchPartyMon_ClearGfx diff --git a/engine/menu/swap_items.asm b/engine/menu/swap_items.asm index 563fc7d5..826fe60b 100644 --- a/engine/menu/swap_items.asm +++ b/engine/menu/swap_items.asm @@ -1,4 +1,4 @@ -HandleItemListSwapping: +HandleItemListSwapping:: ld a, [wListMenuID] cp ITEMLISTMENU jp nz, DisplayListMenuIDLoop ; only rearrange item list menus diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm index b9a36652..00045959 100644 --- a/engine/menu/text_box.asm +++ b/engine/menu/text_box.asm @@ -1,5 +1,5 @@ ; function to draw various text boxes -DisplayTextBoxID_: +DisplayTextBoxID_:: ld a, [wTextBoxID] cp TWO_OPTION_MENU jp z, DisplayTwoOptionMenu diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 0b5c8842..554c5d4f 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -1,4 +1,4 @@ -VendingMachineMenu: +VendingMachineMenu:: ld hl, VendingMachineText1 call PrintText ld a, MONEY_BOX |