dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
5,207 Commits 4 Branches 0 Tags
49184cd799e083b3b612f216da68ccafeb2cfb4f
Commit Graph
74 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
PikalaxALT 724ffe14ee Merge pull request #1028 from jiangzhengwenjz/misc 
sync with pokefirered
 2020-04-27 19:38:38 -04:00
PikalaxALT a12de6e480 Merge pull request #1022 from GriffinRichards/doc-gcn 
Label GCN link flags field
 2020-04-14 15:54:34 -04:00
PikalaxALT c21175d6b8 Merge pull request #1023 from GriffinRichards/fix-decor 
Misc decoration gfx fixes
 2020-04-14 15:16:42 -04:00
PikalaxALT 8a31778733 Merge pull request #1021 from Brainface1/master 
Named some bike-related functions
 2020-04-12 13:30:04 -04:00
PikalaxALT ee1744865e Merge pull request #1014 from GriffinRichards/fix-png 
Re-export tileset anim pngs to use palettes
 2020-04-12 13:29:50 -04:00
PikalaxALT 7eaabab3f0 Merge pull request #1020 from GriffinRichards/doc-unkanim 
Give partial labels to unknown anims
 2020-04-10 14:07:23 -04:00
PikalaxALT c08b4ff3e1 Merge pull request #1019 from GriffinRichards/constants-party 
Add misc party constant usage
 2020-04-10 14:05:35 -04:00
PikalaxALT 8188615db8 Merge pull request #1018 from GriffinRichards/sync-util 
Sync link game util files
 2020-04-10 14:02:53 -04:00
PikalaxALT 384a7cdef8 Merge pull request #1011 from GriffinRichards/doc-avflag 
Minor player avatar doc
 2020-04-10 13:56:52 -04:00
PikalaxALT 6133c6b0af Merge pull request #1006 from AsparagusEduardo/UsingBattleAction 
Using Battle Action constants
 2020-04-10 13:56:25 -04:00
PikalaxALT 7d65645756 Merge pull request #1017 from pret/PikalaxALT-patch-1 
Bump devkitARM
 2020-04-04 16:22:58 -04:00
PikalaxALT 055d13fa38 Bump devkitARM 2020-04-04 16:09:36 -04:00
PikalaxALT 22fa4cb178 Merge pull request #1012 from jiangzhengwenjz/nonmatching 
resolve some naked functions
 2020-04-02 09:52:03 -04:00
PikalaxALT 3a0a4385f6 Merge pull request #1013 from Sewef/patch-2 
Two pokedex matching
 2020-04-02 07:46:37 -04:00
PikalaxALT f1cccc975b Merge pull request #1009 from Sewef/patch-1 
Fix 'AnimMovmentWaves' typo
 2020-03-27 09:52:31 -04:00
PikalaxALT c2d95be156 Merge pull request #1007 from GriffinRichards/fix-healloc 
Revert more porymap-breaking changes from #968
 2020-03-19 16:30:45 -04:00
PikalaxALT 33ecfb46e4 Merge pull request #1005 from GriffinRichards/fix-rme 
Revert city_zoom_tiles.png name
 2020-03-17 12:39:08 -04:00
PikalaxALT 39da49495d Merge pull request #1000 from GriffinRichards/doc-dex 
Document pokedex.c
 2020-03-17 10:43:57 -04:00
PikalaxALT 784e29352d Merge pull request #985 from mrgriffin/decoration 
Document decoration.c
 2020-03-17 10:39:37 -04:00
PikalaxALT 7a059c75a6 Merge pull request #968 from GriffinRichards/doc-regionmap 
Document some pokenav and region map
 2020-03-17 10:38:20 -04:00
PikalaxALT 08bced2cbb Merge pull request #999 from ProjectRevoTPP/patch-1 
Fix the source of pain and suffering for the last 2 years.
 2020-03-09 16:28:27 -04:00
PikalaxALT c805c4cc6f Merge pull request #995 from AsparagusEduardo/Ignore-mGBA-savestate 
Ignores mGBA's first savestate file.
 2020-03-06 13:11:50 -05:00
PikalaxALT b3244301b7 Merge pull request #994 from jiangzhengwenjz/nonmatching 
real match sub_8021A28
 2020-03-05 18:14:08 -05:00
