ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,982 Commits 1 Branch 0 Tags 235 MiB
3ceb43177d
Commit Graph

179 Commits

Author SHA1 Message Date
DizzyEggg
272b98da6c document party status summary 2018-06-28 21:06:32 +02:00
DizzyEggg
ab36efdaf4 document bounce effect 2018-06-20 23:07:51 +02:00
DizzyEggg
94752d4207 document battle bars 2018-06-19 00:43:15 +02:00
DizzyEggg
caa36b530a label and document battle windows 2018-06-17 16:48:58 +02:00
DizzyEggg
edf2ea45b1 merge with master 2018-03-01 10:12:35 +01:00
DizzyEggg
988f0b7e19 Merge branch 'master' into decompile_battle_link_817C95C 2018-03-01 01:01:18 +01:00
DizzyEggg
b846015343 more battle files cleaning 2018-03-01 00:59:52 +01:00
DizzyEggg
59ff4aec9b decompile and document battle tv 2018-02-27 20:40:09 +01:00
DizzyEggg
a9212eeb66 battle file more done and clean up tv 2018-02-27 18:13:28 +01:00
DizzyEggg
2fa00d01ee make it compile 2018-02-26 15:56:59 +01:00
DizzyEggg
1972303792 type and ability names to C 2018-02-26 14:29:17 +01:00
DizzyEggg
919f803214 correct move target defines 2018-02-26 13:24:46 +01:00
DizzyEggg
8ff9cb0ede give up for now 2018-02-26 11:45:47 +01:00
DizzyEggg
4a45b4de4e more work 2018-02-25 18:45:00 +01:00
DizzyEggg
9df5e16343 more battle labels 2018-02-08 12:13:29 +01:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
DizzyEggg
a10fd5a7c4 create more battle constants 2018-02-08 00:35:13 +01:00
DizzyEggg
caf9af321d get rid of unnecessary externs 2018-02-08 00:00:25 +01:00
DizzyEggg
1a32010f13 iwram common symbols to c 2018-02-07 23:21:51 +01:00
DizzyEggg
5ac6cc4860 move battle vars to c file 2018-02-07 22:53:40 +01:00
camthesaxman
c3dc14ba66 more renaming 2018-02-06 16:09:39 -06:00
camthesaxman
f78fa6aabf rename bank to battler 2018-02-05 19:46:59 -06:00
camthesaxman
b4bb562363 rename battle_2.c to battle_main.c 2018-01-16 16:15:02 -06:00
camthesaxman
c3c13d0acf more renaming 2018-01-16 15:12:38 -06:00
camthesaxman
157b88b6db identity -> position 2018-01-16 14:01:31 -06:00
DizzyEggg
4f950d698c dump battle animation scripts 2017-12-31 16:28:57 +01:00
DizzyEggg
7581218569 Merge branch 'master' into decompile_battle1 2017-12-19 17:37:53 +01:00
DizzyEggg
720bd555bc add constants trainers file 2017-12-17 21:19:08 +01:00
DizzyEggg
eb8055eb07 battle 1 is decompiled 2017-12-17 20:10:57 +01:00
DizzyEggg
bb82032208 battle setup review changes 2017-12-16 01:15:19 +01:00
DizzyEggg
44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
Cameron Hall
fd75493bc6
Merge pull request #129 from DizzyEggg/dumb_naming 
Name some battle labels
 2017-12-05 12:05:06 -06:00
