Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-06-01 05:29:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,211 Commits 2 Branches 0 Tags 366 MiB
d190503fa1
Commit Graph

2003 Commits

Author SHA1 Message Date
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
GriffinR
4da9e7549b
Merge pull request #631 from GriffinRichards/colorize 
Correct more graphics colors
 2023-07-26 22:49:23 -04:00
GriffinR
b56e1cbf7c Remove some unused declarations 2023-06-25 16:30:20 -04:00
GriffinR
86c21b8e79 Colorize menu icon graphics, document sMenuInfoIcons 2023-06-01 15:02:03 -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
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
31d4dabcda
Merge pull request #613 from GriffinRichards/const-map 
Treat map data as const
 2023-03-22 13:15:50 -04:00
GriffinR
adf1437074 Format metatile labels 2023-03-21 13:09:32 -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
981d4a34d8 Rename union room chat graphics 2023-03-16 22:13:05 +08:00
cbt6
7a322ba04e Document more of src/graphics.c 2023-03-13 23:09:19 +08:00
GriffinR
ab417d1255 Sync pokemon.c 2023-03-06 15:23:11 -05:00
GriffinR
2c11a2dc76
Merge pull request #608 from GriffinRichards/hiddenitem 
Add hidden item constant usage
 2023-03-06 13:59:57 -05:00
GriffinR
4bf48cf211 Add hidden item constant usage 2023-02-28 11:22:14 -05:00
GriffinR
6fc3965327 Sync some unlabeled graphics 2023-02-17 13:20:21 -05:00
GriffinR
f54a3966aa
Merge pull request #604 from GriffinRichards/doc-creditsgfx 
Document credits graphics
 2023-02-14 18:17:14 -05:00
GriffinR
f8d3a6b583
Merge pull request #602 from GriffinRichards/sync-debug 
Sync debug print functions
 2023-02-07 11:36:31 -05:00
GriffinR
2dd60bd86c Document credits graphics 2023-02-06 12:01: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
c23e55ec94 Sync debug print functions 2023-01-31 12:30:53 -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
7c0a589e58 Fix diploma colors 2023-01-26 23:59:05 -05:00
GriffinR
719d3d3cc6 Colorize teachy tv graphics 2023-01-26 23:30:13 -05:00
GriffinR
240cf616ff Colorize berry crush graphics 2023-01-26 22:30:16 -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
15b3674ec0
Merge pull request #595 from GriffinRichards/gbagfx-pals 
Automatically constrain png pixels to bit depth
 2023-01-15 16:29:32 -05:00
GriffinR
7710148fbc Colorize door animations 2023-01-11 15:35:19 -05:00
GriffinR
fc4aa4fff7 Sync trade anim 2023-01-09 15:38:30 -05: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
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
32ddd0f5cc Index controller function tables 2022-12-07 14:09:33 -05:00
GriffinR
c39f3161d2 Continue documenting Quest Log 2022-12-05 12:15:30 -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
f24fee8e57
Merge pull request #586 from GriffinRichards/sync-mevent 
Sync mystery gift
 2022-11-26 11:34:59 -05:00
GriffinR
b5b25d89cc
Merge pull request #585 from GriffinRichards/doc-areamarkers 
Document pokedex area markers
 2022-11-26 11:20:56 -05:00
GriffinR
94560af99c Remaining text sync/doc 2022-11-22 14:39:18 -05:00
GriffinR
e78094de85 Document fonts 2022-11-22 14:20:27 -05:00
GriffinR
8f95e41d44 Sync text.c 2022-11-22 13:23:30 -05:00
GriffinR
26251e9fba Sync characters 2022-11-22 13:02:40 -05:00
GriffinR
a19cb44458 Clean up mystery gift sync, document wonder news 2022-11-22 01:58:30 -05:00
GriffinR
76c3b014d8 Sync mystery gift menu, ereader screen 2022-11-21 23:30:47 -05:00
GriffinR
af6837c093 Sync mystery gift server, client, scripts 2022-11-21 17:35:18 -05:00
GriffinR
52e1af81b3 Document pokedex area markers 2022-11-21 13:32:10 -05:00
GriffinR
12b0c70069 Sync mystery_gift_link 2022-11-19 21:20:27 -05:00
GriffinR
6d6f207eb4 Initial mystery gift sync 2022-11-19 21:01:35 -05:00
cbt6
1ebe523b29 Document src/title_screen.c 2022-11-20 08:16:07 +08:00
cbt6
97987bc1b7 Document src/region-map.c 2022-11-20 08:11:13 +08:00
GriffinR
3c3101b72c Sync mevent file names 2022-11-19 18:39:26 -05:00
GriffinR
dfa2bfc5e5
Merge pull request #583 from GriffinRichards/sync-btrans 
Sync battle transitions, misc symbol roundup
 2022-11-19 16:40:19 -05:00
