Phlosioneer
986d3d8b2f
Finish and polish new_game.c
...
Only one function is left undocumented. I tried to go into the assembly
to at least name it, but it clears fields in the save block that aren't
even documented yet.
2019-02-15 03:40:57 -05:00
Diegoisawesome
dfb896356c
Merge branch 'master' of github.com:pret/pokeemerald
2019-02-12 00:40:42 -06:00
Diegoisawesome
449fb25f23
Clear up misnamed time-based flags and functions
2019-02-12 00:40:34 -06:00
Phlosioneer
e75f45dbcf
Reverse engineered many of the multiplayer events
...
Some corrections to the way events are handled and identified.
2019-02-10 20:42:50 -05:00
Marcus Huderle
6f1d2b870c
Give proper names to dynamic map layouts
2019-02-09 09:57:30 -06:00
Marcus Huderle
6add3e1794
Document some battle dome stuff
2019-02-08 11:08:25 -06:00
Marcus Huderle
3a88ab831d
Document more battle pyramid
2019-02-07 11:51:03 -06:00
Marcus Huderle
29d6221935
Convert map data to JSON
2019-01-31 15:51:20 -06:00
Marcus Huderle
bd667102fa
Fix PetaburgCity map scripts label
2019-01-29 14:36:02 -06:00
Marcus Huderle
e43f341799
Cleanup link contest map scripts
2019-01-29 14:36:02 -06:00
Marcus Huderle
36a1825bbe
Document trainer approach funcs, and use movement type constants in scripts
2019-01-29 14:36:02 -06:00
Diegoisawesome
6b2dda422b
Merge branch 'master' of github.com:pret/pokeemerald
2019-01-27 00:11:44 -06:00
Diegoisawesome
7a60f36954
Clean up variable numbers mistakenly written as decimal
2019-01-27 00:11:32 -06:00
DizzyEggg
4e396207d3
document more of trainer card
2019-01-20 18:24:35 +01:00
DizzyEggg
c0bc01d301
Move some vars to C
2019-01-13 13:15:23 +01:00
Tetrable
30e7ac0dca
Fix merge conflicts
2019-01-03 02:28:18 +00:00
Marcus Huderle
e1092028ec
Decompile match_call.c
2019-01-02 19:46:15 -06:00
Tetrable
a3ebca4d81
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Tetrable
1e3da62d24
Finish off labelling flags
2019-01-02 21:12:43 +00:00
Diegoisawesome
af1e44befe
Continue porting roulette
2018-12-31 18:07:29 -06:00
Marcus Huderle
6e7bdb3ca4
Document misc field_specials things
2018-12-29 11:36:54 -06:00
Melody
6d556f8cf7
improve checkplayergender calls
...
clean up constant definitions
make tweaks from review
2018-12-28 08:22:21 -06:00
Marcus Huderle
dcbc8db6a3
Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)
2018-12-25 11:46:35 -06:00
Melody
c7971ecb20
improve event script object calls
2018-12-25 11:20:33 -06:00
Melody
1e87810414
document setweather calls
2018-12-24 16:23:58 -05:00
Diegoisawesome
81b38c00e4
Merge pull request #466 from melthelesbian/compare_macros
...
improve compare macros
2018-12-23 11:17:30 -06:00
Melody
55005f1588
improve call_if macros
2018-12-21 21:32:45 -05:00
Melody
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -05:00
DizzyEggg
ecee02816d
Merge with master
2018-12-20 22:53:08 +01:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff
...
Decompile / port fldeff_80F9BCC
2018-12-19 22:16:59 -06:00
Melody
5e6ceeb631
update applymovement to remove magic numbers
2018-12-19 14:08:01 -05:00
garak
e292d0ca83
Merge branch 'master' into fldeff
2018-12-16 20:05:31 -05:00
Meowsy
d3e32ab287
Rename Mauville Man text.
2018-12-10 15:50:10 -05:00
DizzyEggg
c2d8876174
Document PSS functions
2018-12-10 21:36:52 +01:00
garak
e1e2132a37
sync fldeff function names with pokeruby
2018-12-09 22:24:54 -05:00
DizzyEggg
6068495619
Document trainer battle scripts ( #430 )
2018-12-07 16:50:56 -06:00
Melody
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -05:00
Melody
bad5323642
cleans up trainer battle scripts
...
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
2018-12-02 15:08:19 -05:00
Melody
c557ac61ae
adds constants, cleans up callstd and msgbox code
...
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
2018-12-02 03:37:46 -05:00
DizzyEggg
4e37723288
Document Battle Pyramid
2018-11-18 17:52:22 +01:00
Slawter666
6fcf878e2f
Tidy up header files
2018-11-13 22:28:46 +00:00
Slawter666
1d46507110
Move field effects enum to defines
2018-11-13 14:19:04 +00:00
DizzyEggg
b5ea69cf74
Fix conflicts
2018-11-12 19:22:23 +01:00
Slawter666
1b895ff52c
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
2018-11-12 14:14:50 +00:00
DizzyEggg
d5abd7b696
Document Battle Pie
2018-11-12 14:36:31 +01:00
Diegoisawesome
18839a4872
Merge remote-tracking branch 'pret/master' into script_menu
2018-11-06 20:20:56 -06:00
Diegoisawesome
7dd4ed7060
r5/r6 swap on sub_80E2578
2018-11-05 14:45:54 -06:00
DizzyEggg
0bb51037d7
Finish frontier util
2018-11-01 21:31:10 +01:00
DizzyEggg
0ab27e44b1
more tower, fail
2018-10-21 20:13:12 +02:00
Slawter666
3d8874d919
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
2018-10-21 00:20:09 +01:00
garak
113a8d1efd
clean flags and remove temp macro
2018-10-19 14:59:18 -04:00
garak
1441ee6bc3
finish event object flags
2018-10-19 13:04:47 -04:00
garak
cb5981cdf2
name more event flags
2018-10-18 21:32:21 -04:00
garak
c27043bd3c
more event flags
2018-10-18 15:28:59 -04:00
garak
d1b7f32b0a
begin event flag names, add temporary hidden item macro
2018-10-17 22:07:23 -04:00
garak
7d88b9647f
Merge branch 'master' into event-flags
2018-10-17 12:30:45 -04:00
garak
ff97873c30
label temp flags, test replace script
2018-10-17 12:25:12 -04:00
Diegoisawesome
e75f0b4f80
Port/decompile field_control_avatar
2018-10-16 21:47:08 -05:00
Slawter666
1435c96b41
Further synchronisation
2018-10-17 01:11:44 +01:00
DizzyEggg
b4a42a6832
Decompile apprentice
2018-10-14 11:37:44 +02:00
DizzyEggg
7dac22314e
Decompile a bit of pokemon storarage system
2018-08-12 16:40:31 +02:00
Diegoisawesome
18d5186630
Merge remote-tracking branch 'garakmon/heal-loc-2'
2018-08-11 16:57:46 -07:00
Diegoisawesome
cb9127ccaf
Revert "Rename some specials"
...
This reverts commit 658f9351fe
2018-08-11 15:16:41 -07:00
Diegoisawesome
658f9351fe
Rename some specials
2018-08-11 14:59:43 -07:00
Diegoisawesome
b54793be91
Finish decompiling field_specials
2018-08-11 14:51:54 -07:00
garak
c3512e3b39
port larger heal location changes from poke ruby pr
2018-08-10 10:45:15 -04:00
Diegoisawesome
90896e38c9
Begin porting/decompiling field_specials
2018-08-08 01:37:12 -07:00
Marcus Huderle
5e00c0bfcf
Fix map constants
2018-06-20 19:54:21 -05:00
Marcus Huderle
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
Marcus Huderle
acc1a5d446
Get all map constants from include/ rather than constants/
2018-06-15 07:49:21 -05:00
Marcus Huderle
e01dd90bb3
Update applymovement actions to reflect movement action names
2018-06-13 18:19:19 -05:00
DizzyEggg
d1798d0ed9
decompile field tasks
2018-05-19 18:02:43 +02:00
PikalaxALT
cae0fb8ec2
through sub_81203FC
2018-05-02 16:57:34 -04:00
KDSKardabox
936bb5925a
Decompile dewford trend
2018-04-16 16:22:13 +05:30
Marcus Huderle
a5cd6e8ef4
Merge pull request #231 from KDSKardabox/master
...
Player PC
2018-03-28 21:45:24 -07:00
Marcus Huderle
d4c6ef7ae6
Merge pull request #227 from PikalaxALT/pokenav_match_call
...
Pokenav match call
2018-03-28 21:33:50 -07:00
Anders Løvig
57775a946d
Rename start menu functions
2018-03-28 21:09:27 +02:00
KDSKardabox
e7cf8e5c17
Start decompile player_pc
2018-03-12 13:56:20 +05:30
PikalaxALT
df128cbfed
Merge branch 'master' into pokenav_match_call
2018-03-02 21:49:09 -05:00
PikalaxALT
89847427e4
match_call_t; through sub_81D17E4
2018-03-02 08:44:33 -05:00
PikalaxALT
1616f998fc
Rename some flags relevant to the conditions under which Wattson becomes available for rematch
2018-02-26 08:42:15 -05:00
DizzyEggg
94b47c0686
decompile overworld
2018-02-14 00:58:22 +01:00
DizzyEggg
382442c4c8
start decompiling overworld.s
2018-02-12 15:01:43 +01:00
DizzyEggg
ae8e89a10d
move some pokemon data to c
2018-02-05 17:39:26 +01:00
DizzyEggg
f59eedb672
decompile hof pc
2018-01-21 20:45:43 +01:00
golem galvanize
59e1aacd26
DIEGO SEND HELP
2018-01-20 17:26:30 -05:00
golem galvanize
5a5eb4ff59
dumped most of pokenav.s
2018-01-15 23:38:10 -05:00
Diegoisawesome
2d04eb22ab
Split rom_81370FC and port function names
2017-12-28 02:09:11 -06:00
Diegoisawesome
8bd6f9319f
Continue extraction from battle_frontier_2
2017-12-23 03:47:03 -06:00
sceptillion
3c286feec6
Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs
2017-12-22 00:17:34 -08:00
sceptillion
96511dc214
use internal song names
2017-12-22 00:10:20 -08:00
Diegoisawesome
0403f6eea9
Merge remote-tracking branch 'Egg/decompile_use_pokeblock'
2017-12-21 16:19:50 -06:00
DizzyEggg
bcffcb0c1c
pokeblock merge conflicts
2017-12-21 23:12:36 +01:00
Marcus Huderle
173761a5a1
Port generic event script macros from pokeruby
2017-12-21 13:47:52 -06:00
Diegoisawesome
4307292f55
Merge remote-tracking branch 'Egg/kobold_fixes'
2017-12-21 11:42:10 -06:00
DizzyEggg
38af0f78ea
hopefully fix kobold PR
2017-12-19 20:52:52 +01:00
DizzyEggg
37a6e1b6c7
Merge branch 'master' of https://github.com/itskobold/pokeemerald into kobold_fixes
2017-12-19 20:09:28 +01:00
DizzyEggg
5744356989
decompile trainer see
2017-12-18 23:26:44 +01:00
DizzyEggg
cb229f56e8
fix pokeblock conflicts
2017-12-18 16:58:14 +01:00
DizzyEggg
54dccc8512
give batter script command names
2017-12-17 20:38:01 +01:00
DizzyEggg
f4ab21ee67
Merge branch 'master' into decompile_use_pokeblock
2017-12-16 11:42:59 +01:00
DizzyEggg
44abbae60b
nerge with master, fix conflicts
2017-12-16 01:08:55 +01:00
DizzyEggg
4351676749
decompile more of pokeblock.s
2017-12-16 00:08:23 +01:00
camthesaxman
9525fdd54d
convert more constants
2017-12-11 12:41:13 -06:00
camthesaxman
c681b482c2
convert more constants
2017-12-11 12:27:51 -06:00
DizzyEggg
646664ff29
battle setup file is decompiled
2017-12-01 21:25:13 +01:00
itskobold
40638a48e7
battle_frontier_1.s fix
...
sorted out most of the other raw pointers
2017-11-22 15:15:58 +00:00
itskobold
370e47beee
Merge branch 'master' of https://github.com/pret/pokeemerald
2017-11-17 09:25:40 +00:00
itskobold
46ee15b962
Getting myself organised
...
durr
2017-11-15 12:55:16 +00:00
itskobold
7c79b030e9
Merge branch 'master' of https://github.com/pret/pokeemerald
2017-11-15 12:42:18 +00:00
itskobold
2acab81713
Merge branch 'master' of https://github.com/pret/pokeemerald
...
also started fixing pointers in my dumps
2017-11-15 12:41:25 +00: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
2e40384fa2
Extract baseroms from event_scripts
2017-11-10 18:12:18 -06:00
Diegoisawesome
a6c30ba951
More file organization
2017-11-10 13:20:27 -06:00
Diegoisawesome
de8a058714
Extract more baseroms from maps
2017-11-10 02:52:05 -06:00
Diegoisawesome
29079c4b99
Dump numerous baseroms, begin moving data to proper files
2017-11-10 01:49:12 -06:00
Diegoisawesome
2d3044aaa6
Begin map dump cleanup
2017-11-09 19:38:57 -06:00
Diegoisawesome
f61810a8f9
Dump maps
2017-11-09 19:21:31 -06:00
Diegoisawesome
e6ef86e4b0
Update variable and flag names
2017-11-08 15:20:10 -06:00
DizzyEggg
bd56bb073f
start working on hall of fame
2017-11-05 12:05:07 +01:00
Diegoisawesome
49c88e6343
Merge branch 'master' of github.com:pret/pokeemerald into dump_maps
2017-10-27 02:02:36 -05:00
Diegoisawesome
17303d963e
More prep
2017-10-24 00:11:26 -05:00
Diegoisawesome
26f9776f6f
Fix some stuff
2017-10-23 22:18:35 -05:00
Diegoisawesome
c23a633a44
Prepare for dumping
2017-10-23 21:18:49 -05:00
PikalaxALT
7cf9693551
Decompile special pointers
2017-10-14 14:26:25 -04:00
Diegoisawesome
924c0c6b5a
Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd
2017-10-13 20:29:11 -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
Diegoisawesome
f1b6358047
Port/decomp scrcmd
2017-10-12 02:06:19 -05:00
DizzyEggg
1fcafaf35a
more of battle2 done
2017-10-01 18:54:01 +02:00
PikalaxALT
def827fcd4
Capitalize all gUnknown labels
2017-09-26 08:30:12 -04:00
scnorton
55bae5e8ad
data/script_menu.s
2017-09-25 14:47:44 -04:00
scnorton
5fbfc57304
Disassemble some pointers in data3_a1.s
2017-09-25 14:18:54 -04:00
Diegoisawesome
3d32be86fc
Continue baserom extraction
2017-09-19 14:12:51 -05:00
DizzyEggg
5f4c5e280c
berry.s decompiled
2017-09-13 11:16:26 +02:00
DizzyEggg
a2a66181fb
decompile script.s
2017-09-10 23:05:23 +02:00
DizzyEggg
b5fea95a46
finish event data
2017-09-02 22:31:37 +02:00
YamaArashi
a793e62d83
.s -> .inc
2016-11-01 08:29:13 -07:00
YamaArashi
231ea2f27c
base_emerald to baserom
2016-09-03 15:07:51 -07:00
YamaArashi
deb6d7c6ba
split data1.s
2016-09-03 10:20:06 -07:00
