pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Apply most of pokecrystal PR 1105

Browse Source
This commit is contained in:
xCrystal
2024-02-11 00:16:00 +01:00
parent 971c4aa2c7
commit 5c4d982702
74 changed files with 276 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
engine/battle/core.asm
View File

@@ -2655,7 +2655,7 @@ ForcePlayerMonChoice:
call LoadTilemapToTempTilemap
call WaitBGMap
call GetMemCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
xor a
ld c, a
ret
@@ -2674,7 +2674,7 @@ ForcePlayerMonChoice:
call _LoadHPBar
call CloseWindow
call GetMemCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call SendOutMonText
call NewBattleMonStatus
call BreakAttraction
@@ -2718,7 +2718,7 @@ JumpToPartyMenuAndPrintText:
farcall WritePartyMenuTilemap
farcall PlacePartyMenuText
call WaitBGMap
call SetPalettes
call SetDefaultBGPAndOBP
call DelayFrame
ret
@@ -2817,7 +2817,7 @@ LostBattle:
; Grayscale
ld b, CGB_BATTLE_GRAYSCALE
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
jr .end
.LostLinkBattle:
@@ -4845,7 +4845,7 @@ BattleMenu_Pack:
and BATTLERESULT_BITMASK
ld [wBattleResult], a ; WIN
call ClearMenuAndWindowData
call SetPalettes
call SetDefaultBGPAndOBP
scf
ret
@@ -4891,7 +4891,7 @@ BattleMenuPKMN_Loop:
call CloseWindow
call LoadTilemapToTempTilemap
call GetMemCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
jp BattleMenu
.GetMenu:
@@ -4971,7 +4971,7 @@ TryPlayerSwitch:
call _LoadHPBar
call CloseWindow
call GetMemCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
ld a, [wCurPartyMon]
ld [wCurBattleMon], a
PlayerSwitch:
@@ -6797,7 +6797,7 @@ FinishBattleAnim:
push hl
ld b, CGB_BATTLE_COLORS
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call DelayFrame
pop hl
pop de
@@ -8238,7 +8238,7 @@ _DisplayLinkRecord:
call WaitBGMap2
ld b, CGB_DIPLOMA
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
ld c, 8
call DelayFrames
call WaitPressAorB_BlinkCursor
@@ -8718,7 +8718,7 @@ InitBattleDisplay:
call HideSprites
ld b, CGB_BATTLE_COLORS
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
ld a, $90
ldh [hWY], a
xor a
@@ -8854,7 +8854,7 @@ BattleStartMessage:
farcall Battle_GetTrainerName
ld hl, WantsToBattleText
jr .PlaceBattleStartText
jr .PrintBattleStartText
.wild
call BattleCheckEnemyShininess
@@ -8894,18 +8894,18 @@ BattleStartMessage:
jr nz, .NotFishing
ld hl, HookedPokemonAttackedText
jr .PlaceBattleStartText
jr .PrintBattleStartText
.NotFishing:
ld hl, PokemonFellFromTreeText
cp BATTLETYPE_TREE
jr z, .PlaceBattleStartText
jr z, .PrintBattleStartText
ld hl, WildCelebiAppearedText
cp BATTLETYPE_CELEBI
jr z, .PlaceBattleStartText
jr z, .PrintBattleStartText
ld hl, WildPokemonAppearedText
.PlaceBattleStartText:
.PrintBattleStartText:
push hl
farcall BattleStart_TrainerHuds
pop hl

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

@@ -29,7 +29,7 @@ BattleCommand_BatonPass:
call ClearBox
ld b, CGB_BATTLE_COLORS
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call BatonPass_LinkPlayerSwitch
ld hl, PassedBattleMonEntrance

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, CGB_DIPLOMA
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
ld a, $e4
ldh [rOBP0], a
ret