GriffinR
|
a551efea43
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2024-09-19 12:33:34 -04:00 |
|
GriffinR
|
473e0623ba
|
Merge pull request #2031 from GriffinRichards/fix-toolchain
Minor toolchain fixes
|
2024-09-19 12:23:58 -04:00 |
|
GriffinR
|
8f41d9eb17
|
Merge branch 'master' into fix-toolchain
|
2024-09-19 12:20:51 -04:00 |
|
GriffinR
|
635325304b
|
Merge pull request #2033 from Kurausukun/goodbye_gflib
Remove gflib
|
2024-09-19 12:19:48 -04:00 |
|
GriffinR
|
e4e90eacd6
|
Merge pull request #2023 from Bassoonian/updatemapmacros
Fix defines in MAP_NUM and MAP_GROUP
|
2024-09-19 12:17:16 -04:00 |
|
Bassoonian
|
cafeb3fa92
|
Update wild encounters json template
|
2024-09-19 11:27:02 +02:00 |
|
Bassoonian
|
49735754c3
|
Remove accidental expansion leftovers
|
2024-09-19 11:23:33 +02:00 |
|
Kurausukun
|
9cb353179b
|
fix indentation
|
2024-09-18 10:42:28 -04:00 |
|
Kurausukun
|
52c2728ff6
|
remove gflib
|
2024-09-18 10:37:34 -04:00 |
|
GriffinR
|
62c27faba4
|
Merge pull request #2032 from DizzyEggg/patch-1
remove ScriptContext_Enable from secret_base.h
|
2024-09-14 13:17:26 -04:00 |
|
DizzyEggg
|
c4b5818d98
|
remove ScriptContext_Enable from secret_base.h
|
2024-09-14 19:13:02 +02:00 |
|
GriffinR
|
db898f8baa
|
Merge pull request #2030 from skyeforeverblue/patch-2
Update pull_request_template.md to include Discord username update
|
2024-09-14 10:56:50 -04:00 |
|
GriffinR
|
bc58a4ac04
|
Merge pull request #2029 from skyeforeverblue/patch-1
Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft
|
2024-09-14 10:56:41 -04:00 |
|
GriffinR
|
302193a814
|
Have scaninc ignore non-existing files
|
2024-09-14 00:28:57 -04:00 |
|
GriffinR
|
b8c71fa84d
|
Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings
|
2024-09-13 23:38:50 -04:00 |
|
GriffinR
|
7007439be8
|
Remove old ld_script processing
|
2024-09-12 13:50:47 -04:00 |
|
GriffinR
|
d9b824db3f
|
Sync missing alignment from pokefirered
|
2024-09-12 12:27:31 -04:00 |
|
GriffinR
|
9e22bf1af4
|
Merge pull request #1957 from Icedude907/build-music-config
[Build System Rewrite] Improved audio rules
|
2024-09-12 10:46:30 -04:00 |
|
GriffinR
|
51131e2582
|
Merge pull request #1954 from Icedude907/build-scaninc-speed
[Build System Rewrite] Massive build speed improvement via scaninc changes
|
2024-09-12 10:45:41 -04:00 |
|
Skye Chappelle
|
a75be4124d
|
Update pull_request_template.md to include Discord username update
|
2024-09-10 23:39:41 -04:00 |
|
Skye Chappelle
|
28786b42a6
|
Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft
|
2024-09-10 23:36:13 -04:00 |
|
GriffinR
|
cfdb06a813
|
Merge pull request #2028 from NTx86/fix-contest-ai-point-macros
Fix incorrect point macros in contest_ai_script.inc
|
2024-09-08 14:47:28 -04:00 |
|
NT_x86
|
71fcb2e7b5
|
Fix incorrect point macros in contest_ai_script.inc
|
2024-09-08 12:50:35 +03:00 |
|
GriffinR
|
04197b4912
|
Fix swapped cycling road entrances
|
2024-08-31 01:54:25 -04:00 |
|
GriffinR
|
32f05269a3
|
Add missing terminal newlines
|
2024-08-31 00:53:23 -04:00 |
|
GriffinR
|
c265c3f837
|
Merge branch 'master' of https://github.com/pret/pokeemerald into build-music-config
|
2024-08-31 00:51:15 -04:00 |
|
GriffinR
|
2d5231149e
|
Merge branch 'master' of https://github.com/pret/pokeemerald into build-scaninc-speed
|
2024-08-31 00:39:48 -04:00 |
|
GriffinR
|
4d74dd5e33
|
Merge pull request #1950 from Icedude907/build-makefile-cleanup
[Build System Rewrite] Refactored `Makefile`
|
2024-08-31 00:36:50 -04:00 |
|
GriffinR
|
a4dd821658
|
Restore review changes from dependent PR
|
2024-08-31 00:33:02 -04:00 |
|
GriffinR
|
19ad2e16ac
|
Merge branch 'master' of https://github.com/pret/pokeemerald into build-makefile-cleanup
|
2024-08-31 00:17:07 -04:00 |
|
Icedude907
|
625a006cab
|
[Build System Rewrite] mapjson now takes output directory parameters. (#1949)
|
2024-08-29 14:01:01 -04:00 |
|
GriffinR
|
7532f8ddb8
|
Revert MB name changes
|
2024-08-28 11:19:27 -04:00 |
|
psf
|
113226b03a
|
Change metatile behaviors to enum (#2027)
|
2024-08-28 00:45:09 -04:00 |
|
GriffinR
|
bc7c46ffe2
|
Merge pull request #2026 from mrgriffin/preproc-enum-arbitrary-expr
preproc: support arbitrary expressions in enums
|
2024-08-26 00:02:41 -04:00 |
|
Martin Griffin
|
ac28fc52e5
|
Merge pull request #2007 from cawtds/ub-fix-battle-transition
UB fix in battle_transition.c
|
2024-08-21 19:08:07 +01:00 |
|
Martin Griffin
|
56d3faa32f
|
Merge pull request #2025 from Bassoonian/cleandefinespaces
Clean up defines lacking spaces
|
2024-08-21 19:04:12 +01:00 |
|
Martin Griffin
|
ea726eee31
|
Merge pull request #2024 from luckytyphlosion/master
Slight storage system documentation
|
2024-08-21 19:02:03 +01:00 |
|
Martin Griffin
|
5c55cc3748
|
[preproc] support arbitrary expressions in enums
|
2024-08-21 07:50:41 +01:00 |
|
GriffinR
|
3f49c5cbaf
|
Fix trainer match call flags
|
2024-08-15 23:00:20 +02:00 |
|
Bassoonian
|
c1ee43254e
|
Clean up defines lacking spaces
|
2024-08-15 19:34:56 +02:00 |
|
luckytyphlosion
|
7d921fa89b
|
Slight storage system documentation
|
2024-08-14 18:27:44 -04:00 |
|
Bassoonian
|
5fefd743a2
|
Fix defines in MAP_NUM and MAP_GROUP
|
2024-08-14 13:02:40 +02:00 |
|
GriffinR
|
a3d5f54b75
|
Fix type for offset in MapConnection
|
2024-08-13 19:10:24 +02:00 |
|
psf
|
312749dd31
|
Changed type1 and type2 to be consistent (#2021)
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo
* Changed monType1 and monType2 to monTypes to match gSpeciesInfo
|
2024-08-07 06:44:03 +01:00 |
|
GriffinR
|
9a3c6d072b
|
Merge pull request #2018 from fdeblasio/fixMtPyreLabel
Fixed bottom half of Mt. Pyre not being labeled in PokeNav
|
2024-08-05 11:27:01 -04:00 |
|
Frank
|
62b4ea5aaa
|
Fixed bottom half of Mt. Pyre not being labeled in PokeNav
|
2024-08-01 13:34:17 -04:00 |
|
Martin Griffin
|
30f8ccfe6e
|
Merge pull request #2017 from PokemonSanFran/numSnowflakeSpritesConstant
Added constant for NUM_SNOWFLAKE_SPRITES
|
2024-07-27 07:26:40 +01:00 |
|
pkmnsnfrn
|
91b48a10d4
|
Added constant for NUM_SNOWFLAKE_SPRITES
|
2024-07-26 21:57:42 -07:00 |
|
luckytyphlosion
|
7316e54161
|
Merge pull request #2016 from luckytyphlosion/master
Fix WSL1 install instructions
|
2024-07-26 19:22:58 -04:00 |
|
luckytyphlosion
|
3d2b861436
|
Fix WSL1 install instructions
|
2024-07-23 17:53:19 -04:00 |
|