pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -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

2
engine/events/bug_contest/display_stats.asm
View File

@@ -76,7 +76,7 @@ DisplayCaughtContestMonStats:
call WaitBGMap
ld b, CGB_DIPLOMA
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
ret
.Health:

2
engine/events/diploma.asm
View File

@@ -31,7 +31,7 @@ PlaceDiplomaOnScreen:
call WaitBGMap
ld b, CGB_DIPLOMA
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call DelayFrame
ret

6
engine/events/field_moves.asm
View File

@@ -27,14 +27,14 @@ UseFlashAuto::
ret
BlindingFlash:
farcall FadeOutPalettesToWhite
farcall FadeOutToWhite
ld hl, wStatusFlags
set STATUSFLAGS_FLASH_F, [hl]
farcall ReplaceTimeOfDayPals
farcall UpdateTimeOfDayPal
ld b, CGB_MAPPALS
call GetCGBLayout
farcall FadeInPalettesFromWhite
farcall FadeInFromWhite
ret
ShakeHeadbuttTree:
@@ -75,7 +75,7 @@ ShakeHeadbuttTree:
jr .loop
.done
call LoadScreenTilemapAndAttrmapPals
call LoadOverworldTilemapAndAttrmapPals
call WaitBGMap
xor a
ldh [hBGMapMode], a

10
engine/events/halloffame.asm
View File

@@ -39,7 +39,7 @@ RedCredits::
ld [wMusicFadeID + 1], a
ld a, 10
ld [wMusicFade], a
farcall FadeOutPalettesToWhite
farcall FadeOutToWhite
xor a
ld [wVramState], a
ldh [hMapAnims], a
@@ -59,7 +59,7 @@ HallOfFame_FadeOutMusic:
ld [wMusicFadeID + 1], a
ld a, 10
ld [wMusicFade], a
farcall FadeOutPalettesToWhite
farcall FadeOutToWhite
xor a
ld [wVramState], a
ldh [hMapAnims], a
@@ -252,7 +252,7 @@ AnimateHOFMonEntrance:
ldh [hBGMapMode], a
ld b, CGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call HOF_SlideBackpic
xor a
ld [wBoxAlignment], a
@@ -385,7 +385,7 @@ _HallOfFamePC:
call WaitBGMap
ld b, CGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
decoord 6, 5
ld c, ANIM_MON_HOF
predef HOF_AnimateFrontpic
@@ -535,7 +535,7 @@ HOF_AnimatePlayerPic:
ld [wCurPartySpecies], a
ld b, CGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
call HOF_SlideBackpic
xor a
ld [wBoxAlignment], a

4
engine/events/itemfinder.asm
View File

@@ -27,7 +27,7 @@ ItemFinder:
ret
.Script_FoundSomething:
reloadmappart
refreshmap
special UpdateTimePals
callasm .ItemfinderSound
writetext .ItemfinderItemNearbyText
@@ -35,7 +35,7 @@ ItemFinder:
end
.Script_FoundNothing:
reloadmappart
refreshmap
special UpdateTimePals
writetext .ItemfinderNopeText
closetext

44
engine/events/overworld.asm
View File

