Commit Graph

1350 Commits

Author SHA1 Message Date
Evan
39a71e64d1 fix nonmatching 2019-11-20 09:57:19 -07:00
PikalaxALT
e1bdb76ab0 ID --> Id 2019-11-20 11:34:37 -05:00
PikalaxALT
e7cb5476c4 Port evolution_scene 2019-11-20 11:08:30 -05:00
Evan
9f7c34d645 match Task_OptionMenu 2019-11-19 19:51:03 -07:00
Evan
4a3d7ad972 minor style fixes 2019-11-19 17:41:20 -07:00
Evan
e06da7f066 start new func 2019-11-19 17:36:21 -07:00
Evan
ad6d1cb73b attempt to match Task_OptionMenu 2019-11-19 16:03:35 -07:00
Evan
d52bd495b1 various format fixes 2019-11-19 15:02:58 -07:00
Evan
30d967a51a pr fixes 2019-11-19 14:21:00 -07:00
Evan
f72d9cbe77 fix formatting on option menu 2019-11-19 14:21:00 -07:00
Evan
ec2673ebe5 update option menu const structs 2019-11-19 14:21:00 -07:00
Evan
52f64335ed match baserom 2019-11-19 14:21:00 -07:00
Evan
a26885c755 matching rom 2019-11-19 14:21:00 -07:00
Evan
422533386d matching up to sub_8088D8C 2019-11-19 14:21:00 -07:00
Evan
a48e03b78c remove compile errors 2019-11-19 14:21:00 -07:00
Evan
3bf1f5e65d start shop.c 2019-11-19 12:57:11 -07:00
PikalaxALT
1849ad778d
Merge pull request #158 from jiangzhengwenjz/nonmatching
real match OakSpeechNidoranFSetup
2019-11-19 14:05:42 -05:00
Evan
a50adf3a1b fix formatting on option menu 2019-11-19 10:04:40 -07:00
Evan
79b2bc1712 update option menu const structs 2019-11-19 10:04:40 -07:00
Evan
5bb5d38d22 match baserom 2019-11-19 10:04:40 -07:00
Evan
cb5dc21a4e matching rom 2019-11-19 10:04:40 -07:00
Evan
b58554b9ae matching up to sub_8088D8C 2019-11-19 10:04:40 -07:00
Evan
05724d3db1 remove compile errors 2019-11-19 10:04:40 -07:00
PikalaxALT
009732cb4c EvoGraphicsTaskEvoStop 2019-11-19 11:54:21 -05:00
Evan
486ea736cf fix formatting on option menu 2019-11-19 09:53:23 -07:00
PikalaxALT
789eb58882 Address review comments 2019-11-19 11:49:21 -05:00
Evan
9b81c95564 update option menu const structs 2019-11-19 09:46:10 -07:00
PikalaxALT
ff3fb43622 Merge branch 'master' of github.com:pret/pokefirered into dism_more_data 2019-11-19 11:12:41 -05:00
PikalaxALT
89dc26755a
Merge pull request #138 from jiangzhengwenjz/battle
battle (4th take)
2019-11-19 10:58:44 -05:00
jiangzhengwenjz
63f8834b6b resolve review comments 2019-11-19 23:45:59 +08:00
Evan
b8db7961d6 match baserom 2019-11-18 21:41:45 -07:00
Evan
6fb437f9eb matching rom 2019-11-18 21:03:51 -07:00
jiangzhengwenjz
1d3ae2fe78 Merge branch 'master' into battle 2019-11-19 10:26:40 +08:00
jiangzhengwenjz
42185e5c3a OakSpeechNidoranFSetup 2019-11-19 08:26:43 +08:00
Evan
186e17b7eb matching up to sub_8088D8C 2019-11-18 15:21:22 -07:00
PikalaxALT
d13375a4e0 Documentation of evolution_graphics 2019-11-18 15:35:58 -05:00
PikalaxALT
b2070e0681 Decompile evolution_graphics.c 2019-11-18 15:16:08 -05:00
PikalaxALT
2884946423 Merge branch 'master' of github.com:pret/pokefirered into dism_more_data 2019-11-18 12:02:59 -05:00
PikalaxALT
f697e85ef5 Reassign unk gfx to new_menu_helpers and rename ewram vars 2019-11-18 10:34:40 -05:00
Evan
46602859cd remove compile errors 2019-11-16 19:45:55 -07:00
PikalaxALT
317d8e5492 Remaining data in battle_anim_effects_misc 2019-11-15 10:08:09 -05:00
jiangzhengwenjz
8fcb50b7e4 sub_8112B3C 2019-11-15 06:34:44 +08:00
PikalaxALT
f6e8873892 Resolve comments on map_name_popup 2019-11-12 15:24:36 -05:00
PikalaxALT
9c27830791 static rodata 2019-11-12 14:36:06 -05:00
PikalaxALT
e2005e194d Port field_door data to C 2019-11-12 14:34:14 -05:00
PikalaxALT
4c61bead05 Document field_door code 2019-11-12 13:53:47 -05:00
PikalaxALT
3cbc312130 Dump field_door data; start field_door decomp 2019-11-12 11:21:49 -05:00
PikalaxALT
734cbfdb20 Decomp map_name_popup 2019-11-11 21:46:57 -05:00
PikalaxALT
f316b22f96 Move gText_Decimal to strings.h; dump box_party_pokemon_dropdown rodata 2019-11-11 17:08:21 -05:00
PikalaxALT
68ac755bb9
Merge pull request #153 from jiangzhengwenjz/nonmatching
real match sub_815DF54
2019-11-11 16:33:57 -05:00
jiangzhengwenjz
840a1f90cc sub_815DF54 2019-11-12 05:26:34 +08:00
PikalaxALT
8d70c54cd3
Merge pull request #152 from jiangzhengwenjz/nonmatching
real match sub_81406E8
2019-11-11 16:11:28 -05:00
jiangzhengwenjz
678c024fab sub_81406E8 2019-11-12 04:43:57 +08:00
PikalaxALT
36c159f7fa SAVE_STAT_ enums 2019-11-11 14:20:02 -05:00
PikalaxALT
e560b55325 Port mevent scripts to C 2019-11-11 11:09:24 -05:00
PikalaxALT
ccaa934305 Decump SaveStatToString 2019-11-11 09:33:24 -05:00
PikalaxALT
ab27f90e9f
Merge pull request #150 from jiangzhengwenjz/nonmatching
real match sub_8141198
2019-11-11 06:02:09 -05:00
jiangzhengwenjz
ea779d8f35 sub_8141198 2019-11-11 13:10:36 +08:00
PikalaxALT
451310c0c8 Address review comments 2019-11-10 20:25:41 -05:00
PikalaxALT
fa91b511b9 Finish documentation of learn_move syms 2019-11-10 19:43:47 -05:00
PikalaxALT
89b1087c37 Decomp learn_move and start documentation 2019-11-09 22:06:56 -05:00
jiangzhengwenjz
5acaa57a2a FillBattleTowerTrainerParty 2019-11-10 07:11:32 +08:00
PikalaxALT
807fe60b22 Document battle_tower.c 2019-11-09 14:53:30 -05:00
PikalaxALT
55bede6ca2 Finish decomp of battle_tower 2019-11-09 13:59:24 -05:00
PikalaxALT
9773fcf278 Battle Tower through nonmatching sub_80E61DC 2019-11-09 10:57:16 -05:00
jiangzhengwenjz
17b55f50db clean up 2019-11-09 23:41:45 +08:00
jiangzhengwenjz
a4a44dd18e fire; update constants 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
ab9ce0e641 electric 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
94c1924ed8 ice 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
7e4a3697cd fighting 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
253ffec035 poison 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
5fa2f4f18b battle_controller_pokedude remaining stuff 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
378e85d00b thru sub_8159824 2019-11-09 12:26:52 +08:00
jiangzhengwenjz
a937f72283 thru PokedudeHandleSetRawMonData 2019-11-09 12:26:52 +08:00
jiangzhengwenjz
71eb0fc9d8 battle_controller_pokedude data 2019-11-09 12:26:52 +08:00
PikalaxALT
4eb386f7c4 Port battle tower data to C (following pokeruby layout) 2019-11-08 19:49:05 -05:00
PikalaxALT
d25196154f Sync Ruby/Sapphire Battle Tower structs 2019-11-08 16:55:44 -05:00
PikalaxALT
b3caa183bf static symbols in quest_log_815045C 2019-11-08 11:41:09 -05:00
PikalaxALT
345546539d Dump field effect scripts 2019-11-08 10:15:18 -05:00
PikalaxALT
d833c0ba01
Merge pull request #144 from PikalaxALT/dism_more_data
Dump battle scripts and several rfu3 strings
2019-11-07 11:23:15 -05:00
PikalaxALT
64485f5cd1 TRAINER_SECRET_BASE propagation 2019-11-07 09:23:21 -05:00
PikalaxALT
4cad26157e Rename ghost battle scripts 2019-11-06 18:32:17 -05:00
PikalaxALT
f14f13b312 Document battle_scripts_2.s 2019-11-06 18:25:36 -05:00
PikalaxALT
60b75e85c9 Finish documentation of battle_scripts_1 2019-11-06 18:15:43 -05:00
PikalaxALT
d97eb6353d Sync battle script documentation with Emerald, 1 2019-11-06 15:52:58 -05:00
PikalaxALT
629cb532d8 Update macros for battle_scripts_2 2019-11-06 15:05:04 -05:00
PikalaxALT
69edfecc16 Update battle scripts with more defines 2019-11-06 13:09:59 -05:00
jiangzhengwenjz
2c1a188d38 sub_8113550 2019-11-06 03:21:19 +08:00
PikalaxALT
876a139ba3 Fix spriteID --> spriteId 2019-11-04 20:40:37 -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
5b47585549 Split data_83FECCC 2019-11-03 13:36:05 -05:00
PikalaxALT
4e7c1b0e3a Merge branch 'master' of github.com:pret/pokefirered into dism_more_data 2019-11-03 12:02:02 -05:00
jiangzhengwenjz
2bc7cb9650 sub_8110BE8 2019-11-03 11:54:20 +08:00
PikalaxALT
94a4aab580 Document mon_markings 2019-11-02 18:07:22 -04:00
PikalaxALT
ae97c32f7d Port mon_markings 2019-11-02 17:25:17 -04:00
PikalaxALT
e5eccf4752 Better return type for EC_IsDeoxys 2019-11-01 19:48:07 -04:00
PikalaxALT
a20a2b415c Address review comments 2019-11-01 19:46:38 -04:00
PikalaxALT
b5de3ab012 Easy chat groups and such are static too 2019-11-01 16:44:08 -04:00
PikalaxALT
2100eb9d81 Document easy_chat 2019-11-01 16:40:31 -04:00
PikalaxALT
36bea47ea6 Static symbols in easy_chat 2019-11-01 15:59:24 -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
930c7c4ad7 Dump berries and do major splittage 2019-10-31 22:13:33 -04:00
PikalaxALT
f0a7ee8d16 Improve documentation of wild_encounter 2019-10-31 20:25:41 -04:00
PikalaxALT
3f7c66703b Dump wild_encounter data to C/JSON 2019-10-31 20:05:10 -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
dc8c03d13f Dump wild encounter tables 2019-10-31 12:09:21 -04:00
PikalaxALT
2b0bcdcad9 Resolve externed prototypes in C files 2019-10-31 09:19:33 -04:00
PikalaxALT
eff29ff7ae Fix typos 2019-10-31 09:04:51 -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
84e1b97eac Ape trade graphics from Emerald 2019-10-30 15:09:13 -04:00
PikalaxALT
6c209e32a8 trade.c static symbols 2019-10-30 14:23:33 -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
0f0fb927a9 Port sub_805232C 2019-10-30 06:36:12 -04:00
PikalaxALT
e7a66b2941 port sub_8050F3C 2019-10-29 21:29:10 -04:00
PikalaxALT
e9592bee5d Finish sub_8050968 2019-10-29 20:28:17 -04:00
PikalaxALT
316337b031 trade partway through sub_8050968 2019-10-29 17:05:56 -04:00
PikalaxALT
ce5c3fdd77 Trade through sub_804FFE4 2019-10-29 12:58:40 -04:00
PikalaxALT
a1ec6ccff1 Port through sub_804FE00 2019-10-29 11:40:48 -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
4e296b8777 trade through sub_804EED4 2019-10-28 16:31:59 -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
a5ff9f2d00 trade through sub_804D814 2019-10-28 11:15:08 -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
6e221e478a Disassemble trade data 2019-10-27 17:14:28 -04:00
PikalaxALT
93f0703fcd Merge branch 'master' of github.com:pret/pokefirered into script_menu 2019-10-26 10:23:13 -04:00
PikalaxALT
1f569f0136
Merge pull request #134 from jiangzhengwenjz/sub_8115748
real match sub_8115748
2019-10-26 06:46:02 -04:00
jiangzhengwenjz
0ae4d58e98 resolve more review comments 2019-10-26 11:51:43 +08:00
jiangzhengwenjz
bc61968e1b sub_8115748 2019-10-26 10:23:46 +08:00
jiangzhengwenjz
1481f9e819 resolve review comments 2019-10-26 06:03:42 +08:00
PikalaxALT
fd78afa5a7 Name remaining static routines in script_menu.c 2019-10-25 17:11:31 -04: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
PikalaxALT
1f73aff8f4 script_menu static funcs and vars 2019-10-25 13:41:57 -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
PikalaxALT
283084cce4 script_menu through task_yes_no_maybe 2019-10-24 20:49:10 -04:00
jiangzhengwenjz
631eccb92d thru OakOldManHandleSwitchInAnim 2019-10-25 05:57:26 +08:00
PikalaxALT
c0f4afeb17 Fix multiline conditional parentheses and indentation 2019-10-24 16:37:44 -04:00
PikalaxALT
a18e9c27e1 Rename specials according to Ruby 2019-10-24 16:31:38 -04:00
PikalaxALT
4b98c7f6bc Static RAM variables 2019-10-24 15:33:25 -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
16ab70a12c through sub_80CBB28 2019-10-23 17:12:49 -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
3efd2e1210
Update back_pic_tables.h 2019-10-22 21:38:39 -04:00
PikalaxALT
14c10b1417
Update back_pic_anims.h 2019-10-22 21:38:13 -04: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
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
ee00966b68 Name some quest log strings 2019-10-22 09:16:37 -04:00
PikalaxALT
faedabb106 Document quest log flag/var funcs 2019-10-22 09:03:19 -04:00
PikalaxALT
8d1203ab5e Fix build error 2019-10-22 08:52:40 -04:00
jiangzhengwenjz
9a53686a4e document battle_controller_oak symbols 2019-10-22 10:08:10 +08:00
PikalaxALT
6ee1bd0621 Decompile event_data.s 2019-10-21 21:15:54 -04:00
PikalaxALT
62eec64e40 vs_seeker map object gfx ids 2019-10-21 13:15:45 -04:00
PikalaxALT
d7d93b22d2 Trainer constants in vs_seeker.c 2019-10-21 13:03:30 -04:00
PikalaxALT
40355355b2 Trainer AI flags 2019-10-21 11:56:06 -04:00
PikalaxALT
7e8da8845b Rename rival trainer constants 2019-10-21 11:06:53 -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
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
9d8c5b2250 Two additional script macros 2019-10-19 22:37:08 -04:00
PikalaxALT
26d8c4d04b Name all item ball hide/show flags 2019-10-19 21:52:38 -04:00
PikalaxALT
2ff8af13d5 Hide/show flags through 07F 2019-10-19 20:30:38 -04:00
PikalaxALT
d98d4d887c Set map.json files with map_obj_gfx constants 2019-10-19 15:05:51 -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
a7b278ac2d Restore documentation to mystery_event_msg 2019-10-18 10:14:39 -04:00
jiangzhengwenjz
34b440a358 clean up 2019-10-18 10:59:49 +08: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
ultima-soul
b0fc59cf5f Fix formatting. 2019-10-17 14:45:29 -07: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
jiangzhengwenjz
f03807931f thru sub_8011B94 2019-10-17 02:01:07 +08:00
ultima-soul
cb192791eb Dump gTrainerFrontPicCoords 2019-10-15 22:49:41 -07:00
ultima-soul
c93c8aedbc Dump trainer front_pic_anims 2019-10-15 20:37:48 -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
7c684c441e Resolve review comments, 2 2019-10-15 20:13:28 -04:00
PikalaxALT
a56b9e8f7f Separate INCBIN_U16 statements for mon icon palettes 2019-10-15 20:10:34 -04: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
jiangzhengwenjz
9243e792f3 minor fixes 2019-10-16 02:18:41 +08: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
91af788572 Delete an unneeded line break 2019-10-15 10:01:19 -04: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
a91de64dcf Port/dump back_pic_table. 2019-10-14 22:11:03 -07:00
ultima-soul
5e1f71231a Port/dump back_pic_coordinates. 2019-10-14 22:04:57 -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
5a20fefab1 Address review comments 2019-10-14 10:02:00 -04:00
PikalaxALT
9fe74ac590 trade through sub_804C728 (nonmatching 2019-10-14 09:40:17 -04:00
ultima-soul
5f1995782d Add newline to data.c 2019-10-13 22:32:42 -07: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
094b29edb5
Merge pull request #117 from jiangzhengwenjz/battle
#107 review commit
2019-10-12 21:19:22 -04:00
jiangzhengwenjz
7c08a10359 review comments 2019-10-13 09:10:07 +08: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
66c416875a Review comments 2019-10-12 17:23:17 -04: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
PikalaxALT
4aa3ff78ec Dump in-game trades 2019-10-11 11:55:54 -04: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
2ea9fe6bde use window macros in battle_transition.c 2019-10-11 06:33:35 +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
PikalaxALT
f3bd7f06c9 Fix alignment in sFanfares 2019-10-09 20:22:25 -04: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
734cada66a Address review comments 2019-10-09 18:12:37 -04:00
PikalaxALT
5e0f0ca6dc Merge branch 'master' into main_menu 2019-10-09 17:59:26 -04:00
SatoMew
40a810679f Update remaining constants 2019-10-08 23:06:33 +01:00
SatoMew
2c254082de Merge branch 'master' of https://github.com/pret/pokefirered 2019-10-08 22:46:32 +01:00
PikalaxALT
20efe34745 help_system common syms 2019-10-08 13:54:52 -04:00
PikalaxALT
3c3fd189d8 Document main_menu 2019-10-08 13:40:04 -04: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
5ba9fcdd3f Consistent spacing for struct ptr arg/var decls 2019-10-07 12:34:42 -04:00
PikalaxALT
6d0f19184e Static const 2019-10-07 11:27:34 -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
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
a8211f39b5 Move the string vars to string_util 2019-10-05 13:50:32 -04:00
PikalaxALT
29cb480fa8 make ewram static again 2019-10-05 13:14:40 -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
13416f5109 Split pokedex area markers 2019-10-04 15:57:16 -04:00
PikalaxALT
7e8bff29bb review comments; br_ips std=c99 2019-10-04 15:45:26 -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
jiangzhengwenjz
ed2e582821 NUM_PALETTE_STRUCTS macro 2019-10-03 07:32:10 +08:00
PikalaxALT
32f2bb3dda Address review comments 2019-10-01 19:44:10 -04:00
PikalaxALT
07064bd586 Name extern berry pouch gfx 2019-09-30 21:04:25 -04:00
PikalaxALT
beedb8d73f Tidy global namespace and document 2019-09-30 20:58:29 -04:00
PikalaxALT
8eea5b6d75 Finish berry_pouch code decomp 2019-09-30 19:47:38 -04:00
PikalaxALT
89be71dcb8 berry_pouch through sub_813E8D4 2019-09-30 18:06:49 -04:00
PikalaxALT
64362d3040 Berry Pouch rodata 2019-09-30 17:33:57 -04:00
PikalaxALT
e65487716a berry_pouch through sub_813E2B8 2019-09-30 16:59:39 -04:00
PikalaxALT
3766ddcfda berry pouch through sub_813DD74 2019-09-29 12:48:11 -04:00
PikalaxALT
01d42d07f8 Berry Pouch sub_813D9F8 2019-09-28 21:40:58 -04:00
PikalaxALT
b843b55292 berry_pouch through sub_813D940 2019-09-28 21:35:20 -04:00
PikalaxALT
0993cb64f7 Berry_pouch through sub_813D5BC 2019-09-28 20:27:41 -04:00
PikalaxALT
b6c7c6523f berry_pouch through sub_813D0E4 2019-09-28 16:11:41 -04:00
PikalaxALT
db3d5c9043 Start berry_pouch decomp 2019-09-28 12:33:01 -04:00
jiangzhengwenjz
779f48d19d palette 2019-09-28 22:37:10 +08:00
PikalaxALT
3ab2de40cf
Merge pull request #103 from jiangzhengwenjz/PUIE2
real match PokemonUseItemEffects2
2019-09-27 09:09:37 -04:00
PikalaxALT
f1e1e1b9ad
Merge pull request #104 from jiangzhengwenjz/credit
closer RollCredits
2019-09-27 09:08:34 -04:00
jiangzhengwenjz
f0dd50e194 PokemonUseItemEffects2 2019-09-27 04:52:42 +08:00
jiangzhengwenjz
7a062983ae RollCredits 2019-09-27 04:13:28 +08:00
PikalaxALT
9f0ca438d6
Merge pull request #102 from PikalaxALT/field_fadetransition
Field fadetransition
2019-09-26 14:45:58 -04:00
PikalaxALT
55a70ffb18 Some cleanup 2019-09-26 11:17:06 -04:00
PikalaxALT
3a6b6bf9e9 Finish field_fadetransition 2019-09-26 10:50:41 -04:00
PikalaxALT
bdeea4ca28 field_fadetransition begin 2019-09-25 17:16:57 -04:00
PikalaxALT
1d4234bd7e
Merge branch 'master' into PIE2 2019-09-25 13:56:50 -04:00
PikalaxALT
de31b97196 Update name of LoadMonPicForCredits 2019-09-25 13:50:16 -04:00
PikalaxALT
0e217e22d8
Merge branch 'master' into battle 2019-09-25 13:49:16 -04:00
PikalaxALT
6539884c88
Merge pull request #97 from jiangzhengwenjz/text
real match RenderText
2019-09-25 13:47:24 -04:00
PikalaxALT
55caa1fcf8
Merge pull request #98 from jiangzhengwenjz/sub_812E768
attempt sub_812E768
2019-09-25 13:46:46 -04:00
PikalaxALT
e0b3642edc Rename credits strings and document script 2019-09-25 13:41:43 -04:00
PikalaxALT
d66767ed9a Documentation and cleanup 2019-09-25 11:09:28 -04:00
PikalaxALT
932d153f5e Cryptic unreferenced LZ file 2019-09-24 14:00:46 -04:00
PikalaxALT
7f0c7528f7 Finish credits decomp and data dump 2019-09-24 14:00:40 -04:00
PikalaxALT
89c98f2ab7 Start credits (nonmatching sub_80F3BD0) 2019-09-24 14:00:30 -04:00
jiangzhengwenjz
7f6d86a8bf arg name consistency 2019-09-25 01:46:47 +08:00
jiangzhengwenjz
29e641bc1c PokemonUseItemEffects2 2019-09-24 23:48:03 +08:00
jiangzhengwenjz
a26b6576c1 sub_812E768 2019-09-21 13:51:02 +08:00