pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Consistent routine naming convention: 'Foo' wraps '_Foo'

Browse Source
This commit is contained in:
Rangi 2018-07-23 00:13:43 -04:00
parent bdde60c64b
commit a1806d6e81
15 changed files with 104 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/events/pokecenter_pc.asm
View File

@ -478,21 +478,21 @@ PlayerDepositItemMenu:
push af push af
ld a, [wBuffer2] ld a, [wBuffer2]
push af push af
call .DepositItem_ call .DepositItem
pop af pop af
ld [wBuffer2], a ld [wBuffer2], a
pop af pop af
ld [wBuffer1], a ld [wBuffer1], a
ret ret
.DepositItem_: .DepositItem:
farcall _CheckTossableItem farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]
and a and a
jr z, .AskQuantity jr z, .AskQuantity
ld a, $1 ld a, $1
ld [wItemQuantityChangeBuffer], a ld [wItemQuantityChangeBuffer], a
jr .DepositItem jr .ContinueDeposit
.AskQuantity: .AskQuantity:
ld hl, .HowManyText ld hl, .HowManyText
@ -504,7 +504,7 @@ PlayerDepositItemMenu:
pop af pop af
jr c, .DeclinedToDeposit jr c, .DeclinedToDeposit
.DepositItem: .ContinueDeposit:
ld a, [wItemQuantityChangeBuffer] ld a, [wItemQuantityChangeBuffer]
ld [wBuffer1], a ld [wBuffer1], a
ld a, [wCurItemQuantity] ld a, [wCurItemQuantity]

6
engine/gfx/cgb_layouts.asm
View File

@ -266,7 +266,7 @@ _CGB_Pokedex:
jr .got_palette jr .got_palette
.is_pokemon .is_pokemon
call GetMonPalettePointer_ call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black ; mon palette call LoadPalette_White_Col1_Col2_Black ; mon palette
.got_palette .got_palette
call WipeAttrMap call WipeAttrMap
@ -352,7 +352,7 @@ _CGB_PokedexUnownMode:
call GetPredefPal call GetPredefPal
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
call GetMonPalettePointer_ call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black
call WipeAttrMap call WipeAttrMap
hlcoord 7, 5, wAttrMap hlcoord 7, 5, wAttrMap
@ -914,7 +914,7 @@ _CGB_PlayerOrMonFrontpicPals:
_CGB1e: _CGB1e:
ld de, wBGPals1 ld de, wBGPals1
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
call GetMonPalettePointer_ call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black
call WipeAttrMap call WipeAttrMap
call ApplyAttrMap call ApplyAttrMap

58
engine/gfx/color.asm
View File

