summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-27Merge pull request #1257 from Kurausukun/menu_nonmatchingGriffinR
[LEAK INFORMED] match sub_819A080
2020-11-27Merge pull request #1258 from V-FEXrt/masterGriffinR
Rename graphics files for COOLTRAINER to match define
2020-11-26Rename graphics files for COOLTRAINER to match defineAshley Coleman
2020-11-26whitespaceKurausukun
2020-11-26[LEAK INFORMED] match sub_819A080Kurausukun
2020-11-24Merge pull request #1255 from GriffinRichards/doc-paltagsGriffinR
Name object event palettes and tags
2020-11-23Move object event pal declarations to graphicsGriffinR
2020-11-23Clarify Kecleon objectsGriffinR
2020-11-23Name object event pals/tagsGriffinR
2020-11-18Merge pull request #1252 from luckytyphlosion/masterGriffinR
Missing inc files in asm/*.s and data/*.s will raise an actual error message.
2020-11-18Remove useless comment.luckytyphlosion
2020-11-18Optimize Makefile, also add *.sna to gitignore.luckytyphlosion
2020-11-17Merge pull request #1251 from ExpoSeed/patch-1GriffinR
Document bugged IV inheritance difference
2020-11-17Merge pull request #1254 from kageru/pretGriffinR
Use more constants in Battle Tower code
2020-11-17Use more constants in Battle Tower codekageru
2020-11-16Merge pull request #1253 from LOuroboros/patch-1GriffinR
sanityIsBagEgg -> sanityIsBadEgg
2020-11-16sanityIsBagEgg -> sanityIsBadEggLOuroboros
Fixed a typo. Lunos#4026
2020-11-15Fix grammarExpoSeed
2020-11-15Document bugged IV inheritance differenceExpoSeed
2020-11-12Missing inc files in asm/*.s and data/*.s will raise an actual error message.luckytyphlosion
2020-11-09Merge pull request #1248 from luckytyphlosion/masterGriffinR
Bugfix for ChooseMoveOrAction_Doubles.
2020-11-09Merge pull request #1249 from luckytyphlosion/masterGriffinR
Add missing files to .gitattributes.
2020-11-08Add missing files to .gitattributes.luckytyphlosion
Only *.sed is required, all other files are listed to be explicit.
2020-11-07Bugfix for ChooseMoveOrAction_Doubles.luckytyphlosion
2020-11-07Merge branch 'master' of https://github.com/pret/pokeemeraldluckytyphlosion
2020-11-06Merge pull request #1247 from PidgeyALT/attemptcountfixGriffinR
use constants for ball throw count
2020-11-06Merge pull request #1246 from PikalaxALT/simplify_ram_resetPikalaxALT
Simplify RAM reset adaptation for modern
2020-11-06add spaces around - and remove comment from include in battle.hMCboy
2020-11-06use constants for ball throw countMCboy
2020-11-06swi --> svcPikalaxALT
2020-11-06Simplify RAM reset adaptation for modernPikalaxALT
2020-11-04Merge pull request #1245 from GriffinRichards/modernfactoryfixGriffinR
Fix battle factory on gcc 10
2020-11-04Revert to original battle factory gcc 10 fixGriffinR
2020-11-04Fix typoGriffinR
2020-11-04Condense fix for battle factory on gcc 10GriffinR
2020-11-04Fix battle factory on gcc 10GriffinR
2020-11-03Merge pull request #1189 from aaaaaa123456789/revertsPikalaxALT
Undo PokeCodec's PRs and port changes
2020-11-02Solve merge conflicts from previous commitaaaaaa123456789
2020-11-02Re-apply joypad macros (minus merge conflicts)aaaaaa123456789
2020-11-02Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald ↵Kurausukun
into reverts
2020-11-02address commentsKurausukun
2020-10-29Merge pull request #1242 from GriffinRichards/constants-menuinfoiconsGriffinR
Use constants for menu info icon table
2020-10-29Merge pull request #1238 from ketsuban/masterGriffinR
Eliminate goto in ItemUseCB_Medicine
2020-10-29Use constants for menu info icon tableGriffinR
2020-10-26Update src/digit_obj_util.caaaaaa123456789
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
2020-10-26Fix whitespace issuesaaaaaa123456789
2020-10-26Remove unused variableaaaaaa123456789
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
2020-10-26Port back improvements from later commitsaaaaaa123456789
2020-10-26Merge branch 'master' into revertsaaaaaa123456789
2020-10-26re-match BattleIntroOpponent1SendsOutMonAnimationKurausukun
a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-25 20:48:07 +0000