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

Improve some innacurate function names, labels, and comments (#1078)

Browse Source 
[https://github.com/pret/pokecrystal/issues/1078#issue-1869550979 and https://github.com/pret/pokecrystal/issues/1078#issuecomment-1696394371]
This commit is contained in:
xCrystal
2024-01-07 12:38:00 +01:00
parent dbf6044650
commit bd6ceec193
107 changed files with 340 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
engine/battle/core.asm
View File

@@ -2745,7 +2745,7 @@ ForcePlayerMonChoice:
call LoadTilemapToTempTilemap
call WaitBGMap
call GetMemSGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
xor a
ld c, a
ret
@@ -2764,7 +2764,7 @@ ForcePlayerMonChoice:
call _LoadHPBar
call CloseWindow
call GetMemSGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call SendOutMonText
call NewBattleMonStatus
call BreakAttraction
@@ -2830,7 +2830,7 @@ JumpToPartyMenuAndPrintText:
farcall WritePartyMenuTilemap
farcall PrintPartyMenuText
call WaitBGMap
call SetPalettes
call SetDefaultBGPAndOBP
call DelayFrame
ret
@@ -2961,7 +2961,7 @@ LostBattle:
; Grayscale
ld b, SCGB_BATTLE_GRAYSCALE
call GetSGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
jr .end
.LostLinkBattle:
@@ -5045,7 +5045,7 @@ BattleMenu_Pack:
and BATTLERESULT_BITMASK
ld [wBattleResult], a ; WIN
call ClearWindowData
call SetPalettes
call SetDefaultBGPAndOBP
scf
ret
@@ -5095,7 +5095,7 @@ BattleMenuPKMN_Loop:
call CloseWindow
call LoadTilemapToTempTilemap
call GetMemSGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
jp BattleMenu
.GetMenu:
@@ -5181,7 +5181,7 @@ TryPlayerSwitch:
call _LoadHPBar
call CloseWindow
call GetMemSGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
ld a, [wCurPartyMon]
ld [wCurBattleMon], a
PlayerSwitch:
@@ -6963,7 +6963,7 @@ FinishBattleAnim:
push hl
ld b, SCGB_BATTLE_COLORS
call GetSGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call DelayFrame
pop hl
pop de
@@ -8459,7 +8459,7 @@ _DisplayLinkRecord:
call WaitBGMap2
ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
ld c, 8
call DelayFrames
call WaitPressAorB_BlinkCursor
@@ -8940,7 +8940,7 @@ InitBattleDisplay:
call HideSprites
ld b, SCGB_BATTLE_COLORS
call GetSGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
ld a, $90
ldh [hWY], a
xor a

2
engine/battle/move_effects/baton_pass.asm
View File

@@ -29,7 +29,7 @@ BattleCommand_BatonPass:
call ClearBox
ld b, SCGB_BATTLE_COLORS
call GetSGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call BatonPass_LinkPlayerSwitch
; Mobile link battles handle entrances differently

2
engine/battle/returntobattle_useball.asm
View File

@@ -16,4 +16,4 @@ _ReturnToBattle_UseBall:
call CloseWindow
call LoadStandardMenuHeader
call WaitBGMap
jp SetPalettes
jp SetDefaultBGPAndOBP

2
engine/battle/trainer_huds.asm
View File

@@ -252,7 +252,7 @@ _ShowLinkBattleParticipants:
farcall LinkBattle_TrainerHuds ; no need to farcall
ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
ld a, $e4
ldh [rOBP0], a
ret