Commit Graph
100 Commits
Author SHA1 Message Date
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
Marcus Huderle 4223bb65f0 Decompile several contest_link_80F57C4.c functions 2019-02-19 16:36:42 -06:00
Marcus Huderle 05f9368154 Decompile start of flying.c 2019-02-19 16:36:42 -06:00
Marcus Huderle 19b76bffda Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields 2019-02-16 16:56:41 -06:00
Marcus Huderle 6f1d2b870c Give proper names to dynamic map layouts 2019-02-09 09:57:30 -06:00
Marcus Huderle 40dc6833c5 Fully document tileset animations 2019-02-08 15:07:42 -06:00
Marcus Huderle abebd2b864 Cleanup externs in overworld.c 2019-02-08 11:48:51 -06:00
Marcus Huderle 6add3e1794 Document some battle dome stuff 2019-02-08 11:08:25 -06:00
Marcus Huderle 4570e3b6a5 Document battle arena 2019-02-08 09:41:36 -06:00
Marcus Huderle 3a40f5203b Remove old rom_818CFC8.h header 2019-02-07 17:41:44 -06:00
Marcus Huderle 85040e26fd Document battle pike 2019-02-07 17:37:41 -06:00
Marcus Huderle 4785a07acd Document battle factory functions 2019-02-07 12:58:09 -06:00
Marcus Huderle b52871433a Fix typo 2019-02-07 11:54:51 -06:00
Marcus Huderle 3a88ab831d Document more battle pyramid 2019-02-07 11:51:03 -06:00
Marcus Huderle a1ad1bad3a Document a bunch of battle pyramid 2019-02-06 21:14:28 -06:00
Marcus Huderle 1253cbf5f6 Document some battle anim things 2019-02-06 21:14:28 -06:00
huderlem e9149b8608 Merge pull request #544 from Diegoisawesome/master
Add json to list of LF line-end files
2019-02-05 15:45:51 -06:00
huderlem b0ee100975 Merge pull request #543 from pret/mapdata
Convert map data to JSON
2019-02-04 21:36:18 -06:00
Marcus Huderle d4125fef9b Cleanup and add game version flag to mapjson tool 2019-02-04 17:28:45 -06:00
Marcus Huderle 29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
Marcus Huderle 5c1667b41a Define layout constants 2019-01-29 16:55:25 -06:00
Marcus Huderle 14641e916e Cleanup Rustboro City House layout label 2019-01-29 14:36:02 -06:00
Marcus Huderle bd667102fa Fix PetaburgCity map scripts label 2019-01-29 14:36:02 -06:00
Marcus Huderle e43f341799 Cleanup link contest map scripts 2019-01-29 14:36:02 -06:00
Marcus Huderle 8f832434e5 Change drought colors table files to .bin 2019-01-29 14:36:02 -06:00
Marcus Huderle d2d44a97b8 Cleanup link contest map events 2019-01-29 14:36:02 -06:00
Marcus Huderle 36a1825bbe Document trainer approach funcs, and use movement type constants in scripts 2019-01-29 14:36:02 -06:00
Marcus Huderle e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
Marcus Huderle 95db853a78 Decompile more of contest_link_80F57C4.c 2019-01-04 20:03:29 -06:00
huderlem cba2f81bf8 Merge pull request #507 from Tetrable/master
Finish off labeling flags
2019-01-03 20:37:25 -06:00
Marcus Huderle fd201f8395 Start decompiling contest_link_80F57C4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle 2857f7fff9 Decompile contest_link_81D9DE4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle bc43dbab13 Decompile contest_link_81D9DE4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle b471bba55e Use better names for match call texts 2019-01-02 19:46:15 -06:00
Marcus Huderle e1092028ec Decompile match_call.c 2019-01-02 19:46:15 -06:00
Marcus Huderle a0ff38d0be Fix build 2018-12-31 16:53:38 -06:00
Marcus Huderle 05b1d2ea94 Document field_tasks.c 2018-12-31 16:53:38 -06:00
Marcus Huderle b6ee970e7a Minor berry.c cleanup 2018-12-31 16:53:38 -06:00
Marcus Huderle fb2d1591c1 Document more battle anim effects 2018-12-31 16:53:38 -06:00
Marcus Huderle 58f130d007 Document some battle anims and helpers 2018-12-30 11:04:17 -06:00
Marcus Huderle 229177f7c6 Use anim weather constants 2018-12-29 11:40:12 -06:00
Marcus Huderle 8eea0925c5 Finish battle_anim_effects_3.c 2018-12-29 11:40:12 -06:00
Marcus Huderle d0d870e193 Cleanup formatting 2018-12-29 11:36:54 -06:00
Marcus Huderle 6e7bdb3ca4 Document misc field_specials things 2018-12-29 11:36:54 -06:00
Marcus Huderle 67636b7c64 Document deoxys rock 2018-12-29 11:36:54 -06:00
Marcus Huderle 46d41d2fb9 Use EVENT_OBJ_ID_PLAYER in C code 2018-12-29 11:36:54 -06:00
Marcus Huderle 95dcff581b Document some fieldmap stuff 2018-12-29 11:36:54 -06:00
Marcus Huderle d59f5a8e56 Misc overworld documentation 2018-12-27 16:52:13 -06:00
Marcus Huderle 2c0f5f58e9 Use constants for warp into MAP_INSIDE_OF_TRUCK 2018-12-27 11:24:34 -06:00
Marcus Huderle c3dde7353d Add newline to Route111_NoMirageTower layout.inc
To match all other layout.inc files.
2018-12-26 17:04:24 -06:00
Marcus Huderle a1ea3b5e39 Use map_header_flags macro (#483) 2018-12-26 12:20:15 -06:00
Marcus Huderle 7480a41cfe Merge pull request #482 from DizzyEggg/bg
Fix raw SetGpuReg and SetBgAttribute args
2018-12-26 10:07:56 -06:00