Commit Graph

3728 Commits

Author SHA1 Message Date
Edward Nolan d5319ea9f8 Fix misspelling: RivalPokenonTower -> RivalPokemonTower 2023-09-10 22:11:06 -04:00
GriffinR 66669cca92 Merge pull request #643 from ednolan/fix_pokenon_misspelling
Fix misspelling: TRAINER_RIVAL_POKENON_TOWER -> TRAINER_RIVAL_POKEMON_TOWER
2023-09-10 21:24:50 -04:00
Edward Nolan 93d4e3ff66 Fix misspelling: TRAINER_RIVAL_POKENON_TOWER -> TRAINER_RIVAL_POKEMON_TOWER 2023-09-10 21:16:06 -04:00
GriffinR f8741615bf Retire OK bot 2023-08-31 11:15:29 -04:00
GriffinR 0cab317261 Merge pull request #638 from GriffinRichards/doc-ql
Document some quest log
2023-08-31 11:13:49 -04:00
GriffinR f484b96062 Merge pull request #640 from WhenGryphonsFly/key_intr_enable
Correct KEY_INTR_ENABLE
2023-08-27 17:34:00 -04:00
WhenGryphonsFly 7ec3c5d37f Correct KEY_INTR_ENABLE 2023-08-27 14:45:39 -05:00
GriffinR eb250ab92a Merge pull request #639 from AnonymousRandomPerson/master
Added newer decomp projects to readme
2023-08-18 23:46:13 -04:00
AnonymousRandomPerson 1aceaa933f Added newer decomp projects to readme 2023-08-18 23:36:37 -04:00
GriffinR 09ee60049c Quest log doc cleanup 2023-08-18 15:40:57 -04:00
GriffinR 10c1e1298f Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2023-08-18 11:26:22 -04:00
GriffinR e72a26a6c1 Merge pull request #624 from GriffinRichards/field-tasks
Sync field_tasks
2023-08-14 16:00:52 -04:00
GriffinR 120fbb0578 More PALSLOT constant usage 2023-08-07 00:44:46 -04:00
Jaizu e180611de6 Compare to ITEM_HM01 and not ITEM_TM50 (#634)
* Compare to ITEM_HM01 and not ITEM_TM50

While both compile to the same output when doing test functions in https://cexplore.karathan.at/, shinny pointed in the discord that, if you expand TMs, using ITEM_TM50 would break things.
This was the previous behaviour but was changed by cbt when documented the party menu.
This was pointed out but HunarPG in the pokefirered Discord channel.

* Use ITEM_HM01 instead.
2023-07-29 15:13:49 -04:00
GriffinR 4da9e7549b Merge pull request #631 from GriffinRichards/colorize
Correct more graphics colors
2023-07-26 22:49:23 -04:00
GriffinR 25a8d2b9b1 Sync INSTALL 2023-07-06 12:05:22 -04:00
GriffinR b56e1cbf7c Remove some unused declarations 2023-06-25 16:30:20 -04:00
GriffinR 992f8bf017 Sync fix for EWRAM_DATA wildcard 2023-06-07 11:09:43 -04:00
GriffinR 8ef8535fc5 Colorize battle_interface/healthbox_elements.png 2023-06-02 15:51:59 -04:00
GriffinR cf089fedd0 Correct colors in pokemon_storage/menu.png 2023-06-02 14:34:36 -04:00
GriffinR 22fd5541e3 Correct colors in summary_screen/bg.png 2023-06-02 13:58:03 -04:00
GriffinR 86c21b8e79 Colorize menu icon graphics, document sMenuInfoIcons 2023-06-01 15:02:03 -04:00
GriffinR f52d3b6ce4 Correct item_menu/bg.pg colors, combine list tilemaps 2023-06-01 14:17:36 -04:00
GriffinR fe99ef341d Correct colors in item_pc/bg.png 2023-06-01 13:39:51 -04:00
GriffinR febf864bf6 Sync trainer card graphics 2023-06-01 13:39:17 -04:00
GriffinR 8b17c6d36d Colorize tm_case/hm.png 2023-06-01 10:29:53 -04:00
GriffinR b52ace21c4 Merge pull request #628 from GriffinRichards/pal-macros
Sync palette macros
2023-06-01 10:28:30 -04:00
GriffinR c212795217 Fix index comment for ScrCmd_playslotmachine 2023-05-31 21:47:33 -04:00
GriffinR dcdb9024d8 Sync palette macros 2023-05-26 14:52:21 -04:00
GriffinR f93d5a8ae1 Merge pull request #623 from GriffinRichards/item-icons
Give proper names to item icon graphics
2023-05-23 12:53:23 -04:00
GriffinR 1de6a20483 Merge pull request #625 from sophxm/master
Remove unnecessary linker script preprocessing
2023-05-23 12:46:56 -04:00
Sophia cb6409224f Remove unnecessary linker script preprocessing
The previous build process ran sed against the linker scripts twice:
once to replace <X> with the contents of sym_x.ld, a second time to
correct any paths referencing tools/.

The first can be replaced with INCLUDE commands, as was done in
pret/pokeemerald@7c57699 (in 2018).

The second has been unnecessary since 942c248 (also 2018).

With both of these removed there is no longer a need to have a build
step for them, and $(ELF) can take the sym_x.ld files as prerequisites
instead.
2023-05-22 07:53:28 +01:00
GriffinR cea26f20c5 Merge pull request #626 from LOuroboros/patch-1
Updated BattleScripting addresses
2023-05-21 23:55:49 -04:00
LOuroboros d249267aac Updated BattleScripting addresses 2023-05-21 21:06:08 -03:00
GriffinR 3a26fce16b Merge pull request #621 from Gamr13/master
Fix macOS building
2023-05-19 13:11:20 -04:00
GriffinR c110354043 Sync field_tasks 2023-05-17 15:52:14 -04:00
GriffinR 86c2142719 Give proper names to item icon graphics 2023-05-12 10:52:07 -04:00
GriffinR b83a178b18 Add some missing constants in wild_encounter.c 2023-05-12 02:16:33 -04:00
GriffinR 42332a824e Sync mapjson with pokeemerald 2023-05-09 10:52:53 -04:00
GriffinR ac16ba797f Merge pull request #622 from SombrAbsol/master
Remove Magma Emblem and Old Sea Map item icons
2023-05-09 09:32:31 -04:00
SombrAbsol 3c1e954afa Remove Old Sea Map’s palette 2023-05-09 15:04:35 +02:00
SombrAbsol aa0ac4abed Remove Magma Emblem’s palette 2023-05-09 15:04:16 +02:00
SombrAbsol bb15b280b9 Old Sea Map is not in the game 2023-05-09 09:25:20 +02:00
SombrAbsol 5e9bf2f8dc Magma Emblem is not in the game 2023-05-09 09:24:54 +02:00
Gamr13 9efcec167b Update Makefile 2023-05-07 21:11:54 +01:00
Gamr13 349c545939 Update Makefile 2023-05-07 21:11:15 +01:00
GriffinR 5c0bb3a18e Merge pull request #619 from GriffinRichards/sync-charmap
Sync some charmap characters with pokeemerald
2023-05-05 15:19:29 -04:00
GriffinR 1824a9fea2 Sync some charmap characters with pokeemerald 2023-05-03 14:22:01 -04:00
GriffinR f9f4b6ebbd Merge pull request #617 from waterwheels/patch-1
Red and Leaf back palettes swapped
2023-04-27 07:27:46 -04:00
Jo 6ac61a1ccc Red and Leaf back palettes swapped
Not sure if maybe this is an idiosyncrasy of pkmn fire red, but it looks like it's probably just a typo; Red and Leaf each use the other's back pic palette
2023-04-27 18:57:59 +10:00