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

2075 Commits

Author SHA1 Message Date
cawtds
bb6ce1a742 debug menu adjustments 2024-06-19 22:22:38 +02:00
cawtds
82f44b8742 add sprite debug menu 2024-06-19 21:21:46 +02:00
cawtds
36241c743a added battle_debug 2024-06-19 20:24:06 +02:00
cawtds
bd97821ba6 added underscore to charmap.txt, updated tools/preproc 2024-06-19 19:10:52 +02:00
cawtds
cd9254cd42 fix map bug introduced with debug 2024-06-19 17:59:12 +02:00
cawtds
7200d3d552 debug menu 2024-06-19 16:58:28 +02:00
cawtds
12443215f9 refactored item icon/palette usage 2024-06-18 20:55:47 +02:00
cawtds
12d8da7135 updated items 2024-06-18 20:41:00 +02:00
cawtds
f276da42e8 renamed pockets to align with expansion 2024-06-18 20:06:02 +02:00
cawtds
94cd3866d7 updates to items 2024-06-18 20:01:41 +02:00
cawtds
d02b8bd3e1 added tera animations 2024-06-18 19:24:32 +02:00
cawtds
57686b5aed tera working without animations 2024-06-18 19:11:22 +02:00
cawtds
4adea56576 terastal mechanically integrated 2024-06-18 18:16:49 +02:00
cawtds
97b1b5f176 updated battle_script_commands to expansion 2024-06-18 17:58:16 +02:00
cawtds
a8c74d1c4d updating battle_script_commands 2024-06-18 17:04:09 +02:00
cawtds
c4807e34da daycare updates 2024-06-18 00:45:48 +02:00
cawtds
bcc4ac4bec updated speciesinfo to current expansion 2024-06-18 00:33:49 +02:00
cawtds
4291aa3343 updated battle_util.c 2024-06-18 00:20:24 +02:00
cawtds
00b005fcb8 battle_util.h aligned with expansion 2024-06-17 23:44:23 +02:00
cawtds
b9b06c3884 more battle_util reordering 2024-06-17 23:03:18 +02:00
cawtds
fddda28ba7 battle script updates 2024-06-17 22:36:41 +02:00
cawtds
0b0db8c744 integrate updates from expansion 2024-06-17 18:37:18 +02:00
cawtds
3cb3ccb6df natures refactoring 2024-06-17 17:30:05 +02:00
cawtds
e9661be94a types refactoring 2024-06-17 16:59:32 +02:00
cawtds
c5be8a5f7c removed a bunch of unused stuff 2024-06-17 16:23:02 +02:00
cawtds
63c9877b3c fixed warnings 2024-06-16 22:39:45 +02:00
cawtds
1294ea6d66 fixed last warning, reenabled -Werror 2024-06-16 19:03:57 +02:00
cawtds
a108f6ac88 fixed lots of warnings 2024-06-16 15:09:00 +02:00
cawtds
a5332b0eed removed revision and game language 2024-06-14 22:52:58 +02:00
cawtds
9f945f58e2 fixed more warnings 2024-06-14 21:26:11 +02:00
cawtds
bbfd9114d5 more warnings 2024-06-14 18:00:03 +02:00
cawtds
030ebb9f12 fixed warnings in battle_controllers 2024-06-13 23:40:33 +02:00
cawtds
79a4c19733 fix more compiler warnings 2024-06-13 23:33:48 +02:00
cawtds
61ff41ce55 compiler warning 2024-06-13 23:18:06 +02:00
cawtds
4f93c774e0 compiler warnings party_menu.c 2024-06-13 23:12:31 +02:00
cawtds
fb15e62954 fixed remaining tests 2024-06-09 23:01:28 +02:00
cawtds
77637c48d0 more tests fixed 2 2024-06-09 22:37:32 +02:00
cawtds
b3a8a1b7cb more test fixes 2024-06-09 21:37:25 +02:00
cawtds
7b7c66bc56 various updates: fixed switch in ability message, gulpmissile, explosion... 2024-06-09 19:55:37 +02:00
cawtds
cadf4e3173 more test updates, added HQ_RANDOM to config 2024-06-09 19:21:54 +02:00
cawtds
c57cb16884 fixed tests: updated ai classes and strings to match pokeemerald expansion 2024-06-09 15:29:21 +02:00
cawtds
1bab23c4ff fixed large exp test: added autoclick for lvlup popup + increased timeout for tests 2024-06-09 13:44:11 +02:00
cawtds
94ad1ce6a1 fixed an issue with ball throw anim in battle_controller_recorded_player 2024-06-09 11:48:32 +02:00
cawtds
74c82505a5 fixed givemon, adjusted makefile to allow leafgreen again, fixed bugs introduced with test framework 2024-06-09 03:08:36 +02:00
cawtds
16746737a4 fully(?) integrated testframework 2024-06-08 21:19:20 +02:00
cawtds
2f6a832875 implemented test framework semi-functional 2024-06-08 03:15:53 +02:00
Kurausukun
6bd758f45d fix compilation on gcc 14 2024-06-06 23:22:37 -04:00
cawtds
f55636b549 added lure functionality, fixed update repel counter 2024-06-05 22:55:36 +02:00
cawtds
6cd6e4feaf updated repel functionality and added spray menu 2024-06-04 23:53:02 +02:00
cawtds
53424164c0 added exp share gen6+ functionality 2024-06-04 22:04:22 +02:00
cawtds
cb64e6f676 added box link functionality 2024-06-04 21:06:27 +02:00
cawtds
76ce909146 added honey functionality 2024-06-02 23:36:50 +02:00
cawtds
260383969f implemented fusion item functionality 2024-06-02 18:56:27 +02:00
cawtds
1002d2cabd fixed regional variant breeding 2024-06-02 09:39:24 +02:00
cawtds
c58b846165 removed special deoxys sprite handling 2024-06-01 23:11:53 +02:00
cawtds
b5695ea8e5 added rotom catalog and zygarde cube functionality 2024-06-01 22:30:07 +02:00
cawtds
d7519b540e dynamax candy functionality 2024-06-01 21:12:29 +02:00
cawtds
b20c4638e5 move anim refactoring 2024-06-01 16:18:47 +02:00
cawtds
e37718e4c0 hp as part of statStr buffer 2024-05-31 21:13:06 +02:00
cawtds
f422f4b7f8 added EV and IV display in pokemon summary 2024-05-31 16:38:27 +02:00
cawtds
48013b0879 added mint functionality and nature mod color 2024-05-30 14:29:40 +02:00
cawtds
253c75849b updated daycare/egg hatching: 
added nature inheritance
updated iv inheritance
updated incense based species
added item based egg moves
added ability inheritance
updated egg species determination for regional variants
 2024-05-26 21:04:00 +02:00
