Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-12 23:31:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,765 Commits 2 Branches 0 Tags 366 MiB
3ff2bf88c1
Commit Graph

2520 Commits

Author SHA1 Message Date
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
b79736aec8 Fix Route 25 marker coords 2022-11-21 13:44:14 -05:00
GriffinR
52e1af81b3 Document pokedex area markers 2022-11-21 13:32:10 -05:00
cbt6
20e7148ade Address review comments 2022-11-20 20:50:40 +08: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
f51f5b9545 Review changes, label missed symbol 2022-11-19 01:23:29 -05:00
GriffinR
0517667b5b Standardize battle_transition graphics 2022-11-18 22:02:26 -05:00
GriffinR
e872033fdd Misc symbol roundup 2022-11-18 21:45:42 -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
GriffinR
a0f41da30d Label missed symbol 2022-11-14 11:33:17 -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
5b2479b7d7
Merge pull request #577 from GriffinRichards/sync-misc2 
Sync trainer_pokemon_sprites, programmable_wave_data, and battle_bg
 2022-11-08 15:44:11 -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
a7609df31b Sync union_room_player_avatar 2022-11-08 13:37:11 -05:00
GriffinR
5ce573fca1 Sync wireless_communication_status_screen 2022-11-08 02:28:53 -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
7a3c11a9c5 Use constant for object event graphic 2022-11-07 23:04:39 +08: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
c757adc3e9 Sync some battle_bg 2022-11-02 21:38:36 -04:00
GriffinR
bceda105e6 Sync trainer_pokemon_sprites 2022-11-02 21:32:52 -04:00
GriffinR
2f39d4ef99 Fix typo 2022-11-02 16:58:13 -04: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
b9fd3ec29c Clean up tileset anims 2022-11-02 13:53:15 -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
8fca2dcf26 Update gitignore/spacing for new region map data 2022-10-30 21:59:04 -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
483a7f0ddd Sync pokedex.c 2022-10-30 00:04:53 -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
ec38d03d18 Rename mevent_show_* files 2022-10-27 15:17:38 -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
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
a533ff70e7
Merge pull request #568 from GriffinRichards/tilesets-c 
Convert tilesets.s to C
 2022-10-10 12:48:37 -04:00
GriffinR
7178aa8b99 Set unused tiles to transparent, document adjacent files 2022-10-10 09:20:16 -04:00
GriffinR
26c0debb55
Merge pull request #566 from GriffinRichards/doc-scripts 
Label remaining scripts
 2022-10-09 10:05:37 -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
GriffinR
9fffa1fae2 Sync field_screen_effect 2022-10-04 19:21:28 -04:00
cbt6
32573b2ba9 Document item use 2022-10-04 00:51:38 +08:00
GriffinR
77238d182d Correct bag anim names 2022-10-02 07:58:27 -04: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
2e9ce9b2a0
Merge pull request #559 from GriffinRichards/doc-diploma 
Document remainder of diploma
 2022-09-30 01:39:35 -04:00
lioniac
8fb7eebfb9
Naming Mystery Gift Vars 2022-09-26 10:29:31 -03:00
GriffinR
87def58265
Merge pull request #518 from GriffinRichards/format-obj 
Reformat object event graphics info
 2022-09-25 21:58:52 -04:00
GriffinR
7b5f4a00cb
Merge pull request #500 from garakmon/rme_updates 
use json for region map sections
 2022-09-25 21:58:27 -04:00
GriffinR
7ee4e1d140 Document remainder of diploma 2022-09-24 17:48:25 -04: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
e33ed44b7f Add parentheses and case statements 2022-09-23 00:39:59 +08:00
cbt6
500a488442 Remove goto in ItemUseCB_MedicineStep 
Leak-informed
 2022-09-17 16:21:42 +08: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
GriffinR
8a7f1cf1ce Sync static text in ur message 2022-09-05 23:07:27 -04:00
Eduardo Quezada
7dcac240d4 Review changes 2022-09-04 21:23:24 -03:00
Eduardo Quezada
b6bc114ef1 Review suggestions 2022-09-04 20:56:14 -03: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
c0bf576445 Organize Pokemon storage graphics 2022-09-03 23:30:02 +08:00
cbt6
859ca7994e Document Pokemon storage system 2022-09-03 23:27:56 +08:00
GriffinR
d5dfd66812 CpuFastFill -> CpuFastFill16 in fieldmap 2022-09-02 19:42:26 -04: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
219a38578a Sync battle anim - script funcs 2022-08-19 10:29:25 -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
a3c2108af7 Sync battle anim - flying, header cleanup 2022-08-18 14:20:25 -04:00
Eduardo Quezada
2f03c4a62c src/battle_controller_link_opponent.c 2022-08-18 14:17:56 -04:00
Eduardo Quezada
9020751fc4 triedShinyMonAnim 2022-08-18 14:17:35 -04:00
Eduardo Quezada
9205e7ad67 Uses of DISPLAY_WIDTH 2022-08-18 14:02:08 -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
e37c78c73f Usage of ST_OAM_AFFINE constants 2022-08-18 12:10:09 -04:00
Eduardo Quezada
5f81a9834f GetBattlerSpriteCoord and GetBattlerSpriteCoord2 using BATTLER_COORD_* constants 2022-08-18 12:00:13 -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