ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-19 13:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,095 Commits 1 Branch 0 Tags 235 MiB
881d222621
Commit Graph

752 Commits

Author SHA1 Message Date
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
31e0b468c7 move from raq scene to walda phrase 2017-10-20 20:46:26 +02: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
Diegoisawesome
ae5aa3c4df Merge pull request #86 from PikalaxALT/special_ptr_table 
Decompile special pointers
 2017-10-20 00:24:06 -05:00
PikalaxALT
7bc152e2ed Merge branch 'master' into mail 2017-10-19 18:45:38 -04: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
Diegoisawesome
8ceecd9fba Merge pull request #81 from DizzyEggg/decompile_rom3 
Decompile rom_3
 2017-10-19 12:40:56 -05:00
DizzyEggg
9ccc472b97 label some functions 2017-10-19 18:25:48 +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
U-User-PC\User
11f9a27640 decompiled up to sub_81C3D54 2017-10-18 19:25:08 -04:00
DizzyEggg
ee6bdc9068 more battle interface 2017-10-18 23:52:21 +02:00
DizzyEggg
7c24b03742 Merge branch 'master' into decompile_battle_interface 2017-10-18 23:05:55 +02:00
DizzyEggg
25a9c851cf more of battle interface done again 2017-10-18 23:05:14 +02: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
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
ebb2999c03 more of battle anim done 2017-10-14 23:37:44 +02:00
PikalaxALT
70eaf5d1be port def_special 2017-10-14 16:28:22 -04: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
DizzyEggg
20d158cf4a start decompiling emitters 2017-10-13 19:46:27 +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
PikalaxALT
cc84713249 sub_8121B1C 2017-10-13 11:47:17 -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
PikalaxALT
74c59af856 sub_8121A1C 2017-10-13 08:47:26 -04:00
DizzyEggg
b229a1c295 Merge branch 'master' into decompile_reshow_battle_screen 2017-10-13 12:18:32 +02:00
PikalaxALT
aa3af7a3a7 sub_81219F0 2017-10-12 23:05:36 -04:00
PikalaxALT
52af334b89 sub_81215EC 2017-10-12 22:59:01 -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
6dfe8ced2c ai switching basically done 2017-10-10 21:45:07 +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
U-User-PC\User
f6f81f34b1 decompiled up to sub_81C228C 2017-10-09 16:49:14 -04: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
Diegoisawesome
ae06c13e99 Add front pic anims with help from marijnvdwerf 2017-10-09 13:10:02 -05:00
U-User-PC\User
f438734192 fixing merge conflicts 2017-10-09 13:32:57 -04:00
U-User-PC\User
d361f7030a decompiled up to sub_81C20F0 2017-10-09 13:17:13 -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
7552caaadc placeholders for battle strings are done 2017-10-07 19:59:41 +02:00
DizzyEggg
db63fc1a09 battle message huge take off 2017-10-07 15:15:47 +02:00
ProjectRevoTPP
f383cb8354 update labels 2017-10-06 19:48:18 -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
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
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
U-User-PC\User
0a88d1042a decompiled up to sub_81C13B0 2017-10-03 15:42:28 -04:00
DizzyEggg
46fe1f441f giant battle handler is done wohohohhohoho 2017-10-03 21:35:27 +02: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
10c5a7a2dd Merge branch 'master' into sym_bss 2017-10-02 22:04:43 -04:00
DizzyEggg
db58d5e24a battle2 3500 C lines 2017-10-02 23:32:39 +02:00
PikalaxALT
74951e4312 Name pointer tables 2017-10-02 08:43:52 -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
Diegoisawesome
8982501b78 Extract baseroms from reset_rtc_screen 2017-10-01 13:03:51 -05:00
DizzyEggg
d4e1c417d3 Merge branch 'master' into decomp_battle2 2017-10-01 18:55:21 +02:00
DizzyEggg
1fcafaf35a more of battle2 done 2017-10-01 18:54:01 +02:00
Diegoisawesome
c9cad220de Extract baseroms from intro_credits_graphics.s 2017-10-01 03:08:19 -05:00
PikalaxALT
4d78e62fd9 Sanitize data/tilesets.s 2017-09-30 22:23:00 -04:00
PikalaxALT
a1ccd78218 Disassemble pointer tables in data/tileset.s 2017-09-30 22:16:51 -04: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
PikalaxALT
ef0b022707 BSS: src/main.o, src/dma3_manager.o 2017-09-30 09:32:46 -04: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
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
Diegoisawesome
6f22bf385d Extract baseroms from battle_anim_80FE840 2017-09-29 17:34:39 -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
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
DizzyEggg
69928d3904 battle 4 up to 0xE5 2017-09-27 23:43:45 +02:00
Diegoisawesome
ee777d7b17 Extract baseroms from title_screen 2017-09-27 00:51:09 -05: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
d18eaa3502 Extract baserom calls from intro.s 2017-09-26 18:13:58 -05:00
scnorton
d160ca4679 Merge branch 'master' into easy_chat 2017-09-26 18:24:39 -04:00
yenatch
3c8091393c Merge pull request #47 from PikalaxALT/split_data3 
Split data3
 2017-09-26 18:16:52 -04:00
