ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 20:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,362 Commits 1 Branch 0 Tags 235 MiB
21619096da
Commit Graph

158 Commits

Author SHA1 Message Date
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
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
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
DizzyEggg
20d158cf4a start decompiling emitters 2017-10-13 19:46:27 +02:00
PikalaxALT
dea018323f Struct pointer in EWRAM 2017-10-13 12:05:18 -04:00
DizzyEggg
c78679ae66 rom3 decomp start 2017-10-13 17:22:50 +02: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
7fb4a54e39 Merge branch 'master' into decompile_battle_message 2017-10-09 13:58:24 +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
35bb9b02e3 ewram defines 2017-10-06 20:26:53 -04:00
ProjectRevoTPP
f383cb8354 update labels 2017-10-06 19:48:18 -04:00
DizzyEggg
19e2255c34 Merge branch 'master' into decomp_battle2 2017-10-06 17:07:56 +02:00
DizzyEggg
342e616d4b battle2 more and more and more 2017-10-06 00:12:01 +02:00
ProjectRevoTPP
e7175999f5 decompile braille_puzzles.c 2017-10-05 13:02:39 -04:00
DizzyEggg
d87d19cfe5 more battle2 done 2017-10-04 19:25:14 +02:00
DizzyEggg
aaa191f0d8 Merge branch 'master' into decomp_battle2 2017-10-04 11:18:50 +02:00
DizzyEggg
46fe1f441f giant battle handler is done wohohohhohoho 2017-10-03 21:35:27 +02:00
DizzyEggg
db58d5e24a battle2 3500 C lines 2017-10-02 23:32:39 +02:00
PikalaxALT
3ec4d98de9 Split palette and tileset_anims 2017-10-01 22:10:53 -04:00
DizzyEggg
1fcafaf35a more of battle2 done 2017-10-01 18:54:01 +02: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
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
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
bc3b4b4d9a battle 4 commands are decompiled 2017-09-28 15:34:21 +02:00
DizzyEggg
69928d3904 battle 4 up to 0xE5 2017-09-27 23:43:45 +02:00
DizzyEggg
d769ec1374 battle 4 up to a8 2017-09-26 22:39:59 +02:00
DizzyEggg
7bb0fcf182 merge with master and fix conflicts 2017-09-23 20:36:00 +02:00
DizzyEggg
601fc9e85b atk49 is matching baby WOHOHOHOHO 2017-09-23 20:13:45 +02:00
DizzyEggg
d5afb0c6e9 up to x48 and troubles 2017-09-22 21:33:49 +02:00
PikalaxALT
8d5250fdaa Merge branch 'master' into lilycove_lady 2017-09-20 23:02:17 -04:00
PikalaxALT
942fbe87d4 Populate header, label as static whatever won't break things 2017-09-20 21:03:57 -04:00
DizzyEggg
0c7555e237 SetMoveEffect functionally equivalent and close 2017-09-20 22:54:26 +02:00
DizzyEggg
28da80e19a battle 4 up to SetMoveEffect 2017-09-20 12:56:45 +02:00
PikalaxALT
d4d8f876e5 Merge branch 'master' into battle_dome_cards 2017-09-19 20:54:49 -04:00
DizzyEggg
b4875d82d5 more battle 4 2017-09-20 00:28:00 +02:00
PikalaxALT
7e157f2027 Decorate local EWRAM objects in battle_dome_cards.c as EWRAM 2017-09-18 22:50:21 -04:00
PikalaxALT
ee73040717 Merge branch 'master' into field_map_obj 2017-09-18 19:21:34 -04:00
scnorton
71b40f50c0 Merge branch 'master' into field_map_obj 2017-09-17 13:38:33 -04:00
DizzyEggg
a9a66b06ef start porting cam's port of battle3 2017-09-17 14:10:32 +02: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
scnorton
9f6a4be9f0 BerryTree 2017-09-15 14:26:01 -04:00
PikalaxALT
64ffa8f963 Merge branch 'master' into field_map_obj 2017-09-13 19:29:19 -04:00
DizzyEggg
5f4c5e280c berry.s decompiled 2017-09-13 11:16:26 +02:00
DizzyEggg
738e776630 more pokemon2 decomp 2017-09-11 22:28:36 +02:00
DizzyEggg
8e88f2790a pokemon2 get mon data troubles 2017-09-11 18:27:54 +02:00
DizzyEggg
5394435520 more of pokemon3 decompiled 2017-09-11 14:42:13 +02:00
DizzyEggg
154a70e228 start pokemon3 decomp 2017-09-11 11:35:41 +02:00
Diegoisawesome
ab189ecec5 Begin extracting baserom calls from data2.s 2017-09-11 00:40:47 -05:00
scnorton
79b19a36b8 UpdateFieldObjectCoordsForCameraUpdate 2017-09-10 15:35:21 -04: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
4d01d400a8 port lottery corner 2017-09-08 18:48:55 +02:00
DizzyEggg
a55c5925a6 label gMapHeader 2017-09-08 18:31:57 +02:00
PikalaxALT
341a4735bc RemoveFieldObjectsOutsideView 2017-09-07 16:09:59 -04:00
DizzyEggg
8bfdc42d0e name b message functions, split battle2 2017-09-07 16:35:25 +02:00
scnorton
e0216d6045 unref_sub_808D958 2017-09-06 18:26:37 -04:00
scnorton
6448563ede unref_sub_808D77C 2017-09-06 16:14:55 -04:00
DizzyEggg
d41cc4c8d0 clean a bit more ewram.txt 2017-09-06 22:01:43 +02:00
DizzyEggg
33ee3115ab add glink defines from pokeruby 2017-09-06 21:18:50 +02:00
DizzyEggg
b7d75cb615 split item effects and organize sym ewram 2017-09-06 21:11:10 +02:00
DizzyEggg
c6eacc9be5 start porting pokemon1 2017-09-06 17:19:08 +02:00
scnorton
1087d1c822 GetFieldObjectIdByLocalIdAndMapInternal; rename gUnknown_02037350 to gMapObjects 2017-09-06 10:48:51 -04:00
DizzyEggg
b6661e7736 name some pokemon and battle labels 2017-09-05 20:13:34 +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
DizzyEggg
92892d140a begin load_save.c 2017-09-04 18:26:39 +02:00
DizzyEggg
0b39bfb2c2 label a bit of battle transition 2017-09-04 13:46:03 +02:00
DizzyEggg
4bf54bfdd4 split roamer and decor inventories 2017-09-04 13:01:57 +02:00
DizzyEggg
5afd2d5bfb begin new save.c, label lots of things 2017-09-03 22:50:17 +02:00
DizzyEggg
d09f39e971 label battle animation unknowns 2017-09-03 20:13:23 +02:00
DizzyEggg
ddf85539c1 move ram save variables to C 2017-09-03 15:39:33 +02:00
DizzyEggg
907e281de6 decompile label more of item.s 2017-09-03 13:33:13 +02:00
DizzyEggg
b5fea95a46 finish event data 2017-09-02 22:31:37 +02:00
DizzyEggg
7a831c215e decompile decompress.s 2017-09-02 19:55:39 +02:00
DizzyEggg
7ecdcc5ed8 iwram and ewram vars to C 2017-09-02 17:32:34 +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
26bf61e06f start decompiling sprite.s 2017-09-02 00:21:11 +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
cb12aaec65 git commit -m "label sprite for real this time" 
git commit -m
 2017-09-01 22:29:13 +02:00
DizzyEggg
ee7580753b rename sprite labels 2017-09-01 19:43:26 +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
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