GriffinR
519443e214 Sync battle transitions 2022-11-18 21:16:08 -05:00
GriffinR
21a02ab5c7
Merge branch 'master' into sync-menuhelpers 2022-11-17 19:19:30 -05:00
GriffinR
783e8e72cf
Merge pull request #569 from GriffinRichards/sync-numtiles 
Sync num_tiles flags, document tm_case
 2022-11-17 19:18:37 -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
c8562b05ab
Merge pull request #580 from GriffinRichards/sync-rfu2 
Sync wireless link
 2022-11-14 11:39:05 -05:00
cbt6
c257ba1e6b Document src/battle_interface.c 2022-11-14 23:50:20 +08:00
GriffinR
092f19f323 Sync menu_helpers.c 2022-11-11 11:56:59 -05:00
GriffinR
ae38640a3b Continue documenting quest log 2022-11-11 02:10:16 -05:00
GriffinR
9721926b58 Quest log entry to union 2022-11-10 13:59:45 -05:00
GriffinR
78b07aace5 Start documenting quest log 2022-11-10 13:25:05 -05:00
GriffinR
21220c9427
Merge branch 'master' into sync-numtiles 2022-11-10 12:27:47 -05:00
GriffinR
d055ebad83 Document item_case 2022-11-10 12:26:05 -05:00
GriffinR
a043d327ea
Merge pull request #575 from GriffinRichards/sync-ec-gfx 
Sync easy chat data
 2022-11-08 15:24:49 -05:00
GriffinR
f56906cf9a
Merge branch 'master' into sync-rfu2 2022-11-08 15:19:32 -05:00
GriffinR
2b13af10a9
Merge pull request #574 from GriffinRichards/sync-link 
Sync link.c
 2022-11-08 15:17:28 -05:00
GriffinR
91915c5662 Fix player list array sizes 2022-11-08 13:46:11 -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
c5cf788676 Macros for keeping .partyFlags, .partySize, and .party in sync 2022-11-07 22:30:02 -05:00
GriffinR
75a53efc90 Sync link_rfu_3 2022-11-07 14:32:41 -05:00
GriffinR
b3c47d0059 Finish syncing link_rfu_2 2022-11-07 14:07:48 -05:00
GriffinR
87ce3fd349 Merge branch 'master' of https://github.com/pret/pokefirered into sync-rfu2 2022-11-07 10:41:03 -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
99ce8e358f Document/sync misc remaining symbols 2022-11-02 15:29:04 -04:00
GriffinR
9e59afca88 Document DrawHelpMessageWindowTiles 2022-11-02 13:53:27 -04:00
GriffinR
3161595768 Sync easy chat data 2022-11-02 13:32:19 -04:00
GriffinR
d8aa1ce2bf Sync link.c 2022-11-01 23:09:17 -04: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
42df883ebb Sync wonder card/news graphics 2022-10-28 13:03:32 -04:00
GriffinR
59330307a5 Sync mystery_gift_show_news 2022-10-28 02:01:58 -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
d1178f7f8f
Merge pull request #567 from GriffinRichards/doc-get-move-actions 
Label movement action arrays, z coord -> elevation
 2022-10-27 14:15:12 -04:00
GriffinR
aa092e819e
Merge pull request #565 from GriffinRichards/text-window 
Document text window
 2022-10-27 13:57:35 -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
7178aa8b99 Set unused tiles to transparent, document adjacent files 2022-10-10 09:20:16 -04:00
GriffinR
5dfc494c00 Convert tilesets.s to C 2022-10-08 03:54:27 -04:00
GriffinR
57e82c9264 Label movement action arrays, z coord -> elevation 2022-10-05 18:20:54 -04:00
GriffinR
aeb1c74bbf Label remaining scripts 2022-10-05 15:32:51 -04:00
GriffinR
3de70980e5 Document text window 2022-10-05 15:00:58 -04:00
cbt6
32573b2ba9 Document item use 2022-10-04 00:51:38 +08:00
GriffinR
ab2aacc9d5 Sync berry_fix_program 2022-10-02 00:10:53 -04:00
GriffinR
54f9b62ede Label minigame_digits 2022-10-01 23:47:18 -04:00
GriffinR
a247433e20 Sync/document item_menu_icons.c 2022-10-01 23:42:11 -04:00
GriffinR
4e3dedd6fa Sync palette 2022-10-01 22:30:05 -04:00
GriffinR
fc836b9de4
Merge pull request #558 from GriffinRichards/doc-intro 
Document intro
 2022-09-30 01:53:07 -04:00
GriffinR
3c9a9f7388
Merge pull request #560 from lioniac/mystery-gift-vars 
Mystery Gift vars named
 2022-09-26 12:50:55 -04:00