@ -94,9 +94,9 @@ Unreferenced_Function8aa4:
ld a, d ld a, d
ld [wSGBPals + 6], a ld [wSGBPals + 6], a
ld hl, wSGBPals ld hl, wSGBPals
call PushSGBPals_ call PushSGBPals
ld hl, BlkPacket_9a86 ld hl, BlkPacket_9a86
call PushSGBPals_ call PushSGBPals
ret ret
InitPartyMenuPalettes: InitPartyMenuPalettes:
@ -173,7 +173,7 @@ Unreferenced_Function8b3f:
and a and a
ret z ret z
ld hl, BlkPacket_9a86 ld hl, BlkPacket_9a86
jp PushSGBPals_ jp PushSGBPals
Unreferenced_Function8b4d: Unreferenced_Function8b4d:
call CheckCGB call CheckCGB
@ -182,7 +182,7 @@ Unreferenced_Function8b4d:
and a and a
ret z ret z
ld hl, PalPacket_BetaIntroVenusaur ld hl, PalPacket_BetaIntroVenusaur
jp PushSGBPals_ jp PushSGBPals
.cgb .cgb
ld de, wOBPals1 ld de, wOBPals1
@ -197,7 +197,7 @@ Unreferenced_Function8b67:
and a and a
ret z ret z
ld hl, PalPacket_Pack ld hl, PalPacket_Pack
jp PushSGBPals_ jp PushSGBPals
.cgb .cgb
ld de, wOBPals1 ld de, wOBPals1
@ -218,7 +218,7 @@ Unreferenced_Function8b81:
ld bc, PALPACKET_LENGTH ld bc, PALPACKET_LENGTH
call CopyBytes call CopyBytes
pop af pop af
call GetMonPalettePointer_ call GetMonPalettePointer
ld a, [hli] ld a, [hli]
ld [wSGBPals + 3], a ld [wSGBPals + 3], a
ld a, [hli] ld a, [hli]
@ -228,12 +228,12 @@ Unreferenced_Function8b81:
ld a, [hl] ld a, [hl]
ld [wSGBPals + 6], a ld [wSGBPals + 6], a
ld hl, wSGBPals ld hl, wSGBPals
jp PushSGBPals_ jp PushSGBPals
.cgb .cgb
ld de, wOBPals1 ld de, wOBPals1
ld a, c ld a, c
call GetMonPalettePointer_ call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black
ret ret
@ -245,7 +245,7 @@ LoadTrainerClassPaletteAsNthBGPal:
LoadMonPaletteAsNthBGPal: LoadMonPaletteAsNthBGPal:
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
call GetMonPalettePointer call _GetMonPalettePointer
ld a, e ld a, e
bit 7, a bit 7, a
jr z, got_palette_pointer_8bd7 jr z, got_palette_pointer_8bd7
@ -278,7 +278,7 @@ Unreferenced_Function8bec:
and a and a
jr nz, .cgb jr nz, .cgb
ld hl, wPlayerLightScreenCount ld hl, wPlayerLightScreenCount
jp PushSGBPals_ jp PushSGBPals
.cgb .cgb
ld a, [wEnemyLightScreenCount] ; col ld a, [wEnemyLightScreenCount] ; col
@ -310,7 +310,7 @@ ApplyMonOrTrainerPals:
and a and a
jr z, .get_trainer jr z, .get_trainer
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
call GetMonPalettePointer_ call GetMonPalettePointer
jr .load_palettes jr .load_palettes
.get_trainer .get_trainer
@ -426,9 +426,9 @@ LoadMailPalettes:
ld a, [hli] ld a, [hli]
ld [wSGBPals + 6], a ld [wSGBPals + 6], a
ld hl, wSGBPals ld hl, wSGBPals
call PushSGBPals_ call PushSGBPals
ld hl, BlkPacket_9a86 ld hl, BlkPacket_9a86
call PushSGBPals_ call PushSGBPals
ret ret
.cgb .cgb
@ -732,8 +732,8 @@ GetTrainerPalettePointer:
add hl, bc add hl, bc
ret ret
GetMonPalettePointer_: GetMonPalettePointer:
call GetMonPalettePointer call _GetMonPalettePointer
ret ret
Unreferenced_Function9779: Unreferenced_Function9779:
@ -781,7 +781,7 @@ Unreferenced_Function97cc:
jr nz, .loop jr nz, .loop
ret ret
GetMonPalettePointer: _GetMonPalettePointer:
ld l, a ld l, a
ld h, $0 ld h, $0
add hl, hl add hl, hl
@ -793,7 +793,7 @@ GetMonPalettePointer:
GetMonNormalOrShinyPalettePointer: GetMonNormalOrShinyPalettePointer:
push bc push bc
call GetMonPalettePointer call _GetMonPalettePointer
pop bc pop bc
push hl push hl
call CheckShininess call CheckShininess
@ -804,17 +804,17 @@ rept 4
endr endr
ret ret
PushSGBPals_: PushSGBPals:
ld a, [wcfbe] ld a, [wcfbe]
push af push af
set 7, a set 7, a
ld [wcfbe], a ld [wcfbe], a
call PushSGBPals call _PushSGBPals
pop af pop af
ld [wcfbe], a ld [wcfbe], a
ret ret
PushSGBPals: _PushSGBPals:
ld a, [hl] ld a, [hl]
and $7 and $7
ret z ret z
@ -878,7 +878,7 @@ InitSGBBorder:
call SGBDelayCycles call SGBDelayCycles
call SGB_ClearVRAM call SGB_ClearVRAM
ld hl, MaskEnCancelPacket ld hl, MaskEnCancelPacket
call PushSGBPals call _PushSGBPals
.skip .skip
pop af pop af
@ -950,7 +950,7 @@ _InitSGBBorderPals:
push hl push hl
ld h, [hl] ld h, [hl]
ld l, a ld l, a
call PushSGBPals call _PushSGBPals
pop hl pop hl
inc hl inc hl
pop bc pop bc
@ -974,12 +974,12 @@ Unreferenced_Function9911:
xor a xor a
ld [rJOYP], a ld [rJOYP], a
ld hl, MaskEnFreezePacket ld hl, MaskEnFreezePacket
call PushSGBPals call _PushSGBPals
call PushSGBBorder call PushSGBBorder
call SGBDelayCycles call SGBDelayCycles
call SGB_ClearVRAM call SGB_ClearVRAM
ld hl, MaskEnCancelPacket ld hl, MaskEnCancelPacket
call PushSGBPals call _PushSGBPals
ei ei
ret ret
@ -1005,7 +1005,7 @@ SGB_ClearVRAM:
PushSGBBorderPalsAndWait: PushSGBBorderPalsAndWait:
ld hl, MltReq2Packet ld hl, MltReq2Packet
call PushSGBPals call _PushSGBPals
call SGBDelayCycles call SGBDelayCycles
ld a, [rJOYP] ld a, [rJOYP]
and $3 and $3
@ -1050,7 +1050,7 @@ endr
.FinalPush: .FinalPush:
ld hl, MltReq1Packet ld hl, MltReq1Packet
call PushSGBPals call _PushSGBPals
jp SGBDelayCycles jp SGBDelayCycles
SGBBorder_PushBGPals: SGBBorder_PushBGPals:
@ -1065,7 +1065,7 @@ SGBBorder_PushBGPals:
ld a, LCDC_DEFAULT ld a, LCDC_DEFAULT
ld [rLCDC], a ld [rLCDC], a
ld hl, PalTrnPacket ld hl, PalTrnPacket
call PushSGBPals call _PushSGBPals
xor a xor a
ld [rBGP], a ld [rBGP], a
ret ret
@ -1099,7 +1099,7 @@ SGBBorder_MorePalPushing:
ld a, LCDC_DEFAULT ld a, LCDC_DEFAULT
ld [rLCDC], a ld [rLCDC], a
ld hl, PctTrnPacket ld hl, PctTrnPacket
call PushSGBPals call _PushSGBPals
xor a xor a
ld [rBGP], a ld [rBGP], a
ret ret
@ -1123,7 +1123,7 @@ SGBBorder_YetMorePalPushing:
ld a, LCDC_DEFAULT ld a, LCDC_DEFAULT
ld [rLCDC], a ld [rLCDC], a
ld hl, ChrTrnPacket ld hl, ChrTrnPacket
call PushSGBPals call _PushSGBPals
xor a xor a
ld [rBGP], a ld [rBGP], a
ret ret

