Commit Graph

  • 70b6e05a47 Remove useless comment. luckytyphlosion 2020-11-18 21:31:04 -05:00
  • 68b53c7437 Optimize Makefile, also add *.sna to gitignore. luckytyphlosion 2020-11-18 20:53:42 -05:00
  • 0aa06c307b Merge pull request #1251 from ExpoSeed/patch-1 GriffinR 2020-11-17 14:25:36 -05:00
  • 116fbecbe4 Merge pull request #1254 from kageru/pret GriffinR 2020-11-17 13:49:58 -05:00
  • 6f91f7e0e3 Use more constants in Battle Tower code kageru 2020-11-17 17:21:34 +01:00
  • de153a67cf Merge pull request #1253 from LOuroboros/patch-1 GriffinR 2020-11-16 14:57:16 -05:00
  • cad5b57b42 sanityIsBagEgg -> sanityIsBadEgg LOuroboros 2020-11-16 15:36:38 -03:00
  • e5f043ff72 Fix grammar ExpoSeed 2020-11-15 16:28:09 -06:00
  • 3f157b5293 Document bugged IV inheritance difference ExpoSeed 2020-11-15 16:24:19 -06:00
  • 5029c90979 Missing inc files in asm/*.s and data/*.s will raise an actual error message. luckytyphlosion 2020-11-12 11:04:38 -05:00
  • 7172ea35f9 Merge pull request #1248 from luckytyphlosion/master GriffinR 2020-11-09 12:17:41 -05:00
  • 19fa021c63 Merge pull request #1249 from luckytyphlosion/master GriffinR 2020-11-09 12:13:45 -05:00
  • 8a780977a8 Add missing files to .gitattributes. luckytyphlosion 2020-11-08 20:13:21 -05:00
  • 4b748d32cc Bugfix for ChooseMoveOrAction_Doubles. luckytyphlosion 2020-11-07 18:21:17 -05:00
  • a29b18ed2f Merge branch 'master' of https://github.com/pret/pokeemerald luckytyphlosion 2020-11-07 18:06:37 -05:00
  • 8b1c2c946b Merge pull request #1247 from PidgeyALT/attemptcountfix GriffinR 2020-11-06 15:41:25 -05:00
  • 75b12b86dc Merge pull request #1246 from PikalaxALT/simplify_ram_reset PikalaxALT 2020-11-06 15:00:40 -05:00
  • e31158d017 add spaces around - and remove comment from include in battle.h MCboy 2020-11-06 23:29:52 +03:30
  • 3b91735e63 use constants for ball throw count MCboy 2020-11-06 22:59:46 +03:30
  • 3112cf5726 swi --> svc PikalaxALT 2020-11-06 12:34:57 -05:00
  • c70c44fa48 Simplify RAM reset adaptation for modern PikalaxALT 2020-11-06 12:29:40 -05:00
  • 42b7f11db0 Merge pull request #1245 from GriffinRichards/modernfactoryfix GriffinR 2020-11-04 18:34:53 -05:00
  • 1220f0655c Revert to original battle factory gcc 10 fix GriffinR 2020-11-04 17:46:07 -05:00
  • c3080a5a2a Fix typo GriffinR 2020-11-04 16:46:26 -05:00
  • 70ff0d1735 Condense fix for battle factory on gcc 10 GriffinR 2020-11-04 16:43:59 -05:00
  • c59a818462 Fix battle factory on gcc 10 GriffinR 2020-11-04 15:35:22 -05:00
  • 99dd461bef Merge pull request #1189 from aaaaaa123456789/reverts PikalaxALT 2020-11-03 09:28:45 -05:00
  • ca950a8daf Solve merge conflicts from previous commit aaaaaa123456789 2020-11-02 22:18:26 -03:00
  • bacc831aa9 Re-apply joypad macros (minus merge conflicts) aaaaaa123456789 2020-11-02 22:02:39 -03:00
  • 6545745e59 Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts Kurausukun 2020-11-02 18:43:40 -05:00
  • 8bf401c227 address comments Kurausukun 2020-11-02 18:43:11 -05:00
  • 9e55ae22b1 Merge pull request #1242 from GriffinRichards/constants-menuinfoicons GriffinR 2020-10-29 23:50:43 -04:00
  • fbff087e9a Merge pull request #1238 from ketsuban/master GriffinR 2020-10-29 23:50:17 -04:00
  • be1685c87f Use constants for menu info icon table GriffinR 2020-10-29 16:34:33 -04:00
  • 9794b077b5 Update src/digit_obj_util.c aaaaaa123456789 2020-10-26 19:14:08 -03:00
  • bcbd05e151 Fix whitespace issues aaaaaa123456789 2020-10-26 15:52:44 -03:00
  • 4bbc14ecdd Remove unused variable aaaaaa123456789 2020-10-26 15:51:10 -03:00
  • 00db69a302 Port back improvements from later commits aaaaaa123456789 2020-10-26 12:31:07 -03:00
  • 1c3d75f673 Merge branch 'master' into reverts aaaaaa123456789 2020-10-26 12:16:36 -03:00
  • fe40c0c466 re-match BattleIntroOpponent1SendsOutMonAnimation Kurausukun 2020-10-26 05:52:00 -04:00
  • 539fd463c8 port MovementAction_StoreAndLockAnim_Step0 fix Kurausukun 2020-10-26 03:46:08 -04:00
  • 43701c3860 port PrintMonWeight fakematch fix Kurausukun 2020-10-26 00:49:57 -04:00
  • b2b363159f port sub_80C6104 fakematch fix Kurausukun 2020-10-26 00:46:01 -04:00
  • 072797844a port TrendyPhraseIdOld fakematch fix Kurausukun 2020-10-26 00:29:55 -04:00
  • e8fd0bd2c3 port InitPaintingMonOamData fakematch fix Kurausukun 2020-10-26 00:26:15 -04:00
  • 9e033fa554 port BerryCrushCommand_BeginNormalPaletteFade fix Kurausukun 2020-10-26 00:22:56 -04:00
  • 9ca406b15d port Cmd_forcerandomswitch fakematch fix Kurausukun 2020-10-26 00:17:26 -04:00
  • af0a1cb7bf port ReceiveDaycareMailData fakematch fix Kurausukun 2020-10-26 00:10:30 -04:00
  • 9d067dfe0d port sub_8181C2C fakematching fix Kurausukun 2020-10-26 00:06:19 -04:00
  • 83846b913a port sub_806F160 fakematch fix Kurausukun 2020-10-26 00:01:53 -04:00
  • 4c10f3f465 port GetFrontierOpponentClass fakematch fix Kurausukun 2020-10-25 23:55:38 -04:00
  • c7d624edeb re-match sub_81D5F58 Kurausukun 2020-10-25 23:52:39 -04:00
  • 077a2c23dc port HasNoMonsToSwitch fakematch fix (from #1181) Kurausukun 2020-10-25 23:45:42 -04:00
  • 193e601c2c port Phase2_FrontierLogoWave_Func4 fix Kurausukun 2020-10-25 23:42:50 -04:00
  • b2100cb480 port ModifyStatByNature fakematch fix (from #1179) Kurausukun 2020-10-25 23:23:40 -04:00
  • 9c9b626ccb re-match CheckBagHasSpace (from #1179) Kurausukun 2020-10-25 23:19:56 -04:00
  • af04d99cd9 port fix for UpdateSaveAddresses (from #1177) Kurausukun 2020-10-23 22:12:09 -04:00
  • 44c2d15ca9 re-match sub_81C79BC (from #1177) Kurausukun 2020-10-23 22:07:30 -04:00
  • 627853a2bf re-match SetSearchRectHighlight (from #1177) Kurausukun 2020-10-23 21:59:15 -04:00
  • a1d69ae264 re-match sub_81BF2B8 (from $1177) Kurausukun 2020-10-23 21:51:46 -04:00
  • 9b573b283c re-match CreateFrontierBrainPokemon (from #1177) Kurausukun 2020-10-23 21:36:38 -04:00
  • a6cb8279f7 re-match DrawResultsTextWindow (from #1177) Kurausukun 2020-10-23 21:29:59 -04:00
  • 36d7e8c769 re-match TryPutLinkBattleTvShowOnAir (from #1177) Kurausukun 2020-10-23 21:04:28 -04:00
  • 16cf49ffbe re-match GetTypeEffectivenessPoints (from #1177) Kurausukun 2020-10-23 20:59:27 -04:00
  • 90211248af re-match Cmd_unknown_24 (from #1140) Kurausukun 2020-10-23 20:47:10 -04:00
  • 64ba8c8061 port fakematch fixes from #1155 Kurausukun 2020-10-22 05:45:53 -04:00
  • 9c4dddf870 re-match _InitContestMonPixels (from #1153) Kurausukun 2020-10-22 05:37:51 -04:00
  • 0bca313b41 remove naked asm (oops) Kurausukun 2020-10-22 05:04:35 -04:00
  • 2945a3a845 re-match GetConnectedChildStrength Kurausukun 2020-10-22 05:03:16 -04:00
  • 2239f3aa60 Eliminate goto in ItemUseCB_Medicine Thomas Winwood 2020-10-21 20:07:34 +01:00
  • 03f46ff23a re-match battle_anim_water functions (from #1136) Kurausukun 2020-10-21 04:41:57 -04:00
  • 063596d87b re-match GLYPH_COPY Kurausukun 2020-10-21 04:26:45 -04:00
  • 5fd555016f re-match battle_anim_flying functions (from #1126) Kurausukun 2020-10-21 04:04:59 -04:00
  • eee55c65f6 re-do "match function signatures" (from #1119) Kurausukun 2020-10-21 03:45:29 -04:00
  • c8e832980b re-match CreateWaterPulseRingBubbles Kurausukun 2020-10-19 06:37:00 -04:00
  • f0efd11aa9 re-match InitObjectEventStateFromTemplate Kurausukun 2020-10-19 06:19:21 -04:00
  • 56c3eefd9f re-match RotateAuroraRingColors_Step Kurausukun 2020-10-19 06:15:35 -04:00
  • 7d5fce9a72 re-remove extra semicolons (from #1104) Kurausukun 2020-10-19 05:58:51 -04:00
  • 585f313c64 Merge pull request #1232 from Kurausukun/match_m4a GriffinR 2020-10-18 21:41:37 -04:00
  • aedfe27f8d Remove newline Kurausukun 2020-10-16 17:16:25 -04:00
  • bf03f1154f formatting Kurausukun 2020-10-16 16:57:41 -04:00
  • c31c2d93d7 [LEAK INFORMED] match FadeOutBody Kurausukun 2020-10-16 16:55:29 -04:00
  • 8d2d34aae9 Merge pull request #5 from pret/master ExpoSeed 2020-10-12 17:09:38 -05:00
  • 46212e0d14 Merge pull request #1230 from GriffinRichards/fixubcomm GriffinR 2020-10-11 19:16:42 -04:00
  • 1472111c5d Fix PutAwayDecorationLoop UB comment GriffinR 2020-10-11 19:02:10 -04:00
  • 17a77c9018 Merge pull request #1229 from ghoulslash/document GriffinR 2020-10-11 11:59:40 -04:00
  • 280c68b531 renamed pokenav graphics file fixes Evan 2020-10-11 09:11:12 -06:00
  • f4909b4d96 align pokenav task funcs and update some pokenav menu bg gfx files Evan 2020-10-11 08:50:58 -06:00
  • 4efbdaf706 Merge pull request #1227 from kageru/pret GriffinR 2020-10-11 07:17:09 -04:00
  • 52ebc4252e Document gUnknown_03006298 kageru 2020-10-07 23:03:46 +02:00
  • 2b2be90a52 start pokenav documentation Evan 2020-10-10 16:17:34 -06:00
  • 13f37cf974 Merge pull request #1223 from GriffinRichards/constants-misc GriffinR 2020-10-06 18:39:43 -04:00
  • ba18f4011a Merge pull request #1225 from ExpoSeed/make-clean-rl GriffinR 2020-10-06 00:46:31 -04:00
  • 8f7e212967 Remove *.rl in make clean ExpoSeed 2020-10-05 23:33:55 -05:00
  • 9c43bcb429 Delete accidentally pushed file ExpoSeed 2020-10-05 23:33:36 -05:00
  • 65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts GriffinR 2020-10-05 18:48:51 -04:00
  • a33d4874d9 Merge pull request #1219 from ExpoSeed/bye-pr-template GriffinR 2020-10-04 23:38:42 -04:00
  • 9b90a773d2 Merge pull request #1221 from AsparagusEduardo/Doc-newGameBerries GriffinR 2020-10-04 23:37:41 -04:00
  • 96e4b43ce5 Documenting where each of the berries are generated in new_game.inc Eduardo Quezada 2020-10-03 21:52:09 -03:00
  • 4a773ce18d Merge pull request #1217 from ipatix/fix_O3 PikalaxALT 2020-10-03 12:34:02 -04:00