GriffinR
5496f0e6b0
Merge pull request #1850 from GriffinRichards/sync-trade
...
Sync trade
2023-02-03 19:05:00 -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
7681340966
Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade
2023-01-23 14:45:51 -05:00
GriffinR
18384894e0
Merge pull request #1822 from AsparagusEduardo/pret/doc/typesEggGroups
...
Made Types and Egg Groups into arrays
2023-01-15 00:27:20 -05:00
Eduardo Quezada
70d59d6aa9
Improve Easy Chat documentation
2023-01-15 02:15:11 -03:00
GriffinR
b873d69679
Sync trade anim
2023-01-09 15:32:04 -05:00
GriffinR
347a02ace1
Sync trade
2022-12-15 15:40:59 -05:00
Eduardo Quezada
2f96344cd9
Removed ANIM_CMD macro from unused_anims.h
2022-12-10 11:46:41 -03:00
Eduardo Quezada
2d694a84e3
Trying to fix remote reference
2022-12-05 21:57:28 -03:00
Eduardo Quezada
7999220361
Fixed modern compile
2022-11-22 18:37:38 -03:00
Eduardo Quezada
7327be6f9e
Made Types and Egg Groups into arrays
2022-11-22 17:05:25 -03:00
GriffinR
4736b4b14d
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename
...
Renamed gBaseStats to gSpeciesInfo
2022-11-18 17:45:23 -05:00
GriffinR
e434b0047f
More missing constant usage
2022-11-09 15:53:47 -05:00
GriffinR
1d1c2d41bb
Add list menu cursor constants
2022-11-09 15:16:46 -05:00
GriffinR
b3e75138da
Sync wireless improvements
2022-11-09 15:14:18 -05:00
Eduardo Quezada
14e85249d1
Review changes
2022-10-30 17:12:13 -03:00
GriffinR
d90132842a
Update gitignore/spacing for new region map data
2022-10-30 12:22:41 -04:00
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5
...
Update for Porymap 5.0.0
2022-10-30 11:01:37 -04:00
Eduardo Quezada
85c0d2dac8
Review changes
2022-10-27 11:26:09 -03:00
Eduardo Quezada
85ce30b1d6
Created macros for Bard Sounds
2022-10-25 14:33:02 -03:00
Eduardo Quezada
3ed485632f
Renamed gBaseStats to gSpeciesInfo
2022-10-24 17:01:48 -03:00
GriffinR
3e8baa5b04
Merge branch 'master' into porymap-5
2022-10-18 22:54:25 -04:00
GriffinR
bd023b1c6c
Merge pull request #1796 from GriffinRichards/tilesets-c
...
Convert tilesets.s to C
2022-10-10 12:47:47 -04:00
GriffinR
65d3944a93
Give tileset palettes proper type, name compressed secret base tiles
2022-10-08 02:02:12 -04:00
GriffinR
e293986fbb
Merge pull request #1793 from GriffinRichards/clean-shop
...
Clean up shop.c
2022-10-06 17:24:53 -04:00
GriffinR
6db489e2d5
Use constants for overworld object palette slots
2022-09-27 20:16:48 -04:00
GriffinR
4f407a1066
Convert tilesets.s to C
2022-09-27 17:23:26 -04:00
GriffinR
f0744641d1
Merge pull request #1651 from garakmon/entry_json
...
use json for region map sections
2022-09-25 21:56:09 -04:00
GriffinR
171367d66c
Merge pull request #1643 from cbt6/object-event-graphics-info
...
Format object event graphics info
2022-09-25 21:55:22 -04:00
GriffinR
56c28fb2dd
Move region map gitignore to existing data gitignore
2022-09-25 18:15:16 -04:00
GriffinR
e473aaf783
Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json
2022-09-25 18:10:04 -04:00
GriffinR
7223dbd62f
Merge branch 'master' into rme-update
2022-09-25 11:56:57 -04:00
GriffinR
1107ff954d
Clean up shop.c
2022-09-22 15:08:17 -04:00
GriffinR
9bcc36fe08
Merge pull request #1767 from GriffinRichards/trainer-pals
...
Generate trainer pic palettes from image
2022-09-22 11:34:03 -04:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
Eduardo Quezada
1fa9bc1b5c
Adjusted style of coords tables
2022-09-08 18:32:01 -04:00
Eduardo Quezada
12bb32666b
Aligned FRONTIER_MONS trainer macros with the rest for consistency
2022-09-06 17:05:56 -04:00
GriffinR
c8afeea182
Generate trainer pic palettes from image
2022-09-05 16:09:45 -04:00
tustin2121
33f10d2139
Adding missing externs
...
If there are not externs on these forward declarations, it's entirely possible for the program to link and missing data to be assigned to someplace presumed in IWRAM or something.
2022-09-05 09:49:20 -04:00
GriffinR
898ec580ae
Merge pull request #1737 from GriffinRichards/lock-unlock
...
Clean up lock/unlock anim movement
2022-08-22 01:30:33 -04:00
GriffinR
30906762ed
Merge pull request #1740 from AsparagusEduardo/pret_stringTabs
...
Fixed inconsistent use of white space for scripts, .c files and .h files.
2022-08-20 23:03:59 -04:00
GriffinR
81ef818f61
Merge pull request #1731 from GriffinRichards/missing-tag
...
Move party menu data constants
2022-08-20 22:43:52 -04:00
Eduardo Quezada
5933c42439
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
Eduardo Quezada
e8a05e92e4
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
GriffinR
5515e328b2
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
GriffinR
f534e8e44a
Move party menu data constants
2022-08-10 14:30:01 -04:00
GriffinR
99a37b5aa5
Merge pull request #1717 from mrgriffin/trainer-party-macro
...
Macros for keeping .partyFlags, .partySize, and .party in sync
2022-08-02 13:11:43 -04:00
Eduardo Quezada
2e1bf0d965
OamData mosaic FALSE
2022-07-29 21:27:39 -04:00
Martin Griffin
2380d13a43
Macros for keeping .partyFlags, .partySize, and .party in sync
2022-07-27 23:25:37 +01:00
GriffinR
277750b088
Merge branch 'master' into rme-update
2022-06-22 10:02:17 -04:00