2
engine/gfx/crystal_layouts.asm
View File

@ -284,7 +284,7 @@ _InitMG_Mobile_LinkTradePalMap:
call ByteFill call ByteFill
ret ret
LoadTradeRoomBGPals: _LoadTradeRoomBGPals:
ld hl, TradeRoomPalette ld hl, TradeRoomPalette
ld de, wBGPals1 palette PAL_BG_GREEN ld de, wBGPals1 palette PAL_BG_GREEN
ld bc, 6 palettes ld bc, 6 palettes

1
engine/gfx/pic_animation.asm
View File

@ -59,6 +59,7 @@ endr
ENDM ENDM
PokeAnims: PokeAnims:
; entries correspond to ANIM_MON_* constants
dw .Slow dw .Slow
dw .Normal dw .Normal
dw .Menu dw .Menu

8
engine/gfx/sgb_layouts.asm
View File

@ -61,7 +61,7 @@ LoadSGBLayout:
.SGB_BattleColors: .SGB_BattleColors:
ld hl, BlkPacket_Battle ld hl, BlkPacket_Battle
call PushSGBPals_ call PushSGBPals
ld hl, PalPacket_9ce6 ld hl, PalPacket_9ce6
ld de, wSGBPals ld de, wSGBPals
@ -210,7 +210,7 @@ LoadSGBLayout:
inc hl inc hl
ld [hl], HIGH(palred 26 + palgreen 10 + palblue 6) ld [hl], HIGH(palred 26 + palgreen 10 + palblue 6)
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
call GetMonPalettePointer_ call GetMonPalettePointer
ld a, [hli] ld a, [hli]
ld [wSGBPals + 9], a ld [wSGBPals + 9], a
ld a, [hli] ld a, [hli]
@ -566,6 +566,6 @@ INCLUDE "data/maps/sgb_roof_pal_inds.asm"
_LoadSGBLayout_ReturnFromJumpTable: _LoadSGBLayout_ReturnFromJumpTable:
push de push de
call PushSGBPals_ call PushSGBPals
pop hl pop hl
jp PushSGBPals_ jp PushSGBPals

