From 0c6f94effd1cb4278b0c0a2f02117055a69537e1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 25 Nov 2015 10:26:30 -0500 Subject: [PATCH 1/2] Final relabeling before merge --- engine/link.asm | 26 +++++++++++++------------- engine/map_objects.asm | 2 +- engine/menu.asm | 6 +++--- engine/pokecenter_pc.asm | 14 +++++++------- engine/predef.asm | 2 +- engine/scripting.asm | 16 ++++++++-------- engine/timeset.asm | 4 ++-- event/kurt.asm | 2 +- event/unown.asm | 2 +- home.asm | 10 +++++----- home/battle.asm | 2 +- home/map.asm | 4 ++-- home/menu.asm | 4 ++-- home/rtc.asm | 2 +- home/text.asm | 2 +- home/tilemap.asm | 2 +- main.asm | 16 ++++++++-------- misc/mobile_22.asm | 4 ++-- misc/mobile_40.asm | 4 ++-- misc/mobile_46.asm | 4 ++-- misc/mobile_5b.asm | 4 ++-- wram.asm | 6 +++--- 22 files changed, 69 insertions(+), 69 deletions(-) diff --git a/engine/link.asm b/engine/link.asm index 9d21104f8..8ba1702e9 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1378,7 +1378,7 @@ Function28926: ; 28926 hlcoord 0, 15 ld b, $1 ld c, $12 - call Function28eef + call Predef_LinkTextbox hlcoord 2, 16 ld de, String28ab4 call PlaceString @@ -1487,7 +1487,7 @@ Function28926: ; 28926 hlcoord 0, 12 ld b, $4 ld c, $12 - call Function28eef + call Predef_LinkTextbox callba Function4d354 ld hl, UnknownText_0x28aaf bccoord 1, 14 @@ -1509,7 +1509,7 @@ Function28926: ; 28926 hlcoord 0, 12 ld b, $4 ld c, $12 - call Function28eef + call Predef_LinkTextbox callba Function4d354 ld hl, UnknownText_0x28ac4 bccoord 1, 14 @@ -1519,7 +1519,7 @@ Function28926: ; 28926 hlcoord 0, 12 ld b, $4 ld c, $12 - call Function28eef + call Predef_LinkTextbox hlcoord 1, 14 ld de, String28ece call PlaceString @@ -1666,7 +1666,7 @@ Function28b87: ; 28b87 hlcoord 0, 12 ld b, $4 ld c, $12 - call Function28eef + call Predef_LinkTextbox callba Function4d354 ld a, [wd002] ld hl, PartySpecies @@ -1695,7 +1695,7 @@ Function28b87: ; 28b87 hlcoord 10, 7 ld b, $3 ld c, $7 - call Function28eef + call Predef_LinkTextbox ld de, String28eab hlcoord 12, 8 call PlaceString @@ -1735,7 +1735,7 @@ Function28b87: ; 28b87 hlcoord 0, 12 ld b, 4 ld c, 18 - call Function28eef + call Predef_LinkTextbox hlcoord 1, 14 ld de, String28ece call PlaceString @@ -1752,7 +1752,7 @@ Function28b87: ; 28b87 hlcoord 0, 12 ld b, 4 ld c, 18 - call Function28eef + call Predef_LinkTextbox hlcoord 1, 14 ld de, String28ece call PlaceString @@ -1982,7 +1982,7 @@ Function28b87: ; 28b87 hlcoord 0, 12 ld b, 4 ld c, 18 - call Function28eef + call Predef_LinkTextbox hlcoord 1, 14 ld de, String28ebd call PlaceString @@ -2019,10 +2019,10 @@ String28ece: ; 28ece next "was canceled!@" -Function28eef: ; 28eef +Predef_LinkTextbox: ; 28eef ld d, h ld e, l - callba Function16d6ca + callba LinkTextbox ret ; 28ef8 @@ -2041,11 +2041,11 @@ Function28f09: ; 28f09 hlcoord 0, 0 ld b, 6 ld c, 18 - call Function28eef + call Predef_LinkTextbox hlcoord 0, 8 ld b, 6 ld c, 18 - call Function28eef + call Predef_LinkTextbox callba Functionfb60d ret ; 28f24 diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 168c5389c..13e4f73bf 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2736,7 +2736,7 @@ Function5602: ; 5602, called at battle start ld a, PLAYER call Function5629 ; respawn player - ld a, [wd459] + ld a, [wBattleScriptFlags] bit 7, a jr z, .ok diff --git a/engine/menu.asm b/engine/menu.asm index a1ec30b7a..6978a0e54 100755 --- a/engine/menu.asm +++ b/engine/menu.asm @@ -4,7 +4,7 @@ Function2400e:: ; 2400e rst FarCall call Function24085 call UpdateSprites - call Function321c + call ApplyTilemap call Function2408f ret ; 24022 @@ -16,7 +16,7 @@ Function24022:: ; 24022 call Function24085 callba MobileTextBorder call UpdateSprites - call Function321c + call ApplyTilemap call Function2408f ret ; 2403c @@ -28,7 +28,7 @@ Function2403c:: ; 2403c call Function24085 callba MobileTextBorder call UpdateSprites - call Function321c + call ApplyTilemap call Function2411a ld hl, wcfa5 set 7, [hl] diff --git a/engine/pokecenter_pc.asm b/engine/pokecenter_pc.asm index 4d296aab2..064b35a6c 100755 --- a/engine/pokecenter_pc.asm +++ b/engine/pokecenter_pc.asm @@ -188,7 +188,7 @@ _KrissHousePC: ; 156d9 and a jr nz, .asm_156f9 call OverworldTextModeSwitch - call Function321c + call ApplyTilemap call UpdateSprites call PC_PlayShutdownSound ld c, $0 @@ -466,16 +466,16 @@ UnknownText_0x158c7: ; 0x158c7 Function158cc: ; 0x158cc - ld a, [wc2ce] + ld a, [wSpriteUpdatesEnabled] push af ld a, $0 - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a callba CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .jumptable rst JumpTable pop af - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a ret ; 0x158e7 @@ -577,10 +577,10 @@ Function15985: ; 0x15985 xor a ld [wd0e3], a .asm_15989 - ld a, [wc2ce] + ld a, [wSpriteUpdatesEnabled] push af ld a, $0 - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a ld hl, MenuData15a08 call CopyMenuDataHeader hlcoord 0, 0 @@ -597,7 +597,7 @@ Function15985: ; 0x15985 ld a, [MenuSelection2] ld [wd0d7], a pop af - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a ld a, [wd0e3] and a jr nz, .asm_159d8 diff --git a/engine/predef.asm b/engine/predef.asm index c089215a6..680a6b4a0 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -46,7 +46,7 @@ PredefPointers:: ; 856b add_predef CalcPkmnStatC add_predef CanLearnTMHMMove add_predef GetTMHMMove - add_predef Function28eef ; $ 10 + add_predef Predef_LinkTextbox ; $ 10 add_predef PrintMoveDesc add_predef UpdatePlayerHUD add_predef FillBox diff --git a/engine/scripting.asm b/engine/scripting.asm index 945368e2b..c80343a4c 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -929,7 +929,7 @@ Script_winlosstext: ; 9714c Script_talkaftercancel: ; 97163 ; script command 0x66 - ld a, [wd04d] + ld a, [wRunningTrainerBattleScript] and a ret z jp Script_end @@ -940,7 +940,7 @@ Script_talkaftercheck: ; 9716b ld a, 1 ld [ScriptVar], a - ld a, [wd04d] + ld a, [wRunningTrainerBattleScript] and a ret nz xor a @@ -1485,7 +1485,7 @@ Script_battlecheck: ; 973fb ; script command 0x5b xor a - ld [wd459], a + ld [wBattleScriptFlags], a ret ; 97400 @@ -1493,7 +1493,7 @@ Script_loadtrainerdata: ; 97400 ; script command 0x5c ld a, (1 << 7) | 1 - ld [wd459], a + ld [wBattleScriptFlags], a ld a, [WalkingDirection] ld [OtherTrainerClass], a ld a, [FacingDirection] @@ -1508,7 +1508,7 @@ Script_loadpokedata: ; 97412 ; level (DecimalParam) ld a, (1 << 7) - ld [wd459], a + ld [wBattleScriptFlags], a call GetScriptByte ld [TempWildMonSpecies], a call GetScriptByte @@ -1523,7 +1523,7 @@ Script_loadtrainer: ; 97424 ; trainer_id (TrainerIdParam) ld a, (1 << 7) | 1 - ld [wd459], a + ld [wBattleScriptFlags], a call GetScriptByte ld [OtherTrainerClass], a call GetScriptByte @@ -1557,7 +1557,7 @@ Script_catchtutorial: ; 97447 Script_returnafterbattle: ; 97459 ; script command 0x60 - ld hl, wd459 + ld hl, wBattleScriptFlags ld d, [hl] ld [hl], $0 ld a, [wBattleResult] @@ -1589,7 +1589,7 @@ Script_reloadmap: ; 97491 ; script command 0x7b xor a - ld [wd459], a + ld [wBattleScriptFlags], a ld a, MAPSETUP_RELOADMAP ld [hMapEntryMethod], a ld a, $1 diff --git a/engine/timeset.asm b/engine/timeset.asm index 0b0f12718..1f82da884 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -6,7 +6,7 @@ InitClock: ; 90672 (24:4672) ld [hInMenu], a ld a, $0 - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a ld a, $10 ld [MusicFade], a ld a, MUSIC_NONE % $100 @@ -436,7 +436,7 @@ Special_SetDayOfWeek: ; 90913 ld [hl], $f5 hlcoord 10, 5 call Function909de - call Function321c + call ApplyTilemap ld c, 10 call DelayFrames .asm_9096a diff --git a/event/kurt.asm b/event/kurt.asm index 272a96ca8..bb24f26ab 100644 --- a/event/kurt.asm +++ b/event/kurt.asm @@ -139,7 +139,7 @@ Kurt_SelectQuantity: ; 880c2 call UpdateSprites call .PlaceApricornName call PlaceApricornQuantity - call Function321c + call ApplyTilemap callba Function27a28 jr nc, .loop diff --git a/event/unown.asm b/event/unown.asm index 2d48dc695..789629ae0 100644 --- a/event/unown.asm +++ b/event/unown.asm @@ -124,7 +124,7 @@ Special_DisplayUnownWords: ; 8ae68 ld [hBGMapMode], a call MenuBox call UpdateSprites - call Function321c + call ApplyTilemap call MenuBoxCoord2Tile inc hl ld d, $0 diff --git a/home.asm b/home.asm index c5c8187df..2808df8fb 100644 --- a/home.asm +++ b/home.asm @@ -104,13 +104,13 @@ DisableSpriteUpdates:: ; 0x2ed3 res 0, a ld [VramState], a ld a, $0 - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a ret ; 0x2ee4 EnableSpriteUpdates:: ; 2ee4 ld a, $1 - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a ld a, [VramState] set 0, a ld [VramState], a @@ -568,12 +568,12 @@ IsCGB:: ; 3218 ; 321c -Function321c:: ; 321c +ApplyTilemap:: ; 321c ld a, [hCGB] and a jr z, .dmg - ld a, [wc2ce] + ld a, [wSpriteUpdatesEnabled] cp 0 jr z, .dmg @@ -1488,7 +1488,7 @@ LoadTrainer_continue:: ; 367e ld a, [EngineBuffer1] call FarCopyBytes xor a - ld [wd04d], a + ld [wRunningTrainerBattleScript], a scf ret ; 36a5 diff --git a/home/battle.asm b/home/battle.asm index 57bab4083..4786cc4d3 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -285,7 +285,7 @@ BattleTextBox:: ; 3ac3 call SpeechTextBox call MobileTextBorder call UpdateSprites - call Function321c + call ApplyTilemap pop hl call PrintTextBoxText ret diff --git a/home/map.asm b/home/map.asm index a93f208a4..d50c99349 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1091,7 +1091,7 @@ MapTextbox:: ; 269a call Function2e31 ld a, 1 ld [hOAMUpdate], a - call Function321c + call ApplyTilemap pop hl call PrintTextBoxText xor a @@ -2043,7 +2043,7 @@ Function2b5c:: ; 2b5c Function2b74:: ; 0x2b74 push af ld a, $1 - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a call ClearBGPalettes call ClearSprites call Function2bae diff --git a/home/menu.asm b/home/menu.asm index 64f7e4d8c..4e7b7772b 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -77,7 +77,7 @@ InterpretMenu2:: call MenuBox call UpdateSprites call Function1c89 - call Function321c + call ApplyTilemap call CopyMenuData2 ld a, [wMenuData2Flags] bit 7, a @@ -262,7 +262,7 @@ MenuWriteText:: push af ld a, $1 ld [hOAMUpdate], a - call Function321c + call ApplyTilemap pop af ld [hOAMUpdate], a ret diff --git a/home/rtc.asm b/home/rtc.asm index 7070c0dad..9fb71c0be 100644 --- a/home/rtc.asm +++ b/home/rtc.asm @@ -2,7 +2,7 @@ RTC:: ; 46f ; update time and time-sensitive palettes ; rtc enabled? - ld a, [wc2ce] + ld a, [wSpriteUpdatesEnabled] cp 0 ret z diff --git a/home/text.asm b/home/text.asm index 2877f88dd..37208af9d 100644 --- a/home/text.asm +++ b/home/text.asm @@ -192,7 +192,7 @@ SetUpTextBox:: ; 106c push hl call SpeechTextBox call UpdateSprites - call Function321c + call ApplyTilemap pop hl ret ; 1078 diff --git a/home/tilemap.asm b/home/tilemap.asm index 3153cea2c..74ec17cee 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -16,7 +16,7 @@ Function1c10:: ; 0x1c10 WriteBackup:: ; 0x1c17 push af call ExitMenu - call Function321c + call ApplyTilemap call UpdateSprites pop af ret diff --git a/main.asm b/main.asm index dfff0d855..0117e41c3 100644 --- a/main.asm +++ b/main.asm @@ -17,7 +17,7 @@ PlaceWaitingText:: ; 4000 jr .proceed .notinbattle - predef Function28eef + predef Predef_LinkTextbox .proceed hlcoord 4, 11 @@ -9921,7 +9921,7 @@ Pokepic:: ; 244e3 call CopyMenuDataHeader call MenuBox call UpdateSprites - call Function321c + call ApplyTilemap ld b, SCGB_12 call GetSGBLayout xor a @@ -9955,7 +9955,7 @@ PokepicYesOrNo:: ; 24528 xor a ld [hBGMapMode], a call OverworldTextModeSwitch - call Function321c + call ApplyTilemap call UpdateSprites call LoadStandardFont ret @@ -10051,7 +10051,7 @@ Function245af:: ; 245af call Function24764 call Function247dd call Function245f1 - call Function321c + call ApplyTilemap xor a ld [hBGMapMode], a ret @@ -17539,7 +17539,7 @@ Buena_ExitMenu: ; 4ae5e call DelayFrame ld a, $1 ld [hOAMUpdate], a - call Function321c + call ApplyTilemap pop af ld [hOAMUpdate], a ret @@ -17856,7 +17856,7 @@ PhoneRing_LoadEDTile: ; 4d188 ld a, [hCGB] and a jp z, WaitBGMap - ld a, [wc2ce] + ld a, [wSpriteUpdatesEnabled] cp $0 jp z, WaitBGMap @@ -22713,7 +22713,7 @@ StartBattleWithMapTrainerScript: ; 0xbe68a startbattle returnafterbattle trainerstatus SET_FLAG - loadvar wd04d, -1 + loadvar wRunningTrainerBattleScript, -1 AlreadyBeatenTrainerScript: scripttalkafter @@ -24096,7 +24096,7 @@ LoadMapTimeOfDay: ; 104750 ld hl, VramState res 6, [hl] ld a, $1 - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a callba Function8c0e5 callba Function8c001 call OverworldTextModeSwitch diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm index 3e21f1365..061e67117 100644 --- a/misc/mobile_22.asm +++ b/misc/mobile_22.asm @@ -150,13 +150,13 @@ Function891fe: ; 891fe Function89209: ; 89209 ld a, 1 - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a ret ; 8920f Function8920f: ; 8920f ld a, 0 - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a ret ; 89215 diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 51fbcbd65..00581de06 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -838,7 +838,7 @@ Jumptable_10052a: ; 10052a Function100534: ; 100534 call Function100513 call UpdateSprites - call Function321c + call ApplyTilemap ld a, [wcd28] inc a ld [wcd28], a @@ -1847,7 +1847,7 @@ Function100b7a: ; 100b7a callba Function24085 callba MobileTextBorder call UpdateSprites - call Function321c + call ApplyTilemap callba Function2411a ld hl, wcfa5 set 7, [hl] diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index ac44da8cd..836da4fa0 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -1290,7 +1290,7 @@ Function118936: call LoadMenuDataHeader call MenuBox call MenuBoxCoord2Tile - call Function321c + call ApplyTilemap hlcoord 16, 8, AttrMap ld a, $40 or [hl] @@ -4745,7 +4745,7 @@ Function11a207: ; 11a207 call LoadMenuDataHeader call MenuBox call MenuBoxCoord2Tile - call Function321c + call ApplyTilemap hlcoord 16, 8 ld de, String_11a2cf call PlaceString diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm index f4956bff9..19d192aeb 100755 --- a/misc/mobile_5b.asm +++ b/misc/mobile_5b.asm @@ -1028,7 +1028,7 @@ Function16d6ae: ; 16d6ae ret ; 16d6ca -Function16d6ca: ; 16d6ca +LinkTextbox: ; 16d6ca call Function16d61d ret ; 16d6ce @@ -1046,7 +1046,7 @@ Function16d6e1: ; 16d6e1 hlcoord 4, 10 ld b, 1 ld c, 10 - predef Function28eef + predef Predef_LinkTextbox hlcoord 5, 11 ld de, .Waiting call PlaceString diff --git a/wram.asm b/wram.asm index 00b4956b2..30b02eac4 100644 --- a/wram.asm +++ b/wram.asm @@ -311,7 +311,7 @@ AutoInputLength:: ; c2cb wc2cc:: ds 1 wc2cd:: ds 1 -wc2ce:: ds 1 +wSpriteUpdatesEnabled:: ds 1 wc2cf:: ds 1 wc2d0:: ds 4 wc2d4:: ds 1 @@ -1679,7 +1679,7 @@ wd048:: ds 1 wLossTextPointer:: ds 2 wScriptAfterPointer:: wd04b:: ds 2 -wd04d:: ds 1 +wRunningTrainerBattleScript:: ds 1 MenuItemsListEnd:: wTempTrainerHeaderEnd:: wd04e:: ds 2 @@ -2221,7 +2221,7 @@ wd453:: ds 1 wd454:: ds 1 ds 4 -wd459:: ds 2 +wBattleScriptFlags:: ds 2 wPlayerSpriteSetupFlags:: ds 1 wMapReentryScriptQueueFlag:: ds 1 ; MemScriptFlag wMapReentryScriptBank:: ds 1 ; MemScriptBank From 4bcd71e3227181baa536357af3d87a8d02af3890 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 26 Nov 2015 21:06:32 -0500 Subject: [PATCH 2/2] Fix some labels in engine/timeofdaypals.asm --- engine/map_setup.asm | 4 ++-- engine/specials.asm | 6 +++--- engine/timeofdaypals.asm | 6 +++--- event/field_moves.asm | 4 ++-- event/halloffame.asm | 4 ++-- event/sacred_ash.asm | 12 ++++++------ event/whiteout.asm | 2 +- home/map.asm | 4 ++-- maps/BattleTowerBattleRoom.asm | 10 +++++----- maps/BluesHouse.asm | 4 ++-- maps/EcruteakGym.asm | 2 +- maps/FastShip1F.asm | 4 ++-- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 2 +- maps/FastShipCabins_SW_SSW_NW.asm | 2 +- maps/IndigoPlateauPokeCenter1F.asm | 2 +- maps/LancesRoom.asm | 2 +- maps/MobileBattleRoom.asm | 4 ++-- maps/MrPokemonsHouse.asm | 2 +- maps/OlivineLighthouse6F.asm | 12 ++++++------ maps/OlivinePort.asm | 2 +- maps/RadioTower5F.asm | 2 +- maps/Route24.asm | 2 +- maps/Route26HealSpeechHouse.asm | 2 +- maps/Route35NationalParkgate.asm | 4 ++-- maps/Route36NationalParkgate.asm | 6 +++--- maps/SilverCaveRoom3.asm | 2 +- maps/SlowpokeWellB1F.asm | 4 ++-- maps/SproutTower3F.asm | 2 +- maps/TeamRocketBaseB1F.asm | 12 ++++++------ maps/TeamRocketBaseB2F.asm | 6 +++--- maps/VermilionPort.asm | 2 +- maps/WarehouseEntrance.asm | 8 ++++---- misc/mobile_40.asm | 2 +- 33 files changed, 72 insertions(+), 72 deletions(-) diff --git a/engine/map_setup.asm b/engine/map_setup.asm index ef1ad715e..7444c7fbe 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -272,8 +272,8 @@ MapSetupCommands: ; 15440 dba LoadMapAttributes ; 1a dba LoadMapAttributes_SkipPeople ; 1b dba ClearBGPalettes ; 1c - dba RotatePalettesRightPalettes ; 1d - dba RotatePalettesLeftPalettes ; 1e + dba FadeOutPalettes ; 1d + dba FadeInPalettes ; 1e dba GetCoordOfUpperLeftCorner ; 1f dba RestoreFacingAfterWarp ; 20 dba SpawnInFacingDown ; 21 diff --git a/engine/specials.asm b/engine/specials.asm index e2b4e6195..09edbb263 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -66,11 +66,11 @@ SpecialsPointers:: ; c029 add_special Special_CardFlip add_special Special_DummyNonfunctionalGameCornerGame add_special Special_ClearBGPalettesBufferScreen - add_special RotatePalettesRightPalettes + add_special FadeOutPalettes add_special Special_BattleTowerFade add_special Special_FadeBlackQuickly - add_special RotatePalettesLeftPalettes - add_special Special_RotatePalettesLeftQuickly + add_special FadeInPalettes + add_special Special_FadeInQuickly add_special Special_ReloadSpritesNoPalettes add_special ClearBGPalettes add_special UpdateTimePals diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index b977772eb..368636758 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -116,7 +116,7 @@ _UpdateTimePals:: ; 8c070 ret ; 8c079 -RotatePalettesLeftPalettes:: ; 8c079 +FadeInPalettes:: ; 8c079 ld c, $12 call GetTimePalFade ld b, $4 @@ -124,7 +124,7 @@ RotatePalettesLeftPalettes:: ; 8c079 ret ; 8c084 -RotatePalettesRightPalettes:: ; 8c084 +FadeOutPalettes:: ; 8c084 call Function8c0c1 ld c, $9 call GetTimePalFade @@ -150,7 +150,7 @@ endr ret ; 8c0ab -Special_RotatePalettesLeftQuickly: ; 8c0ab +Special_FadeInQuickly: ; 8c0ab ld c, $0 call GetTimePalFade ld b, $4 diff --git a/event/field_moves.asm b/event/field_moves.asm index e12709b1e..d6fa4a0bb 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4 ; 8c7e1 BlindingFlash: ; 8c7e1 - callba RotatePalettesRightPalettes + callba FadeOutPalettes ld hl, StatusFlags set 2, [hl] callba Function8c0e5 @@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1 ld b, SCGB_09 call GetSGBLayout callba Function49409 - callba RotatePalettesLeftPalettes + callba FadeInPalettes ret ; 8c80a diff --git a/event/halloffame.asm b/event/halloffame.asm index 9aa088495..d4b86286d 100755 --- a/event/halloffame.asm +++ b/event/halloffame.asm @@ -40,7 +40,7 @@ RedCredits:: ; 86455 ld [MusicFadeIDHi], a ld a, $a ld [MusicFade], a - callba RotatePalettesRightPalettes + callba FadeOutPalettes xor a ld [VramState], a ld [hMapAnims], a @@ -63,7 +63,7 @@ Function8648e: ; 8648e ld [MusicFadeIDHi], a ld a, 10 ld [MusicFade], a - callba RotatePalettesRightPalettes + callba FadeOutPalettes xor a ld [VramState], a ld [hMapAnims], a diff --git a/event/sacred_ash.asm b/event/sacred_ash.asm index 1b0a4e244..00b80bb46 100755 --- a/event/sacred_ash.asm +++ b/event/sacred_ash.asm @@ -52,12 +52,12 @@ SacredAshScript: ; 0x50821 special HealParty reloadmappart playsound SFX_WARP_TO - special RotatePalettesRightPalettes - special RotatePalettesLeftPalettes - special RotatePalettesRightPalettes - special RotatePalettesLeftPalettes - special RotatePalettesRightPalettes - special RotatePalettesLeftPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes waitbutton writetext UnknownText_0x50845 playsound SFX_CAUGHT_MON diff --git a/event/whiteout.asm b/event/whiteout.asm index cc42714d0..2e8774b8f 100755 --- a/event/whiteout.asm +++ b/event/whiteout.asm @@ -10,7 +10,7 @@ Script_OverworldWhiteout:: ; 0x124c8 Script_Whiteout: ; 0x124ce writetext .WhitedOutText closetext - special RotatePalettesRightPalettes + special FadeOutPalettes pause 40 special HealParty checkflag ENGINE_BUG_CONTEST_TIMER diff --git a/home/map.asm b/home/map.asm index d50c99349..e385517a1 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2007,7 +2007,7 @@ FadeToMenu:: ; 2b29 xor a ld [hBGMapMode], a call LoadStandardMenuDataHeader - callba RotatePalettesRightPalettes + callba FadeOutPalettes call ClearSprites call DisableSpriteUpdates ret @@ -2034,7 +2034,7 @@ Function2b5c:: ; 2b5c call GetSGBLayout callba Function49409 call Function3200 - callba RotatePalettesLeftPalettes + callba FadeInPalettes call EnableSpriteUpdates ret ; 2b74 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 07e0b8016..858b51fb0 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -31,7 +31,7 @@ Script_BattleRoomLoop: ; 0x9f425 keeptextopen loadmovesprites special BattleTowerBattle ; calls predef startbattle - special RotatePalettesRightPalettes + special FadeOutPalettes reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 @@ -46,10 +46,10 @@ Script_BattleRoomLoop: ; 0x9f425 closetext loadmovesprites playmusic MUSIC_HEAL - special RotatePalettesRightPalettes + special FadeOutPalettes special LoadMapPalettes pause 60 - special RotatePalettesLeftPalettes + special FadeInPalettes special RestartMapMusic loadfont writetext Text_NextUpOpponentNo @@ -73,7 +73,7 @@ Script_DontBattleNextOpponent: ; 0x9f483 special BattleTowerAction playsound SFX_SAVE waitbutton - special RotatePalettesRightPalettes + special FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge @@ -84,7 +84,7 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3 writebyte BATTLE_TOWER_ACTION_06 special BattleTowerAction loadmovesprites - special RotatePalettesRightPalettes + special FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, $7, $7 loadfont jump UnknownScript_0x9e4b0 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index f15cbd1f3..36d06b943 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -30,10 +30,10 @@ UnknownScript_0x19b0de: writetext UnknownText_0x19b266 closetext loadmovesprites - special RotatePalettesRightPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special RotatePalettesLeftPalettes + special FadeInPalettes special RestartMapMusic loadfont writetext UnknownText_0x19b296 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 2e205fa8a..f3e136c9d 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -84,7 +84,7 @@ UnknownScript_0x99dc6: follow PLAYER, $8 applymovement PLAYER, MovementData_0x99e5f stopfollow - special RotatePalettesRightPalettes + special FadeOutPalettes playsound SFX_ENTER_DOOR waitbutton warp ECRUTEAK_CITY, $6, $1b diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index ec41829db..be1675a1b 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -64,7 +64,7 @@ SailorScript_0x75160: loadmovesprites scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitbutton setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY domaptrigger VERMILION_PORT, $1 @@ -77,7 +77,7 @@ SailorScript_0x75160: loadmovesprites scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitbutton setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY domaptrigger OLIVINE_PORT, $1 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 69a499841..70759c740 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -43,7 +43,7 @@ TwinScript_0x75ebb: appear $4 spriteface PLAYER, UP spriteface $4, UP - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly spriteface $3, DOWN showemote EMOTE_SHOCK, $3, 15 applymovement $4, MovementData_0x7600c diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index c459b1e7e..493ee070e 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -70,7 +70,7 @@ FastShipBed: playmusic MUSIC_HEAL pause 60 special RestartMapMusic - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly loadfont writetext FastShipBedText2 closetext diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 5cce7f36c..6595cc0a9 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -154,7 +154,7 @@ TeleportGuyScript: closetext loadmovesprites playsound SFX_WARP_TO - special RotatePalettesRightPalettes + special FadeOutPalettes waitbutton warp NEW_BARK_TOWN, $d, $6 end diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 549baf320..0a89ea3a7 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -125,7 +125,7 @@ LanceScript_0x180e7b: pause 30 loadmovesprites applymovement $3, MovementData_0x180f5b - special RotatePalettesRightPalettes + special FadeOutPalettes pause 15 warpfacing UP, HALL_OF_FAME, $4, $d end diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 44ee3a5b1..c672c3b69 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -35,11 +35,11 @@ MapMobileBattleRoomSignpost0Script: writetext MobileBattleRoom_HealText pause 20 loadmovesprites - special RotatePalettesRightPalettes + special FadeOutPalettes playmusic MUSIC_HEAL special LoadMapPalettes pause 60 - special RotatePalettesLeftPalettes + special FadeInPalettes special RestartMapMusic refreshscreen $0 .two_: diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index cc1f22f21..aeac05928 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -114,7 +114,7 @@ UnknownScript_0x196ec9: special Mobile_HealParty special HealParty pause 60 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly special RestartMapMusic loadfont writetext UnknownText_0x197134 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index b8986bad8..aae5ed42e 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -42,9 +42,9 @@ UnknownScript_0x60bab: loadmovesprites special RestartMapMusic cry AMPHAROS - special RotatePalettesRightPalettes + special FadeOutPalettes pause 10 - special RotatePalettesLeftPalettes + special FadeInPalettes loadfont writetext UnknownText_0x60f3d closetext @@ -116,10 +116,10 @@ UnknownScript_0x60c51: cry AMPHAROS closetext loadmovesprites - special RotatePalettesRightPalettes - special RotatePalettesLeftPalettes - special RotatePalettesRightPalettes - special RotatePalettesLeftPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes end ItemFragment_0x60c66: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 39d77694f..38941d295 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -39,7 +39,7 @@ SailorScript_0x748c0: waitbutton applymovement PLAYER, MovementData_0x74a30 playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitbutton checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 3f1b16882..32a363e55 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -95,7 +95,7 @@ UnknownScript_0x6006e: disappear $3 disappear $4 pause 15 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly 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 0e6467288..b828c9e89 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -29,7 +29,7 @@ RocketScript_0x1adbfa: special Special_ReloadSpritesNoPalettes disappear $2 pause 25 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly playmapmusic end diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index e187b09d4..785daaeb2 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -17,7 +17,7 @@ TeacherScript_0x7b125: playmusic MUSIC_HEAL special HealParty pause 60 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly special RestartMapMusic loadfont writetext UnknownText_0x7b18b diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 005b1f1fd..ba5c3516a 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -75,7 +75,7 @@ Route35NationalParkgate_GoBackIn: loadmovesprites scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR - special RotatePalettesRightPalettes + special FadeOutPalettes waitbutton warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f end @@ -112,7 +112,7 @@ Route35NationalParkgate_OkayToProceed: special Special_GiveParkBalls scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR - special RotatePalettesRightPalettes + special FadeOutPalettes waitbutton special Special_SelectRandomBugContestContestants warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 495ef1856..03c8c2474 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -74,7 +74,7 @@ Route36NationalParkgate_MapScriptHeader: appear $d applymovement PLAYER, MovementData_0x6add1 pause 15 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly jumpstd bugcontestresults .GoBackToContest: @@ -83,7 +83,7 @@ Route36NationalParkgate_MapScriptHeader: loadmovesprites spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitbutton warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 end @@ -166,7 +166,7 @@ Route36OfficerScriptContest: special Special_GiveParkBalls spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitbutton special Special_SelectRandomBugContestContestants warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index b01588ba6..08831af22 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -26,7 +26,7 @@ RedScript_0x18c603: special Special_ReloadSpritesNoPalettes disappear $2 pause 15 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly pause 30 special HealParty refreshscreen $0 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 1d98bf807..27b397543 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -34,7 +34,7 @@ GruntM1Script: disappear $4 disappear $5 pause 15 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly disappear $8 moveperson $8, $b, $6 appear $8 @@ -56,7 +56,7 @@ GruntM1Script: clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_KURT_1 - special RotatePalettesRightPalettes + special FadeOutPalettes special HealParty pause 15 warp KURTS_HOUSE, $3, $3 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 06c85c22b..c8a1216a8 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -51,7 +51,7 @@ UnknownScript_0x184947: special Special_ReloadSpritesNoPalettes disappear $8 waitbutton - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly dotrigger $1 special RestartMapMusic end diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 5bd666972..e9e68a97d 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -445,9 +445,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special RotatePalettesRightPalettes + special FadeOutPalettes cry VOLTORB - special RotatePalettesLeftPalettes + special FadeInPalettes setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata VOLTORB, 23 @@ -455,9 +455,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special RotatePalettesRightPalettes + special FadeOutPalettes cry GEODUDE - special RotatePalettesLeftPalettes + special FadeInPalettes setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata GEODUDE, 21 @@ -465,9 +465,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special RotatePalettesRightPalettes + special FadeOutPalettes cry KOFFING - special RotatePalettesLeftPalettes + special FadeInPalettes setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata KOFFING, 21 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 39b8ea4fc..2a44c4652 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -106,7 +106,7 @@ UnknownScript_0x6cfac: disappear $d disappear $e pause 15 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly dotrigger $2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface $4, DOWN @@ -155,11 +155,11 @@ UnknownScript_0x6d091: writetext UnknownText_0x6da97 closetext loadmovesprites - special RotatePalettesRightPalettes + special FadeOutPalettes special Mobile_HealParty playsound SFX_FULL_HEAL special HealParty - special RotatePalettesLeftPalettes + special FadeInPalettes loadfont writetext UnknownText_0x6daf7 closetext diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index fd48206eb..c9cb32207 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -51,7 +51,7 @@ SailorScript_0x74dc4: waitbutton applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitbutton setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 12b9ae2d6..2ef14fcc0 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -226,10 +226,10 @@ OlderHaircutBrotherScript: writetext UnknownText_0x7c6b8 closetext loadmovesprites - special RotatePalettesRightPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special RotatePalettesLeftPalettes + special FadeInPalettes special RestartMapMusic loadfont writetext UnknownText_0x7c6d8 @@ -309,10 +309,10 @@ YoungerHaircutBrotherScript: writetext UnknownText_0x7c80e closetext loadmovesprites - special RotatePalettesRightPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special RotatePalettesLeftPalettes + special FadeInPalettes special RestartMapMusic loadfont writetext UnknownText_0x7c82a diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 00581de06..9b98046c0 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -313,7 +313,7 @@ Function10016f: ; 10016f Function10020b: ; 10020b xor a ld [wc303], a - callba RotatePalettesRightPalettes + callba FadeOutPalettes callba Function106464 call HideSprites call DelayFrame