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

455 Commits

Author SHA1 Message Date
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
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
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
adf1437074 Format metatile labels 2023-03-21 13:09:32 -04:00
GriffinR
ab417d1255 Sync pokemon.c 2023-03-06 15:23: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
ef12c2a7f9 Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2023-01-30 10:23:08 -05:00
GriffinR
e001949f42
Merge pull request #597 from GriffinRichards/sync-trade 
Sync trade
 2023-01-30 10:18:23 -05:00
GriffinR
81efd8f9f8 Document script_menu 2023-01-24 16:26:45 -05:00
GriffinR
dd90956cbb Clarify MB_SEMI_DEEP_WATER name 2023-01-17 21:23:33 -05:00
GriffinR
7710148fbc Colorize door animations 2023-01-11 15:35:19 -05:00
GriffinR
ea9510f7f8 Use constants in gMoveNames 2022-12-16 11:08:18 -05:00
GriffinR
5621d29866 Sync trade 2022-12-15 15:41:42 -05:00
GriffinR
66e279611b Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2022-11-30 15:03:21 -05:00
GriffinR
a19cb44458 Clean up mystery gift sync, document wonder news 2022-11-22 01:58:30 -05:00
GriffinR
6d6f207eb4 Initial mystery gift sync 2022-11-19 21:01:35 -05:00
GriffinR
519443e214 Sync battle transitions 2022-11-18 21:16:08 -05:00
GriffinR
f3e8362c08 Document special event actions 2022-11-16 15:14:41 -05:00
GriffinR
45546ce350 Clarify ql event data 2022-11-15 13:31:55 -05:00
GriffinR
ae38640a3b Continue documenting quest log 2022-11-11 02:10:16 -05:00
GriffinR
78b07aace5 Start documenting quest log 2022-11-10 13:25:05 -05:00
GriffinR
a7609df31b Sync union_room_player_avatar 2022-11-08 13:37:11 -05:00
GriffinR
9983b41c1d Sync union room 2022-11-08 01:19:15 -05:00
cbt6
8998b19435 Document src/event_object_movement.c 2022-11-07 14:53:37 +08:00
cbt6
dea9552563 Document src/event_data.c 2022-11-07 14:52:23 +08:00
GriffinR
2abdb6aa41
Merge pull request #572 from GriffinRichards/sync-mgfitview 
Sync wonder card / news screens
 2022-11-01 16:20:36 -04:00
GriffinR
52591dcee4
Merge pull request #570 from pret/porymap-5 
Update for Porymap 5.0.0
 2022-10-30 11:01:30 -04:00
GriffinR
8aae7ac7f3 Sync pokedex constants 2022-10-29 23:46:39 -04:00
GriffinR
8c887bca44 Sync mystery_gift_show_card 2022-10-27 15:49:53 -04:00
GriffinR
f096196c91
Merge branch 'master' into porymap-5 2022-10-27 14:16:25 -04:00
GriffinR
2b2bf84502 Use actual flag values for hidden items 2022-10-25 14:51:01 -04:00
GriffinR
c77adaf6bf Sync map data macros 2022-10-25 14:31:01 -04:00
GriffinR
32ab6087d8
Merge pull request #484 from GriffinRichards/clone-union 
Separate connection clone objects from normal objects
 2022-10-17 21:29:52 -04:00
GriffinR
57e82c9264 Label movement action arrays, z coord -> elevation 2022-10-05 18:20:54 -04:00
cbt6
32573b2ba9 Document item use 2022-10-04 00:51:38 +08:00
GriffinR
a247433e20 Sync/document item_menu_icons.c 2022-10-01 23:42:11 -04:00
lioniac
fe757ff8ae
Updated vars.h 2022-09-26 10:31:44 -03:00
cbt6
61ad87a314 Document party menu 2022-09-17 14:29:32 +08:00
GriffinR
398417593b
Merge pull request #549 from AsparagusEduardo/pret_unused 
Removed UNUSED attribute
 2022-09-12 14:47:25 -04:00
Eduardo Quezada
81ef26732d Removed UNUSED attribute 2022-09-04 18:06:58 -03:00
Eduardo Quezada
9241dc6fe7 Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4 
# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c
 2022-09-04 17:44:13 -03:00