2
engine/link/link.asm
View File

@ -1971,7 +1971,7 @@ LoadTradeScreenBorder:
ret ret
SetTradeRoomBGPals: SetTradeRoomBGPals:
farcall LoadTradeRoomBGPals_ ; just a nested farcall; so wasteful farcall LoadTradeRoomBGPals ; just a nested farcall; so wasteful
call SetPalettes call SetPalettes
ret ret

4
engine/link/link_trade.asm
View File

@ -133,8 +133,8 @@ LinkComms_LoadPleaseWaitTextboxBorderGFX:
call Get2bpp call Get2bpp
ret ret
LoadTradeRoomBGPals_: LoadTradeRoomBGPals:
farcall LoadTradeRoomBGPals farcall _LoadTradeRoomBGPals
ret ret
Function16d6ae: Function16d6ae:

6
engine/menus/save.asm
View File

@ -164,7 +164,7 @@ AddHallOfFameEntry:
ret ret
SaveGameData: SaveGameData:
call SaveGameData_ call _SaveGameData
ret ret
AskOverwriteSaveFile: AskOverwriteSaveFile:
@ -228,7 +228,7 @@ CompareLoadedAndSavedPlayerID:
_SavingDontTurnOffThePower: _SavingDontTurnOffThePower:
call SavingDontTurnOffThePower call SavingDontTurnOffThePower
SavedTheGame: SavedTheGame:
call SaveGameData_ call _SaveGameData
; wait 32 frames ; wait 32 frames
ld c, $20 ld c, $20
call DelayFrames call DelayFrames
@ -252,7 +252,7 @@ SavedTheGame:
call DelayFrames call DelayFrames
ret ret
SaveGameData_: _SaveGameData:
ld a, TRUE ld a, TRUE
ld [wSaveFileExists], a ld [wSaveFileExists], a
farcall StageRTCTimeForSave farcall StageRTCTimeForSave

16
engine/menus/start_menu.asm
View File

@ -29,7 +29,7 @@ StartMenu::
call .SetUpMenuItems call .SetUpMenuItems
ld a, [wBattleMenuCursorBuffer] ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
call .DrawMenuAccount_ call .DrawMenuAccount
call DrawVariableLengthMenuBox call DrawVariableLengthMenuBox
call .DrawBugContestStatusBox call .DrawBugContestStatusBox
call SafeUpdateSprites call SafeUpdateSprites
@ -49,7 +49,7 @@ StartMenu::
.Select: .Select:
call .GetInput call .GetInput
jr c, .Exit jr c, .Exit
call .DrawMenuAccount call ._DrawMenuAccount
ld a, [wMenuCursorBuffer] ld a, [wMenuCursorBuffer]
ld [wBattleMenuCursorBuffer], a ld [wBattleMenuCursorBuffer], a
call PlayClickSFX call PlayClickSFX
@ -96,7 +96,7 @@ StartMenu::
; Return carry on exit, and no-carry on selection. ; Return carry on exit, and no-carry on selection.
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call .DrawMenuAccount call ._DrawMenuAccount
call SetUpMenu call SetUpMenu
ld a, $ff ld a, $ff
ld [wMenuSelection], a ld [wMenuSelection], a
@ -147,7 +147,7 @@ StartMenu::
call ClearBGPalettes call ClearBGPalettes
call Call_ExitMenu call Call_ExitMenu
call ReloadTilesetAndPalettes call ReloadTilesetAndPalettes
call .DrawMenuAccount_ call .DrawMenuAccount
call DrawVariableLengthMenuBox call DrawVariableLengthMenuBox
call .DrawBugContestStatus call .DrawBugContestStatus
call UpdateSprites call UpdateSprites
@ -360,17 +360,17 @@ endr
inc c inc c
ret ret
.DrawMenuAccount_: .DrawMenuAccount:
jp .DrawMenuAccount jp ._DrawMenuAccount
.PrintMenuAccount: .PrintMenuAccount:
call .IsMenuAccountOn call .IsMenuAccountOn
ret z ret z
call .DrawMenuAccount call ._DrawMenuAccount
decoord 0, 14 decoord 0, 14
jp .MenuDesc jp .MenuDesc
.DrawMenuAccount: ._DrawMenuAccount:
call .IsMenuAccountOn call .IsMenuAccountOn
ret z ret z
hlcoord 0, 13 hlcoord 0, 13

