Commit Graph

6840 Commits

Author SHA1 Message Date
GriffinR
60162a98b9
Merge pull request #1602 from GriffinRichards/charmap-quote
Allow right single quotation mark in charmap
2022-01-16 13:55:16 -05:00
GriffinR
6d6ff91268 Allow right single quotation mark in charmap 2022-01-16 10:29:15 -05:00
GriffinR
755d9143a6
Merge pull request #1600 from GriffinRichards/remove-berry-fix
Remove berry fix
2022-01-15 12:20:22 -05:00
GriffinR
9ded1eb14e
Merge pull request #1598 from atasro2/master
Give sensical names to Unused_AdjustBgMosaic
2022-01-14 09:12:05 -05:00
MCboy
1a33187bad
Move enum to bg.h 2022-01-14 13:48:46 +03:30
MCboy
998900bd1b
Give sensical names to Unused_AdjustBgMosaic 2022-01-14 13:37:27 +03:30
GriffinR
fd7457b05a Remove berry fix 2022-01-13 15:26:20 -05:00
GriffinR
fa2d25d366
Merge pull request #1594 from GriffinRichards/pokestorage-clean
Misc pokemon_storage_system cleanup
2022-01-11 12:26:02 -05:00
GriffinR
4024b3f1b3
Merge pull request #1590 from GriffinRichards/dex-enum
Convert pokedex defines to enums
2022-01-10 14:56:26 -05:00
Wiz
ded2021361 Remove redundant assembler 2022-01-09 14:42:41 -06:00
GriffinR
30dbf3f858
Merge pull request #1595 from sphericalice/patch-3
Remove unneeded brackets in GetWeekCount
2022-01-08 17:44:25 -05:00
sphericalice
6a21c3f5f3
Remove unneeded brackets in GetWeekCount 2022-01-08 20:39:45 +00:00
GriffinR
ca9bc34bea Clean up pokemon_storage_system graphics 2022-01-07 17:36:38 -05:00
GriffinR
5cbe572607 Add window constants in pokemon_storage_system 2022-01-07 17:05:58 -05:00
GriffinR
a837d1fe2c
Merge pull request #1593 from laqieer/master
Fix macro v069 in sound/MPlayDef.s
2022-01-07 12:09:51 -05:00
laqieer
1c6232bc2e Fix macro v069 in sound/MPlayDef.s 2022-01-08 00:58:05 +08:00
GriffinR
577e6cc740
Merge pull request #1586 from GriffinRichards/clean-areascreen
Clean up pokedex_area_screen
2022-01-06 23:02:23 -05:00
GriffinR
713cd6616e Add glow tile empty 2022-01-06 22:33:00 -05:00
GriffinR
71e0b480a9
Merge pull request #1591 from kiliwily/master
Fix brackets inconsistency in field_specials.c
2022-01-06 13:58:06 -05:00
kiliwily
8a9740b819 Update field_specials.c 2022-01-06 19:47:56 +01:00
kiliwily
ba9b533845 Revert "Update field_specials.c"
This reverts commit f67137ddb2.
2022-01-06 19:45:38 +01:00
kiliwily
f67137ddb2 Update field_specials.c 2022-01-06 19:29:58 +01:00
GriffinR
d4111d5520 Add comment about pokedex reordering 2022-01-05 14:50:19 -05:00
GriffinR
5d033c2e4d Convert pokedex defines to enums 2022-01-05 12:18:49 -05:00
GriffinR
45e8cd4b84
Merge pull request #1589 from sphericalice/patch-2
Use SPECIES_NONE and ITEM_NONE in battle_tower.c
2022-01-04 08:55:33 -05:00
sphericalice
48bf1ab98d
Use SPECIES_NONE and ITEM_NONE in battle_tower.c 2022-01-04 13:46:46 +00:00
GriffinR
ac47489216
Merge pull request #1588 from sphericalice/patch-1
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu
2022-01-02 16:09:31 -05:00
sphericalice
2d536bf560
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu 2022-01-02 21:02:53 +00:00
GriffinR
434086be69
Merge pull request #1585 from sphericalice/patch-2
Update field_specials.c to match the style
2021-12-31 12:39:43 -05:00
sphericalice
61a0036c47
Clarify ScrollableMultichoice_ProcessInput comment 2021-12-31 17:34:46 +00:00
sphericalice
9e660b2cdf
Update src/field_specials.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-31 16:29:11 +00:00
sphericalice
4f6323606f
Update field_specials.c to match the style 2021-12-31 16:24:44 +00:00
GriffinR
23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
GriffinR
643cc62f73
Merge pull request #1584 from sphericalice/patch-1
Remove some magic numbers from TryPushBoulder
2021-12-30 09:00:08 -05:00
sphericalice
50522fdea4
Remove some magic numbers from TryPushBoulder 2021-12-30 12:21:47 +00:00
GriffinR
4192a40adf
Merge pull request #1583 from GriffinRichards/renametilemaps
Give less generic names to some tilemaps, some misc fixes
2021-12-29 00:57:37 -05:00
GriffinR
aadab8b016 Move pokemon and easy chat constants to global, misc clean-up 2021-12-28 18:07:41 -05:00
GriffinR
aba5264260 RGB macro use in slot_machine 2021-12-28 17:46:05 -05:00
GriffinR
4fc345fff5 Rename unused frontier pass tilemap 2021-12-28 14:54:09 -05:00
GriffinR
3acf002a9c Rename generic jp contest tilemaps 2021-12-28 13:16:40 -05:00
GriffinR
ee5e65d9ed Rename generic title screen tilemaps 2021-12-28 03:57:44 -05:00
GriffinR
f554f09aed
Merge pull request #1582 from LOuroboros/patch-2
Update main_menu.c
2021-12-27 16:29:08 -05:00
LOuroboros
599ca58059
Update main_menu.c 2021-12-25 07:04:19 -03:00
GriffinR
84925a892b
Merge pull request #1576 from Kurausukun/aif2pcm16
Accept 16-bit AIFF Files and Convert to 8-bit
2021-12-24 02:48:48 -05:00
GriffinR
94c2b7f1c6
Merge pull request #1581 from LOuroboros/patch-2
Fixed typo in src/battle_script_commands.c
2021-12-24 00:07:24 -05:00
LOuroboros
03205c995d
Update battle_script_commands.c 2021-12-24 01:59:40 -03:00
GriffinR
f663e310b1
Merge pull request #1580 from LOuroboros/patch-2
Removed some commented out addresses
2021-12-21 20:55:41 -05:00
LOuroboros
d94dae18f7 Removed more commented out addresses
I like to help.
2021-12-21 22:49:30 -03:00
LOuroboros
e28fa7f91c
Update event_scripts.s 2021-12-21 22:10:54 -03:00
Kurausukun
39f493287f one more lel 2021-12-17 23:03:09 -05:00