Commit Graph

974 Commits

Author SHA1 Message Date
DizzyEggg
4b45282dd3 start working on battle interface 2017-10-16 18:12:27 +02:00
DizzyEggg
003a8a501b fix merge conflict 2017-10-15 23:27:27 +02:00
DizzyEggg
dd0f19476c battle anim file is decompiled 2017-10-15 23:21:59 +02:00
DizzyEggg
ebb2999c03 more of battle anim done 2017-10-14 23:37:44 +02:00
PikalaxALT
70eaf5d1be port def_special 2017-10-14 16:28:22 -04:00
PikalaxALT
7cf9693551 Decompile special pointers 2017-10-14 14:26:25 -04:00
DizzyEggg
752ce9b90d start working on battle anim 2017-10-14 16:55:25 +02:00
PikalaxALT
a252140f3b Merge branch 'master' into mail 2017-10-14 09:52:56 -04:00
DizzyEggg
455202eca0 Merge branch 'master' into decompile_rom3 2017-10-14 11:36:28 +02:00
DizzyEggg
14e41d6c50 rom3 is decompiled 2017-10-14 11:34:26 +02:00
Diegoisawesome
0d38d443b5 Merge pull request #84 from Diegoisawesome/decomp_scrcmd
Decomp scrcmd
2017-10-14 00:05:50 -05:00
Diegoisawesome
924c0c6b5a Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd 2017-10-13 20:29:11 -05:00
Diegoisawesome
2852f4f1b8 Continue attempt to decomp braillemessage 2017-10-13 19:48:09 -05:00
Diegoisawesome
f6af9e7013 Merge pull request #77 from DizzyEggg/match_abe
ABE
2017-10-13 13:30:46 -05:00
DizzyEggg
72ed861715 fix rom3 conflicts 2017-10-13 19:58:45 +02:00
DizzyEggg
20d158cf4a start decompiling emitters 2017-10-13 19:46:27 +02:00
Diegoisawesome
3040c1e1aa Merge pull request #75 from DizzyEggg/decompile_reshow_battle_screen
Decompile reshow battle screen
2017-10-13 12:42:42 -05:00
PikalaxALT
1112af4e19 Field labels 2017-10-13 12:19:51 -04:00
PikalaxALT
dea018323f Struct pointer in EWRAM 2017-10-13 12:05:18 -04:00
PikalaxALT
32168adbc8 Remaining functions 2017-10-13 12:03:15 -04:00
PikalaxALT
cc84713249 sub_8121B1C 2017-10-13 11:47:17 -04:00
DizzyEggg
c78679ae66 rom3 decomp start 2017-10-13 17:22:50 +02:00
PikalaxALT
e24f3808f4 Merge branch 'master' into mail 2017-10-13 11:16:34 -04:00
PikalaxALT
52db3ad5aa 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
2017-10-13 10:09:36 -05:00
PikalaxALT
74c59af856 sub_8121A1C 2017-10-13 08:47:26 -04:00
DizzyEggg
0f44747788 review changes 2017-10-13 12:25:32 +02:00
DizzyEggg
b229a1c295 Merge branch 'master' into decompile_reshow_battle_screen 2017-10-13 12:18:32 +02:00
PikalaxALT
3c4478b370 Decompile data 2017-10-13 00:11:55 -04:00
Diegoisawesome
24bd8c73e1 Name some new script commands 2017-10-12 22:34:58 -05:00
PikalaxALT
aa3af7a3a7 sub_81219F0 2017-10-12 23:05:36 -04:00
PikalaxALT
52af334b89 sub_81215EC 2017-10-12 22:59:01 -04:00
Diegoisawesome
428dd0e0a8 Merge branch 'DizzyEggg-decompile_battle_9' 2017-10-12 20:00:38 -05:00
Diegoisawesome
df04aca8d2 Merge branch 'decompile_battle_9' of https://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_battle_9 2017-10-12 19:46:39 -05:00
Diegoisawesome
9ac5f464fd Merge branch 'DizzyEggg-qwerty2' 2017-10-12 17:55:38 -05:00
Diegoisawesome
3131014b1b Merge branch 'qwerty2' of https://github.com/DizzyEggg/pokeemerald into DizzyEggg-qwerty2 2017-10-12 17:55:10 -05:00
PikalaxALT
8d31a46c6f sub_8121478 2017-10-12 15:59:43 -04:00
Diegoisawesome
f300f853c8 Add const qualifiers to scrcmd 2017-10-12 14:39:18 -05:00
DizzyEggg
4178e32ec9 ABE is matching 2017-10-12 17:49:24 +02:00
Diegoisawesome
f1b6358047 Port/decomp scrcmd 2017-10-12 02:06:19 -05:00
yenatch
08274c04c0 Merge pull request #70 from ProjectRevoTPP/use_build
use build/.
2017-10-11 23:47:42 -04:00
Diegoisawesome
31eeff9319 Use less cd and more vars 2017-10-11 23:37:30 -04:00
DizzyEggg
a3b62f43ee battle 9 is decompiled 2017-10-11 12:49:42 +02:00
DizzyEggg
6dfe8ced2c ai switching basically done 2017-10-10 21:45:07 +02:00
DizzyEggg
57e5624e06 battle9 is being worked on 2017-10-10 18:01:45 +02:00
DizzyEggg
e382a73e9d merge branch master 2017-10-10 11:48:16 +02:00
ProjectRevoTPP
f1d07acc48 Merge branch 'master' of https://github.com/pret/pokeemerald into use_build 2017-10-09 20:25:41 -04:00
ProjectRevoTPP
6d66081be0 minor tweak to make tidy. 2017-10-09 20:25:34 -04:00
Diegoisawesome
8914645231 Merge pull request #72 from DizzyEggg/fix_static_names
Add Save Location header and fix static names
2017-10-09 18:17:04 -05:00
Diegoisawesome
6c28abf5dd Merge pull request #71 from DizzyEggg/match_sth
Match all nonmatching functions in battle ai commands
2017-10-09 18:16:16 -05:00
Diegoisawesome
3e72d67487 Merge pull request #65 from DizzyEggg/decompile_battle_message
Decompile battle message
2017-10-09 16:42:21 -05:00