cawtds
636de5fda4 fixed teachy tv crash 2024-05-26 15:27:36 +02:00
cawtds
d55f15e57e readded some key item field functions, pokedex refactoring 2024-05-25 14:45:33 +02:00
cawtds
ee69e9f140 rename gItems to gItemsInfo 2024-05-24 22:31:38 +02:00
cawtds
9256aaeff1 refactoring dex constants 2024-05-24 21:52:19 +02:00
cawtds
a7e025d27c animation changes 2024-05-24 21:22:53 +02:00
cawtds
2ee1fd9719 fixed pokemon summary for 4 digit numbers, changed move descriptions to fit window 2024-05-21 23:07:00 +02:00
cawtds
f5568b0aae removed dex_mode macro, merged dex_category and dex_order indices 2024-05-21 18:30:44 +02:00
cawtds
f6403670f4 support 4 digit dex numbers 2024-05-21 18:18:51 +02:00
cawtds
2e019d2c6b added metric units and optional imperial 2024-05-20 21:19:31 +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
f17f42b479 fixed party menu display for learnable moves, added wild encounter manipulation with ability 2024-05-20 12:24:08 +02:00
cawtds
6e09249156 fix full restore 2024-05-20 00:58:18 +02:00
cawtds
8d114bdd8c fixed poison_point freezing game by reading B_BUFF_ABILITY as u16 instead of u8 2024-05-19 19:11:34 +02:00
cawtds
0e9263ae37 dynamax animation 2024-05-19 14:59:41 +02:00
cawtds
183c782ac6 added ability popup 2024-05-19 14:06:19 +02:00
cawtds
2a38365c71 dont do time based events in pokemon center 1f 2024-05-19 13:52:24 +02:00
cawtds
12f9853133 bounce refactoring 2024-05-19 13:39:34 +02:00
cawtds
64f3aa42f1 finished revival blessing 2024-05-19 13:00:15 +02:00
cawtds
c995dadd05 fixed pokedex entry handling for forms, removed unused 2024-05-19 12:43:06 +02:00
cawtds
6fe79e23bd fixed state change shift, removed unused 2024-05-19 01:38:06 +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
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
cawtds
b1b92c94ca added start menu window for time, season, day 2024-05-16 23:29:17 +02:00
cawtds
4efba579cd added seasons and season based form encounters 2024-05-15 17:58:28 +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
7e2ecf588e fixed 1v2 double battles, added wild double battles, removed unused 2024-05-12 22:39:03 +02:00
SatoMew
b9dec717da Spring cleaning 2024-05-12 14:34:43 +01:00
cawtds
56d32c797d finished updating battle_main, removed unused functions/variables, fixed trainer money rewards 2024-05-12 02:30:07 +02:00
cawtds
a1b4f04468 fixed dive and lure ball, more battle_main updates 2024-05-12 00:07:10 +02:00
cawtds
94cebee475 updated battle intro 2024-05-11 16:32:29 +02:00
cawtds
7791678ba1 fixed bug with AI switchout, removed unused functions, refactoring 2024-05-11 13:37:46 +02:00
cawtds
638a089e06 updated AI 2024-05-11 02:36:12 +02:00
cawtds
f980e6258d refactored trainers 2024-05-11 01:30:30 +02:00
cawtds
6d3a81785f finished updating battle_controller_oak_old_man 2024-05-10 22:29:02 +02:00
cawtds
46c82ee187 finished updating battle_controller_link_partner 2024-05-10 17:55:19 +02:00
cawtds
4632104c13 updated battle_controller_opponent up to CONTROLLER_TOGGLEUNKFLAG 2024-05-10 14:36:16 +02:00
cawtds
7331c111a9 updated battle_controller_opponent up to CONTROLLER_DRAWTRAINERPIC 2024-05-10 12:52:25 +02:00
cawtds
ff50415c90 finished updating battle_controller_player 2024-05-10 10:32:50 +02:00
cawtds
ee8f8cb2cc updated battle_controller_player up to CONTROLLER_DRAWPARTYSTATUSSUMMARY 2024-05-10 10:09:22 +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
75b8ba5d6b battle_controller_player done up to PlayerHandleTrainerSlideBack 2024-05-09 20:55:10 +02:00
cawtds
c8012f6d46 generalized battleloadmonspritegfx 2024-05-09 18:22:50 +02:00
cawtds
64d681150c moved bufferA, bufferB and transferBuffer to BattleResources 2024-05-09 18:09:32 +02:00
cawtds
87b28b8041 prep battle controller refactoring, add trainer for double battle tests 2024-05-09 17:47:03 +02:00
cawtds
91b858d863 replace gTypeNames with gTypesInfo, changed font size in move selection 2024-05-09 14:07:38 +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
bd91a6eaa1 refactoring: removed gMoveNames and move gNatureNamePointers 2024-05-05 22:53:32 +02:00
cawtds
339a958caf fixed evolution tracker based evolutions, removed unused functions 2024-05-05 21:45:55 +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
7afbec3526 fixed evolution learn moves 2024-05-04 13:46:40 +02:00
cawtds
eb2bc4fd09 new pokemon, updated species_info and learnsets 2024-05-04 13:33:20 +02:00
cawtds
5a72d6a155 enabled all species, padding to 32mb 2024-05-04 12:43:10 +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
b332fecc43 remove unused variables, pass battler to function instead of gActiveBattler 2024-05-03 21:24:13 +02:00
cawtds
4887646e6e refactoring: prep for removing gActiveBattler 2024-05-03 20:37:48 +02:00
cawtds
3e3f6d8974 refactored PlayHandle functions 2024-05-03 19:25:47 +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
97cca809a0 removed more unused functions, updated wild pokemon held item calculation 2024-05-03 13:00:05 +02:00
cawtds
963be8c077 fixed bug with type3 not being intialized leading to wrong type calculations 
removed unused functions
 2024-05-03 11:57:21 +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
