ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,245 Commits 1 Branch 0 Tags 235 MiB
dbb9cdd424
Commit Graph

618 Commits

Author SHA1 Message Date
PikalaxALT
89b695278d Merge branch 'master' into heal_location 2017-11-15 09:01:56 -05:00
Diegoisawesome
ce0e5cbfe4 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps 2017-11-15 00:47:34 -06:00
Diegoisawesome
3fb2a488f9
Merge pull request #111 from DizzyEggg/decompile_battle5 
Decompile battle5
 2017-11-14 16:52:40 -06:00
Diegoisawesome
118bf4f4b1
Merge pull request #108 from DizzyEggg/decompile_starter_choose 
Decompile starter choose
 2017-11-14 16:41:53 -06:00
DizzyEggg
a972de7bca start working on daycare 2017-11-14 20:23:25 +01:00
DizzyEggg
516a5b2219 fix merge conflicts, review changes 2017-11-13 20:00:20 +01:00
Diegoisawesome
d1fe93bf4a
Merge pull request #105 from DizzyEggg/dump_things 
Get rid of a couple of baseroms
 2017-11-13 12:46:40 -06:00
DizzyEggg
3e1f3d0e1e recorded battle file is decompiled 2017-11-13 19:01:23 +01:00
DizzyEggg
c4674735d2 start working on recorded battle 2017-11-12 22:59:36 +01:00
DizzyEggg
47a8c6c432 battle5 decompiled and renamed 2017-11-12 16:39:21 +01:00
DizzyEggg
fa3691ca40 start pss 2017-11-11 14:45:08 +01:00
PikalaxALT
b92d85fd30 Decompile link data 2017-11-10 20:55:03 -05:00
PikalaxALT
50c1622507 Split link.s and link_rfu.s 2017-11-10 20:47:24 -05:00
Diegoisawesome
a6c30ba951 More file organization 2017-11-10 13:20:27 -06:00
Diegoisawesome
6ecad1a59d Organize map data 2017-11-10 12:39:00 -06:00
DizzyEggg
045e7d6382 split starter choose data 2017-11-08 20:53:39 +01:00
DizzyEggg
61408456e8 starter choose file is decompiled 2017-11-08 18:05:47 +01:00
PikalaxALT
fce326fbd4 through sub_8009414 2017-11-07 20:25:24 -05:00
DizzyEggg
a729e9838e move data to hall of fame c file 2017-11-06 18:41:32 +01:00
DizzyEggg
bd56bb073f start working on hall of fame 2017-11-05 12:05:07 +01:00
DizzyEggg
4d4d642285 dump berry blender and script menu 2017-11-04 22:40:36 +01:00
DizzyEggg
352102a07a Merge branch 'master' into decompile_battle_7 2017-11-04 16:12:45 +01:00
DizzyEggg
6c8155074b battle 7 is decompiled 2017-11-04 16:11:13 +01:00
PikalaxALT
ca2bc94c2b through sub_80E6BF8 2017-11-03 20:59:29 -04:00
DizzyEggg
5243285ab2 start working on battle 7 2017-11-02 18:19:49 +01:00
PikalaxALT
ab3b8cd51a Merge branch 'master' into heal_location 2017-11-02 07:59:29 -04:00
Diegoisawesome
af197ccd3b
Merge pull request #98 from PikalaxALT/bard_music 
Decompile bard music
 2017-11-01 23:18:10 -05:00
PikalaxALT
75262c1920 Merge branch 'master' into bard_music 2017-11-02 00:09:14 -04:00
PikalaxALT
6543d7f2d6 Merge branch 'master' into heal_location 2017-11-01 23:43:08 -04:00
PikalaxALT
8a4f0287da Merge branch 'master' into secret_base 2017-11-01 23:42:04 -04:00
Diegoisawesome
c71f6baa8c
Merge pull request #99 from PikalaxALT/math_util 
Meme Util
 2017-11-01 22:41:28 -05:00