DizzyEggg
d769ec1374 battle 4 up to a8 2017-09-26 22:39:59 +02:00
Diegoisawesome
6f230848f6 Add window_template_terminator macro 2017-09-25 20:24:14 -05:00
scnorton
b62b67e428 sub_811A4D0; constants for ezchat task data offsets 2017-09-25 17:30:49 -04:00
Diegoisawesome
d1efbcd282 Extract scattered baseroms and cleanup 2017-09-25 16:27:02 -05:00
scnorton
cdfdd2a29a sub_811A428 2017-09-25 17:22:51 -04:00
scnorton
3013d3726f Split data3b.s 2017-09-25 11:23:44 -04:00
PikalaxALT
0984461aeb Start decomp of easy_chat 2017-09-25 08:53:25 -04:00
DizzyEggg
52a951276f battle 4, up to x69 2017-09-25 00:09:13 +02:00
U-User-PC\User
40eb03542b decompiled up to sub_81C1040 2017-09-23 20:23:55 -04:00
DizzyEggg
898d0b20ad up to x50 2017-09-24 00:29:52 +02:00
ProjectRevoTPP
d740eabb3c merge 2017-09-23 15:02:32 -04: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
ProjectRevoTPP
2448426183 decompile field_special_scene.c 2017-09-22 22:45:47 -04:00
DizzyEggg
d5afb0c6e9 up to x48 and troubles 2017-09-22 21:33:49 +02:00
U-User-PC\User
ee277bff16 decompiled up to sub_81C0A50 2017-09-22 15:17:59 -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
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
yenatch
e7f91c65d9 Merge pull request #38 from PikalaxALT/battle_dome_cards 
Battle dome cards
 2017-09-20 22:41:18 -04:00
yenatch
b35935e3ef Merge pull request #39 from Diegoisawesome/master 
Extract baserom calls from various battle data files and crt0.s
 2017-09-20 22:24:38 -04:00
U-User-PC\User
70e0a357be why are these functions bullying me 2017-09-20 21:25:48 -04:00
PikalaxALT
942fbe87d4 Populate header, label as static whatever won't break things 2017-09-20 21:03:57 -04:00
PikalaxALT
d263750f19 remaining lilycove lady functions 2017-09-20 20:48:32 -04:00
PikalaxALT
faf844f332 through sub_818E880 2017-09-20 20:32:22 -04:00
PikalaxALT
c56b6fc9a4 sub_818E794 2017-09-20 20:24:22 -04:00
PikalaxALT
45d53d9242 Merge branch 'master' into lilycove_lady 2017-09-20 20:17:31 -04:00
PikalaxALT
25ffdf7342 sub_818E704 2017-09-20 20:16:11 -04:00
PikalaxALT
bf4319f25e sub_818E6B0 2017-09-20 20:08:05 -04:00
Diegoisawesome
9ed9f7de94 Finish renaming strings in strings.s 2017-09-20 16:46:59 -05:00
DizzyEggg
0c7555e237 SetMoveEffect functionally equivalent and close 2017-09-20 22:54:26 +02:00
PikalaxALT
7c8cbc6b88 SetLilycoveContestLady 2017-09-20 16:49:22 -04:00
PikalaxALT
44e75e1f03 through sub_818E570 2017-09-20 16:32:37 -04:00