Commit Graph

3563 Commits

Author SHA1 Message Date
GriffinR
0ef7307040
Merge pull request #503 from colonelsalt/document_transform
Some documentation of transform types
2022-05-13 05:17:42 -04:00
colonelsalt
1bca7cadc1 Rename transform arg in header as well 2022-05-13 08:47:57 +01:00
colonelsalt
ed9dcb2fbe Some documentation of transform types 2022-05-13 08:24:02 +01:00
lioniac
6cf06255c0
Added missing SHINY_ODDS replacements (#502) 2022-05-09 23:04:35 -04:00
garakmon
c518cba3ec use json for region map sections
- also update wild encounters inja template to consider whitespace trimming
2022-04-21 20:21:58 -04:00
GriffinR
dca627c6bf
Merge pull request #497 from GriffinRichards/update-build
Update Makefile to not require gcc-arm-none-eabi
2022-03-19 15:25:04 -04:00
GriffinR
4643644d7f Update Makefile to not require gcc-arm-none-eabi 2022-03-15 13:03:12 -04:00
GriffinR
3bdf9d7c65
Merge pull request #496 from GriffinRichards/sync-webhook
Add line breaks around webhook output
2022-03-14 15:26:26 -04:00
GriffinR
f8aa4419fc Add line breaks around webhook output 2022-03-14 15:16:50 -04:00
GriffinR
ac5274b8c2
Merge pull request #494 from PikalaxALT/replace-install
Sync INSTALL.md with Emerald
2022-03-14 09:58:54 -04:00
PikalaxALT
aea142ba03 Fix two stale references to emerald in legacy_WSL1_INSTALL.md 2022-03-14 08:49:14 -04:00
PikalaxALT
ccd694f665 Sync INSTALL.md with Emerald 2022-03-13 16:04:56 -04:00
GriffinR
b7a624077c
Merge pull request #492 from GriffinRichards/sync-poke-jump
Sync pokemon jump
2022-03-05 12:28:07 -05:00
GriffinR
16aacb0648 Sync pokemon jump documentation 2022-03-02 02:05:07 -05:00
GriffinR
82f0cced2d Merge pokemon jump files 2022-03-01 17:53:05 -05:00
GriffinR
fdfc8318c7
Merge pull request #491 from GriffinRichards/doc-anims
Document/sync object event anims
2022-03-01 09:51:09 -05:00
GriffinR
cd9d40b3cd Add usage of ANIM_GET_ON_OFF_POKEMON_WEST, unused comments 2022-02-28 15:10:53 -05:00
GriffinR
a5e6e91605 Document/sync object event anims 2022-02-28 13:17:57 -05:00
GriffinR
7cc59fbb11
Merge pull request #490 from cbt6/movement-action-0x9f
Rename movement action 0x9F
2022-02-28 10:41:16 -05:00
cbt6
7ae187a2dd Add clarifying comment 2022-02-28 23:27:26 +08:00
cbt6
0aaae88d6e Rename movement action 0x9F 2022-02-28 23:12:57 +08:00
GriffinR
23d7c00c62
Merge branch 'master' into clone-union 2022-02-22 18:42:20 -05:00
GriffinR
759f373d31
Merge pull request #488 from GriffinRichards/map-constants
Sync roamer.c, add missing map constant usage
2022-02-14 21:17:44 -05:00
GriffinR
8d85ff1683
Merge pull request #487 from GriffinRichards/trainer-type-constants
Add missing trainer type constant usage
2022-02-11 19:52:26 -05:00
GriffinR
59695b8221 Sync roamer 2022-02-11 15:05:15 -05:00
GriffinR
24f18af338 Add missing map constant usage 2022-02-11 14:43:38 -05:00
GriffinR
2598b285bb Add missing trainer type constant usage 2022-02-11 13:26:55 -05:00
GriffinR
91076d9408
Merge pull request #486 from Deokishisu/patch-4
Fix Magic Number in sub_8064544 in event_object_movement.c
2022-02-11 07:57:26 -05:00
Deokishisu
27c3f7204a
Fix Magic Number in sub_8064544 in event_object_movement.c
`sub_8064544()` has something to do with handling boulder puzzles and used a magic number instead of `OBJ_EVENT_GFX_PUSHABLE_BOULDER` while checking the object's `graphicsId`. This has been fixed.
2022-02-11 06:19:16 -05:00
GriffinR
9f2ac797d3
Merge pull request #485 from cbt6/movement
Rename some movement actions and functions
2022-02-09 13:07:59 -05:00
cbt6
0f3e26f9a4 Fix formatting and style 2022-02-10 01:53:48 +08:00
cbt6
7de67831e9 Add macros for renamed movement actions 2022-02-10 01:48:28 +08:00
cbt6
ac3de6d02c Rename some movement actions and functions 2022-02-10 00:20:22 +08:00
GriffinR
38601cf09b Reformat clone objects in JSON 2022-02-05 14:34:53 -05:00
GriffinR
dd5f6ccd3b Add union for clone objects 2022-02-05 13:42:46 -05:00
GriffinR
bef2668d8b
Merge pull request #481 from GriffinRichards/sync-classes
Sync/update trainer classes
2022-01-21 19:26:14 -05:00
GriffinR
7fb97f9e25
Merge pull request #483 from GriffinRichards/remove-berry-fix
Remove berry fix
2022-01-15 13:11:24 -05:00
GriffinR
cf41c78370 Remove berry fix 2022-01-15 13:03:36 -05:00
GriffinR
f8ab09b4b4
Merge pull request #482 from GriffinRichards/remove-old-asm-constants
Remove old asm constants
2022-01-11 02:20:18 -05:00
GriffinR
53eca1d3a7 Remove old asm constants 2022-01-10 19:39:09 -05:00
GriffinR
08a18d6e32 Sync/update trainer classes 2022-01-10 13:48:08 -05:00
GriffinR
d0c79e4e47
Merge pull request #480 from GriffinRichards/map-preview-gfx
Clean up map preview graphics
2022-01-06 23:39:01 -05:00
GriffinR
2a59523ad9 Re-export map preview gfx with palettes and sensible sizes 2022-01-06 17:20:55 -05:00
GriffinR
26c496e099 Decompress map preview tilemaps 2022-01-06 15:34:55 -05:00
GriffinR
f1121b1593 Move map preview gfx to own folders 2022-01-06 15:26:00 -05:00
GriffinR
cb7b53adee
Merge pull request #479 from Birdulon/PartySize
Fix party size calculations for larger-than-six PARTY_SIZE
2022-01-01 10:20:01 -05:00
Luke Hubmayer-Werner
92d6d97c65 Fix party size calculations for larger-than-six PARTY_SIZE 2022-01-01 22:23:41 +10:30
GriffinR
4c023cb8c7
Merge pull request #478 from GriffinRichards/fix-baldingman
Fix balding man palette
2021-12-03 20:23:21 -05:00
GriffinR
0b61e91d6c Fix balding man palette 2021-12-03 19:54:36 -05:00
GriffinR
7b913802ab
Merge pull request #477 from GriffinRichards/sync-global
Sync global
2021-11-28 15:50:13 -05:00