From 37e4c62208974f5012479c47b22f92b410395eec Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 29 Jan 2024 23:43:17 +0000 Subject: [PATCH] Improve some innacurate function names, labels, and comments (#1078) [https://github.com/pret/pokecrystal/issues/1078#issue-1869550979 and https://github.com/pret/pokecrystal/issues/1078#issuecomment-1696394371] --- pokecrystal.map | 190 ++++++++++++++++++++-------------------- pokecrystal.sym | 190 ++++++++++++++++++++-------------------- pokecrystal11.map | 190 ++++++++++++++++++++-------------------- pokecrystal11.sym | 190 ++++++++++++++++++++-------------------- pokecrystal11_debug.map | 190 ++++++++++++++++++++-------------------- pokecrystal11_debug.sym | 190 ++++++++++++++++++++-------------------- pokecrystal11_vc.map | 190 ++++++++++++++++++++-------------------- pokecrystal11_vc.sym | 190 ++++++++++++++++++++-------------------- pokecrystal_au.map | 190 ++++++++++++++++++++-------------------- pokecrystal_au.sym | 190 ++++++++++++++++++++-------------------- pokecrystal_debug.map | 190 ++++++++++++++++++++-------------------- pokecrystal_debug.sym | 190 ++++++++++++++++++++-------------------- 12 files changed, 1140 insertions(+), 1140 deletions(-) diff --git a/pokecrystal.map b/pokecrystal.map index c9ef28f2f4e..ff582d3d092 100644 --- a/pokecrystal.map +++ b/pokecrystal.map @@ -165,7 +165,7 @@ ROM0 bank #0: $0833 = SerialDisconnected $083b = Serial_ExchangeSyncBytes $0847 = Serial_ExchangeSyncBytes.exchange - $0862 = Serial_PrintWaitingTextAndSyncAndExchangeNybble + $0862 = Serial_PlaceWaitingTextAndSyncAndExchangeNybble $0871 = Serial_SyncAndExchangeNybble $087d = WaitLinkTransfer $0882 = WaitLinkTransfer.loop @@ -263,7 +263,7 @@ ROM0 bank #0: $0d79 = ClearVBank1 $0d90 = GSReloadPalettes $0d91 = ReloadSpritesNoPalettes - $0db1 = SwapTextboxPalettes + $0db1 = LoadOverworldAttrmapPals $0dbd = ScrollBGMapPalettes $0dc9 = Get2bppViaHDMA $0ddc = Get1bppViaHDMA @@ -408,7 +408,7 @@ ROM0 bank #0: $13d4 = PlaceFarString $13e0 = PokeFluteTerminator $13e4 = PokeFluteTerminator.stop - $13e5 = PlaceHLTextAtBC + $13e5 = PrintTextboxTextAt $13f6 = DoTextUntilTerminator $13ff = DoTextUntilTerminator.TextCommand $1410 = TextCommands @@ -474,9 +474,9 @@ ROM0 bank #0: $1830 = GetSpriteVTile.found $1833 = GetSpriteVTile.done $1836 = DoesSpriteHaveFacings - $184a = GetPlayerTile + $184a = GetPlayerTilePermission $1852 = CheckOnWater - $185d = GetTileCollision + $185d = GetTilePermission $1875 = CheckGrassTile $1882 = CheckGrassTile.grass $1888 = CheckGrassTile.water @@ -520,8 +520,8 @@ ROM0 bank #0: $1a61 = CopySpriteMovementData $1a71 = CopySpriteMovementData.CopyData $1aae = _GetMovementIndex - $1ac6 = SetVramState_Bit0 - $1acc = ResetVramState_Bit0 + $1ac6 = SetVramState_SpriteUpdatesDisabled + $1acc = ResetVramState_SpriteUpdatesDisabled $1ad2 = UpdateSprites $1ae5 = GetObjectStruct $1af1 = DoesObjectHaveASprite @@ -656,8 +656,8 @@ ROM0 bank #0: $2167 = GetMapSceneID.end $216a = GetMapSceneID.found $216d = GetMapSceneID.done - $2173 = OverworldTextModeSwitch - $217a = LoadMapPart + $2173 = LoadOverworldTilemapAndAttrmapPals + $217a = LoadOverworldTilemap $2198 = LoadMetatiles $21a5 = LoadMetatiles.row $21a9 = LoadMetatiles.col @@ -698,7 +698,7 @@ ROM0 bank #0: $23a5 = GetMapConnection.loop $23ac = ReadMapSceneScripts $23c3 = ReadMapCallbacks - $23da = ReadWarps + $23da = ReadWarpEvents $23f1 = ReadCoordEvents $2408 = ReadBGEvents $241f = ReadObjectEvents @@ -803,10 +803,10 @@ ROM0 bank #0: $29ff = GetMovementPermissions.CheckHiNybble $2a07 = GetFacingTileCoord $2a2c = GetFacingTileCoord.Directions - $2a3c = GetCoordTile - $2a56 = GetCoordTile.nocarry - $2a5c = GetCoordTile.nocarry2 - $2a63 = GetCoordTile.nope + $2a3c = GetCoordTileCollision + $2a56 = GetCoordTileCollision.nocarry + $2a5c = GetCoordTileCollision.nocarry2 + $2a63 = GetCoordTileCollision.nope $2a66 = GetBlockLocation $2a78 = GetBlockLocation.loop $2a7d = GetBlockLocation.ok @@ -867,11 +867,11 @@ ROM0 bank #0: $2d82 = FarCall_JumpToHL $2d83 = Predef $2da6 = Predef.Return - $2dba = RefreshScreen + $2dba = ReanchorMap $2dcf = CloseText $2de2 = CloseText.CloseText $2e08 = OpenText - $2e20 = _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + $2e20 = HDMATransferTilemapAndAttrmap_Menu $2e31 = SafeUpdateSprites $2e4e = SetCarryFlag $2e50 = ResetMapBufferEventFlags @@ -1004,8 +1004,8 @@ ROM0 bank #0: $32cc = _CopyTilemapAtOnce.loop_u12 $32d5 = _CopyTilemapAtOnce.loop_u13 $32de = _CopyTilemapAtOnce.loop_u14 - $32f9 = SetPalettes - $3309 = SetPalettes.SetPalettesForGameBoyColor + $32f9 = SetDefaultBGPAndOBP + $3309 = SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor $3317 = ClearPalettes $3324 = ClearPalettes.cgb $333e = GetMemSGBLayout @@ -2539,11 +2539,11 @@ ROMX bank #3: $40aa = CardFlipSpecial $40ad = UnusedMemoryGameSpecial $40b0 = ClearBGPalettesBufferScreenSpecial - $40b3 = FadeOutPalettesSpecial + $40b3 = FadeOutToWhiteSpecial $40b6 = BattleTowerFadeSpecial - $40b9 = FadeBlackQuicklySpecial - $40bc = FadeInPalettesSpecial - $40bf = FadeInQuicklySpecial + $40b9 = FadeOutToBlackSpecial + $40bc = FadeInFromWhiteSpecial + $40bf = FadeInFromBlackSpecial $40c2 = ReloadSpritesNoPalettesSpecial $40c5 = ClearBGPalettesSpecial $40c8 = UpdateTimePalsSpecial @@ -4814,8 +4814,8 @@ ROMX bank #5: $548e = LoadMapAttributes_MapSetupCmd $5491 = LoadMapAttributes_SkipObjects_MapSetupCmd $5494 = ClearBGPalettes_MapSetupCmd - $5497 = FadeOutPalettes_MapSetupCmd - $549a = FadeInPalettes_MapSetupCmd + $5497 = FadeOutToWhite_MapSetupCmd + $549a = FadeInFromWhite_MapSetupCmd $549d = GetMapScreenCoords_MapSetupCmd $54a0 = GetWarpDestCoords_MapSetupCmd $54a3 = SpawnInFacingDown_MapSetupCmd @@ -4840,8 +4840,8 @@ ROMX bank #5: $54f1 = SkipUpdateMapSprites $54f7 = CheckUpdatePlayerSprite $5508 = CheckUpdatePlayerSprite.ok - $550c = CheckUpdatePlayerSprite.CheckBiking - $551a = CheckUpdatePlayerSprite.CheckSurfing2 + $550c = CheckUpdatePlayerSprite.CheckForcedBiking + $551a = CheckUpdatePlayerSprite.ResetSurfingOrBikingState $553e = CheckUpdatePlayerSprite.no_biking $5545 = CheckUpdatePlayerSprite.surfing $554c = CheckUpdatePlayerSprite.nope @@ -9732,7 +9732,7 @@ ROMX bank #15: $7ce0 = BattleStartMessage.cry_no_anim $7ceb = BattleStartMessage.skip_cry $7cfd = BattleStartMessage.NotFishing - $7d0e = BattleStartMessage.PlaceBattleStartText + $7d0e = BattleStartMessage.PrintBattleStartText $7d28 = BattleCommandPointers EMPTY: $7e86-$7fff ($017a bytes) TOTAL EMPTY: $017a bytes @@ -11009,11 +11009,11 @@ ROMX bank #18: ROMX bank #19: SECTION: $4000-$5248 ($1249 bytes) ["bank13"] - $4000 = _SwapTextboxPalettes - $4008 = _SwapTextboxPalettes.loop - $400b = _SwapTextboxPalettes.innerloop - $4021 = _SwapTextboxPalettes.UpperNybble - $4031 = _SwapTextboxPalettes.next + $4000 = _LoadOverworldAttrmapPals + $4008 = _LoadOverworldAttrmapPals.loop + $400b = _LoadOverworldAttrmapPals.innerloop + $4021 = _LoadOverworldAttrmapPals.UpperNybble + $4031 = _LoadOverworldAttrmapPals.next $403f = _ScrollBGMapPalettes $4045 = _ScrollBGMapPalettes.loop $405b = _ScrollBGMapPalettes.UpperNybble @@ -11057,7 +11057,7 @@ ROMX bank #19: $4d25 = TilesetBattleTowerInsidePalMap $4d95 = TilesetBattleTowerOutsidePalMap $4e05 = MapGroupPalettes - $4e1f = TileCollisionTable + $4e1f = CollisionPermissionTable $4f1f = EmptyAllSRAMBanks $4f34 = EmptyAllSRAMBanks.EmptyBank $4f45 = SaveMenu_CopyTilemapAtOnce @@ -11078,12 +11078,12 @@ ROMX bank #19: $4ffe = CheckSave $501b = CheckSave.ok $501e = MapScenes - $515b = _LoadMapPart - $5168 = _LoadMapPart.top_row - $5170 = _LoadMapPart.left_column - $5175 = _LoadMapPart.loop - $5177 = _LoadMapPart.loop2 - $5184 = _LoadMapPart.carry + $515b = _LoadOverworldTilemap + $5168 = _LoadOverworldTilemap.top_row + $5170 = _LoadOverworldTilemap.left_column + $5175 = _LoadOverworldTilemap.loop + $5177 = _LoadOverworldTilemap.loop2 + $5184 = _LoadOverworldTilemap.carry $5188 = PhoneRing_CopyTilemapAtOnce $51a2 = PhoneRing_CopyTilemapAtOnce.wait $51bd = PhoneRing_CopyTilemapAtOnce.wait2 @@ -11557,9 +11557,9 @@ ROMX bank #20: $444f = PartyMenu2DMenuData $4457 = PartyMenuSelect $448f = PartyMenuSelect.exitmenu - $449a = PrintPartyMenuText - $44ae = PrintPartyMenuText.haspokemon - $44be = PrintPartyMenuText.gotstring + $449a = PlacePartyMenuText + $44ae = PlacePartyMenuText.haspokemon + $44be = PlacePartyMenuText.gotstring $44d2 = PartyMenuStrings $44e4 = ChooseAMonString $44f3 = UseOnWhichPKMNString @@ -17334,12 +17334,12 @@ ROMX bank #35: $405b = _TimeOfDayPals.pop $406e = _TimeOfDayPals.dontchange $4070 = _UpdateTimePals - $4079 = FadeInPalettes - $4084 = FadeOutPalettes + $4079 = FadeInFromWhite + $4084 = FadeOutToWhite $4092 = BattleTowerFade $409c = BattleTowerFade.loop - $40ab = FadeInQuickly - $40b6 = FadeBlackQuickly + $40ab = FadeInFromBlack + $40b6 = FadeOutToBlack $40c1 = FillWhiteBGColor $40d4 = FillWhiteBGColor.loop $40e5 = ReplaceTimeOfDayPals @@ -19087,19 +19087,19 @@ ROMX bank #37: $66c3 = OverworldLoop.Jumptable $66cb = DisableEvents $66d0 = EnableEvents - $66d6 = CheckBit5_ScriptFlags2 - $66dc = DisableWarpsConnxns + $66d6 = CheckEnabledMapEventsBit5 + $66dc = DisableWarpsConnections $66e2 = DisableCoordEvents $66e8 = DisableStepCount $66ee = DisableWildEncounters - $66f4 = EnableWarpsConnxns + $66f4 = EnableWarpsConnections $66fa = EnableCoordEvents $6700 = EnableStepCount $6706 = EnableWildEncounters - $670c = CheckWarpConnxnScriptFlag - $6712 = CheckCoordEventScriptFlag - $6718 = CheckStepCountScriptFlag - $671e = CheckWildEncountersScriptFlag + $670c = CheckWarpConnectionsEnabled + $6712 = CheckCoordEventsEnabled + $6718 = CheckStepCountEnabled + $671e = CheckWildEncountersEnabled $6724 = StartMap $673e = EnterMap $675a = EnterMap.dont_enable @@ -19123,8 +19123,8 @@ ROMX bank #37: $681f = PlayerEvents $6848 = PlayerEvents.ok $6865 = PlayerEvents.ok2 - $6867 = CheckTrainerBattle_GetPlayerEvent - $6872 = CheckTrainerBattle_GetPlayerEvent.nope + $6867 = CheckTrainerEvent + $6872 = CheckTrainerEvent.nope $6874 = CheckTileEvent $6886 = CheckTileEvent.connections_disabled $6890 = CheckTileEvent.coord_events_disabled @@ -19137,7 +19137,7 @@ ROMX bank #37: $68c7 = CheckWildEncounterCooldown $68d1 = SetUpFiveStepWildEncounterCooldown $68d7 = SetMinTwoStepWildEncounterCooldown - $68e4 = Dummy_CheckScriptFlags2Bit5 + $68e4 = Dummy_CheckEnabledMapEventsBit5 $68ec = RunSceneScript $6938 = RunSceneScript.nope $693a = CheckTimeEvents @@ -19471,13 +19471,13 @@ ROMX bank #37: $7a9e = Script_delcmdqueue $7ab3 = Script_changemapblocks $7acc = Script_changeblock - $7ae3 = Script_reloadmappart + $7ae3 = Script_refreshmap $7af6 = Script_warpcheck $7b01 = Script_enableevents $7b08 = Script_newloadmap $7b16 = Script_reloadend $7b1c = Script_opentext - $7b20 = Script_refreshscreen + $7b20 = Script_reanchormap $7b27 = Script_writeunusedbyte $7b2e = UnusedClosetextScript $7b2f = Script_closetext @@ -19504,7 +19504,7 @@ ROMX bank #37: $7c27 = Script_checkver_duplicate.gs_version $7c28 = WarpToSpawnPoint $7c30 = RunMemScript - $7c4f = LoadScriptBDE + $7c4f = LoadMemScript $7c5f = TryTileCollisionEvent $7c7b = TryTileCollisionEvent.whirlpool $7c8b = TryTileCollisionEvent.waterfall @@ -19519,9 +19519,9 @@ ROMX bank #37: $7ced = RandomEncounter.ok_bug_contest $7cf4 = RandomEncounter.done $7cf9 = WildBattleScript - $7cfd = CanUseSweetScent - $7d17 = CanUseSweetScent.ice_check - $7d21 = CanUseSweetScent.no + $7cfd = CanEncounterWildMon + $7d17 = CanEncounterWildMon.ice_check + $7d21 = CanEncounterWildMon.no $7d23 = _TryWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest.loop @@ -31416,31 +31416,31 @@ ROMX bank #65: $4033 = HDMATransferTilemapToWRAMBank3.Function $4047 = HDMATransferAttrmapToWRAMBank3 $404d = HDMATransferAttrmapToWRAMBank3.Function - $4061 = ReloadMapPart - $4067 = ReloadMapPart.Function - $4099 = Mobile_ReloadMapPart - $40a2 = Mobile_ReloadMapPart.Function + $4061 = HDMATransferTilemapAndAttrmap_Overworld + $4067 = HDMATransferTilemapAndAttrmap_Overworld.Function + $4099 = Mobile_HDMATransferTilemapAndAttrmap_Overworld + $40a2 = Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function $40d4 = Function1040d4 $40da = Function1040d4.Function $40fb = Function1040fb $4101 = Function1040fb.Function - $4110 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $4116 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function - $4148 = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $414e = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function + $4110 = _HDMATransferTilemapAndAttrmap_Menu + $4116 = _HDMATransferTilemapAndAttrmap_Menu.Function + $4148 = Mobile_HDMATransferTilemapAndAttrmap_Menu + $414e = Mobile_HDMATransferTilemapAndAttrmap_Menu.Function $4177 = CallInSafeGFXMode $419c = CallInSafeGFXMode._hl_ $419d = HDMATransferToWRAMBank3 $41a4 = WaitDMATransfer $41a4 = WaitDMATransfer.loop - $41ad = HDMATransfer_Wait127Scanlines_toBGMap - $41b7 = HDMATransfer_Wait123Scanlines_toBGMap + $41ad = HDMATransfer_WaitForScanline128_toBGMap + $41b7 = HDMATransfer_WaitForScanline124_toBGMap $41c1 = HDMATransfer_NoDI $41e4 = HDMATransfer_NoDI.loop1 $41e9 = HDMATransfer_NoDI.loop2 $41f8 = HDMATransfer_NoDI.loop3 - $4205 = HDMATransfer_Wait123Scanlines - $4209 = HDMATransfer_Wait127Scanlines + $4205 = HDMATransfer_WaitForScanline124 + $4209 = HDMATransfer_WaitForScanline128 $420b = _continue_HDMATransfer $4225 = _continue_HDMATransfer.ly_loop $422b = _continue_HDMATransfer.rstat_loop_1 @@ -35858,9 +35858,9 @@ ROMX bank #91: $56a7 = LoadTradeRoomBGPals $56ae = LoadCableTradeBorderTilemap $56ca = LinkTextbox - $56ce = PrintWaitingTextAndSyncAndExchangeNybble - $56e1 = PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText - $5701 = PrintWaitingTextAndSyncAndExchangeNybble.Waiting + $56ce = PlaceWaitingTextAndSyncAndExchangeNybble + $56e1 = PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText + $5701 = PlaceWaitingTextAndSyncAndExchangeNybble.Waiting $570c = LinkTradeMenu $5713 = LinkTradeMenu.GetJoypad $5725 = LinkTradeMenu.MenuAction @@ -55940,7 +55940,7 @@ WRAMX bank #1: $d046 = wWalkingY $d046 = wBufferMonSpclDef $d047 = wWinTextPointer - $d047 = wWalkingTile + $d047 = wWalkingTileCollision $d048 = wBufferMonStructEnd $d049 = wLossTextPointer $d04b = wScriptAfterPointer @@ -55983,7 +55983,7 @@ WRAMX bank #1: $d0ec = wSolvedUnownPuzzle $d0ec = wItemEffectSucceeded $d0ec = wBattlePlayerAction - $d0ed = wVramState + $d0ed = wStateFlags $d0ee = wBattleResult $d0ef = wUsingItemWithSelect $d0f0 = wCurElevatorCount @@ -56558,7 +56558,7 @@ WRAMX bank #1: $d432 = wMapStatus $d433 = wMapEventStatus $d434 = wScriptFlags - $d436 = wScriptFlags2 + $d436 = wEnabledPlayerEvents $d437 = wScriptMode $d438 = wScriptRunning $d439 = wScriptBank @@ -56636,7 +56636,7 @@ WRAMX bank #1: $d4e1 = wPlayerAction $d4e2 = wPlayerStepFrame $d4e3 = wPlayerFacing - $d4e4 = wPlayerTile + $d4e4 = wPlayerTileCollision $d4e5 = wPlayerLastTile $d4e6 = wPlayerMapX $d4e7 = wPlayerMapY @@ -56670,7 +56670,7 @@ WRAMX bank #1: $d509 = wObject1Action $d50a = wObject1StepFrame $d50b = wObject1Facing - $d50c = wObject1Tile + $d50c = wObject1TileCollision $d50d = wObject1LastTile $d50e = wObject1MapX $d50f = wObject1MapY @@ -56704,7 +56704,7 @@ WRAMX bank #1: $d531 = wObject2Action $d532 = wObject2StepFrame $d533 = wObject2Facing - $d534 = wObject2Tile + $d534 = wObject2TileCollision $d535 = wObject2LastTile $d536 = wObject2MapX $d537 = wObject2MapY @@ -56738,7 +56738,7 @@ WRAMX bank #1: $d559 = wObject3Action $d55a = wObject3StepFrame $d55b = wObject3Facing - $d55c = wObject3Tile + $d55c = wObject3TileCollision $d55d = wObject3LastTile $d55e = wObject3MapX $d55f = wObject3MapY @@ -56772,7 +56772,7 @@ WRAMX bank #1: $d581 = wObject4Action $d582 = wObject4StepFrame $d583 = wObject4Facing - $d584 = wObject4Tile + $d584 = wObject4TileCollision $d585 = wObject4LastTile $d586 = wObject4MapX $d587 = wObject4MapY @@ -56806,7 +56806,7 @@ WRAMX bank #1: $d5a9 = wObject5Action $d5aa = wObject5StepFrame $d5ab = wObject5Facing - $d5ac = wObject5Tile + $d5ac = wObject5TileCollision $d5ad = wObject5LastTile $d5ae = wObject5MapX $d5af = wObject5MapY @@ -56840,7 +56840,7 @@ WRAMX bank #1: $d5d1 = wObject6Action $d5d2 = wObject6StepFrame $d5d3 = wObject6Facing - $d5d4 = wObject6Tile + $d5d4 = wObject6TileCollision $d5d5 = wObject6LastTile $d5d6 = wObject6MapX $d5d7 = wObject6MapY @@ -56874,7 +56874,7 @@ WRAMX bank #1: $d5f9 = wObject7Action $d5fa = wObject7StepFrame $d5fb = wObject7Facing - $d5fc = wObject7Tile + $d5fc = wObject7TileCollision $d5fd = wObject7LastTile $d5fe = wObject7MapX $d5ff = wObject7MapY @@ -56908,7 +56908,7 @@ WRAMX bank #1: $d621 = wObject8Action $d622 = wObject8StepFrame $d623 = wObject8Facing - $d624 = wObject8Tile + $d624 = wObject8TileCollision $d625 = wObject8LastTile $d626 = wObject8MapX $d627 = wObject8MapY @@ -56942,7 +56942,7 @@ WRAMX bank #1: $d649 = wObject9Action $d64a = wObject9StepFrame $d64b = wObject9Facing - $d64c = wObject9Tile + $d64c = wObject9TileCollision $d64d = wObject9LastTile $d64e = wObject9MapX $d64f = wObject9MapY @@ -56976,7 +56976,7 @@ WRAMX bank #1: $d671 = wObject10Action $d672 = wObject10StepFrame $d673 = wObject10Facing - $d674 = wObject10Tile + $d674 = wObject10TileCollision $d675 = wObject10LastTile $d676 = wObject10MapX $d677 = wObject10MapY @@ -57010,7 +57010,7 @@ WRAMX bank #1: $d699 = wObject11Action $d69a = wObject11StepFrame $d69b = wObject11Facing - $d69c = wObject11Tile + $d69c = wObject11TileCollision $d69d = wObject11LastTile $d69e = wObject11MapX $d69f = wObject11MapY @@ -57044,7 +57044,7 @@ WRAMX bank #1: $d6c1 = wObject12Action $d6c2 = wObject12StepFrame $d6c3 = wObject12Facing - $d6c4 = wObject12Tile + $d6c4 = wObject12TileCollision $d6c5 = wObject12LastTile $d6c6 = wObject12MapX $d6c7 = wObject12MapY @@ -57457,8 +57457,8 @@ WRAMX bank #1: $dbf5 = wBikeFlags $dbf7 = wCurMapSceneScriptPointer $dbf9 = wCurCaller - $dbfb = wCurMapWarpCount - $dbfc = wCurMapWarpsPointer + $dbfb = wCurMapWarpEventCount + $dbfc = wCurMapWarpEventsPointer $dbfe = wCurMapCoordEventCount $dbff = wCurMapCoordEventsPointer $dc01 = wCurMapBGEventCount diff --git a/pokecrystal.sym b/pokecrystal.sym index e2ef7394002..1bbc22693ed 100644 --- a/pokecrystal.sym +++ b/pokecrystal.sym @@ -130,7 +130,7 @@ 00:0833 SerialDisconnected 00:083b Serial_ExchangeSyncBytes 00:0847 Serial_ExchangeSyncBytes.exchange -00:0862 Serial_PrintWaitingTextAndSyncAndExchangeNybble +00:0862 Serial_PlaceWaitingTextAndSyncAndExchangeNybble 00:0871 Serial_SyncAndExchangeNybble 00:087d WaitLinkTransfer 00:0882 WaitLinkTransfer.loop @@ -228,7 +228,7 @@ 00:0d79 ClearVBank1 00:0d90 GSReloadPalettes 00:0d91 ReloadSpritesNoPalettes -00:0db1 SwapTextboxPalettes +00:0db1 LoadOverworldAttrmapPals 00:0dbd ScrollBGMapPalettes 00:0dc9 Get2bppViaHDMA 00:0ddc Get1bppViaHDMA @@ -373,7 +373,7 @@ 00:13d4 PlaceFarString 00:13e0 PokeFluteTerminator 00:13e4 PokeFluteTerminator.stop -00:13e5 PlaceHLTextAtBC +00:13e5 PrintTextboxTextAt 00:13f6 DoTextUntilTerminator 00:13ff DoTextUntilTerminator.TextCommand 00:1410 TextCommands @@ -439,9 +439,9 @@ 00:1830 GetSpriteVTile.found 00:1833 GetSpriteVTile.done 00:1836 DoesSpriteHaveFacings -00:184a GetPlayerTile +00:184a GetPlayerTilePermission 00:1852 CheckOnWater -00:185d GetTileCollision +00:185d GetTilePermission 00:1875 CheckGrassTile 00:1882 CheckGrassTile.grass 00:1888 CheckGrassTile.water @@ -485,8 +485,8 @@ 00:1a61 CopySpriteMovementData 00:1a71 CopySpriteMovementData.CopyData 00:1aae _GetMovementIndex -00:1ac6 SetVramState_Bit0 -00:1acc ResetVramState_Bit0 +00:1ac6 SetVramState_SpriteUpdatesDisabled +00:1acc ResetVramState_SpriteUpdatesDisabled 00:1ad2 UpdateSprites 00:1ae5 GetObjectStruct 00:1af1 DoesObjectHaveASprite @@ -621,8 +621,8 @@ 00:2167 GetMapSceneID.end 00:216a GetMapSceneID.found 00:216d GetMapSceneID.done -00:2173 OverworldTextModeSwitch -00:217a LoadMapPart +00:2173 LoadOverworldTilemapAndAttrmapPals +00:217a LoadOverworldTilemap 00:2198 LoadMetatiles 00:21a5 LoadMetatiles.row 00:21a9 LoadMetatiles.col @@ -663,7 +663,7 @@ 00:23a5 GetMapConnection.loop 00:23ac ReadMapSceneScripts 00:23c3 ReadMapCallbacks -00:23da ReadWarps +00:23da ReadWarpEvents 00:23f1 ReadCoordEvents 00:2408 ReadBGEvents 00:241f ReadObjectEvents @@ -768,10 +768,10 @@ 00:29ff GetMovementPermissions.CheckHiNybble 00:2a07 GetFacingTileCoord 00:2a2c GetFacingTileCoord.Directions -00:2a3c GetCoordTile -00:2a56 GetCoordTile.nocarry -00:2a5c GetCoordTile.nocarry2 -00:2a63 GetCoordTile.nope +00:2a3c GetCoordTileCollision +00:2a56 GetCoordTileCollision.nocarry +00:2a5c GetCoordTileCollision.nocarry2 +00:2a63 GetCoordTileCollision.nope 00:2a66 GetBlockLocation 00:2a78 GetBlockLocation.loop 00:2a7d GetBlockLocation.ok @@ -832,11 +832,11 @@ 00:2d82 FarCall_JumpToHL 00:2d83 Predef 00:2da6 Predef.Return -00:2dba RefreshScreen +00:2dba ReanchorMap 00:2dcf CloseText 00:2de2 CloseText.CloseText 00:2e08 OpenText -00:2e20 _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap +00:2e20 HDMATransferTilemapAndAttrmap_Menu 00:2e31 SafeUpdateSprites 00:2e4e SetCarryFlag 00:2e50 ResetMapBufferEventFlags @@ -969,8 +969,8 @@ 00:32cc _CopyTilemapAtOnce.loop_u12 00:32d5 _CopyTilemapAtOnce.loop_u13 00:32de _CopyTilemapAtOnce.loop_u14 -00:32f9 SetPalettes -00:3309 SetPalettes.SetPalettesForGameBoyColor +00:32f9 SetDefaultBGPAndOBP +00:3309 SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor 00:3317 ClearPalettes 00:3324 ClearPalettes.cgb 00:333e GetMemSGBLayout @@ -2489,11 +2489,11 @@ 03:40aa CardFlipSpecial 03:40ad UnusedMemoryGameSpecial 03:40b0 ClearBGPalettesBufferScreenSpecial -03:40b3 FadeOutPalettesSpecial +03:40b3 FadeOutToWhiteSpecial 03:40b6 BattleTowerFadeSpecial -03:40b9 FadeBlackQuicklySpecial -03:40bc FadeInPalettesSpecial -03:40bf FadeInQuicklySpecial +03:40b9 FadeOutToBlackSpecial +03:40bc FadeInFromWhiteSpecial +03:40bf FadeInFromBlackSpecial 03:40c2 ReloadSpritesNoPalettesSpecial 03:40c5 ClearBGPalettesSpecial 03:40c8 UpdateTimePalsSpecial @@ -4754,8 +4754,8 @@ 05:548e LoadMapAttributes_MapSetupCmd 05:5491 LoadMapAttributes_SkipObjects_MapSetupCmd 05:5494 ClearBGPalettes_MapSetupCmd -05:5497 FadeOutPalettes_MapSetupCmd -05:549a FadeInPalettes_MapSetupCmd +05:5497 FadeOutToWhite_MapSetupCmd +05:549a FadeInFromWhite_MapSetupCmd 05:549d GetMapScreenCoords_MapSetupCmd 05:54a0 GetWarpDestCoords_MapSetupCmd 05:54a3 SpawnInFacingDown_MapSetupCmd @@ -4780,8 +4780,8 @@ 05:54f1 SkipUpdateMapSprites 05:54f7 CheckUpdatePlayerSprite 05:5508 CheckUpdatePlayerSprite.ok -05:550c CheckUpdatePlayerSprite.CheckBiking -05:551a CheckUpdatePlayerSprite.CheckSurfing2 +05:550c CheckUpdatePlayerSprite.CheckForcedBiking +05:551a CheckUpdatePlayerSprite.ResetSurfingOrBikingState 05:553e CheckUpdatePlayerSprite.no_biking 05:5545 CheckUpdatePlayerSprite.surfing 05:554c CheckUpdatePlayerSprite.nope @@ -9617,7 +9617,7 @@ 0f:7ce0 BattleStartMessage.cry_no_anim 0f:7ceb BattleStartMessage.skip_cry 0f:7cfd BattleStartMessage.NotFishing -0f:7d0e BattleStartMessage.PlaceBattleStartText +0f:7d0e BattleStartMessage.PrintBattleStartText 0f:7d28 BattleCommandPointers 10:4000 Pokedex 10:4029 Pokedex.main @@ -10873,11 +10873,11 @@ 12:6e1f AskRememberPassword.DoMenu 12:6e57 AskRememberPassword.refused 12:6e5e Buena_ExitMenu -13:4000 _SwapTextboxPalettes -13:4008 _SwapTextboxPalettes.loop -13:400b _SwapTextboxPalettes.innerloop -13:4021 _SwapTextboxPalettes.UpperNybble -13:4031 _SwapTextboxPalettes.next +13:4000 _LoadOverworldAttrmapPals +13:4008 _LoadOverworldAttrmapPals.loop +13:400b _LoadOverworldAttrmapPals.innerloop +13:4021 _LoadOverworldAttrmapPals.UpperNybble +13:4031 _LoadOverworldAttrmapPals.next 13:403f _ScrollBGMapPalettes 13:4045 _ScrollBGMapPalettes.loop 13:405b _ScrollBGMapPalettes.UpperNybble @@ -10921,7 +10921,7 @@ 13:4d25 TilesetBattleTowerInsidePalMap 13:4d95 TilesetBattleTowerOutsidePalMap 13:4e05 MapGroupPalettes -13:4e1f TileCollisionTable +13:4e1f CollisionPermissionTable 13:4f1f EmptyAllSRAMBanks 13:4f34 EmptyAllSRAMBanks.EmptyBank 13:4f45 SaveMenu_CopyTilemapAtOnce @@ -10942,12 +10942,12 @@ 13:4ffe CheckSave 13:501b CheckSave.ok 13:501e MapScenes -13:515b _LoadMapPart -13:5168 _LoadMapPart.top_row -13:5170 _LoadMapPart.left_column -13:5175 _LoadMapPart.loop -13:5177 _LoadMapPart.loop2 -13:5184 _LoadMapPart.carry +13:515b _LoadOverworldTilemap +13:5168 _LoadOverworldTilemap.top_row +13:5170 _LoadOverworldTilemap.left_column +13:5175 _LoadOverworldTilemap.loop +13:5177 _LoadOverworldTilemap.loop2 +13:5184 _LoadOverworldTilemap.carry 13:5188 PhoneRing_CopyTilemapAtOnce 13:51a2 PhoneRing_CopyTilemapAtOnce.wait 13:51bd PhoneRing_CopyTilemapAtOnce.wait2 @@ -11414,9 +11414,9 @@ 14:444f PartyMenu2DMenuData 14:4457 PartyMenuSelect 14:448f PartyMenuSelect.exitmenu -14:449a PrintPartyMenuText -14:44ae PrintPartyMenuText.haspokemon -14:44be PrintPartyMenuText.gotstring +14:449a PlacePartyMenuText +14:44ae PlacePartyMenuText.haspokemon +14:44be PlacePartyMenuText.gotstring 14:44d2 PartyMenuStrings 14:44e4 ChooseAMonString 14:44f3 UseOnWhichPKMNString @@ -17115,12 +17115,12 @@ 23:405b _TimeOfDayPals.pop 23:406e _TimeOfDayPals.dontchange 23:4070 _UpdateTimePals -23:4079 FadeInPalettes -23:4084 FadeOutPalettes +23:4079 FadeInFromWhite +23:4084 FadeOutToWhite 23:4092 BattleTowerFade 23:409c BattleTowerFade.loop -23:40ab FadeInQuickly -23:40b6 FadeBlackQuickly +23:40ab FadeInFromBlack +23:40b6 FadeOutToBlack 23:40c1 FillWhiteBGColor 23:40d4 FillWhiteBGColor.loop 23:40e5 ReplaceTimeOfDayPals @@ -18857,19 +18857,19 @@ 25:66c3 OverworldLoop.Jumptable 25:66cb DisableEvents 25:66d0 EnableEvents -25:66d6 CheckBit5_ScriptFlags2 -25:66dc DisableWarpsConnxns +25:66d6 CheckEnabledMapEventsBit5 +25:66dc DisableWarpsConnections 25:66e2 DisableCoordEvents 25:66e8 DisableStepCount 25:66ee DisableWildEncounters -25:66f4 EnableWarpsConnxns +25:66f4 EnableWarpsConnections 25:66fa EnableCoordEvents 25:6700 EnableStepCount 25:6706 EnableWildEncounters -25:670c CheckWarpConnxnScriptFlag -25:6712 CheckCoordEventScriptFlag -25:6718 CheckStepCountScriptFlag -25:671e CheckWildEncountersScriptFlag +25:670c CheckWarpConnectionsEnabled +25:6712 CheckCoordEventsEnabled +25:6718 CheckStepCountEnabled +25:671e CheckWildEncountersEnabled 25:6724 StartMap 25:673e EnterMap 25:675a EnterMap.dont_enable @@ -18893,8 +18893,8 @@ 25:681f PlayerEvents 25:6848 PlayerEvents.ok 25:6865 PlayerEvents.ok2 -25:6867 CheckTrainerBattle_GetPlayerEvent -25:6872 CheckTrainerBattle_GetPlayerEvent.nope +25:6867 CheckTrainerEvent +25:6872 CheckTrainerEvent.nope 25:6874 CheckTileEvent 25:6886 CheckTileEvent.connections_disabled 25:6890 CheckTileEvent.coord_events_disabled @@ -18907,7 +18907,7 @@ 25:68c7 CheckWildEncounterCooldown 25:68d1 SetUpFiveStepWildEncounterCooldown 25:68d7 SetMinTwoStepWildEncounterCooldown -25:68e4 Dummy_CheckScriptFlags2Bit5 +25:68e4 Dummy_CheckEnabledMapEventsBit5 25:68ec RunSceneScript 25:6938 RunSceneScript.nope 25:693a CheckTimeEvents @@ -19241,13 +19241,13 @@ 25:7a9e Script_delcmdqueue 25:7ab3 Script_changemapblocks 25:7acc Script_changeblock -25:7ae3 Script_reloadmappart +25:7ae3 Script_refreshmap 25:7af6 Script_warpcheck 25:7b01 Script_enableevents 25:7b08 Script_newloadmap 25:7b16 Script_reloadend 25:7b1c Script_opentext -25:7b20 Script_refreshscreen +25:7b20 Script_reanchormap 25:7b27 Script_writeunusedbyte 25:7b2e UnusedClosetextScript 25:7b2f Script_closetext @@ -19274,7 +19274,7 @@ 25:7c27 Script_checkver_duplicate.gs_version 25:7c28 WarpToSpawnPoint 25:7c30 RunMemScript -25:7c4f LoadScriptBDE +25:7c4f LoadMemScript 25:7c5f TryTileCollisionEvent 25:7c7b TryTileCollisionEvent.whirlpool 25:7c8b TryTileCollisionEvent.waterfall @@ -19289,9 +19289,9 @@ 25:7ced RandomEncounter.ok_bug_contest 25:7cf4 RandomEncounter.done 25:7cf9 WildBattleScript -25:7cfd CanUseSweetScent -25:7d17 CanUseSweetScent.ice_check -25:7d21 CanUseSweetScent.no +25:7cfd CanEncounterWildMon +25:7d17 CanEncounterWildMon.ice_check +25:7d21 CanEncounterWildMon.no 25:7d23 _TryWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest.loop @@ -31039,31 +31039,31 @@ 41:4033 HDMATransferTilemapToWRAMBank3.Function 41:4047 HDMATransferAttrmapToWRAMBank3 41:404d HDMATransferAttrmapToWRAMBank3.Function -41:4061 ReloadMapPart -41:4067 ReloadMapPart.Function -41:4099 Mobile_ReloadMapPart -41:40a2 Mobile_ReloadMapPart.Function +41:4061 HDMATransferTilemapAndAttrmap_Overworld +41:4067 HDMATransferTilemapAndAttrmap_Overworld.Function +41:4099 Mobile_HDMATransferTilemapAndAttrmap_Overworld +41:40a2 Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function 41:40d4 Function1040d4 41:40da Function1040d4.Function 41:40fb Function1040fb 41:4101 Function1040fb.Function -41:4110 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:4116 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function -41:4148 Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:414e Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function +41:4110 _HDMATransferTilemapAndAttrmap_Menu +41:4116 _HDMATransferTilemapAndAttrmap_Menu.Function +41:4148 Mobile_HDMATransferTilemapAndAttrmap_Menu +41:414e Mobile_HDMATransferTilemapAndAttrmap_Menu.Function 41:4177 CallInSafeGFXMode 41:419c CallInSafeGFXMode._hl_ 41:419d HDMATransferToWRAMBank3 41:41a4 WaitDMATransfer 41:41a4 WaitDMATransfer.loop -41:41ad HDMATransfer_Wait127Scanlines_toBGMap -41:41b7 HDMATransfer_Wait123Scanlines_toBGMap +41:41ad HDMATransfer_WaitForScanline128_toBGMap +41:41b7 HDMATransfer_WaitForScanline124_toBGMap 41:41c1 HDMATransfer_NoDI 41:41e4 HDMATransfer_NoDI.loop1 41:41e9 HDMATransfer_NoDI.loop2 41:41f8 HDMATransfer_NoDI.loop3 -41:4205 HDMATransfer_Wait123Scanlines -41:4209 HDMATransfer_Wait127Scanlines +41:4205 HDMATransfer_WaitForScanline124 +41:4209 HDMATransfer_WaitForScanline128 41:420b _continue_HDMATransfer 41:4225 _continue_HDMATransfer.ly_loop 41:422b _continue_HDMATransfer.rstat_loop_1 @@ -35351,9 +35351,9 @@ 5b:56a7 LoadTradeRoomBGPals 5b:56ae LoadCableTradeBorderTilemap 5b:56ca LinkTextbox -5b:56ce PrintWaitingTextAndSyncAndExchangeNybble -5b:56e1 PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText -5b:5701 PrintWaitingTextAndSyncAndExchangeNybble.Waiting +5b:56ce PlaceWaitingTextAndSyncAndExchangeNybble +5b:56e1 PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText +5b:5701 PlaceWaitingTextAndSyncAndExchangeNybble.Waiting 5b:570c LinkTradeMenu 5b:5713 LinkTradeMenu.GetJoypad 5b:5725 LinkTradeMenu.MenuAction @@ -55168,7 +55168,7 @@ 01:d046 wWalkingY 01:d046 wBufferMonSpclDef 01:d047 wWinTextPointer -01:d047 wWalkingTile +01:d047 wWalkingTileCollision 01:d048 wBufferMonStructEnd 01:d049 wLossTextPointer 01:d04b wScriptAfterPointer @@ -55210,7 +55210,7 @@ 01:d0ec wSolvedUnownPuzzle 01:d0ec wItemEffectSucceeded 01:d0ec wBattlePlayerAction -01:d0ed wVramState +01:d0ed wStateFlags 01:d0ee wBattleResult 01:d0ef wUsingItemWithSelect 01:d0f0 wCurElevatorCount @@ -55784,7 +55784,7 @@ 01:d432 wMapStatus 01:d433 wMapEventStatus 01:d434 wScriptFlags -01:d436 wScriptFlags2 +01:d436 wEnabledPlayerEvents 01:d437 wScriptMode 01:d438 wScriptRunning 01:d439 wScriptBank @@ -55862,7 +55862,7 @@ 01:d4e1 wPlayerAction 01:d4e2 wPlayerStepFrame 01:d4e3 wPlayerFacing -01:d4e4 wPlayerTile +01:d4e4 wPlayerTileCollision 01:d4e5 wPlayerLastTile 01:d4e6 wPlayerMapX 01:d4e7 wPlayerMapY @@ -55896,7 +55896,7 @@ 01:d509 wObject1Action 01:d50a wObject1StepFrame 01:d50b wObject1Facing -01:d50c wObject1Tile +01:d50c wObject1TileCollision 01:d50d wObject1LastTile 01:d50e wObject1MapX 01:d50f wObject1MapY @@ -55930,7 +55930,7 @@ 01:d531 wObject2Action 01:d532 wObject2StepFrame 01:d533 wObject2Facing -01:d534 wObject2Tile +01:d534 wObject2TileCollision 01:d535 wObject2LastTile 01:d536 wObject2MapX 01:d537 wObject2MapY @@ -55964,7 +55964,7 @@ 01:d559 wObject3Action 01:d55a wObject3StepFrame 01:d55b wObject3Facing -01:d55c wObject3Tile +01:d55c wObject3TileCollision 01:d55d wObject3LastTile 01:d55e wObject3MapX 01:d55f wObject3MapY @@ -55998,7 +55998,7 @@ 01:d581 wObject4Action 01:d582 wObject4StepFrame 01:d583 wObject4Facing -01:d584 wObject4Tile +01:d584 wObject4TileCollision 01:d585 wObject4LastTile 01:d586 wObject4MapX 01:d587 wObject4MapY @@ -56032,7 +56032,7 @@ 01:d5a9 wObject5Action 01:d5aa wObject5StepFrame 01:d5ab wObject5Facing -01:d5ac wObject5Tile +01:d5ac wObject5TileCollision 01:d5ad wObject5LastTile 01:d5ae wObject5MapX 01:d5af wObject5MapY @@ -56066,7 +56066,7 @@ 01:d5d1 wObject6Action 01:d5d2 wObject6StepFrame 01:d5d3 wObject6Facing -01:d5d4 wObject6Tile +01:d5d4 wObject6TileCollision 01:d5d5 wObject6LastTile 01:d5d6 wObject6MapX 01:d5d7 wObject6MapY @@ -56100,7 +56100,7 @@ 01:d5f9 wObject7Action 01:d5fa wObject7StepFrame 01:d5fb wObject7Facing -01:d5fc wObject7Tile +01:d5fc wObject7TileCollision 01:d5fd wObject7LastTile 01:d5fe wObject7MapX 01:d5ff wObject7MapY @@ -56134,7 +56134,7 @@ 01:d621 wObject8Action 01:d622 wObject8StepFrame 01:d623 wObject8Facing -01:d624 wObject8Tile +01:d624 wObject8TileCollision 01:d625 wObject8LastTile 01:d626 wObject8MapX 01:d627 wObject8MapY @@ -56168,7 +56168,7 @@ 01:d649 wObject9Action 01:d64a wObject9StepFrame 01:d64b wObject9Facing -01:d64c wObject9Tile +01:d64c wObject9TileCollision 01:d64d wObject9LastTile 01:d64e wObject9MapX 01:d64f wObject9MapY @@ -56202,7 +56202,7 @@ 01:d671 wObject10Action 01:d672 wObject10StepFrame 01:d673 wObject10Facing -01:d674 wObject10Tile +01:d674 wObject10TileCollision 01:d675 wObject10LastTile 01:d676 wObject10MapX 01:d677 wObject10MapY @@ -56236,7 +56236,7 @@ 01:d699 wObject11Action 01:d69a wObject11StepFrame 01:d69b wObject11Facing -01:d69c wObject11Tile +01:d69c wObject11TileCollision 01:d69d wObject11LastTile 01:d69e wObject11MapX 01:d69f wObject11MapY @@ -56270,7 +56270,7 @@ 01:d6c1 wObject12Action 01:d6c2 wObject12StepFrame 01:d6c3 wObject12Facing -01:d6c4 wObject12Tile +01:d6c4 wObject12TileCollision 01:d6c5 wObject12LastTile 01:d6c6 wObject12MapX 01:d6c7 wObject12MapY @@ -56683,8 +56683,8 @@ 01:dbf5 wBikeFlags 01:dbf7 wCurMapSceneScriptPointer 01:dbf9 wCurCaller -01:dbfb wCurMapWarpCount -01:dbfc wCurMapWarpsPointer +01:dbfb wCurMapWarpEventCount +01:dbfc wCurMapWarpEventsPointer 01:dbfe wCurMapCoordEventCount 01:dbff wCurMapCoordEventsPointer 01:dc01 wCurMapBGEventCount diff --git a/pokecrystal11.map b/pokecrystal11.map index 3b519e39350..9e7f7f973f7 100644 --- a/pokecrystal11.map +++ b/pokecrystal11.map @@ -165,7 +165,7 @@ ROM0 bank #0: $0833 = SerialDisconnected $083b = Serial_ExchangeSyncBytes $0847 = Serial_ExchangeSyncBytes.exchange - $0862 = Serial_PrintWaitingTextAndSyncAndExchangeNybble + $0862 = Serial_PlaceWaitingTextAndSyncAndExchangeNybble $0871 = Serial_SyncAndExchangeNybble $087d = WaitLinkTransfer $0882 = WaitLinkTransfer.loop @@ -263,7 +263,7 @@ ROM0 bank #0: $0d79 = ClearVBank1 $0d90 = GSReloadPalettes $0d91 = ReloadSpritesNoPalettes - $0db1 = SwapTextboxPalettes + $0db1 = LoadOverworldAttrmapPals $0dbd = ScrollBGMapPalettes $0dc9 = Get2bppViaHDMA $0ddc = Get1bppViaHDMA @@ -408,7 +408,7 @@ ROM0 bank #0: $13d4 = PlaceFarString $13e0 = PokeFluteTerminator $13e4 = PokeFluteTerminator.stop - $13e5 = PlaceHLTextAtBC + $13e5 = PrintTextboxTextAt $13f6 = DoTextUntilTerminator $13ff = DoTextUntilTerminator.TextCommand $1410 = TextCommands @@ -474,9 +474,9 @@ ROM0 bank #0: $1830 = GetSpriteVTile.found $1833 = GetSpriteVTile.done $1836 = DoesSpriteHaveFacings - $184a = GetPlayerTile + $184a = GetPlayerTilePermission $1852 = CheckOnWater - $185d = GetTileCollision + $185d = GetTilePermission $1875 = CheckGrassTile $1882 = CheckGrassTile.grass $1888 = CheckGrassTile.water @@ -520,8 +520,8 @@ ROM0 bank #0: $1a61 = CopySpriteMovementData $1a71 = CopySpriteMovementData.CopyData $1aae = _GetMovementIndex - $1ac6 = SetVramState_Bit0 - $1acc = ResetVramState_Bit0 + $1ac6 = SetVramState_SpriteUpdatesDisabled + $1acc = ResetVramState_SpriteUpdatesDisabled $1ad2 = UpdateSprites $1ae5 = GetObjectStruct $1af1 = DoesObjectHaveASprite @@ -656,8 +656,8 @@ ROM0 bank #0: $2167 = GetMapSceneID.end $216a = GetMapSceneID.found $216d = GetMapSceneID.done - $2173 = OverworldTextModeSwitch - $217a = LoadMapPart + $2173 = LoadOverworldTilemapAndAttrmapPals + $217a = LoadOverworldTilemap $2198 = LoadMetatiles $21a5 = LoadMetatiles.row $21a9 = LoadMetatiles.col @@ -698,7 +698,7 @@ ROM0 bank #0: $23a5 = GetMapConnection.loop $23ac = ReadMapSceneScripts $23c3 = ReadMapCallbacks - $23da = ReadWarps + $23da = ReadWarpEvents $23f1 = ReadCoordEvents $2408 = ReadBGEvents $241f = ReadObjectEvents @@ -803,10 +803,10 @@ ROM0 bank #0: $29ff = GetMovementPermissions.CheckHiNybble $2a07 = GetFacingTileCoord $2a2c = GetFacingTileCoord.Directions - $2a3c = GetCoordTile - $2a56 = GetCoordTile.nocarry - $2a5c = GetCoordTile.nocarry2 - $2a63 = GetCoordTile.nope + $2a3c = GetCoordTileCollision + $2a56 = GetCoordTileCollision.nocarry + $2a5c = GetCoordTileCollision.nocarry2 + $2a63 = GetCoordTileCollision.nope $2a66 = GetBlockLocation $2a78 = GetBlockLocation.loop $2a7d = GetBlockLocation.ok @@ -867,11 +867,11 @@ ROM0 bank #0: $2d82 = FarCall_JumpToHL $2d83 = Predef $2da6 = Predef.Return - $2dba = RefreshScreen + $2dba = ReanchorMap $2dcf = CloseText $2de2 = CloseText.CloseText $2e08 = OpenText - $2e20 = _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + $2e20 = HDMATransferTilemapAndAttrmap_Menu $2e31 = SafeUpdateSprites $2e4e = SetCarryFlag $2e50 = ResetMapBufferEventFlags @@ -1004,8 +1004,8 @@ ROM0 bank #0: $32cc = _CopyTilemapAtOnce.loop_u12 $32d5 = _CopyTilemapAtOnce.loop_u13 $32de = _CopyTilemapAtOnce.loop_u14 - $32f9 = SetPalettes - $3309 = SetPalettes.SetPalettesForGameBoyColor + $32f9 = SetDefaultBGPAndOBP + $3309 = SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor $3317 = ClearPalettes $3324 = ClearPalettes.cgb $333e = GetMemSGBLayout @@ -2539,11 +2539,11 @@ ROMX bank #3: $40aa = CardFlipSpecial $40ad = UnusedMemoryGameSpecial $40b0 = ClearBGPalettesBufferScreenSpecial - $40b3 = FadeOutPalettesSpecial + $40b3 = FadeOutToWhiteSpecial $40b6 = BattleTowerFadeSpecial - $40b9 = FadeBlackQuicklySpecial - $40bc = FadeInPalettesSpecial - $40bf = FadeInQuicklySpecial + $40b9 = FadeOutToBlackSpecial + $40bc = FadeInFromWhiteSpecial + $40bf = FadeInFromBlackSpecial $40c2 = ReloadSpritesNoPalettesSpecial $40c5 = ClearBGPalettesSpecial $40c8 = UpdateTimePalsSpecial @@ -4814,8 +4814,8 @@ ROMX bank #5: $548e = LoadMapAttributes_MapSetupCmd $5491 = LoadMapAttributes_SkipObjects_MapSetupCmd $5494 = ClearBGPalettes_MapSetupCmd - $5497 = FadeOutPalettes_MapSetupCmd - $549a = FadeInPalettes_MapSetupCmd + $5497 = FadeOutToWhite_MapSetupCmd + $549a = FadeInFromWhite_MapSetupCmd $549d = GetMapScreenCoords_MapSetupCmd $54a0 = GetWarpDestCoords_MapSetupCmd $54a3 = SpawnInFacingDown_MapSetupCmd @@ -4840,8 +4840,8 @@ ROMX bank #5: $54f1 = SkipUpdateMapSprites $54f7 = CheckUpdatePlayerSprite $5508 = CheckUpdatePlayerSprite.ok - $550c = CheckUpdatePlayerSprite.CheckBiking - $551a = CheckUpdatePlayerSprite.CheckSurfing2 + $550c = CheckUpdatePlayerSprite.CheckForcedBiking + $551a = CheckUpdatePlayerSprite.ResetSurfingOrBikingState $553e = CheckUpdatePlayerSprite.no_biking $5545 = CheckUpdatePlayerSprite.surfing $554c = CheckUpdatePlayerSprite.nope @@ -9732,7 +9732,7 @@ ROMX bank #15: $7ce0 = BattleStartMessage.cry_no_anim $7ceb = BattleStartMessage.skip_cry $7cfd = BattleStartMessage.NotFishing - $7d0e = BattleStartMessage.PlaceBattleStartText + $7d0e = BattleStartMessage.PrintBattleStartText $7d28 = BattleCommandPointers EMPTY: $7e86-$7fff ($017a bytes) TOTAL EMPTY: $017a bytes @@ -11009,11 +11009,11 @@ ROMX bank #18: ROMX bank #19: SECTION: $4000-$5248 ($1249 bytes) ["bank13"] - $4000 = _SwapTextboxPalettes - $4008 = _SwapTextboxPalettes.loop - $400b = _SwapTextboxPalettes.innerloop - $4021 = _SwapTextboxPalettes.UpperNybble - $4031 = _SwapTextboxPalettes.next + $4000 = _LoadOverworldAttrmapPals + $4008 = _LoadOverworldAttrmapPals.loop + $400b = _LoadOverworldAttrmapPals.innerloop + $4021 = _LoadOverworldAttrmapPals.UpperNybble + $4031 = _LoadOverworldAttrmapPals.next $403f = _ScrollBGMapPalettes $4045 = _ScrollBGMapPalettes.loop $405b = _ScrollBGMapPalettes.UpperNybble @@ -11057,7 +11057,7 @@ ROMX bank #19: $4d25 = TilesetBattleTowerInsidePalMap $4d95 = TilesetBattleTowerOutsidePalMap $4e05 = MapGroupPalettes - $4e1f = TileCollisionTable + $4e1f = CollisionPermissionTable $4f1f = EmptyAllSRAMBanks $4f34 = EmptyAllSRAMBanks.EmptyBank $4f45 = SaveMenu_CopyTilemapAtOnce @@ -11078,12 +11078,12 @@ ROMX bank #19: $4ffe = CheckSave $501b = CheckSave.ok $501e = MapScenes - $515b = _LoadMapPart - $5168 = _LoadMapPart.top_row - $5170 = _LoadMapPart.left_column - $5175 = _LoadMapPart.loop - $5177 = _LoadMapPart.loop2 - $5184 = _LoadMapPart.carry + $515b = _LoadOverworldTilemap + $5168 = _LoadOverworldTilemap.top_row + $5170 = _LoadOverworldTilemap.left_column + $5175 = _LoadOverworldTilemap.loop + $5177 = _LoadOverworldTilemap.loop2 + $5184 = _LoadOverworldTilemap.carry $5188 = PhoneRing_CopyTilemapAtOnce $51a2 = PhoneRing_CopyTilemapAtOnce.wait $51bd = PhoneRing_CopyTilemapAtOnce.wait2 @@ -11557,9 +11557,9 @@ ROMX bank #20: $444f = PartyMenu2DMenuData $4457 = PartyMenuSelect $448f = PartyMenuSelect.exitmenu - $449a = PrintPartyMenuText - $44ae = PrintPartyMenuText.haspokemon - $44be = PrintPartyMenuText.gotstring + $449a = PlacePartyMenuText + $44ae = PlacePartyMenuText.haspokemon + $44be = PlacePartyMenuText.gotstring $44d2 = PartyMenuStrings $44e4 = ChooseAMonString $44f3 = UseOnWhichPKMNString @@ -17334,12 +17334,12 @@ ROMX bank #35: $405b = _TimeOfDayPals.pop $406e = _TimeOfDayPals.dontchange $4070 = _UpdateTimePals - $4079 = FadeInPalettes - $4084 = FadeOutPalettes + $4079 = FadeInFromWhite + $4084 = FadeOutToWhite $4092 = BattleTowerFade $409c = BattleTowerFade.loop - $40ab = FadeInQuickly - $40b6 = FadeBlackQuickly + $40ab = FadeInFromBlack + $40b6 = FadeOutToBlack $40c1 = FillWhiteBGColor $40d4 = FillWhiteBGColor.loop $40e5 = ReplaceTimeOfDayPals @@ -19087,19 +19087,19 @@ ROMX bank #37: $66c3 = OverworldLoop.Jumptable $66cb = DisableEvents $66d0 = EnableEvents - $66d6 = CheckBit5_ScriptFlags2 - $66dc = DisableWarpsConnxns + $66d6 = CheckEnabledMapEventsBit5 + $66dc = DisableWarpsConnections $66e2 = DisableCoordEvents $66e8 = DisableStepCount $66ee = DisableWildEncounters - $66f4 = EnableWarpsConnxns + $66f4 = EnableWarpsConnections $66fa = EnableCoordEvents $6700 = EnableStepCount $6706 = EnableWildEncounters - $670c = CheckWarpConnxnScriptFlag - $6712 = CheckCoordEventScriptFlag - $6718 = CheckStepCountScriptFlag - $671e = CheckWildEncountersScriptFlag + $670c = CheckWarpConnectionsEnabled + $6712 = CheckCoordEventsEnabled + $6718 = CheckStepCountEnabled + $671e = CheckWildEncountersEnabled $6724 = StartMap $673e = EnterMap $675a = EnterMap.dont_enable @@ -19123,8 +19123,8 @@ ROMX bank #37: $681f = PlayerEvents $6848 = PlayerEvents.ok $6865 = PlayerEvents.ok2 - $6867 = CheckTrainerBattle_GetPlayerEvent - $6872 = CheckTrainerBattle_GetPlayerEvent.nope + $6867 = CheckTrainerEvent + $6872 = CheckTrainerEvent.nope $6874 = CheckTileEvent $6886 = CheckTileEvent.connections_disabled $6890 = CheckTileEvent.coord_events_disabled @@ -19137,7 +19137,7 @@ ROMX bank #37: $68c7 = CheckWildEncounterCooldown $68d1 = SetUpFiveStepWildEncounterCooldown $68d7 = SetMinTwoStepWildEncounterCooldown - $68e4 = Dummy_CheckScriptFlags2Bit5 + $68e4 = Dummy_CheckEnabledMapEventsBit5 $68ec = RunSceneScript $6938 = RunSceneScript.nope $693a = CheckTimeEvents @@ -19471,13 +19471,13 @@ ROMX bank #37: $7a9e = Script_delcmdqueue $7ab3 = Script_changemapblocks $7acc = Script_changeblock - $7ae3 = Script_reloadmappart + $7ae3 = Script_refreshmap $7af6 = Script_warpcheck $7b01 = Script_enableevents $7b08 = Script_newloadmap $7b16 = Script_reloadend $7b1c = Script_opentext - $7b20 = Script_refreshscreen + $7b20 = Script_reanchormap $7b27 = Script_writeunusedbyte $7b2e = UnusedClosetextScript $7b2f = Script_closetext @@ -19504,7 +19504,7 @@ ROMX bank #37: $7c27 = Script_checkver_duplicate.gs_version $7c28 = WarpToSpawnPoint $7c30 = RunMemScript - $7c4f = LoadScriptBDE + $7c4f = LoadMemScript $7c5f = TryTileCollisionEvent $7c7b = TryTileCollisionEvent.whirlpool $7c8b = TryTileCollisionEvent.waterfall @@ -19519,9 +19519,9 @@ ROMX bank #37: $7ced = RandomEncounter.ok_bug_contest $7cf4 = RandomEncounter.done $7cf9 = WildBattleScript - $7cfd = CanUseSweetScent - $7d17 = CanUseSweetScent.ice_check - $7d21 = CanUseSweetScent.no + $7cfd = CanEncounterWildMon + $7d17 = CanEncounterWildMon.ice_check + $7d21 = CanEncounterWildMon.no $7d23 = _TryWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest.loop @@ -31416,31 +31416,31 @@ ROMX bank #65: $4033 = HDMATransferTilemapToWRAMBank3.Function $4047 = HDMATransferAttrmapToWRAMBank3 $404d = HDMATransferAttrmapToWRAMBank3.Function - $4061 = ReloadMapPart - $4067 = ReloadMapPart.Function - $4099 = Mobile_ReloadMapPart - $40a2 = Mobile_ReloadMapPart.Function + $4061 = HDMATransferTilemapAndAttrmap_Overworld + $4067 = HDMATransferTilemapAndAttrmap_Overworld.Function + $4099 = Mobile_HDMATransferTilemapAndAttrmap_Overworld + $40a2 = Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function $40d4 = Function1040d4 $40da = Function1040d4.Function $40fb = Function1040fb $4101 = Function1040fb.Function - $4110 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $4116 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function - $4148 = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $414e = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function + $4110 = _HDMATransferTilemapAndAttrmap_Menu + $4116 = _HDMATransferTilemapAndAttrmap_Menu.Function + $4148 = Mobile_HDMATransferTilemapAndAttrmap_Menu + $414e = Mobile_HDMATransferTilemapAndAttrmap_Menu.Function $4177 = CallInSafeGFXMode $419c = CallInSafeGFXMode._hl_ $419d = HDMATransferToWRAMBank3 $41a4 = WaitDMATransfer $41a4 = WaitDMATransfer.loop - $41ad = HDMATransfer_Wait127Scanlines_toBGMap - $41b7 = HDMATransfer_Wait123Scanlines_toBGMap + $41ad = HDMATransfer_WaitForScanline128_toBGMap + $41b7 = HDMATransfer_WaitForScanline124_toBGMap $41c1 = HDMATransfer_NoDI $41e4 = HDMATransfer_NoDI.loop1 $41e9 = HDMATransfer_NoDI.loop2 $41f8 = HDMATransfer_NoDI.loop3 - $4205 = HDMATransfer_Wait123Scanlines - $4209 = HDMATransfer_Wait127Scanlines + $4205 = HDMATransfer_WaitForScanline124 + $4209 = HDMATransfer_WaitForScanline128 $420b = _continue_HDMATransfer $4225 = _continue_HDMATransfer.ly_loop $422b = _continue_HDMATransfer.rstat_loop_1 @@ -35858,9 +35858,9 @@ ROMX bank #91: $56a7 = LoadTradeRoomBGPals $56ae = LoadCableTradeBorderTilemap $56ca = LinkTextbox - $56ce = PrintWaitingTextAndSyncAndExchangeNybble - $56e1 = PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText - $5701 = PrintWaitingTextAndSyncAndExchangeNybble.Waiting + $56ce = PlaceWaitingTextAndSyncAndExchangeNybble + $56e1 = PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText + $5701 = PlaceWaitingTextAndSyncAndExchangeNybble.Waiting $570c = LinkTradeMenu $5713 = LinkTradeMenu.GetJoypad $5725 = LinkTradeMenu.MenuAction @@ -55940,7 +55940,7 @@ WRAMX bank #1: $d046 = wWalkingY $d046 = wBufferMonSpclDef $d047 = wWinTextPointer - $d047 = wWalkingTile + $d047 = wWalkingTileCollision $d048 = wBufferMonStructEnd $d049 = wLossTextPointer $d04b = wScriptAfterPointer @@ -55983,7 +55983,7 @@ WRAMX bank #1: $d0ec = wSolvedUnownPuzzle $d0ec = wItemEffectSucceeded $d0ec = wBattlePlayerAction - $d0ed = wVramState + $d0ed = wStateFlags $d0ee = wBattleResult $d0ef = wUsingItemWithSelect $d0f0 = wCurElevatorCount @@ -56558,7 +56558,7 @@ WRAMX bank #1: $d432 = wMapStatus $d433 = wMapEventStatus $d434 = wScriptFlags - $d436 = wScriptFlags2 + $d436 = wEnabledPlayerEvents $d437 = wScriptMode $d438 = wScriptRunning $d439 = wScriptBank @@ -56636,7 +56636,7 @@ WRAMX bank #1: $d4e1 = wPlayerAction $d4e2 = wPlayerStepFrame $d4e3 = wPlayerFacing - $d4e4 = wPlayerTile + $d4e4 = wPlayerTileCollision $d4e5 = wPlayerLastTile $d4e6 = wPlayerMapX $d4e7 = wPlayerMapY @@ -56670,7 +56670,7 @@ WRAMX bank #1: $d509 = wObject1Action $d50a = wObject1StepFrame $d50b = wObject1Facing - $d50c = wObject1Tile + $d50c = wObject1TileCollision $d50d = wObject1LastTile $d50e = wObject1MapX $d50f = wObject1MapY @@ -56704,7 +56704,7 @@ WRAMX bank #1: $d531 = wObject2Action $d532 = wObject2StepFrame $d533 = wObject2Facing - $d534 = wObject2Tile + $d534 = wObject2TileCollision $d535 = wObject2LastTile $d536 = wObject2MapX $d537 = wObject2MapY @@ -56738,7 +56738,7 @@ WRAMX bank #1: $d559 = wObject3Action $d55a = wObject3StepFrame $d55b = wObject3Facing - $d55c = wObject3Tile + $d55c = wObject3TileCollision $d55d = wObject3LastTile $d55e = wObject3MapX $d55f = wObject3MapY @@ -56772,7 +56772,7 @@ WRAMX bank #1: $d581 = wObject4Action $d582 = wObject4StepFrame $d583 = wObject4Facing - $d584 = wObject4Tile + $d584 = wObject4TileCollision $d585 = wObject4LastTile $d586 = wObject4MapX $d587 = wObject4MapY @@ -56806,7 +56806,7 @@ WRAMX bank #1: $d5a9 = wObject5Action $d5aa = wObject5StepFrame $d5ab = wObject5Facing - $d5ac = wObject5Tile + $d5ac = wObject5TileCollision $d5ad = wObject5LastTile $d5ae = wObject5MapX $d5af = wObject5MapY @@ -56840,7 +56840,7 @@ WRAMX bank #1: $d5d1 = wObject6Action $d5d2 = wObject6StepFrame $d5d3 = wObject6Facing - $d5d4 = wObject6Tile + $d5d4 = wObject6TileCollision $d5d5 = wObject6LastTile $d5d6 = wObject6MapX $d5d7 = wObject6MapY @@ -56874,7 +56874,7 @@ WRAMX bank #1: $d5f9 = wObject7Action $d5fa = wObject7StepFrame $d5fb = wObject7Facing - $d5fc = wObject7Tile + $d5fc = wObject7TileCollision $d5fd = wObject7LastTile $d5fe = wObject7MapX $d5ff = wObject7MapY @@ -56908,7 +56908,7 @@ WRAMX bank #1: $d621 = wObject8Action $d622 = wObject8StepFrame $d623 = wObject8Facing - $d624 = wObject8Tile + $d624 = wObject8TileCollision $d625 = wObject8LastTile $d626 = wObject8MapX $d627 = wObject8MapY @@ -56942,7 +56942,7 @@ WRAMX bank #1: $d649 = wObject9Action $d64a = wObject9StepFrame $d64b = wObject9Facing - $d64c = wObject9Tile + $d64c = wObject9TileCollision $d64d = wObject9LastTile $d64e = wObject9MapX $d64f = wObject9MapY @@ -56976,7 +56976,7 @@ WRAMX bank #1: $d671 = wObject10Action $d672 = wObject10StepFrame $d673 = wObject10Facing - $d674 = wObject10Tile + $d674 = wObject10TileCollision $d675 = wObject10LastTile $d676 = wObject10MapX $d677 = wObject10MapY @@ -57010,7 +57010,7 @@ WRAMX bank #1: $d699 = wObject11Action $d69a = wObject11StepFrame $d69b = wObject11Facing - $d69c = wObject11Tile + $d69c = wObject11TileCollision $d69d = wObject11LastTile $d69e = wObject11MapX $d69f = wObject11MapY @@ -57044,7 +57044,7 @@ WRAMX bank #1: $d6c1 = wObject12Action $d6c2 = wObject12StepFrame $d6c3 = wObject12Facing - $d6c4 = wObject12Tile + $d6c4 = wObject12TileCollision $d6c5 = wObject12LastTile $d6c6 = wObject12MapX $d6c7 = wObject12MapY @@ -57457,8 +57457,8 @@ WRAMX bank #1: $dbf5 = wBikeFlags $dbf7 = wCurMapSceneScriptPointer $dbf9 = wCurCaller - $dbfb = wCurMapWarpCount - $dbfc = wCurMapWarpsPointer + $dbfb = wCurMapWarpEventCount + $dbfc = wCurMapWarpEventsPointer $dbfe = wCurMapCoordEventCount $dbff = wCurMapCoordEventsPointer $dc01 = wCurMapBGEventCount diff --git a/pokecrystal11.sym b/pokecrystal11.sym index 07b046c8102..d73403c602e 100644 --- a/pokecrystal11.sym +++ b/pokecrystal11.sym @@ -130,7 +130,7 @@ 00:0833 SerialDisconnected 00:083b Serial_ExchangeSyncBytes 00:0847 Serial_ExchangeSyncBytes.exchange -00:0862 Serial_PrintWaitingTextAndSyncAndExchangeNybble +00:0862 Serial_PlaceWaitingTextAndSyncAndExchangeNybble 00:0871 Serial_SyncAndExchangeNybble 00:087d WaitLinkTransfer 00:0882 WaitLinkTransfer.loop @@ -228,7 +228,7 @@ 00:0d79 ClearVBank1 00:0d90 GSReloadPalettes 00:0d91 ReloadSpritesNoPalettes -00:0db1 SwapTextboxPalettes +00:0db1 LoadOverworldAttrmapPals 00:0dbd ScrollBGMapPalettes 00:0dc9 Get2bppViaHDMA 00:0ddc Get1bppViaHDMA @@ -373,7 +373,7 @@ 00:13d4 PlaceFarString 00:13e0 PokeFluteTerminator 00:13e4 PokeFluteTerminator.stop -00:13e5 PlaceHLTextAtBC +00:13e5 PrintTextboxTextAt 00:13f6 DoTextUntilTerminator 00:13ff DoTextUntilTerminator.TextCommand 00:1410 TextCommands @@ -439,9 +439,9 @@ 00:1830 GetSpriteVTile.found 00:1833 GetSpriteVTile.done 00:1836 DoesSpriteHaveFacings -00:184a GetPlayerTile +00:184a GetPlayerTilePermission 00:1852 CheckOnWater -00:185d GetTileCollision +00:185d GetTilePermission 00:1875 CheckGrassTile 00:1882 CheckGrassTile.grass 00:1888 CheckGrassTile.water @@ -485,8 +485,8 @@ 00:1a61 CopySpriteMovementData 00:1a71 CopySpriteMovementData.CopyData 00:1aae _GetMovementIndex -00:1ac6 SetVramState_Bit0 -00:1acc ResetVramState_Bit0 +00:1ac6 SetVramState_SpriteUpdatesDisabled +00:1acc ResetVramState_SpriteUpdatesDisabled 00:1ad2 UpdateSprites 00:1ae5 GetObjectStruct 00:1af1 DoesObjectHaveASprite @@ -621,8 +621,8 @@ 00:2167 GetMapSceneID.end 00:216a GetMapSceneID.found 00:216d GetMapSceneID.done -00:2173 OverworldTextModeSwitch -00:217a LoadMapPart +00:2173 LoadOverworldTilemapAndAttrmapPals +00:217a LoadOverworldTilemap 00:2198 LoadMetatiles 00:21a5 LoadMetatiles.row 00:21a9 LoadMetatiles.col @@ -663,7 +663,7 @@ 00:23a5 GetMapConnection.loop 00:23ac ReadMapSceneScripts 00:23c3 ReadMapCallbacks -00:23da ReadWarps +00:23da ReadWarpEvents 00:23f1 ReadCoordEvents 00:2408 ReadBGEvents 00:241f ReadObjectEvents @@ -768,10 +768,10 @@ 00:29ff GetMovementPermissions.CheckHiNybble 00:2a07 GetFacingTileCoord 00:2a2c GetFacingTileCoord.Directions -00:2a3c GetCoordTile -00:2a56 GetCoordTile.nocarry -00:2a5c GetCoordTile.nocarry2 -00:2a63 GetCoordTile.nope +00:2a3c GetCoordTileCollision +00:2a56 GetCoordTileCollision.nocarry +00:2a5c GetCoordTileCollision.nocarry2 +00:2a63 GetCoordTileCollision.nope 00:2a66 GetBlockLocation 00:2a78 GetBlockLocation.loop 00:2a7d GetBlockLocation.ok @@ -832,11 +832,11 @@ 00:2d82 FarCall_JumpToHL 00:2d83 Predef 00:2da6 Predef.Return -00:2dba RefreshScreen +00:2dba ReanchorMap 00:2dcf CloseText 00:2de2 CloseText.CloseText 00:2e08 OpenText -00:2e20 _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap +00:2e20 HDMATransferTilemapAndAttrmap_Menu 00:2e31 SafeUpdateSprites 00:2e4e SetCarryFlag 00:2e50 ResetMapBufferEventFlags @@ -969,8 +969,8 @@ 00:32cc _CopyTilemapAtOnce.loop_u12 00:32d5 _CopyTilemapAtOnce.loop_u13 00:32de _CopyTilemapAtOnce.loop_u14 -00:32f9 SetPalettes -00:3309 SetPalettes.SetPalettesForGameBoyColor +00:32f9 SetDefaultBGPAndOBP +00:3309 SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor 00:3317 ClearPalettes 00:3324 ClearPalettes.cgb 00:333e GetMemSGBLayout @@ -2489,11 +2489,11 @@ 03:40aa CardFlipSpecial 03:40ad UnusedMemoryGameSpecial 03:40b0 ClearBGPalettesBufferScreenSpecial -03:40b3 FadeOutPalettesSpecial +03:40b3 FadeOutToWhiteSpecial 03:40b6 BattleTowerFadeSpecial -03:40b9 FadeBlackQuicklySpecial -03:40bc FadeInPalettesSpecial -03:40bf FadeInQuicklySpecial +03:40b9 FadeOutToBlackSpecial +03:40bc FadeInFromWhiteSpecial +03:40bf FadeInFromBlackSpecial 03:40c2 ReloadSpritesNoPalettesSpecial 03:40c5 ClearBGPalettesSpecial 03:40c8 UpdateTimePalsSpecial @@ -4754,8 +4754,8 @@ 05:548e LoadMapAttributes_MapSetupCmd 05:5491 LoadMapAttributes_SkipObjects_MapSetupCmd 05:5494 ClearBGPalettes_MapSetupCmd -05:5497 FadeOutPalettes_MapSetupCmd -05:549a FadeInPalettes_MapSetupCmd +05:5497 FadeOutToWhite_MapSetupCmd +05:549a FadeInFromWhite_MapSetupCmd 05:549d GetMapScreenCoords_MapSetupCmd 05:54a0 GetWarpDestCoords_MapSetupCmd 05:54a3 SpawnInFacingDown_MapSetupCmd @@ -4780,8 +4780,8 @@ 05:54f1 SkipUpdateMapSprites 05:54f7 CheckUpdatePlayerSprite 05:5508 CheckUpdatePlayerSprite.ok -05:550c CheckUpdatePlayerSprite.CheckBiking -05:551a CheckUpdatePlayerSprite.CheckSurfing2 +05:550c CheckUpdatePlayerSprite.CheckForcedBiking +05:551a CheckUpdatePlayerSprite.ResetSurfingOrBikingState 05:553e CheckUpdatePlayerSprite.no_biking 05:5545 CheckUpdatePlayerSprite.surfing 05:554c CheckUpdatePlayerSprite.nope @@ -9617,7 +9617,7 @@ 0f:7ce0 BattleStartMessage.cry_no_anim 0f:7ceb BattleStartMessage.skip_cry 0f:7cfd BattleStartMessage.NotFishing -0f:7d0e BattleStartMessage.PlaceBattleStartText +0f:7d0e BattleStartMessage.PrintBattleStartText 0f:7d28 BattleCommandPointers 10:4000 Pokedex 10:4029 Pokedex.main @@ -10873,11 +10873,11 @@ 12:6e1f AskRememberPassword.DoMenu 12:6e57 AskRememberPassword.refused 12:6e5e Buena_ExitMenu -13:4000 _SwapTextboxPalettes -13:4008 _SwapTextboxPalettes.loop -13:400b _SwapTextboxPalettes.innerloop -13:4021 _SwapTextboxPalettes.UpperNybble -13:4031 _SwapTextboxPalettes.next +13:4000 _LoadOverworldAttrmapPals +13:4008 _LoadOverworldAttrmapPals.loop +13:400b _LoadOverworldAttrmapPals.innerloop +13:4021 _LoadOverworldAttrmapPals.UpperNybble +13:4031 _LoadOverworldAttrmapPals.next 13:403f _ScrollBGMapPalettes 13:4045 _ScrollBGMapPalettes.loop 13:405b _ScrollBGMapPalettes.UpperNybble @@ -10921,7 +10921,7 @@ 13:4d25 TilesetBattleTowerInsidePalMap 13:4d95 TilesetBattleTowerOutsidePalMap 13:4e05 MapGroupPalettes -13:4e1f TileCollisionTable +13:4e1f CollisionPermissionTable 13:4f1f EmptyAllSRAMBanks 13:4f34 EmptyAllSRAMBanks.EmptyBank 13:4f45 SaveMenu_CopyTilemapAtOnce @@ -10942,12 +10942,12 @@ 13:4ffe CheckSave 13:501b CheckSave.ok 13:501e MapScenes -13:515b _LoadMapPart -13:5168 _LoadMapPart.top_row -13:5170 _LoadMapPart.left_column -13:5175 _LoadMapPart.loop -13:5177 _LoadMapPart.loop2 -13:5184 _LoadMapPart.carry +13:515b _LoadOverworldTilemap +13:5168 _LoadOverworldTilemap.top_row +13:5170 _LoadOverworldTilemap.left_column +13:5175 _LoadOverworldTilemap.loop +13:5177 _LoadOverworldTilemap.loop2 +13:5184 _LoadOverworldTilemap.carry 13:5188 PhoneRing_CopyTilemapAtOnce 13:51a2 PhoneRing_CopyTilemapAtOnce.wait 13:51bd PhoneRing_CopyTilemapAtOnce.wait2 @@ -11414,9 +11414,9 @@ 14:444f PartyMenu2DMenuData 14:4457 PartyMenuSelect 14:448f PartyMenuSelect.exitmenu -14:449a PrintPartyMenuText -14:44ae PrintPartyMenuText.haspokemon -14:44be PrintPartyMenuText.gotstring +14:449a PlacePartyMenuText +14:44ae PlacePartyMenuText.haspokemon +14:44be PlacePartyMenuText.gotstring 14:44d2 PartyMenuStrings 14:44e4 ChooseAMonString 14:44f3 UseOnWhichPKMNString @@ -17115,12 +17115,12 @@ 23:405b _TimeOfDayPals.pop 23:406e _TimeOfDayPals.dontchange 23:4070 _UpdateTimePals -23:4079 FadeInPalettes -23:4084 FadeOutPalettes +23:4079 FadeInFromWhite +23:4084 FadeOutToWhite 23:4092 BattleTowerFade 23:409c BattleTowerFade.loop -23:40ab FadeInQuickly -23:40b6 FadeBlackQuickly +23:40ab FadeInFromBlack +23:40b6 FadeOutToBlack 23:40c1 FillWhiteBGColor 23:40d4 FillWhiteBGColor.loop 23:40e5 ReplaceTimeOfDayPals @@ -18857,19 +18857,19 @@ 25:66c3 OverworldLoop.Jumptable 25:66cb DisableEvents 25:66d0 EnableEvents -25:66d6 CheckBit5_ScriptFlags2 -25:66dc DisableWarpsConnxns +25:66d6 CheckEnabledMapEventsBit5 +25:66dc DisableWarpsConnections 25:66e2 DisableCoordEvents 25:66e8 DisableStepCount 25:66ee DisableWildEncounters -25:66f4 EnableWarpsConnxns +25:66f4 EnableWarpsConnections 25:66fa EnableCoordEvents 25:6700 EnableStepCount 25:6706 EnableWildEncounters -25:670c CheckWarpConnxnScriptFlag -25:6712 CheckCoordEventScriptFlag -25:6718 CheckStepCountScriptFlag -25:671e CheckWildEncountersScriptFlag +25:670c CheckWarpConnectionsEnabled +25:6712 CheckCoordEventsEnabled +25:6718 CheckStepCountEnabled +25:671e CheckWildEncountersEnabled 25:6724 StartMap 25:673e EnterMap 25:675a EnterMap.dont_enable @@ -18893,8 +18893,8 @@ 25:681f PlayerEvents 25:6848 PlayerEvents.ok 25:6865 PlayerEvents.ok2 -25:6867 CheckTrainerBattle_GetPlayerEvent -25:6872 CheckTrainerBattle_GetPlayerEvent.nope +25:6867 CheckTrainerEvent +25:6872 CheckTrainerEvent.nope 25:6874 CheckTileEvent 25:6886 CheckTileEvent.connections_disabled 25:6890 CheckTileEvent.coord_events_disabled @@ -18907,7 +18907,7 @@ 25:68c7 CheckWildEncounterCooldown 25:68d1 SetUpFiveStepWildEncounterCooldown 25:68d7 SetMinTwoStepWildEncounterCooldown -25:68e4 Dummy_CheckScriptFlags2Bit5 +25:68e4 Dummy_CheckEnabledMapEventsBit5 25:68ec RunSceneScript 25:6938 RunSceneScript.nope 25:693a CheckTimeEvents @@ -19241,13 +19241,13 @@ 25:7a9e Script_delcmdqueue 25:7ab3 Script_changemapblocks 25:7acc Script_changeblock -25:7ae3 Script_reloadmappart +25:7ae3 Script_refreshmap 25:7af6 Script_warpcheck 25:7b01 Script_enableevents 25:7b08 Script_newloadmap 25:7b16 Script_reloadend 25:7b1c Script_opentext -25:7b20 Script_refreshscreen +25:7b20 Script_reanchormap 25:7b27 Script_writeunusedbyte 25:7b2e UnusedClosetextScript 25:7b2f Script_closetext @@ -19274,7 +19274,7 @@ 25:7c27 Script_checkver_duplicate.gs_version 25:7c28 WarpToSpawnPoint 25:7c30 RunMemScript -25:7c4f LoadScriptBDE +25:7c4f LoadMemScript 25:7c5f TryTileCollisionEvent 25:7c7b TryTileCollisionEvent.whirlpool 25:7c8b TryTileCollisionEvent.waterfall @@ -19289,9 +19289,9 @@ 25:7ced RandomEncounter.ok_bug_contest 25:7cf4 RandomEncounter.done 25:7cf9 WildBattleScript -25:7cfd CanUseSweetScent -25:7d17 CanUseSweetScent.ice_check -25:7d21 CanUseSweetScent.no +25:7cfd CanEncounterWildMon +25:7d17 CanEncounterWildMon.ice_check +25:7d21 CanEncounterWildMon.no 25:7d23 _TryWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest.loop @@ -31039,31 +31039,31 @@ 41:4033 HDMATransferTilemapToWRAMBank3.Function 41:4047 HDMATransferAttrmapToWRAMBank3 41:404d HDMATransferAttrmapToWRAMBank3.Function -41:4061 ReloadMapPart -41:4067 ReloadMapPart.Function -41:4099 Mobile_ReloadMapPart -41:40a2 Mobile_ReloadMapPart.Function +41:4061 HDMATransferTilemapAndAttrmap_Overworld +41:4067 HDMATransferTilemapAndAttrmap_Overworld.Function +41:4099 Mobile_HDMATransferTilemapAndAttrmap_Overworld +41:40a2 Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function 41:40d4 Function1040d4 41:40da Function1040d4.Function 41:40fb Function1040fb 41:4101 Function1040fb.Function -41:4110 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:4116 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function -41:4148 Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:414e Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function +41:4110 _HDMATransferTilemapAndAttrmap_Menu +41:4116 _HDMATransferTilemapAndAttrmap_Menu.Function +41:4148 Mobile_HDMATransferTilemapAndAttrmap_Menu +41:414e Mobile_HDMATransferTilemapAndAttrmap_Menu.Function 41:4177 CallInSafeGFXMode 41:419c CallInSafeGFXMode._hl_ 41:419d HDMATransferToWRAMBank3 41:41a4 WaitDMATransfer 41:41a4 WaitDMATransfer.loop -41:41ad HDMATransfer_Wait127Scanlines_toBGMap -41:41b7 HDMATransfer_Wait123Scanlines_toBGMap +41:41ad HDMATransfer_WaitForScanline128_toBGMap +41:41b7 HDMATransfer_WaitForScanline124_toBGMap 41:41c1 HDMATransfer_NoDI 41:41e4 HDMATransfer_NoDI.loop1 41:41e9 HDMATransfer_NoDI.loop2 41:41f8 HDMATransfer_NoDI.loop3 -41:4205 HDMATransfer_Wait123Scanlines -41:4209 HDMATransfer_Wait127Scanlines +41:4205 HDMATransfer_WaitForScanline124 +41:4209 HDMATransfer_WaitForScanline128 41:420b _continue_HDMATransfer 41:4225 _continue_HDMATransfer.ly_loop 41:422b _continue_HDMATransfer.rstat_loop_1 @@ -35351,9 +35351,9 @@ 5b:56a7 LoadTradeRoomBGPals 5b:56ae LoadCableTradeBorderTilemap 5b:56ca LinkTextbox -5b:56ce PrintWaitingTextAndSyncAndExchangeNybble -5b:56e1 PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText -5b:5701 PrintWaitingTextAndSyncAndExchangeNybble.Waiting +5b:56ce PlaceWaitingTextAndSyncAndExchangeNybble +5b:56e1 PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText +5b:5701 PlaceWaitingTextAndSyncAndExchangeNybble.Waiting 5b:570c LinkTradeMenu 5b:5713 LinkTradeMenu.GetJoypad 5b:5725 LinkTradeMenu.MenuAction @@ -55168,7 +55168,7 @@ 01:d046 wWalkingY 01:d046 wBufferMonSpclDef 01:d047 wWinTextPointer -01:d047 wWalkingTile +01:d047 wWalkingTileCollision 01:d048 wBufferMonStructEnd 01:d049 wLossTextPointer 01:d04b wScriptAfterPointer @@ -55210,7 +55210,7 @@ 01:d0ec wSolvedUnownPuzzle 01:d0ec wItemEffectSucceeded 01:d0ec wBattlePlayerAction -01:d0ed wVramState +01:d0ed wStateFlags 01:d0ee wBattleResult 01:d0ef wUsingItemWithSelect 01:d0f0 wCurElevatorCount @@ -55784,7 +55784,7 @@ 01:d432 wMapStatus 01:d433 wMapEventStatus 01:d434 wScriptFlags -01:d436 wScriptFlags2 +01:d436 wEnabledPlayerEvents 01:d437 wScriptMode 01:d438 wScriptRunning 01:d439 wScriptBank @@ -55862,7 +55862,7 @@ 01:d4e1 wPlayerAction 01:d4e2 wPlayerStepFrame 01:d4e3 wPlayerFacing -01:d4e4 wPlayerTile +01:d4e4 wPlayerTileCollision 01:d4e5 wPlayerLastTile 01:d4e6 wPlayerMapX 01:d4e7 wPlayerMapY @@ -55896,7 +55896,7 @@ 01:d509 wObject1Action 01:d50a wObject1StepFrame 01:d50b wObject1Facing -01:d50c wObject1Tile +01:d50c wObject1TileCollision 01:d50d wObject1LastTile 01:d50e wObject1MapX 01:d50f wObject1MapY @@ -55930,7 +55930,7 @@ 01:d531 wObject2Action 01:d532 wObject2StepFrame 01:d533 wObject2Facing -01:d534 wObject2Tile +01:d534 wObject2TileCollision 01:d535 wObject2LastTile 01:d536 wObject2MapX 01:d537 wObject2MapY @@ -55964,7 +55964,7 @@ 01:d559 wObject3Action 01:d55a wObject3StepFrame 01:d55b wObject3Facing -01:d55c wObject3Tile +01:d55c wObject3TileCollision 01:d55d wObject3LastTile 01:d55e wObject3MapX 01:d55f wObject3MapY @@ -55998,7 +55998,7 @@ 01:d581 wObject4Action 01:d582 wObject4StepFrame 01:d583 wObject4Facing -01:d584 wObject4Tile +01:d584 wObject4TileCollision 01:d585 wObject4LastTile 01:d586 wObject4MapX 01:d587 wObject4MapY @@ -56032,7 +56032,7 @@ 01:d5a9 wObject5Action 01:d5aa wObject5StepFrame 01:d5ab wObject5Facing -01:d5ac wObject5Tile +01:d5ac wObject5TileCollision 01:d5ad wObject5LastTile 01:d5ae wObject5MapX 01:d5af wObject5MapY @@ -56066,7 +56066,7 @@ 01:d5d1 wObject6Action 01:d5d2 wObject6StepFrame 01:d5d3 wObject6Facing -01:d5d4 wObject6Tile +01:d5d4 wObject6TileCollision 01:d5d5 wObject6LastTile 01:d5d6 wObject6MapX 01:d5d7 wObject6MapY @@ -56100,7 +56100,7 @@ 01:d5f9 wObject7Action 01:d5fa wObject7StepFrame 01:d5fb wObject7Facing -01:d5fc wObject7Tile +01:d5fc wObject7TileCollision 01:d5fd wObject7LastTile 01:d5fe wObject7MapX 01:d5ff wObject7MapY @@ -56134,7 +56134,7 @@ 01:d621 wObject8Action 01:d622 wObject8StepFrame 01:d623 wObject8Facing -01:d624 wObject8Tile +01:d624 wObject8TileCollision 01:d625 wObject8LastTile 01:d626 wObject8MapX 01:d627 wObject8MapY @@ -56168,7 +56168,7 @@ 01:d649 wObject9Action 01:d64a wObject9StepFrame 01:d64b wObject9Facing -01:d64c wObject9Tile +01:d64c wObject9TileCollision 01:d64d wObject9LastTile 01:d64e wObject9MapX 01:d64f wObject9MapY @@ -56202,7 +56202,7 @@ 01:d671 wObject10Action 01:d672 wObject10StepFrame 01:d673 wObject10Facing -01:d674 wObject10Tile +01:d674 wObject10TileCollision 01:d675 wObject10LastTile 01:d676 wObject10MapX 01:d677 wObject10MapY @@ -56236,7 +56236,7 @@ 01:d699 wObject11Action 01:d69a wObject11StepFrame 01:d69b wObject11Facing -01:d69c wObject11Tile +01:d69c wObject11TileCollision 01:d69d wObject11LastTile 01:d69e wObject11MapX 01:d69f wObject11MapY @@ -56270,7 +56270,7 @@ 01:d6c1 wObject12Action 01:d6c2 wObject12StepFrame 01:d6c3 wObject12Facing -01:d6c4 wObject12Tile +01:d6c4 wObject12TileCollision 01:d6c5 wObject12LastTile 01:d6c6 wObject12MapX 01:d6c7 wObject12MapY @@ -56683,8 +56683,8 @@ 01:dbf5 wBikeFlags 01:dbf7 wCurMapSceneScriptPointer 01:dbf9 wCurCaller -01:dbfb wCurMapWarpCount -01:dbfc wCurMapWarpsPointer +01:dbfb wCurMapWarpEventCount +01:dbfc wCurMapWarpEventsPointer 01:dbfe wCurMapCoordEventCount 01:dbff wCurMapCoordEventsPointer 01:dc01 wCurMapBGEventCount diff --git a/pokecrystal11_debug.map b/pokecrystal11_debug.map index dd21c0256ca..3aef76e55d5 100644 --- a/pokecrystal11_debug.map +++ b/pokecrystal11_debug.map @@ -165,7 +165,7 @@ ROM0 bank #0: $0833 = SerialDisconnected $083b = Serial_ExchangeSyncBytes $0847 = Serial_ExchangeSyncBytes.exchange - $0862 = Serial_PrintWaitingTextAndSyncAndExchangeNybble + $0862 = Serial_PlaceWaitingTextAndSyncAndExchangeNybble $0871 = Serial_SyncAndExchangeNybble $087d = WaitLinkTransfer $0882 = WaitLinkTransfer.loop @@ -263,7 +263,7 @@ ROM0 bank #0: $0d79 = ClearVBank1 $0d90 = GSReloadPalettes $0d91 = ReloadSpritesNoPalettes - $0db1 = SwapTextboxPalettes + $0db1 = LoadOverworldAttrmapPals $0dbd = ScrollBGMapPalettes $0dc9 = Get2bppViaHDMA $0ddc = Get1bppViaHDMA @@ -408,7 +408,7 @@ ROM0 bank #0: $13d4 = PlaceFarString $13e0 = PokeFluteTerminator $13e4 = PokeFluteTerminator.stop - $13e5 = PlaceHLTextAtBC + $13e5 = PrintTextboxTextAt $13f6 = DoTextUntilTerminator $13ff = DoTextUntilTerminator.TextCommand $1410 = TextCommands @@ -474,9 +474,9 @@ ROM0 bank #0: $1830 = GetSpriteVTile.found $1833 = GetSpriteVTile.done $1836 = DoesSpriteHaveFacings - $184a = GetPlayerTile + $184a = GetPlayerTilePermission $1852 = CheckOnWater - $185d = GetTileCollision + $185d = GetTilePermission $1875 = CheckGrassTile $1882 = CheckGrassTile.grass $1888 = CheckGrassTile.water @@ -520,8 +520,8 @@ ROM0 bank #0: $1a61 = CopySpriteMovementData $1a71 = CopySpriteMovementData.CopyData $1aae = _GetMovementIndex - $1ac6 = SetVramState_Bit0 - $1acc = ResetVramState_Bit0 + $1ac6 = SetVramState_SpriteUpdatesDisabled + $1acc = ResetVramState_SpriteUpdatesDisabled $1ad2 = UpdateSprites $1ae5 = GetObjectStruct $1af1 = DoesObjectHaveASprite @@ -656,8 +656,8 @@ ROM0 bank #0: $2167 = GetMapSceneID.end $216a = GetMapSceneID.found $216d = GetMapSceneID.done - $2173 = OverworldTextModeSwitch - $217a = LoadMapPart + $2173 = LoadOverworldTilemapAndAttrmapPals + $217a = LoadOverworldTilemap $2198 = LoadMetatiles $21a5 = LoadMetatiles.row $21a9 = LoadMetatiles.col @@ -698,7 +698,7 @@ ROM0 bank #0: $23a5 = GetMapConnection.loop $23ac = ReadMapSceneScripts $23c3 = ReadMapCallbacks - $23da = ReadWarps + $23da = ReadWarpEvents $23f1 = ReadCoordEvents $2408 = ReadBGEvents $241f = ReadObjectEvents @@ -805,10 +805,10 @@ ROM0 bank #0: $2a16 = GetMovementPermissions.CheckHiNybble $2a1e = GetFacingTileCoord $2a43 = GetFacingTileCoord.Directions - $2a53 = GetCoordTile - $2a6d = GetCoordTile.nocarry - $2a73 = GetCoordTile.nocarry2 - $2a7a = GetCoordTile.nope + $2a53 = GetCoordTileCollision + $2a6d = GetCoordTileCollision.nocarry + $2a73 = GetCoordTileCollision.nocarry2 + $2a7a = GetCoordTileCollision.nope $2a7d = GetBlockLocation $2a8f = GetBlockLocation.loop $2a94 = GetBlockLocation.ok @@ -869,11 +869,11 @@ ROM0 bank #0: $2d99 = FarCall_JumpToHL $2d9a = Predef $2dbd = Predef.Return - $2dd1 = RefreshScreen + $2dd1 = ReanchorMap $2de6 = CloseText $2df9 = CloseText.CloseText $2e1f = OpenText - $2e37 = _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + $2e37 = HDMATransferTilemapAndAttrmap_Menu $2e48 = SafeUpdateSprites $2e65 = SetCarryFlag $2e67 = ResetMapBufferEventFlags @@ -1007,8 +1007,8 @@ ROM0 bank #0: $32fa = _CopyTilemapAtOnce.loop_u12 $3303 = _CopyTilemapAtOnce.loop_u13 $330c = _CopyTilemapAtOnce.loop_u14 - $3327 = SetPalettes - $3337 = SetPalettes.SetPalettesForGameBoyColor + $3327 = SetDefaultBGPAndOBP + $3337 = SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor $3345 = ClearPalettes $3352 = ClearPalettes.cgb $336c = GetMemSGBLayout @@ -2543,11 +2543,11 @@ ROMX bank #3: $40aa = CardFlipSpecial $40ad = UnusedMemoryGameSpecial $40b0 = ClearBGPalettesBufferScreenSpecial - $40b3 = FadeOutPalettesSpecial + $40b3 = FadeOutToWhiteSpecial $40b6 = BattleTowerFadeSpecial - $40b9 = FadeBlackQuicklySpecial - $40bc = FadeInPalettesSpecial - $40bf = FadeInQuicklySpecial + $40b9 = FadeOutToBlackSpecial + $40bc = FadeInFromWhiteSpecial + $40bf = FadeInFromBlackSpecial $40c2 = ReloadSpritesNoPalettesSpecial $40c5 = ClearBGPalettesSpecial $40c8 = UpdateTimePalsSpecial @@ -4819,8 +4819,8 @@ ROMX bank #5: $548e = LoadMapAttributes_MapSetupCmd $5491 = LoadMapAttributes_SkipObjects_MapSetupCmd $5494 = ClearBGPalettes_MapSetupCmd - $5497 = FadeOutPalettes_MapSetupCmd - $549a = FadeInPalettes_MapSetupCmd + $5497 = FadeOutToWhite_MapSetupCmd + $549a = FadeInFromWhite_MapSetupCmd $549d = GetMapScreenCoords_MapSetupCmd $54a0 = GetWarpDestCoords_MapSetupCmd $54a3 = SpawnInFacingDown_MapSetupCmd @@ -4845,8 +4845,8 @@ ROMX bank #5: $54f1 = SkipUpdateMapSprites $54f7 = CheckUpdatePlayerSprite $5508 = CheckUpdatePlayerSprite.ok - $550c = CheckUpdatePlayerSprite.CheckBiking - $551a = CheckUpdatePlayerSprite.CheckSurfing2 + $550c = CheckUpdatePlayerSprite.CheckForcedBiking + $551a = CheckUpdatePlayerSprite.ResetSurfingOrBikingState $553e = CheckUpdatePlayerSprite.no_biking $5545 = CheckUpdatePlayerSprite.surfing $554c = CheckUpdatePlayerSprite.nope @@ -9738,7 +9738,7 @@ ROMX bank #15: $7ce0 = BattleStartMessage.cry_no_anim $7ceb = BattleStartMessage.skip_cry $7cfd = BattleStartMessage.NotFishing - $7d0e = BattleStartMessage.PlaceBattleStartText + $7d0e = BattleStartMessage.PrintBattleStartText $7d28 = BattleCommandPointers EMPTY: $7e86-$7fff ($017a bytes) TOTAL EMPTY: $017a bytes @@ -11016,11 +11016,11 @@ ROMX bank #18: ROMX bank #19: SECTION: $4000-$5248 ($1249 bytes) ["bank13"] - $4000 = _SwapTextboxPalettes - $4008 = _SwapTextboxPalettes.loop - $400b = _SwapTextboxPalettes.innerloop - $4021 = _SwapTextboxPalettes.UpperNybble - $4031 = _SwapTextboxPalettes.next + $4000 = _LoadOverworldAttrmapPals + $4008 = _LoadOverworldAttrmapPals.loop + $400b = _LoadOverworldAttrmapPals.innerloop + $4021 = _LoadOverworldAttrmapPals.UpperNybble + $4031 = _LoadOverworldAttrmapPals.next $403f = _ScrollBGMapPalettes $4045 = _ScrollBGMapPalettes.loop $405b = _ScrollBGMapPalettes.UpperNybble @@ -11064,7 +11064,7 @@ ROMX bank #19: $4d25 = TilesetBattleTowerInsidePalMap $4d95 = TilesetBattleTowerOutsidePalMap $4e05 = MapGroupPalettes - $4e1f = TileCollisionTable + $4e1f = CollisionPermissionTable $4f1f = EmptyAllSRAMBanks $4f34 = EmptyAllSRAMBanks.EmptyBank $4f45 = SaveMenu_CopyTilemapAtOnce @@ -11085,12 +11085,12 @@ ROMX bank #19: $4ffe = CheckSave $501b = CheckSave.ok $501e = MapScenes - $515b = _LoadMapPart - $5168 = _LoadMapPart.top_row - $5170 = _LoadMapPart.left_column - $5175 = _LoadMapPart.loop - $5177 = _LoadMapPart.loop2 - $5184 = _LoadMapPart.carry + $515b = _LoadOverworldTilemap + $5168 = _LoadOverworldTilemap.top_row + $5170 = _LoadOverworldTilemap.left_column + $5175 = _LoadOverworldTilemap.loop + $5177 = _LoadOverworldTilemap.loop2 + $5184 = _LoadOverworldTilemap.carry $5188 = PhoneRing_CopyTilemapAtOnce $51a2 = PhoneRing_CopyTilemapAtOnce.wait $51bd = PhoneRing_CopyTilemapAtOnce.wait2 @@ -11569,9 +11569,9 @@ ROMX bank #20: $444f = PartyMenu2DMenuData $4457 = PartyMenuSelect $448f = PartyMenuSelect.exitmenu - $449a = PrintPartyMenuText - $44ae = PrintPartyMenuText.haspokemon - $44be = PrintPartyMenuText.gotstring + $449a = PlacePartyMenuText + $44ae = PlacePartyMenuText.haspokemon + $44be = PlacePartyMenuText.gotstring $44d2 = PartyMenuStrings $44e4 = ChooseAMonString $44f3 = UseOnWhichPKMNString @@ -17346,12 +17346,12 @@ ROMX bank #35: $405b = _TimeOfDayPals.pop $406e = _TimeOfDayPals.dontchange $4070 = _UpdateTimePals - $4079 = FadeInPalettes - $4084 = FadeOutPalettes + $4079 = FadeInFromWhite + $4084 = FadeOutToWhite $4092 = BattleTowerFade $409c = BattleTowerFade.loop - $40ab = FadeInQuickly - $40b6 = FadeBlackQuickly + $40ab = FadeInFromBlack + $40b6 = FadeOutToBlack $40c1 = FillWhiteBGColor $40d4 = FillWhiteBGColor.loop $40e5 = ReplaceTimeOfDayPals @@ -19099,19 +19099,19 @@ ROMX bank #37: $66c3 = OverworldLoop.Jumptable $66cb = DisableEvents $66d0 = EnableEvents - $66d6 = CheckBit5_ScriptFlags2 - $66dc = DisableWarpsConnxns + $66d6 = CheckEnabledMapEventsBit5 + $66dc = DisableWarpsConnections $66e2 = DisableCoordEvents $66e8 = DisableStepCount $66ee = DisableWildEncounters - $66f4 = EnableWarpsConnxns + $66f4 = EnableWarpsConnections $66fa = EnableCoordEvents $6700 = EnableStepCount $6706 = EnableWildEncounters - $670c = CheckWarpConnxnScriptFlag - $6712 = CheckCoordEventScriptFlag - $6718 = CheckStepCountScriptFlag - $671e = CheckWildEncountersScriptFlag + $670c = CheckWarpConnectionsEnabled + $6712 = CheckCoordEventsEnabled + $6718 = CheckStepCountEnabled + $671e = CheckWildEncountersEnabled $6724 = StartMap $673e = EnterMap $675a = EnterMap.dont_enable @@ -19135,8 +19135,8 @@ ROMX bank #37: $681f = PlayerEvents $6848 = PlayerEvents.ok $6865 = PlayerEvents.ok2 - $6867 = CheckTrainerBattle_GetPlayerEvent - $6872 = CheckTrainerBattle_GetPlayerEvent.nope + $6867 = CheckTrainerEvent + $6872 = CheckTrainerEvent.nope $6874 = CheckTileEvent $6886 = CheckTileEvent.connections_disabled $6890 = CheckTileEvent.coord_events_disabled @@ -19149,7 +19149,7 @@ ROMX bank #37: $68c7 = CheckWildEncounterCooldown $68d1 = SetUpFiveStepWildEncounterCooldown $68d7 = SetMinTwoStepWildEncounterCooldown - $68e4 = Dummy_CheckScriptFlags2Bit5 + $68e4 = Dummy_CheckEnabledMapEventsBit5 $68ec = RunSceneScript $6938 = RunSceneScript.nope $693a = CheckTimeEvents @@ -19483,13 +19483,13 @@ ROMX bank #37: $7a9e = Script_delcmdqueue $7ab3 = Script_changemapblocks $7acc = Script_changeblock - $7ae3 = Script_reloadmappart + $7ae3 = Script_refreshmap $7af6 = Script_warpcheck $7b01 = Script_enableevents $7b08 = Script_newloadmap $7b16 = Script_reloadend $7b1c = Script_opentext - $7b20 = Script_refreshscreen + $7b20 = Script_reanchormap $7b27 = Script_writeunusedbyte $7b2e = UnusedClosetextScript $7b2f = Script_closetext @@ -19516,7 +19516,7 @@ ROMX bank #37: $7c27 = Script_checkver_duplicate.gs_version $7c28 = WarpToSpawnPoint $7c30 = RunMemScript - $7c4f = LoadScriptBDE + $7c4f = LoadMemScript $7c5f = TryTileCollisionEvent $7c7b = TryTileCollisionEvent.whirlpool $7c8b = TryTileCollisionEvent.waterfall @@ -19531,9 +19531,9 @@ ROMX bank #37: $7ced = RandomEncounter.ok_bug_contest $7cf4 = RandomEncounter.done $7cf9 = WildBattleScript - $7cfd = CanUseSweetScent - $7d17 = CanUseSweetScent.ice_check - $7d21 = CanUseSweetScent.no + $7cfd = CanEncounterWildMon + $7d17 = CanEncounterWildMon.ice_check + $7d21 = CanEncounterWildMon.no $7d23 = _TryWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest.loop @@ -31428,31 +31428,31 @@ ROMX bank #65: $4033 = HDMATransferTilemapToWRAMBank3.Function $4047 = HDMATransferAttrmapToWRAMBank3 $404d = HDMATransferAttrmapToWRAMBank3.Function - $4061 = ReloadMapPart - $4067 = ReloadMapPart.Function - $4099 = Mobile_ReloadMapPart - $40a2 = Mobile_ReloadMapPart.Function + $4061 = HDMATransferTilemapAndAttrmap_Overworld + $4067 = HDMATransferTilemapAndAttrmap_Overworld.Function + $4099 = Mobile_HDMATransferTilemapAndAttrmap_Overworld + $40a2 = Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function $40d4 = Function1040d4 $40da = Function1040d4.Function $40fb = Function1040fb $4101 = Function1040fb.Function - $4110 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $4116 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function - $4148 = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $414e = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function + $4110 = _HDMATransferTilemapAndAttrmap_Menu + $4116 = _HDMATransferTilemapAndAttrmap_Menu.Function + $4148 = Mobile_HDMATransferTilemapAndAttrmap_Menu + $414e = Mobile_HDMATransferTilemapAndAttrmap_Menu.Function $4177 = CallInSafeGFXMode $419c = CallInSafeGFXMode._hl_ $419d = HDMATransferToWRAMBank3 $41a4 = WaitDMATransfer $41a4 = WaitDMATransfer.loop - $41ad = HDMATransfer_Wait127Scanlines_toBGMap - $41b7 = HDMATransfer_Wait123Scanlines_toBGMap + $41ad = HDMATransfer_WaitForScanline128_toBGMap + $41b7 = HDMATransfer_WaitForScanline124_toBGMap $41c1 = HDMATransfer_NoDI $41e4 = HDMATransfer_NoDI.loop1 $41e9 = HDMATransfer_NoDI.loop2 $41f8 = HDMATransfer_NoDI.loop3 - $4205 = HDMATransfer_Wait123Scanlines - $4209 = HDMATransfer_Wait127Scanlines + $4205 = HDMATransfer_WaitForScanline124 + $4209 = HDMATransfer_WaitForScanline128 $420b = _continue_HDMATransfer $4225 = _continue_HDMATransfer.ly_loop $422b = _continue_HDMATransfer.rstat_loop_1 @@ -35870,9 +35870,9 @@ ROMX bank #91: $56a7 = LoadTradeRoomBGPals $56ae = LoadCableTradeBorderTilemap $56ca = LinkTextbox - $56ce = PrintWaitingTextAndSyncAndExchangeNybble - $56e1 = PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText - $5701 = PrintWaitingTextAndSyncAndExchangeNybble.Waiting + $56ce = PlaceWaitingTextAndSyncAndExchangeNybble + $56e1 = PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText + $5701 = PlaceWaitingTextAndSyncAndExchangeNybble.Waiting $570c = LinkTradeMenu $5713 = LinkTradeMenu.GetJoypad $5725 = LinkTradeMenu.MenuAction @@ -56210,7 +56210,7 @@ WRAMX bank #1: $d046 = wWalkingY $d046 = wBufferMonSpclDef $d047 = wWinTextPointer - $d047 = wWalkingTile + $d047 = wWalkingTileCollision $d048 = wBufferMonStructEnd $d049 = wLossTextPointer $d04b = wScriptAfterPointer @@ -56253,7 +56253,7 @@ WRAMX bank #1: $d0ec = wSolvedUnownPuzzle $d0ec = wItemEffectSucceeded $d0ec = wBattlePlayerAction - $d0ed = wVramState + $d0ed = wStateFlags $d0ee = wBattleResult $d0ef = wUsingItemWithSelect $d0f0 = wCurElevatorCount @@ -56828,7 +56828,7 @@ WRAMX bank #1: $d432 = wMapStatus $d433 = wMapEventStatus $d434 = wScriptFlags - $d436 = wScriptFlags2 + $d436 = wEnabledPlayerEvents $d437 = wScriptMode $d438 = wScriptRunning $d439 = wScriptBank @@ -56906,7 +56906,7 @@ WRAMX bank #1: $d4e1 = wPlayerAction $d4e2 = wPlayerStepFrame $d4e3 = wPlayerFacing - $d4e4 = wPlayerTile + $d4e4 = wPlayerTileCollision $d4e5 = wPlayerLastTile $d4e6 = wPlayerMapX $d4e7 = wPlayerMapY @@ -56940,7 +56940,7 @@ WRAMX bank #1: $d509 = wObject1Action $d50a = wObject1StepFrame $d50b = wObject1Facing - $d50c = wObject1Tile + $d50c = wObject1TileCollision $d50d = wObject1LastTile $d50e = wObject1MapX $d50f = wObject1MapY @@ -56974,7 +56974,7 @@ WRAMX bank #1: $d531 = wObject2Action $d532 = wObject2StepFrame $d533 = wObject2Facing - $d534 = wObject2Tile + $d534 = wObject2TileCollision $d535 = wObject2LastTile $d536 = wObject2MapX $d537 = wObject2MapY @@ -57008,7 +57008,7 @@ WRAMX bank #1: $d559 = wObject3Action $d55a = wObject3StepFrame $d55b = wObject3Facing - $d55c = wObject3Tile + $d55c = wObject3TileCollision $d55d = wObject3LastTile $d55e = wObject3MapX $d55f = wObject3MapY @@ -57042,7 +57042,7 @@ WRAMX bank #1: $d581 = wObject4Action $d582 = wObject4StepFrame $d583 = wObject4Facing - $d584 = wObject4Tile + $d584 = wObject4TileCollision $d585 = wObject4LastTile $d586 = wObject4MapX $d587 = wObject4MapY @@ -57076,7 +57076,7 @@ WRAMX bank #1: $d5a9 = wObject5Action $d5aa = wObject5StepFrame $d5ab = wObject5Facing - $d5ac = wObject5Tile + $d5ac = wObject5TileCollision $d5ad = wObject5LastTile $d5ae = wObject5MapX $d5af = wObject5MapY @@ -57110,7 +57110,7 @@ WRAMX bank #1: $d5d1 = wObject6Action $d5d2 = wObject6StepFrame $d5d3 = wObject6Facing - $d5d4 = wObject6Tile + $d5d4 = wObject6TileCollision $d5d5 = wObject6LastTile $d5d6 = wObject6MapX $d5d7 = wObject6MapY @@ -57144,7 +57144,7 @@ WRAMX bank #1: $d5f9 = wObject7Action $d5fa = wObject7StepFrame $d5fb = wObject7Facing - $d5fc = wObject7Tile + $d5fc = wObject7TileCollision $d5fd = wObject7LastTile $d5fe = wObject7MapX $d5ff = wObject7MapY @@ -57178,7 +57178,7 @@ WRAMX bank #1: $d621 = wObject8Action $d622 = wObject8StepFrame $d623 = wObject8Facing - $d624 = wObject8Tile + $d624 = wObject8TileCollision $d625 = wObject8LastTile $d626 = wObject8MapX $d627 = wObject8MapY @@ -57212,7 +57212,7 @@ WRAMX bank #1: $d649 = wObject9Action $d64a = wObject9StepFrame $d64b = wObject9Facing - $d64c = wObject9Tile + $d64c = wObject9TileCollision $d64d = wObject9LastTile $d64e = wObject9MapX $d64f = wObject9MapY @@ -57246,7 +57246,7 @@ WRAMX bank #1: $d671 = wObject10Action $d672 = wObject10StepFrame $d673 = wObject10Facing - $d674 = wObject10Tile + $d674 = wObject10TileCollision $d675 = wObject10LastTile $d676 = wObject10MapX $d677 = wObject10MapY @@ -57280,7 +57280,7 @@ WRAMX bank #1: $d699 = wObject11Action $d69a = wObject11StepFrame $d69b = wObject11Facing - $d69c = wObject11Tile + $d69c = wObject11TileCollision $d69d = wObject11LastTile $d69e = wObject11MapX $d69f = wObject11MapY @@ -57314,7 +57314,7 @@ WRAMX bank #1: $d6c1 = wObject12Action $d6c2 = wObject12StepFrame $d6c3 = wObject12Facing - $d6c4 = wObject12Tile + $d6c4 = wObject12TileCollision $d6c5 = wObject12LastTile $d6c6 = wObject12MapX $d6c7 = wObject12MapY @@ -57727,8 +57727,8 @@ WRAMX bank #1: $dbf5 = wBikeFlags $dbf7 = wCurMapSceneScriptPointer $dbf9 = wCurCaller - $dbfb = wCurMapWarpCount - $dbfc = wCurMapWarpsPointer + $dbfb = wCurMapWarpEventCount + $dbfc = wCurMapWarpEventsPointer $dbfe = wCurMapCoordEventCount $dbff = wCurMapCoordEventsPointer $dc01 = wCurMapBGEventCount diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym index 3dcdb76a2da..505ce6f9fde 100644 --- a/pokecrystal11_debug.sym +++ b/pokecrystal11_debug.sym @@ -130,7 +130,7 @@ 00:0833 SerialDisconnected 00:083b Serial_ExchangeSyncBytes 00:0847 Serial_ExchangeSyncBytes.exchange -00:0862 Serial_PrintWaitingTextAndSyncAndExchangeNybble +00:0862 Serial_PlaceWaitingTextAndSyncAndExchangeNybble 00:0871 Serial_SyncAndExchangeNybble 00:087d WaitLinkTransfer 00:0882 WaitLinkTransfer.loop @@ -228,7 +228,7 @@ 00:0d79 ClearVBank1 00:0d90 GSReloadPalettes 00:0d91 ReloadSpritesNoPalettes -00:0db1 SwapTextboxPalettes +00:0db1 LoadOverworldAttrmapPals 00:0dbd ScrollBGMapPalettes 00:0dc9 Get2bppViaHDMA 00:0ddc Get1bppViaHDMA @@ -373,7 +373,7 @@ 00:13d4 PlaceFarString 00:13e0 PokeFluteTerminator 00:13e4 PokeFluteTerminator.stop -00:13e5 PlaceHLTextAtBC +00:13e5 PrintTextboxTextAt 00:13f6 DoTextUntilTerminator 00:13ff DoTextUntilTerminator.TextCommand 00:1410 TextCommands @@ -439,9 +439,9 @@ 00:1830 GetSpriteVTile.found 00:1833 GetSpriteVTile.done 00:1836 DoesSpriteHaveFacings -00:184a GetPlayerTile +00:184a GetPlayerTilePermission 00:1852 CheckOnWater -00:185d GetTileCollision +00:185d GetTilePermission 00:1875 CheckGrassTile 00:1882 CheckGrassTile.grass 00:1888 CheckGrassTile.water @@ -485,8 +485,8 @@ 00:1a61 CopySpriteMovementData 00:1a71 CopySpriteMovementData.CopyData 00:1aae _GetMovementIndex -00:1ac6 SetVramState_Bit0 -00:1acc ResetVramState_Bit0 +00:1ac6 SetVramState_SpriteUpdatesDisabled +00:1acc ResetVramState_SpriteUpdatesDisabled 00:1ad2 UpdateSprites 00:1ae5 GetObjectStruct 00:1af1 DoesObjectHaveASprite @@ -621,8 +621,8 @@ 00:2167 GetMapSceneID.end 00:216a GetMapSceneID.found 00:216d GetMapSceneID.done -00:2173 OverworldTextModeSwitch -00:217a LoadMapPart +00:2173 LoadOverworldTilemapAndAttrmapPals +00:217a LoadOverworldTilemap 00:2198 LoadMetatiles 00:21a5 LoadMetatiles.row 00:21a9 LoadMetatiles.col @@ -663,7 +663,7 @@ 00:23a5 GetMapConnection.loop 00:23ac ReadMapSceneScripts 00:23c3 ReadMapCallbacks -00:23da ReadWarps +00:23da ReadWarpEvents 00:23f1 ReadCoordEvents 00:2408 ReadBGEvents 00:241f ReadObjectEvents @@ -770,10 +770,10 @@ 00:2a16 GetMovementPermissions.CheckHiNybble 00:2a1e GetFacingTileCoord 00:2a43 GetFacingTileCoord.Directions -00:2a53 GetCoordTile -00:2a6d GetCoordTile.nocarry -00:2a73 GetCoordTile.nocarry2 -00:2a7a GetCoordTile.nope +00:2a53 GetCoordTileCollision +00:2a6d GetCoordTileCollision.nocarry +00:2a73 GetCoordTileCollision.nocarry2 +00:2a7a GetCoordTileCollision.nope 00:2a7d GetBlockLocation 00:2a8f GetBlockLocation.loop 00:2a94 GetBlockLocation.ok @@ -834,11 +834,11 @@ 00:2d99 FarCall_JumpToHL 00:2d9a Predef 00:2dbd Predef.Return -00:2dd1 RefreshScreen +00:2dd1 ReanchorMap 00:2de6 CloseText 00:2df9 CloseText.CloseText 00:2e1f OpenText -00:2e37 _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap +00:2e37 HDMATransferTilemapAndAttrmap_Menu 00:2e48 SafeUpdateSprites 00:2e65 SetCarryFlag 00:2e67 ResetMapBufferEventFlags @@ -972,8 +972,8 @@ 00:32fa _CopyTilemapAtOnce.loop_u12 00:3303 _CopyTilemapAtOnce.loop_u13 00:330c _CopyTilemapAtOnce.loop_u14 -00:3327 SetPalettes -00:3337 SetPalettes.SetPalettesForGameBoyColor +00:3327 SetDefaultBGPAndOBP +00:3337 SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor 00:3345 ClearPalettes 00:3352 ClearPalettes.cgb 00:336c GetMemSGBLayout @@ -2493,11 +2493,11 @@ 03:40aa CardFlipSpecial 03:40ad UnusedMemoryGameSpecial 03:40b0 ClearBGPalettesBufferScreenSpecial -03:40b3 FadeOutPalettesSpecial +03:40b3 FadeOutToWhiteSpecial 03:40b6 BattleTowerFadeSpecial -03:40b9 FadeBlackQuicklySpecial -03:40bc FadeInPalettesSpecial -03:40bf FadeInQuicklySpecial +03:40b9 FadeOutToBlackSpecial +03:40bc FadeInFromWhiteSpecial +03:40bf FadeInFromBlackSpecial 03:40c2 ReloadSpritesNoPalettesSpecial 03:40c5 ClearBGPalettesSpecial 03:40c8 UpdateTimePalsSpecial @@ -4759,8 +4759,8 @@ 05:548e LoadMapAttributes_MapSetupCmd 05:5491 LoadMapAttributes_SkipObjects_MapSetupCmd 05:5494 ClearBGPalettes_MapSetupCmd -05:5497 FadeOutPalettes_MapSetupCmd -05:549a FadeInPalettes_MapSetupCmd +05:5497 FadeOutToWhite_MapSetupCmd +05:549a FadeInFromWhite_MapSetupCmd 05:549d GetMapScreenCoords_MapSetupCmd 05:54a0 GetWarpDestCoords_MapSetupCmd 05:54a3 SpawnInFacingDown_MapSetupCmd @@ -4785,8 +4785,8 @@ 05:54f1 SkipUpdateMapSprites 05:54f7 CheckUpdatePlayerSprite 05:5508 CheckUpdatePlayerSprite.ok -05:550c CheckUpdatePlayerSprite.CheckBiking -05:551a CheckUpdatePlayerSprite.CheckSurfing2 +05:550c CheckUpdatePlayerSprite.CheckForcedBiking +05:551a CheckUpdatePlayerSprite.ResetSurfingOrBikingState 05:553e CheckUpdatePlayerSprite.no_biking 05:5545 CheckUpdatePlayerSprite.surfing 05:554c CheckUpdatePlayerSprite.nope @@ -9623,7 +9623,7 @@ 0f:7ce0 BattleStartMessage.cry_no_anim 0f:7ceb BattleStartMessage.skip_cry 0f:7cfd BattleStartMessage.NotFishing -0f:7d0e BattleStartMessage.PlaceBattleStartText +0f:7d0e BattleStartMessage.PrintBattleStartText 0f:7d28 BattleCommandPointers 10:4000 Pokedex 10:4029 Pokedex.main @@ -10880,11 +10880,11 @@ 12:6e3b AskRememberPassword.DoMenu 12:6e73 AskRememberPassword.refused 12:6e7a Buena_ExitMenu -13:4000 _SwapTextboxPalettes -13:4008 _SwapTextboxPalettes.loop -13:400b _SwapTextboxPalettes.innerloop -13:4021 _SwapTextboxPalettes.UpperNybble -13:4031 _SwapTextboxPalettes.next +13:4000 _LoadOverworldAttrmapPals +13:4008 _LoadOverworldAttrmapPals.loop +13:400b _LoadOverworldAttrmapPals.innerloop +13:4021 _LoadOverworldAttrmapPals.UpperNybble +13:4031 _LoadOverworldAttrmapPals.next 13:403f _ScrollBGMapPalettes 13:4045 _ScrollBGMapPalettes.loop 13:405b _ScrollBGMapPalettes.UpperNybble @@ -10928,7 +10928,7 @@ 13:4d25 TilesetBattleTowerInsidePalMap 13:4d95 TilesetBattleTowerOutsidePalMap 13:4e05 MapGroupPalettes -13:4e1f TileCollisionTable +13:4e1f CollisionPermissionTable 13:4f1f EmptyAllSRAMBanks 13:4f34 EmptyAllSRAMBanks.EmptyBank 13:4f45 SaveMenu_CopyTilemapAtOnce @@ -10949,12 +10949,12 @@ 13:4ffe CheckSave 13:501b CheckSave.ok 13:501e MapScenes -13:515b _LoadMapPart -13:5168 _LoadMapPart.top_row -13:5170 _LoadMapPart.left_column -13:5175 _LoadMapPart.loop -13:5177 _LoadMapPart.loop2 -13:5184 _LoadMapPart.carry +13:515b _LoadOverworldTilemap +13:5168 _LoadOverworldTilemap.top_row +13:5170 _LoadOverworldTilemap.left_column +13:5175 _LoadOverworldTilemap.loop +13:5177 _LoadOverworldTilemap.loop2 +13:5184 _LoadOverworldTilemap.carry 13:5188 PhoneRing_CopyTilemapAtOnce 13:51a2 PhoneRing_CopyTilemapAtOnce.wait 13:51bd PhoneRing_CopyTilemapAtOnce.wait2 @@ -11426,9 +11426,9 @@ 14:444f PartyMenu2DMenuData 14:4457 PartyMenuSelect 14:448f PartyMenuSelect.exitmenu -14:449a PrintPartyMenuText -14:44ae PrintPartyMenuText.haspokemon -14:44be PrintPartyMenuText.gotstring +14:449a PlacePartyMenuText +14:44ae PlacePartyMenuText.haspokemon +14:44be PlacePartyMenuText.gotstring 14:44d2 PartyMenuStrings 14:44e4 ChooseAMonString 14:44f3 UseOnWhichPKMNString @@ -17127,12 +17127,12 @@ 23:405b _TimeOfDayPals.pop 23:406e _TimeOfDayPals.dontchange 23:4070 _UpdateTimePals -23:4079 FadeInPalettes -23:4084 FadeOutPalettes +23:4079 FadeInFromWhite +23:4084 FadeOutToWhite 23:4092 BattleTowerFade 23:409c BattleTowerFade.loop -23:40ab FadeInQuickly -23:40b6 FadeBlackQuickly +23:40ab FadeInFromBlack +23:40b6 FadeOutToBlack 23:40c1 FillWhiteBGColor 23:40d4 FillWhiteBGColor.loop 23:40e5 ReplaceTimeOfDayPals @@ -18869,19 +18869,19 @@ 25:66c3 OverworldLoop.Jumptable 25:66cb DisableEvents 25:66d0 EnableEvents -25:66d6 CheckBit5_ScriptFlags2 -25:66dc DisableWarpsConnxns +25:66d6 CheckEnabledMapEventsBit5 +25:66dc DisableWarpsConnections 25:66e2 DisableCoordEvents 25:66e8 DisableStepCount 25:66ee DisableWildEncounters -25:66f4 EnableWarpsConnxns +25:66f4 EnableWarpsConnections 25:66fa EnableCoordEvents 25:6700 EnableStepCount 25:6706 EnableWildEncounters -25:670c CheckWarpConnxnScriptFlag -25:6712 CheckCoordEventScriptFlag -25:6718 CheckStepCountScriptFlag -25:671e CheckWildEncountersScriptFlag +25:670c CheckWarpConnectionsEnabled +25:6712 CheckCoordEventsEnabled +25:6718 CheckStepCountEnabled +25:671e CheckWildEncountersEnabled 25:6724 StartMap 25:673e EnterMap 25:675a EnterMap.dont_enable @@ -18905,8 +18905,8 @@ 25:681f PlayerEvents 25:6848 PlayerEvents.ok 25:6865 PlayerEvents.ok2 -25:6867 CheckTrainerBattle_GetPlayerEvent -25:6872 CheckTrainerBattle_GetPlayerEvent.nope +25:6867 CheckTrainerEvent +25:6872 CheckTrainerEvent.nope 25:6874 CheckTileEvent 25:6886 CheckTileEvent.connections_disabled 25:6890 CheckTileEvent.coord_events_disabled @@ -18919,7 +18919,7 @@ 25:68c7 CheckWildEncounterCooldown 25:68d1 SetUpFiveStepWildEncounterCooldown 25:68d7 SetMinTwoStepWildEncounterCooldown -25:68e4 Dummy_CheckScriptFlags2Bit5 +25:68e4 Dummy_CheckEnabledMapEventsBit5 25:68ec RunSceneScript 25:6938 RunSceneScript.nope 25:693a CheckTimeEvents @@ -19253,13 +19253,13 @@ 25:7a9e Script_delcmdqueue 25:7ab3 Script_changemapblocks 25:7acc Script_changeblock -25:7ae3 Script_reloadmappart +25:7ae3 Script_refreshmap 25:7af6 Script_warpcheck 25:7b01 Script_enableevents 25:7b08 Script_newloadmap 25:7b16 Script_reloadend 25:7b1c Script_opentext -25:7b20 Script_refreshscreen +25:7b20 Script_reanchormap 25:7b27 Script_writeunusedbyte 25:7b2e UnusedClosetextScript 25:7b2f Script_closetext @@ -19286,7 +19286,7 @@ 25:7c27 Script_checkver_duplicate.gs_version 25:7c28 WarpToSpawnPoint 25:7c30 RunMemScript -25:7c4f LoadScriptBDE +25:7c4f LoadMemScript 25:7c5f TryTileCollisionEvent 25:7c7b TryTileCollisionEvent.whirlpool 25:7c8b TryTileCollisionEvent.waterfall @@ -19301,9 +19301,9 @@ 25:7ced RandomEncounter.ok_bug_contest 25:7cf4 RandomEncounter.done 25:7cf9 WildBattleScript -25:7cfd CanUseSweetScent -25:7d17 CanUseSweetScent.ice_check -25:7d21 CanUseSweetScent.no +25:7cfd CanEncounterWildMon +25:7d17 CanEncounterWildMon.ice_check +25:7d21 CanEncounterWildMon.no 25:7d23 _TryWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest.loop @@ -31051,31 +31051,31 @@ 41:4033 HDMATransferTilemapToWRAMBank3.Function 41:4047 HDMATransferAttrmapToWRAMBank3 41:404d HDMATransferAttrmapToWRAMBank3.Function -41:4061 ReloadMapPart -41:4067 ReloadMapPart.Function -41:4099 Mobile_ReloadMapPart -41:40a2 Mobile_ReloadMapPart.Function +41:4061 HDMATransferTilemapAndAttrmap_Overworld +41:4067 HDMATransferTilemapAndAttrmap_Overworld.Function +41:4099 Mobile_HDMATransferTilemapAndAttrmap_Overworld +41:40a2 Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function 41:40d4 Function1040d4 41:40da Function1040d4.Function 41:40fb Function1040fb 41:4101 Function1040fb.Function -41:4110 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:4116 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function -41:4148 Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:414e Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function +41:4110 _HDMATransferTilemapAndAttrmap_Menu +41:4116 _HDMATransferTilemapAndAttrmap_Menu.Function +41:4148 Mobile_HDMATransferTilemapAndAttrmap_Menu +41:414e Mobile_HDMATransferTilemapAndAttrmap_Menu.Function 41:4177 CallInSafeGFXMode 41:419c CallInSafeGFXMode._hl_ 41:419d HDMATransferToWRAMBank3 41:41a4 WaitDMATransfer 41:41a4 WaitDMATransfer.loop -41:41ad HDMATransfer_Wait127Scanlines_toBGMap -41:41b7 HDMATransfer_Wait123Scanlines_toBGMap +41:41ad HDMATransfer_WaitForScanline128_toBGMap +41:41b7 HDMATransfer_WaitForScanline124_toBGMap 41:41c1 HDMATransfer_NoDI 41:41e4 HDMATransfer_NoDI.loop1 41:41e9 HDMATransfer_NoDI.loop2 41:41f8 HDMATransfer_NoDI.loop3 -41:4205 HDMATransfer_Wait123Scanlines -41:4209 HDMATransfer_Wait127Scanlines +41:4205 HDMATransfer_WaitForScanline124 +41:4209 HDMATransfer_WaitForScanline128 41:420b _continue_HDMATransfer 41:4225 _continue_HDMATransfer.ly_loop 41:422b _continue_HDMATransfer.rstat_loop_1 @@ -35363,9 +35363,9 @@ 5b:56a7 LoadTradeRoomBGPals 5b:56ae LoadCableTradeBorderTilemap 5b:56ca LinkTextbox -5b:56ce PrintWaitingTextAndSyncAndExchangeNybble -5b:56e1 PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText -5b:5701 PrintWaitingTextAndSyncAndExchangeNybble.Waiting +5b:56ce PlaceWaitingTextAndSyncAndExchangeNybble +5b:56e1 PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText +5b:5701 PlaceWaitingTextAndSyncAndExchangeNybble.Waiting 5b:570c LinkTradeMenu 5b:5713 LinkTradeMenu.GetJoypad 5b:5725 LinkTradeMenu.MenuAction @@ -55438,7 +55438,7 @@ 01:d046 wWalkingY 01:d046 wBufferMonSpclDef 01:d047 wWinTextPointer -01:d047 wWalkingTile +01:d047 wWalkingTileCollision 01:d048 wBufferMonStructEnd 01:d049 wLossTextPointer 01:d04b wScriptAfterPointer @@ -55480,7 +55480,7 @@ 01:d0ec wSolvedUnownPuzzle 01:d0ec wItemEffectSucceeded 01:d0ec wBattlePlayerAction -01:d0ed wVramState +01:d0ed wStateFlags 01:d0ee wBattleResult 01:d0ef wUsingItemWithSelect 01:d0f0 wCurElevatorCount @@ -56054,7 +56054,7 @@ 01:d432 wMapStatus 01:d433 wMapEventStatus 01:d434 wScriptFlags -01:d436 wScriptFlags2 +01:d436 wEnabledPlayerEvents 01:d437 wScriptMode 01:d438 wScriptRunning 01:d439 wScriptBank @@ -56132,7 +56132,7 @@ 01:d4e1 wPlayerAction 01:d4e2 wPlayerStepFrame 01:d4e3 wPlayerFacing -01:d4e4 wPlayerTile +01:d4e4 wPlayerTileCollision 01:d4e5 wPlayerLastTile 01:d4e6 wPlayerMapX 01:d4e7 wPlayerMapY @@ -56166,7 +56166,7 @@ 01:d509 wObject1Action 01:d50a wObject1StepFrame 01:d50b wObject1Facing -01:d50c wObject1Tile +01:d50c wObject1TileCollision 01:d50d wObject1LastTile 01:d50e wObject1MapX 01:d50f wObject1MapY @@ -56200,7 +56200,7 @@ 01:d531 wObject2Action 01:d532 wObject2StepFrame 01:d533 wObject2Facing -01:d534 wObject2Tile +01:d534 wObject2TileCollision 01:d535 wObject2LastTile 01:d536 wObject2MapX 01:d537 wObject2MapY @@ -56234,7 +56234,7 @@ 01:d559 wObject3Action 01:d55a wObject3StepFrame 01:d55b wObject3Facing -01:d55c wObject3Tile +01:d55c wObject3TileCollision 01:d55d wObject3LastTile 01:d55e wObject3MapX 01:d55f wObject3MapY @@ -56268,7 +56268,7 @@ 01:d581 wObject4Action 01:d582 wObject4StepFrame 01:d583 wObject4Facing -01:d584 wObject4Tile +01:d584 wObject4TileCollision 01:d585 wObject4LastTile 01:d586 wObject4MapX 01:d587 wObject4MapY @@ -56302,7 +56302,7 @@ 01:d5a9 wObject5Action 01:d5aa wObject5StepFrame 01:d5ab wObject5Facing -01:d5ac wObject5Tile +01:d5ac wObject5TileCollision 01:d5ad wObject5LastTile 01:d5ae wObject5MapX 01:d5af wObject5MapY @@ -56336,7 +56336,7 @@ 01:d5d1 wObject6Action 01:d5d2 wObject6StepFrame 01:d5d3 wObject6Facing -01:d5d4 wObject6Tile +01:d5d4 wObject6TileCollision 01:d5d5 wObject6LastTile 01:d5d6 wObject6MapX 01:d5d7 wObject6MapY @@ -56370,7 +56370,7 @@ 01:d5f9 wObject7Action 01:d5fa wObject7StepFrame 01:d5fb wObject7Facing -01:d5fc wObject7Tile +01:d5fc wObject7TileCollision 01:d5fd wObject7LastTile 01:d5fe wObject7MapX 01:d5ff wObject7MapY @@ -56404,7 +56404,7 @@ 01:d621 wObject8Action 01:d622 wObject8StepFrame 01:d623 wObject8Facing -01:d624 wObject8Tile +01:d624 wObject8TileCollision 01:d625 wObject8LastTile 01:d626 wObject8MapX 01:d627 wObject8MapY @@ -56438,7 +56438,7 @@ 01:d649 wObject9Action 01:d64a wObject9StepFrame 01:d64b wObject9Facing -01:d64c wObject9Tile +01:d64c wObject9TileCollision 01:d64d wObject9LastTile 01:d64e wObject9MapX 01:d64f wObject9MapY @@ -56472,7 +56472,7 @@ 01:d671 wObject10Action 01:d672 wObject10StepFrame 01:d673 wObject10Facing -01:d674 wObject10Tile +01:d674 wObject10TileCollision 01:d675 wObject10LastTile 01:d676 wObject10MapX 01:d677 wObject10MapY @@ -56506,7 +56506,7 @@ 01:d699 wObject11Action 01:d69a wObject11StepFrame 01:d69b wObject11Facing -01:d69c wObject11Tile +01:d69c wObject11TileCollision 01:d69d wObject11LastTile 01:d69e wObject11MapX 01:d69f wObject11MapY @@ -56540,7 +56540,7 @@ 01:d6c1 wObject12Action 01:d6c2 wObject12StepFrame 01:d6c3 wObject12Facing -01:d6c4 wObject12Tile +01:d6c4 wObject12TileCollision 01:d6c5 wObject12LastTile 01:d6c6 wObject12MapX 01:d6c7 wObject12MapY @@ -56953,8 +56953,8 @@ 01:dbf5 wBikeFlags 01:dbf7 wCurMapSceneScriptPointer 01:dbf9 wCurCaller -01:dbfb wCurMapWarpCount -01:dbfc wCurMapWarpsPointer +01:dbfb wCurMapWarpEventCount +01:dbfc wCurMapWarpEventsPointer 01:dbfe wCurMapCoordEventCount 01:dbff wCurMapCoordEventsPointer 01:dc01 wCurMapBGEventCount diff --git a/pokecrystal11_vc.map b/pokecrystal11_vc.map index 07dae07f4d4..e19f98c2011 100644 --- a/pokecrystal11_vc.map +++ b/pokecrystal11_vc.map @@ -165,7 +165,7 @@ ROM0 bank #0: $0833 = SerialDisconnected $083b = Serial_ExchangeSyncBytes $0847 = Serial_ExchangeSyncBytes.exchange - $0862 = Serial_PrintWaitingTextAndSyncAndExchangeNybble + $0862 = Serial_PlaceWaitingTextAndSyncAndExchangeNybble $0871 = Serial_SyncAndExchangeNybble $087d = WaitLinkTransfer $087d = WaitLinkTransfer.VC_Wireless_WaitLinkTransfer @@ -269,7 +269,7 @@ ROM0 bank #0: $0d79 = ClearVBank1 $0d90 = GSReloadPalettes $0d91 = ReloadSpritesNoPalettes - $0db1 = SwapTextboxPalettes + $0db1 = LoadOverworldAttrmapPals $0dbd = ScrollBGMapPalettes $0dc9 = Get2bppViaHDMA $0ddc = Get1bppViaHDMA @@ -414,7 +414,7 @@ ROM0 bank #0: $13d4 = PlaceFarString $13e0 = PokeFluteTerminator $13e4 = PokeFluteTerminator.stop - $13e5 = PlaceHLTextAtBC + $13e5 = PrintTextboxTextAt $13f6 = DoTextUntilTerminator $13ff = DoTextUntilTerminator.TextCommand $1410 = TextCommands @@ -480,9 +480,9 @@ ROM0 bank #0: $1830 = GetSpriteVTile.found $1833 = GetSpriteVTile.done $1836 = DoesSpriteHaveFacings - $184a = GetPlayerTile + $184a = GetPlayerTilePermission $1852 = CheckOnWater - $185d = GetTileCollision + $185d = GetTilePermission $1875 = CheckGrassTile $1882 = CheckGrassTile.grass $1888 = CheckGrassTile.water @@ -526,8 +526,8 @@ ROM0 bank #0: $1a61 = CopySpriteMovementData $1a71 = CopySpriteMovementData.CopyData $1aae = _GetMovementIndex - $1ac6 = SetVramState_Bit0 - $1acc = ResetVramState_Bit0 + $1ac6 = SetVramState_SpriteUpdatesDisabled + $1acc = ResetVramState_SpriteUpdatesDisabled $1ad2 = UpdateSprites $1ae5 = GetObjectStruct $1af1 = DoesObjectHaveASprite @@ -662,8 +662,8 @@ ROM0 bank #0: $2167 = GetMapSceneID.end $216a = GetMapSceneID.found $216d = GetMapSceneID.done - $2173 = OverworldTextModeSwitch - $217a = LoadMapPart + $2173 = LoadOverworldTilemapAndAttrmapPals + $217a = LoadOverworldTilemap $2198 = LoadMetatiles $21a5 = LoadMetatiles.row $21a9 = LoadMetatiles.col @@ -704,7 +704,7 @@ ROM0 bank #0: $23a5 = GetMapConnection.loop $23ac = ReadMapSceneScripts $23c3 = ReadMapCallbacks - $23da = ReadWarps + $23da = ReadWarpEvents $23f1 = ReadCoordEvents $2408 = ReadBGEvents $241f = ReadObjectEvents @@ -809,10 +809,10 @@ ROM0 bank #0: $29ff = GetMovementPermissions.CheckHiNybble $2a07 = GetFacingTileCoord $2a2c = GetFacingTileCoord.Directions - $2a3c = GetCoordTile - $2a56 = GetCoordTile.nocarry - $2a5c = GetCoordTile.nocarry2 - $2a63 = GetCoordTile.nope + $2a3c = GetCoordTileCollision + $2a56 = GetCoordTileCollision.nocarry + $2a5c = GetCoordTileCollision.nocarry2 + $2a63 = GetCoordTileCollision.nope $2a66 = GetBlockLocation $2a78 = GetBlockLocation.loop $2a7d = GetBlockLocation.ok @@ -873,11 +873,11 @@ ROM0 bank #0: $2d82 = FarCall_JumpToHL $2d83 = Predef $2da6 = Predef.Return - $2dba = RefreshScreen + $2dba = ReanchorMap $2dcf = CloseText $2de2 = CloseText.CloseText $2e08 = OpenText - $2e20 = _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + $2e20 = HDMATransferTilemapAndAttrmap_Menu $2e31 = SafeUpdateSprites $2e4e = SetCarryFlag $2e50 = ResetMapBufferEventFlags @@ -1010,8 +1010,8 @@ ROM0 bank #0: $32cc = _CopyTilemapAtOnce.loop_u12 $32d5 = _CopyTilemapAtOnce.loop_u13 $32de = _CopyTilemapAtOnce.loop_u14 - $32f9 = SetPalettes - $3309 = SetPalettes.SetPalettesForGameBoyColor + $32f9 = SetDefaultBGPAndOBP + $3309 = SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor $3317 = ClearPalettes $3324 = ClearPalettes.cgb $333e = GetMemSGBLayout @@ -2546,11 +2546,11 @@ ROMX bank #3: $40aa = CardFlipSpecial $40ad = UnusedMemoryGameSpecial $40b0 = ClearBGPalettesBufferScreenSpecial - $40b3 = FadeOutPalettesSpecial + $40b3 = FadeOutToWhiteSpecial $40b6 = BattleTowerFadeSpecial - $40b9 = FadeBlackQuicklySpecial - $40bc = FadeInPalettesSpecial - $40bf = FadeInQuicklySpecial + $40b9 = FadeOutToBlackSpecial + $40bc = FadeInFromWhiteSpecial + $40bf = FadeInFromBlackSpecial $40c2 = ReloadSpritesNoPalettesSpecial $40c5 = ClearBGPalettesSpecial $40c8 = UpdateTimePalsSpecial @@ -4822,8 +4822,8 @@ ROMX bank #5: $548e = LoadMapAttributes_MapSetupCmd $5491 = LoadMapAttributes_SkipObjects_MapSetupCmd $5494 = ClearBGPalettes_MapSetupCmd - $5497 = FadeOutPalettes_MapSetupCmd - $549a = FadeInPalettes_MapSetupCmd + $5497 = FadeOutToWhite_MapSetupCmd + $549a = FadeInFromWhite_MapSetupCmd $549d = GetMapScreenCoords_MapSetupCmd $54a0 = GetWarpDestCoords_MapSetupCmd $54a3 = SpawnInFacingDown_MapSetupCmd @@ -4848,8 +4848,8 @@ ROMX bank #5: $54f1 = SkipUpdateMapSprites $54f7 = CheckUpdatePlayerSprite $5508 = CheckUpdatePlayerSprite.ok - $550c = CheckUpdatePlayerSprite.CheckBiking - $551a = CheckUpdatePlayerSprite.CheckSurfing2 + $550c = CheckUpdatePlayerSprite.CheckForcedBiking + $551a = CheckUpdatePlayerSprite.ResetSurfingOrBikingState $553e = CheckUpdatePlayerSprite.no_biking $5545 = CheckUpdatePlayerSprite.surfing $554c = CheckUpdatePlayerSprite.nope @@ -9774,7 +9774,7 @@ ROMX bank #15: $7ce0 = BattleStartMessage.cry_no_anim $7ceb = BattleStartMessage.skip_cry $7cfd = BattleStartMessage.NotFishing - $7d0e = BattleStartMessage.PlaceBattleStartText + $7d0e = BattleStartMessage.PrintBattleStartText $7d28 = BattleCommandPointers EMPTY: $7e86-$7fff ($017a bytes) TOTAL EMPTY: $017a bytes @@ -11052,11 +11052,11 @@ ROMX bank #18: ROMX bank #19: SECTION: $4000-$5248 ($1249 bytes) ["bank13"] - $4000 = _SwapTextboxPalettes - $4008 = _SwapTextboxPalettes.loop - $400b = _SwapTextboxPalettes.innerloop - $4021 = _SwapTextboxPalettes.UpperNybble - $4031 = _SwapTextboxPalettes.next + $4000 = _LoadOverworldAttrmapPals + $4008 = _LoadOverworldAttrmapPals.loop + $400b = _LoadOverworldAttrmapPals.innerloop + $4021 = _LoadOverworldAttrmapPals.UpperNybble + $4031 = _LoadOverworldAttrmapPals.next $403f = _ScrollBGMapPalettes $4045 = _ScrollBGMapPalettes.loop $405b = _ScrollBGMapPalettes.UpperNybble @@ -11100,7 +11100,7 @@ ROMX bank #19: $4d25 = TilesetBattleTowerInsidePalMap $4d95 = TilesetBattleTowerOutsidePalMap $4e05 = MapGroupPalettes - $4e1f = TileCollisionTable + $4e1f = CollisionPermissionTable $4f1f = EmptyAllSRAMBanks $4f34 = EmptyAllSRAMBanks.EmptyBank $4f45 = SaveMenu_CopyTilemapAtOnce @@ -11121,12 +11121,12 @@ ROMX bank #19: $4ffe = CheckSave $501b = CheckSave.ok $501e = MapScenes - $515b = _LoadMapPart - $5168 = _LoadMapPart.top_row - $5170 = _LoadMapPart.left_column - $5175 = _LoadMapPart.loop - $5177 = _LoadMapPart.loop2 - $5184 = _LoadMapPart.carry + $515b = _LoadOverworldTilemap + $5168 = _LoadOverworldTilemap.top_row + $5170 = _LoadOverworldTilemap.left_column + $5175 = _LoadOverworldTilemap.loop + $5177 = _LoadOverworldTilemap.loop2 + $5184 = _LoadOverworldTilemap.carry $5188 = PhoneRing_CopyTilemapAtOnce $51a2 = PhoneRing_CopyTilemapAtOnce.wait $51bd = PhoneRing_CopyTilemapAtOnce.wait2 @@ -11600,9 +11600,9 @@ ROMX bank #20: $444f = PartyMenu2DMenuData $4457 = PartyMenuSelect $448f = PartyMenuSelect.exitmenu - $449a = PrintPartyMenuText - $44ae = PrintPartyMenuText.haspokemon - $44be = PrintPartyMenuText.gotstring + $449a = PlacePartyMenuText + $44ae = PlacePartyMenuText.haspokemon + $44be = PlacePartyMenuText.gotstring $44d2 = PartyMenuStrings $44e4 = ChooseAMonString $44f3 = UseOnWhichPKMNString @@ -17377,12 +17377,12 @@ ROMX bank #35: $405b = _TimeOfDayPals.pop $406e = _TimeOfDayPals.dontchange $4070 = _UpdateTimePals - $4079 = FadeInPalettes - $4084 = FadeOutPalettes + $4079 = FadeInFromWhite + $4084 = FadeOutToWhite $4092 = BattleTowerFade $409c = BattleTowerFade.loop - $40ab = FadeInQuickly - $40b6 = FadeBlackQuickly + $40ab = FadeInFromBlack + $40b6 = FadeOutToBlack $40c1 = FillWhiteBGColor $40d4 = FillWhiteBGColor.loop $40e5 = ReplaceTimeOfDayPals @@ -19136,19 +19136,19 @@ ROMX bank #37: $66c3 = OverworldLoop.Jumptable $66cb = DisableEvents $66d0 = EnableEvents - $66d6 = CheckBit5_ScriptFlags2 - $66dc = DisableWarpsConnxns + $66d6 = CheckEnabledMapEventsBit5 + $66dc = DisableWarpsConnections $66e2 = DisableCoordEvents $66e8 = DisableStepCount $66ee = DisableWildEncounters - $66f4 = EnableWarpsConnxns + $66f4 = EnableWarpsConnections $66fa = EnableCoordEvents $6700 = EnableStepCount $6706 = EnableWildEncounters - $670c = CheckWarpConnxnScriptFlag - $6712 = CheckCoordEventScriptFlag - $6718 = CheckStepCountScriptFlag - $671e = CheckWildEncountersScriptFlag + $670c = CheckWarpConnectionsEnabled + $6712 = CheckCoordEventsEnabled + $6718 = CheckStepCountEnabled + $671e = CheckWildEncountersEnabled $6724 = StartMap $673e = EnterMap $675a = EnterMap.dont_enable @@ -19172,8 +19172,8 @@ ROMX bank #37: $681f = PlayerEvents $6848 = PlayerEvents.ok $6865 = PlayerEvents.ok2 - $6867 = CheckTrainerBattle_GetPlayerEvent - $6872 = CheckTrainerBattle_GetPlayerEvent.nope + $6867 = CheckTrainerEvent + $6872 = CheckTrainerEvent.nope $6874 = CheckTileEvent $6886 = CheckTileEvent.connections_disabled $6890 = CheckTileEvent.coord_events_disabled @@ -19186,7 +19186,7 @@ ROMX bank #37: $68c7 = CheckWildEncounterCooldown $68d1 = SetUpFiveStepWildEncounterCooldown $68d7 = SetMinTwoStepWildEncounterCooldown - $68e4 = Dummy_CheckScriptFlags2Bit5 + $68e4 = Dummy_CheckEnabledMapEventsBit5 $68ec = RunSceneScript $6938 = RunSceneScript.nope $693a = CheckTimeEvents @@ -19521,13 +19521,13 @@ ROMX bank #37: $7a9e = Script_delcmdqueue $7ab3 = Script_changemapblocks $7acc = Script_changeblock - $7ae3 = Script_reloadmappart + $7ae3 = Script_refreshmap $7af6 = Script_warpcheck $7b01 = Script_enableevents $7b08 = Script_newloadmap $7b16 = Script_reloadend $7b1c = Script_opentext - $7b20 = Script_refreshscreen + $7b20 = Script_reanchormap $7b27 = Script_writeunusedbyte $7b2e = UnusedClosetextScript $7b2f = Script_closetext @@ -19554,7 +19554,7 @@ ROMX bank #37: $7c27 = Script_checkver_duplicate.gs_version $7c28 = WarpToSpawnPoint $7c30 = RunMemScript - $7c4f = LoadScriptBDE + $7c4f = LoadMemScript $7c5f = TryTileCollisionEvent $7c7b = TryTileCollisionEvent.whirlpool $7c8b = TryTileCollisionEvent.waterfall @@ -19569,9 +19569,9 @@ ROMX bank #37: $7ced = RandomEncounter.ok_bug_contest $7cf4 = RandomEncounter.done $7cf9 = WildBattleScript - $7cfd = CanUseSweetScent - $7d17 = CanUseSweetScent.ice_check - $7d21 = CanUseSweetScent.no + $7cfd = CanEncounterWildMon + $7d17 = CanEncounterWildMon.ice_check + $7d21 = CanEncounterWildMon.no $7d23 = _TryWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest.loop @@ -31479,31 +31479,31 @@ ROMX bank #65: $4033 = HDMATransferTilemapToWRAMBank3.Function $4047 = HDMATransferAttrmapToWRAMBank3 $404d = HDMATransferAttrmapToWRAMBank3.Function - $4061 = ReloadMapPart - $4067 = ReloadMapPart.Function - $4099 = Mobile_ReloadMapPart - $40a2 = Mobile_ReloadMapPart.Function + $4061 = HDMATransferTilemapAndAttrmap_Overworld + $4067 = HDMATransferTilemapAndAttrmap_Overworld.Function + $4099 = Mobile_HDMATransferTilemapAndAttrmap_Overworld + $40a2 = Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function $40d4 = Function1040d4 $40da = Function1040d4.Function $40fb = Function1040fb $4101 = Function1040fb.Function - $4110 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $4116 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function - $4148 = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $414e = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function + $4110 = _HDMATransferTilemapAndAttrmap_Menu + $4116 = _HDMATransferTilemapAndAttrmap_Menu.Function + $4148 = Mobile_HDMATransferTilemapAndAttrmap_Menu + $414e = Mobile_HDMATransferTilemapAndAttrmap_Menu.Function $4177 = CallInSafeGFXMode $419c = CallInSafeGFXMode._hl_ $419d = HDMATransferToWRAMBank3 $41a4 = WaitDMATransfer $41a4 = WaitDMATransfer.loop - $41ad = HDMATransfer_Wait127Scanlines_toBGMap - $41b7 = HDMATransfer_Wait123Scanlines_toBGMap + $41ad = HDMATransfer_WaitForScanline128_toBGMap + $41b7 = HDMATransfer_WaitForScanline124_toBGMap $41c1 = HDMATransfer_NoDI $41e4 = HDMATransfer_NoDI.loop1 $41e9 = HDMATransfer_NoDI.loop2 $41f8 = HDMATransfer_NoDI.loop3 - $4205 = HDMATransfer_Wait123Scanlines - $4209 = HDMATransfer_Wait127Scanlines + $4205 = HDMATransfer_WaitForScanline124 + $4209 = HDMATransfer_WaitForScanline128 $420b = _continue_HDMATransfer $4225 = _continue_HDMATransfer.ly_loop $422b = _continue_HDMATransfer.rstat_loop_1 @@ -35929,9 +35929,9 @@ ROMX bank #91: $56a7 = LoadTradeRoomBGPals $56ae = LoadCableTradeBorderTilemap $56ca = LinkTextbox - $56ce = PrintWaitingTextAndSyncAndExchangeNybble - $56e1 = PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText - $5701 = PrintWaitingTextAndSyncAndExchangeNybble.Waiting + $56ce = PlaceWaitingTextAndSyncAndExchangeNybble + $56e1 = PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText + $5701 = PlaceWaitingTextAndSyncAndExchangeNybble.Waiting $570c = LinkTradeMenu $5713 = LinkTradeMenu.GetJoypad $5725 = LinkTradeMenu.MenuAction @@ -56011,7 +56011,7 @@ WRAMX bank #1: $d046 = wWalkingY $d046 = wBufferMonSpclDef $d047 = wWinTextPointer - $d047 = wWalkingTile + $d047 = wWalkingTileCollision $d048 = wBufferMonStructEnd $d049 = wLossTextPointer $d04b = wScriptAfterPointer @@ -56054,7 +56054,7 @@ WRAMX bank #1: $d0ec = wSolvedUnownPuzzle $d0ec = wItemEffectSucceeded $d0ec = wBattlePlayerAction - $d0ed = wVramState + $d0ed = wStateFlags $d0ee = wBattleResult $d0ef = wUsingItemWithSelect $d0f0 = wCurElevatorCount @@ -56629,7 +56629,7 @@ WRAMX bank #1: $d432 = wMapStatus $d433 = wMapEventStatus $d434 = wScriptFlags - $d436 = wScriptFlags2 + $d436 = wEnabledPlayerEvents $d437 = wScriptMode $d438 = wScriptRunning $d439 = wScriptBank @@ -56707,7 +56707,7 @@ WRAMX bank #1: $d4e1 = wPlayerAction $d4e2 = wPlayerStepFrame $d4e3 = wPlayerFacing - $d4e4 = wPlayerTile + $d4e4 = wPlayerTileCollision $d4e5 = wPlayerLastTile $d4e6 = wPlayerMapX $d4e7 = wPlayerMapY @@ -56741,7 +56741,7 @@ WRAMX bank #1: $d509 = wObject1Action $d50a = wObject1StepFrame $d50b = wObject1Facing - $d50c = wObject1Tile + $d50c = wObject1TileCollision $d50d = wObject1LastTile $d50e = wObject1MapX $d50f = wObject1MapY @@ -56775,7 +56775,7 @@ WRAMX bank #1: $d531 = wObject2Action $d532 = wObject2StepFrame $d533 = wObject2Facing - $d534 = wObject2Tile + $d534 = wObject2TileCollision $d535 = wObject2LastTile $d536 = wObject2MapX $d537 = wObject2MapY @@ -56809,7 +56809,7 @@ WRAMX bank #1: $d559 = wObject3Action $d55a = wObject3StepFrame $d55b = wObject3Facing - $d55c = wObject3Tile + $d55c = wObject3TileCollision $d55d = wObject3LastTile $d55e = wObject3MapX $d55f = wObject3MapY @@ -56843,7 +56843,7 @@ WRAMX bank #1: $d581 = wObject4Action $d582 = wObject4StepFrame $d583 = wObject4Facing - $d584 = wObject4Tile + $d584 = wObject4TileCollision $d585 = wObject4LastTile $d586 = wObject4MapX $d587 = wObject4MapY @@ -56877,7 +56877,7 @@ WRAMX bank #1: $d5a9 = wObject5Action $d5aa = wObject5StepFrame $d5ab = wObject5Facing - $d5ac = wObject5Tile + $d5ac = wObject5TileCollision $d5ad = wObject5LastTile $d5ae = wObject5MapX $d5af = wObject5MapY @@ -56911,7 +56911,7 @@ WRAMX bank #1: $d5d1 = wObject6Action $d5d2 = wObject6StepFrame $d5d3 = wObject6Facing - $d5d4 = wObject6Tile + $d5d4 = wObject6TileCollision $d5d5 = wObject6LastTile $d5d6 = wObject6MapX $d5d7 = wObject6MapY @@ -56945,7 +56945,7 @@ WRAMX bank #1: $d5f9 = wObject7Action $d5fa = wObject7StepFrame $d5fb = wObject7Facing - $d5fc = wObject7Tile + $d5fc = wObject7TileCollision $d5fd = wObject7LastTile $d5fe = wObject7MapX $d5ff = wObject7MapY @@ -56979,7 +56979,7 @@ WRAMX bank #1: $d621 = wObject8Action $d622 = wObject8StepFrame $d623 = wObject8Facing - $d624 = wObject8Tile + $d624 = wObject8TileCollision $d625 = wObject8LastTile $d626 = wObject8MapX $d627 = wObject8MapY @@ -57013,7 +57013,7 @@ WRAMX bank #1: $d649 = wObject9Action $d64a = wObject9StepFrame $d64b = wObject9Facing - $d64c = wObject9Tile + $d64c = wObject9TileCollision $d64d = wObject9LastTile $d64e = wObject9MapX $d64f = wObject9MapY @@ -57047,7 +57047,7 @@ WRAMX bank #1: $d671 = wObject10Action $d672 = wObject10StepFrame $d673 = wObject10Facing - $d674 = wObject10Tile + $d674 = wObject10TileCollision $d675 = wObject10LastTile $d676 = wObject10MapX $d677 = wObject10MapY @@ -57081,7 +57081,7 @@ WRAMX bank #1: $d699 = wObject11Action $d69a = wObject11StepFrame $d69b = wObject11Facing - $d69c = wObject11Tile + $d69c = wObject11TileCollision $d69d = wObject11LastTile $d69e = wObject11MapX $d69f = wObject11MapY @@ -57115,7 +57115,7 @@ WRAMX bank #1: $d6c1 = wObject12Action $d6c2 = wObject12StepFrame $d6c3 = wObject12Facing - $d6c4 = wObject12Tile + $d6c4 = wObject12TileCollision $d6c5 = wObject12LastTile $d6c6 = wObject12MapX $d6c7 = wObject12MapY @@ -57528,8 +57528,8 @@ WRAMX bank #1: $dbf5 = wBikeFlags $dbf7 = wCurMapSceneScriptPointer $dbf9 = wCurCaller - $dbfb = wCurMapWarpCount - $dbfc = wCurMapWarpsPointer + $dbfb = wCurMapWarpEventCount + $dbfc = wCurMapWarpEventsPointer $dbfe = wCurMapCoordEventCount $dbff = wCurMapCoordEventsPointer $dc01 = wCurMapBGEventCount diff --git a/pokecrystal11_vc.sym b/pokecrystal11_vc.sym index 52b0dba6db3..d19b1406e05 100644 --- a/pokecrystal11_vc.sym +++ b/pokecrystal11_vc.sym @@ -130,7 +130,7 @@ 00:0833 SerialDisconnected 00:083b Serial_ExchangeSyncBytes 00:0847 Serial_ExchangeSyncBytes.exchange -00:0862 Serial_PrintWaitingTextAndSyncAndExchangeNybble +00:0862 Serial_PlaceWaitingTextAndSyncAndExchangeNybble 00:0871 Serial_SyncAndExchangeNybble 00:087d WaitLinkTransfer 00:087d WaitLinkTransfer.VC_Wireless_WaitLinkTransfer @@ -234,7 +234,7 @@ 00:0d79 ClearVBank1 00:0d90 GSReloadPalettes 00:0d91 ReloadSpritesNoPalettes -00:0db1 SwapTextboxPalettes +00:0db1 LoadOverworldAttrmapPals 00:0dbd ScrollBGMapPalettes 00:0dc9 Get2bppViaHDMA 00:0ddc Get1bppViaHDMA @@ -379,7 +379,7 @@ 00:13d4 PlaceFarString 00:13e0 PokeFluteTerminator 00:13e4 PokeFluteTerminator.stop -00:13e5 PlaceHLTextAtBC +00:13e5 PrintTextboxTextAt 00:13f6 DoTextUntilTerminator 00:13ff DoTextUntilTerminator.TextCommand 00:1410 TextCommands @@ -445,9 +445,9 @@ 00:1830 GetSpriteVTile.found 00:1833 GetSpriteVTile.done 00:1836 DoesSpriteHaveFacings -00:184a GetPlayerTile +00:184a GetPlayerTilePermission 00:1852 CheckOnWater -00:185d GetTileCollision +00:185d GetTilePermission 00:1875 CheckGrassTile 00:1882 CheckGrassTile.grass 00:1888 CheckGrassTile.water @@ -491,8 +491,8 @@ 00:1a61 CopySpriteMovementData 00:1a71 CopySpriteMovementData.CopyData 00:1aae _GetMovementIndex -00:1ac6 SetVramState_Bit0 -00:1acc ResetVramState_Bit0 +00:1ac6 SetVramState_SpriteUpdatesDisabled +00:1acc ResetVramState_SpriteUpdatesDisabled 00:1ad2 UpdateSprites 00:1ae5 GetObjectStruct 00:1af1 DoesObjectHaveASprite @@ -627,8 +627,8 @@ 00:2167 GetMapSceneID.end 00:216a GetMapSceneID.found 00:216d GetMapSceneID.done -00:2173 OverworldTextModeSwitch -00:217a LoadMapPart +00:2173 LoadOverworldTilemapAndAttrmapPals +00:217a LoadOverworldTilemap 00:2198 LoadMetatiles 00:21a5 LoadMetatiles.row 00:21a9 LoadMetatiles.col @@ -669,7 +669,7 @@ 00:23a5 GetMapConnection.loop 00:23ac ReadMapSceneScripts 00:23c3 ReadMapCallbacks -00:23da ReadWarps +00:23da ReadWarpEvents 00:23f1 ReadCoordEvents 00:2408 ReadBGEvents 00:241f ReadObjectEvents @@ -774,10 +774,10 @@ 00:29ff GetMovementPermissions.CheckHiNybble 00:2a07 GetFacingTileCoord 00:2a2c GetFacingTileCoord.Directions -00:2a3c GetCoordTile -00:2a56 GetCoordTile.nocarry -00:2a5c GetCoordTile.nocarry2 -00:2a63 GetCoordTile.nope +00:2a3c GetCoordTileCollision +00:2a56 GetCoordTileCollision.nocarry +00:2a5c GetCoordTileCollision.nocarry2 +00:2a63 GetCoordTileCollision.nope 00:2a66 GetBlockLocation 00:2a78 GetBlockLocation.loop 00:2a7d GetBlockLocation.ok @@ -838,11 +838,11 @@ 00:2d82 FarCall_JumpToHL 00:2d83 Predef 00:2da6 Predef.Return -00:2dba RefreshScreen +00:2dba ReanchorMap 00:2dcf CloseText 00:2de2 CloseText.CloseText 00:2e08 OpenText -00:2e20 _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap +00:2e20 HDMATransferTilemapAndAttrmap_Menu 00:2e31 SafeUpdateSprites 00:2e4e SetCarryFlag 00:2e50 ResetMapBufferEventFlags @@ -975,8 +975,8 @@ 00:32cc _CopyTilemapAtOnce.loop_u12 00:32d5 _CopyTilemapAtOnce.loop_u13 00:32de _CopyTilemapAtOnce.loop_u14 -00:32f9 SetPalettes -00:3309 SetPalettes.SetPalettesForGameBoyColor +00:32f9 SetDefaultBGPAndOBP +00:3309 SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor 00:3317 ClearPalettes 00:3324 ClearPalettes.cgb 00:333e GetMemSGBLayout @@ -2496,11 +2496,11 @@ 03:40aa CardFlipSpecial 03:40ad UnusedMemoryGameSpecial 03:40b0 ClearBGPalettesBufferScreenSpecial -03:40b3 FadeOutPalettesSpecial +03:40b3 FadeOutToWhiteSpecial 03:40b6 BattleTowerFadeSpecial -03:40b9 FadeBlackQuicklySpecial -03:40bc FadeInPalettesSpecial -03:40bf FadeInQuicklySpecial +03:40b9 FadeOutToBlackSpecial +03:40bc FadeInFromWhiteSpecial +03:40bf FadeInFromBlackSpecial 03:40c2 ReloadSpritesNoPalettesSpecial 03:40c5 ClearBGPalettesSpecial 03:40c8 UpdateTimePalsSpecial @@ -4762,8 +4762,8 @@ 05:548e LoadMapAttributes_MapSetupCmd 05:5491 LoadMapAttributes_SkipObjects_MapSetupCmd 05:5494 ClearBGPalettes_MapSetupCmd -05:5497 FadeOutPalettes_MapSetupCmd -05:549a FadeInPalettes_MapSetupCmd +05:5497 FadeOutToWhite_MapSetupCmd +05:549a FadeInFromWhite_MapSetupCmd 05:549d GetMapScreenCoords_MapSetupCmd 05:54a0 GetWarpDestCoords_MapSetupCmd 05:54a3 SpawnInFacingDown_MapSetupCmd @@ -4788,8 +4788,8 @@ 05:54f1 SkipUpdateMapSprites 05:54f7 CheckUpdatePlayerSprite 05:5508 CheckUpdatePlayerSprite.ok -05:550c CheckUpdatePlayerSprite.CheckBiking -05:551a CheckUpdatePlayerSprite.CheckSurfing2 +05:550c CheckUpdatePlayerSprite.CheckForcedBiking +05:551a CheckUpdatePlayerSprite.ResetSurfingOrBikingState 05:553e CheckUpdatePlayerSprite.no_biking 05:5545 CheckUpdatePlayerSprite.surfing 05:554c CheckUpdatePlayerSprite.nope @@ -9659,7 +9659,7 @@ 0f:7ce0 BattleStartMessage.cry_no_anim 0f:7ceb BattleStartMessage.skip_cry 0f:7cfd BattleStartMessage.NotFishing -0f:7d0e BattleStartMessage.PlaceBattleStartText +0f:7d0e BattleStartMessage.PrintBattleStartText 0f:7d28 BattleCommandPointers 10:4000 Pokedex 10:4029 Pokedex.main @@ -10916,11 +10916,11 @@ 12:6e1f AskRememberPassword.DoMenu 12:6e57 AskRememberPassword.refused 12:6e5e Buena_ExitMenu -13:4000 _SwapTextboxPalettes -13:4008 _SwapTextboxPalettes.loop -13:400b _SwapTextboxPalettes.innerloop -13:4021 _SwapTextboxPalettes.UpperNybble -13:4031 _SwapTextboxPalettes.next +13:4000 _LoadOverworldAttrmapPals +13:4008 _LoadOverworldAttrmapPals.loop +13:400b _LoadOverworldAttrmapPals.innerloop +13:4021 _LoadOverworldAttrmapPals.UpperNybble +13:4031 _LoadOverworldAttrmapPals.next 13:403f _ScrollBGMapPalettes 13:4045 _ScrollBGMapPalettes.loop 13:405b _ScrollBGMapPalettes.UpperNybble @@ -10964,7 +10964,7 @@ 13:4d25 TilesetBattleTowerInsidePalMap 13:4d95 TilesetBattleTowerOutsidePalMap 13:4e05 MapGroupPalettes -13:4e1f TileCollisionTable +13:4e1f CollisionPermissionTable 13:4f1f EmptyAllSRAMBanks 13:4f34 EmptyAllSRAMBanks.EmptyBank 13:4f45 SaveMenu_CopyTilemapAtOnce @@ -10985,12 +10985,12 @@ 13:4ffe CheckSave 13:501b CheckSave.ok 13:501e MapScenes -13:515b _LoadMapPart -13:5168 _LoadMapPart.top_row -13:5170 _LoadMapPart.left_column -13:5175 _LoadMapPart.loop -13:5177 _LoadMapPart.loop2 -13:5184 _LoadMapPart.carry +13:515b _LoadOverworldTilemap +13:5168 _LoadOverworldTilemap.top_row +13:5170 _LoadOverworldTilemap.left_column +13:5175 _LoadOverworldTilemap.loop +13:5177 _LoadOverworldTilemap.loop2 +13:5184 _LoadOverworldTilemap.carry 13:5188 PhoneRing_CopyTilemapAtOnce 13:51a2 PhoneRing_CopyTilemapAtOnce.wait 13:51bd PhoneRing_CopyTilemapAtOnce.wait2 @@ -11457,9 +11457,9 @@ 14:444f PartyMenu2DMenuData 14:4457 PartyMenuSelect 14:448f PartyMenuSelect.exitmenu -14:449a PrintPartyMenuText -14:44ae PrintPartyMenuText.haspokemon -14:44be PrintPartyMenuText.gotstring +14:449a PlacePartyMenuText +14:44ae PlacePartyMenuText.haspokemon +14:44be PlacePartyMenuText.gotstring 14:44d2 PartyMenuStrings 14:44e4 ChooseAMonString 14:44f3 UseOnWhichPKMNString @@ -17158,12 +17158,12 @@ 23:405b _TimeOfDayPals.pop 23:406e _TimeOfDayPals.dontchange 23:4070 _UpdateTimePals -23:4079 FadeInPalettes -23:4084 FadeOutPalettes +23:4079 FadeInFromWhite +23:4084 FadeOutToWhite 23:4092 BattleTowerFade 23:409c BattleTowerFade.loop -23:40ab FadeInQuickly -23:40b6 FadeBlackQuickly +23:40ab FadeInFromBlack +23:40b6 FadeOutToBlack 23:40c1 FillWhiteBGColor 23:40d4 FillWhiteBGColor.loop 23:40e5 ReplaceTimeOfDayPals @@ -18906,19 +18906,19 @@ 25:66c3 OverworldLoop.Jumptable 25:66cb DisableEvents 25:66d0 EnableEvents -25:66d6 CheckBit5_ScriptFlags2 -25:66dc DisableWarpsConnxns +25:66d6 CheckEnabledMapEventsBit5 +25:66dc DisableWarpsConnections 25:66e2 DisableCoordEvents 25:66e8 DisableStepCount 25:66ee DisableWildEncounters -25:66f4 EnableWarpsConnxns +25:66f4 EnableWarpsConnections 25:66fa EnableCoordEvents 25:6700 EnableStepCount 25:6706 EnableWildEncounters -25:670c CheckWarpConnxnScriptFlag -25:6712 CheckCoordEventScriptFlag -25:6718 CheckStepCountScriptFlag -25:671e CheckWildEncountersScriptFlag +25:670c CheckWarpConnectionsEnabled +25:6712 CheckCoordEventsEnabled +25:6718 CheckStepCountEnabled +25:671e CheckWildEncountersEnabled 25:6724 StartMap 25:673e EnterMap 25:675a EnterMap.dont_enable @@ -18942,8 +18942,8 @@ 25:681f PlayerEvents 25:6848 PlayerEvents.ok 25:6865 PlayerEvents.ok2 -25:6867 CheckTrainerBattle_GetPlayerEvent -25:6872 CheckTrainerBattle_GetPlayerEvent.nope +25:6867 CheckTrainerEvent +25:6872 CheckTrainerEvent.nope 25:6874 CheckTileEvent 25:6886 CheckTileEvent.connections_disabled 25:6890 CheckTileEvent.coord_events_disabled @@ -18956,7 +18956,7 @@ 25:68c7 CheckWildEncounterCooldown 25:68d1 SetUpFiveStepWildEncounterCooldown 25:68d7 SetMinTwoStepWildEncounterCooldown -25:68e4 Dummy_CheckScriptFlags2Bit5 +25:68e4 Dummy_CheckEnabledMapEventsBit5 25:68ec RunSceneScript 25:6938 RunSceneScript.nope 25:693a CheckTimeEvents @@ -19291,13 +19291,13 @@ 25:7a9e Script_delcmdqueue 25:7ab3 Script_changemapblocks 25:7acc Script_changeblock -25:7ae3 Script_reloadmappart +25:7ae3 Script_refreshmap 25:7af6 Script_warpcheck 25:7b01 Script_enableevents 25:7b08 Script_newloadmap 25:7b16 Script_reloadend 25:7b1c Script_opentext -25:7b20 Script_refreshscreen +25:7b20 Script_reanchormap 25:7b27 Script_writeunusedbyte 25:7b2e UnusedClosetextScript 25:7b2f Script_closetext @@ -19324,7 +19324,7 @@ 25:7c27 Script_checkver_duplicate.gs_version 25:7c28 WarpToSpawnPoint 25:7c30 RunMemScript -25:7c4f LoadScriptBDE +25:7c4f LoadMemScript 25:7c5f TryTileCollisionEvent 25:7c7b TryTileCollisionEvent.whirlpool 25:7c8b TryTileCollisionEvent.waterfall @@ -19339,9 +19339,9 @@ 25:7ced RandomEncounter.ok_bug_contest 25:7cf4 RandomEncounter.done 25:7cf9 WildBattleScript -25:7cfd CanUseSweetScent -25:7d17 CanUseSweetScent.ice_check -25:7d21 CanUseSweetScent.no +25:7cfd CanEncounterWildMon +25:7d17 CanEncounterWildMon.ice_check +25:7d21 CanEncounterWildMon.no 25:7d23 _TryWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest.loop @@ -31102,31 +31102,31 @@ 41:4033 HDMATransferTilemapToWRAMBank3.Function 41:4047 HDMATransferAttrmapToWRAMBank3 41:404d HDMATransferAttrmapToWRAMBank3.Function -41:4061 ReloadMapPart -41:4067 ReloadMapPart.Function -41:4099 Mobile_ReloadMapPart -41:40a2 Mobile_ReloadMapPart.Function +41:4061 HDMATransferTilemapAndAttrmap_Overworld +41:4067 HDMATransferTilemapAndAttrmap_Overworld.Function +41:4099 Mobile_HDMATransferTilemapAndAttrmap_Overworld +41:40a2 Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function 41:40d4 Function1040d4 41:40da Function1040d4.Function 41:40fb Function1040fb 41:4101 Function1040fb.Function -41:4110 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:4116 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function -41:4148 Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:414e Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function +41:4110 _HDMATransferTilemapAndAttrmap_Menu +41:4116 _HDMATransferTilemapAndAttrmap_Menu.Function +41:4148 Mobile_HDMATransferTilemapAndAttrmap_Menu +41:414e Mobile_HDMATransferTilemapAndAttrmap_Menu.Function 41:4177 CallInSafeGFXMode 41:419c CallInSafeGFXMode._hl_ 41:419d HDMATransferToWRAMBank3 41:41a4 WaitDMATransfer 41:41a4 WaitDMATransfer.loop -41:41ad HDMATransfer_Wait127Scanlines_toBGMap -41:41b7 HDMATransfer_Wait123Scanlines_toBGMap +41:41ad HDMATransfer_WaitForScanline128_toBGMap +41:41b7 HDMATransfer_WaitForScanline124_toBGMap 41:41c1 HDMATransfer_NoDI 41:41e4 HDMATransfer_NoDI.loop1 41:41e9 HDMATransfer_NoDI.loop2 41:41f8 HDMATransfer_NoDI.loop3 -41:4205 HDMATransfer_Wait123Scanlines -41:4209 HDMATransfer_Wait127Scanlines +41:4205 HDMATransfer_WaitForScanline124 +41:4209 HDMATransfer_WaitForScanline128 41:420b _continue_HDMATransfer 41:4225 _continue_HDMATransfer.ly_loop 41:422b _continue_HDMATransfer.rstat_loop_1 @@ -35422,9 +35422,9 @@ 5b:56a7 LoadTradeRoomBGPals 5b:56ae LoadCableTradeBorderTilemap 5b:56ca LinkTextbox -5b:56ce PrintWaitingTextAndSyncAndExchangeNybble -5b:56e1 PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText -5b:5701 PrintWaitingTextAndSyncAndExchangeNybble.Waiting +5b:56ce PlaceWaitingTextAndSyncAndExchangeNybble +5b:56e1 PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText +5b:5701 PlaceWaitingTextAndSyncAndExchangeNybble.Waiting 5b:570c LinkTradeMenu 5b:5713 LinkTradeMenu.GetJoypad 5b:5725 LinkTradeMenu.MenuAction @@ -55239,7 +55239,7 @@ 01:d046 wWalkingY 01:d046 wBufferMonSpclDef 01:d047 wWinTextPointer -01:d047 wWalkingTile +01:d047 wWalkingTileCollision 01:d048 wBufferMonStructEnd 01:d049 wLossTextPointer 01:d04b wScriptAfterPointer @@ -55281,7 +55281,7 @@ 01:d0ec wSolvedUnownPuzzle 01:d0ec wItemEffectSucceeded 01:d0ec wBattlePlayerAction -01:d0ed wVramState +01:d0ed wStateFlags 01:d0ee wBattleResult 01:d0ef wUsingItemWithSelect 01:d0f0 wCurElevatorCount @@ -55855,7 +55855,7 @@ 01:d432 wMapStatus 01:d433 wMapEventStatus 01:d434 wScriptFlags -01:d436 wScriptFlags2 +01:d436 wEnabledPlayerEvents 01:d437 wScriptMode 01:d438 wScriptRunning 01:d439 wScriptBank @@ -55933,7 +55933,7 @@ 01:d4e1 wPlayerAction 01:d4e2 wPlayerStepFrame 01:d4e3 wPlayerFacing -01:d4e4 wPlayerTile +01:d4e4 wPlayerTileCollision 01:d4e5 wPlayerLastTile 01:d4e6 wPlayerMapX 01:d4e7 wPlayerMapY @@ -55967,7 +55967,7 @@ 01:d509 wObject1Action 01:d50a wObject1StepFrame 01:d50b wObject1Facing -01:d50c wObject1Tile +01:d50c wObject1TileCollision 01:d50d wObject1LastTile 01:d50e wObject1MapX 01:d50f wObject1MapY @@ -56001,7 +56001,7 @@ 01:d531 wObject2Action 01:d532 wObject2StepFrame 01:d533 wObject2Facing -01:d534 wObject2Tile +01:d534 wObject2TileCollision 01:d535 wObject2LastTile 01:d536 wObject2MapX 01:d537 wObject2MapY @@ -56035,7 +56035,7 @@ 01:d559 wObject3Action 01:d55a wObject3StepFrame 01:d55b wObject3Facing -01:d55c wObject3Tile +01:d55c wObject3TileCollision 01:d55d wObject3LastTile 01:d55e wObject3MapX 01:d55f wObject3MapY @@ -56069,7 +56069,7 @@ 01:d581 wObject4Action 01:d582 wObject4StepFrame 01:d583 wObject4Facing -01:d584 wObject4Tile +01:d584 wObject4TileCollision 01:d585 wObject4LastTile 01:d586 wObject4MapX 01:d587 wObject4MapY @@ -56103,7 +56103,7 @@ 01:d5a9 wObject5Action 01:d5aa wObject5StepFrame 01:d5ab wObject5Facing -01:d5ac wObject5Tile +01:d5ac wObject5TileCollision 01:d5ad wObject5LastTile 01:d5ae wObject5MapX 01:d5af wObject5MapY @@ -56137,7 +56137,7 @@ 01:d5d1 wObject6Action 01:d5d2 wObject6StepFrame 01:d5d3 wObject6Facing -01:d5d4 wObject6Tile +01:d5d4 wObject6TileCollision 01:d5d5 wObject6LastTile 01:d5d6 wObject6MapX 01:d5d7 wObject6MapY @@ -56171,7 +56171,7 @@ 01:d5f9 wObject7Action 01:d5fa wObject7StepFrame 01:d5fb wObject7Facing -01:d5fc wObject7Tile +01:d5fc wObject7TileCollision 01:d5fd wObject7LastTile 01:d5fe wObject7MapX 01:d5ff wObject7MapY @@ -56205,7 +56205,7 @@ 01:d621 wObject8Action 01:d622 wObject8StepFrame 01:d623 wObject8Facing -01:d624 wObject8Tile +01:d624 wObject8TileCollision 01:d625 wObject8LastTile 01:d626 wObject8MapX 01:d627 wObject8MapY @@ -56239,7 +56239,7 @@ 01:d649 wObject9Action 01:d64a wObject9StepFrame 01:d64b wObject9Facing -01:d64c wObject9Tile +01:d64c wObject9TileCollision 01:d64d wObject9LastTile 01:d64e wObject9MapX 01:d64f wObject9MapY @@ -56273,7 +56273,7 @@ 01:d671 wObject10Action 01:d672 wObject10StepFrame 01:d673 wObject10Facing -01:d674 wObject10Tile +01:d674 wObject10TileCollision 01:d675 wObject10LastTile 01:d676 wObject10MapX 01:d677 wObject10MapY @@ -56307,7 +56307,7 @@ 01:d699 wObject11Action 01:d69a wObject11StepFrame 01:d69b wObject11Facing -01:d69c wObject11Tile +01:d69c wObject11TileCollision 01:d69d wObject11LastTile 01:d69e wObject11MapX 01:d69f wObject11MapY @@ -56341,7 +56341,7 @@ 01:d6c1 wObject12Action 01:d6c2 wObject12StepFrame 01:d6c3 wObject12Facing -01:d6c4 wObject12Tile +01:d6c4 wObject12TileCollision 01:d6c5 wObject12LastTile 01:d6c6 wObject12MapX 01:d6c7 wObject12MapY @@ -56754,8 +56754,8 @@ 01:dbf5 wBikeFlags 01:dbf7 wCurMapSceneScriptPointer 01:dbf9 wCurCaller -01:dbfb wCurMapWarpCount -01:dbfc wCurMapWarpsPointer +01:dbfb wCurMapWarpEventCount +01:dbfc wCurMapWarpEventsPointer 01:dbfe wCurMapCoordEventCount 01:dbff wCurMapCoordEventsPointer 01:dc01 wCurMapBGEventCount diff --git a/pokecrystal_au.map b/pokecrystal_au.map index eff458c38ea..e509f14ecb1 100644 --- a/pokecrystal_au.map +++ b/pokecrystal_au.map @@ -165,7 +165,7 @@ ROM0 bank #0: $0833 = SerialDisconnected $083b = Serial_ExchangeSyncBytes $0847 = Serial_ExchangeSyncBytes.exchange - $0862 = Serial_PrintWaitingTextAndSyncAndExchangeNybble + $0862 = Serial_PlaceWaitingTextAndSyncAndExchangeNybble $0871 = Serial_SyncAndExchangeNybble $087d = WaitLinkTransfer $0882 = WaitLinkTransfer.loop @@ -263,7 +263,7 @@ ROM0 bank #0: $0d79 = ClearVBank1 $0d90 = GSReloadPalettes $0d91 = ReloadSpritesNoPalettes - $0db1 = SwapTextboxPalettes + $0db1 = LoadOverworldAttrmapPals $0dbd = ScrollBGMapPalettes $0dc9 = Get2bppViaHDMA $0ddc = Get1bppViaHDMA @@ -408,7 +408,7 @@ ROM0 bank #0: $13d4 = PlaceFarString $13e0 = PokeFluteTerminator $13e4 = PokeFluteTerminator.stop - $13e5 = PlaceHLTextAtBC + $13e5 = PrintTextboxTextAt $13f6 = DoTextUntilTerminator $13ff = DoTextUntilTerminator.TextCommand $1410 = TextCommands @@ -474,9 +474,9 @@ ROM0 bank #0: $1830 = GetSpriteVTile.found $1833 = GetSpriteVTile.done $1836 = DoesSpriteHaveFacings - $184a = GetPlayerTile + $184a = GetPlayerTilePermission $1852 = CheckOnWater - $185d = GetTileCollision + $185d = GetTilePermission $1875 = CheckGrassTile $1882 = CheckGrassTile.grass $1888 = CheckGrassTile.water @@ -520,8 +520,8 @@ ROM0 bank #0: $1a61 = CopySpriteMovementData $1a71 = CopySpriteMovementData.CopyData $1aae = _GetMovementIndex - $1ac6 = SetVramState_Bit0 - $1acc = ResetVramState_Bit0 + $1ac6 = SetVramState_SpriteUpdatesDisabled + $1acc = ResetVramState_SpriteUpdatesDisabled $1ad2 = UpdateSprites $1ae5 = GetObjectStruct $1af1 = DoesObjectHaveASprite @@ -656,8 +656,8 @@ ROM0 bank #0: $2167 = GetMapSceneID.end $216a = GetMapSceneID.found $216d = GetMapSceneID.done - $2173 = OverworldTextModeSwitch - $217a = LoadMapPart + $2173 = LoadOverworldTilemapAndAttrmapPals + $217a = LoadOverworldTilemap $2198 = LoadMetatiles $21a5 = LoadMetatiles.row $21a9 = LoadMetatiles.col @@ -698,7 +698,7 @@ ROM0 bank #0: $23a5 = GetMapConnection.loop $23ac = ReadMapSceneScripts $23c3 = ReadMapCallbacks - $23da = ReadWarps + $23da = ReadWarpEvents $23f1 = ReadCoordEvents $2408 = ReadBGEvents $241f = ReadObjectEvents @@ -803,10 +803,10 @@ ROM0 bank #0: $29ff = GetMovementPermissions.CheckHiNybble $2a07 = GetFacingTileCoord $2a2c = GetFacingTileCoord.Directions - $2a3c = GetCoordTile - $2a56 = GetCoordTile.nocarry - $2a5c = GetCoordTile.nocarry2 - $2a63 = GetCoordTile.nope + $2a3c = GetCoordTileCollision + $2a56 = GetCoordTileCollision.nocarry + $2a5c = GetCoordTileCollision.nocarry2 + $2a63 = GetCoordTileCollision.nope $2a66 = GetBlockLocation $2a78 = GetBlockLocation.loop $2a7d = GetBlockLocation.ok @@ -867,11 +867,11 @@ ROM0 bank #0: $2d82 = FarCall_JumpToHL $2d83 = Predef $2da6 = Predef.Return - $2dba = RefreshScreen + $2dba = ReanchorMap $2dcf = CloseText $2de2 = CloseText.CloseText $2e08 = OpenText - $2e20 = _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + $2e20 = HDMATransferTilemapAndAttrmap_Menu $2e31 = SafeUpdateSprites $2e4e = SetCarryFlag $2e50 = ResetMapBufferEventFlags @@ -1004,8 +1004,8 @@ ROM0 bank #0: $32cc = _CopyTilemapAtOnce.loop_u12 $32d5 = _CopyTilemapAtOnce.loop_u13 $32de = _CopyTilemapAtOnce.loop_u14 - $32f9 = SetPalettes - $3309 = SetPalettes.SetPalettesForGameBoyColor + $32f9 = SetDefaultBGPAndOBP + $3309 = SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor $3317 = ClearPalettes $3324 = ClearPalettes.cgb $333e = GetMemSGBLayout @@ -2539,11 +2539,11 @@ ROMX bank #3: $40aa = CardFlipSpecial $40ad = UnusedMemoryGameSpecial $40b0 = ClearBGPalettesBufferScreenSpecial - $40b3 = FadeOutPalettesSpecial + $40b3 = FadeOutToWhiteSpecial $40b6 = BattleTowerFadeSpecial - $40b9 = FadeBlackQuicklySpecial - $40bc = FadeInPalettesSpecial - $40bf = FadeInQuicklySpecial + $40b9 = FadeOutToBlackSpecial + $40bc = FadeInFromWhiteSpecial + $40bf = FadeInFromBlackSpecial $40c2 = ReloadSpritesNoPalettesSpecial $40c5 = ClearBGPalettesSpecial $40c8 = UpdateTimePalsSpecial @@ -4814,8 +4814,8 @@ ROMX bank #5: $548e = LoadMapAttributes_MapSetupCmd $5491 = LoadMapAttributes_SkipObjects_MapSetupCmd $5494 = ClearBGPalettes_MapSetupCmd - $5497 = FadeOutPalettes_MapSetupCmd - $549a = FadeInPalettes_MapSetupCmd + $5497 = FadeOutToWhite_MapSetupCmd + $549a = FadeInFromWhite_MapSetupCmd $549d = GetMapScreenCoords_MapSetupCmd $54a0 = GetWarpDestCoords_MapSetupCmd $54a3 = SpawnInFacingDown_MapSetupCmd @@ -4840,8 +4840,8 @@ ROMX bank #5: $54f1 = SkipUpdateMapSprites $54f7 = CheckUpdatePlayerSprite $5508 = CheckUpdatePlayerSprite.ok - $550c = CheckUpdatePlayerSprite.CheckBiking - $551a = CheckUpdatePlayerSprite.CheckSurfing2 + $550c = CheckUpdatePlayerSprite.CheckForcedBiking + $551a = CheckUpdatePlayerSprite.ResetSurfingOrBikingState $553e = CheckUpdatePlayerSprite.no_biking $5545 = CheckUpdatePlayerSprite.surfing $554c = CheckUpdatePlayerSprite.nope @@ -9732,7 +9732,7 @@ ROMX bank #15: $7ce0 = BattleStartMessage.cry_no_anim $7ceb = BattleStartMessage.skip_cry $7cfd = BattleStartMessage.NotFishing - $7d0e = BattleStartMessage.PlaceBattleStartText + $7d0e = BattleStartMessage.PrintBattleStartText $7d28 = BattleCommandPointers EMPTY: $7e86-$7fff ($017a bytes) TOTAL EMPTY: $017a bytes @@ -11009,11 +11009,11 @@ ROMX bank #18: ROMX bank #19: SECTION: $4000-$5248 ($1249 bytes) ["bank13"] - $4000 = _SwapTextboxPalettes - $4008 = _SwapTextboxPalettes.loop - $400b = _SwapTextboxPalettes.innerloop - $4021 = _SwapTextboxPalettes.UpperNybble - $4031 = _SwapTextboxPalettes.next + $4000 = _LoadOverworldAttrmapPals + $4008 = _LoadOverworldAttrmapPals.loop + $400b = _LoadOverworldAttrmapPals.innerloop + $4021 = _LoadOverworldAttrmapPals.UpperNybble + $4031 = _LoadOverworldAttrmapPals.next $403f = _ScrollBGMapPalettes $4045 = _ScrollBGMapPalettes.loop $405b = _ScrollBGMapPalettes.UpperNybble @@ -11057,7 +11057,7 @@ ROMX bank #19: $4d25 = TilesetBattleTowerInsidePalMap $4d95 = TilesetBattleTowerOutsidePalMap $4e05 = MapGroupPalettes - $4e1f = TileCollisionTable + $4e1f = CollisionPermissionTable $4f1f = EmptyAllSRAMBanks $4f34 = EmptyAllSRAMBanks.EmptyBank $4f45 = SaveMenu_CopyTilemapAtOnce @@ -11078,12 +11078,12 @@ ROMX bank #19: $4ffe = CheckSave $501b = CheckSave.ok $501e = MapScenes - $515b = _LoadMapPart - $5168 = _LoadMapPart.top_row - $5170 = _LoadMapPart.left_column - $5175 = _LoadMapPart.loop - $5177 = _LoadMapPart.loop2 - $5184 = _LoadMapPart.carry + $515b = _LoadOverworldTilemap + $5168 = _LoadOverworldTilemap.top_row + $5170 = _LoadOverworldTilemap.left_column + $5175 = _LoadOverworldTilemap.loop + $5177 = _LoadOverworldTilemap.loop2 + $5184 = _LoadOverworldTilemap.carry $5188 = PhoneRing_CopyTilemapAtOnce $51a2 = PhoneRing_CopyTilemapAtOnce.wait $51bd = PhoneRing_CopyTilemapAtOnce.wait2 @@ -11557,9 +11557,9 @@ ROMX bank #20: $444f = PartyMenu2DMenuData $4457 = PartyMenuSelect $448f = PartyMenuSelect.exitmenu - $449a = PrintPartyMenuText - $44ae = PrintPartyMenuText.haspokemon - $44be = PrintPartyMenuText.gotstring + $449a = PlacePartyMenuText + $44ae = PlacePartyMenuText.haspokemon + $44be = PlacePartyMenuText.gotstring $44d2 = PartyMenuStrings $44e4 = ChooseAMonString $44f3 = UseOnWhichPKMNString @@ -17334,12 +17334,12 @@ ROMX bank #35: $405b = _TimeOfDayPals.pop $406e = _TimeOfDayPals.dontchange $4070 = _UpdateTimePals - $4079 = FadeInPalettes - $4084 = FadeOutPalettes + $4079 = FadeInFromWhite + $4084 = FadeOutToWhite $4092 = BattleTowerFade $409c = BattleTowerFade.loop - $40ab = FadeInQuickly - $40b6 = FadeBlackQuickly + $40ab = FadeInFromBlack + $40b6 = FadeOutToBlack $40c1 = FillWhiteBGColor $40d4 = FillWhiteBGColor.loop $40e5 = ReplaceTimeOfDayPals @@ -19087,19 +19087,19 @@ ROMX bank #37: $66c3 = OverworldLoop.Jumptable $66cb = DisableEvents $66d0 = EnableEvents - $66d6 = CheckBit5_ScriptFlags2 - $66dc = DisableWarpsConnxns + $66d6 = CheckEnabledMapEventsBit5 + $66dc = DisableWarpsConnections $66e2 = DisableCoordEvents $66e8 = DisableStepCount $66ee = DisableWildEncounters - $66f4 = EnableWarpsConnxns + $66f4 = EnableWarpsConnections $66fa = EnableCoordEvents $6700 = EnableStepCount $6706 = EnableWildEncounters - $670c = CheckWarpConnxnScriptFlag - $6712 = CheckCoordEventScriptFlag - $6718 = CheckStepCountScriptFlag - $671e = CheckWildEncountersScriptFlag + $670c = CheckWarpConnectionsEnabled + $6712 = CheckCoordEventsEnabled + $6718 = CheckStepCountEnabled + $671e = CheckWildEncountersEnabled $6724 = StartMap $673e = EnterMap $675a = EnterMap.dont_enable @@ -19123,8 +19123,8 @@ ROMX bank #37: $681f = PlayerEvents $6848 = PlayerEvents.ok $6865 = PlayerEvents.ok2 - $6867 = CheckTrainerBattle_GetPlayerEvent - $6872 = CheckTrainerBattle_GetPlayerEvent.nope + $6867 = CheckTrainerEvent + $6872 = CheckTrainerEvent.nope $6874 = CheckTileEvent $6886 = CheckTileEvent.connections_disabled $6890 = CheckTileEvent.coord_events_disabled @@ -19137,7 +19137,7 @@ ROMX bank #37: $68c7 = CheckWildEncounterCooldown $68d1 = SetUpFiveStepWildEncounterCooldown $68d7 = SetMinTwoStepWildEncounterCooldown - $68e4 = Dummy_CheckScriptFlags2Bit5 + $68e4 = Dummy_CheckEnabledMapEventsBit5 $68ec = RunSceneScript $6938 = RunSceneScript.nope $693a = CheckTimeEvents @@ -19471,13 +19471,13 @@ ROMX bank #37: $7a9e = Script_delcmdqueue $7ab3 = Script_changemapblocks $7acc = Script_changeblock - $7ae3 = Script_reloadmappart + $7ae3 = Script_refreshmap $7af6 = Script_warpcheck $7b01 = Script_enableevents $7b08 = Script_newloadmap $7b16 = Script_reloadend $7b1c = Script_opentext - $7b20 = Script_refreshscreen + $7b20 = Script_reanchormap $7b27 = Script_writeunusedbyte $7b2e = UnusedClosetextScript $7b2f = Script_closetext @@ -19504,7 +19504,7 @@ ROMX bank #37: $7c27 = Script_checkver_duplicate.gs_version $7c28 = WarpToSpawnPoint $7c30 = RunMemScript - $7c4f = LoadScriptBDE + $7c4f = LoadMemScript $7c5f = TryTileCollisionEvent $7c7b = TryTileCollisionEvent.whirlpool $7c8b = TryTileCollisionEvent.waterfall @@ -19519,9 +19519,9 @@ ROMX bank #37: $7ced = RandomEncounter.ok_bug_contest $7cf4 = RandomEncounter.done $7cf9 = WildBattleScript - $7cfd = CanUseSweetScent - $7d17 = CanUseSweetScent.ice_check - $7d21 = CanUseSweetScent.no + $7cfd = CanEncounterWildMon + $7d17 = CanEncounterWildMon.ice_check + $7d21 = CanEncounterWildMon.no $7d23 = _TryWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest.loop @@ -31416,31 +31416,31 @@ ROMX bank #65: $4033 = HDMATransferTilemapToWRAMBank3.Function $4047 = HDMATransferAttrmapToWRAMBank3 $404d = HDMATransferAttrmapToWRAMBank3.Function - $4061 = ReloadMapPart - $4067 = ReloadMapPart.Function - $4099 = Mobile_ReloadMapPart - $40a2 = Mobile_ReloadMapPart.Function + $4061 = HDMATransferTilemapAndAttrmap_Overworld + $4067 = HDMATransferTilemapAndAttrmap_Overworld.Function + $4099 = Mobile_HDMATransferTilemapAndAttrmap_Overworld + $40a2 = Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function $40d4 = Function1040d4 $40da = Function1040d4.Function $40fb = Function1040fb $4101 = Function1040fb.Function - $4110 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $4116 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function - $4148 = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $414e = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function + $4110 = _HDMATransferTilemapAndAttrmap_Menu + $4116 = _HDMATransferTilemapAndAttrmap_Menu.Function + $4148 = Mobile_HDMATransferTilemapAndAttrmap_Menu + $414e = Mobile_HDMATransferTilemapAndAttrmap_Menu.Function $4177 = CallInSafeGFXMode $419c = CallInSafeGFXMode._hl_ $419d = HDMATransferToWRAMBank3 $41a4 = WaitDMATransfer $41a4 = WaitDMATransfer.loop - $41ad = HDMATransfer_Wait127Scanlines_toBGMap - $41b7 = HDMATransfer_Wait123Scanlines_toBGMap + $41ad = HDMATransfer_WaitForScanline128_toBGMap + $41b7 = HDMATransfer_WaitForScanline124_toBGMap $41c1 = HDMATransfer_NoDI $41e4 = HDMATransfer_NoDI.loop1 $41e9 = HDMATransfer_NoDI.loop2 $41f8 = HDMATransfer_NoDI.loop3 - $4205 = HDMATransfer_Wait123Scanlines - $4209 = HDMATransfer_Wait127Scanlines + $4205 = HDMATransfer_WaitForScanline124 + $4209 = HDMATransfer_WaitForScanline128 $420b = _continue_HDMATransfer $4225 = _continue_HDMATransfer.ly_loop $422b = _continue_HDMATransfer.rstat_loop_1 @@ -35858,9 +35858,9 @@ ROMX bank #91: $56a7 = LoadTradeRoomBGPals $56ae = LoadCableTradeBorderTilemap $56ca = LinkTextbox - $56ce = PrintWaitingTextAndSyncAndExchangeNybble - $56e1 = PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText - $5701 = PrintWaitingTextAndSyncAndExchangeNybble.Waiting + $56ce = PlaceWaitingTextAndSyncAndExchangeNybble + $56e1 = PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText + $5701 = PlaceWaitingTextAndSyncAndExchangeNybble.Waiting $570c = LinkTradeMenu $5713 = LinkTradeMenu.GetJoypad $5725 = LinkTradeMenu.MenuAction @@ -55940,7 +55940,7 @@ WRAMX bank #1: $d046 = wWalkingY $d046 = wBufferMonSpclDef $d047 = wWinTextPointer - $d047 = wWalkingTile + $d047 = wWalkingTileCollision $d048 = wBufferMonStructEnd $d049 = wLossTextPointer $d04b = wScriptAfterPointer @@ -55983,7 +55983,7 @@ WRAMX bank #1: $d0ec = wSolvedUnownPuzzle $d0ec = wItemEffectSucceeded $d0ec = wBattlePlayerAction - $d0ed = wVramState + $d0ed = wStateFlags $d0ee = wBattleResult $d0ef = wUsingItemWithSelect $d0f0 = wCurElevatorCount @@ -56558,7 +56558,7 @@ WRAMX bank #1: $d432 = wMapStatus $d433 = wMapEventStatus $d434 = wScriptFlags - $d436 = wScriptFlags2 + $d436 = wEnabledPlayerEvents $d437 = wScriptMode $d438 = wScriptRunning $d439 = wScriptBank @@ -56636,7 +56636,7 @@ WRAMX bank #1: $d4e1 = wPlayerAction $d4e2 = wPlayerStepFrame $d4e3 = wPlayerFacing - $d4e4 = wPlayerTile + $d4e4 = wPlayerTileCollision $d4e5 = wPlayerLastTile $d4e6 = wPlayerMapX $d4e7 = wPlayerMapY @@ -56670,7 +56670,7 @@ WRAMX bank #1: $d509 = wObject1Action $d50a = wObject1StepFrame $d50b = wObject1Facing - $d50c = wObject1Tile + $d50c = wObject1TileCollision $d50d = wObject1LastTile $d50e = wObject1MapX $d50f = wObject1MapY @@ -56704,7 +56704,7 @@ WRAMX bank #1: $d531 = wObject2Action $d532 = wObject2StepFrame $d533 = wObject2Facing - $d534 = wObject2Tile + $d534 = wObject2TileCollision $d535 = wObject2LastTile $d536 = wObject2MapX $d537 = wObject2MapY @@ -56738,7 +56738,7 @@ WRAMX bank #1: $d559 = wObject3Action $d55a = wObject3StepFrame $d55b = wObject3Facing - $d55c = wObject3Tile + $d55c = wObject3TileCollision $d55d = wObject3LastTile $d55e = wObject3MapX $d55f = wObject3MapY @@ -56772,7 +56772,7 @@ WRAMX bank #1: $d581 = wObject4Action $d582 = wObject4StepFrame $d583 = wObject4Facing - $d584 = wObject4Tile + $d584 = wObject4TileCollision $d585 = wObject4LastTile $d586 = wObject4MapX $d587 = wObject4MapY @@ -56806,7 +56806,7 @@ WRAMX bank #1: $d5a9 = wObject5Action $d5aa = wObject5StepFrame $d5ab = wObject5Facing - $d5ac = wObject5Tile + $d5ac = wObject5TileCollision $d5ad = wObject5LastTile $d5ae = wObject5MapX $d5af = wObject5MapY @@ -56840,7 +56840,7 @@ WRAMX bank #1: $d5d1 = wObject6Action $d5d2 = wObject6StepFrame $d5d3 = wObject6Facing - $d5d4 = wObject6Tile + $d5d4 = wObject6TileCollision $d5d5 = wObject6LastTile $d5d6 = wObject6MapX $d5d7 = wObject6MapY @@ -56874,7 +56874,7 @@ WRAMX bank #1: $d5f9 = wObject7Action $d5fa = wObject7StepFrame $d5fb = wObject7Facing - $d5fc = wObject7Tile + $d5fc = wObject7TileCollision $d5fd = wObject7LastTile $d5fe = wObject7MapX $d5ff = wObject7MapY @@ -56908,7 +56908,7 @@ WRAMX bank #1: $d621 = wObject8Action $d622 = wObject8StepFrame $d623 = wObject8Facing - $d624 = wObject8Tile + $d624 = wObject8TileCollision $d625 = wObject8LastTile $d626 = wObject8MapX $d627 = wObject8MapY @@ -56942,7 +56942,7 @@ WRAMX bank #1: $d649 = wObject9Action $d64a = wObject9StepFrame $d64b = wObject9Facing - $d64c = wObject9Tile + $d64c = wObject9TileCollision $d64d = wObject9LastTile $d64e = wObject9MapX $d64f = wObject9MapY @@ -56976,7 +56976,7 @@ WRAMX bank #1: $d671 = wObject10Action $d672 = wObject10StepFrame $d673 = wObject10Facing - $d674 = wObject10Tile + $d674 = wObject10TileCollision $d675 = wObject10LastTile $d676 = wObject10MapX $d677 = wObject10MapY @@ -57010,7 +57010,7 @@ WRAMX bank #1: $d699 = wObject11Action $d69a = wObject11StepFrame $d69b = wObject11Facing - $d69c = wObject11Tile + $d69c = wObject11TileCollision $d69d = wObject11LastTile $d69e = wObject11MapX $d69f = wObject11MapY @@ -57044,7 +57044,7 @@ WRAMX bank #1: $d6c1 = wObject12Action $d6c2 = wObject12StepFrame $d6c3 = wObject12Facing - $d6c4 = wObject12Tile + $d6c4 = wObject12TileCollision $d6c5 = wObject12LastTile $d6c6 = wObject12MapX $d6c7 = wObject12MapY @@ -57457,8 +57457,8 @@ WRAMX bank #1: $dbf5 = wBikeFlags $dbf7 = wCurMapSceneScriptPointer $dbf9 = wCurCaller - $dbfb = wCurMapWarpCount - $dbfc = wCurMapWarpsPointer + $dbfb = wCurMapWarpEventCount + $dbfc = wCurMapWarpEventsPointer $dbfe = wCurMapCoordEventCount $dbff = wCurMapCoordEventsPointer $dc01 = wCurMapBGEventCount diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym index d59cc694787..fe32e6115cc 100644 --- a/pokecrystal_au.sym +++ b/pokecrystal_au.sym @@ -130,7 +130,7 @@ 00:0833 SerialDisconnected 00:083b Serial_ExchangeSyncBytes 00:0847 Serial_ExchangeSyncBytes.exchange -00:0862 Serial_PrintWaitingTextAndSyncAndExchangeNybble +00:0862 Serial_PlaceWaitingTextAndSyncAndExchangeNybble 00:0871 Serial_SyncAndExchangeNybble 00:087d WaitLinkTransfer 00:0882 WaitLinkTransfer.loop @@ -228,7 +228,7 @@ 00:0d79 ClearVBank1 00:0d90 GSReloadPalettes 00:0d91 ReloadSpritesNoPalettes -00:0db1 SwapTextboxPalettes +00:0db1 LoadOverworldAttrmapPals 00:0dbd ScrollBGMapPalettes 00:0dc9 Get2bppViaHDMA 00:0ddc Get1bppViaHDMA @@ -373,7 +373,7 @@ 00:13d4 PlaceFarString 00:13e0 PokeFluteTerminator 00:13e4 PokeFluteTerminator.stop -00:13e5 PlaceHLTextAtBC +00:13e5 PrintTextboxTextAt 00:13f6 DoTextUntilTerminator 00:13ff DoTextUntilTerminator.TextCommand 00:1410 TextCommands @@ -439,9 +439,9 @@ 00:1830 GetSpriteVTile.found 00:1833 GetSpriteVTile.done 00:1836 DoesSpriteHaveFacings -00:184a GetPlayerTile +00:184a GetPlayerTilePermission 00:1852 CheckOnWater -00:185d GetTileCollision +00:185d GetTilePermission 00:1875 CheckGrassTile 00:1882 CheckGrassTile.grass 00:1888 CheckGrassTile.water @@ -485,8 +485,8 @@ 00:1a61 CopySpriteMovementData 00:1a71 CopySpriteMovementData.CopyData 00:1aae _GetMovementIndex -00:1ac6 SetVramState_Bit0 -00:1acc ResetVramState_Bit0 +00:1ac6 SetVramState_SpriteUpdatesDisabled +00:1acc ResetVramState_SpriteUpdatesDisabled 00:1ad2 UpdateSprites 00:1ae5 GetObjectStruct 00:1af1 DoesObjectHaveASprite @@ -621,8 +621,8 @@ 00:2167 GetMapSceneID.end 00:216a GetMapSceneID.found 00:216d GetMapSceneID.done -00:2173 OverworldTextModeSwitch -00:217a LoadMapPart +00:2173 LoadOverworldTilemapAndAttrmapPals +00:217a LoadOverworldTilemap 00:2198 LoadMetatiles 00:21a5 LoadMetatiles.row 00:21a9 LoadMetatiles.col @@ -663,7 +663,7 @@ 00:23a5 GetMapConnection.loop 00:23ac ReadMapSceneScripts 00:23c3 ReadMapCallbacks -00:23da ReadWarps +00:23da ReadWarpEvents 00:23f1 ReadCoordEvents 00:2408 ReadBGEvents 00:241f ReadObjectEvents @@ -768,10 +768,10 @@ 00:29ff GetMovementPermissions.CheckHiNybble 00:2a07 GetFacingTileCoord 00:2a2c GetFacingTileCoord.Directions -00:2a3c GetCoordTile -00:2a56 GetCoordTile.nocarry -00:2a5c GetCoordTile.nocarry2 -00:2a63 GetCoordTile.nope +00:2a3c GetCoordTileCollision +00:2a56 GetCoordTileCollision.nocarry +00:2a5c GetCoordTileCollision.nocarry2 +00:2a63 GetCoordTileCollision.nope 00:2a66 GetBlockLocation 00:2a78 GetBlockLocation.loop 00:2a7d GetBlockLocation.ok @@ -832,11 +832,11 @@ 00:2d82 FarCall_JumpToHL 00:2d83 Predef 00:2da6 Predef.Return -00:2dba RefreshScreen +00:2dba ReanchorMap 00:2dcf CloseText 00:2de2 CloseText.CloseText 00:2e08 OpenText -00:2e20 _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap +00:2e20 HDMATransferTilemapAndAttrmap_Menu 00:2e31 SafeUpdateSprites 00:2e4e SetCarryFlag 00:2e50 ResetMapBufferEventFlags @@ -969,8 +969,8 @@ 00:32cc _CopyTilemapAtOnce.loop_u12 00:32d5 _CopyTilemapAtOnce.loop_u13 00:32de _CopyTilemapAtOnce.loop_u14 -00:32f9 SetPalettes -00:3309 SetPalettes.SetPalettesForGameBoyColor +00:32f9 SetDefaultBGPAndOBP +00:3309 SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor 00:3317 ClearPalettes 00:3324 ClearPalettes.cgb 00:333e GetMemSGBLayout @@ -2489,11 +2489,11 @@ 03:40aa CardFlipSpecial 03:40ad UnusedMemoryGameSpecial 03:40b0 ClearBGPalettesBufferScreenSpecial -03:40b3 FadeOutPalettesSpecial +03:40b3 FadeOutToWhiteSpecial 03:40b6 BattleTowerFadeSpecial -03:40b9 FadeBlackQuicklySpecial -03:40bc FadeInPalettesSpecial -03:40bf FadeInQuicklySpecial +03:40b9 FadeOutToBlackSpecial +03:40bc FadeInFromWhiteSpecial +03:40bf FadeInFromBlackSpecial 03:40c2 ReloadSpritesNoPalettesSpecial 03:40c5 ClearBGPalettesSpecial 03:40c8 UpdateTimePalsSpecial @@ -4754,8 +4754,8 @@ 05:548e LoadMapAttributes_MapSetupCmd 05:5491 LoadMapAttributes_SkipObjects_MapSetupCmd 05:5494 ClearBGPalettes_MapSetupCmd -05:5497 FadeOutPalettes_MapSetupCmd -05:549a FadeInPalettes_MapSetupCmd +05:5497 FadeOutToWhite_MapSetupCmd +05:549a FadeInFromWhite_MapSetupCmd 05:549d GetMapScreenCoords_MapSetupCmd 05:54a0 GetWarpDestCoords_MapSetupCmd 05:54a3 SpawnInFacingDown_MapSetupCmd @@ -4780,8 +4780,8 @@ 05:54f1 SkipUpdateMapSprites 05:54f7 CheckUpdatePlayerSprite 05:5508 CheckUpdatePlayerSprite.ok -05:550c CheckUpdatePlayerSprite.CheckBiking -05:551a CheckUpdatePlayerSprite.CheckSurfing2 +05:550c CheckUpdatePlayerSprite.CheckForcedBiking +05:551a CheckUpdatePlayerSprite.ResetSurfingOrBikingState 05:553e CheckUpdatePlayerSprite.no_biking 05:5545 CheckUpdatePlayerSprite.surfing 05:554c CheckUpdatePlayerSprite.nope @@ -9617,7 +9617,7 @@ 0f:7ce0 BattleStartMessage.cry_no_anim 0f:7ceb BattleStartMessage.skip_cry 0f:7cfd BattleStartMessage.NotFishing -0f:7d0e BattleStartMessage.PlaceBattleStartText +0f:7d0e BattleStartMessage.PrintBattleStartText 0f:7d28 BattleCommandPointers 10:4000 Pokedex 10:4029 Pokedex.main @@ -10873,11 +10873,11 @@ 12:6e1f AskRememberPassword.DoMenu 12:6e57 AskRememberPassword.refused 12:6e5e Buena_ExitMenu -13:4000 _SwapTextboxPalettes -13:4008 _SwapTextboxPalettes.loop -13:400b _SwapTextboxPalettes.innerloop -13:4021 _SwapTextboxPalettes.UpperNybble -13:4031 _SwapTextboxPalettes.next +13:4000 _LoadOverworldAttrmapPals +13:4008 _LoadOverworldAttrmapPals.loop +13:400b _LoadOverworldAttrmapPals.innerloop +13:4021 _LoadOverworldAttrmapPals.UpperNybble +13:4031 _LoadOverworldAttrmapPals.next 13:403f _ScrollBGMapPalettes 13:4045 _ScrollBGMapPalettes.loop 13:405b _ScrollBGMapPalettes.UpperNybble @@ -10921,7 +10921,7 @@ 13:4d25 TilesetBattleTowerInsidePalMap 13:4d95 TilesetBattleTowerOutsidePalMap 13:4e05 MapGroupPalettes -13:4e1f TileCollisionTable +13:4e1f CollisionPermissionTable 13:4f1f EmptyAllSRAMBanks 13:4f34 EmptyAllSRAMBanks.EmptyBank 13:4f45 SaveMenu_CopyTilemapAtOnce @@ -10942,12 +10942,12 @@ 13:4ffe CheckSave 13:501b CheckSave.ok 13:501e MapScenes -13:515b _LoadMapPart -13:5168 _LoadMapPart.top_row -13:5170 _LoadMapPart.left_column -13:5175 _LoadMapPart.loop -13:5177 _LoadMapPart.loop2 -13:5184 _LoadMapPart.carry +13:515b _LoadOverworldTilemap +13:5168 _LoadOverworldTilemap.top_row +13:5170 _LoadOverworldTilemap.left_column +13:5175 _LoadOverworldTilemap.loop +13:5177 _LoadOverworldTilemap.loop2 +13:5184 _LoadOverworldTilemap.carry 13:5188 PhoneRing_CopyTilemapAtOnce 13:51a2 PhoneRing_CopyTilemapAtOnce.wait 13:51bd PhoneRing_CopyTilemapAtOnce.wait2 @@ -11414,9 +11414,9 @@ 14:444f PartyMenu2DMenuData 14:4457 PartyMenuSelect 14:448f PartyMenuSelect.exitmenu -14:449a PrintPartyMenuText -14:44ae PrintPartyMenuText.haspokemon -14:44be PrintPartyMenuText.gotstring +14:449a PlacePartyMenuText +14:44ae PlacePartyMenuText.haspokemon +14:44be PlacePartyMenuText.gotstring 14:44d2 PartyMenuStrings 14:44e4 ChooseAMonString 14:44f3 UseOnWhichPKMNString @@ -17115,12 +17115,12 @@ 23:405b _TimeOfDayPals.pop 23:406e _TimeOfDayPals.dontchange 23:4070 _UpdateTimePals -23:4079 FadeInPalettes -23:4084 FadeOutPalettes +23:4079 FadeInFromWhite +23:4084 FadeOutToWhite 23:4092 BattleTowerFade 23:409c BattleTowerFade.loop -23:40ab FadeInQuickly -23:40b6 FadeBlackQuickly +23:40ab FadeInFromBlack +23:40b6 FadeOutToBlack 23:40c1 FillWhiteBGColor 23:40d4 FillWhiteBGColor.loop 23:40e5 ReplaceTimeOfDayPals @@ -18857,19 +18857,19 @@ 25:66c3 OverworldLoop.Jumptable 25:66cb DisableEvents 25:66d0 EnableEvents -25:66d6 CheckBit5_ScriptFlags2 -25:66dc DisableWarpsConnxns +25:66d6 CheckEnabledMapEventsBit5 +25:66dc DisableWarpsConnections 25:66e2 DisableCoordEvents 25:66e8 DisableStepCount 25:66ee DisableWildEncounters -25:66f4 EnableWarpsConnxns +25:66f4 EnableWarpsConnections 25:66fa EnableCoordEvents 25:6700 EnableStepCount 25:6706 EnableWildEncounters -25:670c CheckWarpConnxnScriptFlag -25:6712 CheckCoordEventScriptFlag -25:6718 CheckStepCountScriptFlag -25:671e CheckWildEncountersScriptFlag +25:670c CheckWarpConnectionsEnabled +25:6712 CheckCoordEventsEnabled +25:6718 CheckStepCountEnabled +25:671e CheckWildEncountersEnabled 25:6724 StartMap 25:673e EnterMap 25:675a EnterMap.dont_enable @@ -18893,8 +18893,8 @@ 25:681f PlayerEvents 25:6848 PlayerEvents.ok 25:6865 PlayerEvents.ok2 -25:6867 CheckTrainerBattle_GetPlayerEvent -25:6872 CheckTrainerBattle_GetPlayerEvent.nope +25:6867 CheckTrainerEvent +25:6872 CheckTrainerEvent.nope 25:6874 CheckTileEvent 25:6886 CheckTileEvent.connections_disabled 25:6890 CheckTileEvent.coord_events_disabled @@ -18907,7 +18907,7 @@ 25:68c7 CheckWildEncounterCooldown 25:68d1 SetUpFiveStepWildEncounterCooldown 25:68d7 SetMinTwoStepWildEncounterCooldown -25:68e4 Dummy_CheckScriptFlags2Bit5 +25:68e4 Dummy_CheckEnabledMapEventsBit5 25:68ec RunSceneScript 25:6938 RunSceneScript.nope 25:693a CheckTimeEvents @@ -19241,13 +19241,13 @@ 25:7a9e Script_delcmdqueue 25:7ab3 Script_changemapblocks 25:7acc Script_changeblock -25:7ae3 Script_reloadmappart +25:7ae3 Script_refreshmap 25:7af6 Script_warpcheck 25:7b01 Script_enableevents 25:7b08 Script_newloadmap 25:7b16 Script_reloadend 25:7b1c Script_opentext -25:7b20 Script_refreshscreen +25:7b20 Script_reanchormap 25:7b27 Script_writeunusedbyte 25:7b2e UnusedClosetextScript 25:7b2f Script_closetext @@ -19274,7 +19274,7 @@ 25:7c27 Script_checkver_duplicate.gs_version 25:7c28 WarpToSpawnPoint 25:7c30 RunMemScript -25:7c4f LoadScriptBDE +25:7c4f LoadMemScript 25:7c5f TryTileCollisionEvent 25:7c7b TryTileCollisionEvent.whirlpool 25:7c8b TryTileCollisionEvent.waterfall @@ -19289,9 +19289,9 @@ 25:7ced RandomEncounter.ok_bug_contest 25:7cf4 RandomEncounter.done 25:7cf9 WildBattleScript -25:7cfd CanUseSweetScent -25:7d17 CanUseSweetScent.ice_check -25:7d21 CanUseSweetScent.no +25:7cfd CanEncounterWildMon +25:7d17 CanEncounterWildMon.ice_check +25:7d21 CanEncounterWildMon.no 25:7d23 _TryWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest.loop @@ -31039,31 +31039,31 @@ 41:4033 HDMATransferTilemapToWRAMBank3.Function 41:4047 HDMATransferAttrmapToWRAMBank3 41:404d HDMATransferAttrmapToWRAMBank3.Function -41:4061 ReloadMapPart -41:4067 ReloadMapPart.Function -41:4099 Mobile_ReloadMapPart -41:40a2 Mobile_ReloadMapPart.Function +41:4061 HDMATransferTilemapAndAttrmap_Overworld +41:4067 HDMATransferTilemapAndAttrmap_Overworld.Function +41:4099 Mobile_HDMATransferTilemapAndAttrmap_Overworld +41:40a2 Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function 41:40d4 Function1040d4 41:40da Function1040d4.Function 41:40fb Function1040fb 41:4101 Function1040fb.Function -41:4110 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:4116 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function -41:4148 Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:414e Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function +41:4110 _HDMATransferTilemapAndAttrmap_Menu +41:4116 _HDMATransferTilemapAndAttrmap_Menu.Function +41:4148 Mobile_HDMATransferTilemapAndAttrmap_Menu +41:414e Mobile_HDMATransferTilemapAndAttrmap_Menu.Function 41:4177 CallInSafeGFXMode 41:419c CallInSafeGFXMode._hl_ 41:419d HDMATransferToWRAMBank3 41:41a4 WaitDMATransfer 41:41a4 WaitDMATransfer.loop -41:41ad HDMATransfer_Wait127Scanlines_toBGMap -41:41b7 HDMATransfer_Wait123Scanlines_toBGMap +41:41ad HDMATransfer_WaitForScanline128_toBGMap +41:41b7 HDMATransfer_WaitForScanline124_toBGMap 41:41c1 HDMATransfer_NoDI 41:41e4 HDMATransfer_NoDI.loop1 41:41e9 HDMATransfer_NoDI.loop2 41:41f8 HDMATransfer_NoDI.loop3 -41:4205 HDMATransfer_Wait123Scanlines -41:4209 HDMATransfer_Wait127Scanlines +41:4205 HDMATransfer_WaitForScanline124 +41:4209 HDMATransfer_WaitForScanline128 41:420b _continue_HDMATransfer 41:4225 _continue_HDMATransfer.ly_loop 41:422b _continue_HDMATransfer.rstat_loop_1 @@ -35351,9 +35351,9 @@ 5b:56a7 LoadTradeRoomBGPals 5b:56ae LoadCableTradeBorderTilemap 5b:56ca LinkTextbox -5b:56ce PrintWaitingTextAndSyncAndExchangeNybble -5b:56e1 PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText -5b:5701 PrintWaitingTextAndSyncAndExchangeNybble.Waiting +5b:56ce PlaceWaitingTextAndSyncAndExchangeNybble +5b:56e1 PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText +5b:5701 PlaceWaitingTextAndSyncAndExchangeNybble.Waiting 5b:570c LinkTradeMenu 5b:5713 LinkTradeMenu.GetJoypad 5b:5725 LinkTradeMenu.MenuAction @@ -55168,7 +55168,7 @@ 01:d046 wWalkingY 01:d046 wBufferMonSpclDef 01:d047 wWinTextPointer -01:d047 wWalkingTile +01:d047 wWalkingTileCollision 01:d048 wBufferMonStructEnd 01:d049 wLossTextPointer 01:d04b wScriptAfterPointer @@ -55210,7 +55210,7 @@ 01:d0ec wSolvedUnownPuzzle 01:d0ec wItemEffectSucceeded 01:d0ec wBattlePlayerAction -01:d0ed wVramState +01:d0ed wStateFlags 01:d0ee wBattleResult 01:d0ef wUsingItemWithSelect 01:d0f0 wCurElevatorCount @@ -55784,7 +55784,7 @@ 01:d432 wMapStatus 01:d433 wMapEventStatus 01:d434 wScriptFlags -01:d436 wScriptFlags2 +01:d436 wEnabledPlayerEvents 01:d437 wScriptMode 01:d438 wScriptRunning 01:d439 wScriptBank @@ -55862,7 +55862,7 @@ 01:d4e1 wPlayerAction 01:d4e2 wPlayerStepFrame 01:d4e3 wPlayerFacing -01:d4e4 wPlayerTile +01:d4e4 wPlayerTileCollision 01:d4e5 wPlayerLastTile 01:d4e6 wPlayerMapX 01:d4e7 wPlayerMapY @@ -55896,7 +55896,7 @@ 01:d509 wObject1Action 01:d50a wObject1StepFrame 01:d50b wObject1Facing -01:d50c wObject1Tile +01:d50c wObject1TileCollision 01:d50d wObject1LastTile 01:d50e wObject1MapX 01:d50f wObject1MapY @@ -55930,7 +55930,7 @@ 01:d531 wObject2Action 01:d532 wObject2StepFrame 01:d533 wObject2Facing -01:d534 wObject2Tile +01:d534 wObject2TileCollision 01:d535 wObject2LastTile 01:d536 wObject2MapX 01:d537 wObject2MapY @@ -55964,7 +55964,7 @@ 01:d559 wObject3Action 01:d55a wObject3StepFrame 01:d55b wObject3Facing -01:d55c wObject3Tile +01:d55c wObject3TileCollision 01:d55d wObject3LastTile 01:d55e wObject3MapX 01:d55f wObject3MapY @@ -55998,7 +55998,7 @@ 01:d581 wObject4Action 01:d582 wObject4StepFrame 01:d583 wObject4Facing -01:d584 wObject4Tile +01:d584 wObject4TileCollision 01:d585 wObject4LastTile 01:d586 wObject4MapX 01:d587 wObject4MapY @@ -56032,7 +56032,7 @@ 01:d5a9 wObject5Action 01:d5aa wObject5StepFrame 01:d5ab wObject5Facing -01:d5ac wObject5Tile +01:d5ac wObject5TileCollision 01:d5ad wObject5LastTile 01:d5ae wObject5MapX 01:d5af wObject5MapY @@ -56066,7 +56066,7 @@ 01:d5d1 wObject6Action 01:d5d2 wObject6StepFrame 01:d5d3 wObject6Facing -01:d5d4 wObject6Tile +01:d5d4 wObject6TileCollision 01:d5d5 wObject6LastTile 01:d5d6 wObject6MapX 01:d5d7 wObject6MapY @@ -56100,7 +56100,7 @@ 01:d5f9 wObject7Action 01:d5fa wObject7StepFrame 01:d5fb wObject7Facing -01:d5fc wObject7Tile +01:d5fc wObject7TileCollision 01:d5fd wObject7LastTile 01:d5fe wObject7MapX 01:d5ff wObject7MapY @@ -56134,7 +56134,7 @@ 01:d621 wObject8Action 01:d622 wObject8StepFrame 01:d623 wObject8Facing -01:d624 wObject8Tile +01:d624 wObject8TileCollision 01:d625 wObject8LastTile 01:d626 wObject8MapX 01:d627 wObject8MapY @@ -56168,7 +56168,7 @@ 01:d649 wObject9Action 01:d64a wObject9StepFrame 01:d64b wObject9Facing -01:d64c wObject9Tile +01:d64c wObject9TileCollision 01:d64d wObject9LastTile 01:d64e wObject9MapX 01:d64f wObject9MapY @@ -56202,7 +56202,7 @@ 01:d671 wObject10Action 01:d672 wObject10StepFrame 01:d673 wObject10Facing -01:d674 wObject10Tile +01:d674 wObject10TileCollision 01:d675 wObject10LastTile 01:d676 wObject10MapX 01:d677 wObject10MapY @@ -56236,7 +56236,7 @@ 01:d699 wObject11Action 01:d69a wObject11StepFrame 01:d69b wObject11Facing -01:d69c wObject11Tile +01:d69c wObject11TileCollision 01:d69d wObject11LastTile 01:d69e wObject11MapX 01:d69f wObject11MapY @@ -56270,7 +56270,7 @@ 01:d6c1 wObject12Action 01:d6c2 wObject12StepFrame 01:d6c3 wObject12Facing -01:d6c4 wObject12Tile +01:d6c4 wObject12TileCollision 01:d6c5 wObject12LastTile 01:d6c6 wObject12MapX 01:d6c7 wObject12MapY @@ -56683,8 +56683,8 @@ 01:dbf5 wBikeFlags 01:dbf7 wCurMapSceneScriptPointer 01:dbf9 wCurCaller -01:dbfb wCurMapWarpCount -01:dbfc wCurMapWarpsPointer +01:dbfb wCurMapWarpEventCount +01:dbfc wCurMapWarpEventsPointer 01:dbfe wCurMapCoordEventCount 01:dbff wCurMapCoordEventsPointer 01:dc01 wCurMapBGEventCount diff --git a/pokecrystal_debug.map b/pokecrystal_debug.map index ef88ef066d0..b7a16fd648c 100644 --- a/pokecrystal_debug.map +++ b/pokecrystal_debug.map @@ -165,7 +165,7 @@ ROM0 bank #0: $0833 = SerialDisconnected $083b = Serial_ExchangeSyncBytes $0847 = Serial_ExchangeSyncBytes.exchange - $0862 = Serial_PrintWaitingTextAndSyncAndExchangeNybble + $0862 = Serial_PlaceWaitingTextAndSyncAndExchangeNybble $0871 = Serial_SyncAndExchangeNybble $087d = WaitLinkTransfer $0882 = WaitLinkTransfer.loop @@ -263,7 +263,7 @@ ROM0 bank #0: $0d79 = ClearVBank1 $0d90 = GSReloadPalettes $0d91 = ReloadSpritesNoPalettes - $0db1 = SwapTextboxPalettes + $0db1 = LoadOverworldAttrmapPals $0dbd = ScrollBGMapPalettes $0dc9 = Get2bppViaHDMA $0ddc = Get1bppViaHDMA @@ -408,7 +408,7 @@ ROM0 bank #0: $13d4 = PlaceFarString $13e0 = PokeFluteTerminator $13e4 = PokeFluteTerminator.stop - $13e5 = PlaceHLTextAtBC + $13e5 = PrintTextboxTextAt $13f6 = DoTextUntilTerminator $13ff = DoTextUntilTerminator.TextCommand $1410 = TextCommands @@ -474,9 +474,9 @@ ROM0 bank #0: $1830 = GetSpriteVTile.found $1833 = GetSpriteVTile.done $1836 = DoesSpriteHaveFacings - $184a = GetPlayerTile + $184a = GetPlayerTilePermission $1852 = CheckOnWater - $185d = GetTileCollision + $185d = GetTilePermission $1875 = CheckGrassTile $1882 = CheckGrassTile.grass $1888 = CheckGrassTile.water @@ -520,8 +520,8 @@ ROM0 bank #0: $1a61 = CopySpriteMovementData $1a71 = CopySpriteMovementData.CopyData $1aae = _GetMovementIndex - $1ac6 = SetVramState_Bit0 - $1acc = ResetVramState_Bit0 + $1ac6 = SetVramState_SpriteUpdatesDisabled + $1acc = ResetVramState_SpriteUpdatesDisabled $1ad2 = UpdateSprites $1ae5 = GetObjectStruct $1af1 = DoesObjectHaveASprite @@ -656,8 +656,8 @@ ROM0 bank #0: $2167 = GetMapSceneID.end $216a = GetMapSceneID.found $216d = GetMapSceneID.done - $2173 = OverworldTextModeSwitch - $217a = LoadMapPart + $2173 = LoadOverworldTilemapAndAttrmapPals + $217a = LoadOverworldTilemap $2198 = LoadMetatiles $21a5 = LoadMetatiles.row $21a9 = LoadMetatiles.col @@ -698,7 +698,7 @@ ROM0 bank #0: $23a5 = GetMapConnection.loop $23ac = ReadMapSceneScripts $23c3 = ReadMapCallbacks - $23da = ReadWarps + $23da = ReadWarpEvents $23f1 = ReadCoordEvents $2408 = ReadBGEvents $241f = ReadObjectEvents @@ -805,10 +805,10 @@ ROM0 bank #0: $2a16 = GetMovementPermissions.CheckHiNybble $2a1e = GetFacingTileCoord $2a43 = GetFacingTileCoord.Directions - $2a53 = GetCoordTile - $2a6d = GetCoordTile.nocarry - $2a73 = GetCoordTile.nocarry2 - $2a7a = GetCoordTile.nope + $2a53 = GetCoordTileCollision + $2a6d = GetCoordTileCollision.nocarry + $2a73 = GetCoordTileCollision.nocarry2 + $2a7a = GetCoordTileCollision.nope $2a7d = GetBlockLocation $2a8f = GetBlockLocation.loop $2a94 = GetBlockLocation.ok @@ -869,11 +869,11 @@ ROM0 bank #0: $2d99 = FarCall_JumpToHL $2d9a = Predef $2dbd = Predef.Return - $2dd1 = RefreshScreen + $2dd1 = ReanchorMap $2de6 = CloseText $2df9 = CloseText.CloseText $2e1f = OpenText - $2e37 = _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap + $2e37 = HDMATransferTilemapAndAttrmap_Menu $2e48 = SafeUpdateSprites $2e65 = SetCarryFlag $2e67 = ResetMapBufferEventFlags @@ -1007,8 +1007,8 @@ ROM0 bank #0: $32fa = _CopyTilemapAtOnce.loop_u12 $3303 = _CopyTilemapAtOnce.loop_u13 $330c = _CopyTilemapAtOnce.loop_u14 - $3327 = SetPalettes - $3337 = SetPalettes.SetPalettesForGameBoyColor + $3327 = SetDefaultBGPAndOBP + $3337 = SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor $3345 = ClearPalettes $3352 = ClearPalettes.cgb $336c = GetMemSGBLayout @@ -2543,11 +2543,11 @@ ROMX bank #3: $40aa = CardFlipSpecial $40ad = UnusedMemoryGameSpecial $40b0 = ClearBGPalettesBufferScreenSpecial - $40b3 = FadeOutPalettesSpecial + $40b3 = FadeOutToWhiteSpecial $40b6 = BattleTowerFadeSpecial - $40b9 = FadeBlackQuicklySpecial - $40bc = FadeInPalettesSpecial - $40bf = FadeInQuicklySpecial + $40b9 = FadeOutToBlackSpecial + $40bc = FadeInFromWhiteSpecial + $40bf = FadeInFromBlackSpecial $40c2 = ReloadSpritesNoPalettesSpecial $40c5 = ClearBGPalettesSpecial $40c8 = UpdateTimePalsSpecial @@ -4819,8 +4819,8 @@ ROMX bank #5: $548e = LoadMapAttributes_MapSetupCmd $5491 = LoadMapAttributes_SkipObjects_MapSetupCmd $5494 = ClearBGPalettes_MapSetupCmd - $5497 = FadeOutPalettes_MapSetupCmd - $549a = FadeInPalettes_MapSetupCmd + $5497 = FadeOutToWhite_MapSetupCmd + $549a = FadeInFromWhite_MapSetupCmd $549d = GetMapScreenCoords_MapSetupCmd $54a0 = GetWarpDestCoords_MapSetupCmd $54a3 = SpawnInFacingDown_MapSetupCmd @@ -4845,8 +4845,8 @@ ROMX bank #5: $54f1 = SkipUpdateMapSprites $54f7 = CheckUpdatePlayerSprite $5508 = CheckUpdatePlayerSprite.ok - $550c = CheckUpdatePlayerSprite.CheckBiking - $551a = CheckUpdatePlayerSprite.CheckSurfing2 + $550c = CheckUpdatePlayerSprite.CheckForcedBiking + $551a = CheckUpdatePlayerSprite.ResetSurfingOrBikingState $553e = CheckUpdatePlayerSprite.no_biking $5545 = CheckUpdatePlayerSprite.surfing $554c = CheckUpdatePlayerSprite.nope @@ -9738,7 +9738,7 @@ ROMX bank #15: $7ce0 = BattleStartMessage.cry_no_anim $7ceb = BattleStartMessage.skip_cry $7cfd = BattleStartMessage.NotFishing - $7d0e = BattleStartMessage.PlaceBattleStartText + $7d0e = BattleStartMessage.PrintBattleStartText $7d28 = BattleCommandPointers EMPTY: $7e86-$7fff ($017a bytes) TOTAL EMPTY: $017a bytes @@ -11016,11 +11016,11 @@ ROMX bank #18: ROMX bank #19: SECTION: $4000-$5248 ($1249 bytes) ["bank13"] - $4000 = _SwapTextboxPalettes - $4008 = _SwapTextboxPalettes.loop - $400b = _SwapTextboxPalettes.innerloop - $4021 = _SwapTextboxPalettes.UpperNybble - $4031 = _SwapTextboxPalettes.next + $4000 = _LoadOverworldAttrmapPals + $4008 = _LoadOverworldAttrmapPals.loop + $400b = _LoadOverworldAttrmapPals.innerloop + $4021 = _LoadOverworldAttrmapPals.UpperNybble + $4031 = _LoadOverworldAttrmapPals.next $403f = _ScrollBGMapPalettes $4045 = _ScrollBGMapPalettes.loop $405b = _ScrollBGMapPalettes.UpperNybble @@ -11064,7 +11064,7 @@ ROMX bank #19: $4d25 = TilesetBattleTowerInsidePalMap $4d95 = TilesetBattleTowerOutsidePalMap $4e05 = MapGroupPalettes - $4e1f = TileCollisionTable + $4e1f = CollisionPermissionTable $4f1f = EmptyAllSRAMBanks $4f34 = EmptyAllSRAMBanks.EmptyBank $4f45 = SaveMenu_CopyTilemapAtOnce @@ -11085,12 +11085,12 @@ ROMX bank #19: $4ffe = CheckSave $501b = CheckSave.ok $501e = MapScenes - $515b = _LoadMapPart - $5168 = _LoadMapPart.top_row - $5170 = _LoadMapPart.left_column - $5175 = _LoadMapPart.loop - $5177 = _LoadMapPart.loop2 - $5184 = _LoadMapPart.carry + $515b = _LoadOverworldTilemap + $5168 = _LoadOverworldTilemap.top_row + $5170 = _LoadOverworldTilemap.left_column + $5175 = _LoadOverworldTilemap.loop + $5177 = _LoadOverworldTilemap.loop2 + $5184 = _LoadOverworldTilemap.carry $5188 = PhoneRing_CopyTilemapAtOnce $51a2 = PhoneRing_CopyTilemapAtOnce.wait $51bd = PhoneRing_CopyTilemapAtOnce.wait2 @@ -11569,9 +11569,9 @@ ROMX bank #20: $444f = PartyMenu2DMenuData $4457 = PartyMenuSelect $448f = PartyMenuSelect.exitmenu - $449a = PrintPartyMenuText - $44ae = PrintPartyMenuText.haspokemon - $44be = PrintPartyMenuText.gotstring + $449a = PlacePartyMenuText + $44ae = PlacePartyMenuText.haspokemon + $44be = PlacePartyMenuText.gotstring $44d2 = PartyMenuStrings $44e4 = ChooseAMonString $44f3 = UseOnWhichPKMNString @@ -17346,12 +17346,12 @@ ROMX bank #35: $405b = _TimeOfDayPals.pop $406e = _TimeOfDayPals.dontchange $4070 = _UpdateTimePals - $4079 = FadeInPalettes - $4084 = FadeOutPalettes + $4079 = FadeInFromWhite + $4084 = FadeOutToWhite $4092 = BattleTowerFade $409c = BattleTowerFade.loop - $40ab = FadeInQuickly - $40b6 = FadeBlackQuickly + $40ab = FadeInFromBlack + $40b6 = FadeOutToBlack $40c1 = FillWhiteBGColor $40d4 = FillWhiteBGColor.loop $40e5 = ReplaceTimeOfDayPals @@ -19099,19 +19099,19 @@ ROMX bank #37: $66c3 = OverworldLoop.Jumptable $66cb = DisableEvents $66d0 = EnableEvents - $66d6 = CheckBit5_ScriptFlags2 - $66dc = DisableWarpsConnxns + $66d6 = CheckEnabledMapEventsBit5 + $66dc = DisableWarpsConnections $66e2 = DisableCoordEvents $66e8 = DisableStepCount $66ee = DisableWildEncounters - $66f4 = EnableWarpsConnxns + $66f4 = EnableWarpsConnections $66fa = EnableCoordEvents $6700 = EnableStepCount $6706 = EnableWildEncounters - $670c = CheckWarpConnxnScriptFlag - $6712 = CheckCoordEventScriptFlag - $6718 = CheckStepCountScriptFlag - $671e = CheckWildEncountersScriptFlag + $670c = CheckWarpConnectionsEnabled + $6712 = CheckCoordEventsEnabled + $6718 = CheckStepCountEnabled + $671e = CheckWildEncountersEnabled $6724 = StartMap $673e = EnterMap $675a = EnterMap.dont_enable @@ -19135,8 +19135,8 @@ ROMX bank #37: $681f = PlayerEvents $6848 = PlayerEvents.ok $6865 = PlayerEvents.ok2 - $6867 = CheckTrainerBattle_GetPlayerEvent - $6872 = CheckTrainerBattle_GetPlayerEvent.nope + $6867 = CheckTrainerEvent + $6872 = CheckTrainerEvent.nope $6874 = CheckTileEvent $6886 = CheckTileEvent.connections_disabled $6890 = CheckTileEvent.coord_events_disabled @@ -19149,7 +19149,7 @@ ROMX bank #37: $68c7 = CheckWildEncounterCooldown $68d1 = SetUpFiveStepWildEncounterCooldown $68d7 = SetMinTwoStepWildEncounterCooldown - $68e4 = Dummy_CheckScriptFlags2Bit5 + $68e4 = Dummy_CheckEnabledMapEventsBit5 $68ec = RunSceneScript $6938 = RunSceneScript.nope $693a = CheckTimeEvents @@ -19483,13 +19483,13 @@ ROMX bank #37: $7a9e = Script_delcmdqueue $7ab3 = Script_changemapblocks $7acc = Script_changeblock - $7ae3 = Script_reloadmappart + $7ae3 = Script_refreshmap $7af6 = Script_warpcheck $7b01 = Script_enableevents $7b08 = Script_newloadmap $7b16 = Script_reloadend $7b1c = Script_opentext - $7b20 = Script_refreshscreen + $7b20 = Script_reanchormap $7b27 = Script_writeunusedbyte $7b2e = UnusedClosetextScript $7b2f = Script_closetext @@ -19516,7 +19516,7 @@ ROMX bank #37: $7c27 = Script_checkver_duplicate.gs_version $7c28 = WarpToSpawnPoint $7c30 = RunMemScript - $7c4f = LoadScriptBDE + $7c4f = LoadMemScript $7c5f = TryTileCollisionEvent $7c7b = TryTileCollisionEvent.whirlpool $7c8b = TryTileCollisionEvent.waterfall @@ -19531,9 +19531,9 @@ ROMX bank #37: $7ced = RandomEncounter.ok_bug_contest $7cf4 = RandomEncounter.done $7cf9 = WildBattleScript - $7cfd = CanUseSweetScent - $7d17 = CanUseSweetScent.ice_check - $7d21 = CanUseSweetScent.no + $7cfd = CanEncounterWildMon + $7d17 = CanEncounterWildMon.ice_check + $7d21 = CanEncounterWildMon.no $7d23 = _TryWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest $7d31 = ChooseWildEncounter_BugContest.loop @@ -31428,31 +31428,31 @@ ROMX bank #65: $4033 = HDMATransferTilemapToWRAMBank3.Function $4047 = HDMATransferAttrmapToWRAMBank3 $404d = HDMATransferAttrmapToWRAMBank3.Function - $4061 = ReloadMapPart - $4067 = ReloadMapPart.Function - $4099 = Mobile_ReloadMapPart - $40a2 = Mobile_ReloadMapPart.Function + $4061 = HDMATransferTilemapAndAttrmap_Overworld + $4067 = HDMATransferTilemapAndAttrmap_Overworld.Function + $4099 = Mobile_HDMATransferTilemapAndAttrmap_Overworld + $40a2 = Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function $40d4 = Function1040d4 $40da = Function1040d4.Function $40fb = Function1040fb $4101 = Function1040fb.Function - $4110 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $4116 = OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function - $4148 = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap - $414e = Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function + $4110 = _HDMATransferTilemapAndAttrmap_Menu + $4116 = _HDMATransferTilemapAndAttrmap_Menu.Function + $4148 = Mobile_HDMATransferTilemapAndAttrmap_Menu + $414e = Mobile_HDMATransferTilemapAndAttrmap_Menu.Function $4177 = CallInSafeGFXMode $419c = CallInSafeGFXMode._hl_ $419d = HDMATransferToWRAMBank3 $41a4 = WaitDMATransfer $41a4 = WaitDMATransfer.loop - $41ad = HDMATransfer_Wait127Scanlines_toBGMap - $41b7 = HDMATransfer_Wait123Scanlines_toBGMap + $41ad = HDMATransfer_WaitForScanline128_toBGMap + $41b7 = HDMATransfer_WaitForScanline124_toBGMap $41c1 = HDMATransfer_NoDI $41e4 = HDMATransfer_NoDI.loop1 $41e9 = HDMATransfer_NoDI.loop2 $41f8 = HDMATransfer_NoDI.loop3 - $4205 = HDMATransfer_Wait123Scanlines - $4209 = HDMATransfer_Wait127Scanlines + $4205 = HDMATransfer_WaitForScanline124 + $4209 = HDMATransfer_WaitForScanline128 $420b = _continue_HDMATransfer $4225 = _continue_HDMATransfer.ly_loop $422b = _continue_HDMATransfer.rstat_loop_1 @@ -35870,9 +35870,9 @@ ROMX bank #91: $56a7 = LoadTradeRoomBGPals $56ae = LoadCableTradeBorderTilemap $56ca = LinkTextbox - $56ce = PrintWaitingTextAndSyncAndExchangeNybble - $56e1 = PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText - $5701 = PrintWaitingTextAndSyncAndExchangeNybble.Waiting + $56ce = PlaceWaitingTextAndSyncAndExchangeNybble + $56e1 = PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText + $5701 = PlaceWaitingTextAndSyncAndExchangeNybble.Waiting $570c = LinkTradeMenu $5713 = LinkTradeMenu.GetJoypad $5725 = LinkTradeMenu.MenuAction @@ -56210,7 +56210,7 @@ WRAMX bank #1: $d046 = wWalkingY $d046 = wBufferMonSpclDef $d047 = wWinTextPointer - $d047 = wWalkingTile + $d047 = wWalkingTileCollision $d048 = wBufferMonStructEnd $d049 = wLossTextPointer $d04b = wScriptAfterPointer @@ -56253,7 +56253,7 @@ WRAMX bank #1: $d0ec = wSolvedUnownPuzzle $d0ec = wItemEffectSucceeded $d0ec = wBattlePlayerAction - $d0ed = wVramState + $d0ed = wStateFlags $d0ee = wBattleResult $d0ef = wUsingItemWithSelect $d0f0 = wCurElevatorCount @@ -56828,7 +56828,7 @@ WRAMX bank #1: $d432 = wMapStatus $d433 = wMapEventStatus $d434 = wScriptFlags - $d436 = wScriptFlags2 + $d436 = wEnabledPlayerEvents $d437 = wScriptMode $d438 = wScriptRunning $d439 = wScriptBank @@ -56906,7 +56906,7 @@ WRAMX bank #1: $d4e1 = wPlayerAction $d4e2 = wPlayerStepFrame $d4e3 = wPlayerFacing - $d4e4 = wPlayerTile + $d4e4 = wPlayerTileCollision $d4e5 = wPlayerLastTile $d4e6 = wPlayerMapX $d4e7 = wPlayerMapY @@ -56940,7 +56940,7 @@ WRAMX bank #1: $d509 = wObject1Action $d50a = wObject1StepFrame $d50b = wObject1Facing - $d50c = wObject1Tile + $d50c = wObject1TileCollision $d50d = wObject1LastTile $d50e = wObject1MapX $d50f = wObject1MapY @@ -56974,7 +56974,7 @@ WRAMX bank #1: $d531 = wObject2Action $d532 = wObject2StepFrame $d533 = wObject2Facing - $d534 = wObject2Tile + $d534 = wObject2TileCollision $d535 = wObject2LastTile $d536 = wObject2MapX $d537 = wObject2MapY @@ -57008,7 +57008,7 @@ WRAMX bank #1: $d559 = wObject3Action $d55a = wObject3StepFrame $d55b = wObject3Facing - $d55c = wObject3Tile + $d55c = wObject3TileCollision $d55d = wObject3LastTile $d55e = wObject3MapX $d55f = wObject3MapY @@ -57042,7 +57042,7 @@ WRAMX bank #1: $d581 = wObject4Action $d582 = wObject4StepFrame $d583 = wObject4Facing - $d584 = wObject4Tile + $d584 = wObject4TileCollision $d585 = wObject4LastTile $d586 = wObject4MapX $d587 = wObject4MapY @@ -57076,7 +57076,7 @@ WRAMX bank #1: $d5a9 = wObject5Action $d5aa = wObject5StepFrame $d5ab = wObject5Facing - $d5ac = wObject5Tile + $d5ac = wObject5TileCollision $d5ad = wObject5LastTile $d5ae = wObject5MapX $d5af = wObject5MapY @@ -57110,7 +57110,7 @@ WRAMX bank #1: $d5d1 = wObject6Action $d5d2 = wObject6StepFrame $d5d3 = wObject6Facing - $d5d4 = wObject6Tile + $d5d4 = wObject6TileCollision $d5d5 = wObject6LastTile $d5d6 = wObject6MapX $d5d7 = wObject6MapY @@ -57144,7 +57144,7 @@ WRAMX bank #1: $d5f9 = wObject7Action $d5fa = wObject7StepFrame $d5fb = wObject7Facing - $d5fc = wObject7Tile + $d5fc = wObject7TileCollision $d5fd = wObject7LastTile $d5fe = wObject7MapX $d5ff = wObject7MapY @@ -57178,7 +57178,7 @@ WRAMX bank #1: $d621 = wObject8Action $d622 = wObject8StepFrame $d623 = wObject8Facing - $d624 = wObject8Tile + $d624 = wObject8TileCollision $d625 = wObject8LastTile $d626 = wObject8MapX $d627 = wObject8MapY @@ -57212,7 +57212,7 @@ WRAMX bank #1: $d649 = wObject9Action $d64a = wObject9StepFrame $d64b = wObject9Facing - $d64c = wObject9Tile + $d64c = wObject9TileCollision $d64d = wObject9LastTile $d64e = wObject9MapX $d64f = wObject9MapY @@ -57246,7 +57246,7 @@ WRAMX bank #1: $d671 = wObject10Action $d672 = wObject10StepFrame $d673 = wObject10Facing - $d674 = wObject10Tile + $d674 = wObject10TileCollision $d675 = wObject10LastTile $d676 = wObject10MapX $d677 = wObject10MapY @@ -57280,7 +57280,7 @@ WRAMX bank #1: $d699 = wObject11Action $d69a = wObject11StepFrame $d69b = wObject11Facing - $d69c = wObject11Tile + $d69c = wObject11TileCollision $d69d = wObject11LastTile $d69e = wObject11MapX $d69f = wObject11MapY @@ -57314,7 +57314,7 @@ WRAMX bank #1: $d6c1 = wObject12Action $d6c2 = wObject12StepFrame $d6c3 = wObject12Facing - $d6c4 = wObject12Tile + $d6c4 = wObject12TileCollision $d6c5 = wObject12LastTile $d6c6 = wObject12MapX $d6c7 = wObject12MapY @@ -57727,8 +57727,8 @@ WRAMX bank #1: $dbf5 = wBikeFlags $dbf7 = wCurMapSceneScriptPointer $dbf9 = wCurCaller - $dbfb = wCurMapWarpCount - $dbfc = wCurMapWarpsPointer + $dbfb = wCurMapWarpEventCount + $dbfc = wCurMapWarpEventsPointer $dbfe = wCurMapCoordEventCount $dbff = wCurMapCoordEventsPointer $dc01 = wCurMapBGEventCount diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym index 6b5db533ae2..0fa7e4b217c 100644 --- a/pokecrystal_debug.sym +++ b/pokecrystal_debug.sym @@ -130,7 +130,7 @@ 00:0833 SerialDisconnected 00:083b Serial_ExchangeSyncBytes 00:0847 Serial_ExchangeSyncBytes.exchange -00:0862 Serial_PrintWaitingTextAndSyncAndExchangeNybble +00:0862 Serial_PlaceWaitingTextAndSyncAndExchangeNybble 00:0871 Serial_SyncAndExchangeNybble 00:087d WaitLinkTransfer 00:0882 WaitLinkTransfer.loop @@ -228,7 +228,7 @@ 00:0d79 ClearVBank1 00:0d90 GSReloadPalettes 00:0d91 ReloadSpritesNoPalettes -00:0db1 SwapTextboxPalettes +00:0db1 LoadOverworldAttrmapPals 00:0dbd ScrollBGMapPalettes 00:0dc9 Get2bppViaHDMA 00:0ddc Get1bppViaHDMA @@ -373,7 +373,7 @@ 00:13d4 PlaceFarString 00:13e0 PokeFluteTerminator 00:13e4 PokeFluteTerminator.stop -00:13e5 PlaceHLTextAtBC +00:13e5 PrintTextboxTextAt 00:13f6 DoTextUntilTerminator 00:13ff DoTextUntilTerminator.TextCommand 00:1410 TextCommands @@ -439,9 +439,9 @@ 00:1830 GetSpriteVTile.found 00:1833 GetSpriteVTile.done 00:1836 DoesSpriteHaveFacings -00:184a GetPlayerTile +00:184a GetPlayerTilePermission 00:1852 CheckOnWater -00:185d GetTileCollision +00:185d GetTilePermission 00:1875 CheckGrassTile 00:1882 CheckGrassTile.grass 00:1888 CheckGrassTile.water @@ -485,8 +485,8 @@ 00:1a61 CopySpriteMovementData 00:1a71 CopySpriteMovementData.CopyData 00:1aae _GetMovementIndex -00:1ac6 SetVramState_Bit0 -00:1acc ResetVramState_Bit0 +00:1ac6 SetVramState_SpriteUpdatesDisabled +00:1acc ResetVramState_SpriteUpdatesDisabled 00:1ad2 UpdateSprites 00:1ae5 GetObjectStruct 00:1af1 DoesObjectHaveASprite @@ -621,8 +621,8 @@ 00:2167 GetMapSceneID.end 00:216a GetMapSceneID.found 00:216d GetMapSceneID.done -00:2173 OverworldTextModeSwitch -00:217a LoadMapPart +00:2173 LoadOverworldTilemapAndAttrmapPals +00:217a LoadOverworldTilemap 00:2198 LoadMetatiles 00:21a5 LoadMetatiles.row 00:21a9 LoadMetatiles.col @@ -663,7 +663,7 @@ 00:23a5 GetMapConnection.loop 00:23ac ReadMapSceneScripts 00:23c3 ReadMapCallbacks -00:23da ReadWarps +00:23da ReadWarpEvents 00:23f1 ReadCoordEvents 00:2408 ReadBGEvents 00:241f ReadObjectEvents @@ -770,10 +770,10 @@ 00:2a16 GetMovementPermissions.CheckHiNybble 00:2a1e GetFacingTileCoord 00:2a43 GetFacingTileCoord.Directions -00:2a53 GetCoordTile -00:2a6d GetCoordTile.nocarry -00:2a73 GetCoordTile.nocarry2 -00:2a7a GetCoordTile.nope +00:2a53 GetCoordTileCollision +00:2a6d GetCoordTileCollision.nocarry +00:2a73 GetCoordTileCollision.nocarry2 +00:2a7a GetCoordTileCollision.nope 00:2a7d GetBlockLocation 00:2a8f GetBlockLocation.loop 00:2a94 GetBlockLocation.ok @@ -834,11 +834,11 @@ 00:2d99 FarCall_JumpToHL 00:2d9a Predef 00:2dbd Predef.Return -00:2dd1 RefreshScreen +00:2dd1 ReanchorMap 00:2de6 CloseText 00:2df9 CloseText.CloseText 00:2e1f OpenText -00:2e37 _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap +00:2e37 HDMATransferTilemapAndAttrmap_Menu 00:2e48 SafeUpdateSprites 00:2e65 SetCarryFlag 00:2e67 ResetMapBufferEventFlags @@ -972,8 +972,8 @@ 00:32fa _CopyTilemapAtOnce.loop_u12 00:3303 _CopyTilemapAtOnce.loop_u13 00:330c _CopyTilemapAtOnce.loop_u14 -00:3327 SetPalettes -00:3337 SetPalettes.SetPalettesForGameBoyColor +00:3327 SetDefaultBGPAndOBP +00:3337 SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor 00:3345 ClearPalettes 00:3352 ClearPalettes.cgb 00:336c GetMemSGBLayout @@ -2493,11 +2493,11 @@ 03:40aa CardFlipSpecial 03:40ad UnusedMemoryGameSpecial 03:40b0 ClearBGPalettesBufferScreenSpecial -03:40b3 FadeOutPalettesSpecial +03:40b3 FadeOutToWhiteSpecial 03:40b6 BattleTowerFadeSpecial -03:40b9 FadeBlackQuicklySpecial -03:40bc FadeInPalettesSpecial -03:40bf FadeInQuicklySpecial +03:40b9 FadeOutToBlackSpecial +03:40bc FadeInFromWhiteSpecial +03:40bf FadeInFromBlackSpecial 03:40c2 ReloadSpritesNoPalettesSpecial 03:40c5 ClearBGPalettesSpecial 03:40c8 UpdateTimePalsSpecial @@ -4759,8 +4759,8 @@ 05:548e LoadMapAttributes_MapSetupCmd 05:5491 LoadMapAttributes_SkipObjects_MapSetupCmd 05:5494 ClearBGPalettes_MapSetupCmd -05:5497 FadeOutPalettes_MapSetupCmd -05:549a FadeInPalettes_MapSetupCmd +05:5497 FadeOutToWhite_MapSetupCmd +05:549a FadeInFromWhite_MapSetupCmd 05:549d GetMapScreenCoords_MapSetupCmd 05:54a0 GetWarpDestCoords_MapSetupCmd 05:54a3 SpawnInFacingDown_MapSetupCmd @@ -4785,8 +4785,8 @@ 05:54f1 SkipUpdateMapSprites 05:54f7 CheckUpdatePlayerSprite 05:5508 CheckUpdatePlayerSprite.ok -05:550c CheckUpdatePlayerSprite.CheckBiking -05:551a CheckUpdatePlayerSprite.CheckSurfing2 +05:550c CheckUpdatePlayerSprite.CheckForcedBiking +05:551a CheckUpdatePlayerSprite.ResetSurfingOrBikingState 05:553e CheckUpdatePlayerSprite.no_biking 05:5545 CheckUpdatePlayerSprite.surfing 05:554c CheckUpdatePlayerSprite.nope @@ -9623,7 +9623,7 @@ 0f:7ce0 BattleStartMessage.cry_no_anim 0f:7ceb BattleStartMessage.skip_cry 0f:7cfd BattleStartMessage.NotFishing -0f:7d0e BattleStartMessage.PlaceBattleStartText +0f:7d0e BattleStartMessage.PrintBattleStartText 0f:7d28 BattleCommandPointers 10:4000 Pokedex 10:4029 Pokedex.main @@ -10880,11 +10880,11 @@ 12:6e3b AskRememberPassword.DoMenu 12:6e73 AskRememberPassword.refused 12:6e7a Buena_ExitMenu -13:4000 _SwapTextboxPalettes -13:4008 _SwapTextboxPalettes.loop -13:400b _SwapTextboxPalettes.innerloop -13:4021 _SwapTextboxPalettes.UpperNybble -13:4031 _SwapTextboxPalettes.next +13:4000 _LoadOverworldAttrmapPals +13:4008 _LoadOverworldAttrmapPals.loop +13:400b _LoadOverworldAttrmapPals.innerloop +13:4021 _LoadOverworldAttrmapPals.UpperNybble +13:4031 _LoadOverworldAttrmapPals.next 13:403f _ScrollBGMapPalettes 13:4045 _ScrollBGMapPalettes.loop 13:405b _ScrollBGMapPalettes.UpperNybble @@ -10928,7 +10928,7 @@ 13:4d25 TilesetBattleTowerInsidePalMap 13:4d95 TilesetBattleTowerOutsidePalMap 13:4e05 MapGroupPalettes -13:4e1f TileCollisionTable +13:4e1f CollisionPermissionTable 13:4f1f EmptyAllSRAMBanks 13:4f34 EmptyAllSRAMBanks.EmptyBank 13:4f45 SaveMenu_CopyTilemapAtOnce @@ -10949,12 +10949,12 @@ 13:4ffe CheckSave 13:501b CheckSave.ok 13:501e MapScenes -13:515b _LoadMapPart -13:5168 _LoadMapPart.top_row -13:5170 _LoadMapPart.left_column -13:5175 _LoadMapPart.loop -13:5177 _LoadMapPart.loop2 -13:5184 _LoadMapPart.carry +13:515b _LoadOverworldTilemap +13:5168 _LoadOverworldTilemap.top_row +13:5170 _LoadOverworldTilemap.left_column +13:5175 _LoadOverworldTilemap.loop +13:5177 _LoadOverworldTilemap.loop2 +13:5184 _LoadOverworldTilemap.carry 13:5188 PhoneRing_CopyTilemapAtOnce 13:51a2 PhoneRing_CopyTilemapAtOnce.wait 13:51bd PhoneRing_CopyTilemapAtOnce.wait2 @@ -11426,9 +11426,9 @@ 14:444f PartyMenu2DMenuData 14:4457 PartyMenuSelect 14:448f PartyMenuSelect.exitmenu -14:449a PrintPartyMenuText -14:44ae PrintPartyMenuText.haspokemon -14:44be PrintPartyMenuText.gotstring +14:449a PlacePartyMenuText +14:44ae PlacePartyMenuText.haspokemon +14:44be PlacePartyMenuText.gotstring 14:44d2 PartyMenuStrings 14:44e4 ChooseAMonString 14:44f3 UseOnWhichPKMNString @@ -17127,12 +17127,12 @@ 23:405b _TimeOfDayPals.pop 23:406e _TimeOfDayPals.dontchange 23:4070 _UpdateTimePals -23:4079 FadeInPalettes -23:4084 FadeOutPalettes +23:4079 FadeInFromWhite +23:4084 FadeOutToWhite 23:4092 BattleTowerFade 23:409c BattleTowerFade.loop -23:40ab FadeInQuickly -23:40b6 FadeBlackQuickly +23:40ab FadeInFromBlack +23:40b6 FadeOutToBlack 23:40c1 FillWhiteBGColor 23:40d4 FillWhiteBGColor.loop 23:40e5 ReplaceTimeOfDayPals @@ -18869,19 +18869,19 @@ 25:66c3 OverworldLoop.Jumptable 25:66cb DisableEvents 25:66d0 EnableEvents -25:66d6 CheckBit5_ScriptFlags2 -25:66dc DisableWarpsConnxns +25:66d6 CheckEnabledMapEventsBit5 +25:66dc DisableWarpsConnections 25:66e2 DisableCoordEvents 25:66e8 DisableStepCount 25:66ee DisableWildEncounters -25:66f4 EnableWarpsConnxns +25:66f4 EnableWarpsConnections 25:66fa EnableCoordEvents 25:6700 EnableStepCount 25:6706 EnableWildEncounters -25:670c CheckWarpConnxnScriptFlag -25:6712 CheckCoordEventScriptFlag -25:6718 CheckStepCountScriptFlag -25:671e CheckWildEncountersScriptFlag +25:670c CheckWarpConnectionsEnabled +25:6712 CheckCoordEventsEnabled +25:6718 CheckStepCountEnabled +25:671e CheckWildEncountersEnabled 25:6724 StartMap 25:673e EnterMap 25:675a EnterMap.dont_enable @@ -18905,8 +18905,8 @@ 25:681f PlayerEvents 25:6848 PlayerEvents.ok 25:6865 PlayerEvents.ok2 -25:6867 CheckTrainerBattle_GetPlayerEvent -25:6872 CheckTrainerBattle_GetPlayerEvent.nope +25:6867 CheckTrainerEvent +25:6872 CheckTrainerEvent.nope 25:6874 CheckTileEvent 25:6886 CheckTileEvent.connections_disabled 25:6890 CheckTileEvent.coord_events_disabled @@ -18919,7 +18919,7 @@ 25:68c7 CheckWildEncounterCooldown 25:68d1 SetUpFiveStepWildEncounterCooldown 25:68d7 SetMinTwoStepWildEncounterCooldown -25:68e4 Dummy_CheckScriptFlags2Bit5 +25:68e4 Dummy_CheckEnabledMapEventsBit5 25:68ec RunSceneScript 25:6938 RunSceneScript.nope 25:693a CheckTimeEvents @@ -19253,13 +19253,13 @@ 25:7a9e Script_delcmdqueue 25:7ab3 Script_changemapblocks 25:7acc Script_changeblock -25:7ae3 Script_reloadmappart +25:7ae3 Script_refreshmap 25:7af6 Script_warpcheck 25:7b01 Script_enableevents 25:7b08 Script_newloadmap 25:7b16 Script_reloadend 25:7b1c Script_opentext -25:7b20 Script_refreshscreen +25:7b20 Script_reanchormap 25:7b27 Script_writeunusedbyte 25:7b2e UnusedClosetextScript 25:7b2f Script_closetext @@ -19286,7 +19286,7 @@ 25:7c27 Script_checkver_duplicate.gs_version 25:7c28 WarpToSpawnPoint 25:7c30 RunMemScript -25:7c4f LoadScriptBDE +25:7c4f LoadMemScript 25:7c5f TryTileCollisionEvent 25:7c7b TryTileCollisionEvent.whirlpool 25:7c8b TryTileCollisionEvent.waterfall @@ -19301,9 +19301,9 @@ 25:7ced RandomEncounter.ok_bug_contest 25:7cf4 RandomEncounter.done 25:7cf9 WildBattleScript -25:7cfd CanUseSweetScent -25:7d17 CanUseSweetScent.ice_check -25:7d21 CanUseSweetScent.no +25:7cfd CanEncounterWildMon +25:7d17 CanEncounterWildMon.ice_check +25:7d21 CanEncounterWildMon.no 25:7d23 _TryWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest 25:7d31 ChooseWildEncounter_BugContest.loop @@ -31051,31 +31051,31 @@ 41:4033 HDMATransferTilemapToWRAMBank3.Function 41:4047 HDMATransferAttrmapToWRAMBank3 41:404d HDMATransferAttrmapToWRAMBank3.Function -41:4061 ReloadMapPart -41:4067 ReloadMapPart.Function -41:4099 Mobile_ReloadMapPart -41:40a2 Mobile_ReloadMapPart.Function +41:4061 HDMATransferTilemapAndAttrmap_Overworld +41:4067 HDMATransferTilemapAndAttrmap_Overworld.Function +41:4099 Mobile_HDMATransferTilemapAndAttrmap_Overworld +41:40a2 Mobile_HDMATransferTilemapAndAttrmap_Overworld.Function 41:40d4 Function1040d4 41:40da Function1040d4.Function 41:40fb Function1040fb 41:4101 Function1040fb.Function -41:4110 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:4116 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function -41:4148 Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap -41:414e Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap.Function +41:4110 _HDMATransferTilemapAndAttrmap_Menu +41:4116 _HDMATransferTilemapAndAttrmap_Menu.Function +41:4148 Mobile_HDMATransferTilemapAndAttrmap_Menu +41:414e Mobile_HDMATransferTilemapAndAttrmap_Menu.Function 41:4177 CallInSafeGFXMode 41:419c CallInSafeGFXMode._hl_ 41:419d HDMATransferToWRAMBank3 41:41a4 WaitDMATransfer 41:41a4 WaitDMATransfer.loop -41:41ad HDMATransfer_Wait127Scanlines_toBGMap -41:41b7 HDMATransfer_Wait123Scanlines_toBGMap +41:41ad HDMATransfer_WaitForScanline128_toBGMap +41:41b7 HDMATransfer_WaitForScanline124_toBGMap 41:41c1 HDMATransfer_NoDI 41:41e4 HDMATransfer_NoDI.loop1 41:41e9 HDMATransfer_NoDI.loop2 41:41f8 HDMATransfer_NoDI.loop3 -41:4205 HDMATransfer_Wait123Scanlines -41:4209 HDMATransfer_Wait127Scanlines +41:4205 HDMATransfer_WaitForScanline124 +41:4209 HDMATransfer_WaitForScanline128 41:420b _continue_HDMATransfer 41:4225 _continue_HDMATransfer.ly_loop 41:422b _continue_HDMATransfer.rstat_loop_1 @@ -35363,9 +35363,9 @@ 5b:56a7 LoadTradeRoomBGPals 5b:56ae LoadCableTradeBorderTilemap 5b:56ca LinkTextbox -5b:56ce PrintWaitingTextAndSyncAndExchangeNybble -5b:56e1 PrintWaitingTextAndSyncAndExchangeNybble.PrintWaitingText -5b:5701 PrintWaitingTextAndSyncAndExchangeNybble.Waiting +5b:56ce PlaceWaitingTextAndSyncAndExchangeNybble +5b:56e1 PlaceWaitingTextAndSyncAndExchangeNybble.PlaceWaitingText +5b:5701 PlaceWaitingTextAndSyncAndExchangeNybble.Waiting 5b:570c LinkTradeMenu 5b:5713 LinkTradeMenu.GetJoypad 5b:5725 LinkTradeMenu.MenuAction @@ -55438,7 +55438,7 @@ 01:d046 wWalkingY 01:d046 wBufferMonSpclDef 01:d047 wWinTextPointer -01:d047 wWalkingTile +01:d047 wWalkingTileCollision 01:d048 wBufferMonStructEnd 01:d049 wLossTextPointer 01:d04b wScriptAfterPointer @@ -55480,7 +55480,7 @@ 01:d0ec wSolvedUnownPuzzle 01:d0ec wItemEffectSucceeded 01:d0ec wBattlePlayerAction -01:d0ed wVramState +01:d0ed wStateFlags 01:d0ee wBattleResult 01:d0ef wUsingItemWithSelect 01:d0f0 wCurElevatorCount @@ -56054,7 +56054,7 @@ 01:d432 wMapStatus 01:d433 wMapEventStatus 01:d434 wScriptFlags -01:d436 wScriptFlags2 +01:d436 wEnabledPlayerEvents 01:d437 wScriptMode 01:d438 wScriptRunning 01:d439 wScriptBank @@ -56132,7 +56132,7 @@ 01:d4e1 wPlayerAction 01:d4e2 wPlayerStepFrame 01:d4e3 wPlayerFacing -01:d4e4 wPlayerTile +01:d4e4 wPlayerTileCollision 01:d4e5 wPlayerLastTile 01:d4e6 wPlayerMapX 01:d4e7 wPlayerMapY @@ -56166,7 +56166,7 @@ 01:d509 wObject1Action 01:d50a wObject1StepFrame 01:d50b wObject1Facing -01:d50c wObject1Tile +01:d50c wObject1TileCollision 01:d50d wObject1LastTile 01:d50e wObject1MapX 01:d50f wObject1MapY @@ -56200,7 +56200,7 @@ 01:d531 wObject2Action 01:d532 wObject2StepFrame 01:d533 wObject2Facing -01:d534 wObject2Tile +01:d534 wObject2TileCollision 01:d535 wObject2LastTile 01:d536 wObject2MapX 01:d537 wObject2MapY @@ -56234,7 +56234,7 @@ 01:d559 wObject3Action 01:d55a wObject3StepFrame 01:d55b wObject3Facing -01:d55c wObject3Tile +01:d55c wObject3TileCollision 01:d55d wObject3LastTile 01:d55e wObject3MapX 01:d55f wObject3MapY @@ -56268,7 +56268,7 @@ 01:d581 wObject4Action 01:d582 wObject4StepFrame 01:d583 wObject4Facing -01:d584 wObject4Tile +01:d584 wObject4TileCollision 01:d585 wObject4LastTile 01:d586 wObject4MapX 01:d587 wObject4MapY @@ -56302,7 +56302,7 @@ 01:d5a9 wObject5Action 01:d5aa wObject5StepFrame 01:d5ab wObject5Facing -01:d5ac wObject5Tile +01:d5ac wObject5TileCollision 01:d5ad wObject5LastTile 01:d5ae wObject5MapX 01:d5af wObject5MapY @@ -56336,7 +56336,7 @@ 01:d5d1 wObject6Action 01:d5d2 wObject6StepFrame 01:d5d3 wObject6Facing -01:d5d4 wObject6Tile +01:d5d4 wObject6TileCollision 01:d5d5 wObject6LastTile 01:d5d6 wObject6MapX 01:d5d7 wObject6MapY @@ -56370,7 +56370,7 @@ 01:d5f9 wObject7Action 01:d5fa wObject7StepFrame 01:d5fb wObject7Facing -01:d5fc wObject7Tile +01:d5fc wObject7TileCollision 01:d5fd wObject7LastTile 01:d5fe wObject7MapX 01:d5ff wObject7MapY @@ -56404,7 +56404,7 @@ 01:d621 wObject8Action 01:d622 wObject8StepFrame 01:d623 wObject8Facing -01:d624 wObject8Tile +01:d624 wObject8TileCollision 01:d625 wObject8LastTile 01:d626 wObject8MapX 01:d627 wObject8MapY @@ -56438,7 +56438,7 @@ 01:d649 wObject9Action 01:d64a wObject9StepFrame 01:d64b wObject9Facing -01:d64c wObject9Tile +01:d64c wObject9TileCollision 01:d64d wObject9LastTile 01:d64e wObject9MapX 01:d64f wObject9MapY @@ -56472,7 +56472,7 @@ 01:d671 wObject10Action 01:d672 wObject10StepFrame 01:d673 wObject10Facing -01:d674 wObject10Tile +01:d674 wObject10TileCollision 01:d675 wObject10LastTile 01:d676 wObject10MapX 01:d677 wObject10MapY @@ -56506,7 +56506,7 @@ 01:d699 wObject11Action 01:d69a wObject11StepFrame 01:d69b wObject11Facing -01:d69c wObject11Tile +01:d69c wObject11TileCollision 01:d69d wObject11LastTile 01:d69e wObject11MapX 01:d69f wObject11MapY @@ -56540,7 +56540,7 @@ 01:d6c1 wObject12Action 01:d6c2 wObject12StepFrame 01:d6c3 wObject12Facing -01:d6c4 wObject12Tile +01:d6c4 wObject12TileCollision 01:d6c5 wObject12LastTile 01:d6c6 wObject12MapX 01:d6c7 wObject12MapY @@ -56953,8 +56953,8 @@ 01:dbf5 wBikeFlags 01:dbf7 wCurMapSceneScriptPointer 01:dbf9 wCurCaller -01:dbfb wCurMapWarpCount -01:dbfc wCurMapWarpsPointer +01:dbfb wCurMapWarpEventCount +01:dbfc wCurMapWarpEventsPointer 01:dbfe wCurMapCoordEventCount 01:dbff wCurMapCoordEventsPointer 01:dc01 wCurMapBGEventCount