Commit Graph

2516 Commits

Author SHA1 Message Date
GriffinR 50babdb07f Move local IDs to map.json 2024-10-15 02:51:08 -04:00
GriffinR 4dc5c47799 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA 2024-10-14 22:48:30 -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 311d317eb3 Merge pull request #672 from GriffinRichards/sync-toolchain
Sync Makefile and tools with pokeemerald
2024-09-18 19:40:16 -04:00
GriffinR 93b4a7b815 Toolchain sync fixes 2024-09-12 17:49:50 -04:00
GriffinR 539ed36160 Merge pull request #662 from cawtds/ub-fix-battle-transition
UB fix in battle_transition.c
2024-08-29 14:18:26 -04:00
GriffinR caf8c6bfa9 Merge pull request #670 from abcboy101/decode
Update link_rfu_2.c
2024-08-29 14:16:53 -04:00
GriffinR 4f7b8c5e9e Merge pull request #663 from cawtds/ub-fix-camera-object
Fix for potential UB in CameraObjectReset2
2024-08-29 14:11:58 -04:00
GriffinR 5e464c2091 Sync map macro change with pokeemerald 2024-08-27 13:57:07 -04:00
abcboy101 6319b453bc Update link_rfu_2.c 2024-08-24 22:19:28 -04:00
cawtds 466a69a6e0 Update src/event_object_movement.c
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
2024-08-10 20:41:21 +02:00
abcboy101 588e164e67 Decode unused JP text 2024-08-09 20:19:38 -04:00
cawtds d61220569d fix for potential UB in CameraObjectReset2 2024-06-27 16:13:17 +02:00
cawtds e6eb717275 UB fix ClockwiseWipe_TopRight 2024-06-25 22:09:08 +02:00
Kurausukun 6bd758f45d fix compilation on gcc 14 2024-06-06 23:22:37 -04: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
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
Kurausukun 5e7fada945 add missing constant usage in m4a_1 2023-09-23 19:37:52 -04:00
Edward Nolan d5319ea9f8 Fix misspelling: RivalPokenonTower -> RivalPokemonTower 2023-09-10 22:11:06 -04:00
Edward Nolan 93d4e3ff66 Fix misspelling: TRAINER_RIVAL_POKENON_TOWER -> TRAINER_RIVAL_POKEMON_TOWER 2023-09-10 21:16:06 -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 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 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 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 1824a9fea2 Sync some charmap characters with pokeemerald 2023-05-03 14:22:01 -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
Frank 82b3d51743 Made variable for Oak's introduction Pokemon 2023-04-10 15:00:20 -04:00
GriffinR 45e4c30d38 Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2023-04-10 10:18:07 -04:00
Frank 59101819de Added constants for nature and species length 2023-04-10 08:51:24 -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 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 fed868ddf6 Rename special anim scene graphics 2023-03-16 22:14:14 +08:00
cbt6 981d4a34d8 Rename union room chat graphics 2023-03-16 22:13:05 +08:00
cbt6 62f745d646 Rename summary screen graphics 2023-03-16 22:12:02 +08:00
GriffinR a7881d3ae4 Merge pull request #610 from cbt6/graphics
Document src/graphics.c
2023-03-16 01:46:17 -04:00
cbt6 7a322ba04e Document more of src/graphics.c 2023-03-13 23:09:19 +08:00
GriffinR 55e9b04e64 Add missing task data define use 2023-03-11 11:25:18 -05:00
cbt6 242bb41682 Document src/graphics.c 2023-03-11 23:57:01 +08:00