PikalaxALT
17fd3bccf7 Merge branch 'master' into secret_base 2017-11-01 23:39:54 -04:00
PikalaxALT
9cfdc8b7e8 Merge branch 'master' into heal_location 2017-11-01 23:37:41 -04:00
PikalaxALT
22f6517423 Decompile remaining region map data 2017-11-01 23:21:07 -04:00
PikalaxALT
7eacb24cf7 Start ripping graphics/data for region_map 2017-11-01 21:10:47 -04:00
PikalaxALT
e3005e88c7 Decompile remaining functions in region_map 2017-11-01 00:34:57 -04:00
DizzyEggg
6cb1c4fd6e fix merge conflicts, evo scene 2017-10-31 19:36:25 +01:00
PikalaxALT
76bb397e83 region_map.c through sub_8122CF8 2017-10-29 19:33:53 -04:00
DizzyEggg
51df918c04 evo scene file is done 2017-10-29 16:15:23 +01:00
PikalaxALT
c0a229f108 Decompile field region map bg and window templates 2017-10-29 11:12:28 -04:00
PikalaxALT
0a060ae254 Start decompiling field_region_map 2017-10-29 10:38:25 -04:00
PikalaxALT
00f4bba6d8 Decompile heal location functions 2017-10-28 20:55:01 -04:00
PikalaxALT
6fcde15bb6 Decompile heal location data 2017-10-28 20:43:33 -04:00
PikalaxALT
6d3778948d finish math_util 2017-10-28 16:15:36 -04:00
PikalaxALT
f57776c74c through sub_8151574 2017-10-28 15:58:07 -04:00
PikalaxALT
607b7ac834 Decompile remaining bard music data 2017-10-28 10:42:12 -04:00
PikalaxALT
4ae9b1d9d0 Decompile Bard Sound structs 2017-10-28 10:27:28 -04:00
PikalaxALT
5da296e94e GetWordPhonemes; assign names and improve guess of types 2017-10-28 09:46:35 -04:00
PikalaxALT
002b394855 through sub_817C7F4 2017-10-28 09:05:40 -04:00
PikalaxALT
a5951592be Decompile data 2017-10-27 23:21:09 -04:00
PikalaxALT
4c274f6030 Last remaining function in secret base 2017-10-27 22:46:57 -04:00
DizzyEggg
e8903fb4dd start workin on evo scene 2017-10-27 18:52:21 +02:00
DizzyEggg
f4e134569f evo graphics file is done 2017-10-27 15:49:14 +02:00
DizzyEggg
0f992c8f5c begin working on evolution graphics 2017-10-27 14:59:55 +02:00
DizzyEggg
1506184465 battle controller opponent is done 2017-10-26 23:12:48 +02:00
DizzyEggg
a9bc67dbb0 recorded opponent controller is done 2017-10-25 18:59:07 +02:00
DizzyEggg
91b010299f start recorded opponent controller 2017-10-25 16:24:17 +02:00
DizzyEggg
3ece244246 wally controller is done 2017-10-24 21:45:41 +02:00
DizzyEggg
bffcd426cf link opponent controller is done 2017-10-24 15:25:20 +02:00
PikalaxALT
eb49cfcab2 sub_80E8AF0 2017-10-23 18:35:06 -04:00
DizzyEggg
1f3a867a0b battle link partner controller is done 2017-10-23 16:38:11 +02:00
DizzyEggg
356eb34e32 undo revert 2017-10-23 14:40:22 +02:00
DizzyEggg
5b05811dd9 start link partner controller 2017-10-23 14:24:54 +02:00
DizzyEggg
5b70307962 revert merge coz its bugged 2017-10-23 13:36:55 +02:00
DizzyEggg
7d1373e3fa Merge branch 'master' into decompile_battle_controllers 2017-10-23 13:33:32 +02:00
DizzyEggg
918625196e recorded player controller is done 2017-10-23 13:32:11 +02:00
DizzyEggg
aa7e97945b start recorded player controller 2017-10-23 11:24:58 +02:00
DizzyEggg
a8ea415c81 player partner controller is done 2017-10-23 11:07:36 +02:00
Diegoisawesome
88230e8d16 Merge pull request #91 from golemgalvanize/summary 
partially decompile pokemon_summary_screen
 2017-10-22 20:16:16 -05:00
