Commit Graph

608 Commits

Author SHA1 Message Date
jiangzhengwenjz
4b5195c9cb Merge branch 'master' into battle 2019-08-29 03:09:24 +08:00
jiangzhengwenjz
2bd15329e0 minor fixes
and remove unnecessary NONMATCHING
2019-08-28 14:57:16 +08:00
jiangzhengwenjz
b2343076db remaining stuff of battle_script_commands 2019-08-27 15:10:23 +08:00
jiangzhengwenjz
f4b4f5dd0c thru atkee 2019-08-27 12:01:32 +08:00
jiangzhengwenjz
ca130a8aeb thru atkc0 2019-08-27 10:27:36 +08:00
jiangzhengwenjz
a61be4c32d Merge branch 'master' into battle 2019-08-27 08:42:00 +08:00
jiangzhengwenjz
b516246769 thru TryDoForceSwitchOut 2019-08-27 08:20:59 +08:00
SatoMew
8c44c7b949 Replace labels for used and unused Saffron City maps 2019-08-26 20:23:25 +01:00
PikalaxALT
738dac67fc Eliminate struct TextColor definition and use 2019-08-26 14:54:33 -04:00
jiangzhengwenjz
184066d1c1 thru atk6B 2019-08-26 14:38:40 +08:00
jiangzhengwenjz
db0d8e5bdb thru sub_8024398 2019-08-26 06:48:04 +08:00
jiangzhengwenjz
1d8232b919 thru atk23 2019-08-26 04:01:55 +08:00
PikalaxALT
e5b607ccbe minor fixes
Change (struct MapPreviewScreen).id --> .mapsec
Initialize static bools to FALSE
2019-08-25 10:13:45 -04:00
PikalaxALT
779d754992 Decompile map_preview_screen 2019-08-24 22:25:20 -04:00
jiangzhengwenjz
8b14f4e90a Merge branch 'master' into battle 2019-08-25 06:58:56 +08:00
jiangzhengwenjz
41a7e6967d thru atk14 2019-08-25 06:53:22 +08:00
PikalaxALT
74e2a0e123
Merge pull request #88 from ultima-soul/pokedex_2
Port/Decompile pokedex.c and Dump Pokedex Entries and Text to C
2019-08-24 13:14:50 -04:00
PikalaxALT
60b2c75191
Merge pull request #90 from jiangzhengwenjz/nonmatching
'real' match CopyTileMapEntry
2019-08-23 21:49:49 -04:00
jiangzhengwenjz
29d7ae94de battle_script_commands symbol documentation 2019-08-24 09:37:41 +08:00
jiangzhengwenjz
3459fbb9a3 battle_script_commands data decomp 2019-08-23 15:54:19 +08:00
jiangzhengwenjz
23b2a0cc9f battle_controller_link_partner 2019-08-23 05:12:27 +08:00
jiangzhengwenjz
5f6a55e4fd battle_controller_link_opponent 2019-08-22 14:21:56 +08:00
jiangzhengwenjz
d6de2fd5c0 match CopyRectToBgTilemapBufferRect from pokeemerald 2019-08-12 14:57:43 +08:00
jiangzhengwenjz
82253083e3 match CopyTileMapEntry with goto 2019-08-12 12:38:46 +08:00
ultima-soul
d92bc9a257 Fix formatting of tileset_anims.h 2019-08-05 16:04:42 -07:00
ultima-soul
fe81e11f49 Fix formatting and add tileset_anims.h 2019-08-05 15:08:14 -07:00
ultima-soul
7ae9d90566 Decompile tileset_anims 2019-08-05 01:00:59 -07:00
jiangzhengwenjz
b9d547a02f ported battle_controller_player from pokeem and matched several new functions 2019-08-05 08:15:58 +08:00
ultima-soul
ed90bf2430 Merge branch 'master' into pokedex_2 2019-08-04 15:23:09 -07:00
ultima-soul
bbc7c6ccfc Port pokedex.c 2019-08-04 15:11:02 -07:00
ultima-soul
9ceff166bc Dump and convert Pokedex Entries and Text to C. 2019-08-03 19:27:45 -07:00
jiangzhengwenjz
5568895b04 ported battle_ai_switch_items from pokeem 2019-08-03 23:59:41 +08:00
jiangzhengwenjz
8fed9a5f20 quick review on battle_ai_script_commands 2019-08-03 07:44:51 +08:00
jiangzhengwenjz
26a7192186 Merge branch 'master' into battle 2019-08-03 06:59:28 +08:00
jiangzhengwenjz
6a063cf74a ported battle_controller_opponent from pokeem and corrected lots of stuff 2019-08-03 06:55:42 +08:00
PikalaxALT
201418cd4d
Merge pull request #87 from PikalaxALT/title_screen
Title screen
2019-08-01 21:04:28 -04:00
PikalaxALT
da78b51cf3 Delete duplicate menu.h declarations; make slot machine vars static 2019-08-01 20:29:17 -04:00
jiangzhengwenjz
742a7ee1be ported reshow_battle_screen from pokeem 2019-08-02 07:28:09 +08:00
jiangzhengwenjz
c2964e8181 ported battle_util from pokeem 2019-08-02 05:05:35 +08:00
jiangzhengwenjz
3eb1f1bc78 matched AbilityBattleEffects 2019-08-01 12:30:36 +08:00
PikalaxALT
6032159d1b Name stuff 2019-07-31 17:15:57 -04:00
PikalaxALT
e2c552f1df Static decl/def; gfx dump 2019-07-31 16:11:20 -04:00
PikalaxALT
c3f95c1cbb title_screen: through sub_8079730 2019-07-31 13:50:47 -04:00
PikalaxALT
e96ecee460 title_screen through sub_80791C0 2019-07-31 12:32:57 -04:00
PikalaxALT
ea8f529f2d title_screen: data and code thru sub_8078C9C 2019-07-30 22:07:15 -04:00
jiangzhengwenjz
c88c9c6edf progress #1 on porting battle_util 2019-07-31 07:58:09 +08:00
jiangzhengwenjz
353fe5e797 improved style of sub_800DD28 2019-07-31 07:58:09 +08:00
jiangzhengwenjz
035df4d7a4 ported documentation of battle_util.s 2019-07-31 07:58:09 +08:00
jiangzhengwenjz
045331d139 ported battle_controllers from pokeem 2019-07-31 07:58:09 +08:00
jiangzhengwenjz
6043478081 ported battle_util2 from pokeem 2019-07-31 07:58:08 +08:00
jiangzhengwenjz
a4263a6bd8 ported battle_controller_safari from pokeem 2019-07-31 07:58:08 +08:00
jiangzhengwenjz
935f93a075 ported battle_gfx_sfx_util from pokeem 2019-07-31 07:58:07 +08:00
jiangzhengwenjz
37be39117a port documentation of battle_anim_mon_movement from pokeem 2019-07-31 07:58:07 +08:00
PikalaxALT
fba22dbd24 Merge branch 'master' into slot_machine 2019-07-30 19:40:00 -04:00
PikalaxALT
9b3b3244f7 Suppress IDE errors when incbinning multiple files 2019-07-30 19:20:41 -04:00
PikalaxALT
a74d770de1 Move string decls to strings.h 2019-07-29 21:56:42 -04:00
PikalaxALT
e130a00cdf Merge branch 'master' into slot_machine 2019-07-29 21:10:54 -04:00
PikalaxALT
ef4c86fbfd slot_machine: through sub_81418C4 2019-07-29 20:50:06 -04:00
jiangzhengwenjz
a348095998 matched all easy functions 2019-07-25 14:15:41 +08:00
jiangzhengwenjz
25661400cc thru BT_Phase2AntiClockwiseSpiral 2019-07-24 14:52:07 +08:00
jiangzhengwenjz
4677efabdb thru BT_Phase2BigPokeball_UpdateWave3 2019-07-24 05:52:16 +08:00
jiangzhengwenjz
e150a62045 battle transition data decomp 2019-07-24 05:52:16 +08:00
jiangzhengwenjz
a674ba2749 updated battle transition header 2019-07-24 05:52:16 +08:00
jiangzhengwenjz
e37e108542 document battle transition symbols 2019-07-24 05:52:16 +08:00
jiangzhengwenjz
9054fa32a0 sorted hoenn_cries.h 2019-07-21 00:37:08 +08:00
jiangzhengwenjz
78ffd627bd enums for hoenn cries 2019-07-20 13:24:59 +08:00
jiangzhengwenjz
f7af77d22c sync documentation of CountAliveMonsInBattle() 2019-07-18 05:06:53 +08:00
jiangzhengwenjz
c7d3ad06b0 Merge branch 'master' into pokemon 2019-07-16 23:22:52 +08:00
jiangzhengwenjz
298c578c60 corrected move target flags 2019-07-15 16:15:50 +08:00
jiangzhengwenjz
f24eae3e90 resolved several TODOs 2019-07-15 13:24:47 +08:00
jiangzhengwenjz
51a779aa7b finished pokemon data decomp 2019-07-15 13:10:29 +08:00
jiangzhengwenjz
00cd1d483d thru sSpindaSpotGraphics 2019-07-15 10:06:01 +08:00
jiangzhengwenjz
1e390204cb thru gTMHMLearnsets 2019-07-15 09:30:28 +08:00
jiangzhengwenjz
cb3722a57a decompiled learnset and evo table 2019-07-15 06:34:49 +08:00
jiangzhengwenjz
96fa1a23ed Merge branch 'master' into pokemon 2019-07-15 00:04:06 +08:00
PikalaxALT
939bd127bb Merge branch 'master' into battle_records 2019-07-14 11:29:23 -04:00
jiangzhengwenjz
277726fd5e interpret filler with empty agbstring 2019-07-14 12:22:44 +08:00
jiangzhengwenjz
6e2ae504b8 finished data decomp 2019-07-14 09:36:11 +08:00
PikalaxALT
97b4bb41b7 Name functions in battle_records.c 2019-07-13 19:51:30 -04:00
PikalaxALT
40c3cf3da7 Finish battle_records.s and assoc. data 2019-07-13 19:31:19 -04:00
jiangzhengwenjz
1caed4e632 updated headers 2019-07-14 05:31:17 +08:00
jiangzhengwenjz
0985206a29 marked all static functions in pokemon.c 2019-07-14 04:49:21 +08:00
PikalaxALT
b4677561d5 battle_record: through sub_80CD98C 2019-07-13 14:00:58 -04:00
jiangzhengwenjz
000bbba77c resolved wrong typing in diploma 2019-07-13 11:31:40 +08:00
PikalaxALT
7ec965bd24 Port diploma data to C 2019-07-12 22:21:10 -04:00
jiangzhengwenjz
9d53999465 polish and bug fix 2019-07-13 05:26:19 +08:00
jiangzhengwenjz
bcf27c2de1 resolved SetWindowTemplateFields 2019-07-13 05:26:19 +08:00
jiangzhengwenjz
05371e5875 fixed more header issue 2019-07-13 05:26:19 +08:00
jiangzhengwenjz
eb1719afc6 updated menu.h 2019-07-13 05:26:18 +08:00
jiangzhengwenjz
1a5d41b805 updated new_menu_helpers.h 2019-07-13 05:26:18 +08:00
jiangzhengwenjz
0c57132043 finished menu_helpers.h + more documentation 2019-07-13 05:26:18 +08:00
jiangzhengwenjz
e0e81c5fbe finished menu (1 failed attempt) 2019-07-13 05:26:18 +08:00
jiangzhengwenjz
559ddb05e7 thru CheckBattleTypeGhost() 2019-07-12 13:39:33 +08:00
jiangzhengwenjz
43ba65ef8b document pokemon function symbols 2019-07-12 09:59:49 +08:00
dheu
da593ec33d fix: rm asm/diploma.s 2019-07-10 14:50:54 +08:00
dheu
8fe7ed27fe fix: this isn't emerald 2019-07-08 20:06:23 +08:00
dheu
56b5fffe9d fix: move/rename declarations 2019-07-08 19:58:36 +08:00
jiangzhengwenjz
122f139582 fixed multiple issue 2019-07-08 06:18:58 +08:00
jiangzhengwenjz
01b375ab9a fixed some struct DECL location 2019-07-07 01:46:06 +08:00
jiangzhengwenjz
050bb93753 finished list_menu 2019-07-07 01:46:06 +08:00
jiangzhengwenjz
cc4d2f524c finished dynamic_placeholder_text_util 2019-07-07 01:46:06 +08:00
jiangzhengwenjz
6030086696 finished buy_menu_helpers 2019-07-07 01:46:06 +08:00
jiangzhengwenjz
503086bc7d finished menu_indicators 2019-07-07 01:46:05 +08:00
jiangzhengwenjz
d97925df0e finished field_poison 2019-07-07 01:46:05 +08:00
jiangzhengwenjz
40a808351a finished safari_zone 2019-07-07 01:46:05 +08:00
PikalaxALT
231b2aeb83 Foundation to support LG, Rev1 in the future 2019-07-04 11:40:05 -04:00
PikalaxALT
2c953c5baf Redo partial decomp of intro (force push) 2019-07-01 22:10:35 -04:00
jiangzhengwenjz
062238aa12 fixed another macro expansion 2019-07-02 09:42:18 +08:00
jiangzhengwenjz
5384fd020c multiple fixes 2019-07-02 09:38:28 +08:00
jiangzhengwenjz
3ec40eb833 AdjustBgMosaic documentation upgrade 2019-07-02 06:25:17 +08:00
jiangzhengwenjz
b566ae26de finished fldeff_dig + fldeff_rocksmash 2019-06-29 10:03:06 +08:00
jiangzhengwenjz
38febc8baf finished fldeff_sweetscent 2019-06-29 06:39:11 +08:00
jiangzhengwenjz
d09d78dca3 finished fldeff_strength + lots of clean up 2019-06-29 03:30:48 +08:00
jiangzhengwenjz
c994998aad AdjustBgMosaic Documentation 2019-06-28 14:41:29 +08:00
jiangzhengwenjz
3f43150b5a finished fldeff_poison 2019-06-28 11:33:23 +08:00
jiangzhengwenjz
d06166633f finished mail_data 2019-06-28 11:04:15 +08:00
jiangzhengwenjz
8e8fe3bf44 finished save_location 2019-06-28 05:56:28 +08:00
jiangzhengwenjz
be2010e0db finished reset_save_heap 2019-06-28 04:30:45 +08:00
jiangzhengwenjz
6e570a107f Merge branch 'decompress' into misc 2019-06-28 02:00:02 +08:00
jiangzhengwenjz
f52d439a85 finished decompress (1 failed attempt) 2019-06-28 01:56:43 +08:00
jiangzhengwenjz
30ce36c7b0 fix header 2019-06-26 07:38:07 +08:00
jiangzhengwenjz
5c9af82955 Merge branch 'small_files' into misc 2019-06-26 07:32:33 +08:00
jiangzhengwenjz
f7aaf62343 finished hof_pc 2019-06-26 07:31:39 +08:00
jiangzhengwenjz
1ba29fd2ed fix return type 2019-06-26 06:30:22 +08:00
jiangzhengwenjz
5f0e87bbb7 Merge branch 'replicate_multiboot' into misc 2019-06-26 06:17:59 +08:00
jiangzhengwenjz
11a8a01654 finished multiboot 2019-06-26 06:15:39 +08:00
jiangzhengwenjz
1182626739 matched several functions from pokeem 2019-06-26 05:04:20 +08:00
jiangzhengwenjz
2a870d54fc All Done 2019-06-26 04:52:53 +08:00
jiangzhengwenjz
0d46c60b38 thru DisplayYesNoMenuDefaultNo() 2019-06-26 04:52:35 +08:00
jiangzhengwenjz
cc937d33b4 thru WindowFunc_ClearDialogWindowAndFrame() 2019-06-26 04:52:34 +08:00
jiangzhengwenjz
efad45497d through AddTextPrinterParameterized2() 2019-06-26 04:52:34 +08:00
jiangzhengwenjz
f85848545a JOY_XX 2019-06-24 02:57:25 +08:00
jiangzhengwenjz
bc7ff2226d menu_helpers.c & field_special_scene.c 2019-06-24 02:07:25 +08:00
PikalaxALT
43d2563704 Finish battle_anim_mon_movement 2019-06-22 14:05:30 -04:00
PikalaxALT
374ea9ec62 battle_anim_mon_movement: through sub_809946C 2019-06-21 21:19:45 -04:00
PikalaxALT
95b5a2753e battle_anim_mon_movement: through sub_80991B4 2019-06-21 16:53:47 -04:00
PikalaxALT
9217a26399 battle_anim_mon_movement: through sub_8099004 2019-06-21 16:29:47 -04:00
PikalaxALT
92bf25bd0d Make this function static in unk_815C980 2019-06-21 12:47:28 -04:00
PikalaxALT
a4f1de8015 Some renaming 2019-06-21 10:44:25 -04:00
PikalaxALT
7abbe42763 Finish item_use 2019-06-20 20:00:13 -04:00
PikalaxALT
12f3ceb0f7 item_use: through sub_80A16D0 2019-06-20 11:02:09 -04:00
PikalaxALT
164dd43a62 Rename item use funcs, first pass 2019-06-20 10:30:41 -04:00
PikalaxALT
715847bc37 Finish item.c 2019-06-20 10:17:05 -04:00
PikalaxALT
649a351c4c item: through sub_809A584 2019-06-19 21:41:43 -04:00
PikalaxALT
7eeba327bd Dump items and start decomp item_use 2019-06-19 18:28:55 -04:00
PikalaxALT
5ff301fd8f item_menu_icons 2019-06-17 18:36:18 -04:00
PikalaxALT
2b750cf444 Rename Item PC symbols 2019-06-17 10:21:32 -04:00
PikalaxALT
632a7e8c08 finish item_pc 2019-06-16 21:14:16 -04:00
PikalaxALT
105716d701 item_pc: through sub_810E548 2019-06-16 19:37:28 -04:00
PikalaxALT
d681d7f727 item_pc: through sub_810E200 2019-06-16 18:12:11 -04:00
PikalaxALT
b624de76db item_pc: through sub_810DE94 2019-06-16 16:55:40 -04:00
PikalaxALT
d0633593e8 item_pc: through sub_810DBD0 2019-06-16 15:14:57 -04:00
PikalaxALT
4f4b03af60 item_pc: sub_810D878 2019-06-16 12:36:34 -04:00
PikalaxALT
7e1c966eb3 item_pc: through sub_810D4C0 2019-06-15 21:26:46 -04:00
PikalaxALT
e28c767612 berry_fix_program 2019-06-15 16:24:47 -04:00
PikalaxALT
9fb5dcdbf6 unk_815F138 2019-06-15 14:45:24 -04:00
PikalaxALT
decd15a458 unk_815EDDC 2019-06-15 12:56:14 -04:00
PikalaxALT
e07368e90b cereader_tool and ereader_helpers 2019-06-14 18:23:27 -04:00
PikalaxALT
cac04f6033 Rename VAR_0x4053 2019-06-14 11:55:29 -04:00
PikalaxALT
601d2feeac Decompile SS Anne 2019-06-14 11:33:13 -04:00
PikalaxALT
bba7f06cd9 Fix songs constants header eof 2019-06-13 16:36:07 -04:00
PikalaxALT
9aac6112a2 Some symbol renaming 2019-06-13 16:34:18 -04:00
PikalaxALT
e30052e271 help_system: through sub_813C3AC 2019-06-13 13:45:46 -04:00
PikalaxALT
63b2153402 help_system: sub_813B870 2019-06-13 09:56:44 -04:00
PikalaxALT
c993f5db4e A little bit of cleanup 2019-06-12 17:25:36 -04:00
PikalaxALT
63defaa95f Finish help_system_812B1E0 decomp 2019-06-12 17:08:46 -04:00
PikalaxALT
85aeb8d476 help_system_812B1E0: through sub_812BDEC 2019-06-12 16:43:34 -04:00
PikalaxALT
12c62c656b Decompile help system rodata 2019-06-12 14:46:42 -04:00
PikalaxALT
b6709608f5 help_system_812B1E0: through sub_812B5A8 2019-06-11 19:32:23 -04:00
PikalaxALT
71d017a2bc help_system_812B1E0: through sub_812B4D8 2019-06-11 17:32:33 -04:00
PikalaxALT
75a89830a9 Cleanup and documentation of teachy_tv 2019-06-11 10:11:23 -04:00
jiangzhengwenjz
c28365392e struct ScrollArrowsTemplate 2019-06-11 05:44:21 +08:00
jiangzhengwenjz
20a09555ea fixed lots of stuff 2019-06-11 05:20:42 +08:00
jiangzhengwenjz
12191612cd TeachyTvLoadMapPalette and fixes 2019-06-10 09:03:39 +08:00
jiangzhengwenjz
b44bd642b8 more fix 2019-06-10 08:24:07 +08:00
jiangzhengwenjz
cce7cee9bd all fixed 2019-06-10 07:20:37 +08:00
jiangzhengwenjz
5110cafe24 fix header 2019-06-07 03:40:49 +08:00
jiangzhengwenjz
67542ec22d fix for merge 2019-06-04 01:54:51 +08:00
jiangzhengwenjz
b6a166c459 more symbol name fixes 2019-06-04 00:00:21 +08:00
jiangzhengwenjz
49a1de36d3 sub_815B0CC and rollback of failed attempt to make it compilable 2019-06-03 03:22:03 +08:00
jiangzhengwenjz
0a13397b85 some more functions 2019-06-02 15:25:04 +08:00
PikalaxALT
5bcafd74ec fldeff_softboiled 2019-06-01 14:18:27 -04:00
jiangzhengwenjz
55406f92fd teachy_tv and minor update to match DizzyEgg's struct def 2019-06-01 16:07:06 +08:00
garak
b249154009 synchronize text printer function names with pokeemerald 2019-05-30 17:44:48 -04:00
garak
e73ce5317d Parametrized to Parameterized 2019-05-30 17:05:30 -04:00
PikalaxALT
36fc72f25e slot_machine nonmatching sub_8141198 2019-05-24 18:57:01 -04:00
PikalaxALT
8502697ecd Merge branch 'master' into slot_machine 2019-05-22 21:40:32 -04:00
garak
28885f5a47 dump event script text strings 2019-05-21 14:35:12 -04:00
PikalaxALT
c33448ba09 slot_machine: through sub_813FBC0 2019-05-20 14:17:26 -04:00
PikalaxALT
348bd19fdd text_window 2019-05-20 11:09:41 -04:00
PikalaxALT
68ac134c0c Finish wireless_communication_status_screen 2019-05-20 10:15:31 -04:00
PikalaxALT
b5d753383f braille_text 2019-05-19 14:36:55 -04:00
PikalaxALT
12de501f36 map_obj_lock 2019-05-19 13:02:57 -04:00
PikalaxALT
4661be7836
Merge pull request #57 from SatoMew/master
Add weather labels and missing constants
2019-05-19 12:10:26 -04:00
PikalaxALT
6c2d5ea50d text_window_graphics 2019-05-19 11:56:19 -04:00
PikalaxALT
d045449298 prof_pc 2019-05-17 18:48:53 -04:00
SatoMew
333d2f37a8 Add weather.h 2019-05-17 15:34:34 +01:00
SatoMew
cfc43d1111 Label weather 2019-05-17 14:14:21 +01:00
PikalaxALT
468d5a0594 finish heal_location 2019-05-16 17:44:16 -04:00
PikalaxALT
4156dd6b57 setrespawn 2019-05-16 13:57:21 -04:00