ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,466 Commits 1 Branch 0 Tags 235 MiB
4a6ea87247
Commit Graph

7466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR
4a6ea87247
Merge pull request #1865 from AsparagusEduardo/pret/doc/species2 
Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarity
 2023-02-27 13:06:04 -05:00
GriffinR
c7b50c6dcb
Merge pull request #1866 from AsparagusEduardo/pret/feature/toolsWhitelist 
Whitelist instead of Blacklist for TOOLDIRS in Makefiles
 2023-02-27 12:59:52 -05:00
GriffinR
be84793713 Let scaninc/preproc ignore empty asm files 2023-02-27 12:47:35 -05:00
GriffinR
588100e4ab
Merge pull request #1867 from Zunawe/fix-item-flag 
Fix wrong route in item flag name
 2023-02-25 17:12:08 -05:00
Zunawe
f376b71f7c Fix wrong route in item flag name 2023-02-25 13:48:39 -08:00
Eduardo Quezada
d00c8902f9 Whitelist instead of Blacklist for TOOLDIRS in Makefiles 2023-02-25 16:49:41 -03:00
Eduardo Quezada
079ca8ab29 Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification 2023-02-24 07:53:02 -03:00
GriffinR
f209a5a66c
Merge pull request #1863 from Zunawe/fix-hidden-item-flag 
Fix wrong route in hidden item flag name
 2023-02-22 16:20:55 -05:00
Zunawe
60be59d18b Fix wrong route in hidden item flag name 2023-02-22 13:13:57 -08:00
GriffinR
d45e67e16e
Merge pull request #1862 from Zunawe/fix-spelling 
Fix spelling mistake for item flag
 2023-02-20 22:10:07 -05:00
Zunawe
8f74a6777a Fix spelling mistake for item flag 2023-02-20 18:17:30 -08:00
GriffinR
f888021c8f
Merge pull request #1857 from GriffinRichards/sync-mapjson 
Sync mapjson
 2023-02-19 20:48:13 -05:00
GriffinR
a164a021e4
Merge pull request #1861 from LOuroboros/metatitle 
Fixed minor spelling mistake
 2023-02-17 15:26:38 -05:00
LOuroboros
4be4ec3081 metatitleBehavior -> metatileBehavior 2023-02-17 16:43:22 -03:00
GriffinR
bc3805f9d3 Fix two binary palettes 2023-02-17 13:27:39 -05:00
GriffinR
69fdf0faa4
Merge pull request #1853 from GriffinRichards/doc-contest-bar 
Clarify AI_CV_AttackDown_UnknownTypeList
 2023-02-15 11:29:57 -05:00
GriffinR
ef950e6663
Merge pull request #1852 from GriffinRichards/doc-windows 
Document window IDs
 2023-02-15 10:47:13 -05:00
GriffinR
a322379feb
Merge branch 'master' into doc-windows 2023-02-15 10:04:48 -05:00
GriffinR
9c1c598160 GROUPTYPE_NONE to unsigned 2023-02-15 09:49:33 -05:00
GriffinR
c32fbf594a
Merge pull request #1851 from GriffinRichards/doc-fldspc 
Document remaining field_specials task data
 2023-02-08 22:34:57 -05:00
GriffinR
c29cf5a5e5 Remove unnecessary version check 2023-02-08 13:34:38 -05:00
GriffinR
de56e400ff Sync clone object macro 2023-02-08 13:11:10 -05:00
GriffinR
118a9701c9 Add event type errors 2023-02-08 12:52:28 -05:00
GriffinR
db5edc49d7 Sync mapjson 2023-02-08 12:52:06 -05:00
GriffinR
bbf0cf0103 Stop hard-coding number of preset names 2023-02-04 00:00:38 -05:00
GriffinR
5496f0e6b0
Merge pull request #1850 from GriffinRichards/sync-trade 
Sync trade
 2023-02-03 19:05:00 -05:00
GriffinR
c1cfd3ac66 Add fix for commented bug 2023-02-03 16:01:13 -05:00
GriffinR
6c3bc86b56
Merge pull request #1856 from Jaizu/patch-4 
Make contest opponents an enum
 2023-02-03 12:42:13 -05:00
Jaizu
717ba22ea1
Make contest opponents an enum 
I'm sure that at least 2 people eventually might consider editing them, this makes it easier.
 2023-02-03 15:49:22 +01:00
GriffinR
62aed217fe Remove unused common symbols in window.c 2023-02-01 16:14:32 -05:00
GriffinR
28ada9c93b Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest-bar 2023-02-01 15:52:19 -05:00
GriffinR
020266463c Add fix for described UB 2023-02-01 15:44:48 -05:00
GriffinR
07e00b2e41 Additional window id constant usage 2023-02-01 15:24:15 -05:00
GriffinR
4328ed8b19 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows 2023-02-01 14:59:45 -05:00
GriffinR
30f893f255 Fix comment mistake 2023-02-01 11:52:32 -05:00
GriffinR
9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
GriffinR
43af7d46ca Label data for elevator effects 2023-02-01 10:43:10 -05:00
GriffinR
27a5e05f75 Label data for screen effect tasks 2023-02-01 10:20:23 -05:00
GriffinR
603d870ea0 Fix debug printing negative values 2023-02-01 09:36:18 -05:00
GriffinR
65d476d575 Remove some incorrect color constant usage 2023-02-01 09:32:41 -05:00
GriffinR
f4cb6d229f Add some missing sizeof usage for SpriteSheets 2023-01-24 17:04:48 -05:00
GriffinR
10230799d3 Simplify some max value macros 2023-01-23 16:01:46 -05:00
GriffinR
7681340966 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade 2023-01-23 14:45:51 -05:00
GriffinR
f40fad528d
Merge pull request #1847 from GriffinRichards/mapjson-err 
Better type conversions and errors for mapjson
 2023-01-22 18:38:06 -05:00
GriffinR
29c1af50ca Fix Best Streak stat name 2023-01-20 11:25:04 -05:00
GriffinR
0851e55ccb
Merge pull request #1657 from PikalaxALT/sync_battle_anim_args 
Sync battle anim args
 2023-01-18 12:16:49 -05:00
GriffinR
b7d92e8537 Revert incorrect constant usage, add new correct ones 2023-01-18 12:11:09 -05:00
GriffinR
d1e4bd44ce Correct comment in maps.h 2023-01-18 11:54:06 -05:00
GriffinR
5a906c33ac
Merge branch 'master' into sync_battle_anim_args 2023-01-18 11:47:33 -05:00
GriffinR
ff3168f6cc
Merge pull request #1746 from mrgriffin/ui-standardize 
Standardize the UI code
 2023-01-18 11:15:52 -05:00