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
1,937 Commits 2 Branches 0 Tags 366 MiB
404932ba23
Commit Graph

835 Commits

Author SHA1 Message Date
PikalaxALT
629cb532d8 Update macros for battle_scripts_2 2019-11-06 15:05:04 -05:00
PikalaxALT
f3be95d0c0 Dump battle_scripts_2.s 2019-11-06 14:06:51 -05:00
PikalaxALT
69edfecc16 Update battle scripts with more defines 2019-11-06 13:09:59 -05:00
PikalaxALT
95d19b8e88 Sync battle script commands with emerald 2019-11-06 11:26:22 -05:00
PikalaxALT
2ed15a3bb5 Fix whitespace in battle_string_ids.h 2019-11-05 21:29:46 -05:00
PikalaxALT
91e305255c Dump battle scripts 1 2019-11-05 21:27:47 -05:00
PikalaxALT
eff10f0e50 Battle message buffers; review comments 2019-11-04 20:32:10 -05:00
PikalaxALT
2fa08605b8 Propagate save status, type, and sector defines 2019-11-04 17:12:02 -05:00
PikalaxALT
57b328ad40 Decomp hall_of_fame 2019-11-04 16:20:11 -05:00
PikalaxALT
d16532c262 Some more documentation 2019-11-04 09:33:19 -05:00
PikalaxALT
0f4621c730 Split mevent_client from mevent_server 2019-11-04 09:07:15 -05:00
PikalaxALT
89e0168cce Document mevent scripts 2019-11-03 19:16:53 -05:00
PikalaxALT
977925a9ee Exported function prototypes to mon_markings.h 2019-11-03 14:30:34 -05:00
PikalaxALT
8013fa861c Sync charmap with Emerald 2019-11-02 21:10:42 -04:00
PikalaxALT
ae97c32f7d Port mon_markings 2019-11-02 17:25:17 -04:00
PikalaxALT
2100eb9d81 Document easy_chat 2019-11-01 16:40:31 -04:00
PikalaxALT
115fd2aa9b Remove nonexistant easy_chat prototypes 2019-11-01 16:13:54 -04:00
PikalaxALT
36bea47ea6 Static symbols in easy_chat 2019-11-01 15:59:24 -04:00
PikalaxALT
6a90a57318 Disassemble bike data 2019-11-01 13:51:30 -04:00
PikalaxALT
a8c2fecbd5 Redump easy chat to C 2019-11-01 13:36:16 -04:00
PikalaxALT
5913bcf0e9 Port pokemon_size_record from Emerald 2019-11-01 09:55:25 -04:00
PikalaxALT
079310c70b Finish decomp of wild_encounter 2019-10-31 18:45:07 -04:00
PikalaxALT
b07b36c6d2 wild_encounter through sub_8082C98 2019-10-31 14:31:21 -04:00
PikalaxALT
2b0bcdcad9 Resolve externed prototypes in C files 2019-10-31 09:19:33 -04:00
PikalaxALT
f86bb07027 Review comments and documentation 2019-10-30 21:06:15 -04:00
PikalaxALT
71dbb00800 Address review comments 2019-10-30 18:47:02 -04:00
PikalaxALT
1ba6cb2245 Some renaming; resolve trade bss 2019-10-30 16:51:43 -04:00
PikalaxALT
4fae033d1a Finish trade_scene data 2019-10-30 16:01:31 -04:00
PikalaxALT
f6d768d5ed Trade data; split off trade_scene 2019-10-30 14:20:32 -04:00
PikalaxALT
2c2c179eb9 Finish trade code 2019-10-30 12:49:16 -04:00
PikalaxALT
265f8b5b25 trade through sub_8053E1C; dynamic sys flags start idx 2019-10-30 11:16:26 -04:00
PikalaxALT
e7a66b2941 port sub_8050F3C 2019-10-29 21:29:10 -04:00
PikalaxALT
ce5c3fdd77 Trade through sub_804FFE4 2019-10-29 12:58:40 -04:00
PikalaxALT
4c5e645e90 trade port through sub_804FA14 2019-10-29 11:02:57 -04:00
PikalaxALT
b07899b2d2 Remove unused header 2019-10-28 20:39:06 -04:00
PikalaxALT
efe914a5ba trade through sub_804E944 2019-10-28 15:55:57 -04:00
PikalaxALT
e9cf9fc104 port shedinja_maker_maybe; resolve within-array party pointers 2019-10-28 12:16:01 -04:00
PikalaxALT
b290a1a570 trade through sub_804D694 2019-10-28 10:43:57 -04:00
PikalaxALT
3710c0a370 Nonmatching sub_804CF14 2019-10-28 10:23:51 -04:00
PikalaxALT
47534a1471 Merge branch 'master' of github.com:pret/pokefirered into trade 2019-10-27 20:52:55 -04:00
PikalaxALT
93f0703fcd Merge branch 'master' of github.com:pret/pokefirered into script_menu 2019-10-26 10:23:13 -04:00
jiangzhengwenjz
0ae4d58e98 resolve more review comments 2019-10-26 11:51:43 +08:00
jiangzhengwenjz
1481f9e819 resolve review comments 2019-10-26 06:03:42 +08:00
PikalaxALT
4b052a2040 Resolve review comments 2019-10-25 17:01:05 -04:00
PikalaxALT
2fce740005 Name strings used in field_specials 2019-10-25 14:59:46 -04:00
PikalaxALT
359ec8dde1 Name multichoice menus 2019-10-25 14:52:54 -04:00
PikalaxALT
15298c6cd1 Fix some string names 2019-10-25 14:01:40 -04:00
PikalaxALT
d33509ec93 script_menu name strings 2019-10-25 13:56:01 -04:00
jiangzhengwenjz
1230a5c48a clean up 2019-10-26 01:31:50 +08:00
PikalaxALT
00675eaafb script_menu data 2019-10-25 13:23:46 -04:00
PikalaxALT
0a440d658b Finish script_menu code decomp 2019-10-25 11:10:08 -04:00
jiangzhengwenjz
2f87855072 Merge branch 'master' into battle 2019-10-25 09:22:50 +08:00
jiangzhengwenjz
6ca932e5e9 revert some symbol documentation (I hate this) 2019-10-25 09:17:15 +08:00
jiangzhengwenjz
b8c2d14f6a battle_controller_oak_old_man 2019-10-25 08:51:14 +08:00
jiangzhengwenjz
631eccb92d thru OakOldManHandleSwitchInAnim 2019-10-25 05:57:26 +08:00
PikalaxALT
4fae71a4b0 Fix alignment in flags.h 2019-10-24 16:54:01 -04:00
PikalaxALT
a18e9c27e1 Rename specials according to Ruby 2019-10-24 16:31:38 -04:00
PikalaxALT
440d062936 fix erroneous var name reversion 2019-10-24 15:51:47 -04:00
PikalaxALT
7c3d9df380 Finish field_specials 2019-10-24 15:28:43 -04:00
PikalaxALT
0d73967f6c field_specials through Special_BattleCardAction; field_specials rodata 2019-10-24 11:42:45 -04:00
PikalaxALT
779d6187c6 field_specials through sub_80CC534 2019-10-24 10:22:39 -04:00
jiangzhengwenjz
b469207121 rename BATTLE_TYPE_OLD_MAN_TUTORIAL 2019-10-24 14:05:20 +08:00
PikalaxALT
db3be6ef2e field_specials through sub_80CBFA0 2019-10-23 20:43:41 -04:00
PikalaxALT
54d6414654 field_specials through sub_80CBDE8 2019-10-23 20:12:14 -04:00
PikalaxALT
f33f58eff7 Finish fixing SEAVAULT to SEVAULT 2019-10-23 15:32:23 -04:00
PikalaxALT
661e5d9221 field_specials through Task_AnimateElevatorWindowView 2019-10-23 15:31:23 -04:00
jiangzhengwenjz
1dc0b25c1e Merge branch 'master' into battle 2019-10-24 01:42:52 +08:00
PikalaxALT
8249a58a2c Split trainers and port species and move names 2019-10-22 21:24:16 -04:00
PikalaxALT
4dfc6699fe Update code style in some places 2019-10-22 20:09:08 -04:00
PikalaxALT
a5521e6b69 Remove incomplete menews_jison constant defs 2019-10-22 16:47:41 -04:00
PikalaxALT
2a584a0671 Partial documentation of trainer_tower 2019-10-22 16:36:47 -04:00
PikalaxALT
1de8b7b197 Document overworld whiteout funcs 2019-10-22 13:09:47 -04:00
PikalaxALT
949a4c3b5d Document unk_8159F40 (pokedude battle party info) 2019-10-22 11:24:09 -04:00
PikalaxALT
aabb95139d stab in the dark at documenting menews_jisan 2019-10-22 10:44:00 -04:00
PikalaxALT
d51915bb0d Document some variables 2019-10-22 09:50:49 -04:00
PikalaxALT
faedabb106 Document quest log flag/var funcs 2019-10-22 09:03:19 -04:00
PikalaxALT
6ee1bd0621 Decompile event_data.s 2019-10-21 21:15:54 -04:00
PikalaxALT
7e0956f459 SEAGALLOP constants in event scripts 2019-10-21 16:46:58 -04:00
PikalaxALT
c5db703229 Update hidden item json fields 2019-10-21 13:34:31 -04:00
PikalaxALT
d7d93b22d2 Trainer constants in vs_seeker.c 2019-10-21 13:03:30 -04:00
PikalaxALT
629b9268e1 Name massage step counter 2019-10-21 12:30:57 -04:00
PikalaxALT
3a910078c1 Rename routines and objects related to move tutor 2019-10-21 12:08:37 -04:00
PikalaxALT
7e8da8845b Rename rival trainer constants 2019-10-21 11:06:53 -04:00
PikalaxALT
85a033f350 escort --> guide 2019-10-21 10:49:19 -04:00
PikalaxALT
221259d0d6 sys flags 2019-10-21 10:42:24 -04:00
PikalaxALT
a1bddb8f8c Remaining story flags referenced in event scripts 2019-10-21 09:58:14 -04:00
PikalaxALT
3ab70c735e Story flags through mystic ticket 2019-10-20 22:14:22 -04:00
PikalaxALT
8654e828e4 More story flags 2019-10-20 21:38:52 -04:00
PikalaxALT
9aa5709329 use TRUE and FALSE for flag conditionals; more story flags 2019-10-20 21:24:16 -04:00
PikalaxALT
2aeefdc5de update famechecker macro 2019-10-20 20:20:45 -04:00
jiangzhengwenjz
8fa4c84dbd sync with pret/pokeemerald#847 2019-10-21 05:02:05 +08:00
jiangzhengwenjz
cfe2a27b9c clean up 2019-10-21 04:17:17 +08:00
jiangzhengwenjz
b0400ef6ba battle_setup funcs 2019-10-21 03:08:10 +08:00
PikalaxALT
b3951b48ec fix FLAG_DEFEATED_RIVAL to FLAG_DEFEATED_CHAMP 2019-10-20 09:25:55 -04:00
PikalaxALT
9d8c5b2250 Two additional script macros 2019-10-19 22:37:08 -04:00
PikalaxALT
5a956fd91a Annotate blocks of flags 2019-10-19 22:02:04 -04:00
PikalaxALT
26d8c4d04b Name all item ball hide/show flags 2019-10-19 21:52:38 -04:00
PikalaxALT
44a293d84c Name remaining NPC hide/show flags 2019-10-19 21:18:39 -04:00
PikalaxALT
2702aa2754 Remaining NPC hide/show flags 2019-10-19 21:10:29 -04:00
PikalaxALT
2ff8af13d5 Hide/show flags through 07F 2019-10-19 20:30:38 -04:00
PikalaxALT
a8b767965a auto-assign map object hide/show flags 2019-10-19 15:49:26 -04:00
PikalaxALT
d98d4d887c Set map.json files with map_obj_gfx constants 2019-10-19 15:05:51 -04:00
PikalaxALT
1449c71364 Dump map obj gfx 2019-10-19 14:46:50 -04:00
PikalaxALT
a16d9af699 Document renewable_hidden_items 2019-10-18 15:16:52 -04:00
jiangzhengwenjz
e48725d9b5 document battle_setup symbols 2019-10-19 03:14:17 +08:00
PikalaxALT
a7bca8aa92 Hidden item flags 2019-10-18 15:02:34 -04:00
PikalaxALT
e363b0e2bf Split off renewable_hidden_items.c 2019-10-18 13:04:57 -04:00
PikalaxALT
4f15cb02d2 Rename map scene vars and partially document Oak's lab 2019-10-18 12:49:59 -04:00
PikalaxALT
4d8f66774e Merge branch 'master' into trainers 2019-10-18 10:20:01 -04:00
PikalaxALT
a7b278ac2d Restore documentation to mystery_event_msg 2019-10-18 10:14:39 -04:00
PikalaxALT
4bc284ff2c
Merge pull request #128 from garakmon/more_event_script_dump 
Final Event Script Dump
 2019-10-18 10:11:33 -04:00
