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

4
engine/pokemon/bills_pc_top.asm
View File

@@ -48,7 +48,7 @@ _BillsPC:
ld a, $1
.loop
ld [wMenuCursorPosition], a
call SetPalettes
call SetDefaultBGPAndOBP
xor a
ld [wWhichIndexSet], a
ldh [hBGMapMode], a
@@ -245,7 +245,7 @@ ClearPCItemScreen:
lb bc, 4, 18
call Textbox1bpp
call WaitBGMap2
call SetPalettes ; load regular palettes?
call SetDefaultBGPAndOBP
ret
CopyBoxmonToTempMon:

2
engine/pokemon/breeding.asm
View File

@@ -649,7 +649,7 @@ Hatch_UpdateFrontpicBGMapCenter:
predef PlaceGraphic
pop af
call Hatch_LoadFrontpicPal
call SetPalettes
call SetDefaultBGPAndOBP
jp WaitBGMap
EggHatch_DoSpriteAnimFrame:

2
engine/pokemon/mail.asm
View File

@@ -490,7 +490,7 @@ MailboxPC:
farcall WritePartyMenuTilemap
farcall PlacePartyMenuText
call WaitBGMap
call SetPalettes
call SetDefaultBGPAndOBP
call DelayFrame
farcall PartyMenuSelect
jr c, .exit2

2
engine/pokemon/mail_2.asm
View File

@@ -40,7 +40,7 @@ ReadAnyMail:
ld a, [wCurMailIndex]
ld e, a
farcall LoadMailPalettes
call SetPalettes
call SetDefaultBGPAndOBP
xor a
ldh [hJoyPressed], a
call .loop

6
engine/pokemon/mon_menu.asm
View File

@@ -119,7 +119,7 @@ Party::
farcall WritePartyMenuTilemap
farcall PlacePartyMenuText
call WaitBGMap
call SetPalettes
call SetDefaultBGPAndOBP
call DelayFrame
farcall PartyMenuSelect
ret c ; if cancelled or pressed B
@@ -204,7 +204,7 @@ SwitchPartyMons:
call AddNTimes
ld [hl], "▷"
call WaitBGMap
call SetPalettes
call SetDefaultBGPAndOBP
call DelayFrame
farcall PartyMenuSelect
@@ -1181,7 +1181,7 @@ SetUpMoveList:
hlcoord 10, 4
predef ListMovePP
call WaitBGMap
call SetPalettes
call SetDefaultBGPAndOBP
ld a, [wNumMoves]
inc a
ld [w2DMenuNumRows], a

4
engine/pokemon/party_menu.asm
View File

@@ -5,7 +5,7 @@ SelectMonFromParty:
call ClearBGPalettes
call InitPartyMenuLayout
call WaitBGMap
call SetPalettes
call SetDefaultBGPAndOBP
call DelayFrame
call PartyMenuSelect
call ReturnToMapWithSpeechTextbox
@@ -20,7 +20,7 @@ SelectTradeOrDayCareMon:
call WaitBGMap
ld b, CGB_PARTY_MENU
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call DelayFrame
call PartyMenuSelect
call ReturnToMapWithSpeechTextbox

10
engine/pokemon/stats_screen.asm
View File

@@ -494,7 +494,7 @@ StatsScreen_LoadGFX:
ld hl, wStatsScreenFlags
bit 4, [hl]
jr nz, .place_frontpic
call SetPalettes
call SetDefaultBGPAndOBP
ret
.place_frontpic
@@ -795,16 +795,16 @@ StatsScreen_PlaceFrontpic:
.egg
call .AnimateEgg
call SetPalettes
call SetDefaultBGPAndOBP
ret
.no_cry
call .AnimateMon
call SetPalettes
call SetDefaultBGPAndOBP
ret
.cry
call SetPalettes
call SetDefaultBGPAndOBP
call .AnimateMon
ld a, [wCurPartySpecies]
call PlayMonCry2
@@ -995,7 +995,7 @@ endc
call PlaceString
ld hl, wStatsScreenFlags
set 5, [hl]
call SetPalettes ; pals
call SetDefaultBGPAndOBP
call DelayFrame
hlcoord 0, 0
call PrepMonFrontpic