cbt6
c26afe5e1b Remove include/tilesets.h 2022-09-26 22:33:56 +08:00
lioniac
fe757ff8ae
Updated vars.h 2022-09-26 10:31:44 -03:00
GriffinR
fa9808f79d Document intro functions 2022-09-24 16:15:20 -04:00
GriffinR
aeef671c42 Merge branch 'master' of https://github.com/pret/pokefirered into doc-strings 2022-09-22 13:36:32 -04:00
cbt6
61ad87a314 Document party menu 2022-09-17 14:29:32 +08:00
GriffinR
27b2b0b24a Document intro graphics/data 2022-09-13 16:10:15 -04:00
GriffinR
7b2da8e402 Sync/document the rest of strings.c 2022-09-13 14:48:54 -04:00
GriffinR
c4cf82f439 Sync easy chat strings 2022-09-12 18:27:34 -04:00
GriffinR
f08115d9fe
Merge pull request #553 from GriffinRichards/sync-fld-weather-eff 
Sync field weather effects
 2022-09-12 17:56:14 -04:00
GriffinR
228869156c
Merge pull request #550 from GriffinRichards/sync-urmsg 
Document union room message texts
 2022-09-12 17:10:15 -04:00
GriffinR
ffaea1265b
Merge pull request #552 from GriffinRichards/sync-keyboardtext 
Sync keyboard text
 2022-09-12 15:03:52 -04:00
GriffinR
f59fb1710f
Merge pull request #551 from GriffinRichards/sync-rouletteutil 
Sync palette util
 2022-09-12 14:55:30 -04:00
GriffinR
c9281e5a57 Add more usage of GENDER_COUNT 2022-09-12 14:54:05 -04:00
GriffinR
398417593b
Merge pull request #549 from AsparagusEduardo/pret_unused 
Removed UNUSED attribute
 2022-09-12 14:47:25 -04:00
GriffinR
0a01d8f31b
Merge pull request #545 from GriffinRichards/sync-fieldmap 
Sync fieldmap
 2022-09-12 14:31:51 -04:00
GriffinR
212e455aae Sync field weather effects 2022-09-06 15:30:34 -04:00
GriffinR
d08aa80a70 Sync palette util 2022-09-06 14:54:40 -04:00
GriffinR
fc7da1aa5e Sync keyboard text 2022-09-06 14:10:43 -04:00
GriffinR
8fd8d21980 Document global ur text 2022-09-06 01:57:40 -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
cbt6
dbaf8f5900 Document field moves 2022-09-04 17:55:15 +08: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
cbt6
3a1994f7f7 Rearrange Pokemon storage source files 2022-09-03 23:35:07 +08:00
cbt6
859ca7994e Document Pokemon storage system 2022-09-03 23:27:56 +08:00
GriffinR
dcdf31f020 Sync fieldmap 2022-09-02 19:24:59 -04:00
GriffinR
a30ea109c1
Merge pull request #544 from GriffinRichards/fix-b-msg 
Fix battle message charmap copied from emerald
 2022-09-01 23:08:21 -04:00
GriffinR
17a8498701 Fix battle message charmap copied from emerald 2022-08-30 14:07:57 -04:00
GriffinR
7c0b46f6da
Merge pull request #541 from GriffinRichards/sync-script 
Sync script.c
 2022-08-26 23:55:31 -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
GriffinR
72f76b19b3 Sync script.c 2022-08-22 20:27:23 -04:00
Eduardo Quezada
616ab63d94 More sync with battle controllers 2022-08-20 16:13:03 -04:00
GriffinR
8a793e73a5 Sync link_rfu_2 2022-08-19 15:27:54 -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
a3c2108af7 Sync battle anim - flying, header cleanup 2022-08-18 14:20:25 -04:00
Eduardo Quezada
27e81b2fc7 UnusedControllerStruct 2022-08-18 12:59:38 -04:00
Eduardo Quezada
26e8d57ba1 Special Trainer IDs 2022-08-18 12:58:27 -04:00
Eduardo Quezada
57374b796b Sync src/battle_controllers.c 2022-08-18 11:32:26 -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
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
efa422d6fa Sync battle anim - mons 2022-08-17 13:14:34 -04:00
GriffinR
9552ea6330 Sync battle anim - ice 2022-08-17 12:18:06 -04:00
GriffinR
56f8b1a47c
Merge pull request #536 from GriffinRichards/sync-data 
Sync data.c
 2022-08-17 11:36:07 -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
ba890e57a4 Sync battle anim - ghost 2022-08-16 15:27:42 -04:00
GriffinR
796d307ffb Sync battle anim - fire 2022-08-16 15:15:07 -04:00
GriffinR
b598507a2e Sync battle anim - fight 2022-08-16 14:51:48 -04:00
GriffinR
ba6bb34226 Sync battle anim - electric 2022-08-16 14:35:37 -04:00
GriffinR
0c74385de7 Sync battle anim - effects 3 2022-08-16 14:23:32 -04:00