GriffinR
0eb6d1d74c
Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants
2024-10-15 22:04:45 -04:00
GriffinR
da9c0239d9
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
2024-10-15 22:02:40 -04:00
luckytyphlosion
a55c75d350
Get rid of common syms ( #2040 )
2024-10-14 23:52:11 -04:00
mid-kid
253d3dd7ef
Remove unnecessary looping for rule generation and unroll macros ( #2046 )
2024-10-14 23:47:07 -04:00
GriffinR
a0be2cbf7b
Fix Fallorbor typo
2024-10-12 23:50:12 -04:00
GriffinR
f61c0099b9
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
GriffinR
bf17d54b52
Finish adding local IDs to map.json files
2024-10-12 23:32:28 -04:00
GriffinR
cb66ea6653
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
GriffinR
a2a3255bdd
Fix typo, remove old size check
2024-10-12 03:30:35 -04:00
GriffinR
9f31b0fe90
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
GriffinR
6518f1e3ff
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
2024-10-11 15:26:58 -04:00
GriffinR
091b7269df
Move heal locations data to their associated map.json ( #2034 )
2024-10-11 15:15:55 -04:00
GriffinR
b6892f5b67
Let scaninc ignore empty C files
2024-10-11 15:03:38 -04:00
mid-kid
2c7964dbc2
Fix deleting files with dependency files ( #2045 )
2024-10-11 14:33:32 -04:00
Martin Griffin
fcc067e515
[preproc] support C23 enum underlying type syntax ( #2043 )
2024-10-11 13:50:26 -04:00
GriffinR
af8f4bf45d
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
2024-10-11 13:38:04 -04:00
GriffinR
6d24d8a78f
Fix libpng installation for workflow on Ubuntu 24.04
2024-10-11 13:29:16 -04:00
Martin Griffin
6395d55b43
Merge pull request #2044 from AreaZR/Excessive
...
Fix typo: | should be || in Task_TryFieldPoisonWhiteOut
2024-10-10 20:26:12 +01:00
Rose
9ad0018c17
Fix typo: | should be || in Task_TryFieldPoisonWhiteOut
...
Yes, this is honestly overkill, as it doesn't actually fix any behavioral bugs, but I was suggested to do this. This was a typo made in the source that GameFreak made, and the compiler warns against this. I opened a PR in pokeemerald expansion and was suggested to open one here.
2024-10-10 10:27:33 -04:00
psf
9a24c031bb
Replaced copyright magic numbers in intro.c with constants ( #2035 )
2024-10-02 20:48:54 -04:00
GriffinR
2b73d10a2a
Merge pull request #2041 from Jaizu/patch-9
...
Ignore mGBA screenshots
2024-10-02 15:35:20 -04:00
GriffinR
44e9228a6e
Merge pull request #2038 from GriffinRichards/gflib-syms
...
Remove explicit symbol sizes in sym_common.txt
2024-10-02 15:34:42 -04:00
GriffinR
37d104f7a5
Merge pull request #2039 from Scyrous/patch-1
...
Bugfix for cable car hikerGraphicsIds array
2024-10-02 15:34:22 -04:00
Jaizu
c8cc0fa5a3
Ignore mGBA screenshots
...
Everytime I make a new project I suffer, please merge.
2024-10-01 10:07:45 +02:00
Scyrous
1dc85df1f0
Update cable_car.c
2024-09-29 14:38:08 +02:00
Scyrous
8e2c3ca3f2
Bugfix for cable car sprite array count
2024-09-29 14:13:50 +02:00
GriffinR
80a37c16be
Remove explicit symbol sizes in sym_common.txt
2024-09-25 16:14:10 -04:00
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
