summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-10-11Fix hang when releasing after adding new movesGriffinR
2020-09-28Merge pull request #364 from Kurausukun/audio_macrosGriffinR
Update Audio Macros
2020-09-27update audio macrosKurausukun
2020-09-23Merge pull request #362 from Kurausukun/rename_instrumentsGriffinR
rename instruments (again)
2020-09-23rename instruments (again)Kurausukun
Mirroring the change made in pokeemerald
2020-09-08Merge pull request #361 from PikalaxALT/match_nakedPikalaxALT
Match sub_8159AB8
2020-09-08Resolve travis config warningsPikalaxALT
2020-09-08Match sub_8159AB8PikalaxALT
2020-09-07Merge pull request #360 from BigBahss/leafgreen-encounters-prefixGriffinR
wild_encounters.json: Add "MAP_" prefix to LeafGreen's "map" fields
2020-09-06Add "MAP_" prefix missing from 76e126a35b00ecf87038c37de1899cd923617e45BigBahss
2020-09-06Add "MAP_" prefix to LeafGreen "map" fieldsBigBahss
2020-09-03Merge pull request #359 from PikalaxALT/agb_flash_fixPikalaxALT
Fix agb_flash in modern frlg
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 19:45:46 +0000