jiangzhengwenjz
34b440a358 clean up 2019-10-18 10:59:49 +08:00
PikalaxALT
c40fdc5eb6 Begin fresh dump of mystery_event_msg 2019-10-17 22:32:06 -04:00
jiangzhengwenjz
a28bb81ab7 battle_main remaining funcs 2019-10-18 09:55:23 +08:00
PikalaxALT
2f0ae810f7 Merge branch 'master' into trainers 2019-10-17 21:26:00 -04:00
PikalaxALT
2435bcc09d sys flag rearrange 2019-10-17 21:24:47 -04:00
jiangzhengwenjz
88ad62c3f3 thru HandleEndTurn_MonFled 2019-10-18 06:16:11 +08:00
PikalaxALT
97dc0a6903 Trainer dump pass 2; flag refactoring 2019-10-17 17:11:34 -04:00
PikalaxALT
0b708aeade Initial trainers dump 2019-10-17 16:13:02 -04:00
ultima-soul
790966aec0 Dump gTrainerFrontPicTable and gTrainerFrontPicPaletteTable. 2019-10-17 00:23:41 -07:00
ultima-soul
5f6672ee07 Rename trainer front pics and palettes. 2019-10-16 22:52:41 -07:00
jiangzhengwenjz
1862f70466 thru BattleIntroDrawTrainersOrMonsSprites 2019-10-17 12:26:01 +08:00
garak
2ab9d19d34 use FLDEFF constants for dofieldeffect macro 2019-10-16 19:14:43 -04:00
garak
705138c224 dump more map event scripts 2019-10-16 19:09:52 -04:00
jiangzhengwenjz
f03807931f thru sub_8011B94 2019-10-17 02:01:07 +08:00
ultima-soul
29d7f1c737 Added TRAINER_PIC constants. 2019-10-16 00:04:07 -07:00
ultima-soul
cb192791eb Dump gTrainerFrontPicCoords 2019-10-15 22:49:41 -07:00
ultima-soul
364d88ec2c Merge branch 'master' into data_dump 2019-10-15 17:57:54 -07:00
jiangzhengwenjz
a6c0088073 battle_main data decomp 2019-10-16 08:31:44 +08:00
PikalaxALT
f8ae26e8af Address review comments 2019-10-15 19:17:38 -04:00
PikalaxALT
b08879b07e Name remaining pokemon_icon funcs 2019-10-15 17:04:32 -04:00
PikalaxALT
27772ae60f Port pokemon_icon data 2019-10-15 16:53:08 -04:00
PikalaxALT
170e4d03ff Decompile pokemon_icon 2019-10-15 12:07:14 -04:00
ultima-soul
94f722e719 Merge branch 'master' into data_dump 2019-10-15 07:48:46 -07:00
PikalaxALT
951bbcf64d Merge branch 'mail' of github.com:PikalaxALT/pokefirered into mail 2019-10-15 09:54:43 -04:00
PikalaxALT
19df609026 Revert MAIL(name) macro 2019-10-15 09:54:42 -04:00
ultima-soul
1937cc7b0d Port/dump palette tables. 2019-10-14 22:47:01 -07:00
ultima-soul
e3e61c6210 Port/dump front_pic_table. 2019-10-14 21:36:42 -07:00
ultima-soul
9d33d5600a Move data to C. 2019-10-14 18:37:06 -07:00
PikalaxALT
28d2e6f312 Merge branch 'master' into mail 2019-10-14 20:34:56 -04:00
PikalaxALT
f3ee5e7511
Merge pull request #119 from ultima-soul/data_dump 
Port/dump some data
 2019-10-14 17:21:38 -04:00