99a46831af updated up to Cmd_removelightscreenreflect 2024-05-02 11:58:44 +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
3975b342b5 updated up to Cmd_settypetorandomresistance 2024-05-02 03:05:00 +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
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
d1d0baad3f updated up to Cmd_resetsentmonsvalue 2024-05-01 23:02:03 +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
8d43d7f975 updated Cmd_yesnoboxlearnmove 2024-05-01 20:32:05 +02:00
cawtds
711cf686cf updated up to Cmd_endlinkbattle 2024-05-01 19:11:54 +02:00
cawtds
6a84c1a901 Cmd_switchineffects 2024-05-01 18:57:00 +02:00
cawtds
dbe0659d3d updated Cmd_switchhandleorder 2024-05-01 18:04:01 +02:00
cawtds
3d93e375fd updated Cmd_openpartyscreen 2024-05-01 17:40:34 +02:00
cawtds
6c8ca5e28d updated up to Cmd_jumpifcantswitch 2024-05-01 17:07:57 +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
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
afbda761c3 updated Cmd_dofaintanimation and Cmd_cleareffectsonfaint 2024-04-30 21:20:14 +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
45f6238b77 updated Cmd_critcalc, Cmd_damagecalc, Cmd_typecalc 2024-04-29 23:42:03 +02:00
cawtds
459c59b42e updated Cmd_attackstring and Cmd_ppreduce 2024-04-29 23:19:22 +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
f547146578 changed effect parameters to u16 2024-04-27 18:37:34 +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
1e892f14fe removed redundant function 2024-04-26 18:13:53 +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
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
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