DizzyEggg
|
6cb1c4fd6e
|
fix merge conflicts, evo scene
|
2017-10-31 19:36:25 +01:00 |
|
DizzyEggg
|
51df918c04
|
evo scene file is done
|
2017-10-29 16:15:23 +01:00 |
|
DizzyEggg
|
e8903fb4dd
|
start workin on evo scene
|
2017-10-27 18:52:21 +02:00 |
|
DizzyEggg
|
2d14e6bb67
|
name one var
|
2017-10-27 13:29:18 +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 |
|
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
|
813b1bfd4a
|
label and do more work at player controller
|
2017-10-22 01:04:02 +02:00 |
|
Diegoisawesome
|
d2cf86bff9
|
Merge pull request #82 from PikalaxALT/mail
Decompile functions for reading mail
|
2017-10-20 13:22:56 -05: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 |
|
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 |
|