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,463 Commits 2 Branches 0 Tags 366 MiB
f5008263b3
Commit Graph

1519 Commits

Author SHA1 Message Date
Deokishisu
4578a59673
Fix Localization Oversight in Daisy's Text 
Based on the FONT_NORMAL and FONT_FEMALE control codes in Daisy's text when finishing her grooming of a Pokémon, it seems the original intention was for the first part of this text to be NPC_TEXT_COLOR_NEUTRAL and for Daisy's dialogue to be NPC_TEXT_COLOR_FEMALE. If the localizers had caught it, they would've replaced FONT_NORMAL with COLOR DARK_GRAY and FONT_FEMALE with COLOR RED. This commit creates a .ifdef BUGFIX for this oversight.
 2024-05-24 22:09:31 -04:00
Deokishisu
fb0c7dc3f2
Fix Typo in Nurse Script 
EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom => EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom
 2024-05-24 21:58:35 -04:00
cawtds
a7e025d27c animation changes 2024-05-24 21:22:53 +02:00
cawtds
cf09c3d886 fixed mr mime typing 
fixed pokedex screen crashing after battle due to memory
fixed dex ordering modes a-z, lightest, smallest and type
 2024-05-20 17:53:56 +02:00
cawtds
6e09249156 fix full restore 2024-05-20 00:58:18 +02:00
cawtds
0e9263ae37 dynamax animation 2024-05-19 14:59:41 +02:00
cawtds
64f3aa42f1 finished revival blessing 2024-05-19 13:00:15 +02:00
cawtds
91851dd1b5 fixed ultra burst and added animation for necrozma moves 
fixed pokedex entries and crashes with categories/post battle registering
 2024-05-19 01:19:35 +02:00
