diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 5d18ce3fb52..84c374f7d84 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -29,7 +29,7 @@ DEF MAP_LENGTH EQU _RS const DUNGEON DEF NUM_ENVIRONMENTS EQU const_value - 1 -; map palettes (wEnvironment) +; map palettes (wMapTimeOfDay) const_def const PALETTE_AUTO const PALETTE_DAY diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 9a80a8c9dbb..7d48938a2c0 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -56,7 +56,7 @@ DEF NUM_FRAMES EQU const_value ; wTextboxFlags:: const_def const FAST_TEXT_DELAY_F ; 0 - const NO_TEXT_DELAY_F ; 1 + const TEXT_DELAY_F ; 1 ; wGBPrinterBrightness:: DEF GBPRINTER_LIGHTEST EQU $00 diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm index 71e6a8ffd0c..d6c3a1db92b 100644 --- a/data/events/special_pointers.asm +++ b/data/events/special_pointers.asm @@ -57,11 +57,11 @@ SpecialsPointers:: add_special CardFlip add_special UnusedMemoryGame ; unused add_special ClearBGPalettesBufferScreen ; unused - add_special FadeOutPalettes + add_special FadeOutToWhite add_special BattleTowerFade - add_special FadeBlackQuickly - add_special FadeInPalettes - add_special FadeInQuickly + add_special FadeOutToBlack + add_special FadeInFromWhite + add_special FadeInFromBlack add_special ReloadSpritesNoPalettes ; bank 0 add_special ClearBGPalettes ; bank 0 add_special UpdateTimePals ; bank 0 diff --git a/data/maps/setup_script_pointers.asm b/data/maps/setup_script_pointers.asm index b32be8d8f3b..18b4ec0ae11 100644 --- a/data/maps/setup_script_pointers.asm +++ b/data/maps/setup_script_pointers.asm @@ -33,8 +33,8 @@ MapSetupCommands: add_mapsetup LoadMapAttributes ; 1a add_mapsetup LoadMapAttributes_SkipObjects ; 1b add_mapsetup ClearBGPalettes ; 1c - add_mapsetup FadeOutPalettes ; 1d - add_mapsetup FadeInPalettes ; 1e + add_mapsetup FadeOutToWhite ; 1d + add_mapsetup FadeInFromWhite ; 1e add_mapsetup GetMapScreenCoords ; 1f add_mapsetup GetWarpDestCoords ; 20 add_mapsetup SpawnInFacingDown ; 21 diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm index 5ad24be6ef3..efa4fe584bc 100644 --- a/data/maps/setup_scripts.asm +++ b/data/maps/setup_scripts.asm @@ -23,7 +23,7 @@ ENDM MapSetupScript_Teleport: mapsetup ResetPlayerObjectAction MapSetupScript_Fly: - mapsetup FadeOutPalettes + mapsetup FadeOutToWhite mapsetup JumpRoamMons MapSetupScript_Warp: mapsetup DisableLCD @@ -45,7 +45,7 @@ MapSetupScript_Warp: mapsetup RefreshMapSprites mapsetup PlayMapMusicBike mapsetup FadeInToMusic - mapsetup FadeInPalettes + mapsetup FadeInFromWhite mapsetup ActivateMapAnims mapsetup LoadWildMonData db -1 ; end @@ -69,7 +69,7 @@ MapSetupScript_BadWarp: mapsetup SpawnInFacingDown mapsetup RefreshMapSprites mapsetup FadeToMapMusic - mapsetup FadeInPalettes + mapsetup FadeInFromWhite mapsetup ActivateMapAnims mapsetup LoadWildMonData db -1 ; end @@ -96,7 +96,7 @@ MapSetupScript_Connection: MapSetupScript_Fall: mapsetup ResetPlayerObjectAction MapSetupScript_Door: - mapsetup FadeOutPalettes + mapsetup FadeOutToWhite MapSetupScript_Train: mapsetup EnterMapWarp mapsetup LoadMapAttributes @@ -114,7 +114,7 @@ MapSetupScript_Train: mapsetup LoadMapPalettes mapsetup RefreshMapSprites mapsetup FadeToMapMusic - mapsetup FadeInPalettes + mapsetup FadeInFromWhite mapsetup ActivateMapAnims mapsetup LoadWildMonData mapsetup UpdateRoamMons @@ -133,7 +133,7 @@ MapSetupScript_ReloadMap: mapsetup LoadMapPalettes mapsetup RefreshMapSprites mapsetup ForceMapMusic - mapsetup FadeInPalettes + mapsetup FadeInFromWhite mapsetup ActivateMapAnims mapsetup LoadWildMonData db -1 ; end @@ -151,7 +151,7 @@ MapSetupScript_LinkReturn: mapsetup LoadMapPalettes mapsetup RefreshMapSprites mapsetup PlayMapMusicBike - mapsetup FadeInPalettes + mapsetup FadeInFromWhite mapsetup ActivateMapAnims mapsetup LoadWildMonData mapsetup EnableTextAcceleration @@ -172,7 +172,7 @@ MapSetupScript_Continue: mapsetup LoadMapPalettes mapsetup RefreshMapSprites mapsetup PlayMapMusicBike - mapsetup FadeInPalettes + mapsetup FadeInFromWhite mapsetup ActivateMapAnims mapsetup LoadWildMonData db -1 ; end diff --git a/engine/battle/core.asm b/engine/battle/core.asm index b6e916f9d6c..ecab9902ba4 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -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 diff --git a/engine/battle/move_effects/baton_pass.asm b/engine/battle/move_effects/baton_pass.asm index 29759f087d6..98a6c106b79 100644 --- a/engine/battle/move_effects/baton_pass.asm +++ b/engine/battle/move_effects/baton_pass.asm @@ -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 diff --git a/engine/battle/returntobattle_useball.asm b/engine/battle/returntobattle_useball.asm index fd138ae67ae..0b8ed0d63a9 100644 --- a/engine/battle/returntobattle_useball.asm +++ b/engine/battle/returntobattle_useball.asm @@ -16,4 +16,4 @@ _ReturnToBattle_UseBall: call CloseWindow call LoadStandardMenuHeader call WaitBGMap - jp SetPalettes + jp SetDefaultBGPAndOBP diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index 2be4d64bbfe..74d144deedf 100644 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -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 diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm index 0ad6426d7a0..99473c1b601 100644 --- a/engine/debug/color_picker.asm +++ b/engine/debug/color_picker.asm @@ -1081,7 +1081,7 @@ TilesetColorPicker: ; unreferenced ld [wDebugTilesetCurColor], a ldh [hMapAnims], a call ClearSprites - call OverworldTextModeSwitch + call LoadOverworldTilemapAndAttrmapPals call WaitBGMap2 xor a ldh [hBGMapMode], a diff --git a/engine/debug/debug_room.asm b/engine/debug/debug_room.asm index 245f31d9b83..56108c1728e 100644 --- a/engine/debug/debug_room.asm +++ b/engine/debug/debug_room.asm @@ -602,7 +602,7 @@ DebugRoom_EditPagedValues: call WaitBGMap ld b, SCGB_DIPLOMA call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP .resume call DelayFrame call JoyTextDelay diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index a1a8eeeefc1..2b4627e8260 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -608,7 +608,7 @@ Function1704e1: bit 7, a jr nz, .done call .DoJumptable - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld jr .loop .done @@ -654,7 +654,7 @@ Function1704e1: jr .NextJumptableFunction .Jumptable_1: - call SetPalettes + call SetDefaultBGPAndOBP call .NextJumptableFunction .Jumptable_2: diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 220eeb4e434..8cbe040e046 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -76,7 +76,7 @@ DisplayCaughtContestMonStats: call WaitBGMap ld b, SCGB_DIPLOMA call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP ret .Health: diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm index 814c9644cc7..b8731fecca7 100644 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm @@ -31,7 +31,7 @@ PlaceDiplomaOnScreen: call WaitBGMap ld b, SCGB_DIPLOMA call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame ret diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 88fcfcbb0a6..f7f6dea248f 100644 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -10,7 +10,7 @@ PlayWhirlpoolSound: ret BlindingFlash: - farcall FadeOutPalettes + farcall FadeOutToWhite ld hl, wStatusFlags set STATUSFLAGS_FLASH_F, [hl] farcall ReplaceTimeOfDayPals @@ -18,7 +18,7 @@ BlindingFlash: ld b, SCGB_MAPPALS call GetSGBLayout farcall LoadOW_BGPal7 - farcall FadeInPalettes + farcall FadeInFromWhite ret ShakeHeadbuttTree: @@ -59,7 +59,7 @@ ShakeHeadbuttTree: jr .loop .done - call OverworldTextModeSwitch + call LoadOverworldTilemapAndAttrmapPals call WaitBGMap xor a ldh [hBGMapMode], a diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 6a148d96303..d2c687b8aa1 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -41,7 +41,7 @@ RedCredits:: ld [wMusicFadeID + 1], a ld a, 10 ld [wMusicFade], a - farcall FadeOutPalettes + farcall FadeOutToWhite xor a ld [wVramState], a ldh [hMapAnims], a @@ -63,7 +63,7 @@ HallOfFame_FadeOutMusic: ld [wMusicFadeID + 1], a ld a, 10 ld [wMusicFade], a - farcall FadeOutPalettes + farcall FadeOutToWhite xor a ld [wVramState], a ldh [hMapAnims], a @@ -256,7 +256,7 @@ AnimateHOFMonEntrance: ldh [hBGMapMode], a ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP call HOF_SlideBackpic xor a ld [wBoxAlignment], a @@ -389,7 +389,7 @@ _HallOfFamePC: call WaitBGMap ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP decoord 6, 5 ld c, ANIM_MON_HOF predef HOF_AnimateFrontpic @@ -543,7 +543,7 @@ HOF_AnimatePlayerPic: ld [wCurPartySpecies], a ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP call HOF_SlideBackpic xor a ld [wBoxAlignment], a diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 8fa37c572a6..a5b309b39bd 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -220,7 +220,7 @@ CutDownTreeOrGrass: ld [hl], a xor a ldh [hBGMapMode], a - call OverworldTextModeSwitch + call LoadOverworldTilemapAndAttrmapPals call UpdateSprites call DelayFrame ld a, [wCutWhirlpoolAnimationType] @@ -1179,7 +1179,7 @@ DisappearWhirlpool: ld [hl], a xor a ldh [hBGMapMode], a - call OverworldTextModeSwitch + call LoadOverworldTilemapAndAttrmapPals ld a, [wCutWhirlpoolAnimationType] ld e, a farcall PlayWhirlpoolSound diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index d2e6ca83faa..9ffb4361050 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -212,7 +212,7 @@ _PlayersHousePC: call _PlayersPC and a jr nz, .changed_deco_tiles - call OverworldTextModeSwitch + call LoadOverworldTilemapAndAttrmapPals call ApplyTilemap call UpdateSprites call PC_PlayShutdownSound diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm index 523c5df5e2d..7050ef1c70f 100644 --- a/engine/events/pokepic.asm +++ b/engine/events/pokepic.asm @@ -35,7 +35,7 @@ ClosePokepic:: call GetMemSGBLayout xor a ldh [hBGMapMode], a - call OverworldTextModeSwitch + call LoadOverworldTilemapAndAttrmapPals call ApplyTilemap call UpdateSprites call LoadStandardFont diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index d9b99e807b0..22d88062fd9 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -64,7 +64,7 @@ _UnownPrinter: ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP .joy_loop call JoyTextDelay diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index d105b2fb746..83b16d60001 100644 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm @@ -49,12 +49,12 @@ SacredAshScript: special HealParty reloadmappart playsound SFX_WARP_TO - special FadeOutPalettes - special FadeInPalettes - special FadeOutPalettes - special FadeInPalettes - special FadeOutPalettes - special FadeInPalettes + special FadeOutToWhite + special FadeInFromWhite + special FadeOutToWhite + special FadeInFromWhite + special FadeOutToWhite + special FadeInFromWhite waitsfx writetext .UseSacredAshText playsound SFX_CAUGHT_MON diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index ceda90b1133..05a6afc3ead 100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -30,7 +30,7 @@ SweetScentNothing: end SweetScentEncounter: - farcall CanUseSweetScent + farcall CanEncounterWildMonInThisTile jr nc, .no_battle ld hl, wStatusFlags2 bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 02f60f0e0f1..4f5325e00b0 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -9,7 +9,7 @@ OverworldWhiteoutScript:: Script_Whiteout: writetext .WhitedOutText waitbutton - special FadeOutPalettes + special FadeOutToWhite pause 40 special HealParty checkflag ENGINE_BUG_CONTEST_TIMER @@ -39,7 +39,7 @@ OverworldBGMap: BattleBGMap: ld b, SCGB_BATTLE_GRAYSCALE call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP ret HalveMoney: diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 4af157c8809..e8ea24e162b 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -29,6 +29,7 @@ LoadSGBLayoutCGB: ret CGBLayoutJumptable: +; entries correspond to SCGB_* constants (see constants/scgb_constants.asm) table_width 2, CGBLayoutJumptable dw _CGB_BattleGrayscale dw _CGB_BattleColors diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 203ba3aa52d..cd509c76967 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -1200,7 +1200,7 @@ LoadMapPals: ; Which palette group is based on whether we're outside or inside ld a, [wEnvironment] - and 7 + maskbits NUM_ENVIRONMENTS + 1 ld e, a ld d, 0 ld hl, EnvironmentColorsPointers diff --git a/engine/gfx/dma_transfer.asm b/engine/gfx/dma_transfer.asm index 682302f9635..c77cda100c3 100644 --- a/engine/gfx/dma_transfer.asm +++ b/engine/gfx/dma_transfer.asm @@ -47,7 +47,7 @@ HDMATransferAttrmapToWRAMBank3: call HDMATransferToWRAMBank3 ret -ReloadMapPart:: +HDMATransferTilemapAndAttrmap_Overworld:: ld hl, .Function jp CallInSafeGFXMode @@ -66,19 +66,19 @@ ReloadMapPart:: ld a, $1 ldh [rVBK], a ld hl, wScratchAttrmap - call HDMATransfer_Wait127Scanlines_toBGMap + call HDMATransfer_WaitForScanline128_toBGMap ld a, $0 ldh [rVBK], a ld hl, wScratchTilemap - call HDMATransfer_Wait127Scanlines_toBGMap + call HDMATransfer_WaitForScanline128_toBGMap pop af ldh [rVBK], a ei ret -Mobile_ReloadMapPart: - ld hl, ReloadMapPart ; useless +Mobile_HDMATransferTilemapAndAttrmap_Overworld: + ld hl, HDMATransferTilemapAndAttrmap_Overworld ; useless ld hl, .Function jp CallInSafeGFXMode @@ -144,8 +144,7 @@ Function1040fb: ; unreferenced call HDMATransferToWRAMBank3 ret -OpenAndCloseMenu_HDMATransferTilemapAndAttrmap:: -; OpenText +_HDMATransferTilemapAndAttrmap_Menu:: ld hl, .Function jp CallInSafeGFXMode @@ -167,17 +166,17 @@ OpenAndCloseMenu_HDMATransferTilemapAndAttrmap:: ld a, $1 ldh [rVBK], a ld hl, wScratchAttrmap - call HDMATransfer_Wait123Scanlines_toBGMap + call HDMATransfer_WaitForScanline124_toBGMap ld a, $0 ldh [rVBK], a ld hl, wScratchTilemap - call HDMATransfer_Wait123Scanlines_toBGMap + call HDMATransfer_WaitForScanline124_toBGMap pop af ldh [rVBK], a ei ret -Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap: +Mobile_HDMATransferTilemapAndAttrmap_Menu: ld hl, .Function jp CallInSafeGFXMode @@ -196,11 +195,11 @@ Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap: ld a, $1 ldh [rVBK], a ld hl, wScratchAttrmap - call HDMATransfer_Wait127Scanlines_toBGMap + call HDMATransfer_WaitForScanline128_toBGMap ld a, $0 ldh [rVBK], a ld hl, wScratchTilemap - call HDMATransfer_Wait127Scanlines_toBGMap + call HDMATransfer_WaitForScanline128_toBGMap ret CallInSafeGFXMode: @@ -246,7 +245,7 @@ WaitDMATransfer: jr nz, .loop ret -HDMATransfer_Wait127Scanlines_toBGMap: +HDMATransfer_WaitForScanline128_toBGMap: ; HDMA transfer from hl to [hBGMapAddress] ; hBGMapAddress -> de ; 2 * SCREEN_HEIGHT -> c @@ -255,9 +254,9 @@ HDMATransfer_Wait127Scanlines_toBGMap: ldh a, [hBGMapAddress] ld e, a ld c, 2 * SCREEN_HEIGHT - jr HDMATransfer_Wait127Scanlines + jr HDMATransfer_WaitForScanline128 -HDMATransfer_Wait123Scanlines_toBGMap: +HDMATransfer_WaitForScanline124_toBGMap: ; HDMA transfer from hl to [hBGMapAddress] ; hBGMapAddress -> de ; 2 * SCREEN_HEIGHT -> c @@ -267,7 +266,7 @@ HDMATransfer_Wait123Scanlines_toBGMap: ldh a, [hBGMapAddress] ld e, a ld c, 2 * SCREEN_HEIGHT - jr HDMATransfer_Wait123Scanlines + jr HDMATransfer_WaitForScanline124 HDMATransfer_NoDI: ; HDMA transfer from hl to [hBGMapAddress] @@ -328,11 +327,11 @@ HDMATransfer_NoDI: res 7, [hl] ret -HDMATransfer_Wait123Scanlines: +HDMATransfer_WaitForScanline124: ld b, $7b jr _continue_HDMATransfer -HDMATransfer_Wait127Scanlines: +HDMATransfer_WaitForScanline128: ld b, $7f _continue_HDMATransfer: ; a lot of waiting around for hardware registers @@ -487,7 +486,7 @@ HDMATransfer2bpp:: ld d, h ld e, l ld hl, wScratchTilemap - call HDMATransfer_Wait127Scanlines + call HDMATransfer_WaitForScanline128 ; restore the previous bank pop af @@ -552,7 +551,7 @@ HDMATransfer1bpp:: ld d, h ld e, l ld hl, wScratchTilemap - call HDMATransfer_Wait127Scanlines + call HDMATransfer_WaitForScanline128 pop af ldh [rSVBK], a @@ -574,13 +573,13 @@ HDMATransfer_OnlyTopFourRows: ld c, $8 ld hl, wScratchTilemap + $80 debgcoord 0, 0, vBGMap1 - call HDMATransfer_Wait127Scanlines + call HDMATransfer_WaitForScanline128 ld a, $0 ldh [rVBK], a ld c, $8 ld hl, wScratchTilemap debgcoord 0, 0, vBGMap1 - call HDMATransfer_Wait127Scanlines + call HDMATransfer_WaitForScanline128 ret .Copy: diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index 69615a61682..16ca46ee58a 100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -22,6 +22,7 @@ LoadSGBLayout: jp hl SGBLayoutJumptable: +; entries correspond to SCGB_* constants (see constants/scgb_constants.asm) table_width 2, SGBLayoutJumptable dw .SGB_BattleGrayscale dw .SGB_BattleColors diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index d04851e60c0..1e2582717c6 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1726,7 +1726,7 @@ ChooseMonToUseItemOn: farcall WritePartyMenuTilemap farcall PrintPartyMenuText call WaitBGMap - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame farcall PartyMenuSelect ret @@ -1743,7 +1743,7 @@ ItemActionText: farcall WritePartyMenuTilemap farcall PrintPartyMenuActionText call WaitBGMap - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame pop bc pop de diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 4a4b694dd6b..224d70b02d1 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -574,7 +574,7 @@ GiveItem: farcall WritePartyMenuTilemap farcall PrintPartyMenuText call WaitBGMap - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame farcall PartyMenuSelect jr c, .finish @@ -1437,7 +1437,7 @@ Pack_InitColors: call WaitBGMap ld b, SCGB_PACKPALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame ret diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index d4d7d7bb305..82cd00b737b 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -86,7 +86,7 @@ ChooseMonToLearnTMHM_NoRefresh: farcall WritePartyMenuTilemap farcall PrintPartyMenuText call WaitBGMap - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame farcall PartyMenuSelect push af diff --git a/engine/link/link.asm b/engine/link/link.asm index 6c4e725fd57..9178e029290 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -2085,7 +2085,7 @@ LoadTradeScreenBorderGFX: SetTradeRoomBGPals: farcall LoadTradeRoomBGPals ; just a nested farcall; so wasteful - call SetPalettes + call SetDefaultBGPAndOBP ret PlaceTradeScreenTextbox: ; unreferenced diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm index 101a3dc70df..cf629036b20 100644 --- a/engine/link/link_trade.asm +++ b/engine/link/link_trade.asm @@ -27,7 +27,7 @@ TestMobileTradeBorderTilemap: ; unreferenced farcall LoadMobileTradeBorderTilemap ; useless to farcall ld b, SCGB_DIPLOMA call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP call WaitBGMap call JoyWaitAorB call Call_ExitMenu diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index e12f27a1f07..d00141b61a2 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -66,7 +66,7 @@ endc call WaitBGMap ld b, SCGB_DIPLOMA call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP pop de hlcoord 2, 8 @@ -1554,7 +1554,7 @@ InitMysteryGiftLayout: call WaitBGMap ld b, SCGB_MYSTERY_GIFT call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP ret .Load5GFX: @@ -1726,7 +1726,7 @@ endr call WaitBGMap ld b, SCGB_DIPLOMA call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP ret StageDataForNameCard: @@ -1851,7 +1851,7 @@ InitNameCardLayout: call WaitBGMap ld b, CRYSTAL_CGB_NAME_CARD farcall GetCrystalCGBLayout - jp SetPalettes + jp SetDefaultBGPAndOBP .Load6Row: ld b, 6 diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm index 4bf8cc2f03f..bd916ba1527 100644 --- a/engine/menus/init_gender.asm +++ b/engine/menus/init_gender.asm @@ -25,7 +25,7 @@ InitGender: call LoadGenderScreenPal call LoadGenderScreenLightBlueTile call WaitBGMap2 - call SetPalettes + call SetDefaultBGPAndOBP ld hl, AreYouABoyOrAreYouAGirlText call PrintText ld hl, .MenuHeader diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 63173ec0ccb..2db69976175 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -30,7 +30,7 @@ MainMenu: call ClearTilemapEtc ld b, SCGB_DIPLOMA call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP ld hl, wGameTimerPaused res GAME_TIMER_PAUSED_F, [hl] call MainMenu_GetWhichMenu diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index 96b6bdfbcef..a3c25e97afb 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -703,7 +703,7 @@ RestoreOverworldMapTiles: ; unreferenced ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyBytes call CloseSRAM - call OverworldTextModeSwitch + call LoadOverworldTilemapAndAttrmapPals xor a ; sScratch call OpenSRAM ld hl, sScratch diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index dd8cd2c25b9..48a8d456c96 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -55,7 +55,7 @@ NamingScreen: call .GetNamingScreenSetup call WaitBGMap call WaitTop - call SetPalettes + call SetDefaultBGPAndOBP call NamingScreen_InitNameEntry ret diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm index a25638c605b..63d546533a5 100644 --- a/engine/menus/options_menu.asm +++ b/engine/menus/options_menu.asm @@ -48,7 +48,7 @@ _Option: call WaitBGMap ld b, SCGB_DIPLOMA call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP .joypad_loop call JoyTextDelay diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index 25d3db99212..7946308c1fb 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -33,7 +33,7 @@ StartMenu:: call DrawVariableLengthMenuBox call .DrawBugContestStatusBox call SafeUpdateSprites - call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + call HDMATransferTilemapAndAttrmap_Menu farcall LoadFonts_NoOAMUpdate call .DrawBugContestStatus call UpdateTimePals @@ -514,7 +514,7 @@ StartMenu_Pokemon: farcall WritePartyMenuTilemap farcall PrintPartyMenuText call WaitBGMap - call SetPalettes ; load regular palettes? + call SetDefaultBGPAndOBP call DelayFrame farcall PartyMenuSelect jr c, .return ; if cancelled or pressed B diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 8b79c6d0eda..aaea1f7fd57 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -68,7 +68,7 @@ TrainerCard: call WaitBGMap ld b, SCGB_TRAINER_CARD call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP call WaitBGMap ld hl, wJumptableIndex xor a ; TRAINERCARDSTATE_PAGE1_LOADGFX diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 304bd061e28..b3ef3ec416d 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -72,7 +72,7 @@ Credits:: ldh [hLCDCPointer], a call GetCreditsPalette - call SetPalettes + call SetDefaultBGPAndOBP ; BUG: Credits sequence changes move selection menu behavior (see docs/bugs_and_glitches.md) ldh a, [hVBlank] push af @@ -321,7 +321,7 @@ ParseCredits: xor a ld [wCreditsBorderFrame], a ; frame call GetCreditsPalette - call SetPalettes ; update hw pal registers + call SetDefaultBGPAndOBP ; update hw pal registers jr .loop .clear diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index 11164ed79dc..b6a7d1ac078 100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm @@ -20,7 +20,7 @@ InitDisplayForHallOfFame: ld hl, .SavingRecordText call PrintText call WaitBGMap2 - call SetPalettes + call SetDefaultBGPAndOBP ret .SavingRecordText: @@ -56,7 +56,7 @@ InitDisplayForRedCredits: ldh [hSCX], a call EnableLCD call WaitBGMap2 - call SetPalettes + call SetDefaultBGPAndOBP ret ResetDisplayBetweenHallOfFameMons: diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm index f592e0a4e46..a9a60ab695f 100644 --- a/engine/movie/splash.asm +++ b/engine/movie/splash.asm @@ -19,7 +19,7 @@ SplashScreen: call WaitBGMap ld b, SCGB_GAMEFREAK_LOGO call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP ld c, 10 call DelayFrames diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index 7b669e660bf..fecb9494588 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -1131,11 +1131,9 @@ TryTileCollisionEvent:: ret RandomEncounter:: -; Random encounter - call CheckWildEncounterCooldown jr c, .nope - call CanUseSweetScent + call CanEncounterWildMonInThisTile jr nc, .nope ld hl, wStatusFlags2 bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] @@ -1175,7 +1173,7 @@ WildBattleScript: reloadmapafterbattle end -CanUseSweetScent:: +CanEncounterWildMonInThisTile:: ld hl, wStatusFlags bit STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl] jr nz, .no diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm index 4a2e403091c..efd6cc90b18 100644 --- a/engine/overworld/init_map.asm +++ b/engine/overworld/init_map.asm @@ -27,10 +27,10 @@ ReanchorBGMap_NoOAMUpdate:: ldh [hBGMapMode], a ld a, $90 ldh [hWY], a - call OverworldTextModeSwitch + call LoadOverworldTilemapAndAttrmapPals ld a, HIGH(vBGMap1) call .LoadBGMapAddrIntoHRAM - call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + call HDMATransferTilemapAndAttrmap_Menu farcall LoadOW_BGPal7 farcall ApplyPals ld a, TRUE diff --git a/engine/overworld/load_map_part.asm b/engine/overworld/load_map_part.asm index 88a0b53cbe1..d9bdbd7cc39 100644 --- a/engine/overworld/load_map_part.asm +++ b/engine/overworld/load_map_part.asm @@ -1,4 +1,6 @@ -_LoadMapPart:: +_LoadOverworldTilemap:: +; From the metatile-based 24x20 map in wSurroundingTiles, +; load the corresponding 20x18 tiles to wTilemap. ld hl, wSurroundingTiles ld a, [wPlayerMetatileY] and a diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index dec66f6adae..1ee4cc79a8f 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -13,7 +13,7 @@ BlankScreen: ld a, $7 call ByteFill call WaitBGMap2 - call SetPalettes + call SetDefaultBGPAndOBP ret SpawnPlayer: diff --git a/engine/overworld/player_step.asm b/engine/overworld/player_step.asm index 7a65bb1f576..efc9bc9014b 100644 --- a/engine/overworld/player_step.asm +++ b/engine/overworld/player_step.asm @@ -125,25 +125,25 @@ UpdateOverworldMap: .step_down call .ScrollOverworldMapDown - call LoadMapPart + call LoadOverworldTilemap call ScrollMapDown ret .step_up call .ScrollOverworldMapUp - call LoadMapPart + call LoadOverworldTilemap call ScrollMapUp ret .step_left call .ScrollOverworldMapLeft - call LoadMapPart + call LoadOverworldTilemap call ScrollMapLeft ret .step_right call .ScrollOverworldMapRight - call LoadMapPart + call LoadOverworldTilemap call ScrollMapRight ret diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 9f1ebbaf1bf..9219d50dc9d 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -939,7 +939,7 @@ ApplyObjectFacing: ret .DisableTextTiles: - call LoadMapPart + call LoadOverworldTilemap hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT .loop @@ -2160,9 +2160,9 @@ Script_changeblock: Script_reloadmappart:: xor a ldh [hBGMapMode], a - call OverworldTextModeSwitch + call LoadOverworldTilemapAndAttrmapPals call GetMovementPermissions - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call UpdateSprites ret @@ -2206,7 +2206,7 @@ UnusedClosetextScript: ; unreferenced closetext Script_closetext: - call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + call HDMATransferTilemapAndAttrmap_Menu call CloseText ret diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index 89d8437a18e..4a58e144e47 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -232,7 +232,7 @@ LoadMapTimeOfDay: ld [wSpriteUpdatesEnabled], a farcall ReplaceTimeOfDayPals farcall UpdateTimeOfDayPal - call OverworldTextModeSwitch + call LoadOverworldTilemapAndAttrmapPals call .ClearBGMap call .PushAttrmap ret diff --git a/engine/pokedex/new_pokedex_entry.asm b/engine/pokedex/new_pokedex_entry.asm index 844253c52df..cdd427b0ec0 100644 --- a/engine/pokedex/new_pokedex_entry.asm +++ b/engine/pokedex/new_pokedex_entry.asm @@ -46,5 +46,5 @@ NewPokedexEntry: ld [wTempMonDVs + 1], a ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP ret diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 05577bb301f..2d5b642be80 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -103,7 +103,7 @@ PokeGear: call InitPokegearTilemap ld b, SCGB_POKEGEAR_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP ldh a, [hCGB] and a ret z @@ -1796,7 +1796,7 @@ _TownMap: ld [wTownMapCursorObjectPointer + 1], a ld b, SCGB_POKEGEAR_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP ldh a, [hCGB] and a jr z, .dmg @@ -2042,7 +2042,7 @@ _FlyMap: call Pokegear_DummyFunction ld b, SCGB_POKEGEAR_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP .loop call JoyTextDelay ld hl, hJoyPressed @@ -2363,7 +2363,7 @@ Pokedex_GetArea: call TownMapBGUpdate ld b, SCGB_POKEGEAR_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP xor a ldh [hBGMapMode], a xor a ; JOHTO_REGION @@ -2827,7 +2827,7 @@ EntireFlyMap: ; unreferenced ld [wTownMapCursorCoordinates + 1], a ld b, SCGB_POKEGEAR_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP .loop call JoyTextDelay ld hl, hJoyPressed diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index fa5833aef94..27707c0d845 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -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 Textbox call WaitBGMap2 - call SetPalettes ; load regular palettes? + call SetDefaultBGPAndOBP ret CopyBoxmonToTempMon: diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index f778dba44a5..40796f47701 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -659,7 +659,7 @@ Hatch_UpdateFrontpicBGMapCenter: predef PlaceGraphic pop af call Hatch_LoadFrontpicPal - call SetPalettes + call SetDefaultBGPAndOBP jp WaitBGMap EggHatch_DoAnimFrame: diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index 55e6b03fb0a..cf1e02dd1e2 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -490,7 +490,7 @@ MailboxPC: farcall WritePartyMenuTilemap farcall PrintPartyMenuText call WaitBGMap - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame farcall PartyMenuSelect jr c, .exit2 diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm index 02241153516..3321ec51d37 100644 --- a/engine/pokemon/mail_2.asm +++ b/engine/pokemon/mail_2.asm @@ -53,7 +53,7 @@ ReadAnyMail: ld a, [wCurMailIndex] ld e, a farcall LoadMailPalettes - call SetPalettes + call SetDefaultBGPAndOBP xor a ldh [hJoyPressed], a call .loop diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 2607cdf5813..e88ebbe40e1 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -173,7 +173,7 @@ SwitchPartyMons: call AddNTimes ld [hl], "▷" call WaitBGMap - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame farcall PartyMenuSelect @@ -1151,7 +1151,7 @@ SetUpMoveList: hlcoord 10, 4 predef ListMovePP call WaitBGMap - call SetPalettes + call SetDefaultBGPAndOBP ld a, [wNumMoves] inc a ld [w2DMenuNumRows], a diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 00bfa9b4093..48e1975d5b8 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -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, SCGB_PARTY_MENU call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame call PartyMenuSelect call ReturnToMapWithSpeechTextbox diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 2b9e0e8a8d5..ef5a57b84a1 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -533,7 +533,7 @@ StatsScreen_LoadGFX: ld hl, wStatsScreenFlags bit 4, [hl] jr nz, .place_frontpic - call SetPalettes + call SetDefaultBGPAndOBP ret .place_frontpic @@ -834,16 +834,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 @@ -1037,7 +1037,7 @@ endc call PlaceString ld hl, wStatsScreenFlags set 5, [hl] - call SetPalettes ; pals + call SetDefaultBGPAndOBP call DelayFrame hlcoord 0, 0 call PrepMonFrontpic diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index 651d1309644..001888e470e 100644 --- a/engine/printer/print_party.asm +++ b/engine/printer/print_party.asm @@ -225,7 +225,7 @@ PrintPartyMonPage1: call WaitBGMap ld b, SCGB_STATS_SCREEN_HP_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP ret PrintPartyMonPage2: @@ -276,7 +276,7 @@ PrintPartyMonPage2: call WaitBGMap ld b, SCGB_STATS_SCREEN_HP_PALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP ret .PrintTempMonStats: diff --git a/engine/tilesets/map_palettes.asm b/engine/tilesets/map_palettes.asm index ff57ac83b42..84a03f99a52 100644 --- a/engine/tilesets/map_palettes.asm +++ b/engine/tilesets/map_palettes.asm @@ -1,4 +1,5 @@ -_SwapTextboxPalettes:: +_LoadOverworldAttrmapPals:: +; Load wAttrmap palette numbers based on the tileset palettes of current map. hlcoord 0, 0 decoord 0, 0, wAttrmap ld b, SCREEN_HEIGHT diff --git a/engine/tilesets/timeofday_pals.asm b/engine/tilesets/timeofday_pals.asm index 12c44f377e6..053a9769a12 100644 --- a/engine/tilesets/timeofday_pals.asm +++ b/engine/tilesets/timeofday_pals.asm @@ -112,14 +112,14 @@ _UpdateTimePals:: call DmgToCgbTimePals ret -FadeInPalettes:: +FadeInFromWhite:: ld c, $12 call GetTimePalFade ld b, $4 call ConvertTimePalsDecHL ret -FadeOutPalettes:: +FadeOutToWhite:: call FillWhiteBGColor ld c, $9 call GetTimePalFade @@ -143,14 +143,14 @@ BattleTowerFade: jr nz, .loop ret -FadeInQuickly: +FadeInFromBlack: ld c, $0 call GetTimePalFade ld b, $4 call ConvertTimePalsIncHL ret -FadeBlackQuickly: +FadeOutToBlack: ld c, $9 call GetTimePalFade ld b, $4 @@ -158,6 +158,7 @@ FadeBlackQuickly: ret FillWhiteBGColor: +; Copy white palette of wBGPals1 Pal0 into white palette of wBGPals1 Pal1-Pal6 ldh a, [rSVBK] push af ld a, BANK(wBGPals1) diff --git a/home/map.asm b/home/map.asm index 14786eece72..d4f2fc047a9 100644 --- a/home/map.asm +++ b/home/map.asm @@ -91,12 +91,12 @@ GetMapSceneID:: pop bc ret -OverworldTextModeSwitch:: - call LoadMapPart - call SwapTextboxPalettes +LoadOverworldTilemapAndAttrmapPals:: + call LoadOverworldTilemap + call LoadOverworldAttrmapPals ret -LoadMapPart:: +LoadOverworldTilemap:: ldh a, [hROMBank] push af @@ -109,9 +109,9 @@ LoadMapPart:: ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill - ld a, BANK(_LoadMapPart) + ld a, BANK(_LoadOverworldTilemap) rst Bankswitch - call _LoadMapPart + call _LoadOverworldTilemap pop af rst Bankswitch @@ -1911,7 +1911,7 @@ FadeToMenu:: xor a ldh [hBGMapMode], a call LoadStandardMenuHeader - farcall FadeOutPalettes + farcall FadeOutToWhite call ClearSprites call DisableSpriteUpdates ret @@ -1935,7 +1935,7 @@ FinishExitMenu:: call GetSGBLayout farcall LoadOW_BGPal7 call WaitBGMap2 - farcall FadeInPalettes + farcall FadeInFromWhite call EnableSpriteUpdates ret @@ -1977,7 +1977,7 @@ ReloadTilesetAndPalettes:: ld c, a call SwitchToAnyMapAttributesBank farcall UpdateTimeOfDayPal - call OverworldTextModeSwitch + call LoadOverworldTilemapAndAttrmapPals call LoadTilesetGFX ld a, 9 call SkipMusic diff --git a/home/palettes.asm b/home/palettes.asm index 30a463ec01b..1b74716640f 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -324,8 +324,8 @@ ReloadSpritesNoPalettes:: call DelayFrame ret -SwapTextboxPalettes:: - homecall _SwapTextboxPalettes +LoadOverworldAttrmapPals:: + homecall _LoadOverworldAttrmapPals ret ScrollBGMapPalettes:: diff --git a/home/print_text.asm b/home/print_text.asm index efca959eb1a..9f97ffbd515 100644 --- a/home/print_text.asm +++ b/home/print_text.asm @@ -15,7 +15,7 @@ PrintLetterDelay:: ; non-scrolling text? ld a, [wTextboxFlags] - bit NO_TEXT_DELAY_F, a + bit TEXT_DELAY_F, a ret z push hl diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index cde0e0212a2..5e6373953d7 100644 --- a/home/scrolling_menu.asm +++ b/home/scrolling_menu.asm @@ -20,7 +20,7 @@ ScrollingMenu:: ld hl, wVramState bit 0, [hl] jp nz, UpdateTimePals - jp SetPalettes + jp SetDefaultBGPAndOBP InitScrollingMenu:: ld a, [wMenuBorderTopCoord] diff --git a/home/text.asm b/home/text.asm index 0d6a701b503..e2a9734fcfb 100644 --- a/home/text.asm +++ b/home/text.asm @@ -661,7 +661,7 @@ PokeFluteTerminator:: PlaceHLTextAtBC:: ld a, [wTextboxFlags] push af - set NO_TEXT_DELAY_F, a + set TEXT_DELAY_F, a ld [wTextboxFlags], a call DoTextUntilTerminator diff --git a/home/tilemap.asm b/home/tilemap.asm index 8f8d339dfbb..5afee25cc7f 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -143,12 +143,12 @@ endr ld sp, hl ret -SetPalettes:: +SetDefaultBGPAndOBP:: ; Inits the Palettes ; depending on the system the monochromes palettes or color palettes ldh a, [hCGB] and a - jr nz, .SetPalettesForGameBoyColor + jr nz, .SetDefaultBGPAndOBPForGameBoyColor ld a, %11100100 ldh [rBGP], a ld a, %11010000 @@ -156,7 +156,7 @@ SetPalettes:: ldh [rOBP1], a ret -.SetPalettesForGameBoyColor: +.SetDefaultBGPAndOBPForGameBoyColor: push de ld a, %11100100 call DmgToCgbBGPals diff --git a/home/window.asm b/home/window.asm index fa53b068e40..7fc5ddc8bf9 100644 --- a/home/window.asm +++ b/home/window.asm @@ -6,7 +6,7 @@ RefreshScreen:: rst Bankswitch call ReanchorBGMap_NoOAMUpdate - call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + call HDMATransferTilemapAndAttrmap_Menu call LoadFonts_NoOAMUpdate pop af @@ -31,8 +31,8 @@ CloseText:: call ClearWindowData xor a ldh [hBGMapMode], a - call OverworldTextModeSwitch - call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + call LoadOverworldTilemapAndAttrmapPals + call HDMATransferTilemapAndAttrmap_Menu xor a ldh [hBGMapMode], a call SafeUpdateSprites @@ -50,22 +50,22 @@ OpenText:: ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; aka BANK(LoadFonts_NoOAMUpdate) rst Bankswitch - call ReanchorBGMap_NoOAMUpdate ; clear bgmap + call ReanchorBGMap_NoOAMUpdate ; anchor bgmap call SpeechTextbox - call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap + call HDMATransferTilemapAndAttrmap_Menu ; transfer bgmap call LoadFonts_NoOAMUpdate ; load font pop af rst Bankswitch ret -_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap:: +HDMATransferTilemapAndAttrmap_Menu:: ldh a, [hOAMUpdate] push af ld a, $1 ldh [hOAMUpdate], a - farcall OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + farcall _HDMATransferTilemapAndAttrmap_Menu pop af ldh [hOAMUpdate], a diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 1cf4438c10f..b8ef55a10af 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -32,7 +32,7 @@ Script_BattleRoomLoop: promptbutton closetext special BattleTowerBattle ; predef StartBattle - special FadeOutPalettes + special FadeOutToWhite reloadmap ifnotequal $0, Script_FailedBattleTowerChallenge readmem wNrOfBeatenBattleTowerTrainers @@ -47,10 +47,10 @@ Script_BattleRoomLoop: waitbutton closetext playmusic MUSIC_HEAL - special FadeOutPalettes + special FadeOutToWhite special LoadMapPalettes pause 60 - special FadeInPalettes + special FadeInFromWhite special RestartMapMusic opentext writetext Text_NextUpOpponentNo @@ -74,7 +74,7 @@ Script_DontBattleNextOpponent: special BattleTowerAction playsound SFX_SAVE waitsfx - special FadeOutPalettes + special FadeOutToWhite special Reset Script_DontSaveAndEndTheSession: writetext Text_CancelYourBattleRoomChallenge @@ -85,7 +85,7 @@ Script_DontSaveAndEndTheSession: setval BATTLETOWERACTION_06 special BattleTowerAction closetext - special FadeOutPalettes + special FadeOutToWhite warpfacing UP, BATTLE_TOWER_1F, 7, 7 opentext sjump Script_BattleTowerHopeToServeYouAgain diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 55a38d1d5a5..5413d1491e9 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -31,10 +31,10 @@ DaisyScript: writetext DaisyAlrightText waitbutton closetext - special FadeOutPalettes + special FadeOutToWhite playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special FadeInFromWhite special RestartMapMusic opentext writetext GroomedMonLooksContentText diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 56f3d463d2e..a7b584f2314 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -89,7 +89,7 @@ EcruteakGymClosed: follow PLAYER, ECRUTEAKGYM_GRAMPS applymovement PLAYER, EcruteakGymPlayerSlowStepDownMovement stopfollow - special FadeOutPalettes + special FadeOutToWhite playsound SFX_ENTER_DOOR waitsfx warp ECRUTEAK_CITY, 6, 27 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 8b156e83d98..8de154f55dd 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -66,7 +66,7 @@ FastShip1FSailor1Script: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special FadeOutToWhite waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setmapscene VERMILION_PORT, SCENE_VERMILIONPORT_LEAVE_SHIP @@ -79,7 +79,7 @@ FastShip1FSailor1Script: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special FadeOutToWhite waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY setmapscene OLIVINE_PORT, SCENE_OLIVINEPORT_LEAVE_SHIP diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 2bdc7c2d36a..6e2a7e57b1e 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -46,7 +46,7 @@ SSAquaGranddaughterBefore: writetext SSAquaGranddaughterHasToFindGrandpaText waitbutton closetext - special FadeBlackQuickly + special FadeOutToBlack special ReloadSpritesNoPalettes disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, SSAquaCaptainsCabinWarpsToGrandpasCabinMovement @@ -54,7 +54,7 @@ SSAquaGranddaughterBefore: appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 turnobject PLAYER, UP turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP - special FadeInQuickly + special FadeInFromBlack turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15 applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, SSAquaGranddaughterEntersCabinMovement diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index e9124dff5fe..934985d4f62 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -67,14 +67,14 @@ FastShipBed: writetext FastShipBedText1 waitbutton closetext - special FadeBlackQuickly + special FadeOutToBlack special ReloadSpritesNoPalettes special StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_HEAL pause 60 special RestartMapMusic - special FadeInQuickly + special FadeInFromBlack opentext writetext FastShipBedText2 waitbutton diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 5014bd5c3bb..a7bbd404780 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -233,10 +233,10 @@ OlderHaircutBrotherScript: writetext GoldenrodUndergroundOlderHaircutBrotherWatchItBecomeBeautifulText waitbutton closetext - special FadeOutPalettes + special FadeOutToWhite playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special FadeInFromWhite special RestartMapMusic opentext writetext GoldenrodUndergroundOlderHaircutBrotherAllDoneText @@ -316,10 +316,10 @@ YoungerHaircutBrotherScript: writetext GoldenrodUndergroundYoungerHaircutBrotherIllMakeItLookCoolText waitbutton closetext - special FadeOutPalettes + special FadeOutToWhite playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special FadeInFromWhite special RestartMapMusic opentext writetext GoldenrodUndergroundYoungerHaircutBrotherAllDoneText diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 7d8370479dc..d894cee8a75 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -156,7 +156,7 @@ TeleportGuyScript: waitbutton closetext playsound SFX_WARP_TO - special FadeOutPalettes + special FadeOutToWhite waitsfx warp NEW_BARK_TOWN, 13, 6 end diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 1fa3843eebd..a168dab31e3 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -123,7 +123,7 @@ LancesRoomLanceScript: pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth - special FadeOutPalettes + special FadeOutToWhite pause 15 warpfacing UP, HALL_OF_FAME, 4, 13 end diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 118813076dd..0e9bfd1c3b2 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -31,11 +31,11 @@ MobileBattleRoomConsoleScript: writetext MobileBattleRoom_HealText pause 20 closetext - special FadeOutPalettes + special FadeOutToWhite playmusic MUSIC_HEAL special LoadMapPalettes pause 60 - special FadeInPalettes + special FadeInFromWhite special RestartMapMusic refreshscreen .two_ diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index de0489f3089..3f45a580021 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -108,13 +108,13 @@ MrPokemonsHouse_OakScript: writetext MrPokemonsHouse_MrPokemonHealText waitbutton closetext - special FadeBlackQuickly + special FadeOutToBlack special ReloadSpritesNoPalettes playmusic MUSIC_HEAL special StubbedTrainerRankings_Healings special HealParty pause 60 - special FadeInQuickly + special FadeInFromBlack special RestartMapMusic opentext writetext MrPokemonText_ImDependingOnYou diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 6f9e43dd38b..94af79d195e 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -45,9 +45,9 @@ OlivineLighthouseJasmine: closetext special RestartMapMusic cry AMPHAROS - special FadeOutPalettes + special FadeOutToWhite pause 10 - special FadeInPalettes + special FadeInFromWhite opentext writetext AmphyPaluPaluluText waitbutton @@ -119,10 +119,10 @@ OlivineLighthouseAmphy: cry AMPHAROS waitbutton closetext - special FadeOutPalettes - special FadeInPalettes - special FadeOutPalettes - special FadeInPalettes + special FadeOutToWhite + special FadeInFromWhite + special FadeOutToWhite + special FadeInFromWhite end OlivineLighthouse6FSuperPotion: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 25c3e25bda5..fa39f779b71 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -44,7 +44,7 @@ OlivinePortSailorAtGangwayScript: waitsfx applymovement PLAYER, OlivinePortEnterFastShipMovement playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special FadeOutToWhite waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse .FirstTime diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 49ca41a2991..68e766d6d7e 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -93,12 +93,12 @@ RadioTower5FRocketBossScript: writetext RadioTower5FRocketBossAfterText waitbutton closetext - special FadeBlackQuickly + special FadeOutToBlack special ReloadSpritesNoPalettes disappear RADIOTOWER5F_ROCKET disappear RADIOTOWER5F_ROCKET_GIRL pause 15 - special FadeInQuickly + special FadeInFromBlack setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_CLEARED_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER diff --git a/maps/Route24.asm b/maps/Route24.asm index 826cfaeeadd..979cb6afc5b 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -26,11 +26,11 @@ Route24RocketScript: writetext Route24RocketDisappearsText waitbutton closetext - special FadeBlackQuickly + special FadeOutToBlack special ReloadSpritesNoPalettes disappear ROUTE24_ROCKET pause 25 - special FadeInQuickly + special FadeInFromBlack playmapmusic end diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index 1135febf5e4..90b92614b03 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -12,13 +12,13 @@ Route26HealHouseTeacherScript: writetext Route26HealHouseRestAWhileText waitbutton closetext - special FadeBlackQuickly + special FadeOutToBlack special ReloadSpritesNoPalettes special StubbedTrainerRankings_Healings playmusic MUSIC_HEAL special HealParty pause 60 - special FadeInQuickly + special FadeInFromBlack special RestartMapMusic opentext writetext Route26HealHouseKeepAtItText diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index b38e5644980..250f65dbd24 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -72,7 +72,7 @@ Route35NationalParkGateLeavingContestEarlyScript: closetext scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special FadeOutPalettes + special FadeOutToWhite waitsfx warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end @@ -109,7 +109,7 @@ Route35NationalParkGate_OkayToProceed: special GiveParkBalls scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special FadeOutPalettes + special FadeOutToWhite waitsfx special SelectRandomBugContestContestants warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 1bcef7a54a5..dc229cd5ccf 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -73,14 +73,14 @@ Route36NationalParkGateLeavingContestEarlyScript: writetext Route36NationalParkGateOfficer1WaitHereForAnnouncementText waitbutton closetext - special FadeBlackQuickly + special FadeOutToBlack special ReloadSpritesNoPalettes scall .CopyContestants disappear ROUTE36NATIONALPARKGATE_OFFICER1 appear ROUTE36NATIONALPARKGATE_OFFICER2 applymovement PLAYER, Route36NationalParkGatePlayerWaitWithContestantsMovement pause 15 - special FadeInQuickly + special FadeInFromBlack jumpstd BugContestResultsScript .GoBackToContest: @@ -89,7 +89,7 @@ Route36NationalParkGateLeavingContestEarlyScript: closetext turnobject PLAYER, LEFT playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special FadeOutToWhite waitsfx warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end @@ -172,7 +172,7 @@ Route36OfficerScriptContest: special GiveParkBalls turnobject PLAYER, LEFT playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special FadeOutToWhite waitsfx special SelectRandomBugContestContestants warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index f471bd8b111..922866c052a 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -23,11 +23,11 @@ Red: writetext RedLeavesText waitbutton closetext - special FadeBlackQuickly + special FadeOutToBlack special ReloadSpritesNoPalettes disappear SILVERCAVEROOM3_RED pause 15 - special FadeInQuickly + special FadeInFromBlack pause 30 special HealParty refreshscreen diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 4a187fceaeb..45c8b08ceb8 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -36,14 +36,14 @@ TrainerGruntM1: writetext TrainerGruntM1WhenTalkText waitbutton closetext - special FadeBlackQuickly + special FadeOutToBlack special ReloadSpritesNoPalettes disappear SLOWPOKEWELLB1F_ROCKET1 disappear SLOWPOKEWELLB1F_ROCKET2 disappear SLOWPOKEWELLB1F_ROCKET3 disappear SLOWPOKEWELLB1F_ROCKET_GIRL pause 15 - special FadeInQuickly + special FadeInFromBlack disappear SLOWPOKEWELLB1F_KURT moveobject SLOWPOKEWELLB1F_KURT, 11, 6 appear SLOWPOKEWELLB1F_KURT @@ -65,7 +65,7 @@ TrainerGruntM1: clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_KURT_1 - special FadeOutPalettes + special FadeOutToWhite special HealParty pause 15 warp KURTS_HOUSE, 3, 3 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index b4388df51fd..995495fef4d 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -52,11 +52,11 @@ SproutTower3FRivalScene: pause 15 closetext playsound SFX_WARP_TO - special FadeBlackQuickly + special FadeOutToBlack special ReloadSpritesNoPalettes disappear SPROUTTOWER3F_RIVAL waitsfx - special FadeInQuickly + special FadeInFromBlack setscene SCENE_SPROUTTOWER3F_NOOP special RestartMapMusic end diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index bcfcc0e04d2..838e53a6b1d 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -446,9 +446,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special FadeOutPalettes + special FadeOutToWhite cry VOLTORB - special FadeInPalettes + special FadeInFromWhite setlasttalked -1 loadvar VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon VOLTORB, 23 @@ -456,9 +456,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special FadeOutPalettes + special FadeOutToWhite cry GEODUDE - special FadeInPalettes + special FadeInFromWhite setlasttalked -1 loadvar VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon GEODUDE, 21 @@ -466,9 +466,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special FadeOutPalettes + special FadeOutToWhite cry KOFFING - special FadeInPalettes + special FadeInFromWhite setlasttalked -1 loadvar VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon KOFFING, 21 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 08f04f8acd1..e4ddafb2f76 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -107,7 +107,7 @@ RocketBaseBossFScript: writetext RocketBaseBossRetreatText waitbutton closetext - special FadeBlackQuickly + special FadeOutToBlack special ReloadSpritesNoPalettes disappear TEAMROCKETBASEB2F_ROCKET1 disappear TEAMROCKETBASEB2F_ROCKET_GIRL @@ -115,7 +115,7 @@ RocketBaseBossFScript: disappear TEAMROCKETBASEB2F_ROCKET3 disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 - special FadeInQuickly + special FadeInFromBlack setscene SCENE_TEAMROCKETBASEB2F_ELECTRODES clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE turnobject TEAMROCKETBASEB2F_LANCE, DOWN @@ -164,11 +164,11 @@ LanceHealsCommon: writetext LanceHealsText1 waitbutton closetext - special FadeOutPalettes + special FadeOutToWhite special StubbedTrainerRankings_Healings playsound SFX_FULL_HEAL special HealParty - special FadeInPalettes + special FadeInFromWhite opentext writetext LanceHealsText2 waitbutton diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 794040e8e33..87971da3fee 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -50,7 +50,7 @@ VermilionPortSailorAtGangwayScript: waitsfx applymovement PLAYER, VermilionPortEnterFastShipMovement playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special FadeOutToWhite waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index b29631462c0..e832862f47b 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -309,7 +309,7 @@ Function11c1b9: call ClearSprites call ClearScreen call Function11d323 - call SetPalettes + call SetDefaultBGPAndOBP call DisableLCD ld hl, SelectStartGFX ld de, vTiles2 @@ -319,7 +319,7 @@ Function11c1b9: ld de, vTiles0 call Decompress call EnableLCD - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld farcall ClearSpriteAnims farcall LoadPokemonData farcall Pokedex_ABCMode @@ -374,7 +374,7 @@ EZChat_MasterLoop: jr nz, .exit call .DoJumptableFunction farcall PlaySpriteAnimations - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld jr .loop .exit @@ -703,7 +703,7 @@ Function11c4be: hlcoord 0, 14, wAttrmap ld bc, $28 call ByteFill - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret String_11c4db: @@ -898,7 +898,7 @@ Function11c618: hlcoord 0, 6, wAttrmap ld bc, $c8 call ByteFill - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret EZChatString_Stop_Mode_Cancel: @@ -1498,7 +1498,7 @@ Function11c9ab: hlcoord 0, 6, wAttrmap ld bc, $c8 call ByteFill - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret Function11c9bd: @@ -1588,7 +1588,7 @@ Function11ca19: add hl, de dec c jr nz, .asm_11ca22 - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret String_11ca38: @@ -2000,7 +2000,7 @@ Function11cdaa: hlcoord 0, 12, wAttrmap ld bc, 4 * SCREEN_WIDTH call ByteFill - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret String_11cdc7: diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 7f3e1719030..c8800e4f4d6 100644 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -113,7 +113,7 @@ InitMobileProfile: call PlaceString call Function48187 call WaitBGMap2 - call SetPalettes + call SetDefaultBGPAndOBP call StaticMenuJoypad ld hl, wMenuCursorY ld b, [hl] @@ -354,7 +354,7 @@ Function48304: ld a, $29 .asm_4833f ld [wMenuScrollPosition], a - farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + farcall Mobile_HDMATransferTilemapAndAttrmap_Menu .asm_48348 call ScrollingMenu ld de, $629 @@ -380,7 +380,7 @@ Function48304: ld [wd003], a .asm_48377 call Function48187 - farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + farcall Mobile_HDMATransferTilemapAndAttrmap_Menu jp Function4840c Function48383: diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 1171f6b89fc..571929441f0 100644 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -221,7 +221,7 @@ Function4a94e: ld [wd019], a ld b, SCGB_PACKPALS call GetSGBLayout - call SetPalettes + call SetDefaultBGPAndOBP call Function4aa22 jr c, .asm_4a985 jr z, .asm_4a9a1 @@ -345,7 +345,7 @@ Function4aa34: farcall PrintPartyMenuText call Function4aab6 call WaitBGMap - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame call Function4ab1a jr z, .asm_4aa66 diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index a44604e8282..8f05f329ab3 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -92,7 +92,7 @@ Function8919e: Function891ab: call Mobile22_SetBGMapMode1 - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call Mobile22_SetBGMapMode0 ret @@ -618,7 +618,7 @@ Function894ca: call Function895c7 call Function8949c call Function8a60d - call SetPalettes + call SetDefaultBGPAndOBP pop bc ret @@ -1237,7 +1237,7 @@ Function89844: call Function897af push bc call WaitBGMap2 - call SetPalettes + call SetDefaultBGPAndOBP pop bc ret @@ -1713,7 +1713,7 @@ Function89b28: call Function893e2 call Call_ExitMenu call Function891ab - call SetPalettes + call SetDefaultBGPAndOBP ret Function89b3b: @@ -2063,7 +2063,7 @@ Function89d0d: pop af ldh [rSVBK], a - call SetPalettes + call SetDefaultBGPAndOBP farcall PrintMail call Mobile22_SetBGMapMode1 ld c, 24 @@ -2099,7 +2099,7 @@ Function89d75: push hl call Mobile22_SetBGMapMode0 call _hl_ - farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + farcall Mobile_HDMATransferTilemapAndAttrmap_Menu pop hl jr asm_89d90 @@ -2263,7 +2263,7 @@ Function89e6f: hlcoord 10, 4, wAttrmap call Function8a5a3 call Function891ab - call SetPalettes + call SetDefaultBGPAndOBP jp Function89e36 Function89e9a: @@ -2298,7 +2298,7 @@ Function89eb9: hlcoord 10, 4, wAttrmap call Function8a5a3 call Function891ab - call SetPalettes + call SetDefaultBGPAndOBP jp Function89e36 Function89ee1: @@ -2478,7 +2478,7 @@ Function89fce: hlcoord 10, 4, wAttrmap call Function8a5a3 call Function89448 - call SetPalettes + call SetDefaultBGPAndOBP call Function891ab jp Function89e36 @@ -2826,7 +2826,7 @@ Function8a262: call Function8b36c call Function8b493 call Function891ab - call SetPalettes + call SetDefaultBGPAndOBP call Function8b5e7 ret @@ -2917,7 +2917,7 @@ Function8a31c: call Function8a4d3 call Function8a4fc call Function891ab - call SetPalettes + call SetDefaultBGPAndOBP call Function8a383 jr c, .asm_8a370 jr z, .asm_8a34e diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 040283881a2..e991c15adf9 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -565,7 +565,7 @@ Function8b677: call Function8b6ed call EnableLCD call Function891ab - call SetPalettes + call SetDefaultBGPAndOBP ret Function8b690: diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index b09cd6b5f3c..496c51114e1 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -304,7 +304,7 @@ Function10016f: Function10020b: xor a ld [wc303], a - farcall FadeOutPalettes + farcall FadeOutToWhite farcall Function106464 call HideSprites call DelayFrame @@ -426,7 +426,7 @@ Function100301: ret Function100320: - farcall Mobile_ReloadMapPart + farcall Mobile_HDMATransferTilemapAndAttrmap_Overworld ret Function100327: ; unreferenced @@ -1411,7 +1411,7 @@ Function100902: call PrintNum ld de, SFX_TWO_PC_BEEPS call PlaySFX - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld c, $3c call DelayFrames ret @@ -1422,7 +1422,7 @@ Function100902: call PlaceString ld de, SFX_4_NOTE_DITTY call PlaySFX - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld c, 120 call DelayFrames ret @@ -1448,7 +1448,7 @@ Function100989: decoord 0, 0 call Function1009a5 call Function1009ae - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld hl, w3_dd68 decoord 0, 0, wAttrmap call Function1009a5 @@ -4914,7 +4914,7 @@ Function10224b: .asm_10225e res 1, [hl] res 2, [hl] - farcall Mobile_ReloadMapPart + farcall Mobile_HDMATransferTilemapAndAttrmap_Overworld scf ret @@ -6483,7 +6483,7 @@ Function102dec: ld a, $05 call FarCopyWRAM farcall Function49742 - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame ret diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index d316d6a783e..3b313b3c581 100644 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -462,7 +462,7 @@ Function1161d5: pop af ldh [rSVBK], a - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, $8 ld [wMusicFade], a ld de, MUSIC_MOBILE_ADAPTER @@ -498,7 +498,7 @@ Function116294: ld de, wBGPals1 palette 7 ld bc, 1 palettes call CopyBytes - call SetPalettes + call SetDefaultBGPAndOBP pop af ldh [rSVBK], a ld a, $30 @@ -518,7 +518,7 @@ Function1162cb: ld de, wOBPals1 palette 2 ld bc, 6 palettes call CopyBytes - call SetPalettes + call SetDefaultBGPAndOBP pop af ldh [rSVBK], a ret @@ -623,7 +623,7 @@ Function11636e: call CopyBytes pop af ldh [rSVBK], a - call SetPalettes + call SetDefaultBGPAndOBP ldh a, [rSVBK] push af ld a, $1 @@ -637,7 +637,7 @@ Function11636e: call UpdateSprites pop af ldh [rSVBK], a - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, $8 ld [wMusicFade], a ld a, [wMapMusic] @@ -672,7 +672,7 @@ Function1163c0: call CopyBytes pop af ldh [rSVBK], a - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame ld a, $90 ldh [hWY], a @@ -680,7 +680,7 @@ Function1163c0: farcall _ClearSprites pop af ldh [rSVBK], a - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, [wLinkMode] cp LINK_MOBILE jr z, .asm_11642a @@ -710,7 +710,7 @@ Function116441: farcall Function17d405 ld a, $90 ldh [hWY], a - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, $8 ld [wMusicFade], a ld a, [wMapMusic] diff --git a/mobile/mobile_45_stadium.asm b/mobile/mobile_45_stadium.asm index 3a74c6f7601..bf97e331460 100644 --- a/mobile/mobile_45_stadium.asm +++ b/mobile/mobile_45_stadium.asm @@ -58,7 +58,7 @@ Function117699: call ClearBGPalettes call ClearSprites farcall Function171c87 - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld farcall ClearSpriteAnims ret @@ -70,7 +70,7 @@ Function1176ee: jr nz, .quit call Function117719 farcall PlaySpriteAnimations - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld jr .loop .quit @@ -325,7 +325,7 @@ Function1178aa: call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld hlcoord 16, 8 ld de, YessNoString_1179c5 call PlaceString @@ -427,7 +427,7 @@ Function117984: call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld hlcoord 1, 14 ld de, NotAPokemonPasswordString call PlaceString @@ -526,7 +526,7 @@ Function117ab4: call ClearSprites farcall Function172e78 farcall Function172eb9 - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret Function117acd: @@ -633,13 +633,13 @@ Function117b4f: jr nz, .b_button call ExitMenu call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld jp MobileStudium_JumptableIncrement .b_button call ExitMenu call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, $80 ld [wJumptableIndex], a ret @@ -726,7 +726,7 @@ Function117c4a: call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld hl, MobileStadiumSuccessText call PrintText ldh a, [rSVBK] diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 7f4263d9512..4acb0722635 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -4259,7 +4259,7 @@ Function119f98: and a jr z, .asm_119fd4 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld farcall Function115dc3 ld a, [wcd33] ld [wcf66], a @@ -4276,14 +4276,14 @@ Function119f98: ld [wc30d], a ld a, $1 ld [wc314], a - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld and a ret .asm_119fef call ExitMenu call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a farcall Function115dc3 @@ -4357,7 +4357,7 @@ Function11a00e: farcall Stubbed_Function106462 farcall Function106464 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld farcall Function115d99 ld c, $0 farcall Function115e18 @@ -4379,7 +4379,7 @@ Function11a0ca: farcall Stubbed_Function106462 farcall Function106464 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld farcall Function115d99 ld c, $0 farcall Function115e18 @@ -4465,7 +4465,7 @@ Function11a192: and a jr nz, .asm_11a1b6 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -4475,7 +4475,7 @@ Function11a192: .asm_11a1b6 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a ld [wcd80], a @@ -4601,7 +4601,7 @@ BattleTowerRoomMenu2_UpdateYesNoMenu: and a jr nz, .exit_no_carry call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, [wMobileInactivityTimerFrames] cp $0 jr z, .asm_11a2b4 @@ -4623,7 +4623,7 @@ BattleTowerRoomMenu2_UpdateYesNoMenu: .exit_no_carry call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld and a ret @@ -4693,7 +4693,7 @@ Function11a33a: .asm_11a346 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld farcall Function115dc3 and a ret @@ -4734,7 +4734,7 @@ Function11a38d: and a jr nz, .asm_11a3b1 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -4744,7 +4744,7 @@ Function11a38d: .asm_11a3b1 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a ld [wcd80], a @@ -4805,7 +4805,7 @@ Function11a41b: and a jr nz, .asm_11a43f call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -4815,7 +4815,7 @@ Function11a41b: .asm_11a43f call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, $1c ld [wcf66], a ld [wcd80], a @@ -4871,7 +4871,7 @@ Function11a49e: and a jr nz, .asm_11a4c7 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -4883,7 +4883,7 @@ Function11a49e: .asm_11a4c7 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, [wMobileInactivityTimerFrames] ld [wcf66], a ld [wcd80], a @@ -4915,7 +4915,7 @@ Function11a4fe: and a jr nz, .asm_11a522 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -4925,7 +4925,7 @@ Function11a4fe: .asm_11a522 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a ld [wcd80], a @@ -4953,7 +4953,7 @@ Function11a536: call Function11a9f0 jr nz, .asm_11a562 call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld .asm_11a562 scf @@ -5027,7 +5027,7 @@ Function11a5b9: ld b, $4 ld c, $12 call Function3eea - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call UpdateSprites ld c, $0 farcall Function115e18 @@ -5061,7 +5061,7 @@ Function11a5f5: hlcoord 15, 7 ld a, $ed ld [hl], a - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret Function11a63c: @@ -5563,7 +5563,7 @@ Function11ac51: ld a, 30 * SPRITEOAMSTRUCT_LENGTH ld [wCurSpriteOAMAddr], a farcall DoNextFrameForAllSprites - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld jr .loop .asm_11aca8 @@ -5699,7 +5699,7 @@ Function11ad95: hlcoord 10, 10, wAttrmap lb bc, 8, 8 call Function11afd6 - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call MobileIncJumptableIndex ld a, $1 ld [wMenuCursorY], a @@ -5778,7 +5778,7 @@ Function11adc4: .asm_11ae2e call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret MenuHeader_11ae38: @@ -5812,7 +5812,7 @@ Function11ae4e: hlcoord 9, 12, wAttrmap lb bc, 6, 11 call Function11afd6 - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call MobileIncJumptableIndex ld a, $1 ld [wMenuCursorY], a @@ -5880,7 +5880,7 @@ Function11ae98: .asm_11aef7 call ExitMenu call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret Function11af04: @@ -5902,7 +5902,7 @@ Function11af04: hlcoord 9, 12, wAttrmap lb bc, 6, 11 call Function11afd6 - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call MobileIncJumptableIndex ld a, $2 ld [wMenuCursorY], a @@ -5970,7 +5970,7 @@ Function11af4e: .asm_11afaa call ExitMenu call ExitMenu - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret Function11afb7: @@ -6121,7 +6121,7 @@ Function11b082: call Function11b099 call Function11b295 call Function11b275 - call SetPalettes + call SetDefaultBGPAndOBP jp MobileIncJumptableIndex Function11b099: diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index c1f4228c7bf..a7c99a5f4de 100644 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -312,7 +312,7 @@ Function16c943: cp $8 jr nz, .asm_16c969 farcall ApplyPals - call SetPalettes + call SetDefaultBGPAndOBP ldh a, [rSVBK] push af ld a, $1 @@ -413,7 +413,7 @@ Function16ca11: cp $8 jr nz, .asm_16ca28 farcall ApplyPals - call SetPalettes + call SetDefaultBGPAndOBP ldh a, [rSVBK] push af ld a, $1 diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 616f769f4e7..686d36277c3 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -326,7 +326,7 @@ Function1719ed: call ClearBGPalettes call ClearSprites farcall Function171d2b - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld farcall ClearSpriteAnims ret @@ -338,7 +338,7 @@ Function171a11: jr nz, .done call Function171a36 farcall PlaySpriteAnimations - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld jr .loop .done farcall ClearSpriteAnims @@ -588,7 +588,7 @@ Function171beb: call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld hlcoord 1, 14 ld de, String_171c73 call PlaceString @@ -688,7 +688,7 @@ Function171ccd: ld [hli], a ld a, HIGH(PALRGB_WHITE) ld [hl], a - call SetPalettes + call SetDefaultBGPAndOBP pop af ldh [rSVBK], a ret @@ -823,7 +823,7 @@ Function172eb9: ld de, wBGPals2 ld bc, 8 palettes call CopyBytes - call SetPalettes + call SetDefaultBGPAndOBP pop af ldh [rSVBK], a ret diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index 111fc966659..5477b4c9708 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -61,7 +61,7 @@ Function17a6a8: call Function17abcf farcall LoadOW_BGPal7 farcall Function49420 - call SetPalettes + call SetDefaultBGPAndOBP call DelayFrame ret @@ -183,7 +183,7 @@ Function17a78f: ret .asm_17a79f - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret Function17a7a6: ; unreferenced diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 15cda1893a7..470b3b858db 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -77,7 +77,7 @@ Function17c000: ldh [rVBK], a call EnableLCD - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld ret HaveWantGFX: @@ -604,7 +604,7 @@ Function17d370: call ClearBGPalettes call ClearSprites call ClearScreen - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld call DisableLCD ld hl, vTiles0 tile $ee ld de, wc608 @@ -649,7 +649,7 @@ Function17d3f6: call ClearBGPalettes call ClearSprites call ClearScreen - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld Function17d405: call DisableLCD @@ -682,7 +682,7 @@ Function17d405: ld de, wBGPals1 ld bc, 8 palettes call CopyBytes - call SetPalettes + call SetDefaultBGPAndOBP pop af ldh [rSVBK], a ret @@ -694,7 +694,7 @@ Function17d45a: bit 7, a jr nz, .asm_17d46f call Function17d474 - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld jr .asm_17d45a .asm_17d46f @@ -893,11 +893,11 @@ Function17d48d: call Function17e451 call Function17e55b call Function17e5af - farcall ReloadMapPart + farcall HDMATransferTilemapAndAttrmap_Overworld jp Function17e438 Function17d5be: - call SetPalettes + call SetDefaultBGPAndOBP call Function17e438 Function17d5c4: @@ -1443,7 +1443,7 @@ Function17d93a: ld a, [wc70c] ld e, a farcall LoadMonPaletteAsNthBGPal - call SetPalettes + call SetDefaultBGPAndOBP ld a, [wc708] ld l, a ld a, [wc709] @@ -1478,7 +1478,7 @@ Function17d98b: ld a, [wc70b] ld e, a farcall LoadTrainerClassPaletteAsNthBGPal - call SetPalettes + call SetDefaultBGPAndOBP ld a, [wc708] ld e, a ld a, [wc709] @@ -4512,7 +4512,7 @@ Function17f5c3: Function17f5d2: call Function17f5e4 farcall HDMATransferAttrmapAndTilemapToWRAMBank3 - call SetPalettes + call SetDefaultBGPAndOBP ld a, $1 ld [wc303], a ret diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index f58ae98e22e..448687ddd7f 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -29,7 +29,7 @@ Function49f16: hlcoord 1, 14 call PlaceString call WaitBGMap2 - call SetPalettes + call SetDefaultBGPAndOBP call StaticMenuJoypad ld hl, wMenuCursorY ld b, [hl] @@ -267,8 +267,8 @@ Function4a149: call ClearBox hlcoord 1, 14 call PlaceString - farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - call SetPalettes + farcall Mobile_HDMATransferTilemapAndAttrmap_Menu + call SetDefaultBGPAndOBP call StaticMenuJoypad ld hl, wMenuCursorY ld b, [hl] @@ -386,7 +386,7 @@ Function4a28a: hlcoord 14, 1 ld de, String_4a34b call PlaceString - farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + farcall Mobile_HDMATransferTilemapAndAttrmap_Menu call Function4a118 call ScrollingMenuJoypad push af @@ -415,7 +415,7 @@ Function4a28a: ld b, 3 ld c, 4 call Textbox - farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + farcall Mobile_HDMATransferTilemapAndAttrmap_Menu ld hl, DeletePassword_YesNo_MenuHeader call LoadMenuHeader call VerticalMenu @@ -438,7 +438,7 @@ Function4a28a: call ExitMenu .quit call Call_ExitMenu - farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + farcall Mobile_HDMATransferTilemapAndAttrmap_Menu xor a ret @@ -502,7 +502,7 @@ Function4a39a: ; unreferenced call Function4a485 call Function4a492 call Function4a3aa - call SetPalettes + call SetDefaultBGPAndOBP ret Function4a3a7: @@ -676,7 +676,7 @@ Function4a4c4: hlcoord 1, 16 call PlaceString call WaitBGMap2 - call SetPalettes + call SetDefaultBGPAndOBP call StaticMenuJoypad ld hl, wMenuCursorY ld b, [hl]