PikalaxALT
efe992763f Address review comments 2019-10-14 15:53:09 -04:00
PikalaxALT
9a431dae99 Decompile mail 2019-10-14 14:59:31 -04:00
PikalaxALT
b8fec3d9f6 Merge branch 'master' into trade 2019-10-14 10:46:04 -04:00
PikalaxALT
d4c9b77828 Address review comments, 3 2019-10-14 10:18:45 -04:00
PikalaxALT
5c7081b6e7 Address review comments, 2 2019-10-14 10:07:01 -04:00
PikalaxALT
9fe74ac590 trade through sub_804C728 (nonmatching 2019-10-14 09:40:17 -04:00
PikalaxALT
8fd0bc4245 Decompile start_menu 2019-10-13 22:04:51 -04:00
ultima-soul
26c879be9a Port/dump data up to front_pic_coordinates. 2019-10-13 14:43:22 -07:00
PikalaxALT
6bffe8613e
Merge pull request #115 from PikalaxALT/player_pc 
Player PC
 2019-10-13 09:06:53 -04:00
PikalaxALT
807e03c25d
Merge pull request #107 from jiangzhengwenjz/battle 
battle (2nd take)
 2019-10-12 21:08:06 -04:00
jiangzhengwenjz
b9f3f05b67 InitBgsFromTemplates 2019-10-13 06:56:42 +08:00
PikalaxALT
11b027d13c Decompile player_pc 2019-10-12 16:30:51 -04:00
jiangzhengwenjz
ff795fa834 Merge branch 'master' into battle 2019-10-12 11:55:37 +08:00
jiangzhengwenjz
c46e6fa3d9 flying 2019-10-12 11:46:11 +08:00
jiangzhengwenjz
b2f13ea37a trivial fixes 2019-10-12 06:52:41 +08:00
jiangzhengwenjz
6743faa822 psychic 2019-10-11 12:58:59 +08:00
jiangzhengwenjz
1aa9698ff0 bug 2019-10-11 11:35:33 +08:00
jiangzhengwenjz
e613430492 rock 2019-10-11 08:48:05 +08:00
jiangzhengwenjz
c0c4a2e94b ghost 2019-10-11 06:01:19 +08:00
PikalaxALT
55353e0023 Port songs from Emerald (nonmatching) 2019-10-10 17:15:59 -04:00
jiangzhengwenjz
89a377cdd3 Merge branch 'master' into battle 2019-10-10 08:39:00 +08:00
jiangzhengwenjz
7b28a3ecfd dragon 2019-10-10 08:09:37 +08:00
PikalaxALT
855c052be0 Rename song constants using Japanese sound test menu 2019-10-09 20:02:59 -04:00
jiangzhengwenjz
8c40cd5e5c dark 2019-10-10 07:42:34 +08:00
PikalaxALT
5e0f0ca6dc Merge branch 'master' into main_menu 2019-10-09 17:59:26 -04:00
SatoMew
2c254082de Merge branch 'master' of https://github.com/pret/pokefirered 2019-10-08 22:46:32 +01:00
PikalaxALT
99bd3d9154 Finish main menu decomp 2019-10-08 10:31:33 -04:00
PikalaxALT
0f67a952a3 main_menu through sub_800CE70 2019-10-07 17:06:11 -04:00
jiangzhengwenjz
90e9bbffa6 normal 2019-10-08 02:38:47 +08:00
jiangzhengwenjz
9f7bd7157d ground 2019-10-08 02:38:47 +08:00
jiangzhengwenjz
e9cdb63903 battle_anim_mons 2019-10-08 02:38:47 +08:00
jiangzhengwenjz
eef286808a battle_intro 2019-10-08 02:38:45 +08:00
jiangzhengwenjz
aa89a0482d battle_anim_utility_funcs; split battle_intro.s 2019-10-08 02:38:45 +08:00
jiangzhengwenjz
cb078ec3a2 battle_anim_sound_tasks 2019-10-08 02:38:44 +08:00
PikalaxALT
2fe6b6db8c main menu through sub_800C780 2019-10-07 14:06:47 -04:00
PikalaxALT
13468377bc Correct symbols in librfu.h 2019-10-07 13:07:11 -04:00
PikalaxALT
adf65c8289 More parameter spacing fixes 2019-10-07 12:54:42 -04:00
PikalaxALT
5ba9fcdd3f Consistent spacing for struct ptr arg/var decls 2019-10-07 12:34:42 -04:00
PikalaxALT
f39511d7c8 Finish link.s decomp 2019-10-07 10:54:45 -04:00
PikalaxALT
e73e1172aa link through ResetSerial 2019-10-06 21:08:53 -04:00
PikalaxALT
76fd98fffe link through CheckErrorStatus 2019-10-06 20:04:37 -04:00
PikalaxALT
736b89ae3d Merge branch 'master' into link 2019-10-06 18:06:24 -04:00
PikalaxALT
5620b0ed1a link through BuildSendCmd 2019-10-06 18:03:46 -04:00
ultima-soul
076971ee68 Resolve pokemon_jump changes. 2019-10-06 15:00:10 -07:00
ultima-soul
355c82e13e Remove trailing white space. 2019-10-06 14:51:44 -07:00
ultima-soul
52d40061ec Resolve review suggestions. 2019-10-06 14:47:08 -07:00
ultima-soul
0873084a5d Sync some function names with pokeemerald. 2019-10-06 13:06:13 -07:00
ultima-soul
d4ba74fb34 Fix formatting. 2019-10-06 09:13:15 -07:00
ultima-soul
d84e9bed58 Decompile/port new_game 2019-10-06 00:48:48 -07:00
PikalaxALT
221dd4721d link through TestBlockTransfer + bss, ewram 2019-10-05 20:30:02 -04:00
PikalaxALT
b01da1a592 link.c through InitLocalLinkPlayer 2019-10-05 15:49:05 -04:00
PikalaxALT
69cb422b78 Name functions in mailbox_pc 2019-10-05 12:25:18 -04:00
PikalaxALT
cb3e751f5f Decompile mailbox_pc and dump decorations 2019-10-05 12:13:33 -04:00
PikalaxALT
1f6f5f369b wild_pokemon_area and pokedex_area_markers 2019-10-04 13:06:17 -04:00
PikalaxALT
38d2b71717 Normal hidden item script; hidden item attr enum 2019-10-03 15:20:28 -04:00
PikalaxALT
a56a90d998 Resolve review comments 2019-10-03 14:01:57 -04:00
PikalaxALT
26d940dfeb Finish itemfinder dism/decomp 2019-10-03 12:12:06 -04:00
PikalaxALT
afd5f1f52f itemfinder through sub_813F004 2019-10-02 21:26:01 -04:00
PikalaxALT
d9ab841b0d Merge pull request #106 from PikalaxALT/berry_pouch 
Berry pouch
 2019-10-02 20:16:47 -04:00