cawtds
5ea880f8b7 fixed z-moves 2024-05-18 13:53:20 +02:00
cawtds
b801236595 added dynamax 2024-05-17 18:44:29 +02:00
cawtds
b2a56f6b6c added new pokeball graphics, fixed/refactored tmhms, smaller pokedex entry font to fit whole text 2024-05-14 22:20:07 +02:00
cawtds
2b3e3789a7 fixed learning tmhm moves, fixed and refactored tutor moves 2024-05-14 19:48:52 +02:00
cawtds
56d32c797d finished updating battle_main, removed unused functions/variables, fixed trainer money rewards 2024-05-12 02:30:07 +02:00
cawtds
94cebee475 updated battle intro 2024-05-11 16:32:29 +02:00
cawtds
638a089e06 updated AI 2024-05-11 02:36:12 +02:00
cawtds
f9c73a3cd9 migrated battle_controller_player up to CONTROLLER_STATUSICONUPDATE, fixed in battle item use 2024-05-10 01:02:59 +02:00
cawtds
87b28b8041 prep battle controller refactoring, add trainer for double battle tests 2024-05-09 17:47:03 +02:00
cawtds
8ab3940a99 added mega evolution, removed old type effectiveness 2024-05-09 12:48:10 +02:00
cawtds
a26ee9d55c added missing battle move effects 2024-05-07 20:13:27 +02:00
cawtds
cb86fbde05 fixed evolution tracker for modern, fixed moved based evolution tracking, removed unused 2024-05-05 19:49:16 +02:00
cawtds
c2e0ab5d73
Rtc implementation (#5) 
added RTC and fixed time based evolutions
 2024-05-05 14:20:30 +02:00
cawtds
8411cba7a6 fixed two turn effects, fixed 'what will do' text on first battl 2024-05-04 12:19:37 +02:00
cawtds
31cfcc136b refactoring, removed gActiveBattler 2024-05-04 04:02:12 +02:00
cawtds
61a41d2ad4 refactored to passing battler to Emit functions 2024-05-04 01:44:23 +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
3e4c5fad66 cleanup 2024-05-02 15:33:45 +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
41c8f99763 updated up to Cmd_unused4 2024-05-02 11:45:23 +02:00
cawtds
e2e932c894 updated up to Cmd_unused2 2024-05-02 11:29:10 +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
f8a1b4d4c6 updated up to Cmd_setsunny 2024-05-02 10:08:28 +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
69b94eb97f updated up to Cmd_tryKO 2024-05-02 02:13:51 +02:00
cawtds
4203ad1e98 updated up to Cmd_initmultihitstring 2024-05-02 02:04:56 +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
28158212ad updated Cmd_various 2024-05-02 00:27:19 +02:00
cawtds
09a32a59f3 updated up to Cmd_removeitem 2024-05-01 22:22:17 +02:00
cawtds
991c45f23d updated up to Cmd_getmoneyreward 2024-05-01 21:12:01 +02:00
cawtds
6a84c1a901 Cmd_switchineffects 2024-05-01 18:57:00 +02:00
cawtds
efe6d23e07 updated up to Cmd_switchindataupdate 2024-05-01 16:56:25 +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
070529a3bb updated up to Cmd_setgraphicalstatchangevalues 2024-05-01 15:12:37 +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
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
f547146578 changed effect parameters to u16 2024-04-27 18:37:34 +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
e5172d1b48 fixed evolution stone usage 
GetEvolutionTargetSpecies now usesnew evolution handling
removed national dex restriction for gen2+ evolutions
 2024-04-25 23:12:36 +02:00
cawtds
04c1ecb778 fixed exp candies 2024-04-24 21:38:28 +02:00
cawtds
ef015afb79 fixed in battle and out of battle item usage; 
removed some debug prints
fixed numerical order to show correct entries
refactored pp functions
expanded CannotUseBagBattleItem to CannotUseItemsInBattle
 2024-04-23 21:57:55 +02:00
cawtds
a06fb5c287 add item_icons for new items 2024-04-21 22:04:34 +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
Edward Nolan
93d4e3ff66 Fix misspelling: TRAINER_RIVAL_POKENON_TOWER -> TRAINER_RIVAL_POKEMON_TOWER 2023-09-10 21:16:06 -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
c212795217 Fix index comment for ScrCmd_playslotmachine 2023-05-31 21:47:33 -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
a2f30a3382
Merge pull request #611 from GriffinRichards/sync-pokemon 
Sync pokemon.c
 2023-03-18 13:24:51 -04:00
cbt6
242bb41682 Document src/graphics.c 2023-03-11 23:57:01 +08:00
GriffinR
ab417d1255 Sync pokemon.c 2023-03-06 15:23:11 -05:00
GriffinR
ef12c2a7f9 Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2023-01-30 10:23:08 -05:00
SphericalIce
8e2d4b179e Add missing newline in gOakSpeech_Text_LetsGo 2022-12-31 14:48:57 +00:00
SphericalIce
2070ea7896 Format strings in new_game_intro.inc 2022-12-31 14:42:41 +00:00
SphericalIce
0348b58899 Rename gOakText_AskPlayerGender to fit naming convention 2022-12-31 14:39:34 +00:00
SphericalIce
d080ebd0f0 Document oak_speech.c 2022-12-30 23:59:45 +00:00
GriffinR
fd81669091 Remove old move descriptions 2022-12-16 09:46:31 -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
673c86c56f
Merge branch 'master' into sync-text 2022-11-26 18:08:49 -05:00
GriffinR
e78094de85 Document fonts 2022-11-22 14:20:27 -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
ae38640a3b Continue documenting quest log 2022-11-11 02:10:16 -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
GriffinR
403cbeded2 Fix Marcos/Macros typo 2022-10-30 22:01:45 -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
5dfc494c00 Convert tilesets.s to C 2022-10-08 03:54:27 -04:00
GriffinR
aeb1c74bbf Label remaining scripts 2022-10-05 15:32:51 -04:00
GriffinR
7b2da8e402 Sync/document the rest of strings.c 2022-09-13 14:48:54 -04: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
ccd527b782
Merge pull request #542 from GriffinRichards/sync-cableclub 
Sync cable club
 2022-09-03 14:27:13 -04:00
GriffinR
56fead7d16
Merge pull request #543 from Jaizu/common_movement_naming 
Add Common_ to movements.inc
 2022-09-03 14:20:33 -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
Jaizu
ce612de462 Add Common_ to movements.inc 2022-08-28 16:51:45 +02:00
GriffinR
321f5371d8 Sync cable club 2022-08-25 18:48:54 -04:00
GriffinR
feccd302d7
Merge pull request #540 from GriffinRichards/sync-b-anim 
Sync battle anim
 2022-08-25 10:09:32 -04:00
GriffinR
b06d2045fc Script_HeartIcon -> Script_XIcon 2022-08-24 18:17:18 -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
GriffinR
b3590324b8 Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-19 11:30:00 -04:00
GriffinR
c976547c02 Clean up FRLG-specific anim scripts 2022-08-19 10:11:39 -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
c0b0e87f68 Sync battle anim - status effects 2022-08-17 15:14:30 -04:00
GriffinR
4e106d86e3 Sync battle anim - sound tasks 2022-08-17 14:44:26 -04:00
GriffinR
8601b4fff3 Sync battle anim - smokescreen 2022-08-17 14:29:23 -04:00
GriffinR
a1fcfa2f26 Sync battle anim - normal 2022-08-17 13:30:22 -04:00
GriffinR
9552ea6330 Sync battle anim - ice 2022-08-17 12:18:06 -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
GriffinR
bcab96fb86 Sync battle anim - effects 2 2022-08-16 13:54:37 -04:00
cbt6
2644dd9c21
Merge branch 'master' into movement-action 2022-08-15 12:54:47 +08:00
GriffinR
92a193aa71 Sync battle anim - dark 2022-08-14 18:30:55 -04:00
GriffinR
702d43e742 Rename battle anim files 2022-08-14 18:02:16 -04: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
f113da30ad Use 'goto_if_eq VAR, value, Script' syntax 2022-08-09 20:41:54 -04:00
GriffinR
60fc8c5e22 Add remaining event.inc comments 2022-08-09 20:27:42 -04:00
GriffinR
3add78dbd1 Use constants for setfieldeffectargument 2022-08-09 20:12:26 -04:00
GriffinR
fbdbc5851c Add npc text color constants 2022-08-09 16:06:51 -04:00
GriffinR
0c1adf2115 Use seteventmon 2022-08-09 15:29:16 -04:00
GriffinR
8e7dd94eca Drop some optional script command arguments 2022-08-09 15:25:44 -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
daf293b9ab Rename Viridian City houses 2022-08-05 15:51:27 -04:00
Eduardo Quezada
19a521fe33 Almost complete battle_scripts_1.s sync 2022-08-01 01:05:18 -04:00
Eduardo Quezada
95dd979f09 Font constants and slight PSS sync 2022-07-31 21:00:27 -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
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
cbt6
4940c4da98 Document src/field_effect_helpers.c 2022-07-19 00:01:57 +08:00
cbt6
da47b35d81 Add field effect constants as comments 2022-07-13 16:35:10 +08:00
cbt6
56ca6d4bcc Document src/field_effect.c 2022-07-13 04:07:52 +08:00
GriffinR
9cde4e0f74 Remove address comments 2022-06-24 21:10:48 -04:00
GriffinR
75c7e67f00 Fix Museum_1F -> PokemonCenter_1F text 2022-06-24 19:02:11 -04:00