Commit Graph

149 Commits

Author SHA1 Message Date
GriffinR
9140594b23
Merge branch 'master' into doc-littleroot 2019-11-08 03:07:50 -05:00
GriffinR
bef24a45f0 Document Littleroot scripts 2019-11-08 02:47:55 -05:00
GriffinR
35ed8de51b Fix Battle Colosseum names 2019-11-07 12:37:11 -05:00
GriffinR
09afa7992d Document Shoal Cave 2019-11-07 12:17:28 -05:00
GriffinR
3a00b66407 Document cave scripts 2019-11-07 07:57:51 -05:00
GriffinR
fbc3eee1f2 Document Fossil Maniac and Berry Master route houses 2019-11-06 17:01:23 -06:00
GriffinR
5ef300c10b Document dept store 2019-11-04 16:49:06 -06:00
GriffinR
5f1fcdd023 Document aqua/magma area scripts 2019-11-01 17:22:45 -05:00
GriffinR
8055548fa4 Document legendary scripts 2019-10-31 18:28:34 -05:00
Marcus Huderle
aad430c049 Document route 110 scripts 2019-10-26 12:55:53 -05:00
Marcus Huderle
13f9760187 Document route 109 scripts 2019-10-26 12:55:53 -05:00
GriffinR
f35a3f73b2 Document gabby_and_ty.inc 2019-10-26 09:32:04 -05:00
Marcus Huderle
83d0a87d0c Document several route scripts 2019-10-24 20:14:11 -05:00
GriffinR
7d24f2d62c Document record_mix.inc and clean surf.inc 2019-10-22 17:57:28 -05:00
GriffinR
ca2c6fa9b1 Document pc_transfer.inc 2019-10-22 17:57:28 -05:00
Marcus Huderle
4fd848e689 Document early route scripts 2019-10-22 16:47:19 -05:00
GriffinR
a7ffa96578 Rename mart_attendant to mart_clerk 2019-10-21 17:22:19 -05:00
GriffinR
c70162086b Split some smaller files from event_scripts 2019-10-21 17:22:19 -05:00
GriffinR
973e6f9667 Document mauville_man.inc 2019-10-21 17:21:53 -05:00
GriffinR
b4a9298205
Merge branch 'master' into document-gyms2 2019-10-16 04:22:34 -04:00
GriffinR
1b41b8b7ca Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms 2019-10-15 05:05:57 -04:00
GriffinR
928cdf2531
Merge branch 'master' into doc-inc2 2019-10-14 19:25:10 -04:00
GriffinR
30ef494163
Merge branch 'master' into doc-inc2 2019-10-13 15:44:07 -04:00
GriffinR
a081124a20
Merge branch 'master' into doc-inc 2019-10-13 15:26:44 -04:00
GriffinR
714b122da6 Fix indentation 2019-10-12 15:14:57 -05:00
GriffinR
1c99f5b7c9 Split text from cable_club.inc 2019-10-12 15:14:57 -05:00
GriffinR
1b7607bd91 Document cable_club.inc 2019-10-12 15:14:57 -05:00
GriffinR
9553ec1d28 Document mevent.inc 2019-10-07 10:34:12 -04:00
GriffinR
f179ab95c0 Document move tutors 2019-10-06 17:30:17 -04:00
GriffinR
749247b910 Convert 4 spaces in .inc to tab 2019-10-05 10:52:48 -04:00
GriffinR
67152b9242 Split off more files from event_scripts 2019-09-28 02:37:01 -04:00
GriffinR
12cc7ef34c Split more files from event_scripts 2019-09-27 14:20:51 -04:00
GriffinR
86f1f9066a Split some files from event_scripts 2019-09-27 12:22:58 -04:00
GriffinR
a180d2af49
Merge branch 'master' into document-eventscripts 2019-09-22 12:18:48 -04:00
GriffinR
275695c189 Document more script_menu, lilycove harbor 2019-09-19 17:27:34 -04:00
GriffinR
9fbcd552de document remainder of secret_base scripts, delete unneeded scripts.incs 2019-09-06 02:12:00 -04:00
GriffinR
1d703e786b move some data out of event_scripts, use game stat constants 2019-09-05 14:56:34 -04:00
GriffinR
6b04ea0727
Merge branch 'master' into document-eventscripts 2019-09-03 22:22:14 -04:00
tustin2121
82744ba636 Replace {STRING 5} with {KUN}
Since we already have the KUN placeholder, there's no need for this {STRING 5} stuff.

