diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/bank01.asm | 6 | ||||
| -rw-r--r-- | src/engine/bank02.asm | 26 | ||||
| -rw-r--r-- | src/engine/bank06.asm | 2 | ||||
| -rw-r--r-- | src/engine/home.asm | 12 | 
4 files changed, 23 insertions, 23 deletions
| diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 3ea4ca9..09bdee4 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -812,7 +812,7 @@ UsePokemonCard: ; 44db (1:44db)  ; triggered by selecting the "Check" item in the duel menu  DuelMenu_Check: ; 4585 (1:4585)  	call Func_3b31 -	call CallDuelCheckInterface +	call DuelCheckInterface  	jp DuelMainInterface  ; triggered by pressing SELECT in the duel menu @@ -5199,7 +5199,7 @@ Func_60dd: ; 60dd (1:60dd)  	jr z, .asm_6119  	or a  	jr z, .asm_6132 -	call CallDuelCheckInterface +	call DuelCheckInterface  	jr .asm_60f2  .asm_6132  	call OpenTurnHolderHandScreen_Simple @@ -6297,7 +6297,7 @@ Func_67fb: ; 67fb (1:67fb)  	ld a, [wCurrentDuelMenuItem]  	or a  	jr z, .asm_6839 -	call CallDuelCheckInterface +	call DuelCheckInterface  	jr .asm_6829  .asm_6839  	call OpenTurnHolderHandScreen_Simple diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index 381e9b4..1c9e389 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -1,4 +1,4 @@ -DuelCheckInterface: ; 8000 (2:4000) +_DuelCheckInterface: ; 8000 (2:4000)  	call ResetCursorPosAndBlink  	xor a  	ld [wce5e], a @@ -20,7 +20,7 @@ DuelCheckInterface: ; 8000 (2:4000)  	add b  	ld hl, DuelCheckMenuFunctionTable  	call JumpToFunctionInTable -	jr DuelCheckInterface +	jr _DuelCheckInterface  DuelCheckMenuFunctionTable: ; 8031 (2:4031)  	dw DuelCheckMenu_InPlayArea @@ -58,7 +58,7 @@ DuelCheckMenu_YourPlayArea: ; 8047 (2:4047)  	call DrawWideTextBox  	xor a  	ld [wDuelCursorBlinkCounter], a -	ld hl, $4169 +	lb hl, $41, $69  	call PlaceTextItems  .asm_8074  	call DoFrame @@ -74,7 +74,7 @@ DuelCheckMenu_YourPlayArea: ; 8047 (2:4047)  	ld b, a  	ld a, [wCursorDuelXPosition]  	add b -	ld hl, $4098 +	lb hl, $40, $98  	call JumpToFunctionInTable  	jr .asm_8050  ; 0x8098 @@ -113,7 +113,7 @@ LoadTurnHolders: ; 8209 (2:4209)  ; loads tiles and icons to display play area  ; and draws the screen according to the turn player -Func_8211: ; 8211 (2:4211) +_DrawPlayArea: ; 8211 (2:4211)  	xor a  	ld [wTileMapFill], a  	call ZeroObjectPositions @@ -159,20 +159,20 @@ Func_8211: ; 8211 (2:4211)  	jr nz, .swap  .opp_turn2  	call PrintTextNoDelay -	jr .asm_8275 +	jr .draw  .swap  	call SwapTurn  	call PrintTextNoDelay  	call SwapTurn -.asm_8275 +.draw  	ld a, [wTurnHolder1]  	ld b, a  	ld a, [wTurnHolder2]  	cp b  	jr nz, .not_equal  	ld hl, PrizeCardsCoordinateData.player -	call Func_8464 +	call DrawPrizeCards  	lb de, $06, 02  	call Func_837e  	lb de, $01, $09 @@ -183,7 +183,7 @@ Func_8211: ; 8211 (2:4211)  	jr .lcd  .not_equal  	ld hl, PrizeCardsCoordinateData.opponent -	call Func_8464 +	call DrawPrizeCards  	lb de, $06, $05  	call Func_837e  	lb de, $01, $02 @@ -205,9 +205,9 @@ Func_833c: ; 833c (2:433c)  Func_837e: ; 837e (2:437e)  	INCROM $837e, $8464 -Func_8464: ; 8464 (2:4464) +DrawPrizeCards: ; 8464 (2:4464)  	push hl -	call Func_84fc +	call GetDuelInitialPrizesUpperBitsSet  	ld a, [wTurnHolder1]  	ld h, a  	ld l, DUELVARS_PRIZES @@ -282,13 +282,13 @@ PrizeCardsCoordinateData:  	INCROM $84cc, $84fc -; returns in a bits set up to the number of +; calculates bits set up to the number of  ; initial prizes, with upper 2 bits set, i.e:  ; 6 prizes: a = %11111111  ; 4 prizes: a = %11001111  ; 3 prizes: a = %11000111  ; 2 prizes: a = %11000011 -Func_84fc: ; 84fc (2:44fc) +GetDuelInitialPrizesUpperBitsSet: ; 84fc (2:44fc)  	ld a, [wDuelInitialPrizes]  	ld b, $01  .loop diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index 2feb1e3..8d7d110 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -1100,7 +1100,7 @@ Func_006_50fb: ; 190fb (6:50fb)  	ld a, [wWhoseTurn]  	ld l, a  .asm_006_5127 -	call Func_30bc +	call DrawPlayArea  	pop af  	ld [wDuelDisplayedScreen], a  .asm_006_512e diff --git a/src/engine/home.asm b/src/engine/home.asm index c0c0485..e0e9974 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -9279,12 +9279,12 @@ CompareDEtoBC: ; 3090 (0:3090)  	cp c  	ret -CallDuelCheckInterface: ; 3096 (0:3096) +DuelCheckInterface: ; 3096 (0:3096)  	ldh a, [hBankROM]  	push af -	ld a, BANK(DuelCheckInterface) +	ld a, BANK(_DuelCheckInterface)  	call BankswitchROM -	call DuelCheckInterface +	call _DuelCheckInterface  	pop af  	call BankswitchROM  	ret @@ -9302,16 +9302,16 @@ Func_30a6: ; 30a6 (0:30a6)  	call BankswitchROM  	ret -Func_30bc: ; 30bc (0:30bc) +DrawPlayArea: ; 30bc (0:30bc)  	ld a, h  	ld [wTurnHolder1], a  	ld a, l  	ld [wTurnHolder2], a  	ldh a, [hBankROM]  	push af -	ld a, BANK(Func_8211) +	ld a, BANK(_DrawPlayArea)  	call BankswitchROM -	call Func_8211 +	call _DrawPlayArea  	call DrawWideTextBox  	pop af  	call BankswitchROM | 