PikalaxALT
c042e5148b Decoration + decoration_inventory (#89) 
* SetDecorationInventoriesPointers

* ClearDecorationInventories

* CheckHasDecoration

* DecorationAdd

* DecorationCheckSpace

* DecorationRemove

* sub_8161A38

* CountDecorations; Funcion renaming

* Disassemble decoration data structs, tilemaps, and descriptions

* sub_8126968

* sub_81269D4

* through sub_8126A88

* through sub_8126B2C

* sub_8126B80

* sub_8126C08

* sub_8126C48

* sub_8126CA4

* sub_8126D10

* sub_8126E44

* sub_8126E8C

* sub_8126F68

* sub_8127058

* sub_8127088

* sub_81270E8

* through sub_8127208

* through sub_8127268

* sub_8127284

* through sub_81272F8

* sub_8127330

* through sub_8127480

* sub_81274A0

* sub_8127500; makefile now tells scaninc to scan headers

* Actual real fix to mapfile being in build/emerald instead of wd

* through sub_812759C

* through sub_812764C

* through sub_8127744

* through sub_81277BC

* sub_81277E8

* sub_8127814

* through sub_81279C4

* through sub_8127ACC

* sub_8127B04

* sub_8127B54

* sub_8127B90

* sub_8127D38

* sub_8127E18

* sub_8127F68

* sub_8128060

* ConfigureCameraObjectForPlacingDecoration

* SetUpPlacingDecorationPlayerAvatar

* sub_812826C

* through sub_8128414

* through sub_81284F4

* sub_812853C

* sub_8128950

* through sub_8128AAC

* through sub_8128BBC

* c1_overworld_prev_quest

* sub_8128C64

* sub_8128CD4

* sub_8128D10

* sub_8128DB4

* through sub_8128E18

* through sub_8129068

* sub_8129088

* through sub_81291E8

* sub_812925C

* sub_81292D0

* sub_81292E8

* gpu_pal_decompress_alloc_tag_and_upload

* AddDecorationIconObjectFromIconTable

* GetDecorationIconPicOrPalette

* AddDecorationIconObjectFromFieldObject

* AddDecorationIconObject

* through sub_8129708

* sub_81297F8

* sub_81298EC

* SetUpPuttingAwayDecorationPlayerAvatar

* sub_8129ABC

* sub_8129B34

* sub_8129BCC

* through sub_8129C74

* through sub_8129D8C

* sub_8129E0C

* sub_8129E74

* sub_8129F20

* sub_8129FC8

* sub_812A040

* nonmatching sub_812A0E8

* through sub_812A22C

* sub_812A25C

* sub_812A2C4

* through sub_812A39C

* Remaining fns in decoration.s

* Decompile decoration headers

* Decompile all remaining decoration data that had already been disassembled

* Disassemble two data objects

* Suggest structure of list menu template

* decompile through decoration list menu template

* Disassemble decoration icon graphics table

* Rip icon gfx

* Decompile deco icon table

* Decompile more data related to drawing decorations

* Decompile gUnknown_085A7250 structs

* Decompile two sprite templates

* Decompile remaining data in decoration.s

* Decompile decoration ewram

* deco -> decor
 2017-10-22 17:55:07 -05:00
DizzyEggg
21f4995922 start player partner controller 2017-10-22 20:49:21 +02:00
DizzyEggg
26c79313d8 safari controller is done 2017-10-22 20:38:23 +02:00
DizzyEggg
f77dcef59d Merge branch 'master' into decompile_battle_controllers 2017-10-22 18:47:06 +02:00
DizzyEggg
df4e32a307 player battle controller is done 2017-10-22 18:43:15 +02:00
ProjectRevoTPP
821f1a6f4f Merge branch 'master' of https://github.com/pret/pokeemerald into clear_save_data_screen 2017-10-21 22:46:01 -04:00
Diegoisawesome
b8f23aa20d Merge branch 'master' of github.com:pret/pokeemerald 2017-10-21 20:20:52 -05:00
Diegoisawesome
667914075b Merge branch 'librfu-decomp' 2017-10-21 20:11:31 -05:00
shinyquagsire23
482b42a295 Split librfu into separate C files in its own directory, rfu_initializeAPI matching except for register differences 2017-10-21 13:46:41 -06:00
DizzyEggg
3d1c16523e start working on battle controllers, especially player 2017-10-21 17:32:35 +02:00
ProjectRevoTPP
ae53458622 decompile clear_save_data_screen. 2017-10-21 00:44:17 -04:00
Diegoisawesome
afd42c8e14 Merge pull request #92 from DizzyEggg/decompile_walda_phrase 
decompile walda phrase
 2017-10-20 14:01:40 -05:00
DizzyEggg
8c85a27346 walda phrase is done 2017-10-20 20:39:00 +02:00
Diegoisawesome
d2cf86bff9 Merge pull request #82 from PikalaxALT/mail 
Decompile functions for reading mail
 2017-10-20 13:22:56 -05:00
DizzyEggg
cda5c5f925 start working on walda phrase 2017-10-20 18:52:01 +02:00
DizzyEggg
b65da491a9 merge with master, fix conflicts 2017-10-20 10:49:21 +02:00
PikalaxALT
7bc152e2ed Merge branch 'master' into mail 2017-10-19 18:45:38 -04:00
DizzyEggg
dee6133076 fix merge conflicts 2017-10-19 19:46:37 +02:00
Diegoisawesome
8ceecd9fba Merge pull request #81 from DizzyEggg/decompile_rom3 
Decompile rom_3
 2017-10-19 12:40:56 -05:00
DizzyEggg
11bead31e9 battle interface is done 2017-10-19 15:28:41 +02:00
U-User-PC\User
d4532c70cb fix merge conflicts 2017-10-18 19:28:36 -04:00
DizzyEggg
7c24b03742 Merge branch 'master' into decompile_battle_interface 2017-10-18 23:05:55 +02:00
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
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
924c0c6b5a Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd 2017-10-13 20:29:11 -05:00
DizzyEggg
72ed861715 fix rom3 conflicts 2017-10-13 19:58:45 +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
32168adbc8 Remaining functions 2017-10-13 12:03:15 -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
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
PikalaxALT
8d31a46c6f sub_8121478 2017-10-12 15:59:43 -04:00
Diegoisawesome
f1b6358047 Port/decomp scrcmd 2017-10-12 02:06:19 -05:00
DizzyEggg
a3b62f43ee battle 9 is decompiled 2017-10-11 12:49:42 +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
DizzyEggg
eb59f15799 mergin and chill 2017-10-09 21:40:05 +02:00
Diegoisawesome
41db025975 Merge remote-tracking branch 'pret/master' into baserom_extraction 2017-10-09 13:32:26 -05:00
U-User-PC\User
f438734192 fixing merge conflicts 2017-10-09 13:32:57 -04:00
DizzyEggg
ab03b03c4b decompile reshow battle screen 2017-10-09 18:18:40 +02:00
DizzyEggg
9d4acb9635 some work on international string util 2017-10-09 15:40:08 +02:00
DizzyEggg
7fb4a54e39 Merge branch 'master' into decompile_battle_message 2017-10-09 13:58:24 +02:00
ProjectRevoTPP
a9d94cc5d6 decompile save_location.c 2017-10-08 22:21:34 -04:00
DizzyEggg
95e4ae06ce battle message decompiled and dumped 2017-10-08 14:54:51 +02:00
ProjectRevoTPP
f0775000a1 decompile diploma.c 2017-10-07 22:54:32 -04:00
DizzyEggg
db63fc1a09 battle message huge take off 2017-10-07 15:15:47 +02:00
ProjectRevoTPP
e38fd8347d use rodata for save_failed_screen 2017-10-06 21:59:47 -04:00
ProjectRevoTPP
4b4d9907a8 merge 2017-10-06 18:35:51 -04:00
ProjectRevoTPP
d0dfc758fc decompile save_failed_screen.c 2017-10-06 18:33:35 -04:00
DizzyEggg
7b88c7f2f0 move const data to battle files 2017-10-06 19:09:37 +02:00
DizzyEggg
19e2255c34 Merge branch 'master' into decomp_battle2 2017-10-06 17:07:56 +02:00
DizzyEggg
3cc20c7c3f battle 2 is done 2017-10-06 17:06:45 +02:00
ProjectRevoTPP
e7175999f5 decompile braille_puzzles.c 2017-10-05 13:02:39 -04:00
DizzyEggg
aaa191f0d8 Merge branch 'master' into decomp_battle2 2017-10-04 11:18:50 +02:00
Diegoisawesome
cfc70c9806 Extract baseroms from miscellaneous files 
Had to leave some unfinished due to complexity at the moment
 2017-10-04 02:38:25 -05:00
U-User-PC\User
1ae3d9b57b I hope this fixes merge conflicts 2017-10-03 15:54:19 -04:00
Diegoisawesome
d32ec8bf72 Merge pull request #59 from PikalaxALT/sym_bss 
BSS; decompile tileset_anims
 2017-10-03 01:26:01 -05:00
PikalaxALT
2701191a76 Merge branch 'master' into unk_text_util_2 2017-10-02 22:09:29 -04:00
PikalaxALT
df0b715207 Decompile data/tileset.s 2017-10-02 21:08:54 -04:00
PikalaxALT
3ec4d98de9 Split palette and tileset_anims 2017-10-01 22:10:53 -04:00
Diegoisawesome
ba758afc14 Extract baseroms from and combine fldeff_emotion and trainer_see 
Also extract from bike
 2017-10-01 14:48:29 -05:00
PikalaxALT
20ed9ad0ac Decompile asm/tileset.s into src/palette.c 2017-09-30 21:19:29 -04:00
DizzyEggg
729f4e10ed start decompiling battle2 2017-10-01 01:12:42 +02:00
Diegoisawesome
13017a3b19 Merge pull request #55 from DizzyEggg/decompile_metatile_behavior 
decompile metatile behavior
 2017-09-30 03:11:36 -05:00
Diegoisawesome
2a8ea4981e Merge pull request #54 from DizzyEggg/finish_pokemon2 
finish pokemon 2 file
 2017-09-30 03:04:15 -05:00
Diegoisawesome
f30b9eed2c Merge pull request #53 from DizzyEggg/decomp_save 
finish save.c
 2017-09-30 03:02:07 -05:00
Diegoisawesome
741c99cded Merge pull request #45 from DizzyEggg/decomp_battle4 
Decompile Battle 4
 2017-09-30 03:00:10 -05:00
Diegoisawesome
52a66f0d4c Merge pull request #50 from DizzyEggg/decomp_roamer 
decompile roamer
 2017-09-30 02:31:43 -05:00
DizzyEggg
2766bd78df split the second file 2017-09-30 09:22:59 +02:00
DizzyEggg
5d9d9c1423 split, rename for real this time 2017-09-30 09:11:48 +02:00
DizzyEggg
cd87f47c8a fix a bad file name 2017-09-30 09:01:21 +02:00
Diegoisawesome
88655144df Merge pull request #51 from DizzyEggg/decomp_money 
decompile money
 2017-09-30 01:56:21 -05:00
Diegoisawesome
7ffba45d0f Merge pull request #49 from Diegoisawesome/baserom_extraction 
Extract baseroms from intro.s and others
 2017-09-30 01:40:24 -05:00
DizzyEggg
f5387cf6b1 decompile metatile behav 2017-09-29 19:03:50 +02:00
DizzyEggg
5d56361973 finish pokemon 2 file 2017-09-29 11:02:18 +02:00
DizzyEggg
7b72c83762 finish save.c 2017-09-29 10:06:36 +02:00
DizzyEggg
e41b9cbbb3 decompile money 2017-09-29 00:11:42 +02:00
DizzyEggg
f1fe0c217d decompile roamer 2017-09-28 20:52:36 +02:00
DizzyEggg
6d4d58a8a7 rename battle4 and battleai 2017-09-28 17:38:07 +02:00
DizzyEggg
7273b8f262 battle 4 is all done 2017-09-28 16:51:24 +02:00
DizzyEggg
14fcc9ec20 merge with master and move to C 2017-09-28 16:32:23 +02:00
DizzyEggg
bc3b4b4d9a battle 4 commands are decompiled 2017-09-28 15:34:21 +02:00
ProjectRevoTPP
04c8eff882 merge 2017-09-27 00:48:11 -04:00
Diegoisawesome
14fc923503 Merge remote-tracking branch 'pret/master' into baserom_extraction 2017-09-26 22:21:38 -05:00
Diegoisawesome
825b8dffe1 Extract baserom calls from data2b_2.s and rename 2017-09-26 21:48:26 -05:00
scnorton
1d5ec895af Rename data/data3.s to data/daycare.s 2017-09-25 16:13:32 -04:00
scnorton
9cf6a05905 Split data3_a0_B 2017-09-25 16:09:44 -04:00
scnorton
a8a4a500ab split data3_a0_A 2017-09-25 15:27:54 -04:00
scnorton
bf9e2b7210 split data3_a1 2017-09-25 15:03:52 -04:00
scnorton
55bae5e8ad data/script_menu.s 2017-09-25 14:47:44 -04:00
scnorton
3013d3726f Split data3b.s 2017-09-25 11:23:44 -04:00
ProjectRevoTPP
d740eabb3c merge 2017-09-23 15:02:32 -04:00
yenatch
a57915fa5b Merge pull request #36 from DizzyEggg/decomp_egg_hatch 
Decompile Egg Hatch
 2017-09-23 13:50:55 -04:00
ProjectRevoTPP
2448426183 decompile field_special_scene.c 2017-09-22 22:45:47 -04:00
PikalaxALT
561d60342f Decompile data 2017-09-22 21:18:53 -04:00
PikalaxALT
293a506474 Merge branch 'master' into unk_text_util_2 2017-09-22 21:11:07 -04:00
PikalaxALT
aa64f61b84 Finish decomp of unk_text_util_2 2017-09-22 00:01:07 -04:00
PikalaxALT
15212c4f8d Font6Func 2017-09-21 23:43:13 -04:00
PikalaxALT
4e1c9920b2 Split data/data_emerald2.s 2017-09-21 13:51:32 -04:00
PikalaxALT
ab6a7d2d8c Split data/data_emerald.s 2017-09-21 13:28:02 -04:00
DizzyEggg
9ee9a20152 fix merge conflicts 2017-09-21 10:50:15 +02:00
PikalaxALT
27903a102b Merge branch 'master' into berry_fix_program 2017-09-20 23:18:20 -04:00
PikalaxALT
8d5250fdaa Merge branch 'master' into lilycove_lady 2017-09-20 23:02:17 -04:00
PikalaxALT
6f481cceb1 Decompile lilycove lady data 2017-09-20 22:52:42 -04:00
yenatch
e7f91c65d9 Merge pull request #38 from PikalaxALT/battle_dome_cards 
Battle dome cards
 2017-09-20 22:41:18 -04:00
PikalaxALT
63a25a34a7 Disassemble lilycove lady data 2017-09-20 21:42:14 -04:00
PikalaxALT
45d53d9242 Merge branch 'master' into lilycove_lady 2017-09-20 20:17:31 -04:00
U-User-PC\User
c2f1e2fe53 decompiled up to sub_81C0510 2017-09-20 15:07:24 -04:00
DizzyEggg
3919b7130b Fix merge conflicts 2017-09-20 13:12:43 +02:00
PikalaxALT
f43de6e582 Merge branch 'master' into lilycove_lady 2017-09-19 21:18:34 -04:00
PikalaxALT
54bd2c1781 Address review by diego 2017-09-19 21:10:30 -04:00
PikalaxALT
5fc2c964fb Merge branch 'master' into sub_81700F8 2017-09-19 21:00:24 -04:00
PikalaxALT
2c07b94e94 Merge branch 'master' into berry_fix_program 2017-09-19 20:55:05 -04:00
PikalaxALT
d4d8f876e5 Merge branch 'master' into battle_dome_cards 2017-09-19 20:54:49 -04:00
scnorton
e7e1938094 Start decompilation of lilycove_lady 2017-09-19 16:17:23 -04:00
scnorton
bff89725ec Add battle_dome_cards header to expose symbols as needed 2017-09-19 09:46:17 -04:00
DizzyEggg
148b995189 finish egg hatch, clean up headers 2017-09-19 14:27:46 +02:00
PikalaxALT
9e96bd540a Battle Dome Cards BEGIN 2017-09-18 19:39:20 -04:00
PikalaxALT
60f8369a89 Merge branch 'master' into berry_fix_program 2017-09-18 19:24:09 -04:00
PikalaxALT
ee73040717 Merge branch 'master' into field_map_obj 2017-09-18 19:21:34 -04:00
DizzyEggg
f255cbd7dc Merge branch 'master' into decomp_egg_hatch 2017-09-18 23:50:08 +02:00
scnorton
810bfffd12 data decomp 2017-09-18 15:10:25 -04:00
scnorton
0e2d84f24d Remaining functions 2017-09-18 14:07:34 -04:00
DizzyEggg
c253bf5e75 add important headers, const ptrs and egg hatch start 2017-09-18 18:36:05 +02:00
PikalaxALT
8604291b0f Start decomp 2017-09-18 09:23:06 -04:00
PikalaxALT
abe72dca47 Merge branch 'master' into sub_81700F8 2017-09-17 23:42:43 -04:00
PikalaxALT
16f2e40576 Fix naming conflicts 2017-09-17 23:42:44 -04:00
PikalaxALT
380858293e Merge branch 'master' into sub_81700F8 2017-09-17 22:58:57 -04:00
scnorton
6106bc93b3 Remove data/field_map_obj.s from data/data3.s 2017-09-17 17:33:25 -04:00
scnorton
70b1ad4857 Remaining functions 2017-09-17 15:33:26 -04:00
scnorton
71b40f50c0 Merge branch 'master' into field_map_obj 2017-09-17 13:38:33 -04:00
DizzyEggg
07c2a83827 Merge branch 'master' into decomp_battle3 2017-09-17 19:22:53 +02:00
DizzyEggg
75595f9b3d decompile battle 3 2017-09-17 17:14:32 +02:00
DizzyEggg
a9a66b06ef start porting cam's port of battle3 2017-09-17 14:10:32 +02:00
PikalaxALT
eb7e52d2a8 Deswiss the cheese 2017-09-16 22:44:47 -04:00
ProjectRevoTPP
a923091dec formatting 2017-09-16 21:35:02 -04:00
ProjectRevoTPP
16c05694fb split remaining rom files. 2017-09-16 21:32:37 -04:00
PikalaxALT
559833ccf6 Merge branch 'master' into field_map_obj 2017-09-16 15:41:54 -04:00
Diegoisawesome
5a74c0e913 Merge remote-tracking branch 'pret/master' 2017-09-16 14:24:47 -05:00
Cameron Hall
19d2d73c70 Merge pull request #28 from DizzyEggg/decomp_pokemon 
decompile pokemon1/2/3
 2017-09-16 14:14:50 -05:00
Diegoisawesome
3c63063831 Add missing file and rename data2.s to link.s 2017-09-16 14:08:47 -05:00
PikalaxALT
ee3dc1edda Some more functions, including some swiss-cheesing that got out of hand 2017-09-16 09:43:49 -04:00
Diegoisawesome
6ba1dc8169 Merge remote-tracking branch 'pret/master' 2017-09-16 03:21:42 -05:00
PikalaxALT
54c8580d34 rom_81700F8 2017-09-15 22:12:45 -04:00
PikalaxALT
64ffa8f963 Merge branch 'master' into field_map_obj 2017-09-13 19:29:19 -04:00
DizzyEggg
c80b76e85a Merge branch 'master' into decomp_berry 2017-09-13 18:24:59 +02:00
DizzyEggg
117f8a6abd Merge branch 'master' into decomp_pokemon 2017-09-13 18:24:01 +02:00
DizzyEggg
4c16bb5ee6 decompile util.s 2017-09-13 12:58:57 +02:00
DizzyEggg
5f4c5e280c berry.s decompiled 2017-09-13 11:16:26 +02:00
DizzyEggg
a83d07e1b3 Merge branch 'master' into decomp_berry 2017-09-13 10:03:07 +02:00
shinyquagsire23
dd316b28e0 Decompile up to ARM functions in librfu, split ARM interrupt functions into their own .s 2017-09-12 20:11:51 -06:00
DizzyEggg
c9603c40d8 Merge branch 'master' into decomp_pokemon 2017-09-12 23:02:08 +02:00
DizzyEggg
625b1b6949 start berry porting 2017-09-12 18:47:27 +02:00
DizzyEggg
154a70e228 start pokemon3 decomp 2017-09-11 11:35:41 +02:00
DizzyEggg
48239b6598 Merge branch 'master' into decomp_script 2017-09-11 09:22:10 +02:00
Diegoisawesome
ab189ecec5 Begin extracting baserom calls from data2.s 2017-09-11 00:40:47 -05:00
DizzyEggg
a2a66181fb decompile script.s 2017-09-10 23:05:23 +02:00
Diegoisawesome
a1368c545d Merge remote-tracking branch 'pret/master' 2017-09-09 20:54:41 -05:00
Diegoisawesome
f29fc55796 Cleanup bg.c 2017-09-09 20:52:33 -05:00
Diegoisawesome
001d1027e3 Finish bg.s, 6 nonmatching 2017-09-09 19:46:19 -05:00
DizzyEggg
10a525d5a0 decomp safari zone 2017-09-09 15:45:50 +02:00
DizzyEggg
3355389eab start coins decomp 2017-09-09 14:24:18 +02:00
DizzyEggg
307278374b start money.s decomp 2017-09-09 00:45:25 +02:00
DizzyEggg
44dbf4dea0 port pokemon size record 2017-09-08 22:23:14 +02:00
DizzyEggg
4d01d400a8 port lottery corner 2017-09-08 18:48:55 +02:00
DizzyEggg
ba1c066d57 new game fully decompiled 2017-09-08 16:46:37 +02:00
DizzyEggg
8bfdc42d0e name b message functions, split battle2 2017-09-07 16:35:25 +02:00
shinyquagsire23
f1216076d7 Begin librfu decompilation 2017-09-07 00:55:52 -06:00
DizzyEggg
cb9b14a3e5 split lilycove_lady 2017-09-06 22:27:17 +02:00
DizzyEggg
b7d75cb615 split item effects and organize sym ewram 2017-09-06 21:11:10 +02:00
DizzyEggg
0cc4cadd2f label pokemon2 and some box stuff 2017-09-06 18:34:18 +02:00
DizzyEggg
c6eacc9be5 start porting pokemon1 2017-09-06 17:19:08 +02:00
PikalaxALT
83dbdc0318 npc_clear_ids_and_state 2017-09-06 08:46:47 -04:00
DizzyEggg
e18241d8ec dumped a lot of strings 2017-09-05 17:04:11 +02:00
DizzyEggg
1680fc0b81 start start menu decomp 2017-09-05 13:01:24 +02:00
DizzyEggg
54b8306115 really clean up battle ai 2017-09-05 09:41:48 +02:00
Diegoisawesome
ea33650dc1 Begin disassembling bg.s 2017-09-04 21:18:52 -05:00
DizzyEggg
2702b0ec9b decomp calc dmg and clean up battle ai 2017-09-04 21:43:13 +02:00
DizzyEggg
92892d140a begin load_save.c 2017-09-04 18:26:39 +02:00
DizzyEggg
7ba62bcac8 split data battle controller files 2017-09-04 15:39:20 +02:00
DizzyEggg
1a9b1a45ca split battle rodata 2017-09-04 15:05:11 +02:00
DizzyEggg
0b39bfb2c2 label a bit of battle transition 2017-09-04 13:46:03 +02:00
DizzyEggg
a83501f3bc find pokemon animation and recorded 2017-09-04 13:23:40 +02:00
DizzyEggg
4bf54bfdd4 split roamer and decor inventories 2017-09-04 13:01:57 +02:00
DizzyEggg
75a94ce58e split and label 2017-09-04 12:22:04 +02:00
DizzyEggg
5afd2d5bfb begin new save.c, label lots of things 2017-09-03 22:50:17 +02:00
DizzyEggg
9dedb3a8bd split more battle buffer files 2017-09-03 18:58:40 +02:00
DizzyEggg
a3f602f17c begin save.s decomp, thanks revo! 2017-09-03 14:13:01 +02:00
DizzyEggg
50530b4666 begin decompiling item.s 2017-09-03 00:47:51 +02:00
DizzyEggg
e0725bca55 move variables to rtc.c 2017-09-02 23:37:06 +02:00
DizzyEggg
048700fe57 decompile rtc 2017-09-02 23:28:44 +02:00
DizzyEggg
b5fea95a46 finish event data 2017-09-02 22:31:37 +02:00
DizzyEggg
a4cc67008e begin event data 2017-09-02 21:43:53 +02:00
DizzyEggg
a47face8cf split battle buffer files 2017-09-02 20:56:53 +02:00
DizzyEggg
7a831c215e decompile decompress.s 2017-09-02 19:55:39 +02:00
DizzyEggg
591837e3c3 decompile sound.s 2017-09-02 17:03:46 +02:00
DizzyEggg
2089dd0f86 start labelling, decompiling sound.s 2017-09-02 16:03:53 +02:00
DizzyEggg
84240b1a5a sprite.c: move ewram, iwram, rom data 2017-09-02 13:11:19 +02:00
DizzyEggg
bc5acf7394 more splitting, move ewram sprite vars to C 2017-09-02 00:09:46 +02:00
DizzyEggg
449d546556 split some battle files 2017-09-01 23:40:13 +02:00
DizzyEggg
6987dd9a21 decompile text window 2017-09-01 19:01:58 +02:00
DizzyEggg
1d2be3c5e8 get rid of data window 2017-09-01 17:38:28 +02:00
DizzyEggg
7daeebd3f4 decompile window.s 2017-09-01 16:53:06 +02:00
DizzyEggg
6f03356237 begin working on pokeemerald 2017-08-31 16:48:24 +02:00
camthesaxman
cbe13acff1 split out battle_3.s 2017-07-29 15:18:01 -05:00
camthesaxman
16d30072cb fix the alignment, maybe? 2017-07-28 19:53:49 -05:00
Diegoisawesome
b95747dc69 Begin disassembling window.s 2017-03-29 19:02:15 -05:00
Diegoisawesome
5a8eeb353d Mostly decompile text.s 2017-03-27 19:30:49 -05:00
Diegoisawesome
20358c4c96 Begin disassembling text.s 2017-03-07 07:44:41 -06:00
Diegoisawesome
d12fd5c5ce Merge remote-tracking branch 'refs/remotes/pret/master' 2017-03-04 23:32:12 -06:00
Diegoisawesome
56f5e8bdab Disassemble palette.s 
All but two functions match.
 2017-03-04 22:43:34 -06:00
ProjectRevoTPP
afd45e9dd4 finish decompiling dma3_manager.c except for ProcessDma3Requests (#18) 2017-02-17 09:26:45 -08:00
ProjectRevoTPP
9a80b550f0 finish decompiling main.c (#17) 
* partially decompile battle_ai.c up to tai60_unk

* nonmatching tai60_unk

* decompile more of battle_ai.c

* formatting

* finish porting battle_ai.c

* formatting

* decompile up to nonmatching VBlankIntr

* finish decompiling main.c

* formatting
 2017-02-15 13:25:21 -08:00
YamaArashi
79c7922c23 remove asm/battle_ai.o from ld script 2017-02-03 18:39:54 -08:00
YamaArashi
e2b834d21d begin decompiling main.s 2017-02-03 16:44:06 -08:00
YamaArashi
8f9ed6e585 decompile rng 2017-02-02 16:30:30 -08:00
camthesaxman
bcff8d1b45 start decompiling battle_ai 2017-02-01 22:15:38 -06:00
YamaArashi
a0311c8f84 split more data 2017-01-15 22:56:19 -08:00
YamaArashi
0f27bfba8d split more code 2017-01-15 17:14:00 -08:00
YamaArashi
53935efc64 mostly finish string_util.c 2017-01-14 15:17:51 -08:00
YamaArashi
1268134668 decompile string_util 2017-01-14 14:20:49 -08:00
YamaArashi
dd0ed3d043 split out more data 2017-01-14 01:54:02 -08:00
YamaArashi
a74c6f8586 begin splitting data2 2017-01-14 00:53:26 -08:00
YamaArashi
ebf4c5ca76 decompile multiboot 2017-01-13 17:46:05 -08:00
YamaArashi
452bbe41cf port siirtc from pokeruby 2016-11-02 14:06:41 -07:00
Diegoisawesome
69c734c9a8 Ported libmks4agb from pokeruby (#12) 
* Port agb_flash from pokeruby

* use ramscrgen

* formatting

* delete ewram_syms.txt and iwram_syms.txt

* Finish port of agb_flash

* Ported libmks4agb from pokeruby

* Reordered declarations to match pokeruby
 2016-11-01 20:03:16 -07:00
Diegoisawesome
f5743c7d6f Ported libmks4agb from pokeruby 2016-11-01 21:48:22 -05:00
Diegoisawesome
2f6f3f8256 Port agb_flash from pokeruby (#11) 
* Port agb_flash from pokeruby

* use ramscrgen

* formatting

* delete ewram_syms.txt and iwram_syms.txt

* Finish port of agb_flash
 2016-11-01 16:04:03 -07:00
YamaArashi
652600ba5d use ramscrgen 2016-11-01 17:36:37 -05:00
Diegoisawesome
7dad2846f8 Port agb_flash from pokeruby 2016-11-01 14:15:48 -05:00
YamaArashi
734ec8dd51 use ramscrgen 2016-11-01 12:10:55 -07:00
YamaArashi
6f0e42a91a split asm files 2016-11-01 10:16:34 -07:00
Diegoisawesome
442002dada Ported libc from pokeruby 2016-11-01 10:17:40 -05:00
Diegoisawesome
4df1937738 Ported task.c and others from pokeruby 2016-10-31 09:43:17 -05:00
YamaArashi
deb6d7c6ba split data1.s 2016-09-03 10:20:06 -07:00
YamaArashi
8399f0af6b split data out of data2.s 2016-09-03 09:25:58 -07:00
YamaArashi
e215a4b6c5 RFU data section 2016-09-03 04:29:59 -07:00
YamaArashi
13a00040d7 eliminate libgcc.s 2016-09-03 04:11:10 -07:00
YamaArashi
c9b1c40b86 split out graphics data 2016-09-03 03:03:50 -07:00
YamaArashi
8866801ef9 make it build 2016-09-03 02:20:49 -07:00
YamaArashi
b12e80fc04 split asm/emerald.s 2016-09-03 01:11:14 -07:00
YamaArashi
9024595c93 split out files and add build batch file 2015-10-05 06:03:59 -07:00