Also, it makes it easier to delete all the {KUN}s in hacks later on if desired.
2019-08-21 14:05:22 -04:00
GriffinR
ecf2097abb initial event_scripts documentation 2019-08-14 23:38:42 -04:00
garak
dfa3e079c0 finish pokenav data decomp 2019-07-19 22:57:33 -04:00
Phlosioneer
3b3b2dd031 General cleanup of the second half of contest.c 2019-04-03 20:43:23 -04:00
Phlosioneer
37c7441a15 Merge branch 'master' into contest-data 2019-03-31 20:22:47 -04:00
Fontbane
e8add87bf3 Document Field Effects and some related text
Also VAR_TRICK_HOUSE_LEVEL
2019-03-23 09:57:37 -05:00
Phlosioneer
88c3781880 Move text pointer tables into C 2019-03-08 22:33:40 -05:00
Marcus Huderle
231355f84d Decompile easy_chat data 2019-02-26 14:50:02 -06:00
ultima-soul
284751e761 Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present. 2019-01-06 13:41:18 -08:00
Slawter666
f8c2fcb9b2 Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base 2019-01-05 19:54:26 +00:00
Marcus Huderle
b471bba55e Use better names for match call texts 2019-01-02 19:46:15 -06:00
Marcus Huderle
e1092028ec Decompile match_call.c 2019-01-02 19:46:15 -06:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Diegoisawesome
ac3f4fd994 Continue documentation and cleanup of pokemon_summary_screen 2018-08-15 11:51:47 -07:00
DizzyEggg
df5009cb3e Move move descriptions to C 2018-08-12 00:03:19 +02:00
Diegoisawesome
7270e73fee Move strings to C 2018-07-25 01:15:36 -07:00
vblm12
3d04105488 Remove unnecessary files. 2018-07-21 01:51:44 -05:00
Slawter666
a04f8f6ee3 Convert item data files to .c (not compiling) 2018-04-23 21:44:46 +01:00
Anders Løvig
5bc8ee6465 Added static modifers 2018-03-28 15:45:35 +02:00
DizzyEggg
1972303792 type and ability names to C 2018-02-26 14:29:17 +01:00
golem galvanize
e1bd37dca9 fix merge conflicts 2018-02-13 22:19:14 -05:00
KDSKardabox
0ca0ad1c63 Decompile birch_pc.c 2018-02-12 15:42:15 +05:30
golem galvanize
601a942db4 decompile main_menu 2018-02-11 17:19:36 -05:00
Diegoisawesome
e3c366df64 Merge remote-tracking branch 'pret/master' 2017-12-15 00:08:48 -06:00
camthesaxman
c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
Diegoisawesome
f8402b3d74 Rename contest string symbols 2017-11-15 23:57:38 -06:00
Diegoisawesome
ce0e5cbfe4 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps 2017-11-15 00:47:34 -06:00
Diegoisawesome
6e6e11205d Fix capitalized symbol names 2017-11-11 18:17:46 -06:00
Diegoisawesome
f497c1508b Split files from event_scripts.s
Also move maps/scripts to scripts/maps
2017-11-11 16:10:17 -06:00
Diegoisawesome
431e737453 Final predump fixes 2017-10-27 00:26:34 -05: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
scnorton
810bfffd12 data decomp 2017-09-18 15:10:25 -04:00
YamaArashi
a793e62d83 .s -> .inc 2016-11-01 08:29:13 -07:00
YamaArashi
f5879e72d9 clean up aligns 2016-09-03 14:31:43 -07:00
YamaArashi
a11fe6f83b global labels 2016-09-03 01:17:20 -07:00
YamaArashi
9a8c780523 {next} -> \n 2016-09-02 21:59:16 -07:00
YamaArashi
1ad80dfe89 .charmapstr to .string 2016-09-02 19:56:47 -07:00
YamaArashi
7bef2a2783 convert comments (; -> @) 2016-09-02 19:51:16 -07:00
YamaArashi
6292ec87fc berry data table 2015-10-30 19:04:45 -07:00
YamaArashi
72f13c0b51 berry firmness strings 2015-10-30 10:34:16 -07:00
YamaArashi
b189af94cc use fewer easy chat macros 2015-10-16 21:58:26 -07:00
YamaArashi
22bafa45ca use macros for easy chat words 2015-10-16 17:32:39 -07:00
YamaArashi
8ce02b461e easy chat words by letter 2015-10-16 16:57:46 -07:00
YamaArashi
fc49fe46fd easy chat words 2015-10-16 12:33:20 -07:00
YamaArashi
009d9f877b easy chat group names 2015-10-15 00:50:43 -07:00
YamaArashi
dd8f08f8a8 some contest text 2015-10-14 13:17:58 -07:00
YamaArashi
15deec2511 dumped item data 2015-10-14 03:12:21 -07:00
YamaArashi
654b3eef7c preliminary dump of item effect data 2015-10-13 02:12:21 -07:00
YamaArashi
bfae72bf1d level up learnsets 2015-10-12 16:14:45 -07:00
YamaArashi
54183f2d07 pokemon base stats 2015-10-12 13:08:49 -07:00
YamaArashi
6c87e0143d item descriptions 2015-10-11 22:14:07 -07:00
YamaArashi
7b95d1ff81 pokedex data 2015-10-11 17:59:52 -07:00
YamaArashi
e67ef58403 ribbon descriptions 2015-10-11 14:30:45 -07:00
YamaArashi
7a16daf6ee add move descriptions 2015-10-11 11:16:52 -07:00
YamaArashi
63ee844510 ability descriptions 2015-10-11 03:06:48 -07:00
YamaArashi
5f550963fa nature names 2015-10-11 02:11:27 -07:00
YamaArashi
bc7f744daa ability names 2015-10-11 01:46:54 -07:00
YamaArashi
52c9f4a7dc type names 2015-10-11 01:20:41 -07:00
YamaArashi
1874db5e8a add trainer class names 2015-10-10 22:52:58 -07:00
YamaArashi
9fa2098029 add pokemon and move names, plus pokemon constants 2015-10-10 21:03:09 -07:00