Commit Graph

  • cc388ef30f Merge pull request #2063 from GriffinRichards/region-map-sections GriffinR 2024-11-23 16:09:50 -05:00
  • 6560bbab21 Restore .map file creation GriffinR 2024-11-23 14:17:40 -05:00
  • f775b09ae0 Merge pull request #2055 from GriffinRichards/spinda-spots Martin Griffin 2024-11-20 12:22:59 +00:00
  • 43ad32e8bc Merge pull request #2066 from surtr-games/bugfix_battle_ai GriffinRichards 2024-11-15 20:21:44 +00:00
  • 9275e71390 Merge pull request #2066 from surtr-games/bugfix_battle_ai GriffinR 2024-11-15 15:18:32 -05:00
  • 13692076f9 Fixed a bug with Counter and Mirror Coat where they would be scored up depending on the wrong target mon type category. surtr-games 2024-11-14 00:29:42 -05:00
  • 039bc02546 Use size constants for MAPSEC popup theme array GriffinR 2024-11-12 22:28:01 -05:00
  • 9ea76f9815 Merge pull request #2064 from Lactozilla/fix-contestants-turn-blink-effect-offsets GriffinR 2024-11-12 12:47:24 -05:00
  • b60da57d8a Remove usage of gHeap in sSpritePalettes_ContestantsTurnBlinkEffect Lactozilla 2024-11-12 14:28:33 -03:00
  • b89fda79ea Generate MAPSEC constants from JSON GriffinR 2024-11-06 21:41:43 -05:00
  • f8119bedd4 Merge pull request #2062 from GriffinRichards/emerald-version-png Martin Griffin 2024-11-04 20:47:19 +00:00
  • 1b8e6fbe3f Lay out emerald version png horizontally GriffinR 2024-11-04 15:39:31 -05:00
  • f04c2faeb0 Silence 'Nothing to be done for generated' messages (#2059) GriffinR 2024-11-03 17:53:53 -05:00
  • da791cde94 Add TRY_DRAW_SPOT_PIXEL GriffinR 2024-10-24 12:41:38 -04:00
  • e45fe13af4 Merge pull request #2052 from fdeblasio/bardDefine Martin Griffin 2024-10-21 14:50:51 +01:00
  • 544b76fbbf Added value for bard sound length Frank 2024-10-21 08:58:49 -04:00
  • 0ee9b3cf08 Fix event_constants recipe running twice GriffinR 2024-10-15 22:17:38 -04:00
  • 0eb6d1d74c Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants GriffinR 2024-10-15 22:04:45 -04:00
  • da9c0239d9 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 GriffinR 2024-10-15 22:02:40 -04:00
  • e7587f84ff Get rid of common syms (#2040) GriffinRichards 2024-10-15 03:55:30 +00:00
  • a55c75d350 Get rid of common syms (#2040) luckytyphlosion 2024-10-14 23:52:11 -04:00
  • 253d3dd7ef Remove unnecessary looping for rule generation and unroll macros (#2046) mid-kid 2024-10-15 03:47:07 +00:00
  • a0be2cbf7b Fix Fallorbor typo GriffinR 2024-10-12 23:50:12 -04:00
  • f61c0099b9 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA GriffinR 2024-10-12 23:34:02 -04:00
  • bf17d54b52 Finish adding local IDs to map.json files GriffinR 2024-10-12 12:39:50 -04:00
  • cb66ea6653 Continue adding local IDs to map.json files GriffinR 2024-10-12 09:59:56 -04:00
  • a2a3255bdd Fix typo, remove old size check GriffinR 2024-10-12 03:30:35 -04:00
  • 9f31b0fe90 Generate local IDs from map.json files GriffinR 2024-10-11 21:30:52 -04:00
  • 6518f1e3ff Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 GriffinR 2024-10-11 15:26:58 -04:00
  • 091b7269df Move heal locations data to their associated map.json (#2034) GriffinR 2024-10-11 15:15:55 -04:00
  • b6892f5b67 Let scaninc ignore empty C files GriffinR 2024-10-11 15:03:38 -04:00
  • 2c7964dbc2 Fix deleting files with dependency files (#2045) mid-kid 2024-10-11 18:33:32 +00:00
  • fcc067e515 [preproc] support C23 enum underlying type syntax (#2043) Martin Griffin 2024-10-11 18:50:26 +01:00
  • af8f4bf45d Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 GriffinR 2024-10-11 13:38:04 -04:00
  • 6d24d8a78f Fix libpng installation for workflow on Ubuntu 24.04 GriffinR 2024-10-11 13:05:56 -04:00
  • 6395d55b43 Merge pull request #2044 from AreaZR/Excessive Martin Griffin 2024-10-10 20:26:12 +01:00
  • 9ad0018c17 Fix typo: | should be || in Task_TryFieldPoisonWhiteOut Rose 2024-10-10 10:27:33 -04:00
  • 9a24c031bb Replaced copyright magic numbers in intro.c with constants (#2035) psf 2024-10-02 17:48:54 -07:00
  • 4cba6916e0 Merge pull request #2038 from GriffinRichards/gflib-syms GriffinRichards 2024-10-02 19:38:04 +00:00
  • 2b73d10a2a Merge pull request #2041 from Jaizu/patch-9 GriffinR 2024-10-02 15:35:20 -04:00
  • 44e9228a6e Merge pull request #2038 from GriffinRichards/gflib-syms GriffinR 2024-10-02 15:34:42 -04:00
  • 37d104f7a5 Merge pull request #2039 from Scyrous/patch-1 GriffinR 2024-10-02 15:34:22 -04:00
  • c8cc0fa5a3 Ignore mGBA screenshots Jaizu 2024-10-01 10:07:45 +02:00
  • 1dc85df1f0 Update cable_car.c Scyrous 2024-09-29 14:38:08 +02:00
  • 8e2c3ca3f2 Bugfix for cable car sprite array count Scyrous 2024-09-29 14:13:50 +02:00
  • 80a37c16be Remove explicit symbol sizes in sym_common.txt GriffinR 2024-09-25 13:35:52 -04:00
  • a551efea43 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 GriffinR 2024-09-19 12:27:36 -04:00
  • 473e0623ba Merge pull request #2031 from GriffinRichards/fix-toolchain GriffinR 2024-09-19 12:23:58 -04:00
  • 8f41d9eb17 Merge branch 'master' into fix-toolchain GriffinR 2024-09-19 12:20:51 -04:00
  • 635325304b Merge pull request #2033 from Kurausukun/goodbye_gflib GriffinR 2024-09-19 12:19:48 -04:00
  • e4e90eacd6 Merge pull request #2023 from Bassoonian/updatemapmacros GriffinR 2024-09-19 12:17:16 -04:00
  • cafeb3fa92 Update wild encounters json template Bassoonian 2024-09-19 11:27:02 +02:00
  • 49735754c3 Remove accidental expansion leftovers Bassoonian 2024-09-19 11:23:33 +02:00
  • 9cb353179b fix indentation Kurausukun 2024-09-18 10:42:28 -04:00
  • 52c2728ff6 remove gflib Kurausukun 2024-09-18 10:37:34 -04:00
  • 62c27faba4 Merge pull request #2032 from DizzyEggg/patch-1 GriffinR 2024-09-14 13:17:26 -04:00
  • c4b5818d98 remove ScriptContext_Enable from secret_base.h DizzyEggg 2024-09-14 19:13:02 +02:00
  • db898f8baa Merge pull request #2030 from skyeforeverblue/patch-2 GriffinR 2024-09-14 10:56:50 -04:00
  • bc58a4ac04 Merge pull request #2029 from skyeforeverblue/patch-1 GriffinR 2024-09-14 10:56:41 -04:00
  • 302193a814 Have scaninc ignore non-existing files GriffinR 2024-09-13 23:40:00 -04:00
  • b8c71fa84d Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings GriffinR 2024-09-13 23:38:50 -04:00
  • 7007439be8 Remove old ld_script processing GriffinR 2024-09-12 13:50:47 -04:00
  • d9b824db3f Sync missing alignment from pokefirered GriffinR 2024-09-12 12:27:31 -04:00
  • 9e22bf1af4 Merge pull request #1957 from Icedude907/build-music-config GriffinR 2024-09-12 10:46:30 -04:00
  • 51131e2582 Merge pull request #1954 from Icedude907/build-scaninc-speed GriffinR 2024-09-12 10:45:41 -04:00
  • a75be4124d Update pull_request_template.md to include Discord username update Skye Chappelle 2024-09-10 23:39:41 -04:00
  • 28786b42a6 Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft Skye Chappelle 2024-09-10 23:36:13 -04:00
  • cfdb06a813 Merge pull request #2028 from NTx86/fix-contest-ai-point-macros GriffinR 2024-09-08 14:47:28 -04:00
  • 71fcb2e7b5 Fix incorrect point macros in contest_ai_script.inc NT_x86 2024-09-08 12:50:35 +03:00
  • abbb7dbb21 Fix swapped cycling road entrances GriffinRichards 2024-08-31 05:58:10 +00:00
  • 04197b4912 Fix swapped cycling road entrances GriffinR 2024-08-31 01:54:25 -04:00
  • 32f05269a3 Add missing terminal newlines GriffinR 2024-08-31 00:53:23 -04:00
  • c265c3f837 Merge branch 'master' of https://github.com/pret/pokeemerald into build-music-config GriffinR 2024-08-31 00:51:15 -04:00
  • 2d5231149e Merge branch 'master' of https://github.com/pret/pokeemerald into build-scaninc-speed GriffinR 2024-08-31 00:39:48 -04:00
  • 4d74dd5e33 Merge pull request #1950 from Icedude907/build-makefile-cleanup GriffinR 2024-08-31 00:36:50 -04:00
  • a4dd821658 Restore review changes from dependent PR GriffinR 2024-08-31 00:32:43 -04:00
  • 19ad2e16ac Merge branch 'master' of https://github.com/pret/pokeemerald into build-makefile-cleanup GriffinR 2024-08-31 00:10:55 -04:00
  • 625a006cab [Build System Rewrite] mapjson now takes output directory parameters. (#1949) Icedude907 2024-08-30 06:01:01 +12:00
  • 7532f8ddb8 Revert MB name changes GriffinR 2024-08-28 11:19:27 -04:00
  • 113226b03a Change metatile behaviors to enum (#2027) psf 2024-08-27 21:45:09 -07:00
  • bc7c46ffe2 Merge pull request #2026 from mrgriffin/preproc-enum-arbitrary-expr GriffinR 2024-08-26 00:02:41 -04:00
  • ac28fc52e5 Merge pull request #2007 from cawtds/ub-fix-battle-transition Martin Griffin 2024-08-21 19:08:07 +01:00
  • 56d3faa32f Merge pull request #2025 from Bassoonian/cleandefinespaces Martin Griffin 2024-08-21 19:04:12 +01:00
  • ea726eee31 Merge pull request #2024 from luckytyphlosion/master Martin Griffin 2024-08-21 19:02:03 +01:00
  • 5c55cc3748 [preproc] support arbitrary expressions in enums Martin Griffin 2024-08-21 07:50:41 +01:00
  • 936d9eefa5 Fix trainer match call flags SBird1337 2024-08-15 21:03:31 +00:00
  • 3f49c5cbaf Fix trainer match call flags GriffinR 2024-08-07 16:24:30 -04:00
  • c1ee43254e Clean up defines lacking spaces Bassoonian 2024-08-15 19:34:56 +02:00
  • 7d921fa89b Slight storage system documentation luckytyphlosion 2024-08-14 18:27:44 -04:00
  • 5fefd743a2 Fix defines in MAP_NUM and MAP_GROUP Bassoonian 2024-08-14 13:02:40 +02:00
  • a3d5f54b75 Fix type for offset in MapConnection GriffinR 2024-07-01 15:51:15 -04:00
  • 312749dd31 Changed type1 and type2 to be consistent (#2021) psf 2024-08-06 22:44:03 -07:00
  • 9a3c6d072b Merge pull request #2018 from fdeblasio/fixMtPyreLabel GriffinR 2024-08-05 11:27:01 -04:00
  • 62b4ea5aaa Fixed bottom half of Mt. Pyre not being labeled in PokeNav Frank 2024-08-01 13:18:29 -04:00
  • 30f8ccfe6e Merge pull request #2017 from PokemonSanFran/numSnowflakeSpritesConstant Martin Griffin 2024-07-27 07:26:40 +01:00
  • 91b48a10d4 Added constant for NUM_SNOWFLAKE_SPRITES pkmnsnfrn 2024-07-26 21:57:42 -07:00
  • 7316e54161 Merge pull request #2016 from luckytyphlosion/master luckytyphlosion 2024-07-26 19:22:58 -04:00
  • 3d2b861436 Fix WSL1 install instructions luckytyphlosion 2024-07-23 17:53:19 -04:00
  • 550e6688aa Support C-Style enum in preproc (#1984) Philipp AUER 2024-07-13 19:26:33 +02:00
  • 367f6dc8fd Address concerns Bassoonian 2024-07-13 18:01:54 +02:00