Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-31 20:52:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,355 Commits 2 Branches 0 Tags 366 MiB
dfa6461aa3
Commit Graph

595 Commits

Author SHA1 Message Date
cawtds
c2e0ab5d73
Rtc implementation (#5) 
added RTC and fixed time based evolutions
 2024-05-05 14:20:30 +02:00
cawtds
eb2bc4fd09 new pokemon, updated species_info and learnsets 2024-05-04 13:33:20 +02:00
cawtds
8a4e07c430 large refactoring to remove special deoxys handling 
merged all stringids and string table entries
 2024-05-03 18:14:38 +02:00
cawtds
15e04f6f97 fixed sprite when form changing 
fixed form changes reverting at the end of a battle
replaced personality based shiny sprites with new shiny flag
 2024-05-03 02:52:29 +02:00
cawtds
a63e46ea0a updated all Cmd_ functions 2024-05-02 14:48:24 +02:00
cawtds
6ec21fcd8a updated up to Cmd_handleballthrow 2024-05-02 12:24:35 +02:00
cawtds
545c8cf1df updated up to Cmd_tryswapitems 2024-05-02 11:03:31 +02:00
cawtds
dd1fba7834 updated up to Cmd_callterrainattack 2024-05-02 10:42:24 +02:00
cawtds
245d8c816d updated up to Cmd_tryspiteppreduce 2024-05-02 03:25:03 +02:00
cawtds
13deed92fb updated up to Cmd_tryinfatuating 2024-05-02 02:29:12 +02:00
cawtds
31c845e887 updated up to Cmd_statbuffchange 2024-05-02 01:50:13 +02:00
cawtds
59f8a9eb31 updated up to Cmd_stockpiletohpheal and fixed stockpile 2024-05-02 01:35:16 +02:00
cawtds
ad250f64c5 updated up to Cmd_setrain 2024-05-02 00:46:45 +02:00
cawtds
28158212ad updated Cmd_various 2024-05-02 00:27:19 +02:00
cawtds
6a84c1a901 Cmd_switchineffects 2024-05-01 18:57:00 +02:00
cawtds
547a0a1321 changed all battle_script usages to new system 2024-05-01 16:44:08 +02:00
cawtds
f99b4ce70c updated Cmd_moveend 2024-05-01 16:08:54 +02:00
cawtds
9b1053acf4 updated Cmd_getexp 2024-05-01 13:41:29 +02:00
cawtds
965d08e6df updated Cmd_returnball and ItemBattleEffects 2024-05-01 12:56:52 +02:00
cawtds
375b5214fd updated AbilityBattleEffects and Cmd_various 2024-05-01 02:35:15 +02:00
cawtds
1cda8c22a3 updated Cmd_jumpifstatus, Cmd_jumpifstatus2 and Cmd_jumpifability 2024-04-30 21:30:11 +02:00
cawtds
a5f2b89e29 updated up to Cmd_seteffectsecondary, Cmd_setgastroacid and Cmd_setstealthrock 2024-04-30 20:02:18 +02:00
cawtds
3ad08c53b0 updated Cmd_attackanimation, Cmd_waitanimation, Cmd_healthbarupdate and Cmd_datahpupdate 2024-04-30 16:25:06 +02:00
cawtds
e1a0a769b9 updated Cmd_adjustdamage and Cmd_multihitresultmessage 2024-04-30 00:17:33 +02:00
cawtds
bb55f18b33 updated Cmd_accuracycheck 2024-04-29 23:07:11 +02:00
cawtds
a1b3e83aac added remaining battle scripts in Cmd_attackcanceler 2024-04-29 18:44:07 +02:00
cawtds
63688557df updated Cmd_attackcanceler 2024-04-29 18:22:43 +02:00
cawtds
fed787864c experimental moves_info refactoring 2024-04-28 00:27:33 +02:00
cawtds
1c11bbb049 moved abilities to AbilitiesInfo 2024-04-27 16:54:31 +02:00
cawtds
1e92d725ed updated getevolutionspecies 
getters for species data
redundancies removed
 2024-04-27 15:12:28 +02:00
cawtds
c49b5ef87d expanded pokemon data structs 2024-04-27 13:46:39 +02:00
cawtds
395e4d0cb6 seperated kanto dex from national dex 
included cross generational evolutions in kanto dex
removed debug prints
 2024-04-27 02:03:51 +02:00
cawtds
d17698ee8f changed all ability variables to u16 or larger 
added ability capsule and ability patch functionality
removed unused ribbons to free space in pokemonsubstruct3 for hidden ability
 2024-04-26 22:09:46 +02:00
cawtds
1766e837b4 readded pokeflute out of battle use 
added reduceEv out of battle use
added resetEvs out of battle use
 2024-04-26 17:57:46 +02:00
cawtds
a06fb5c287 add item_icons for new items 2024-04-21 22:04:34 +02:00
cawtds
74c7b222c4 new item structure integrated and new items added; fixed bug with pocketId for pokeball pocket 2024-04-21 14:39:40 +02:00
cawtds
71b9b1ef25 added missing battle functionality for items 2024-04-20 13:07:53 +02:00
cawtds
d869d3355d first changes to item_use in preparation for new items 2024-04-16 21:40:57 +02:00
cawtds
356ffd1627 added fairy type 2024-03-23 15:40:31 +01:00
cawtds
0ab492f7e8 working version with SpeciesInfo and new Moves 2024-03-17 18:04:06 +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
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
GriffinR
bfd1fb2419 MAP_NONE -> MAP_DYNAMIC, treat warp ids as strings to allow constants 2022-09-03 14:59:18 -04:00
GriffinR
0400ee2124
Merge branch 'master' into clone-union 2022-09-03 14:31:04 -04:00
GriffinR
76ec1837aa Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub 2022-09-03 14:19:50 -04:00
GriffinR
17a8498701 Fix battle message charmap copied from emerald 2022-08-30 14:07:57 -04:00
GriffinR
321f5371d8 Sync cable club 2022-08-25 18:48:54 -04:00
GriffinR
da955aaf64 Document safari reactions, move b string ids to constants 2022-08-23 11:11:50 -04:00
GriffinR
a5853a71bd Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-23 10:47:07 -04:00
GriffinR
feb3d9cbab
Merge pull request #537 from GriffinRichards/doc-bmsg 
Sync/document battle_message.c
 2022-08-23 10:45:48 -04:00
Eduardo Quezada
616ab63d94 More sync with battle controllers 2022-08-20 16:13:03 -04:00
GriffinR
b3590324b8 Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-19 11:30:00 -04:00
GriffinR
17b2faa182 Sync battle anim - scripts 2022-08-19 01:07:53 -04:00
GriffinR
5813cb43c2 Sync battle anim.c 2022-08-17 15:57:46 -04:00
GriffinR
ab56ac41a1
Merge branch 'master' into clone-union 2022-08-17 15:41:50 -04:00
GriffinR
5dc80c492a
Merge pull request #532 from AsparagusEduardo/pokefirered_pokeemeraldSync3 
Sync src/battle_util.c with pokeemerald
 2022-08-17 11:29:51 -04:00
GriffinR
0c74385de7 Sync battle anim - effects 3 2022-08-16 14:23:32 -04:00
cbt6
73f8a54aa9 Document remaining movement types and actions 2022-08-16 12:24:18 +08:00
cbt6
2644dd9c21
Merge branch 'master' into movement-action 2022-08-15 12:54:47 +08:00
GriffinR
a064849864 Sync/document battle_message.c 2022-08-12 13:58:24 -04:00
cbt6
7233b2ed0a Rename WalkFastest functions to WalkFaster 2022-08-11 12:21:28 +08:00
GriffinR
2b93687ade Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union 2022-08-10 13:48:30 -04:00
GriffinR
fbdbc5851c Add npc text color constants 2022-08-09 16:06:51 -04:00
GriffinR
acb480f1c1 Sync event.inc and scrcmd.c 2022-08-09 15:10:38 -04:00
Eduardo Quezada
ac973aa38d Sync src/battle_util.c with pokeemerald 2022-08-07 22:37:10 -04:00
GriffinR
3fd7e08ae1
Merge pull request #529 from GriffinRichards/rename-viridian 
Rename Viridian City houses
 2022-08-06 12:53:54 -04:00
GriffinR
507b284353 Celadon water -> cycling road water 2022-08-06 02:31:19 -04:00
GriffinR
daf293b9ab Rename Viridian City houses 2022-08-05 15:51:27 -04:00
GriffinR
1640f8b835 Document metatile behaviors 2022-08-05 15:27:08 -04:00
Eduardo Quezada
b1bc05ec05 Review changes 2022-08-01 15:37:00 -04:00
Eduardo Quezada
19a521fe33 Almost complete battle_scripts_1.s sync 2022-08-01 01:05:18 -04:00
Eduardo Quezada
dcb9d9de1e Synced src/pokeball.c 2022-07-29 21:39:25 -04:00
Eduardo Quezada
dfe6c6885c Synced sound.c 2022-07-29 18:15:25 -04:00
Eduardo Quezada
c97e88b437 Review changes 2022-07-29 16:57:13 -04:00
Eduardo Quezada
7f53f533bb Synced src/battle_script_commands.c 2022-07-29 09:42:03 -04:00
Eduardo Quezada
0709da5867 Multiple changes 2 2022-07-28 01:20:05 -04:00
Eduardo Quezada
f5e9cc595b Multiple changes 
- BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START
- Defines for battle windows
- MAIL_NONE
- MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS
- Usage of BattlePutTextOnWindow with masks
- PlayCry1 -> PlayCry_Normal
- BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL
- FillPalette(0 -> FillPalette(RGB_BLACK
 2022-07-27 18:14:48 -04:00
cbt6
4940c4da98 Document src/field_effect_helpers.c 2022-07-19 00:01:57 +08:00
cbt6
56ca6d4bcc Document src/field_effect.c 2022-07-13 04:07:52 +08:00
GriffinR
16aacb0648 Sync pokemon jump documentation 2022-03-02 02:05:07 -05:00
GriffinR
a5e6e91605 Document/sync object event anims 2022-02-28 13:17:57 -05:00
cbt6
0aaae88d6e Rename movement action 0x9F 2022-02-28 23:12:57 +08:00
GriffinR
23d7c00c62
Merge branch 'master' into clone-union 2022-02-22 18:42:20 -05:00
GriffinR
59695b8221 Sync roamer 2022-02-11 15:05:15 -05:00
cbt6
0f3e26f9a4 Fix formatting and style 2022-02-10 01:53:48 +08:00
cbt6
ac3de6d02c Rename some movement actions and functions 2022-02-10 00:20:22 +08:00
GriffinR
38601cf09b Reformat clone objects in JSON 2022-02-05 14:34:53 -05:00
GriffinR
08a18d6e32 Sync/update trainer classes 2022-01-10 13:48:08 -05:00
GriffinR
b2c74cae84 Sync global 2021-11-19 20:36:59 -05:00
lioniac
0cc1d8a1b5 Multiple renamings; Removed some orphaned functions 2021-10-27 11:56:03 -03:00
Squeetz
d4695fffe7 Rename and document HITMARKER_x100000 
This marker makes the target unable to Counter or Mirror Coat the damage back to an attacker, however the game does not have a scenario where this is applicable since all its uses are in end-turn events. It's used for all passive damage, where the damage dealt isn't coming from an attacker.
Alternate name: HITMARKER_NO_ATTACKER
 2021-08-11 15:45:30 +02:00
PikalaxALT
3dce3407d5
Merge pull request #427 from GriffinRichards/name-mapgroups 
Name map groups
 2021-05-13 14:24:11 -04:00
GriffinR
7deccc36b7 Name unused house maps/map groups 2021-05-13 12:51:45 -04:00
PikalaxALT
c05af7f394 Rename NUM_FIELD_MAP_OBJECT_TEMPLATES --> MOVEMENT_TYPES_COUNT 2021-05-08 14:36:03 -04:00
PikalaxALT
8cb3819cc2 Merge remote-tracking branch 'origin/master' into doc_field_effect_templates 2021-05-08 11:35:23 -04:00
PikalaxALT
014dd7f0be Sync field_effect_objects.h from Emerald 2021-05-03 15:22:13 -04:00
PikalaxALT
7f50753360 Sync field_effect_object_template_pointers.h with Emerald 2021-05-03 14:09:21 -04:00
PikalaxALT
cb90fda18d Refactor some field effect graphics 2021-05-03 13:27:37 -04:00
PikalaxALT
9a91476b81 Improve documentation of trainer tower sets 2021-04-28 20:44:15 -04:00
PikalaxALT
a60d6675d7 Trainer tower sets to C 2021-04-28 18:44:38 -04:00
GriffinR
75f2be2e29 Name map groups 2021-04-28 16:37:08 -04:00
SatoMew
c128e68062 Replace rival labels 2021-04-17 16:32:55 +01:00