Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-09 21:25:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,777 Commits 2 Branches 0 Tags 366 MiB
a2e408cf4e
Commit Graph

1747 Commits

Author SHA1 Message Date
GriffinR
a2e408cf4e Add support for local IDs in map.json 2024-10-14 22:44:16 -04:00
GriffinR
bb50006fc9
Move heal locations data to their associated map.json (#673) 2024-10-11 15:17:18 -04:00
GriffinR
d45b94ea64 Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6 2024-09-18 19:40:41 -04:00
GriffinR
93b4a7b815 Toolchain sync fixes 2024-09-12 17:49:50 -04:00
GriffinR
2ed7806380 Deleted generated constants, add midi.cfg 2024-09-12 12:58:22 -04:00
GriffinR
5e464c2091 Sync map macro change with pokeemerald 2024-08-27 13:57:07 -04:00
GriffinR
c6a2f50491
Merge pull request #657 from aarant/master 
Linkerscript now tracks RAM/ROM usage
 2024-06-22 12:02:35 -04:00
GriffinR
21e8a142db Revert section rename 2024-06-22 11:58:39 -04:00
GriffinR
9b2fc69e5e
Merge pull request #656 from SatoMew/misc-fixes 
Spring cleaning
 2024-06-22 11:46:13 -04:00
Kurausukun
6bd758f45d fix compilation on gcc 14 2024-06-06 23:22:37 -04:00
Ariel A
bc76541189 feat: Linkerscript now tracks RAM/ROM usage 
Based on https://github.com/pret/pokeemerald/pull/1952
 2024-05-16 19:03:37 -04:00
SatoMew
b9dec717da Spring cleaning 2024-05-12 14:34:43 +01:00
GriffinR
efdae01b4b Remove non-existent tilesets from label comments and alphabetize 2024-01-18 14:42:20 -05: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
ff902c9f1b
Merge pull request #642 from citrusbolt/blockboxrs 
[LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`
 2023-09-12 18:48:37 -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
0cab317261
Merge pull request #638 from GriffinRichards/doc-ql 
Document some quest log
 2023-08-31 11:13:49 -04:00
WhenGryphonsFly
7ec3c5d37f Correct KEY_INTR_ENABLE 2023-08-27 14:45:39 -05: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
4da9e7549b
Merge pull request #631 from GriffinRichards/colorize 
Correct more graphics colors
 2023-07-26 22:49:23 -04:00
GriffinR
b56e1cbf7c Remove some unused declarations 2023-06-25 16:30:20 -04:00
GriffinR
86c21b8e79 Colorize menu icon graphics, document sMenuInfoIcons 2023-06-01 15:02:03 -04:00
GriffinR
febf864bf6 Sync trainer card graphics 2023-06-01 13:39:17 -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
LOuroboros
d249267aac Updated BattleScripting addresses 2023-05-21 21:06:08 -03: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
45e4c30d38 Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2023-04-10 10:18:07 -04:00
GriffinR
f6aa148946
Merge pull request #614 from GriffinRichards/metatile-labels 
Format metatile labels
 2023-03-24 09:54:02 -04:00
GriffinR
31d4dabcda
Merge pull request #613 from GriffinRichards/const-map 
Treat map data as const
 2023-03-22 13:15:50 -04:00
GriffinR
adf1437074 Format metatile labels 2023-03-21 13:09:32 -04:00
GriffinR
a2f30a3382
Merge pull request #611 from GriffinRichards/sync-pokemon 
Sync pokemon.c
 2023-03-18 13:24:51 -04:00
GriffinR
ac9bd3ec8f Treat map data as const 2023-03-16 12:46:46 -04:00
cbt6
dd7ff3194c Rename all other graphics 2023-03-16 22:15:44 +08:00
cbt6
981d4a34d8 Rename union room chat graphics 2023-03-16 22:13:05 +08:00
cbt6
7a322ba04e Document more of src/graphics.c 2023-03-13 23:09:19 +08:00
GriffinR
ab417d1255 Sync pokemon.c 2023-03-06 15:23:11 -05:00
GriffinR
2c11a2dc76
Merge pull request #608 from GriffinRichards/hiddenitem 
Add hidden item constant usage
 2023-03-06 13:59:57 -05:00
GriffinR
4bf48cf211 Add hidden item constant usage 2023-02-28 11:22:14 -05:00
GriffinR
6fc3965327 Sync some unlabeled graphics 2023-02-17 13:20:21 -05:00
GriffinR
f54a3966aa
Merge pull request #604 from GriffinRichards/doc-creditsgfx 
Document credits graphics
 2023-02-14 18:17:14 -05:00
GriffinR
f8d3a6b583
Merge pull request #602 from GriffinRichards/sync-debug 
Sync debug print functions
 2023-02-07 11:36:31 -05:00
GriffinR
2dd60bd86c Document credits graphics 2023-02-06 12:01:11 -05:00
GriffinR
a12a9e318e
Merge pull request #598 from GriffinRichards/doc-scriptmenu 
Document script_menu
 2023-02-05 21:06:55 -05:00
GriffinR
c23e55ec94 Sync debug print functions 2023-01-31 12:30:53 -05:00
GriffinR
ef12c2a7f9 Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2023-01-30 10:23:08 -05:00