summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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.
2021-01-07Merge pull request #376 from SatoMew/masterGriffinR
Document the unused battle strings for downpour and rain weather
2021-01-01Document the unused battle strings for downpour and rain weatherSatoMew
2020-12-31Merge pull request #375 from GriffinRichards/deadnameGriffinR
Remove deadnaming, sync BgEvent
2020-12-31Remove deadnaming, sync BgEventGriffinR
2020-12-31Merge pull request #374 from Deokishisu/patch-1GriffinR
Fix Missed Magic Numbers in main_menu.c
2020-12-31Fix Missed Magic Numbers in main_menu.cDeokishisu
There were two lines where magic numbers were used instead of the constant for MAIN_MENU_WINDOW_ERROR, so I filled them in.
2020-11-27Merge pull request #371 from GriffinRichards/data-pokedexGriffinR
Move pokedex_screen data from asm to C
2020-11-27Merge pull request #373 from V-FEXrt/farfetchdGriffinR
Rename farfetchd graphics to match define
2020-11-26Rename farfetchd graphics to match defineAshley Coleman
2020-11-15Merge pull request #372 from V-FEXrt/trainer_parties_variablesGriffinR
Rename unknown trainer party variables
2020-11-12Rename unknown trainer party variablesAshley Coleman
2020-11-12Fix modern buildGriffinR
2020-11-12Clean up pokedex screen textGriffinR
2020-11-11Move pokedex_screen data from asm to CGriffinR
2020-11-11Merge pull request #1 from pret/masterAshley Coleman
Sync upstream
2020-11-11Merge pull request #370 from V-FEXrt/pokedex-screenGriffinR
Give meaningful names to globals in pokedex_screen.s
2020-11-11Give meaningfull names to globals in pokedex_screen.sAshley Coleman
2020-11-02Merge pull request #368 from Kurausukun/match_m4aGriffinR
Match FadeOutBody (ported from pokeemerald)
2020-11-01Match FadeOutBody (ported from pokeemerald)Kurausukun
2020-10-11Merge pull request #365 from GriffinRichards/moves-constGriffinR
Fix hang when releasing after adding new moves
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 08:03:03 +0000