diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2017-10-13 11:09:36 -0400 |
---|---|---|
committer | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-13 10:09:36 -0500 |
commit | 52db3ad5aa83ae70e06eae87f502b09fff55aecc (patch) | |
tree | 60f8af2ad4311a7b83455e5acf1a702e824757fa /asm/rom6.s | |
parent | 428dd0e0a8539b171fccc59ea717fda970a22e91 (diff) |
Decompile TV (#80)
* ClearTVShowData
* special_0x44
* DoTVShow (nonmatching because align)
* DoTVShowBravoTrainerPokemonProfile
* Update field names
* DoTVShowBravoTrainerBattleTower
* Renaming of struct fields
* sub_80EBFF4 and UpdateTVScreensOnMap
* SetTVMetatilesOnMap
* Power buttons for the TV screens on the map
* special_0x45
* sub_80EC18C
* special_0x4a
* ResetGabbyAndTy
* GabbyAndTyBeforeInterview
* GabbyAndTyAfterInterview
* Through IsTVShowInSearchOfTrainersAiring
* GabbyAndTyGetLastQuote
* GabbyAndTyGetLastBattleTrivia
* GabbyAndTySetScriptVarsToFieldObjectLocalIds
* InterviewAfter; use TVShow as a precursor for making the individual show structs anonymous
* Make TV structs anonymous within the union
* Move the TV union to its own subheader
* Move TV show enums to the global.tv.h subheader
* Funcion renaming
* Apply static attributes where able
* PutPokemonTodayCaughtOnAir
* sub_80EC8A4
* PutPokemonTodayFailedOnTheAir
* sub_80EC9E8, sub_80ECA10
* sub_80ECA38
* sub_80ECB00
* Put3CheersForPokeblocksOnTheAir
* PutFanClubSpecialOnTheAir
* ContestLiveUpdates_BeforeInterview
* Other before-interview Contest Live Updates functions
* ContestLiveUpdates_BeforeInterview_5
* InterviewAfter_BravoTrainerPokemonProfile
* BravoTrainerPokemonProfile_BeforeInterview1
* BravoTrainerPokemonProfile_BeforeInterview2
* Disassemble TV data
* Decompile TV data
* InterviewAfter_BravoTrainerBattleTowerProfile
* SaveRecordedItemPurchasesForTVShow
* PutNameRaterShowOnTheAir
* StartMassOutbreak
* PutLilycoveContestLadyShowOnTheAir
* InterviewAfter_FanClubLetter
* Rip TV strings
* InterviewAfter_RecentHappenings
* InterviewAfter_PkmnFanClubOpinions
* sub_80ED718
* EndMassOutbreak
* sub_80ED888
* sub_80ED8B4
* UpdateMassOutbreakTimeLeft
* sub_80ED950
* PutFishingAdviceShowOnTheAir
* through sub_80EDA80
* ewram and common syms are now fetched from the object files
* BSS symbols are taken from the tv.o file
* through sub_80EDC60
* sub_80EDCE8
* sub_80EDD78
* through sub_80EDE84
* nomatching sub_80EDE98
* sub_80EDFB4
* sub_80EE104
* sub_80EE104
* sub_80EE184
* sub_80EE2CC
* sub_80EE35C
* sub_80EE44C
* sub_80EE4DC
* sub_80EE5A4
* sub_80EE69C
* sub_80EE72C
* sub_80EE7C0
* sub_80EE818
* sub_80EE8C8
* sub_80EEA70
* sub_80EEB98
* sub_80EEBF4
* through sub_80EED60
* Functions relating to Pokemon News
* sub_80EEF6C
* GetPriceReduction
* IsPriceDiscounted
* sub_80EF120
* through sub_80EF370
* sub_80EF40C
* HasMixableShowAlreadyBeenSpawnedWithPlayerID
* TV_SortPurchasesByQuantity
* FindActiveBroadcastByShowType_SetScriptResult
* InterviewBefore
* through sub_80EF88C
* through sub_80EF93C
* through sub_80EFA24
* through TV_BernoulliTrial
* sub_80EFB58
* sub_80EFBA4
* sub_80EFBDC
* through sub_80EFD98
* ChangePokemonNickname
* ChangeBoxPokemonNickname
* sub_80EFF9C
* through player_id_to_dword
* CheckForBigMovieOrEmergencyNewsOnTV
* GetMomOrDadStringForTVMessage
* sub_80F01E8
* sub_80F0358
* sub_80F049C
* TV record mixing functions
* sub_80F06D0
* sub_80F0708 nonmatching
* through sub_80F0B24
* sub_80F0B64
* through sub_80F0C04
* sub_80F0C7C
* sub_80F0D60
* sub_80F0E58
* sub_80F0E84
* through sub_80F0F24
* sub_80F0F64
* sub_80F1208
* sub_80F1254
* sub_80F1290
* sub_80F12A4
* sub_80F14F8
* DoTVShowTodaysSmartShopper
* DoTVShowTheNameRaterShow
* DoTVShowPokemonTodaySuccessfulCapture
* DoTVShowPokemonTodayFailedCapture
* DoTVShowPokemonFanClubLetter
* DoTVShowRecentHappenings
* DoTVShowPokemonFanClubOpinions
* DoTVShowPokemonNewsMassOutbreak
* DoTVShowPokemonContestLiveUpdates
* DoTVShowPokemonBattleUpdate
* DoTVShow3CheersForPokeblocks
* DoTVShowInSearchOfTrainers
* Label GabbyAndTyData fields; remove ddump comments from data/text/tv.inc
* DoTVShowPokemonAngler
* DoTVShowTheWorldOfMasters; update RAM symbols and field names
* Decorate static functions
* DoTVShowTodaysRivalTrainer; region map enums
* TVDewfordTrendWatcherNetworkTextGroup
* DoTVShowHoennTreasureInvestigators
* DoTVShowFindThatGamer
* DoTVShowBreakingNewsTV
* DoTVShowSecretBaseVisit
* DoTVShowPokemonLotterWinnerFlashReport
* DoTVShowThePokemonBattleSeminar
* DoTVShowTrainerFanClubSpecial, DoTVShowTrainerFanClub
* DoTVShowSpotTheCuties
* DoTVShowPokemonNewsBattleFrontier
* DoTVShowWhatsNo1InHoennToday
* Helpers for DoTVShowSecretBaseSecrets
* DoTVShowSecretBaseSecrets
* DoTVShowSafariFanClub
* Finish decompilation of tv.s
* Some renaming
* Rename text group pointers
* revoke statis; pokenews enums
* Labels are number one
* Label all TV struct fields
* Make data/text/tv.inc more readable
* Split data/text/tv.inc
* Rename pokenews text pointers
* Frontier Symbol constants; indicate static rodata objects with 's' prefix
* Fix leading spaces/tabs
F*** CLion sometimes
* Fix inconsequential warning
Diffstat (limited to 'asm/rom6.s')
-rw-r--r-- | asm/rom6.s | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/asm/rom6.s b/asm/rom6.s index 2ed9d888e..6df7ea0f4 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -4121,7 +4121,7 @@ _081377BC: add r2, sp, 0x18 bl SetMonData adds r0, r4, 0 - bl sub_80EE5A4 + bl GetRibbonCount strb r0, [r5, 0x1] movs r7, 0x1 _0813780A: @@ -4629,7 +4629,7 @@ sub_8137C10: @ 8137C10 ldr r0, =gSpecialVar_0x8004 ldrh r0, [r0] bl sub_8137A98 - bl box_related_two__2 + bl ShowFieldMessage pop {r0} bx r0 .pool @@ -5399,13 +5399,13 @@ sub_8138240: @ 8138240 bl GetMultiplayerId lsls r0, 24 lsrs r7, r0, 24 - bl sub_8009FCC + bl GetLinkPlayerCount lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 cmp r4, r5 bcs _0813828A - ldr r0, =gUnknown_0858D144 + ldr r0, =gTVStringVarPtrs mov r8, r0 _08138262: cmp r7, r4 @@ -6378,7 +6378,7 @@ sub_8138AA4: @ 8138AA4 sub_8138AC0: @ 8138AC0 push {lr} ldr r0, =gStringVar4 - bl box_related_two__2 + bl ShowFieldMessage pop {r0} bx r0 .pool @@ -6537,7 +6537,7 @@ _08138BF6: thumb_func_start sub_8138C04 sub_8138C04: @ 8138C04 push {r4,lr} - bl sub_8139688 + bl GetIdxOfFirstPartyMemberThatIsNotAnEgg lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -7060,7 +7060,7 @@ sub_8138FEC: @ 8138FEC thumb_func_start sub_8139004 sub_8139004: @ 8139004 push {lr} - bl sub_8139688 + bl GetIdxOfFirstPartyMemberThatIsNotAnEgg lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -7084,7 +7084,7 @@ _0813902A: thumb_func_start sub_8139030 sub_8139030: @ 8139030 push {lr} - bl sub_8139688 + bl GetIdxOfFirstPartyMemberThatIsNotAnEgg lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -7108,7 +7108,7 @@ _08139056: thumb_func_start sub_813905C sub_813905C: @ 813905C push {lr} - bl sub_8139688 + bl GetIdxOfFirstPartyMemberThatIsNotAnEgg lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -7132,7 +7132,7 @@ _08139082: thumb_func_start sub_8139088 sub_8139088: @ 8139088 push {lr} - bl sub_8139688 + bl GetIdxOfFirstPartyMemberThatIsNotAnEgg lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -7156,7 +7156,7 @@ _081390AE: thumb_func_start sub_81390B4 sub_81390B4: @ 81390B4 push {lr} - bl sub_8139688 + bl GetIdxOfFirstPartyMemberThatIsNotAnEgg lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -7295,7 +7295,7 @@ RemoveScriptFieldObject: @ 81391AC thumb_func_start sub_81391D0 sub_81391D0: @ 81391D0 push {lr} - bl sub_8139688 + bl GetIdxOfFirstPartyMemberThatIsNotAnEgg lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -7479,7 +7479,7 @@ _08139342: thumb_func_start sub_8139348 sub_8139348: @ 8139348 push {lr} - bl sub_8139688 + bl GetIdxOfFirstPartyMemberThatIsNotAnEgg lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -7507,7 +7507,7 @@ sub_8139370: @ 8139370 movs r1, 0x1 mov r0, sp strb r1, [r0] - bl sub_8139688 + bl GetIdxOfFirstPartyMemberThatIsNotAnEgg lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -7519,7 +7519,7 @@ sub_8139370: @ 8139370 mov r2, sp bl SetMonData adds r0, r4, 0 - bl sub_80EE5A4 + bl GetRibbonCount lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 @@ -7538,7 +7538,7 @@ _081393B6: thumb_func_start sub_81393C8 sub_81393C8: @ 81393C8 push {lr} - bl sub_8139688 + bl GetIdxOfFirstPartyMemberThatIsNotAnEgg lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -7882,8 +7882,8 @@ _08139684: bx r0 thumb_func_end sub_8139668 - thumb_func_start sub_8139688 -sub_8139688: @ 8139688 + thumb_func_start GetIdxOfFirstPartyMemberThatIsNotAnEgg +GetIdxOfFirstPartyMemberThatIsNotAnEgg: @ 8139688 push {r4-r6,lr} bl CalculatePlayerPartyCount lsls r0, 24 @@ -7926,7 +7926,7 @@ _081396D8: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_8139688 + thumb_func_end GetIdxOfFirstPartyMemberThatIsNotAnEgg thumb_func_start sub_81396E0 sub_81396E0: @ 81396E0 @@ -8050,7 +8050,7 @@ sub_81397C4: @ 81397C4 cmp r1, r0 bls _081397E0 movs r0, 0 - bl sub_80EF340 + bl TV_PrintIntToStringVar b _08139862 .pool _081397E0: @@ -9094,7 +9094,7 @@ _0813A062: lsls r0, 2 adds r0, r7 ldr r0, [r0] - bl box_related_two__2 + bl ShowFieldMessage pop {r4-r7} pop {r0} bx r0 @@ -9996,7 +9996,7 @@ _0813A7C6: lsrs r0, 22 adds r0, r1 ldr r0, [r0] - bl box_related_two__2 + bl ShowFieldMessage pop {r0} bx r0 .pool @@ -10036,7 +10036,7 @@ sub_813A820: @ 813A820 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] - bl box_related_two__2 + bl ShowFieldMessage ldr r0, =0x00004031 adds r1, r4, 0 bl VarSet @@ -10056,7 +10056,7 @@ sub_813A854: @ 813A854 lsrs r0, 14 adds r0, r4 ldr r0, [r0] - bl box_related_two__2 + bl ShowFieldMessage pop {r4} pop {r0} bx r0 |