2
engine/pokemon/mail_2.asm
View File

@ -59,7 +59,7 @@ ReadAnyMail:
.pressed_start .pressed_start
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
push af push af
callfar PrintMail ; printer callfar PrintMailAndExit ; printer
pop af pop af
ld [wJumptableIndex], a ld [wJumptableIndex], a
jr .loop jr .loop

6
engine/printer/printer.asm
View File

@ -268,12 +268,12 @@ PrintUnownStamp:
ld [wPrinterQueueLength], a ld [wPrinterQueueLength], a
ret ret
PrintMail: PrintMailAndExit:
call PrintMail_ call PrintMail
call Printer_ExitPrinter call Printer_ExitPrinter
ret ret
PrintMail_: PrintMail:
ld a, [wPrinterQueueLength] ld a, [wPrinterQueueLength]
push af push af
xor a xor a

82
engine/printer/printer_serial.asm
View File

@ -44,14 +44,14 @@ PrinterJumptableIteration:
dw Printer_WaitUntilFinished ; 0c dw Printer_WaitUntilFinished ; 0c
dw Printer_Quit ; 0d dw Printer_Quit ; 0d
dw Printer_NextSection_ ; 0e dw Printer_NextSection ; 0e
dw Printer_WaitSerial ; 0f dw Printer_WaitSerial ; 0f
dw Printer_SignalLoopBack ; 10 dw Printer_SignalLoopBack ; 10
dw Printer_SectionOne ; 11 dw Printer_SectionOne ; 11
dw Printer_WaitLoopBack ; 12 dw Printer_NextSectionWaitLoopBack ; 12
dw Printer_WaitLoopBack_ ; 13 dw Printer_WaitLoopBack ; 13
Printer_NextSection: _Printer_NextSection:
ld hl, wJumptableIndex ld hl, wJumptableIndex
inc [hl] inc [hl]
ret ret
@ -68,8 +68,8 @@ Printer_Quit:
set 7, [hl] set 7, [hl]
ret ret
Printer_NextSection_: Printer_NextSection:
call Printer_NextSection call _Printer_NextSection
ret ret
Printer_SectionOne: Printer_SectionOne:
@ -86,7 +86,7 @@ Print_InitPrinterHandshake:
ld [wPrinterSendByteCounter + 1], a ld [wPrinterSendByteCounter + 1], a
ld a, [wPrinterQueueLength] ld a, [wPrinterQueueLength]
ld [wPrinterRowIndex], a ld [wPrinterRowIndex], a
call Printer_NextSection call _Printer_NextSection
call Printer_WaitHandshake call Printer_WaitHandshake
ld a, PRINTER_STATUS_CHECKING ld a, PRINTER_STATUS_CHECKING
ld [wPrinterStatus], a ld [wPrinterStatus], a
@ -110,7 +110,7 @@ Printer_StartTransmittingTilemap:
ld [wPrinterSendByteCounter + 1], a ld [wPrinterSendByteCounter + 1], a
; compute the checksum ; compute the checksum
call Printer_ComputeChecksum call Printer_ComputeChecksum
call Printer_NextSection call _Printer_NextSection
call Printer_WaitHandshake call Printer_WaitHandshake
ld a, PRINTER_STATUS_TRANSMITTING ld a, PRINTER_STATUS_TRANSMITTING
ld [wPrinterStatus], a ld [wPrinterStatus], a
@ -127,7 +127,7 @@ Printer_EndTilemapTransmission:
xor a xor a
ld [wPrinterSendByteCounter], a ld [wPrinterSendByteCounter], a
ld [wPrinterSendByteCounter + 1], a ld [wPrinterSendByteCounter + 1], a
call Printer_NextSection call _Printer_NextSection
call Printer_WaitHandshake call Printer_WaitHandshake
ret ret
@ -143,7 +143,7 @@ Printer_SignalSendHeader:
ld [wPrinterSendByteCounter + 1], a ld [wPrinterSendByteCounter + 1], a
; compute the checksum ; compute the checksum
call Printer_ComputeChecksum call Printer_ComputeChecksum
call Printer_NextSection call _Printer_NextSection
call Printer_WaitHandshake call Printer_WaitHandshake
ld a, PRINTER_STATUS_PRINTING ld a, PRINTER_STATUS_PRINTING
ld [wPrinterStatus], a ld [wPrinterStatus], a
@ -160,7 +160,7 @@ Printer_SignalLoopBack:
ld [wPrinterSendByteCounter + 1], a ld [wPrinterSendByteCounter + 1], a
ld a, [wPrinterQueueLength] ld a, [wPrinterQueueLength]
ld [wPrinterRowIndex], a ld [wPrinterRowIndex], a
call Printer_NextSection call _Printer_NextSection
call Printer_WaitHandshake call Printer_WaitHandshake
ret ret
@ -172,7 +172,7 @@ Printer_WaitSerial:
ret c ret c
xor a xor a
ld [hl], a ld [hl], a
call Printer_NextSection call _Printer_NextSection
ret ret
Printer_WaitSerialAndLoopBack2: Printer_WaitSerialAndLoopBack2:
@ -211,7 +211,7 @@ Printer_CheckConnectionStatus:
set 1, [hl] set 1, [hl]
ld a, $5 ld a, $5
ld [wHandshakeFrameDelay], a ld [wHandshakeFrameDelay], a
call Printer_NextSection call _Printer_NextSection
ret ret
.printer_error .printer_error
@ -232,7 +232,7 @@ Printer_TransmissionLoop:
ld a, [wPrinterStatusFlags] ld a, [wPrinterStatusFlags]
and $1 and $1
jr nz, .cycle_back jr nz, .cycle_back
call Printer_NextSection call _Printer_NextSection
ret ret
.cycle_back .cycle_back
@ -240,7 +240,7 @@ Printer_TransmissionLoop:
ret ret
.enter_wait_loop .enter_wait_loop
ld a, $12 ; Printer_WaitLoopBack ld a, $12 ; Printer_NextSectionWaitLoopBack
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
@ -251,12 +251,12 @@ Printer_WaitUntilFinished:
ld a, [wPrinterStatusFlags] ld a, [wPrinterStatusFlags]
and $f3 and $f3
ret nz ret nz
call Printer_NextSection call _Printer_NextSection
ret ret
Printer_NextSectionWaitLoopBack:
call _Printer_NextSection
Printer_WaitLoopBack: Printer_WaitLoopBack:
call Printer_NextSection
Printer_WaitLoopBack_:
ld a, [wPrinterOpcode] ld a, [wPrinterOpcode]
and a and a
ret nz ret nz
@ -474,31 +474,31 @@ _PrinterReceive::
dw Printer_SendNextByte ; 06 dw Printer_SendNextByte ; 06
dw Printer_SendwPrinterChecksumLo ; 07 dw Printer_SendwPrinterChecksumLo ; 07
dw Printer_SendwPrinterChecksumHi ; 08 dw Printer_SendwPrinterChecksumHi ; 08
dw Printer_Send0x00 ; 09 dw Printer_Send0x00_2 ; 09
dw Printer_ReceiveTowPrinterHandshakeAndSend0x00 ; 0a dw Printer_ReceiveTwoPrinterHandshakeAndSend0x00 ; 0a
dw Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop ; 0b dw Printer_ReceiveTwoPrinterStatusFlagsAndExitSendLoop ; 0b
dw Printer_Send0x33 ; 0c triggered by AskSerial dw Printer_Send0x33 ; 0c triggered by AskSerial
dw Printer_Send0x0f ; 0d dw Printer_Send0x0f ; 0d
dw Printer_Send0x00_ ; 0e dw Printer_Send0x00 ; 0e
dw Printer_Send0x00_ ; 0f dw Printer_Send0x00 ; 0f
dw Printer_Send0x00_ ; 10 dw Printer_Send0x00 ; 10
dw Printer_Send0x0f ; 11 dw Printer_Send0x0f ; 11
dw Printer_Send0x00_ ; 12 dw Printer_Send0x00 ; 12
dw Printer_Send0x00 ; 13 dw Printer_Send0x00_2 ; 13
dw Printer_ReceiveTowPrinterHandshakeAndSend0x00 ; 14 dw Printer_ReceiveTwoPrinterHandshakeAndSend0x00 ; 14
dw Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop_ ; 15 dw Printer_ReceiveTwoPrinterStatusFlagsAndExitSendLoop_2 ; 15
dw Printer_Send0x33 ; 16 triggered by pressing B dw Printer_Send0x33 ; 16 triggered by pressing B
dw Printer_Send0x08 ; 17 dw Printer_Send0x08 ; 17
dw Printer_Send0x00_ ; 18 dw Printer_Send0x00 ; 18
dw Printer_Send0x00_ ; 19 dw Printer_Send0x00 ; 19
dw Printer_Send0x00_ ; 1a dw Printer_Send0x00 ; 1a
dw Printer_Send0x08 ; 1b dw Printer_Send0x08 ; 1b
dw Printer_Send0x00_ ; 1c dw Printer_Send0x00 ; 1c
dw Printer_Send0x00 ; 1d dw Printer_Send0x00_2 ; 1d
dw Printer_ReceiveTowPrinterHandshakeAndSend0x00 ; 1e dw Printer_ReceiveTwoPrinterHandshakeAndSend0x00 ; 1e
dw Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop ; 1f dw Printer_ReceiveTwoPrinterStatusFlagsAndExitSendLoop ; 1f
Printer_NextInstruction: Printer_NextInstruction:
ld hl, wPrinterOpcode ld hl, wPrinterOpcode
@ -580,13 +580,14 @@ Printer_SendwPrinterChecksumHi:
call Printer_NextInstruction call Printer_NextInstruction
ret ret
Printer_Send0x00: Printer_Send0x00_2:
; identical to Printer_Send0x00, but referenced less
ld a, $0 ld a, $0
call Printer_SerialSend call Printer_SerialSend
call Printer_NextInstruction call Printer_NextInstruction
ret ret
Printer_ReceiveTowPrinterHandshakeAndSend0x00: Printer_ReceiveTwoPrinterHandshakeAndSend0x00:
ld a, [rSB] ld a, [rSB]
ld [wPrinterHandshake], a ld [wPrinterHandshake], a
ld a, $0 ld a, $0
@ -594,7 +595,7 @@ Printer_ReceiveTowPrinterHandshakeAndSend0x00:
call Printer_NextInstruction call Printer_NextInstruction
ret ret
Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop: Printer_ReceiveTwoPrinterStatusFlagsAndExitSendLoop:
ld a, [rSB] ld a, [rSB]
ld [wPrinterStatusFlags], a ld [wPrinterStatusFlags], a
xor a xor a
@ -607,7 +608,7 @@ Printer_Send0x0f:
call Printer_NextInstruction call Printer_NextInstruction
ret ret
Printer_Send0x00_: Printer_Send0x00:
ld a, $0 ld a, $0
call Printer_SerialSend call Printer_SerialSend
call Printer_NextInstruction call Printer_NextInstruction
@ -627,7 +628,8 @@ Printer_SerialSend:
ld [rSC], a ld [rSC], a
ret ret
Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop_: Printer_ReceiveTwoPrinterStatusFlagsAndExitSendLoop_2:
; identical to Printer_ReceiveTwoPrinterStatusFlagsAndExitSendLoop, but referenced less
ld a, [rSB] ld a, [rSB]
ld [wPrinterStatusFlags], a ld [wPrinterStatusFlags], a
xor a xor a

2
mobile/mobile_22.asm
View File

@ -2063,7 +2063,7 @@ Function89d0d:
ld [rSVBK], a ld [rSVBK], a
call SetPalettes call SetPalettes
farcall PrintMail_ farcall PrintMail
call Mobile22_SetBGMapMode1 call Mobile22_SetBGMapMode1
ld c, 24 ld c, 24
call DelayFrames call DelayFrames

2
mobile/mobile_5f.asm
View File

@ -2967,7 +2967,7 @@ endr
ENDM ENDM
IncCrashCheckPointer_SaveGameData: IncCrashCheckPointer_SaveGameData:
inc_crash_check_pointer_farcall SaveGameData_ inc_crash_check_pointer_farcall _SaveGameData
IncCrashCheckPointer_SaveAfterLinkTrade: IncCrashCheckPointer_SaveAfterLinkTrade:
inc_crash_check_pointer_farcall SaveAfterLinkTrade inc_crash_check_pointer_farcall SaveAfterLinkTrade