summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-13Merge pull request #763 from GriffinRichards/sync-makefilePikalaxALT
Add shasum in addition to sha1sum
2020-02-12Restructure src/data/object_events and src/data/field_effectsMarcus Huderle
2020-02-12Use named C arrays for event obj movement dataMarcus Huderle
2020-02-12Sync with pret/pokeemerald:959GriffinR
2020-02-12Rename event_obj_lock to event_object_lockGriffinR
2020-02-12Fix event object include guards and constant filenamesGriffinR
2020-02-12Standardize Event Object to Object EventGriffinR
2020-01-10Merge pull request #771 from PikalaxALT/match_sub_8043740PikalaxALT
Match sub_8043740
2020-01-10Match sub_8043740PikalaxALT
2019-12-11Merge pull request #769 from pret/bump-discordPikalaxALT
Bump Discord invite
2019-11-25Bump Discord invitePikalaxALT
New invite points to newly-created landing channel
2019-11-09Use descriptive constant for ScriptGiveMon callThomas Winwood
2019-10-19Merge pull request #754 from camthesaxman/emerald_diffhuderlem
resolve more emerald differences
2019-10-16Sync specialvars with pokeemeraldGriffinR
2019-10-16Fix misnamed Mossdeep Gym metatilesGriffinR
2019-10-16remove empty groups from wild encounter fields json objectsgarak
2019-10-16add fishing rod groups to encounter jsongarak
2019-10-16Merge pull request #766 from GriffinRichards/sync-comparePikalaxALT
Sync compare behavior with pokeemerald
2019-10-16Set compare flag in configGriffinR
2019-10-16Update Travis to use compareGriffinR
2019-10-16Sync compare behavior with pokeemeraldGriffinR
2019-10-05Match sub_80C9720PikalaxALT
2019-10-02Merge pull request #757 from easyaspi314/debug-englishPikalaxALT
English Debug menu translations!
2019-10-02Merge branch 'master' into debug-englishPikalaxALT
2019-10-02Merge branch 'master' into emerald_diffPikalaxALT
2019-10-01Add shasum in addition to sha1sumGriffinR
2019-09-08Merge pull request #743 from garakmon/metatile_labelsPikalaxALT
Name Metatiles
2019-09-08Merge pull request #744 from garakmon/pokenav-dataPikalaxALT
Pokenav Data Decomp (take 2)
2019-09-08Merge pull request #753 from ultima-soul/synchronizePikalaxALT
Synchronize bard_music data organization with pokeemerald
2019-09-05Configure Travis to build nonmatching (#746)PikalaxALT
* Configure Travis to build nonmatching
2019-09-05Fix a mixup in the naming :(easyaspi314 (Devin)
2019-09-05Revert Makefile changes [for now] to avoid conflict with PikalaxALT:modern_gcceasyaspi314 (Devin)
2019-09-05Document some debug menu thingseasyaspi314 (Devin)
2019-09-05Merge pull request #755 from garakmon/encounter_jsonPikalaxALT
Wild Encounters to Json
2019-09-05Merge pull request #760 from PikalaxALT/match_currentPikalaxALT
Match sub_80D6874
2019-08-30Match sub_80D6874Scott Norton
2019-08-29name event object pointer indicesgarak
2019-08-29allow CRLF line endings in asm files for preprocgarak
2019-08-27Make DEBUG_TRANSLATE a makefile flageasyaspi314 (Devin)
2019-08-26Change data debug translations to use DEBUG_TRANSLATEeasyaspi314 (Devin)
I'd prefer a macro, but preproc currently comes first.
2019-08-26Mark some things in tomomichi_debug_menu.ceasyaspi314 (Devin)
2019-08-26Translate skipped Mail texteasyaspi314 (Devin)
2019-08-26Translate the Trainer card test nameeasyaspi314 (Devin)
2019-08-26Improve slot machine translation, make textbox largereasyaspi314 (Devin)
2019-08-25Fix some test menu translations, document unused functions and name stuffeasyaspi314 (Devin)
2019-08-25Improve a mori_debug_menu translationeasyaspi314 (Devin)
2019-08-25Replace asm("") with ++ --.easyaspi314 (Devin)
agbcc is weird
2019-08-25Improve some nohara translations.easyaspi314 (Devin)
2019-08-24Match and document DebugMenu_8077C3C (now DebugMenu_ConvertBuildDate)easyaspi314 (Devin)
It seems that simply putting an asm("") matched 8077C3C.
2019-08-24Rename old_charmap and move from graphics-de/unused to graphics/debug.easyaspi314 (Devin)
The debug battle text is in English on German ROMs and Japanese on English ROMs. Additionally, old_charmap.bin held the actual text. Weird. I also choose the English when DEBUG_TRANSLATE is on.