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
This commit is contained in:
committed by
Diegoisawesome
parent
428dd0e0a8
commit
52db3ad5aa
70
asm/link.s
70
asm/link.s
@@ -1371,8 +1371,8 @@ _08009FC4:
|
||||
.pool
|
||||
thumb_func_end sub_8009FAC
|
||||
|
||||
thumb_func_start sub_8009FCC
|
||||
sub_8009FCC: @ 8009FCC
|
||||
thumb_func_start GetLinkPlayerCount
|
||||
GetLinkPlayerCount: @ 8009FCC
|
||||
push {lr}
|
||||
ldr r0, =gLinkVSyncDisabled
|
||||
ldrb r0, [r0]
|
||||
@@ -1392,14 +1392,14 @@ _08009FEC:
|
||||
_08009FF4:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8009FCC
|
||||
thumb_func_end GetLinkPlayerCount
|
||||
|
||||
thumb_func_start sub_8009FF8
|
||||
sub_8009FF8: @ 8009FF8
|
||||
push {r4-r7,lr}
|
||||
adds r6, r0, 0
|
||||
adds r5, r1, 0
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
movs r2, 0
|
||||
@@ -1442,7 +1442,7 @@ sub_800A03C: @ 800A03C
|
||||
thumb_func_start sub_800A040
|
||||
sub_800A040: @ 800A040
|
||||
push {lr}
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x4
|
||||
@@ -1546,7 +1546,7 @@ _0800A0EA:
|
||||
b _0800A22E
|
||||
.pool
|
||||
_0800A0FC:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0800A10E
|
||||
@@ -1572,12 +1572,12 @@ _0800A130:
|
||||
adds r5, 0x1C
|
||||
adds r6, 0x1
|
||||
_0800A134:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r6, r0
|
||||
blt _0800A120
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r7, r0
|
||||
@@ -1714,12 +1714,12 @@ _0800A266:
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
_0800A26C:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r4, r0
|
||||
bcc _0800A24C
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r6, r0
|
||||
@@ -1742,8 +1742,8 @@ _0800A298:
|
||||
.pool
|
||||
thumb_func_end sub_800A23C
|
||||
|
||||
thumb_func_start sub_800A2A4
|
||||
sub_800A2A4: @ 800A2A4
|
||||
thumb_func_start GetLinkPlayerTrainerId
|
||||
GetLinkPlayerTrainerId: @ 800A2A4
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, =gLinkPlayers
|
||||
@@ -1755,7 +1755,7 @@ sub_800A2A4: @ 800A2A4
|
||||
ldr r0, [r1]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_800A2A4
|
||||
thumb_func_end GetLinkPlayerTrainerId
|
||||
|
||||
thumb_func_start sub_800A2BC
|
||||
sub_800A2BC: @ 800A2BC
|
||||
@@ -2697,7 +2697,7 @@ _0800A9E2:
|
||||
lsrs r4, r0, 24
|
||||
adds r5, 0x1
|
||||
_0800A9EE:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r5, r0
|
||||
@@ -3044,7 +3044,7 @@ _0800AC96:
|
||||
thumb_func_start sub_800ACAC
|
||||
sub_800ACAC: @ 800ACAC
|
||||
push {r4,lr}
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
movs r3, 0
|
||||
@@ -3142,7 +3142,7 @@ _0800AD72:
|
||||
thumb_func_start sub_800AD88
|
||||
sub_800AD88: @ 800AD88
|
||||
push {r4,r5,lr}
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
movs r1, 0
|
||||
@@ -3239,7 +3239,7 @@ _0800AE46:
|
||||
thumb_func_start sub_800AE5C
|
||||
sub_800AE5C: @ 800AE5C
|
||||
push {r4,lr}
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
movs r1, 0
|
||||
@@ -9671,7 +9671,7 @@ _0800E1C8:
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
_0800E1E6:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
subs r0, 0x1
|
||||
@@ -9965,7 +9965,7 @@ _0800E428:
|
||||
ble _0800E3FC
|
||||
mov r4, r9
|
||||
_0800E434:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r4, r0
|
||||
@@ -10019,7 +10019,7 @@ _0800E4A6:
|
||||
adds r5, 0x1C
|
||||
adds r4, 0x1
|
||||
_0800E4AC:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r4, r0
|
||||
@@ -13627,7 +13627,7 @@ sub_80102B8: @ 80102B8
|
||||
bl sub_800FD14
|
||||
strh r4, [r5]
|
||||
_080102E6:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
movs r1, 0
|
||||
@@ -13734,7 +13734,7 @@ sub_8010390: @ 8010390
|
||||
b _0801041C
|
||||
.pool
|
||||
_080103CC:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
movs r1, 0x1
|
||||
@@ -15290,7 +15290,7 @@ _08011048:
|
||||
strb r0, [r1, 0x3]
|
||||
adds r4, 0x1
|
||||
_08011054:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r4, r0
|
||||
@@ -20950,12 +20950,12 @@ _08014138:
|
||||
adds r5, 0x1C
|
||||
adds r4, 0x1
|
||||
_08014152:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r4, r0
|
||||
blt _08014138
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x2
|
||||
@@ -21159,7 +21159,7 @@ sub_8014304: @ 8014304
|
||||
strh r1, [r0]
|
||||
ldr r0, =0x00004087
|
||||
bl VarSet
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
ldr r1, =gUnknown_03005DB8
|
||||
strb r0, [r1]
|
||||
bl GetMultiplayerId
|
||||
@@ -39697,7 +39697,7 @@ sub_801DDD0: @ 801DDD0
|
||||
strb r5, [r4, 0x16]
|
||||
movs r0, 0xFF
|
||||
strb r0, [r4, 0x1A]
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
strb r0, [r4, 0xD]
|
||||
bl GetMultiplayerId
|
||||
strb r0, [r4, 0x13]
|
||||
@@ -42285,7 +42285,7 @@ _0801F30A:
|
||||
movs r0, 0x1
|
||||
strh r0, [r4]
|
||||
_0801F30E:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r2, r0, 0
|
||||
@@ -42446,7 +42446,7 @@ _0801F448:
|
||||
ldrsh r0, [r4, r3]
|
||||
cmp r0, 0
|
||||
beq _0801F47C
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x2
|
||||
@@ -45504,7 +45504,7 @@ _08020C8E:
|
||||
b _08020CF8
|
||||
.pool
|
||||
_08020CAC:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
@@ -53271,7 +53271,7 @@ _08024B2C:
|
||||
_08024B6A:
|
||||
ldr r0, [sp, 0x10]
|
||||
strb r1, [r0]
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
mov r1, r8
|
||||
strb r0, [r1]
|
||||
bl GetMultiplayerId
|
||||
@@ -57700,7 +57700,7 @@ _08026EF6:
|
||||
adds r4, 0xC
|
||||
adds r5, 0x1
|
||||
_08026EFE:
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r5, r0
|
||||
@@ -59511,7 +59511,7 @@ _08027C76:
|
||||
thumb_func_start sub_8027D20
|
||||
sub_8027D20: @ 8027D20
|
||||
push {lr}
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
ldr r1, =gUnknown_02022C98
|
||||
ldr r1, [r1]
|
||||
adds r1, 0x24
|
||||
@@ -64891,7 +64891,7 @@ sub_802AA48: @ 802AA48
|
||||
sub_802AA60: @ 802AA60
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
movs r2, 0
|
||||
strb r0, [r4, 0x5]
|
||||
adds r1, r4, 0
|
||||
@@ -68775,7 +68775,7 @@ _0802C8A4:
|
||||
thumb_func_start sub_802C8AC
|
||||
sub_802C8AC: @ 802C8AC
|
||||
push {lr}
|
||||
bl sub_8009FCC
|
||||
bl GetLinkPlayerCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
|
||||
Reference in New Issue
Block a user