PikalaxALT e26293448c Merge pull request #993 from jiangzhengwenjz/nonmatching 
real match sub_8027E30
 2020-03-05 16:39:00 -05:00
PikalaxALT 9259b378ef Merge pull request #991 from GriffinRichards/fix-eventticket 
Clarify event ticket flag names
 2020-03-03 16:15:27 -05:00
PikalaxALT 0eae6d0d07 Merge pull request #992 from GriffinRichards/fix-trainerbattle 
Minor fixes in trainer_battle.inc
 2020-03-03 15:56:28 -05:00
PikalaxALT da7e797236 Merge pull request #982 from jiangzhengwenjz/nonmatching 
real match sub_802C838
 2020-02-19 08:47:03 -05:00
PikalaxALT 39d70e364a Merge pull request #964 from PikalaxALT/combined_moves 
sCombinedMoves
 2020-02-01 13:10:03 -05:00
PikalaxALT de49445a79 Merge pull request #952 from PikalaxALT/real_match_8072308 
Match sub_8072308
 2020-01-10 17:39:18 -05:00
PikalaxALT 5f1c7c9e93 Bump travis to bionic (Ubuntu 18.04 LTS) 2019-12-18 13:03:00 -05:00
PikalaxALT 6efa51f8ad Bump discord invite 
New invite link points to landing channel
 2019-11-25 18:38:13 -06:00
PikalaxALT bab1458cb4 Merge pull request #898 from DizzyEggg/imgp 
Match ConvertImageProcessingToGBA
 2019-11-12 15:26:25 -05:00
PikalaxALT 00fc8ec98a Merge pull request #842 from PikalaxALT/song_vol 
Fix volume in mus_me_b_big.mid
 2019-10-17 11:47:20 -04:00
PikalaxALT 48e54ae387 Merge pull request #825 from GriffinRichards/ignore-lib 
Update .gitignore
 2019-10-02 13:43:59 -04:00
PikalaxALT cb528cb543 Merge pull request #821 from GriffinRichards/document-textinput 
Document text input strings
 2019-10-02 09:49:26 -04:00
PikalaxALT 0d13a85855 Merge pull request #822 from GriffinRichards/document-fieldspecials 
Document a few field specials
 2019-10-02 09:22:09 -04:00
PikalaxALT 9317d114a9 Merge pull request #823 from GriffinRichards/constants-strconv 
Use STR_CONV constants
 2019-10-02 09:18:48 -04:00
PikalaxALT 301822603e Merge pull request #802 from PikalaxALT/gflib 
Gflib and libagbsyscall
 2019-09-27 11:34:55 -04:00
PikalaxALT 3d9bad5558 Merge pull request #778 from GriffinRichards/document-eventscripts 
Document some of event_scripts.s
 2019-09-27 10:18:27 -04:00
PikalaxALT 1e1a4076f0 Merge pull request #798 from GriffinRichards/constants-baction 
Use misc battle constants
 2019-09-05 09:06:31 -04:00
PikalaxALT 5c7eac7134 Merge pull request #744 from PikalaxALT/remove_tutor_casts 
Remove unnecessary tutor learnset casts
 2019-09-04 16:51:06 -04:00
PikalaxALT 36723a235a Merge pull request #735 from garakmon/encounter_json 
Add Different Field Info to Wild Encounters JSON
 2019-09-04 16:50:39 -04:00
PikalaxALT a4270cfdae Merge pull request #779 from pret/deprecate-tools 
Deprecate build_tools.sh
 2019-09-04 16:45:34 -04:00
PikalaxALT 48b8d68872 Merge pull request #797 from PikalaxALT/common_syms 
Fix issue with ramscrgen invoke for some users
 2019-09-04 09:12:46 -04:00
PikalaxALT 1f4c88c952 Copy Berry Fix MB dism from FR (#777) 
* Copy Berry Fix MB dism from FR
 2019-09-03 15:33:11 -04:00
PikalaxALT 45767f9c00 Merge pull request #793 from DizzyEggg/patch-1 
Use item constant in pretty petal flower shop
 2019-08-30 05:56:17 -04:00
PikalaxALT 4663564e02 Merge pull request #775 from DizzyEggg/patch-9 
Fix modern
 2019-08-17 05:17:05 -04:00
PikalaxALT 4541b959b6 Deprecate build_tools.sh 2019-08-15 15:17:13 -04:00
PikalaxALT ca8048c300 Merge pull request #771 from aaaaaa123456789/master 
Fix Makefiles to account for the $CC and $CXX environment variables
 2019-08-06 20:16:36 -04:00
PikalaxALT 1bda9ef2f6 Merge pull request #769 from PikalaxALT/pokenav_unk_9 
Pokenav unk 9
 2019-08-06 12:49:03 -04:00
PikalaxALT 195137b001 Merge pull request #768 from PikalaxALT/pokenav_unk_8 
Finish pokenav_unk_8
 2019-08-05 15:21:20 -04:00
PikalaxALT 9beeba8424 Merge pull request #764 from GriffinRichards/document-varnames 
Document vars that are used and unnamed
 2019-08-05 11:59:53 -04:00
PikalaxALT f5e18718d9 Merge pull request #702 from PikalaxALT/pokenav_unk_2 
Pokenav unk 2
 2019-08-05 09:49:21 -04:00
PikalaxALT 1fc64b8582 Merge pull request #767 from DizzyEggg/pokenav_8 
More pokenav
 2019-08-05 08:21:36 -04:00
PikalaxALT 483e5173c9 Merge pull request #696 from SatoMew/master 
Make installation documentation more straightforward
 2019-08-04 21:16:41 -04:00
PikalaxALT fa5bfc1627 Merge pull request #766 from DizzyEggg/pokenav_10 
Decompile pokenav 10
 2019-08-04 11:07:10 -04:00
PikalaxALT 41e1f9b224 Merge pull request #763 from DizzyEggg/patch-8 
Fakematch sub_819A080
 2019-08-04 11:05:17 -04:00
PikalaxALT 0e4c9fb2c4 Merge pull request #757 from DizzyEggg/pok_jump 
Decompile pokemon jump + some non/fake matches
 2019-08-04 11:04:31 -04:00
PikalaxALT ce941e6f56 Merge pull request #762 from GriffinRichards/GriffinRichards-documentation 
Documenting MAPSEC use in pokenav match call data
 2019-08-03 11:10:42 -04:00
PikalaxALT 9f50c4fa80 Merge pull request #760 from ultima-soul/use_pokeblock_data 
Decompile use_pokeblock data
 2019-08-03 11:01:05 -04:00
PikalaxALT 3ca1a5d9b0 Merge pull request #761 from DizzyEggg/dodrio 
Decompile Dodrio berry picking
 2019-08-03 11:00:29 -04:00
PikalaxALT 370e9afb37 Merge pull request #746 from garakmon/navdata 
Pokenav Data
 2019-07-30 15:03:12 -04:00
PikalaxALT 520eeae678 Merge pull request #756 from camthesaxman/vram 
remove hardcoded VRAM addresses
 2019-07-30 15:00:05 -04:00
PikalaxALT 0aacbca46b Merge pull request #759 from DizzyEggg/fix_funcs 
Some nonmatchings and fakematches
 2019-07-30 14:58:32 -04:00
PikalaxALT 136da953d6 Merge pull request #753 from DizzyEggg/pokenav7 
Decompile some pokenav
 2019-07-27 14:55:00 -04:00
PikalaxALT bb07f06fc6 Fix "arm-none-eabi-gcc not found" error (#751) 2019-07-24 10:38:48 -04:00
PikalaxALT fd53bbc464 Merge pull request #750 from DizzyEggg/patch-7 
tilemap glitch gpu reg fix hopefully
 2019-07-23 15:42:41 -04:00
PikalaxALT 4d5c1ca03b Merge pull request #732 from PikalaxALT/modern_gcc 
Modernize code for compatibility with later releases of GCC
 2019-07-20 12:11:46 -04:00
PikalaxALT 58200616d5 Merge branch 'master' into trader 2018-05-04 17:45:50 -04:00
PikalaxALT 097da4e011 Merge branch 'master' into libc 2018-01-21 20:38:34 -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
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 2701191a76 Merge branch 'master' into unk_text_util_2 2017-10-02 22:09:29 -04:00
PikalaxALT abe72dca47 Merge branch 'master' into sub_81700F8 2017-09-17 23:42:43 -04:00