@@ -200,13 +200,13 @@ CheckMapForSomethingToCut:
ret
Script_CutFromMenu:
reloadmappart
refreshmap
special UpdateTimePals
Script_Cut:
callasm GetPartyNickname
writetext UseCutText
reloadmappart
refreshmap
callasm CutDownTreeOrGrass
closetext
end
@@ -220,7 +220,7 @@ CutDownTreeOrGrass:
ld [hl], a
xor a
ldh [hBGMapMode], a
call LoadScreenTilemapAndAttrmapPals
call LoadOverworldTilemapAndAttrmapPals
call UpdateSprites
call DelayFrame
ld a, [wCutWhirlpoolAnimationType]
@@ -234,11 +234,11 @@ CutDownTreeOrGrass:
ret
Script_CutAuto::
refreshscreen
reanchormap
callasm CutDownTreeObject
disappear LAST_TALKED
special SetObjectToRemainHidden
reloadmappart
refreshmap
end
CutDownTreeObject:
@@ -319,7 +319,7 @@ UseFlash:
jp QueueScript
Script_UseFlash:
reloadmappart
refreshmap
special UpdateTimePals
writetext UseFlashTextScript
callasm BlindingFlash
@@ -624,7 +624,7 @@ FlyFunction:
ret
.FlyScript:
reloadmappart
refreshmap
callasm HideSprites
special UpdateTimePals
callasm FlyFromAnim
@@ -696,7 +696,7 @@ Script_WaterfallAuto::
step_end
Script_WaterfallFromMenu:
reloadmappart
refreshmap
special UpdateTimePals
Script_UsedWaterfall:
@@ -865,13 +865,13 @@ EscapeRopeOrDig:
text_end
.UsedEscapeRopeScript:
reloadmappart
refreshmap
special UpdateTimePals
writetext .UseEscapeRopeText
sjump .UsedDigOrEscapeRopeScript
.UsedDigScript:
reloadmappart
refreshmap
special UpdateTimePals
writetext .UseDigText
@@ -957,11 +957,11 @@ TeleportFunction:
text_end
.TeleportScript:
reloadmappart
refreshmap
special UpdateTimePals
writetext .TeleportReturnText
pause 60
reloadmappart
refreshmap
closetext
playsound SFX_WARP_TO
applymovement PLAYER, .TeleportFrom
@@ -1027,7 +1027,7 @@ SetStrengthFlag:
ret
Script_StrengthFromMenu:
reloadmappart
refreshmap
special UpdateTimePals
Script_UsedStrength:
@@ -1186,13 +1186,13 @@ TryWhirlpoolMenu:
ret
Script_WhirlpoolFromMenu:
reloadmappart
refreshmap
special UpdateTimePals
Script_UsedWhirlpool:
callasm GetPartyNickname
writetext UseWhirlpoolText
reloadmappart
refreshmap
callasm DisappearWhirlpool
closetext
end
@@ -1206,7 +1206,7 @@ DisappearWhirlpool:
ld [hl], a
xor a
ldh [hBGMapMode], a
call LoadScreenTilemapAndAttrmapPals
call LoadOverworldTilemapAndAttrmapPals
ld a, [wCutWhirlpoolAnimationType]
ld e, a
farcall PlayWhirlpoolSound
@@ -1285,14 +1285,14 @@ HeadbuttNothingText:
text_end
HeadbuttFromMenuScript:
reloadmappart
refreshmap
special UpdateTimePals
HeadbuttScript:
callasm GetPartyNickname
writetext UseHeadbuttText
reloadmappart
refreshmap
callasm ShakeHeadbuttTree
callasm TreeMonEncounter
@@ -1382,7 +1382,7 @@ GetFacingObject:
ret
RockSmashFromMenuScript:
reloadmappart
refreshmap
special UpdateTimePals
RockSmashScript:
@@ -1618,7 +1618,7 @@ Fishing_CheckFacingUp:
ret
Script_FishCastRod:
reloadmappart
refreshmap
loadmem hBGMapMode, $0
special UpdateTimePals
loademote EMOTE_ROD
@@ -1735,7 +1735,7 @@ BikeFunction:
ret
Script_GetOnBike:
reloadmappart
refreshmap
special UpdateTimePals
loadvar VAR_MOVEMENT, PLAYER_BIKE
writetext GotOnBikeText
@@ -1751,7 +1751,7 @@ Script_GetOnBike_Register:
end
Script_GetOffBike:
reloadmappart
refreshmap
special UpdateTimePals
loadvar VAR_MOVEMENT, PLAYER_NORMAL
writetext GotOffBikeText

2
engine/events/pokecenter_pc.asm
View File

@@ -212,7 +212,7 @@ _PlayersHousePC:
call _PlayersPC
and a
jr nz, .changed_deco_tiles
call LoadScreenTilemapAndAttrmapPals
call LoadOverworldTilemapAndAttrmapPals
call ApplyTilemap
call UpdateSprites
call PC_PlayShutdownSound

2
engine/events/pokepic.asm
View File

@@ -35,7 +35,7 @@ ClosePokepic::
call GetMemCGBLayout
xor a
ldh [hBGMapMode], a
call LoadScreenTilemapAndAttrmapPals
call LoadOverworldTilemapAndAttrmapPals
call ApplyTilemap
call UpdateSprites
call LoadStandardFont

2
engine/events/print_unown.asm
View File

@@ -64,7 +64,7 @@ _UnownPrinter:
ld b, CGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
.joy_loop
call JoyTextDelay

14
engine/events/sacred_ash.asm
View File

@@ -47,14 +47,14 @@ CheckAnyFaintedMon:
SacredAshScript:
special HealParty
reloadmappart
refreshmap
playsound SFX_WARP_TO
special FadeOutPalettesToWhite
special FadeInPalettesFromWhite
special FadeOutPalettesToWhite
special FadeInPalettesFromWhite
special FadeOutPalettesToWhite
special FadeInPalettesFromWhite
special FadeOutToWhite
special FadeInFromWhite
special FadeOutToWhite
special FadeInFromWhite
special FadeOutToWhite
special FadeInFromWhite
waitsfx
writetext .UseSacredAshText
playsound SFX_CAUGHT_MON

4
engine/events/sweet_scent.asm
View File

@@ -6,7 +6,7 @@ SweetScentFromMenu:
ret
.SweetScent:
reloadmappart
refreshmap
special UpdateTimePals
callasm GetPartyNickname
writetext UseSweetScentText
@@ -30,7 +30,7 @@ SweetScentNothing:
end
SweetScentEncounter:
farcall CanEncounterWildMonInThisTile
farcall CanEncounterWildMon
jr nc, .no_battle
ld hl, wStatusFlags2
bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]

6
engine/events/whiteout.asm
View File

@@ -3,13 +3,13 @@ Script_BattleWhiteout::
sjump Script_Whiteout
OverworldWhiteoutScript::
refreshscreen
reanchormap
callasm OverworldBGMap
Script_Whiteout:
writetext .WhitedOutText
waitbutton
special FadeOutPalettesToWhite
special FadeOutToWhite
pause 40
special HealParty
checkflag ENGINE_BUG_CONTEST_TIMER
@@ -45,7 +45,7 @@ OverworldBGMap:
BattleBGMap:
ld b, CGB_BATTLE_GRAYSCALE
call GetCGBLayout
call SetPalettes
call SetDefaultBGPAndOBP
ret
HalveCoins: