dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-25 09:22:50 +08:00
parent 6ca932e5e9 7579fc65c1
commit 2f87855072
136 changed files with 3963 additions and 6605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/specials.inc
+92 -93
View File
@@ -7,11 +7,10 @@
.set __special__, 0
.align 2
gSpecials:: @ 815FD60
def_special sp000_heal_pokemon
def_special SetCableClubWarp
def_special sub_807E654
def_special DoCableClubWarp
def_special sub_807E704
def_special sub_8081744
def_special sub_8081770
@@ -66,10 +65,10 @@ gSpecials:: @ 815FD60
def_special GetTrainerFlag
def_special ScrSpecial_EndTrainerApproach
def_special SetUpTrainerEncounterMusic
def_special sub_810CD4C
def_special sub_810CEB4
def_special ShouldTryRematchBattle
def_special ScrSpecial_GetTrainerEyeRematchFlag
def_special ScrSpecial_StartTrainerEyeRematch
def_special sub_808C6A8
def_special ShowPokemonStorageSystem
def_special CheckForAlivePartyMons
def_special nullsub_75
def_special nullsub_75
@@ -78,7 +77,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CBEBC
def_special Special_HasLeadMonBeenRenamed
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -128,16 +127,16 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80A0918
def_special sub_80A0930
def_special sub_80A096C
def_special sub_80A0984
def_special sub_80CBFA0
def_special GetHeracrossSizeRecordInfo
def_special CompareHeracrossSize
def_special GetMagikarpSizeRecordInfo
def_special CompareMagikarpSize
def_special NameRaterWasNicknameChanged
def_special TV_CopyNicknameToStringVar1AndEnsureTerminated
def_special TV_CheckMonOTIDEqualsPlayerID
def_special nullsub_75
def_special nullsub_75
def_special sub_80BDB1C
def_special BufferRandomHobbyOrLifestyleString
def_special nullsub_75
def_special RegisteredItemHandleBikeSwap
def_special CalculatePlayerPartyCount
@@ -150,15 +149,15 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA68C
def_special Special_ShowStringVar4AsFieldMessage
def_special DrawWholeMapView
def_special sub_80CA69C
def_special Special_GetPlayerXY
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA6BC
def_special sub_80CA6DC
def_special sub_80CA714
def_special Special_GetPlayerTrainerIdOnesDigit
def_special Special_BufferBigGuyOrBigGirlString
def_special Special_BufferSonOrDaughterString
def_special Special_SetHiddenItemFlag
def_special nullsub_75
def_special nullsub_75
@@ -172,11 +171,11 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_8113364
def_special sub_8113288
def_special sub_81133A4
def_special ShouldMoveSaffronFanClubMember
def_special GetNumMovedSaffronFanClubMembers
def_special BufferStreakTrainerText
def_special sub_8113064
def_special sub_81132CC
def_special UpdateMovedSaffronFanClubMembers
def_special sub_8113510
def_special sub_81130A8
def_special sub_8113530
@@ -204,12 +203,12 @@ gSpecials:: @ 815FD60
def_special TakePokemonFromDaycare
def_special ScriptHatchMon
def_special EggHatch
def_special sub_8046EAC
def_special DaycareMonReceivedMail
def_special Special_BattleRecords
def_special IsEnoughForCostInVar0x8005
def_special SubtractMoneyFromVar0x8005
def_special ExecuteWhiteOut
def_special sub_80CA3C4
def_special sp0C8_whiteout_maybe
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -222,49 +221,49 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special Special_GetPokedexCount
def_special sub_80CA524
def_special sub_80CA86C
def_special sub_80CA9A8
def_special Special_GetProfOaksRatingMessage
def_special Special_AnimatePcTurnOn
def_special Special_AnimatePcTurnOff
def_special Special_GetElevatorFloor
def_special nullsub_75
def_special nullsub_75
def_special sub_80BF93C
def_special Special_ChooseMoveToDelete
def_special Special_DeleteSelectedMove
def_special SelectMoveTutorMon
def_special SelectMove
def_special DeleteMonMove
def_special ScrSpecial_GetPokemonNicknameAndMoveName
def_special ScrSpecial_CountPokemonMoves
def_special sub_80E4634
def_special DisplayMoveTutorMenu
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA664
def_special Special_GetPlayerAvatarBike
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA76C
def_special Special_GetLeadMonFriendship
def_special sub_80E5970
def_special sub_80E5C28
def_special sub_80E6648
def_special sub_80E67FC
def_special sub_80E7538
def_special sub_80E6900
def_special sub_80E6A0C
def_special sub_80E6C8C
def_special sub_80E6E14
def_special sub_80E6FB8
def_special sub_80E7058
def_special sub_80E71D0
def_special sub_80E724C
def_special sub_80E72B8
def_special sub_80A0380
def_special ChooseNextBattleTowerTrainer
def_special CheckPartyBattleTowerBanlist
def_special PrintBattleTowerTrainerGreeting
def_special PrintEReaderTrainerGreeting
def_special StartSpecialBattle
def_special SetBattleTowerProperty
def_special BattleTowerUtil
def_special SetBattleTowerParty
def_special SaveBattleTowerProgress
def_special BattleTower_SoftReset
def_special DetermineBattleTowerPrize
def_special GiveBattleTowerPrize
def_special AwardBattleTowerRibbons
def_special ChooseBattleTowerPlayerParty
def_special ValidateEReaderTrainer
def_special nullsub_75
def_special sub_80A03D8
def_special sub_80EB6AC
def_special sub_80EB6FC
def_special sub_80CA7EC
def_special sub_8053A9C
def_special sub_8053D68
def_special sub_8054440
def_special sub_8053D2C
def_special ReducePlayerPartyToThree
def_special BedroomPC
def_special PlayerPC
def_special Special_TownMap
def_special GetInGameTradeSpeciesInfo
def_special CreateInGameTradePokemon
def_special DoInGameTradeScene
def_special GetTradeSpecies
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -273,7 +272,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special ScrSpecial_CreatePCMenu
def_special HallOfFamePCBeginFade
def_special sub_80CA618
def_special Special_ShowDiploma
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -282,7 +281,7 @@ gSpecials:: @ 815FD60
def_special nullsub_61
def_special DoSoftReset
def_special Special_HallOfFame
def_special sub_80CB498
def_special Special_AnimateElevator
def_special nullsub_75
def_special SpawnCameraObject
def_special RemoveCameraObject
@@ -294,32 +293,32 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CAAAC
def_special sub_80CAABC
def_special Special_BufferEReaderTrainerName5
def_special Special_GetRandomSlotMachine
def_special GetPlayerFacingDirection
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special LeadMonHasEffortRibbon
def_special GivLeadMonEffortRibbon
def_special GiveLeadMonEffortRibbon
def_special ScrSpecial_AreLeadMonEVsMaxedOut
def_special sub_8069740
def_special sub_8069768
def_special InitRoamer
def_special nullsub_75
def_special sub_80CA804
def_special Special_PlayerHasGrassPokemonInParty
def_special nullsub_75
def_special nullsub_75
def_special sub_80CAB78
def_special Special_IsStarterFirstStageInParty
def_special nullsub_75
def_special sub_80CABD0
def_special Special_IsThereRoomInAnyBoxForMorePokemon
def_special nullsub_75
def_special sub_80CB580
def_special Special_DrawElevatorCurrentFloorWindow
def_special nullsub_75
def_special sub_80CAC08
def_special Special_CheckPartyPokerus
def_special sub_806E99C
def_special sub_80CAC28
def_special Special_ShakeScreen
def_special Special_StartGroudonKyogreBattle
def_special Special_StartLegendaryBattle
def_special Special_StartRegiBattle
@@ -331,13 +330,13 @@ gSpecials:: @ 815FD60
def_special DoFallWarp
def_special nullsub_75
def_special nullsub_75
def_special sub_80E5E70
def_special SetEReaderTrainerGfxId
def_special ScrSpecial_StartSouthernIslandBattle
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CAD54
def_special sub_80BFC14
def_special Special_GetSpeciesOfPartySlot_x8004
def_special IsSelectedMonEgg
def_special nullsub_75
def_special nullsub_75
def_special LoadPlayerBag
@@ -345,31 +344,31 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special HasAllKantoMons
def_special sub_80CAD7C
def_special Special_BufferMonOTNameAndCompareToPlayerName
def_special nullsub_75
def_special sub_80E759C
def_special Dummy_TryEnableBravoTrainerBattleTower
def_special GetNameOfEnigmaBerryInPlayerParty
def_special nullsub_75
def_special sub_810B82C
def_special ScrSpecial_StartMarowakBattle
def_special sub_80CA630
def_special sub_80CB7C4
def_special sub_80CBC5C
def_special Special_ForcePlayerOntoBike
def_special Special_ListMenu
def_special Special_ReturnToListMenu
def_special sub_80CADC4
def_special Special_SetVermilionTrashCans
def_special sub_805D1A8
def_special sub_80CB0A8
def_special Special_SampleResortGorgeousMonAndReward
def_special Special_CheckAddCoins
def_special GetDaycarePokemonCount
def_special sub_80CB63C
def_special sub_80CBD80
def_special Special_CloseElevatorCurrentFloorWindow
def_special Special_ForcePlayerToStartSurfing
def_special ScrSpecial_GetStarter
def_special sub_80CBDCC
def_special Special_SetSeenMon
def_special sub_810C444
def_special sub_80CC7B4
def_special ChangeBoxPokemonNickname
def_special sub_80CC2BC
def_special sub_80CC3CC
def_special Special_UpdateTrainerCardPhotoIcons
def_special Special_StickerLadyGetBragFlags
def_special sub_80CC524
def_special IsWirelessAdapterConnected
def_special sub_8115A24
@@ -389,7 +388,7 @@ gSpecials:: @ 815FD60
def_special GetNumLevelsGainedForRoute5DaycareMon
def_special TakePokemonFromRoute5Daycare
def_special ScrSpecial_SeaGallopFerry
def_special sub_80CC48C
def_special Special_PlayerPartyContainsSpecies
def_special Special_SetSomeVariable
def_special HelpSystem_BackupSomeVariable
def_special HelpSystem_RestoreSomeVariable
@@ -398,7 +397,7 @@ gSpecials:: @ 815FD60
def_special sub_811999C
def_special sp182_move_string
def_special sub_811390C
def_special sub_80CC4D4
def_special Special_GetMartClerkObjectId
def_special Special_BattleCardAction
def_special sub_8110AB4
def_special sub_8112364
@@ -415,7 +414,7 @@ gSpecials:: @ 815FD60
def_special IsNationalPokedexEnabled
def_special sub_815D9E8
def_special sub_814B504
def_special sub_80CC8CC
def_special Special_ItemIsTM_GetMoveName
def_special Special_DaisyMassageServices
def_special HelpSystem_Disable
def_special HelpSystem_Enable
@@ -426,31 +425,31 @@ gSpecials:: @ 815FD60
def_special sub_815EEB0
def_special sub_815EF5C
def_special sub_815F070
def_special sub_80CC974
def_special Special_PokemonLeagueLightingEffect
def_special sub_814EA7C
def_special sub_80CCB94
def_special sub_80CCCF8
def_special Special_CapeBrinkGetMoveToTeachLeadPokemon
def_special Special_HasLearnedAllMovesFromCapeBrinkTutor
def_special Special_Credits
def_special sub_8153810
def_special sub_809D764
def_special sub_809D8C0
def_special sub_8147500
def_special GetPlayerFacingDirection
def_special sub_80CCDFC
def_special sub_80CD008
def_special Special_DeoxysSound
def_special Special_SetDeoxysTriangleObjectPal
def_special sub_8147594
def_special sub_80CD034
def_special Special_BadEggInParty
def_special sub_815D834
def_special HasAllMons
def_special sub_80CD074
def_special sub_80CD098
def_special Special_PlayerIsNotInTrainerTowerLobby
def_special Special_BrailleCursorToggle
def_special sub_811B15C
def_special sub_80CD0F4
def_special Special_PlayerPartyContainsSpeciesWithPlayerID
def_special sub_809C4A8
def_special sub_81537C0
def_special sub_809C5FC
def_special sub_80CB328
def_special Special_InitElevatorFloorSelectMenuPos
def_special Special_ComputeLoreleiDollCollection
def_special sub_80CD1B4
def_special Special_LoopWingFlapSound
def_special CreateObedientEnemyMon
gSpecialsEnd::