DizzyEggg
790df7159e more battlescript labels 2017-12-03 00:47:21 +01:00
DizzyEggg
e10aea9a51 give some more labels to battle struct fields 2017-12-02 23:31:58 +01:00
DizzyEggg
c27f7a8131 start working on pokeball 2017-12-02 19:39:07 +01:00
DizzyEggg
d75e7ace1d label battle stuff 2017-12-02 14:08:55 +01:00
DizzyEggg
039c9f4bd8 merge with master 2017-12-01 21:27:29 +01:00
PikalaxALT
921011592c unsigned -> unsigned int; create header 2017-11-29 08:30:18 -05:00
DizzyEggg
10470ef536 start working on battle setup 2017-11-28 23:02:09 +01:00
DizzyEggg
9886eeb5d8 fix, rename, label battle labels and battlescripts 2017-11-26 13:26:58 +01:00
DizzyEggg
cc572f7c00 clear battle code and battlescripts 2017-11-26 11:55:17 +01:00
DizzyEggg
76f4a8b195 clean up and use names for printfromtable 2017-11-26 00:33:40 +01:00
DizzyEggg
9151a6d094 dump battlescripts, rename battlescripts 2017-11-25 18:42:31 +01:00
DizzyEggg
716590c165 one more battle label change 2017-11-12 17:11:06 +01:00
DizzyEggg
9febe24d9f label some battle struct fields 2017-11-12 17:06:31 +01:00
DizzyEggg
cd879d6f8a Merge branch 'battle4_fixes' into decompile_battle5 2017-11-12 16:46:44 +01:00
DizzyEggg
47a8c6c432 battle5 decompiled and renamed 2017-11-12 16:39:21 +01:00
DizzyEggg
b7fa10d01e Merge branch 'master' into battle4_fixes 2017-11-12 00:17:38 +01:00
DizzyEggg
7472d639cf match one function in battlescript cmds 2017-11-11 20:01:04 +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
DizzyEggg
5243285ab2 start working on battle 7 2017-11-02 18:19:49 +01:00
PikalaxALT
17fd3bccf7 Merge branch 'master' into secret_base 2017-11-01 23:39:54 -04:00
DizzyEggg
6cb1c4fd6e fix merge conflicts, evo scene 2017-10-31 19:36:25 +01:00
DizzyEggg
712ae56167 review change battle controllers 2017-10-31 18:04:08 +01:00
DizzyEggg
e8903fb4dd start workin on evo scene 2017-10-27 18:52:21 +02:00
PikalaxALT
fcaccb8501 through sub_80EA30C 2017-10-26 22:49:51 -04:00
DizzyEggg
1506184465 battle controller opponent is done 2017-10-26 23:12:48 +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
DizzyEggg
356eb34e32 undo revert 2017-10-23 14:40:22 +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
Diegoisawesome
88230e8d16 Merge pull request #91 from golemgalvanize/summary 
partially decompile pokemon_summary_screen
 2017-10-22 20:16:16 -05:00
DizzyEggg
26c79313d8 safari controller is done 2017-10-22 20:38:23 +02:00
DizzyEggg
df4e32a307 player battle controller is done 2017-10-22 18:43:15 +02:00
DizzyEggg
813b1bfd4a label and do more work at player controller 2017-10-22 01:04:02 +02:00
DizzyEggg
3d1c16523e start working on battle controllers, especially player 2017-10-21 17:32:35 +02:00
DizzyEggg
b65da491a9 merge with master, fix conflicts 2017-10-20 10:49:21 +02:00
DizzyEggg
36035518dc review battle anim changes 2017-10-20 00:01:17 +02:00
DizzyEggg
dee6133076 fix merge conflicts 2017-10-19 19:46:37 +02: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
6e56211f40 more of battle interface done 2017-10-18 21:42:00 +02:00
DizzyEggg
0ffc5652fd hp printing in healthboxes done I hope 2017-10-18 00:00:46 +02:00
DizzyEggg
4b45282dd3 start working on battle interface 2017-10-16 18:12:27 +02:00
DizzyEggg
ebb2999c03 more of battle anim done 2017-10-14 23:37:44 +02: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
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
DizzyEggg
b229a1c295 Merge branch 'master' into decompile_reshow_battle_screen 2017-10-13 12:18:32 +02: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
e382a73e9d merge branch master 2017-10-10 11:48:16 +02:00
U-User-PC\User
42f633cbf4 (un)fix battle.h 2017-10-09 16:00:18 -04: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
db63fc1a09 battle message huge take off 2017-10-07 15:15:47 +02:00
DizzyEggg
3cc20c7c3f battle 2 is done 2017-10-06 17:06:45 +02:00
DizzyEggg
342e616d4b battle2 more and more and more 2017-10-06 00:12:01 +02:00
DizzyEggg
d87d19cfe5 more battle2 done 2017-10-04 19:25:14 +02:00
U-User-PC\User
750937c58c fix battle.h 2017-10-03 16:10:18 -04:00
U-User-PC\User
1ae3d9b57b I hope this fixes merge conflicts 2017-10-03 15:54:19 -04: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
993d5e2a6a clean up declarations in src/palette.c 2017-10-01 21:50:58 -04:00
DizzyEggg
1fcafaf35a more of battle2 done 2017-10-01 18:54:01 +02:00
DizzyEggg
729f4e10ed start decompiling battle2 2017-10-01 01:12:42 +02:00
DizzyEggg
6d4d58a8a7 rename battle4 and battleai 2017-09-28 17:38:07 +02:00