Commit Graph

  • 23d7c00c62 Merge branch 'master' into clone-union GriffinR 2022-02-22 18:42:20 -05:00
  • 759f373d31 Merge pull request #488 from GriffinRichards/map-constants GriffinR 2022-02-14 21:17:44 -05:00
  • 8d85ff1683 Merge pull request #487 from GriffinRichards/trainer-type-constants GriffinR 2022-02-11 19:52:26 -05:00
  • 59695b8221 Sync roamer GriffinR 2022-02-11 15:05:15 -05:00
  • 24f18af338 Add missing map constant usage GriffinR 2022-02-11 14:43:38 -05:00
  • 2598b285bb Add missing trainer type constant usage GriffinR 2022-02-11 13:18:31 -05:00
  • 91076d9408 Merge pull request #486 from Deokishisu/patch-4 GriffinR 2022-02-11 07:57:26 -05:00
  • 27c3f7204a Fix Magic Number in sub_8064544 in event_object_movement.c Deokishisu 2022-02-11 06:19:16 -05:00
  • 9f2ac797d3 Merge pull request #485 from cbt6/movement GriffinR 2022-02-09 13:07:59 -05:00
  • 0f3e26f9a4 Fix formatting and style cbt6 2022-02-10 01:53:48 +08:00
  • 7de67831e9 Add macros for renamed movement actions cbt6 2022-02-10 01:48:28 +08:00
  • ac3de6d02c Rename some movement actions and functions cbt6 2022-02-10 00:20:22 +08:00
  • 38601cf09b Reformat clone objects in JSON GriffinR 2022-02-05 14:02:35 -05:00
  • dd5f6ccd3b Add union for clone objects GriffinR 2022-02-05 13:42:46 -05:00
  • bef2668d8b Merge pull request #481 from GriffinRichards/sync-classes GriffinR 2022-01-21 19:26:14 -05:00
  • 7fb97f9e25 Merge pull request #483 from GriffinRichards/remove-berry-fix GriffinR 2022-01-15 13:11:24 -05:00
  • cf41c78370 Remove berry fix GriffinR 2022-01-15 13:03:36 -05:00
  • f8ab09b4b4 Merge pull request #482 from GriffinRichards/remove-old-asm-constants GriffinR 2022-01-11 02:20:18 -05:00
  • 53eca1d3a7 Remove old asm constants GriffinR 2022-01-10 19:28:36 -05:00
  • 08a18d6e32 Sync/update trainer classes GriffinR 2022-01-09 15:49:02 -05:00
  • d0c79e4e47 Merge pull request #480 from GriffinRichards/map-preview-gfx GriffinR 2022-01-06 23:39:01 -05:00
  • 2a59523ad9 Re-export map preview gfx with palettes and sensible sizes GriffinR 2022-01-06 16:08:52 -05:00
  • 26c496e099 Decompress map preview tilemaps GriffinR 2022-01-06 15:34:55 -05:00
  • f1121b1593 Move map preview gfx to own folders GriffinR 2022-01-06 15:26:00 -05:00
  • cb7b53adee Merge pull request #479 from Birdulon/PartySize GriffinR 2022-01-01 10:20:01 -05:00
  • 92d6d97c65 Fix party size calculations for larger-than-six PARTY_SIZE Luke Hubmayer-Werner 2022-01-01 22:13:53 +10:30
  • 4c023cb8c7 Merge pull request #478 from GriffinRichards/fix-baldingman GriffinR 2021-12-03 20:23:21 -05:00
  • 0b61e91d6c Fix balding man palette GriffinR 2021-12-03 19:54:36 -05:00
  • 7b913802ab Merge pull request #477 from GriffinRichards/sync-global GriffinR 2021-11-28 15:50:13 -05:00
  • 7e38583a5d Rotating Gate -> dir stair warp GriffinR 2021-11-20 10:50:22 -05:00
  • b2c74cae84 Sync global GriffinR 2021-11-19 17:04:04 -05:00
  • 6282f75cae Merge pull request #476 from Jademalo/patch-1 GriffinR 2021-11-18 22:08:38 -05:00
  • cf94e1841f Add missing semicolon in charmap Jademalo 2021-11-19 02:57:48 +00:00
  • cd4462f58c Merge pull request #474 from lioniac/master GriffinR 2021-11-01 15:25:22 -04:00
  • e006569719 Deleted unused pokenav header lioniac 2021-11-01 16:14:59 -03:00
  • 0cc1d8a1b5 Multiple renamings; Removed some orphaned functions lioniac 2021-10-24 17:42:24 -03:00
  • 471608b56a Merge pull request #473 from Jademalo/ide-support GriffinR 2021-10-23 09:44:08 -04:00
  • 1c4d5bfed0 IDE support formatting and consistency Jademalo 2021-10-23 10:10:06 +01:00
  • 46867c546d Improve IDE Support Jademalo 2021-10-22 04:42:48 +01:00
  • 6eaca5f0d0 Merge pull request #472 from lioniac/master GriffinR 2021-10-18 14:47:44 -04:00
  • d9800a63e0 Few renamings based on Emerald lioniac 2021-10-18 15:33:46 -03:00
  • 89b0351666 Merge pull request #471 from GriffinRichards/sync-calcrom GriffinR 2021-10-15 09:20:57 -04:00
  • 434cc62b7c Make calcrom data info optional GriffinR 2021-10-15 09:12:46 -04:00
  • 7f123f4d0f Merge pull request #470 from GriffinRichards/fix-saveblockchunk GriffinR 2021-10-13 13:43:58 -04:00
  • 490300daab Disallow negative sizes in SAVEBLOCK_CHUNK GriffinR 2021-10-13 13:29:17 -04:00
  • 466e98a983 Kill Freenode. IIMarckus 2021-10-08 04:58:28 -06:00
  • 6eaeceb3ef Merge pull request #467 from GriffinRichards/sync-fieldmap GriffinR 2021-10-01 18:30:55 -04:00
  • 1460774d1d Sync fieldmap.c GriffinR 2021-10-01 17:56:14 -04:00
  • 1f7eb7ea01 Merge pull request #466 from Deokishisu/master GriffinR 2021-10-01 00:26:48 -04:00
  • 18ca5ef678 Fix Magic Numbers in battle_anim_scripts.s Deokishisu 2021-10-01 00:01:16 -04:00
  • fb1bca5b3e Merge pull request #464 from colonelsalt/documentation GriffinR 2021-09-26 22:46:10 -04:00
  • b0698e27f9 Merge pull request #465 from SatoMew/master GriffinR 2021-09-14 13:27:28 -04:00
  • e13a99717b Add fix to disallow negative current HP values SatoMew 2021-09-13 21:51:56 +01:00
  • d3e0bb6bba Removed #define access for data array in Oak speech subtasks take 3 colonelsalt 2021-09-02 12:29:53 +01:00
  • ba1a9e36f8 Removed #define access for data array in Oak speech subtasks take 2 colonelsalt 2021-09-02 12:25:49 +01:00
  • c8c5a06a43 Removed #define access for data array in Oak speech subtasks colonelsalt 2021-09-02 12:16:40 +01:00
  • 54377a43f5 Changed enum name for Oak speech trainer pics colonelsalt 2021-09-02 11:17:38 +01:00
  • 7ba40824f5 Documented some fields in oak_speech.c colonelsalt 2021-09-02 09:57:28 +01:00
  • 6de0d61daf Merge pull request #463 from PikalaxALT/fix_mid2agb_call PikalaxALT 2021-09-01 17:19:20 -04:00
  • 69aac07cc1 Fix default mid2agb Makefile rule PikalaxALT 2021-09-01 17:11:58 -04:00
  • 39c623c8cd Merge pull request #461 from Kurausukun/oops GriffinR 2021-08-21 07:49:17 -04:00
  • bb84e66e82 oops Kurausukun 2021-08-20 22:32:38 -04:00
  • 9ad143bf24 Merge pull request #460 from Sewef/master GriffinR 2021-08-19 13:37:01 -04:00
  • c7473dac0b Use SHINY_ODDS where necessary Sewef 2021-08-19 19:24:11 +02:00
  • f77e1a9901 Merge pull request #457 from Kurausukun/cgbsound PikalaxALT 2021-08-11 19:55:16 -04:00
  • 65d5dab679 Merge pull request #459 from GriffinRichards/fix-symbols PikalaxALT 2021-08-11 19:43:23 -04:00
  • dbdd0d40f3 Fix symbols branch commit messages GriffinR 2021-08-11 19:27:12 -04:00
  • 073f315fc3 Merge pull request #458 from Squeetz/master GriffinR 2021-08-11 12:21:26 -04:00
  • d4695fffe7 Rename and document HITMARKER_x100000 Squeetz 2021-08-11 15:45:30 +02:00
  • 2a244c57dc unsigned int -> u32 Kurausukun 2021-08-08 22:23:54 -04:00
  • dbc41d1d14 port cgbsound documentation and fakematch fixes Kurausukun 2021-08-08 20:44:52 -04:00
  • feb5428937 Merge pull request #456 from SethBarberee/one_func_name GriffinR 2021-08-01 12:15:35 -04:00
  • c370eddd92 name single func Seth Barberee 2021-08-01 09:02:55 -07:00
  • 1150e16b68 Merge pull request #450 from PikalaxALT/flatten_sprite_pos GriffinR 2021-07-25 12:51:51 -04:00
  • cd8ac0ed9b Merge pull request #454 from PikalaxALT/misc_fixes PikalaxALT 2021-07-18 08:14:14 -04:00
  • 864d371c25 Swap two fields in player PC struct PikalaxALT 2021-07-17 20:27:44 -04:00
  • 00c0cb05b0 Merge pull request #453 from PikalaxALT/fix_symbols_commit_msg PikalaxALT 2021-07-16 12:58:58 -04:00
  • d3ef86dd2b Use merge commit message for symbols branch PikalaxALT 2021-07-16 12:20:35 -04:00
  • ea889b65ae Merge pull request #452 from Kurausukun/protectfix GriffinR 2021-07-13 00:42:44 -04:00
  • d7f5e8d8f2 port UB fix from emerald Kurausukun 2021-07-12 23:57:38 -04:00
  • f1e345d279 Merge pull request #451 from GriffinRichards/fix-symsname PikalaxALT 2021-07-08 11:35:05 -04:00
  • 9648aad176 Use PR title for symbols branch commits GriffinR 2021-07-08 11:25:58 -04:00
  • aec808ac0d Flatten pos fields in struct Sprite PikalaxALT 2021-07-07 09:05:48 -04:00
  • 1a43cdc81f Merge pull request #449 from Kurausukun/align GriffinR 2021-07-03 21:55:36 -04:00
  • 41ff1d7672 remove unnecessary .aligns Kurausukun 2021-07-03 20:19:26 -04:00
  • 585d92f298 Merge pull request #445 from Kurausukun/ubfix GriffinR 2021-07-03 17:25:05 -04:00
  • ff94d49a45 add SAFE_DIV macro and usages Kurausukun 2021-07-03 17:18:41 -04:00
  • 558097f423 Merge pull request #441 from Kurausukun/cast_test GriffinR 2021-07-03 17:14:06 -04:00
  • ee0f35b866 Merge branch 'master' of https://github.com/pret/pokefirered into ubfix Kurausukun 2021-07-03 17:02:32 -04:00
  • 4a8bc916b1 remove redundant variable Kurausukun 2021-07-03 17:00:04 -04:00
  • 85beaf7f82 Merge branch 'master' of https://github.com/pret/pokefirered into cast_test Kurausukun 2021-07-03 16:57:44 -04:00
  • bbf39b8560 Merge pull request #442 from GriffinRichards/fix-offsets GriffinR 2021-07-03 11:15:38 -04:00
  • 552060c900 Merge pull request #448 from SnorlaxMonster/terrain GriffinR 2021-07-03 09:38:56 -04:00
  • 3927917784 Merge pull request #447 from Deokishisu/patch-2 GriffinR 2021-07-01 07:28:57 -04:00
  • dd3d464b6a Fix Magic Number in party_menu.c Deokishisu 2021-07-01 03:11:05 -04:00
  • b564c1e58c Merge pull request #446 from garakmon/hey GriffinR 2021-06-27 21:41:20 -04:00
  • 335e3bab09 fix encounter slot logic to accomodate changes garakmon 2021-06-27 21:17:36 -04:00
  • b9363bf366 Merge pull request #444 from Kurausukun/fix_alloc luckytyphlosion 2021-06-26 22:53:52 -04:00
  • cf64f77349 make flash source volatile (ported from emerald) Kurausukun 2021-06-26 22:53:49 -04:00
  • 88bd618496 port UBFIXes from emerald Kurausukun 2021-06-26 04:04:22 -04:00