Commit Graph
100 Commits
Author SHA1 Message Date
GriffinR 4188dd405c Merge pull request #1620 from LOuroboros/gBallSpriteTemplates
Used ball constants in gBallSpriteTemplates
2022-01-26 17:44:26 -05:00
GriffinR 9f2b6ab2f2 Merge pull request #1613 from Kurausukun/m4asymbols
Move M4A Track Definitions
2022-01-22 21:41:37 -05:00
GriffinR 79dfac92c9 Merge pull request #1604 from GriffinRichards/clean-spinda
Document Spinda spot algorithm
2022-01-21 09:55:43 -05:00
GriffinR 8743172686 Merge pull request #1612 from AsparagusEduardo/pret_misc
Small documentation and cleanup
2022-01-20 12:11:27 -05:00
GriffinR 062cdbe01c Merge pull request #1599 from GriffinRichards/fix-tilemaps
Break up graphics/interface and graphics/misc
2022-01-20 08:53:44 -05:00
GriffinR a7e6045d71 Merge pull request #1597 from GriffinRichards/misc-cleanup
Miscellaneous fixes
2022-01-19 22:17:37 -05:00
GriffinR 30d9704418 Specify unsigned in spot comment 2022-01-17 17:27:17 -05:00
GriffinR 313f14ed63 Add Spinda spot color constants 2022-01-17 17:00:18 -05:00
GriffinR 177863da47 Fix typo 2022-01-17 16:04:02 -05:00
GriffinR 225147a94f Document Spinda spot algorithm 2022-01-17 15:34:18 -05:00
GriffinR 69759b2d12 Merge pull request #1601 from GriffinRichards/fix-decor-flag
Fix FLAG_DECORATION_0 name
2022-01-16 17:44:58 -05:00
GriffinR 14a11899cf Merge pull request #1603 from LOuroboros/patch-2
Updated the value of MAX_MAP_DATA_SIZE
2022-01-16 17:37:26 -05:00
GriffinR dad4132762 Merge pull request #1596 from GriffinRichards/player-avatar-arr-const
Add missing array constants in field_player_avatar
2022-01-16 14:03:20 -05:00
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 bd43b905b7 Apply palettes to some field effect pngs 2022-01-14 12:51:13 -05:00
GriffinR 4dec9b83a3 Move more graphics out of misc 2022-01-14 12:29:30 -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
GriffinR fd7457b05a Remove berry fix 2022-01-13 15:26:20 -05:00
GriffinR f899a02ac6 Use MON_GIVEN_TO_ constants for givemon 2022-01-12 18:34:26 -05:00
GriffinR 01af8e877f Move starter choose out of interface/misc 2022-01-11 17:49:08 -05:00
GriffinR 694aa3c65d Move balls, shop, link, map popups, and bag out of interface 2022-01-11 13:53:23 -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 d782d3544d Move pokeblock graphics out of interface 2022-01-11 11:46:58 -05:00
GriffinR 565dd24309 Move party menu graphics out of interface 2022-01-11 11:37:13 -05:00
GriffinR 7103839a61 Move summary screen graphics out of interface, fix some names 2022-01-11 11:22:45 -05:00
GriffinR fde18b4774 Fix berry crusher graphics name 2022-01-11 10:42:00 -05:00
GriffinR 0a78cb5c9e Fix some battle dome graphics names 2022-01-11 10:04:47 -05:00
GriffinR 49418f8c01 Add missing commas 2022-01-11 09:55:11 -05:00
GriffinR 3a6c633905 Add seteventmon 2022-01-11 02:16:25 -05:00
GriffinR 110fbc559c Make item optional for givemon and setwildbattle 2022-01-11 02:08:14 -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
GriffinR 429d53b95c Use runningState directly in CheckMovementInputNotOnBike 2022-01-09 11:12:35 -05:00
GriffinR 8b920691e6 Fix FLAG_DECORATION_0 name 2022-01-09 01:31:42 -05:00
GriffinR 8f1a760937 Add missing array constants in field_player_avatar 2022-01-08 23:55:26 -05:00
GriffinR 30dbf3f858 Merge pull request #1595 from sphericalice/patch-3
Remove unneeded brackets in GetWeekCount
2022-01-08 17:44:25 -05: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
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
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 ce55e58ad8 Misc cleanup 2022-01-04 10:09:42 -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
GriffinR ac47489216 Merge pull request #1588 from sphericalice/patch-1
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu
2022-01-02 16:09:31 -05: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
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
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
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
GriffinR f663e310b1 Merge pull request #1580 from LOuroboros/patch-2
Removed some commented out addresses
2021-12-21 20:55:41 -05:00
GriffinR 32a9ac6eb1 Merge pull request #1575 from LOuroboros/benriBotan
[LEAK INFORMED] Documented the unk19 item field
2021-12-17 22:27:45 -05:00
GriffinR 6e5520207f Merge pull request #1573 from GriffinRichards/tilesetanim
Clean up tileset_anims
2021-12-15 09:47:54 -05:00
GriffinR 961dbee5e3 Clean up tileset_anims 2021-12-14 21:41:07 -05:00
GriffinR df371fdda5 Merge pull request #1572 from LOuroboros/patch-2
Update trade.c
2021-12-14 12:54:09 -05:00
GriffinR d8e405c4f6 Merge pull request #1571 from GriffinRichards/fix-evergrandeflowers
Fix incorrect ever grande flower animation palettes
2021-12-08 18:02:41 -05:00
GriffinR cc05b08227 Fix incorrect ever grande flower animation palettes 2021-12-06 11:17:42 -05:00
GriffinR 888bb4ae9e Merge pull request #1570 from GriffinRichards/fix-flag
Fix incorrect flag animation palettes
2021-12-03 18:44:24 -05:00
GriffinR 8cbb207795 Merge pull request #1568 from GriffinRichards/fix-roamerstatus
Add BUGFIX for roamer's status
2021-12-03 16:58:53 -05:00
GriffinR d501636730 Fix incorrect flag animation palettes 2021-12-03 16:36:18 -05:00
GriffinR 1a08d8fcb4 Add BUGFIX for roamer's status 2021-11-29 12:56:03 -05:00
GriffinR 83be1bfc8f Remove sFiller from malloc.c 2021-11-29 11:19:30 -05:00
GriffinR 4c64863bc5 Merge pull request #1567 from LOuroboros/sBattleTerrainTable
Renamed gBattleTerrainTable
2021-11-27 23:43:22 -05:00
GriffinR 01859a63ff Merge pull request #1566 from cbt6/move-speed
Rename speed parameter to distance in jump functions
2021-11-27 23:37:50 -05:00
GriffinR e677a00676 Merge pull request #1560 from GriffinRichards/retire-ok
Retire OK bot
2021-11-27 21:27:14 -05:00
GriffinR e0fae879da Merge pull request #1558 from GriffinRichards/update-macros
Update event macro comments
2021-11-22 19:10:49 -05:00
GriffinR f81565163e Retire OK bot 2021-11-21 11:48:50 -05:00
GriffinR 5cb875b6cb Merge pull request #1559 from GriffinRichards/remove-flower
Fix incorrect flower animation palettes
2021-11-21 11:29:11 -05:00
GriffinR 23dd1dad7f Fix incorrect palettes in Mauville flower tileset anims 2021-11-21 11:23:03 -05:00
GriffinR 42a83ee50e Use STR_VAR names for apprentice_buff and frontier_gettrainername 2021-11-18 23:20:05 -05:00
GriffinR e66ea0cb99 Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
GriffinR c57efdba5d Allow compare + goto_if/call_if as a single statement 2021-11-18 22:06:53 -05:00
GriffinR 6c6487dd7a Missing spaces to tabs in scripts files 2021-11-18 21:02:22 -05:00
GriffinR 591ab7241f Macro comment typo fix, Object->object 2021-11-18 17:24:43 -05:00
GriffinR c89dfd9f56 Finish updating macro comments 2021-11-18 01:47:58 -05:00
GriffinR b5b5d95de6 Distinguish 'virtual object' names from object events 2021-11-17 23:40:53 -05:00
GriffinR 1b35f9adad Use specific name limits for string limit functions 2021-11-17 22:11:03 -05:00
GriffinR b9fa18bdd4 Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros 2021-11-17 22:03:37 -05:00
GriffinR c4f8f4d11a Add STR_VAR_# ids to string buffer macros 2021-11-17 22:00:44 -05:00
GriffinR c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR 700425ef5f Index sMapHealLocations 2021-11-17 15:52:04 -05:00
GriffinR c1970a4bc8 Remove dead sub references 2021-11-17 15:47:47 -05:00
GriffinR cfb9ae40d7 Merge pull request #1557 from GriffinRichards/fix-calcrom-0
Fix calcrom's handling of 0s
2021-11-17 15:11:23 -05:00
GriffinR ec97a21f95 Fix calcrom's handling of 0s 2021-11-17 15:04:42 -05:00
GriffinR ecb13cdbf7 Merge pull request #1550 from GriffinRichards/doc-pokenav
Document Pokénav
2021-11-17 14:47:34 -05:00
GriffinR eb95ac0b9c Document field_tasks 2021-11-17 14:44:42 -05:00
GriffinR f872ac1b80 Merge pull request #1556 from cbt6/move-enum
Use movement action constant values over enum
2021-11-17 14:14:37 -05:00
GriffinR 61aa9c3ba9 More updating event macro comments 2021-11-16 17:46:34 -05:00
GriffinR d414787932 Some TV clean-up 2021-11-16 16:22:17 -05:00
GriffinR 5d9c31a610 Label slot machine ids, fix GetPriceReduction 2021-11-16 15:43:52 -05:00