summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-13Merge pull request #401 from SethBarberee/emerald_backport_1GriffinR
Backport 2 nonmatching fixes from emerald
2021-03-12backport 2 nonmatching fixes from emeraldSeth Barberee
2021-03-12Fix Son/Daughter name swapGriffinR
2021-03-11Merge pull request #399 from Deokishisu/patch-1000GriffinR
Fix Typos / Use Box Constants / Name an Unknown
2021-03-10Update calcrom ignore pathGriffinR
2021-03-10Use NONMATCHING on modern for gcc-arm-none-eabiGriffinR
2021-03-10Sync Berry Fix makefiles with pokeemeraldGriffinR
2021-03-10Replace Travis CI with Github workflowGriffinR
2021-03-10Use GENDER_COUNT Constants & Rename an Unknown in field_player_avatar.cDeokishisu
`gUnknown_835B882` has been cleaned up and renamed to `sPlayerAvatarGfxToStateFlag` to match pokeemerald.
2021-03-10Fix Typos / Use Box ConstantsDeokishisu
The Celadon City scripts that give Eevee misspelled it as Eeevee. Fixed. The comment explaining `boxRSEggsUnlocked` in the `ExternalEventFlags` struct had an incorrect deposit requirement listed and was fixed. Also, replaced the literals with the `TOTAL_BOXES_COUNT` and `IN_BOX_COUNT` constants in `pokemon.c`'s `IsPokemonStorageFull` function. Thanks hjk321 for pointing that out.
2021-03-03Merge pull request #398 from SethBarberee/patch-1GriffinR
Add -DINFO Option to Makefile
2021-03-03Add -DINFOSeth Barberee
Popped up in discord channel so adding it here
2021-02-22Merge pull request #396 from hjk321/storage-magicGriffinR
Change embarassing magic numbers that should have been fixed a long time ago
2021-02-22Fix storage magic numbershjk321
I could *kinda* understand missing SendMonToPc, but IN THE STRUCT ITSELF?!
2021-02-19Merge pull request #394 from GriffinRichards/calcrom100GriffinR
Celebratory change to calcrom.pl
2021-02-19Celebratory change to calcrom.plGriffinR
2021-02-19Merge pull request #393 from Kurausukun/text_printerGriffinR
[LEAK-INFORMED] match rest of text_printer
2021-02-19oops forgot oneKurausukun
2021-02-19remove redundant parenthesesKurausukun
2021-02-16Merge pull request #392 from Deokishisu/ExternalEvents-docGriffinR
Mirror pokeemerald PR#1329 & PR#1335 to pokefirered
2021-02-16Mirror pokeemerald PR#1329 & PR#1335 to pokefireredDeokishisu
The `giftRibbons` field in `SaveBlock1` has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and FRLG. US & JP Colosseum Bonus Discs', Colosseum and XD's, Pokémon Channel's, and PokémonBox: Ruby & Sapphire's interactions with these fields has been documented. The `giftRibbon#` fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the `obedient` bit was renamed `eventLegal`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind. I still maintain that `eventLegal` is a misnomer and it should be called `fatefulEncounter` in all three repos.
2021-02-16[LEAK-INFORMED] match rest of text_printerKurausukun
2021-02-14Merge pull request #391 from Deokishisu/movement_type-renameGriffinR
Rename "Hidden" Movement Type to "Buried"
2021-02-14Rename "Hidden" Movement Type to "Buried"Deokishisu
This commit mirrors the change to pokeemerald that renames `MOVEMENT_TYPE_HIDDEN` to `MOVEMENT_TYPE_BURIED` to avoid confusion between it and `MOVEMENT_TYPE_INVISIBLE`. As the files and function labels are not synced between the two repos, only the necessary changes were made based on what pokefirered calls its functions. More syncing of labels with pokeemerald will need to be done in the future.
2021-02-14Merge pull request #388 from GriffinRichards/constants-localidsGriffinR
Use more LOCALID constants
2021-02-14Merge pull request #389 from Kurausukun/dexmatchingGriffinR
[LEAK-INFORMED] match the rest of pokedex_screen
2021-02-12Merge pull request #390 from GriffinRichards/fix-constwarningGriffinR
Fix warning about gMonPaletteTable section
2021-02-12Fix warning about gMonPaletteTable sectionGriffinR
2021-02-11words are hardKurausukun
2021-02-11fix whitespace, update dex category macroKurausukun
2021-02-11[LEAK-INFORMED] match the rest of pokedex_screenKurausukun
2021-02-10Use more LOCALID constantsGriffinR
2021-02-09Merge pull request #385 from Deokishisu/patch-3GriffinR
Fix Trainer Tower Magic Number
2021-02-09Fix Trainer Tower Magic NumberDeokishisu
A magic number was missed that will lead to edited projects breaking the Trainer Tower if new map layouts are added. This commit fixes it.
2021-02-05Merge pull request #384 from Deokishisu/patch-2GriffinR
Fix "Compatibility" Misspelling
2021-02-05Fix "Compatibility" MisspellingDeokishisu
Someone misspelled "compatibility" as "compatability" in pokeemerald and the error was brought over to pokefirered.
2021-02-03Merge pull request #383 from Deokishisu/patch-2GriffinR
Fix Vermilion Gym Script Label Transposition Typos
2021-02-03Fix TM34 Transposition TypoDeokishisu
The script labels for being given TM34 from Lt. Surge are mistakenly typoed as TM43. This commit fixes this error.
2021-02-01Merge pull request #382 from GriffinRichards/relativeconstantsGriffinR
Use trainer constants in flags, automatically update flags/vars count
2021-01-29Use trainer constants in flags, automatically update flags/vars countGriffinR
2021-01-19Merge pull request #380 from GriffinRichards/sync-scanincGriffinR
Sync tools with pokeemerald
2021-01-19Fix modern ld_scriptGriffinR
2021-01-19Move 'source' asm files to srcGriffinR
2021-01-19Sync mapjson with pokeemeraldGriffinR
2021-01-19Sync gbagfx with pokeemeraldGriffinR
2021-01-19Sync preproc with pokeemeraldGriffinR
2021-01-19Update Makefile for scanincGriffinR
2021-01-18Sync scaninc with pokeemeraldGriffinR
2021-01-08Merge pull request #377 from Deokishisu/masterGriffinR
Fix Egregious Magic Numbers in GetBattleBGM
2021-01-08Fix Egregious Magic Numbers in GetBattleBGMDeokishisu
Whoever originally decomped this function must've been really fed up with this file. Renamed GetMUS_ForBattle to GetBattleBGM to be consistent with pokeemerald. This entire function was magic numbers, so I replaced them with the appropriate constants.