diff --git a/pokeemerald.sym b/pokeemerald.sym index fe21cd09a6..552990224e 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -2209,8 +2209,8 @@ 080200ec l 0000002a FillTextEntryWindow 08020118 l 0000008a DrawTextEntryMessage 080201a4 l 0000017c PrintCurrentKeyboardPage -08020320 l 00000046 sub_8020320 -08020368 l 00000046 sub_8020368 +08020320 l 00000046 SlideKeyboardPageOut +08020368 l 00000046 SlideKeyboardPageIn 080203b0 l 0000005c ShowKeyboardSwapMenu 0802040c l 00000014 HideKeyboardSwapMenu 08020420 l 0000005e PrintChatMessage @@ -2225,8 +2225,8 @@ 080206e8 l 00000058 LoadTextEntryWindow 08020740 l 00000030 LoadKeyboardSwapWindow 08020770 l 00000050 InitScanlineEffect -080207c0 l 00000058 sub_80207C0 -08020818 l 00000078 sub_8020818 +080207c0 l 00000058 UpdateSlidingKeyboard +08020818 l 00000078 FinishSlidingKeyboard 08020890 l 00000040 TryAllocSprites 080208d0 l 00000018 FreeSprites 080208e8 l 00000034 CreateKeyboardCursorSprite @@ -4721,9 +4721,9 @@ 08089470 g 00000014 MetatileBehavior_IsBerryTreeSoil 08089484 g 00000014 MetatileBehavior_IsAshGrass 08089498 g 00000014 MetatileBehavior_IsFootprints -080894ac g 00000028 MetatileBehavior_IsBridge +080894ac g 00000028 MetatileBehavior_IsBridgeOverWater 080894d4 g 0000003a MetatileBehavior_GetBridgeType -08089510 g 0000001a MetatileBehavior_8089510 +08089510 g 0000001a MetatileBehavior_IsBridgeOverWaterNoEdge 0808952c g 0000002c MetatileBehavior_IsLandWildEncounter 08089558 g 0000002e MetatileBehavior_IsWaterWildEncounter 08089588 g 00000014 MetatileBehavior_IsIndoorEncounter @@ -4760,7 +4760,7 @@ 08089870 g 00000014 MetatileBehavior_IsLavaridgeB1FWarp 08089884 g 00000014 MetatileBehavior_IsLavaridge1FWarp 08089898 g 00000014 MetatileBehavior_IsAquaHideoutWarp -080898ac g 00000014 MetatileBehavior_IsWarpOrBridge +080898ac g 00000014 MetatileBehavior_IsBridgeOverOcean 080898c0 g 00000014 MetatileBehavior_IsMossdeepGymWarp 080898d4 g 0000002e MetatileBehavior_IsSurfableFishableWater 08089904 g 00000014 MetatileBehavior_IsMtPyreHole @@ -7615,7 +7615,7 @@ 080be8dc l 0000003e PrintInfoScreenText 080be91c l 000000a8 LoadInfoScreen 080be9c4 l 00000032 IsInfoScreenScrolling -080be9f8 l 0000002c sub_80BE9F8 +080be9f8 l 0000002c StartInfoScreenScroll 080bea24 l 0000038c Task_LoadInfoScreen 080bedb0 l 00000042 FreeInfoScreenWindowAndBgBuffers 080bedf4 l 000001dc Task_HandleInfoScreenInput @@ -7659,8 +7659,8 @@ 080c0b44 l 000000aa PrintCryScreenSpeciesName 080c0bf0 l 0000007a UnusedPrintMonName 080c0c6c l 000000c2 UnusedPrintDecimalNum -080c0d30 l 00000090 PrintFootprint -080c0dc0 g 0000004c sub_80C0DC0 +080c0d30 l 00000090 DrawFootprint +080c0dc0 l 0000004c RS_DrawFootprint 080c0e0c l 0000005a GetNextPosition 080c0e68 l 00000032 GetPokedexMonPersonality 080c0e9c g 0000005c CreateMonSpriteFromNationalDexNumber @@ -8215,13 +8215,13 @@ 080d2ff0 g 00000024 FreeMonIconPalette 080d3014 g 0000000a SpriteCB_MonIcon 080d3020 g 0000002c GetMonIconTiles -080d304c g 00000034 sub_80D304C +080d304c g 00000034 TryLoadAllMonIconPalettesAtOffset 080d3080 g 00000020 GetValidMonIconPalIndex 080d30a0 g 00000010 GetMonIconPaletteIndexFromSpecies 080d30b0 g 0000002c GetValidMonIconPalettePtr 080d30dc g 000000d6 UpdateMonIconFrame 080d31b4 l 000000d8 CreateMonIconSprite -080d328c g 0000003c sub_80D328C +080d328c l 0000003c FreeAndDestroyMonIconSprite_ 080d32c8 g 0000001e SetPartyHPBarSprite 080d32e8 g 00000058 ScriptMovement_StartObjectMovementScript 080d32e8 l 00000000 .gcc2_compiled. @@ -10713,16 +10713,16 @@ 08120154 l 0000000a SetupTrader 08120160 g 00000068 SetMauvilleOldMan 081201c8 g 00000014 GetCurrentMauvilleOldMan -081201dc g 00000018 ScrSpecial_GetCurrentMauvilleMan -081201f4 g 0000001c ScrSpecial_HasBardSongBeenChanged -08120210 g 00000070 ScrSpecial_SaveBardSongLyrics +081201dc g 00000018 Script_GetCurrentMauvilleMan +081201f4 g 0000001c HasBardSongBeenChanged +08120210 g 00000070 SaveBardSongLyrics 08120280 l 000000c0 PrepareSongText -08120340 g 00000018 ScrSpecial_PlayBardSong -08120358 g 0000001c ScrSpecial_GetHipsterSpokenFlag -08120374 g 00000018 ScrSpecial_SetHipsterSpokenFlag -0812038c g 00000038 ScrSpecial_HipsterTeachWord -081203c4 g 00000038 ScrSpecial_GiddyShouldTellAnotherTale -081203fc g 000000e0 ScrSpecial_GenerateGiddyLine +08120340 g 00000018 PlayBardSong +08120358 g 0000001c GetHipsterSpokenFlag +08120374 g 00000018 SetHipsterSpokenFlag +0812038c g 00000038 HipsterTryTeachWord +081203c4 g 00000038 GiddyShouldTellAnotherTale +081203fc g 000000e0 GenerateGiddyLine 081204dc l 0000014a InitGiddyTaleList 08120628 l 00000018 ResetBardFlag 08120640 l 00000018 ResetHipsterFlag @@ -10731,13 +10731,13 @@ 08120670 g 0000004e ResetMauvilleOldManFlag 081206c0 l 00000030 StartBardSong 081206f0 l 0000000c EnableTextPrinters -081206fc l 0000000c BardSong_DisableTextPrinters -08120708 l 00000040 sub_8120708 +081206fc l 0000000c DisableTextPrinters +08120708 l 00000040 DrawSongTextWindow 08120748 l 000001fc BardSing 08120944 l 00000216 Task_BardSong -08120b5c g 00000014 ScrSpecial_SetMauvilleOldManObjEventGfx +08120b5c g 00000014 SetMauvilleOldManObjEventGfx 08120b70 g 0000009c SanitizeMauvilleOldManForRuby -08120c0c g 000000c2 sub_8120C0C +08120c0c l 000000c2 SetMauvilleOldManLanguage 08120cd0 g 00000064 SanitizeReceivedEmeraldOldMan 08120d34 g 000000d4 SanitizeReceivedRubyOldMan 08120e08 l 00000048 StorytellerSetup @@ -10759,12 +10759,12 @@ 08121178 l 00000074 StorytellerDisplayStory 081211ec l 00000110 PrintStoryList 081212fc l 0000008c Task_StoryListMenu -08121388 g 00000014 ScrSpecial_StorytellerStoryListMenu -0812139c g 00000014 ScrSpecial_StorytellerDisplayStory -081213b0 g 00000028 ScrSpecial_StorytellerGetFreeStorySlot -081213d8 g 0000004c ScrSpecial_StorytellerUpdateStat -08121424 g 0000002a ScrSpecial_HasStorytellerAlreadyRecorded -08121450 g 00000028 ScrSpecial_StorytellerInitializeRandomStat +08121388 g 00000014 StorytellerStoryListMenu +0812139c g 00000014 Script_StorytellerDisplayStory +081213b0 g 00000028 StorytellerGetFreeStorySlot +081213d8 g 0000004c StorytellerUpdateStat +08121424 g 0000002a HasStorytellerAlreadyRecorded +08121450 g 00000028 Script_StorytellerInitializeRandomStat 08121478 g 00000174 ReadMail 08121478 l 00000000 .gcc2_compiled. 081215ec l 00000404 MailReadBuildGraphics @@ -11454,14 +11454,14 @@ 08133a78 g 0000016c CreateAvailableDecorationsMenu 08133be4 g 00000064 Task_BufferDecorSelectionAndCloseWindow 08133c48 g 00000090 Task_HandleGetDecorationMenuInput -08133cd8 g 0000001c ScrSpecial_GetTraderTradedFlag -08133cf4 g 00000038 ScrSpecial_DoesPlayerHaveNoDecorations -08133d2c g 00000060 ScrSpecial_IsDecorationFull -08133d8c g 00000014 ScrSpecial_TraderMenuGiveDecoration +08133cd8 g 0000001c GetTraderTradedFlag +08133cf4 g 00000038 DoesPlayerHaveNoDecorations +08133d2c g 00000060 IsDecorationCategoryFull +08133d8c g 00000014 TraderShowDecorationMenu 08133da0 g 0000007c DecorationItemsMenuAction_Trade 08133e1c g 0000001c ExitTraderMenu -08133e38 g 00000088 ScrSpecial_TraderDoDecorationTrade -08133ec0 g 0000001c ScrSpecial_TraderMenuGetDecoration +08133e38 g 00000088 TraderDoDecorationTrade +08133ec0 g 0000001c TraderMenuGetDecoration 08133edc g 0000001c GetStarterPokemon 08133edc l 00000000 .gcc2_compiled. 08133ef8 l 00000012 VblankCB_StarterChoose @@ -11744,9 +11744,9 @@ 0813a46c l 00000080 ScrollableMultichoice_MoveCursor 0813a4ec l 00000084 ScrollableMultichoice_ProcessInput 0813a570 l 00000090 CloseScrollableMultichoice -0813a600 l 00000030 sub_813A600 -0813a630 g 00000034 sub_813A630 -0813a664 l 00000030 sub_813A664 +0813a600 l 00000030 Task_ScrollableMultichoice_WaitReturnToList +0813a630 g 00000034 ScrollableMultichoice_TryReturnToList +0813a664 l 00000030 Task_ScrollableMultichoice_ReturnToList 0813a694 l 000000a4 ScrollableMultichoice_UpdateScrollArrows 0813a738 l 00000030 ScrollableMultichoice_RemoveScrollArrows 0813a768 g 00000002 ShowGlassWorkshopMenu @@ -11771,9 +11771,9 @@ 0813ace8 l 0000004c ShowBattleFrontierTutorWindow 0813ad34 l 00000084 ShowBattleFrontierTutorMoveDescription 0813adb8 g 0000001c CloseBattleFrontierTutorWindow -0813add4 g 000000e0 sub_813ADD4 +0813add4 g 000000e0 ScrollableMultichoice_RedrawPersistentMenu 0813aeb4 g 00000094 GetBattleFrontierTutorMoveIndex -0813af48 g 00000080 sub_813AF48 +0813af48 g 00000080 ScrollableMultichoice_ClosePersistentMenu 0813afc8 g 00000014 DoDeoxysRockInteraction 0813afdc l 000000d8 Task_DeoxysRockInteraction 0813b0b4 l 000000ac ChangeDeoxysRockLevel @@ -14205,18 +14205,18 @@ 0818d1c0 l 0000002c AssignSpriteAnimsTable 0818d1ec l 00000198 CreatePicSprite 0818d384 l 00000060 CreatePicSprite_HandleDeoxys -0818d3e4 g 000001cc CreatePicSprite2 +0818d3e4 g 000001cc CreateMonPicSprite_Affine 0818d5b0 l 000000ac FreeAndDestroyPicSpriteInternal -0818d65c l 00000070 sub_818D65C +0818d65c l 00000070 LoadPicSpriteInWindow 0818d6cc l 000000ac CreateTrainerCardSprite 0818d778 l 00000060 CreateMonPicSprite 0818d7d8 g 00000048 CreateMonPicSprite_HandleDeoxys 0818d820 g 00000012 FreeAndDestroyMonPicSprite -0818d834 g 00000030 sub_818D834 +0818d834 l 00000030 LoadMonPicInWindow 0818d864 g 00000048 CreateTrainerCardMonIconSprite 0818d8ac g 00000044 CreateTrainerPicSprite 0818d8f0 g 00000012 FreeAndDestroyTrainerPicSprite -0818d904 g 00000034 sub_818D904 +0818d904 l 00000034 LoadTrainerPicInWindow 0818d938 g 00000044 CreateTrainerCardTrainerPicSprite 0818d97c g 00000030 PlayerGenderToFrontTrainerPicId_Debug 0818d9ac g 00000014 GetLilycoveLadyId @@ -15162,10 +15162,10 @@ 081afc84 l 00000048 IsCurMapInLocationList 081afccc l 00000010 IsCurMapPokeCenter 081afcdc l 00000010 IsCurMapReloadLocation -081afcec l 00000010 sub_81AFCEC +081afcec l 00000010 IsCurMapInEmptyList 081afcfc l 00000030 TrySetPokeCenterWarpStatus 081afd2c l 00000030 TrySetReloadWarpStatus -081afd5c l 00000030 sub_81AFD5C +081afd5c l 00000030 TrySetUnknownWarpStatus 081afd8c g 00000012 TrySetMapSaveWarpStatus 081afda0 g 00000030 SetUnlockedPokedexFlags 081afdd0 g 00000014 SetChampionSaveWarp @@ -16840,16 +16840,16 @@ 081db374 g 00000010 GetStringCenterAlignXOffsetWithLetterSpacing 081db384 g 00000022 GetStringWidthDifference 081db3a8 g 00000030 GetMaxWidthInMenuTable -081db3d8 g 00000042 sub_81DB3D8 +081db3d8 g 00000042 GetMaxWidthInSubsetOfMenuTable 081db41c g 0000004c Intl_GetListMenuWidth 081db468 g 0000002c CopyMonCategoryText -081db494 g 00000048 sub_81DB494 +081db494 g 00000048 GetStringClearToWidth 081db4dc g 0000004e PadNameString 081db52c g 00000026 ConvertInternationalPlayerName 081db554 g 00000056 ConvertInternationalPlayerNameStripChar 081db5ac g 0000003c ConvertInternationalContestantName 081db5e8 g 0000001c TVShowConvertInternationalString -081db604 g 0000001a sub_81DB604 +081db604 g 0000001a GetNicknameLanguage 081db620 g 0000005c sub_81DB620 081db67c g 00000000 gScriptCmdTable 081db67c l 00000000 script_data @@ -31653,24 +31653,24 @@ 08294285 l 00000000 BerryBlender_EventScript_TryBecomeLinkLeader 0829428a l 00000000 BerryBlender_EventScript_TryJoinLinkGroup 0829428f l 00000000 BerryBlender_EventScript_LinkLeaderDecided -08294295 g 00000000 gText_SoPretty -082942a1 g 00000000 gText_SoDarling -082942ae g 00000000 gText_SoRelaxed -082942bb g 00000000 gText_SoSunny -082942c6 g 00000000 gText_SoDesirable -082942d5 g 00000000 gText_SoExciting -082942e3 g 00000000 gText_SoAmusing -082942f0 g 00000000 gText_SoMagical -082942fd g 00000000 gOtherText_Is -08294301 g 00000000 gOtherText_DontYouAgree -08294313 g 00000000 gMauvilleManText_ISoWantToGoOnAVacation -08294359 g 00000000 gMauvilleManText_IBoughtCrayonsWith120Colors -08294398 g 00000000 gMauvilleManText_WouldntItBeNiceIfWeCouldFloat -082943da g 00000000 gMauvilleManText_WhenYouWriteOnASandyBeach -0829441c g 00000000 gMauvilleManText_WhatsTheBottomOfTheSeaLike -08294460 g 00000000 gMauvilleManText_WhenYouSeeTheSettingSunDoesIt -082944a0 g 00000000 gMauvilleManText_LyingBackInTheGreenGrass -082944d5 g 00000000 gMauvilleManText_SecretBasesAreSoWonderful +08294295 g 00000000 GiddyText_SoPretty +082942a1 g 00000000 GiddyText_SoDarling +082942ae g 00000000 GiddyText_SoRelaxed +082942bb g 00000000 GiddyText_SoSunny +082942c6 g 00000000 GiddyText_SoDesirable +082942d5 g 00000000 GiddyText_SoExciting +082942e3 g 00000000 GiddyText_SoAmusing +082942f0 g 00000000 GiddyText_SoMagical +082942fd g 00000000 GiddyText_Is +08294301 g 00000000 GiddyText_DontYouAgree +08294313 g 00000000 GiddyText_ISoWantToGoOnAVacation +08294359 g 00000000 GiddyText_IBoughtCrayonsWith120Colors +08294398 g 00000000 GiddyText_WouldntItBeNiceIfWeCouldFloat +082943da g 00000000 GiddyText_WhenYouWriteOnASandyBeach +0829441c g 00000000 GiddyText_WhatsTheBottomOfTheSeaLike +08294460 g 00000000 GiddyText_WhenYouSeeTheSettingSunDoesIt +082944a0 g 00000000 GiddyText_LyingBackInTheGreenGrass +082944d5 g 00000000 GiddyText_SecretBasesAreSoWonderful 08294513 l 00000000 Route102_Text_CalvinIntro 0829457c l 00000000 Route102_Text_CalvinDefeated 082945ac l 00000000 Route102_Text_CalvinPostBattle @@ -48822,17 +48822,17 @@ 0857bca8 g 000006e0 gMonIconTable 0857c388 g 000001b8 gMonIconPaletteIndices 0857c540 g 00000030 gMonIconPaletteTable -0857c570 g 00000008 sMonIconOamData +0857c570 l 00000008 sMonIconOamData 0857c578 l 0000000c sAnim_0 0857c584 l 0000000c sAnim_1 0857c590 l 0000000c sAnim_2 0857c59c l 0000000c sAnim_3 0857c5a8 l 0000000c sAnim_4 -0857c5b4 g 00000014 sMonIconAnims +0857c5b4 l 00000014 sMonIconAnims 0857c5c8 l 00000010 sAffineAnim_0 0857c5d8 l 00000010 sAffineAnim_1 -0857c5e8 g 00000008 sMonIconAffineAnims -0857c5f0 g 00000018 sSpriteImageSizes +0857c5e8 l 00000008 sMonIconAffineAnims +0857c5f0 l 00000018 sSpriteImageSizes 0857c608 l 00000040 sHyperCutStruct 0857c648 l 00000008 sOamData_CutGrass 0857c650 l 00000008 sSpriteAnim_CutGrass @@ -51797,7 +51797,8 @@ 0859eff0 l 00000020 sGiddyAdjectives 0859f010 l 00000020 sGiddyQuestions 0859f048 l 00000240 sStorytellerStories -0859f288 l 00000008 sStorytellerStuff +0859f288 l 00000004 sNumStories +0859f28c l 00000004 sUnused 0859f290 l 0000000c sBgTemplates 0859f29c l 00000010 sWindowTemplates 0859f2ac l 00000003 sTextColors @@ -57022,8 +57023,8 @@ 0860ae90 l 000000e4 sRecordedOpponentBufferCommands 0860af74 l 000000e4 sRecordedPlayerBufferCommands 0860b058 l 0000000c sDummyPicData -0860b064 l 00000008 gUnknown_0860B064 -0860b06c l 00000008 gUnknown_0860B06C +0860b064 l 00000008 sOamData_Normal +0860b06c l 00000008 sOamData_Affine 0860b074 l 0000000a sContestLadyMonGfxId 0860b07e l 00000006 sLilycoveLadyGfxId 0860b084 l 00000012 sQuizLadyQuestion1 @@ -57518,7 +57519,7 @@ 08614378 l 00000044 sRedArrowGfx 086143bc l 0000004e sSaveLocationPokeCenterList 0861440a l 00000004 sSaveLocationReloadLocList -0861440e l 00000002 sUnknown_0861440E +0861440e l 00000002 sEmptyMapList 08614410 g 00000bd0 gItemIconTable 08614fe0 l 00000008 sOamData_ItemIcon 08614fe8 l 00000008 sSpriteAnim_ItemIcon