Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-14 00:01:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,742 Commits 2 Branches 0 Tags 366 MiB
efdae01b4b
Commit Graph

3742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR
efdae01b4b Remove non-existent tilesets from label comments and alphabetize 2024-01-18 14:42:20 -05:00
GriffinR
9588ba6e01
Merge pull request #652 from Kurausukun/macros 
Safeguard SQUARE and CUBE Macro Arguments in Parentheses
 2023-12-27 17:43:49 -05:00
Kurausukun
2da3a172d6 safeguard SQUARE and CUBE macros in parentheses 2023-12-27 17:37:11 -05:00
Jaizu
1d1754d37f
Small mart changes (#651) 2023-12-07 12:43:27 -05:00
Kurausukun
7df4038c86
Ensure Alignment for Map Events (#649) 2023-11-21 15:46:51 -05:00
GriffinR
2d8c81eb21
Merge pull request #648 from SnorlaxMonster/master 
Rename HITMARKER_IGNORE_SAFEGUARD
 2023-11-16 15:47:14 +00:00
SnorlaxMonster
0d063af23f Rename HITMARKER_IGNORE_SAFEGUARD 
Rename HITMARKER_IGNORE_SAFEGUARD to HITMARKER_STATUS_ABILITY_EFFECT.
This flag is used exclusively by status-inflicting Abilities,
and has 3 main functions:
- Whether the effect bypasses Shield Dust
- Whether the effect bypasses Safeguard
- Which text string to display when the status condition is inflicted
   (i.e. whether it was inflicted by a move or Ability)

I believe this new name better represents what the flag actually does.
This name was structured to parallel HITMARKER_SYNCHRONISE_EFFECT.
 2023-11-10 18:21:56 +11:00
GriffinR
1dd602d914
Merge pull request #641 from AnonymousRandomPerson/master 
Replaced decomp list with pret.github.io link
 2023-10-17 02:44:44 -04:00
GriffinR
23dd337246
Merge pull request #645 from Kurausukun/m4asym 
Add Missing Constant Usage in m4a_1
 2023-09-23 21:49:28 -04:00
Kurausukun
5e7fada945 add missing constant usage in m4a_1 2023-09-23 19:37:52 -04:00
GriffinR
ff902c9f1b
Merge pull request #642 from citrusbolt/blockboxrs 
[LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`
 2023-09-12 18:48:37 -04:00
GriffinR
f7d133f503
Merge pull request #644 from ednolan/fix_pokenon_misspelling2 
Fix misspelling: RivalPokenonTower -> RivalPokemonTower
 2023-09-11 08:49:08 -04:00
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
citrusbolt
d04c5d727a Add blockBoxRS field to struct BoxPokemon 2023-09-09 22:08:05 -06: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
AnonymousRandomPerson
6a18b7504d Replaced decomp list with pret.github.io link 2023-08-30 18:34:44 -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