Commit Graph
100 Commits
Author SHA1 Message Date
Marcus Huderle 8df4982b3f Merge remote-tracking branch 'upstream/master' into document-trade 2019-10-12 15:39:17 -05:00
Marcus Huderle 4494b5d4cb Document collision types 2019-10-06 15:48:26 -05:00
huderlem 00629ad94e Merge pull request #828 from huderlem/reflection_movement
Document hide/show reflection movement actions
2019-10-06 15:14:14 -05:00
Marcus Huderle 799edaf3e6 Document hide/show reflection movement actions 2019-10-06 14:17:34 -05:00
huderlem c0b0602516 Merge pull request #819 from GriffinRichards/document-eventscripts
Split some files from event_scripts
2019-10-05 09:59:43 -05:00
Marcus Huderle 1ae352bcb6 Cleanup whitespace 2019-09-25 16:45:57 -05:00
huderlem 886f043025 Merge pull request #816 from jiangzhengwenjz/ptch-3
get rid of goto in battle_script_commands
2019-09-25 16:31:53 -05:00
huderlem 9d4fc9234b Merge pull request #812 from GriffinRichards/document-scriptmenu
Document script_menu and LilycoveCity_Harbor
2019-09-22 09:09:23 -05:00
Marcus Huderle 1a2b430646 Update scaninc to include missing .include files in assembler files 2019-08-29 16:37:42 -05:00
huderlem 08c8ca8287 Merge pull request #630 from PikalaxALT/dodrio_berry_picking
Dodrio berry picking
2019-05-12 07:09:16 -05:00
Marcus Huderle 0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
Marcus Huderle 483648e372 Create jsonproc tool
Add custom function hooks to jsonproc

Add jsonproc to build_tools.sh

