dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
5,016 Commits 4 Branches 0 Tags
25df1460549f97f51c68f9feb205d324582491a2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
huderlem 69833181d9 Merge pull request #803 from tustin2121/tustin2121-patch-5 
Document cave transition code.
 2020-01-13 20:43:49 -06:00
Marcus Huderle 755ae0facc Use empty braces for last null entry in sTransitionTypes array 2020-01-13 20:31:40 -06:00
Marcus Huderle 5a2d676e71 Merge remote-tracking branch 'upstream' into tustin2121-patch-5 2020-01-13 20:26:20 -06:00
huderlem 6d6c57f383 Merge pull request #953 from GriffinRichards/sync-script 
Port some macro/script fixes from pokefirered
 2020-01-13 19:33:47 -06:00
huderlem fa5816915d Merge pull request #949 from GriffinRichards/doc-dome 
Document Battle Dome and add facility party constants
 2020-01-12 20:10:03 -06:00
Marcus Huderle ef751c8d1b Fix formatting and remove unnecessary comments 2019-12-28 12:07:02 -06:00
huderlem 3b05398975 Merge pull request #945 from Fontbane/patch-5 
Give rival and Maxie parties better names
 2019-12-28 12:06:35 -06:00
huderlem 8d64bc9df8 Merge pull request #944 from GriffinRichards/doc-itemuse 
Document item_use.c
 2019-12-25 11:59:07 -06:00
huderlem ee61726136 Merge pull request #936 from GriffinRichards/doc-tower 
Document Battle Tower scripts
 2019-12-25 11:39:20 -06:00
huderlem f8cef9a6a8 Merge pull request #932 from jiangzhengwenjz/berry_crush 
berry crush
 2019-12-17 19:35:00 -06:00
huderlem 45eefac5b9 Merge pull request #934 from GriffinRichards/constants-fade 
Use fadescreen constants
 2019-12-17 19:26:04 -06:00
huderlem edb5df1716 Merge pull request #933 from GriffinRichards/doc-tents 
Document Battle Tent scripts
 2019-12-17 18:09:49 -06:00
huderlem fee36224ed Merge pull request #925 from GriffinRichards/doc-matchcall 
Document some pokenav match call
 2019-12-15 09:42:13 -06:00
huderlem 9a81661075 Merge pull request #851 from Sewef/patch-3 
battle_anim_effects_3
 2019-11-24 12:02:54 -06:00
huderlem bef6150b59 Merge pull request #909 from GriffinRichards/doc-apprentice 
Document Apprentice
 2019-11-23 09:27:02 -06:00
huderlem 0a43f2ce53 Merge pull request #899 from GriffinRichards/doc-scriptclean 
Document interview and TV scripts, and misc script clean up
 2019-11-16 11:34:47 -06:00
Marcus Huderle 8e65f0188f Rename contest_painting_effects to image_processing_effects 2019-11-10 16:37:26 -06:00
Marcus Huderle 1ed3af66eb Document contest painting image processing effects 2019-11-10 16:37:26 -06:00
huderlem ed76620d28 Merge pull request #880 from GriffinRichards/doc-trickhouse 
Document Trick House scripts
 2019-11-09 08:48:49 -06:00
huderlem 906a1ec4ab Merge pull request #883 from GriffinRichards/fix-colossname 
Fix Battle Colosseum names
 2019-11-08 17:24:05 -06:00
huderlem b38bc9a3a2 Merge pull request #885 from GriffinRichards/doc-littleroot 
Document Littleroot scripts
 2019-11-08 17:23:11 -06:00
huderlem 030784dece Merge pull request #882 from GriffinRichards/doc-mauville 
Document Mauville and New Mauville scripts
 2019-11-07 20:22:56 -06:00
huderlem 1ceee6ef70 Merge pull request #884 from GriffinRichards/doc-halloffame 
Document a few towns/cities
 2019-11-07 19:55:19 -06:00
huderlem 662a9915cf Merge pull request #881 from GriffinRichards/doc-caves 
Document cave scripts
 2019-11-07 18:29:48 -06:00
Marcus Huderle 01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
huderlem a4b4ecd470 Merge pull request #787 from GriffinRichards/rename-tablecmds 
Rename table cmds
 2019-11-04 16:31:27 -06:00
huderlem 6eaac9ea9d Merge pull request #863 from GriffinRichards/doc-partymenu 
Document party menu
 2019-10-31 21:36:56 -05:00
Marcus Huderle aad430c049 Document route 110 scripts 2019-10-26 12:55:53 -05:00
Marcus Huderle 8b75d977e3 Document seashore house scripts 2019-10-26 12:55:53 -05:00
Marcus Huderle 13f9760187 Document route 109 scripts 2019-10-26 12:55:53 -05:00
Marcus Huderle 83d0a87d0c Document several route scripts 2019-10-24 20:14:11 -05:00
Marcus Huderle 4fd848e689 Document early route scripts 2019-10-22 16:47:19 -05:00
Marcus Huderle 2f36bd62d7 Document Oldale scripts 2019-10-21 16:44:20 -05:00
Marcus Huderle 04ea8eea5a Document rest of Petalburg scripts 2019-10-20 12:36:35 -05:00
Marcus Huderle cefc31dd1e Document Petalburg City scripts 2019-10-19 15:05:15 -05:00
huderlem cb9f89925f Merge pull request #841 from GriffinRichards/document-gyms2 
Document Petalburg, Fortree, Mossdeep, and Sootopolis Gyms
 2019-10-19 08:05:11 -05:00
huderlem 8b1df92aca Merge pull request #840 from Sewef/patch-2 
battle_anim_affects_1.c labels
 2019-10-19 07:41:06 -05:00
huderlem a0b3f5d9e3 Merge pull request #833 from GriffinRichards/doc-inc2 
Document .incs split from event_scripts Round 2
 2019-10-15 16:30:27 -05:00
huderlem 26962b7725 Merge pull request #830 from GriffinRichards/doc-inc 
Document some .incs split from event_scripts
 2019-10-14 18:22:35 -05:00
Marcus Huderle e47b3efdfe Unify showmonpic and hidemonpic script command names with their function names 2019-10-12 18:58:54 -05:00
huderlem 0278209376 Merge pull request #834 from GriffinRichards/document-trade 
Document trade.c and some Union Room trading board
 2019-10-12 15:47:17 -05:00
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