Commit Graph

3226 Commits

Author SHA1 Message Date
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 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
GriffinR 7e38583a5d Rotating Gate -> dir stair warp 2021-11-20 10:50:22 -05:00
GriffinR b2c74cae84 Sync global 2021-11-19 20:36:59 -05:00
GriffinR 6282f75cae Merge pull request #476 from Jademalo/patch-1
Add missing semicolon in charmap
2021-11-18 22:08:38 -05:00
Jademalo cf94e1841f Add missing semicolon in charmap 2021-11-19 02:57:48 +00:00
GriffinR cd4462f58c Merge pull request #474 from lioniac/master
Multiple renamings and removed some orphaned functions
2021-11-01 15:25:22 -04:00
lioniac e006569719 Deleted unused pokenav header 2021-11-01 16:14:59 -03:00
lioniac 0cc1d8a1b5 Multiple renamings; Removed some orphaned functions 2021-10-27 11:56:03 -03:00
GriffinR 471608b56a Merge pull request #473 from Jademalo/ide-support
Improve IDE Support
2021-10-23 09:44:08 -04:00
Jademalo 1c4d5bfed0 IDE support formatting and consistency 2021-10-23 10:10:06 +01:00
Jademalo 46867c546d Improve IDE Support 2021-10-22 04:42:48 +01:00
GriffinR 6eaca5f0d0 Merge pull request #472 from lioniac/master
Few renamings based on Emerald
2021-10-18 14:47:44 -04:00
lioniac d9800a63e0 Few renamings based on Emerald 2021-10-18 15:33:46 -03:00
GriffinR 89b0351666 Merge pull request #471 from GriffinRichards/sync-calcrom
Make calcrom data info optional
2021-10-15 09:20:57 -04:00
GriffinR 434cc62b7c Make calcrom data info optional 2021-10-15 09:12:46 -04:00
GriffinR 7f123f4d0f Merge pull request #470 from GriffinRichards/fix-saveblockchunk
Disallow negative sizes in SAVEBLOCK_CHUNK
2021-10-13 13:43:58 -04:00
GriffinR 490300daab Disallow negative sizes in SAVEBLOCK_CHUNK 2021-10-13 13:29:17 -04:00
IIMarckus 466e98a983 Kill Freenode. 2021-10-08 04:58:28 -06:00
GriffinR 6eaeceb3ef Merge pull request #467 from GriffinRichards/sync-fieldmap
Sync fieldmap.c
2021-10-01 18:30:55 -04:00
GriffinR 1460774d1d Sync fieldmap.c 2021-10-01 17:56:14 -04:00
GriffinR 1f7eb7ea01 Merge pull request #466 from Deokishisu/master
Fix Magic Numbers in battle_anim_scripts.s
2021-10-01 00:26:48 -04:00
Deokishisu 18ca5ef678 Fix Magic Numbers in battle_anim_scripts.s
This file should still be synced properly with pokeemerald in the future, but for now the magic numbers for the sound constants have been fixed.
2021-10-01 00:01:16 -04:00
GriffinR fb1bca5b3e Merge pull request #464 from colonelsalt/documentation
Document fields in oak_speech
2021-09-26 22:46:10 -04:00
GriffinR b0698e27f9 Merge pull request #465 from SatoMew/master
Add fix to disallow negative current HP values
2021-09-14 13:27:28 -04:00
SatoMew e13a99717b Add fix to disallow negative current HP values 2021-09-13 21:51:56 +01:00
colonelsalt d3e0bb6bba Removed #define access for data array in Oak speech subtasks take 3 2021-09-02 12:29:53 +01:00
colonelsalt ba1a9e36f8 Removed #define access for data array in Oak speech subtasks take 2 2021-09-02 12:25:49 +01:00
colonelsalt c8c5a06a43 Removed #define access for data array in Oak speech subtasks 2021-09-02 12:16:40 +01:00
colonelsalt 54377a43f5 Changed enum name for Oak speech trainer pics 2021-09-02 11:17:38 +01:00
colonelsalt 7ba40824f5 Documented some fields in oak_speech.c 2021-09-02 11:12:38 +01:00
PikalaxALT 6de0d61daf Merge pull request #463 from PikalaxALT/fix_mid2agb_call
Fix default mid2agb Makefile rule
2021-09-01 17:19:20 -04:00
PikalaxALT 69aac07cc1 Fix default mid2agb Makefile rule 2021-09-01 17:11:58 -04:00
GriffinR 39c623c8cd Merge pull request #461 from Kurausukun/oops
oops
2021-08-21 07:49:17 -04:00
Kurausukun bb84e66e82 oops 2021-08-20 22:32:38 -04:00
GriffinR 9ad143bf24 Merge pull request #460 from Sewef/master
Use SHINY_ODDS where necessary
2021-08-19 13:37:01 -04:00
Sewef c7473dac0b Use SHINY_ODDS where necessary 2021-08-19 19:24:11 +02:00
PikalaxALT f77e1a9901 Merge pull request #457 from Kurausukun/cgbsound
Port CgbSound Documentation and Fakematch Fixes
2021-08-11 19:55:16 -04:00
PikalaxALT 65d5dab679 Merge pull request #459 from GriffinRichards/fix-symbols
Fix symbols branch commit messages
2021-08-11 19:43:23 -04:00