Newer g++
2019-05-08 17:06:39 -05:00
huderlem fe59902b8a Fix indentation 2019-05-03 18:21:11 -05:00
Marcus Huderle b8d5c5fb76 Match sub_81D199C 2019-04-16 18:15:03 -05:00
Marcus Huderle 90e555d23e Match sub_81A1224 2019-04-16 16:11:59 -05:00
Marcus Huderle 9915a3fd7f Decompile pokenav_unk_5.c 2019-04-16 14:29:00 -05:00
Marcus Huderle f9f5f34b0c Finish decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
Marcus Huderle c7954e1212 Decompile pokenav_unk_4.c through sub_81CB678() 2019-04-16 11:21:13 -05:00
Marcus Huderle 394c0f5546 Start decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
Marcus Huderle f40f2c5e9c Decompile all of pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
Marcus Huderle e3bdb08efa Start decompiling pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
Marcus Huderle 065c60544d Cleanup some pokenav code 2019-04-13 16:18:04 -05:00
Marcus Huderle 1268691410 Finish decompiling pokenav_unk_1.c 2019-04-13 16:18:04 -05:00
Marcus Huderle cb9d471a2a Decompile pokemon_jump through sub_802CE48() 2019-04-13 11:37:50 -05:00
Marcus Huderle a65cffef42 Decompile more pokemon_jump.c 2019-04-10 20:34:17 -05:00
Marcus Huderle 8a617c3d94 Decompile more pokemon_jump.c 2019-04-09 19:48:21 -05:00
huderlem ce93d3ab9a Merge pull request #661 from Phlosioneer/contest-ai-cleanup
contest & contest_ai cleanup
2019-04-08 17:30:28 -05:00
Marcus Huderle a518810c17 Decompile more pokemon_jump.c 2019-04-07 19:23:14 -05:00
huderlem a4ea0ac816 Merge pull request #645 from Phlosioneer/pokenav-decomp-again
Pokenav decomp again
2019-04-07 18:03:32 -05:00
Marcus Huderle 78151b6d88 Start decompiling pokemon_jump.c 2019-04-07 13:12:27 -05:00
Marcus Huderle c3cfd60658 Generate zoom_tiles palette from correct image 2019-04-06 15:16:05 -05:00
Marcus Huderle 146da2df96 Generate palette from zoom_tiles.png 2019-04-06 14:48:46 -05:00
Marcus Huderle b251ddf3b4 Add explicit return to Alloc funcs 2019-04-06 13:58:06 -05:00
Marcus Huderle fe12f2f4b3 Document and cleanup some decoration code 2019-04-06 12:49:09 -05:00
Marcus Huderle 3cc6803156 Nuke porymap.project.cfg 2019-04-05 16:24:57 -05:00
Marcus Huderle 033580da96 Document secret base 2019-04-05 16:24:57 -05:00
huderlem 4018017e9e Merge pull request #655 from huderlem/misc_docs
Document weather effects and some faraway island
2019-04-02 18:38:08 -05:00
Marcus Huderle 181baf9fe5 Merge remote-tracking branch 'upstream/master' into misc_docs
# Conflicts:
#	src/field_weather_effect.c
2019-04-02 18:29:51 -05:00
Marcus Huderle 1241700b20 Finish documenting the other weather effects 2019-04-02 18:28:56 -05:00
Marcus Huderle 35505c7f5b Document somre more weather effects 2019-04-01 20:04:23 -05:00
huderlem 4d938cb622 Merge pull request #642 from PikalaxALT/union_room_player_avatar
Union Room event objects
2019-04-01 17:54:30 -05:00
huderlem 1e8e5af033 Merge pull request #607 from Phlosioneer/contest-data
Contest data
2019-04-01 07:37:15 -05:00
huderlem bee1d1cbb0 Merge pull request #611 from Phlosioneer/pokedex-area-const-array
Document sAreaGlowTilemapMapping
2019-04-01 07:33:33 -05:00
huderlem b34961792c Merge pull request #641 from PikalaxALT/mystery_gift
Mystery gift documentation
2019-04-01 07:32:43 -05:00
Marcus Huderle 099ea89b77 Document rain weather effect 2019-03-31 21:09:30 -05:00
Marcus Huderle d13563b174 Document some faraway_island code 2019-03-31 14:09:40 -05:00
Marcus Huderle 462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
Marcus Huderle 500d009b5c Start decompiling berry_crush.c 2019-03-31 09:13:19 -05:00
huderlem b9bf3bf072 Merge pull request #637 from DizzyEggg/pokeblock_attempt
Use Pokeblock clean-up and some menu_specialised decomp
2019-03-31 08:39:18 -05:00
huderlem 9259ea4c4e Merge pull request #634 from PikalaxALT/continue_union_room
Continue union room
2019-03-31 08:33:16 -05:00
huderlem 8184688330 Merge pull request #635 from huderlem/union_room_chat
Union room chat
2019-03-29 22:33:32 -05:00
Marcus Huderle accc5ae8dd Merge remote-tracking branch 'upstream/master' into union_room_chat
# Conflicts:
#	ld_script.txt
2019-03-29 21:27:08 -05:00
Marcus Huderle a978a6a624 Finish decompiling union_room_chat.c 2019-03-29 21:26:08 -05:00
Marcus Huderle 519426f4e6 Decompile union_room_chat through sub_8020118 2019-03-28 20:20:52 -05:00
Marcus Huderle 8b8cc7a475 Decompile union_room_chat.s through sub_801FF08 2019-03-28 18:40:49 -05:00
Marcus Huderle aebc676913 Decompile union_room_chat.c up to sub_801F5B8 2019-03-27 19:09:12 -05:00
Marcus Huderle af1baa89f1 Start decompiling union_room_chat.c 2019-03-26 21:58:20 -05:00
Marcus Huderle d7a9fcb975 Cleanup mevent2 2019-03-24 18:29:00 -05:00
Marcus Huderle e6caf0ff10 Port mevent2.c from pokefirered 2019-03-24 18:29:00 -05:00
Marcus Huderle cf917a8733 Decompile berry_powder.c 2019-03-24 14:50:16 -05:00
Marcus Huderle 456cc3a6f0 Split out the remaining wireless-related files 2019-03-24 13:15:37 -05:00
Marcus Huderle d3ff307f9f Remove asm/use_pokeblock.s 2019-03-24 08:23:27 -05:00
Marcus Huderle 4fd2b0b484 Decompile remaining functions in use_pokeblock.s 2019-03-23 17:23:14 -05:00
huderlem cd192e303d Merge pull request #579 from ultima-soul/use_pokeblock
Decompile use_pokeblock  (5 NONMATCHING)
2019-03-23 11:29:40 -05:00
Marcus Huderle 24e7269117 Match sub_81674BC 2019-03-23 11:22:41 -05:00
Marcus Huderle fffdbe4e79 Match sub_8167420 2019-03-23 11:16:53 -05:00
Marcus Huderle 511ff2f20f Match sub_8166BEC and do some cleanup 2019-03-23 10:41:09 -05:00
Marcus Huderle a5ee2c14fd Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
#	include/menu_specialized.h
2019-03-23 10:14:31 -05:00
Marcus Huderle 91fa5faf4a Match sub_8166564 2019-03-23 10:10:51 -05:00
Marcus Huderle 65391a1eb2 Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
#	src/use_pokeblock.c
2019-03-23 09:39:46 -05:00
huderlem abe56579c1 Merge pull request #622 from huderlem/ereader
Finish decompiling ereader and faraway island code
2019-03-22 14:40:50 -05:00
Marcus Huderle 253de64e63 Merge remote-tracking branch 'upstream/master' into ereader 2019-03-22 14:35:47 -05:00
Marcus Huderle a7d5f032b1 Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c 2019-03-22 14:16:26 -05:00
Marcus Huderle f4f666f5af Finish decompiling ereader.c 2019-03-22 13:36:06 -05:00
Marcus Huderle 768a68d3e8 Decompile ereader.c up to faraway island code 2019-03-21 18:36:12 -05:00
Marcus Huderle 7118462b9f Decompile ereader.c up to faraway island code 2019-03-21 18:28:44 -05:00
huderlem 7154d2614d Merge pull request #595 from Phlosioneer/move-tutor
Move tutor
2019-03-17 17:32:42 -05:00
Marcus Huderle e9a3cc6d51 Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c
2019-03-17 17:20:40 -05:00
Marcus Huderle 4ae8a52473 Finish decompiling contest_painting_effects.c 2019-03-17 16:25:18 -05:00
huderlem 32f71b2976 Merge pull request #600 from Phlosioneer/summary-screen-macros
Summary screen macros
2019-03-08 13:37:12 -06:00
huderlem f235d07db5 Merge pull request #590 from Phlosioneer/ok-bot-symbol-counting
Improve OK bot's symbol counting
2019-03-08 13:35:57 -06:00
huderlem d637317e32 Merge pull request #592 from Phlosioneer/extern-cleanup
Extern cleanup
2019-03-08 13:28:49 -06:00
Marcus Huderle bd157b301d Scaninc: Don't insert missing headers into dependencies 2019-03-07 09:46:14 -06:00
huderlem c9d2fcabef Merge pull request #553 from Phlosioneer/main-menu-state-machine
Document main_menu state machine, name window constants
2019-03-03 09:28:35 -06:00
huderlem ee9694d9ba Merge pull request #587 from Phlosioneer/document-all-event-vars
Document all event vars
2019-03-02 08:24:46 -06:00
huderlem 3b04cfa437 Merge pull request #551 from Phlosioneer/multiplayer-stuff
Document overworld.c and link stuff in general
2019-03-01 08:43:55 -06:00
Marcus Huderle 4b9e93850c Document easy chat screen types 2019-02-27 12:55:29 -06:00
Marcus Huderle 231355f84d Decompile easy_chat data 2019-02-26 14:50:02 -06:00
Marcus Huderle b60611c38e Finish decompiling easy_chat.c code 2019-02-26 14:50:02 -06:00
huderlem 153f134318 Merge pull request #583 from huderlem/easy_chat
Decompile more easy_chat.c
2019-02-25 14:12:18 -06:00
Marcus Huderle 7ea05431a5 Decompile more easy_chat.c 2019-02-25 14:11:31 -06:00
huderlem d77ba3d413 Merge pull request #581 from arantonitis/pokemon_summary
Documented/polished pokemon_summary_screen.c
2019-02-25 08:09:14 -06:00
huderlem b3a7a1278a Merge pull request #577 from Phlosioneer/weather-15
Document the weather state functions
2019-02-25 08:03:22 -06:00
huderlem 84573f1774 Merge pull request #574 from Phlosioneer/event-vars
Event vars
2019-02-25 08:02:28 -06:00
huderlem a589d4a630 Delete porymap.project.cfg 2019-02-24 10:22:11 -06:00
Marcus Huderle bb508ade64 Decompile more of easy_chat.c 2019-02-24 10:09:57 -06:00
Marcus Huderle f34903bc45 Decompile more easy_chat.c 2019-02-23 13:05:34 -06:00
Marcus Huderle d3f66a98ff Decompile more easy_chat 2019-02-22 11:46:05 -06:00
Marcus Huderle b105d20d1e Decompile chunk of easy_chat.c 2019-02-21 17:46:14 -06:00
Marcus Huderle 1c6502338e Decompile contest_link_80F57C4.c 2019-02-20 18:11:27 -06:00