GriffinR
5c5c1836bb
Document Trainer Fan Club
2019-11-20 09:08:24 -06:00
GriffinR
4e6a69c297
WIP Document Apprentice
2019-11-19 11:36:38 -05:00
GriffinR
a486c8affd
Begin documenting Apprentice, merge with master
2019-11-18 12:47:10 -05:00
GriffinR
6ac7efb54f
Document Scotts House and begin frontier macros
2019-11-17 08:16:28 -06:00
GriffinR
f7e17ca985
Document Ranking Hall scripts
2019-11-17 08:16:28 -06:00
GriffinR
d6e681066b
Document Battle Frontier outside scripts
2019-11-17 08:16:28 -06:00
GriffinR
3bbdee61b8
Clean up Trainer Hill doc
2019-11-16 13:02:35 -06:00
GriffinR
5e01871f8b
Document Trainer Hill
2019-11-16 13:02:35 -06:00
GriffinR
2c3726a328
Document contest strings
2019-11-16 12:50:01 -06:00
GriffinR
0513e05c38
Document Frontier Reception Gate
2019-11-16 12:00:35 -06:00
GriffinR
248b85c3cb
Document Frontier Exchange Corner scripts
2019-11-16 12:00:35 -06:00
GriffinR
dadaba3075
Fix bet amount typo
2019-11-16 11:37:34 -06:00
GriffinR
57a66bb22d
Document Battle Frontier lounges
2019-11-16 11:37:34 -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
GriffinR
fc3783b739
WIP Document apprentice
2019-11-16 12:28:49 -05:00
GriffinR
0f53aeb19b
Document SS Tidal scripts
2019-11-14 18:07:56 -06:00
GriffinR
00f22b6400
Document remaining routes (104, 119-123)
2019-11-14 17:51:02 -06:00
GriffinR
525ec2025d
Document Routes 111-118
2019-11-14 17:41:01 -06:00
GriffinR
0ba591d26f
Document ocean routes
2019-11-14 17:29:46 -06:00
GriffinR
ff7e11c0b0
Merge branch 'master' into doc-scriptclean
2019-11-13 19:25:41 -05:00
GriffinR
ef8370566f
Document Contest scripts
2019-11-13 18:20:55 -06:00
GriffinR
af83b41dd1
Document Contest Hall berry blenders and misc
2019-11-13 18:20:55 -06:00
GriffinR
c0ae1cbc1c
Document Lilycove scripts
2019-11-13 18:20:55 -06:00
GriffinR
7455bd9b9a
Document interview and TV scripts, and misc script clean up
2019-11-12 14:20:05 -05: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
GriffinR
6c863f6724
Document Sootopolis scripts
2019-11-10 16:37:14 -06:00
GriffinR
a3ee92a4e7
Document some frontier util funcs
2019-11-10 16:37:14 -06:00
DizzyEggg
791ed999d9
Merge
2019-11-10 12:40:11 +01:00
GriffinR
5ac8b126e9
Document Mt Pyre scripts
2019-11-09 12:32:13 -06:00
GriffinR
e4d65addf4
Document Mossdeep scripts
2019-11-09 10:42:52 -06:00
huderlem
ed76620d28
Merge pull request #880 from GriffinRichards/doc-trickhouse
...
Document Trick House scripts
2019-11-09 08:48:49 -06:00
GriffinR
ae1767fe46
Document Mystery Event Club script
2019-11-09 08:41:43 -06:00
GriffinR
06bb4ba402
Document Secret Power TM script
2019-11-09 08:41:43 -06:00
GriffinR
8702972067
Document Sky Pillar outside
2019-11-09 08:41:43 -06:00
GriffinR
a38bff8c17
Document Slateport scripts
2019-11-09 08:37:06 -06:00
GriffinR
1174a20a17
Document Fallarbor and Verdanturf scripts
2019-11-09 08:37:06 -06:00
huderlem
906a1ec4ab
Merge pull request #883 from GriffinRichards/fix-colossname
...
Fix Battle Colosseum names
2019-11-08 17:24:05 -06:00
GriffinR
9140594b23
Merge branch 'master' into doc-littleroot
2019-11-08 03:07:50 -05:00
GriffinR
e19b9c9d46
Resolve Littleroot merge conflict
2019-11-08 03:07:19 -05:00
GriffinR
bef24a45f0
Document Littleroot scripts
2019-11-08 02:47:55 -05: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
GriffinR
4334e31a7e
Fix sailing typo
2019-11-07 16:46:56 -05:00
GriffinR
5e4dd022a6
Document Dewford scripts
2019-11-07 16:36:48 -05:00
GriffinR
5d35662c4c
Document Pacifidlog scripts
2019-11-07 15:41:42 -05:00
GriffinR
de933000e3
Document Lavaridge scripts
2019-11-07 15:21:32 -05:00
GriffinR
979ece7d56
Document Fortree scripts
2019-11-07 14:49:52 -05:00
GriffinR
03a7995570
Move hall of fame script
2019-11-07 13:28:33 -05:00
GriffinR
bae4a586d8
Document Hall of Fame scripts
2019-11-07 13:26:53 -05:00
GriffinR
35ed8de51b
Fix Battle Colosseum names
2019-11-07 12:37:11 -05:00
GriffinR
09afa7992d
Document Shoal Cave
2019-11-07 12:17:28 -05:00
GriffinR
d5685db19a
Fold nops into hidemoneybox
2019-11-07 10:37:15 -05:00
GriffinR
0b5c2c2721
Document New Mauville scripts
2019-11-07 10:32:21 -05:00
GriffinR
c132989679
Document Mauville scripts
2019-11-07 10:18:56 -05:00
GriffinR
43b7fd741a
Document Game Corner scripts
2019-11-07 09:41:59 -05:00
GriffinR
3a00b66407
Document cave scripts
2019-11-07 07:57:51 -05:00
GriffinR
2b944fd721
Merge branch 'master' into doc-trickhouse
2019-11-06 19:49:14 -05:00
GriffinR
25d026aded
Document Trick House scripts
2019-11-06 19:41:19 -05:00
GriffinR
1475c4d8da
Document other cable car station
2019-11-06 17:01:23 -06:00
GriffinR
fbc3eee1f2
Document Fossil Maniac and Berry Master route houses
2019-11-06 17:01:23 -06:00
GriffinR
7d5d12877e
Document cycling, cable car, and tunneler route houses
2019-11-06 17:01:23 -06:00
GriffinR
d0198088d9
Document Lanettes, Winstrates, Old Ladys, and Wingull houses
2019-11-06 17:01:23 -06:00
GriffinR
903b8060a7
Document Glass Workshop
2019-11-06 17:01:23 -06:00
GriffinR
dba94e3971
Update fldeff sparkle macro
2019-11-06 16:41:56 -06:00
GriffinR
6730df2321
Document Abandoned Ship scripts
2019-11-06 16:41:56 -06:00
GriffinR
37bd93ec6c
Rename mystery event msg scripts
2019-11-06 16:38:02 -06:00
GriffinR
e7f6459a89
Split mystery event msg
2019-11-06 16:38:02 -06:00
GriffinR
58dcd6d99d
Clean up mystery event msg
2019-11-06 16:38:02 -06:00
GriffinR
481c09fcad
Clean up Rustboro script doc
2019-11-05 16:43:57 -06:00
GriffinR
d9da932dad
Document Rustboro scripts
2019-11-05 16:43:57 -06:00
GriffinR
1d421f2f71
Document Devon Corp scripts
2019-11-05 16:43:57 -06:00
GriffinR
5ef300c10b
Document dept store
2019-11-04 16:49:06 -06:00
GriffinR
5c627518b3
Rename Grunts to use location-specific names
2019-11-04 16:45:00 -06:00
GriffinR
290df23130
Document remaining poke marts
2019-11-04 16:42:28 -06:00
GriffinR
878eb523d7
Document remainder of poke centers
2019-11-04 16:42:28 -06:00
huderlem
a4b4ecd470
Merge pull request #787 from GriffinRichards/rename-tablecmds
...
Rename table cmds
2019-11-04 16:31:27 -06:00
GriffinR
347d1e20b6
Use constants in io_reg.s
2019-11-04 16:26:09 -06:00
GriffinR
033c6cea3b
Use YES/NO constants for MSGBOX_YESNO
2019-11-02 16:36:43 -05:00
GriffinR
a90b828bb8
Use YES/NO constants
2019-11-02 16:32:58 -05:00
GriffinR
e4fe21786e
Document misc special houses
2019-11-02 16:32:58 -05:00
GriffinR
390d594e21
Fix indentation
2019-11-01 17:22:45 -05:00
GriffinR
5f1fcdd023
Document aqua/magma area scripts
2019-11-01 17:22:45 -05:00
GriffinR
dd01942c4f
Document aqua/magma hideout scripts
2019-11-01 17:22:45 -05:00
huderlem
6eaac9ea9d
Merge pull request #863 from GriffinRichards/doc-partymenu
...
Document party menu
2019-10-31 21:36:56 -05:00
GriffinR
8055548fa4
Document legendary scripts
2019-10-31 18:28:34 -05:00
GriffinR
b1ea2592c3
Merge branch 'master' into doc-partymenu
2019-10-31 14:22:51 -04:00
GriffinR
67ce8c9cc2
Clean up players_house doc
2019-10-30 17:51:35 -05:00
GriffinR
93e2851fc1
Document players_house.inc and Littleroot house scripts
2019-10-30 17:51:35 -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
GriffinR
5fd44d1e74
Rename some STAT_CHANGE macros
2019-10-26 11:53:00 -04:00
GriffinR
f35a3f73b2
Document gabby_and_ty.inc
2019-10-26 09:32:04 -05:00
GriffinR
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04:00
Marcus Huderle
83d0a87d0c
Document several route scripts
2019-10-24 20:14:11 -05:00
GriffinR
7d24f2d62c
Document record_mix.inc and clean surf.inc
2019-10-22 17:57:28 -05:00
GriffinR
ca2c6fa9b1
Document pc_transfer.inc
2019-10-22 17:57:28 -05:00
GriffinR
9a86769847
Document obtain_item.inc
2019-10-22 17:57:28 -05:00
GriffinR
c0aaa01424
Document flash.inc
2019-10-22 17:57:28 -05:00
Marcus Huderle
4fd848e689
Document early route scripts
2019-10-22 16:47:19 -05:00
GriffinR
a4d6ce417d
Fix resetintimidatetracebits typo
2019-10-22 15:54:11 -05:00
GriffinR
fa4940ee44
Clean up lilycove_lady.inc doc
2019-10-21 20:19:37 -05:00
GriffinR
6923f0e369
Document lilycove_lady.inc
2019-10-21 20:19:37 -05:00
GriffinR
a7ffa96578
Rename mart_attendant to mart_clerk
2019-10-21 17:22:19 -05:00
GriffinR
c70162086b
Split some smaller files from event_scripts
2019-10-21 17:22:19 -05:00
GriffinR
973e6f9667
Document mauville_man.inc
2019-10-21 17:21:53 -05:00
Marcus Huderle
2f36bd62d7
Document Oldale scripts
2019-10-21 16:44:20 -05:00
Sewef
64cf2d70fa
battle_anim_effects_3 (3)
2019-10-21 18:36:45 +02:00
Sewef
b24e7a5933
battle_anim_effects_3 (2)
2019-10-21 18:29:59 +02:00
Sewef
c8e0e89f8e
battle_anim_effects_3
2019-10-21 18:19:07 +02:00
Sewef
afdc8da297
Update battle_anim_scripts.s
2019-10-21 18:06:36 +02:00
Marcus Huderle
04ea8eea5a
Document rest of Petalburg scripts
2019-10-20 12:36:35 -05:00
Sewef
41e952a668
battle_anims_effects_2
...
Fixes
2019-10-20 12:29:08 -05:00
Sewef
e9675bdd24
battle_anims_effects_2
2019-10-20 12:29:08 -05:00
Sewef
def7a4a18a
more battle_anims_effects_2
2019-10-20 12:29:08 -05:00
Sewef
8531a17e10
battle_anims_effects_2
2019-10-20 12:29:08 -05:00
Sewef
e90c708383
battle_anims_effects_2
2019-10-20 12:29:08 -05:00
Sewef
3b0d9e134f
battle_anims_effects_2
2019-10-20 12:29:08 -05:00
Sewef
49ad6da8fb
starting battle_anim_effects_2
2019-10-20 12:29:08 -05:00
GriffinR
ac399ade4a
Document safari zone scripts
2019-10-20 09:53:21 -05:00
GriffinR
0db188b487
Clean up berry_tree.inc and misc adjacent documentation
2019-10-20 09:46:46 -05:00
Marcus Huderle
cefc31dd1e
Document Petalburg City scripts
2019-10-19 15:05:15 -05:00
DizzyEggg
1d10d44a4d
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2019-10-19 15:17:45 +02: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
Sewef
19fb0fb220
Merge branch 'master' into patch-2
2019-10-16 19:35:33 +02:00
Sewef
9dcfc5ba73
Fix labels
2019-10-16 19:10:39 +02:00
GriffinR
b4a9298205
Merge branch 'master' into document-gyms2
2019-10-16 04:22:34 -04:00
GriffinR
20fa13616f
Condense fallthrough script
2019-10-16 04:14:51 -04:00
GriffinR
0f15264595
Document rotating_tile_puzzle
2019-10-16 04:09:30 -04:00
GriffinR
60a592a2c3
Condense fallthrough scripts
2019-10-15 17:09:47 -05:00
GriffinR
348bb002a8
Document Gym scripts first half
2019-10-15 17:09:47 -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
GriffinR
90a05cf824
Finish Mossdeep Gym doc, beging documenting rotating tile puzzle
2019-10-15 05:06:13 -04:00
GriffinR
1b41b8b7ca
Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms
2019-10-15 05:05:57 -04:00
Sewef
07ac727c6d
Document Oamdata in battle_anim ( #838 )
2019-10-14 18:26:47 -05:00
GriffinR
928cdf2531
Merge branch 'master' into doc-inc2
2019-10-14 19:25:10 -04:00
Sewef
975c0ce1d0
Label battle_anim_effects_1
2019-10-14 23:27:12 +02:00
Sewef
65b82d67c9
Revert "More battle_anim_effects_1 labels"
...
This reverts commit 00331a644a
.
2019-10-14 23:22:44 +02:00
Sewef
5a366e8d72
More battle_anim_effects_1 labels
2019-10-14 22:51:45 +02:00
Sewef
00331a644a
More battle_anim_effects_1 labels
2019-10-14 22:42:15 +02:00
Sewef
299166edee
Document subs & AnimTask in battle_anim_effects_1
2019-10-14 22:08:03 +02:00
Sewef
46f2cc5449
battle_anim_effects_1 main callbacks
2019-10-14 21:17:38 +02:00
Sewef
63b5be9259
Ended battle_anims_effects_1 SpriteTemplates
2019-10-14 21:05:40 +02:00
Sewef
a49756a8fe
Update battle_anim_scripts.s
2019-10-13 22:37:39 +02:00
GriffinR
30ef494163
Merge branch 'master' into doc-inc2
2019-10-13 15:44:07 -04:00
GriffinR
60a9dc6a0e
Fix map script names
2019-10-13 15:40:15 -04:00
GriffinR
bb23128b77
Merge conflict resolves into review changes
2019-10-13 15:33:19 -04:00
GriffinR
144c5888a1
Fix map script names
2019-10-13 15:29:53 -04:00
GriffinR
a081124a20
Merge branch 'master' into doc-inc
2019-10-13 15:26:44 -04:00
Marcus Huderle
e47b3efdfe
Unify showmonpic and hidemonpic script command names with their function names
2019-10-12 18:58:54 -05:00
Marcus Huderle
8df4982b3f
Merge remote-tracking branch 'upstream/master' into document-trade
2019-10-12 15:39:17 -05:00
GriffinR
4e2be7ff5e
Review changes for #835
2019-10-12 15:14:57 -05:00
GriffinR
714b122da6
Fix indentation
2019-10-12 15:14:57 -05:00
GriffinR
1c99f5b7c9
Split text from cable_club.inc
2019-10-12 15:14:57 -05:00
GriffinR
1b7607bd91
Document cable_club.inc
2019-10-12 15:14:57 -05:00
GriffinR
70d1d8956e
Document elite_four.inc and the E4 map scripts
2019-10-08 02:25:31 -04:00
GriffinR
2368f57669
Merge branch 'master' into doc-inc
2019-10-07 17:37:35 -04:00
GriffinR
d8f5e73bb7
Merge branch 'master' into doc-inc
2019-10-07 17:37:04 -04:00
GriffinR
bcf74df27f
Use B_OUTCOME constants for GetBattleOutcome
2019-10-07 16:36:47 -05:00
GriffinR
7ba11b7a1b
Use VAR_FACING constants
2019-10-07 16:36:02 -05:00
GriffinR
628301d6d5
Document unusual_weather.inc
2019-10-07 11:29:14 -04:00
GriffinR
9553ec1d28
Document mevent.inc
2019-10-07 10:34:12 -04:00
GriffinR
0df304d629
Document roulette.inc
2019-10-07 02:00:16 -04:00
GriffinR
81ee8f07ef
Document pc.inc and prof_birch.inc
2019-10-07 01:13:34 -04:00
GriffinR
c4deb4db96
Document field_poison
2019-10-06 20:04:30 -04:00
GriffinR
f179ab95c0
Document move tutors
2019-10-06 17:30:17 -04:00
GriffinR
02070eaf73
Document kecleon
2019-10-06 16:06:34 -04:00
GriffinR
748a1dbdd4
Document cave hole
2019-10-06 14:16:37 -04:00
GriffinR
d914c1d659
Document common movements
2019-10-06 13:55:30 -04:00
DizzyEggg
cb6bafcb7f
Merge with master
2019-10-06 14:40:12 +02:00
GriffinR
749247b910
Convert 4 spaces in .inc to tab
2019-10-05 10:52:48 -04:00
GriffinR
dadb1cb9f1
More trade/union room doc, incidental party_menu doc
2019-10-04 23:31:25 -04:00
GriffinR
c3c8fb40cf
Move trade data, some trade.c clean up documentation
2019-10-03 01:16:22 -04:00
GriffinR
2ac3ad3e60
Review changes for #819 and merge
2019-10-02 12:40:00 -04:00
PikalaxALT
cb528cb543
Merge pull request #821 from GriffinRichards/document-textinput
...
Document text input strings
2019-10-02 09:49:26 -04:00
GriffinR
9aed405851
Document a few field specials
2019-09-30 01:42:52 -04:00
GriffinR
53bc1bd0d1
Document text input strings
2019-09-30 00:09:29 -04:00
GriffinR
67152b9242
Split off more files from event_scripts
2019-09-28 02:37:01 -04:00
GriffinR
75869a880c
Move running shoes script
2019-09-27 15:27:08 -04:00
GriffinR
12cc7ef34c
Split more files from event_scripts
2019-09-27 14:20:51 -04:00
GriffinR
73b96fe145
Rename CONTACT macros to ON_DAMAGE
2019-09-27 12:27:36 -04:00
GriffinR
86f1f9066a
Split some files from event_scripts
2019-09-27 12:22:58 -04:00
GriffinR
0c1f1281da
Review changes for #778
2019-09-27 10:08:47 -04:00
GriffinR
3bf8129396
Clean up new Cmd macro names
2019-09-27 02:54:28 -04:00
GriffinR
1491b1855b
Merge branch 'master' into document-eventscripts
2019-09-26 15:03:22 -04:00
GriffinR
1016b23918
Merge branch 'master' into rename-tablecmds
2019-09-26 15:02:38 -04:00
GriffinR
37373c1b21
Review changes for #817
2019-09-25 18:46:25 -05:00
GriffinR
4e98a0cc4b
Remove Egg parent constants
2019-09-25 18:46:25 -05:00
GriffinR
801ca37f04
Document day_care.inc and related
2019-09-25 18:46:25 -05:00
GriffinR
de6e1e9ecf
Use multi constants from merge
2019-09-23 00:36:49 -04:00
GriffinR
a180d2af49
Merge branch 'master' into document-eventscripts
2019-09-22 12:18:48 -04:00
GriffinR
8e4e344c7d
Merge branch 'master' into document-scriptmenu
2019-09-22 09:45:44 -04:00
GriffinR
80f58f7b24
Document PLAYER_HAS constants, consolidate poke constants
2019-09-22 08:14:22 -05:00
GriffinR
b6dffcf8b7
Clean up script_menu documentation
2019-09-19 19:23:24 -04:00
GriffinR
9fb24bbbce
Remainder of script_menu documentation
2019-09-19 18:31:09 -04:00
GriffinR
275695c189
Document more script_menu, lilycove harbor
2019-09-19 17:27:34 -04:00
GriffinR
de0084ef7a
Document multichoice ids
2019-09-19 00:56:51 -04:00
GriffinR
b596322ca2
Initial script_menu documentation
2019-09-18 18:57:25 -04:00
GriffinR
58b8d7c297
Merge branch 'master' into document-eventscripts
2019-09-17 18:01:20 -04:00
GriffinR
6ab192e739
Review changes for #807
2019-09-17 16:50:17 -05:00
GriffinR
6ab49da811
Clean up field_specials documentation
2019-09-17 16:50:17 -05:00
GriffinR
3dbd375779
Some frontier field_specials documentation
2019-09-17 16:50:17 -05:00
GriffinR
aac9658a8e
Document some field_specials data
2019-09-17 16:50:17 -05:00
GriffinR
945d3d3a27
Merge branch 'master' into document-eventscripts
2019-09-17 00:10:23 -04:00
GriffinR
06af24bce5
Use misc ScrCmd constants
2019-09-16 19:44:47 -05:00
GriffinR
f4160ded98
Fix misnamed function
2019-09-16 00:29:59 -04:00
GriffinR
bb236b490d
Update BS constants for Cmd rename
2019-09-15 17:58:12 -04:00
GriffinR
826fc3154e
condense secret base mapscript labels
2019-09-06 13:01:45 -04:00
GriffinR
cb82d868af
fix secret base jsons
2019-09-06 02:49:26 -04:00
GriffinR
9fbcd552de
document remainder of secret_base scripts, delete unneeded scripts.incs
2019-09-06 02:12:00 -04:00
PikalaxALT
f3bed6045e
Disassemble data/ereader_screen.s
2019-09-05 20:48:48 -05:00
PikalaxALT
b510100503
Port trainer hill sets to C objects
2019-09-05 20:48:48 -05:00
Eduardo Quezada D'Ottone
de02805388
Changed names.
2019-09-05 20:42:15 -05:00
Eduardo Quezada D'Ottone
e2689d2a27
Documented Mechadoll answers.
2019-09-05 20:42:15 -05:00
GriffinR
8c6b5648d4
document secret_base_1.inc
2019-09-05 16:16:21 -04:00
GriffinR
1d703e786b
move some data out of event_scripts, use game stat constants
2019-09-05 14:56:34 -04:00
GriffinR
6b04ea0727
Merge branch 'master' into document-eventscripts
2019-09-03 22:22:14 -04:00
PikalaxALT
1f4c88c952
Copy Berry Fix MB dism from FR ( #777 )
...
* Copy Berry Fix MB dism from FR
2019-09-03 15:33:11 -04:00
DizzyEggg
6a3b74c59c
Use item constant in pretty petal flower shop
2019-08-30 09:48:59 +02:00
DizzyEggg
d0b9b31390
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2019-08-25 15:58:57 +02:00
GriffinR
869d0eebc0
Rename atk## constants and states
2019-08-23 08:46:21 -04:00
GriffinR
a46f7952f9
Use DIR constants for createvobject
...
Also uses event object ids in LinkContestRoom1
2019-08-21 17:11:06 -05:00
GriffinR
f08615881e
Changes from review
2019-08-21 17:06:55 -05:00
GriffinR
5fb7ab05dd
clean up
2019-08-21 17:06:55 -05:00
GriffinR
d931ba9602
document remaining funcs
2019-08-21 17:06:55 -05:00
GriffinR
7fc99f3952
favor lady funcs
2019-08-21 17:06:55 -05:00
GriffinR
009caa21c8
some contest lady funcs
2019-08-21 17:06:55 -05:00
GriffinR
23979c4d7d
initial documentation commit
2019-08-21 17:06:55 -05:00
tustin2121
82744ba636
Replace {STRING 5} with {KUN}
...
Since we already have the KUN placeholder, there's no need for this {STRING 5} stuff.
Also, it makes it easier to delete all the {KUN}s in hacks later on if desired.
2019-08-21 14:05:22 -04:00
Tustin2121
18dee14170
Review fixes
2019-08-17 23:26:46 -04:00
Tustin2121
d63a8ba817
Replaced createvobject numbers with EVENT_OBJ_GTX defines
...
Doing this allows someone to renumber the event object graphics and still have working contests.
2019-08-17 13:38:13 -04:00
Tustin2121
1069adae46
Renaming unknown link room ids to be the same as name
...
This descrepency was causing a lot of annoyance when using porymap, because porymap generated the ids in map_groups.h from the name, and mapjson was generating map_groups.h from the id in the json files. So just name them the same already like every other map in the repo.
2019-08-17 13:26:57 -04:00
Tustin2121
f4d4424618
Folded nops into hidemoneybox and updatemoneybox
...
The nops are essential to the hidemoneybox and updatemoneybox commands when using vanilla versions of those commands. Even though they're not actually used parameters in the command implementation, they are still consumed, which means if someone were to get rid of the nops (as I did in TriHard) it causes the commands to consume bytecode that are not theirs, resulting in undefined behavior usually leading to softlocks. Folding the extra bytes into the macros means there's no chance of the extra bytes getting losts in scripts.
2019-08-17 13:25:36 -04:00
Tustin2121
6508469259
Rename movobjectoffscreen to copyobjectxytoperm
...
Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.
2019-08-17 13:18:56 -04:00
Tustin2121
ea724278b7
Juan text buffer overflow note
2019-08-17 13:05:55 -04:00
GriffinR
ecf2097abb
initial event_scripts documentation
2019-08-14 23:38:42 -04:00
DizzyEggg
17be6766c7
Merge
2019-08-08 14:07:17 +02:00
PikalaxALT
9beeba8424
Merge pull request #764 from GriffinRichards/document-varnames
...
Document vars that are used and unnamed
2019-08-05 11:59:53 -04:00
GriffinR
191f74525d
name unused route state vars
2019-08-05 11:50:29 -04:00
GriffinR
c2bf668fdd
rename town/city vars
2019-08-05 11:23:45 -04:00
DizzyEggg
df1b804af8
Merge with master
2019-08-04 23:18:49 +02:00
DizzyEggg
1641579297
Merge branch 'master' into pok_jump
2019-08-04 00:02:13 +02:00
GriffinR
0f5d96e5f5
name used and unnamed vars
2019-08-03 14:12:48 -04:00
PikalaxALT
9f50c4fa80
Merge pull request #760 from ultima-soul/use_pokeblock_data
...
Decompile use_pokeblock data
2019-08-03 11:01:05 -04:00
DizzyEggg
9306c142b3
Merge dodrio with master
2019-08-02 00:45:49 +02:00
DizzyEggg
4d2d8779bf
Dodrio berry picking decompiled
2019-08-02 00:41:55 +02:00
DizzyEggg
02cadbee60
MORE DODRIO BERRY PICKINGgit status!
2019-08-01 19:01:50 +02:00
ultima-soul
9a152f8fe6
Decompile data/use_pokeblock.s
2019-07-30 17:21:17 -07:00
DizzyEggg
ba1a70419a
Start dodrio magic
2019-07-31 00:27:30 +02:00
DizzyEggg
e634e722cc
Decompile pokemon jump
2019-07-29 12:35:57 +02:00
garak
dfa3e079c0
finish pokenav data decomp
2019-07-19 22:57:33 -04:00
garak
f9a9297d4f
decompile pokenav 7/8 data
2019-07-19 22:06:42 -04:00
garak
f6d55db535
decompile pokenav_unk_5 data
2019-07-19 21:05:55 -04:00
garak
690a0c4390
decompile pokenav_unk_4 rodata
2019-07-19 19:36:17 -04:00
garak
c400d1dc7f
decompile pokenav_unk_3 data
2019-07-19 18:31:42 -04:00
garak
b68ab6106d
pokenav unk 2 data decomp
2019-07-19 17:23:52 -04:00
DizzyEggg
34aa9b9c56
Merge branch 'master' into item_expansion
2019-06-28 09:34:16 +02:00
garak
a43dcd26bd
finish labeling metatiles
2019-06-16 10:08:07 -05:00
garak
713f61de7c
continue labeling metatiles for scripts
2019-06-16 10:08:07 -05:00
DizzyEggg
0eaddd251c
Merge branch 'master' into item_expansion
2019-06-03 11:06:09 +02:00
DizzyEggg
f64c1dfabf
Some pokenav work
2019-05-26 07:20:51 -05:00
Slawter666
5f292d621a
Use event object constants
2019-05-25 14:41:48 -05:00
DizzyEggg
39770f7fde
Use constants for new game berries setting script
2019-05-25 08:27:07 -05:00
Flametix
dbdb827e54
Fix typos ( #713 )
...
* fix typos
2019-05-18 21:56:19 -05:00
DizzyEggg
ca51bc23bf
Merge branch 'master' into item_expansion
2019-05-17 09:36:35 +02:00
garak
daecd5ec40
name some trainer card related functions
2019-05-16 17:10:13 -05:00
DizzyEggg
6f5e9a1944
Merge branch 'master' into item_expansion
2019-05-14 14:02:07 +02:00
Fontbane
d9115ada86
Use species constants for VAR_TEMP_1 before givemon
2019-05-13 10:16:28 -05:00
PikalaxALT
539d472796
Merge branch 'master' into dodrio_berry_picking
2019-05-11 21:22:09 -04:00
DizzyEggg
e9a104a0c1
Merge with master
2019-04-30 17:05:09 +02:00
Fontbane
901a83d249
Fix some labels and include decorations.h
...
Include decorations.h in shop.c
Include decorations.h in event_scripts.s
2019-04-22 17:23:59 -05:00
Fontbane
6cf06d5f95
Doc some event scripts
...
Doc decoration shops
Revert "Doc decoration shops"
This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435.
Document through comments
Un-revert decor documentation
2019-04-22 17:23:59 -05:00
Fontbane
2c076f1f3e
Doc most OnTransitions
2019-04-22 17:23:59 -05:00
AJ Fontaine
dbdb51e1a5
Start documenting event scripts
2019-04-22 17:23:59 -05:00
DizzyEggg
42e7930987
Almost done with the balls
2019-04-14 21:49:31 +02:00
DizzyEggg
59797e4801
Use constants in battle_anim_special.c
2019-04-14 10:19:50 -05:00
DizzyEggg
d9fc6d36be
Merge branch 'master' into item_expansion
2019-04-14 09:52:07 +02:00
Marcus Huderle
1268691410
Finish decompiling pokenav_unk_1.c
2019-04-13 16:18:04 -05:00
DizzyEggg
896602db5b
Begin item expansion
2019-04-13 13:14:45 +02:00
Marcus Huderle
a65cffef42
Decompile more pokemon_jump.c
2019-04-10 20:34:17 -05:00
Phlosioneer
50350cc2e1
Merge branch 'master' into contest-ai-cleanup
2019-04-07 20:20:22 -04:00
huderlem
a4ea0ac816
Merge pull request #645 from Phlosioneer/pokenav-decomp-again
...
Pokenav decomp again
2019-04-07 18:03:32 -05:00
Phlosioneer
0dc73b0b3a
Break up pokenav into subfiles
...
The files are separated based on the pokenav resources substruct
ID they use.
2019-04-07 14:40:35 -04:00
Marcus Huderle
78151b6d88
Start decompiling pokemon_jump.c
2019-04-07 13:12:27 -05:00
Phlosioneer
d84d94e29a
Merge branch 'master' into pokenav-decomp-again
2019-04-07 01:56:36 -04: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
Fontbane
6a14cd418e
Match
2019-04-06 12:48:50 -05:00
Fontbane
4a09a5da33
Doc field move scripts completely, use fldeff constants for dofieldeffect
...
Fix labels
Fix labels again
Delete extra boulder scripts
Now it should build fine
2019-04-06 12:48:50 -05:00
AJ Fontaine
621e5d2263
Start documenting field move scripts
2019-04-06 12:48:50 -05:00
DizzyEggg
b85a74afc5
Give names to battle anim backgrounds
2019-04-06 12:44:27 -05:00
DizzyEggg
5183cdb357
change anim sprite name
2019-04-06 10:14:48 -05:00
Phlosioneer
bc50686158
Decomp everything onvolving UnknownSubStruct_81C81D4
...
Now I can start cleaning up the fields and substructs
2019-04-06 03:42:14 -04:00
Marcus Huderle
033580da96
Document secret base
2019-04-05 16:24:57 -05:00
DizzyEggg
dd24597d52
Finish up menu specialised
2019-04-05 07:53:23 -05:00
PikalaxALT
a58d9a16dd
Merge branch 'master' into dodrio_berry_picking
2019-04-05 08:41:31 -04:00
Fontbane
9e74409bb2
Fix labels, label more scripts
2019-04-04 19:34:35 -05:00
Fontbane
8b88ef3e01
Document berry tree events
2019-04-04 19:34:35 -05:00
Fontbane
90e32f4ec5
Document landmark setting and item balls
2019-04-04 19:34:35 -05:00
PikalaxALT
c46f271f67
Documentation of ereader_helpers, 1
2019-04-04 19:26:45 -05:00
PikalaxALT
53efbe2832
Finish decomp of union_room_chat
2019-04-04 19:26:45 -05:00
PikalaxALT
a47abb3949
union_room_chat data, 1
2019-04-04 19:26:45 -05:00
Phlosioneer
3b3b2dd031
General cleanup of the second half of contest.c
2019-04-03 20:43:23 -04:00
PikalaxALT
4fadbaf161
Minor fixes
...
gotoram --> returnram
cmdCF/execram --> gotoram
fix indentation in sym_ewram.txt
fix mevent_client.h guard name
2019-04-03 17:04:42 -05:00
PikalaxALT
28646ea64e
Decompile mevent server scripts
2019-04-03 17:04:42 -05:00
PikalaxALT
6c12d154e7
Reformat mevent server and client scripts
2019-04-03 17:04:42 -05:00
PikalaxALT
03badd9c40
mevent_server_ish
2019-04-03 17:04:42 -05:00
PikalaxALT
dabd1f6177
finish mevent_server.s
2019-04-03 17:04:42 -05:00
PikalaxALT
a455d98385
start porting mevent_server from firered
2019-04-03 17:04:42 -05:00
Phlosioneer
3a2ea40188
Rename and document more contest setup functions
...
Also properly label the link contest flags variable, and label the
contest window ID's.
2019-04-03 17:24:32 -04: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
DizzyEggg
baa187665b
Document a bit of script menu and battle anims
2019-04-02 16:28:38 -05:00
DizzyEggg
1aa95a1821
Document a bit of anims
2019-04-02 07:31:06 -05:00
PikalaxALT
7571969a45
Finish union room battle
2019-04-01 22:08:50 -05:00
PikalaxALT
4be97b2dc6
through sub_801A960
2019-04-01 22:08:50 -05:00
Phlosioneer
845307b3a6
Rename contest AI stuff
2019-04-01 22:16:07 -04:00
PikalaxALT
08f4d3e105
Rename these objects to union_room_battle
2019-04-01 14:41:37 -04:00
PikalaxALT
4ea8217f81
file split
2019-04-01 14:25:58 -04:00
PikalaxALT
1fe5208560
through sub_801A02C
2019-04-01 12:05:58 -04:00
huderlem
1e8e5af033
Merge pull request #607 from Phlosioneer/contest-data
...
Contest data
2019-04-01 07:37:15 -05:00
Phlosioneer
37c7441a15
Merge branch 'master' into contest-data
2019-03-31 20:22:47 -04:00
Phlosioneer
207a54393c
Fix mistakes and use EVENT_OBJ_GFX_* macros
2019-03-31 20:07:24 -04:00
PikalaxALT
ade0183378
Document mystery_gift
2019-03-31 18:59:52 -04:00
PikalaxALT
93c4e35d84
infer additional file split after task00_mystery_gift
2019-03-31 15:43:51 -05:00
PikalaxALT
aafe9df454
through sub_8018798
2019-03-31 15:43:51 -05:00
PikalaxALT
f34cda3b52
Start decompiling mystery gift
2019-03-31 15:43:51 -05:00
PikalaxALT
5a0142da08
infer additional file split after task00_mystery_gift
2019-03-31 15:53:38 -04:00
PikalaxALT
db4e9505ad
Merge branch 'master' into mystery_gift
2019-03-31 10:39:11 -04: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
DizzyEggg
aa7f69f067
Begin use pokeblock and menu specialised
2019-03-31 12:59:01 +02:00
PikalaxALT
5bf7886a70
through sub_8018798
2019-03-30 14:36:52 -04:00
PikalaxALT
ed53220be2
Start decompiling mystery gift
2019-03-30 13:15:48 -04:00
PikalaxALT
ccac4694cd
Merge branch 'master' into continue_union_room
2019-03-30 12:41:10 -04:00
DizzyEggg
35cffea987
Helpful macros for atk49
2019-03-30 08:29:56 -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
PikalaxALT
ae0e70d7bb
sub_80179D4 and rodata
2019-03-29 11:57:03 -04:00
PikalaxALT
7c45a7c443
port mevent_801BAAC from fire red
2019-03-28 07:32:25 -05:00
DizzyEggg
5dd653a89e
Use constants in atk89_statbuffchange
2019-03-27 07:47:01 -05:00
Marcus Huderle
af1baa89f1
Start decompiling union_room_chat.c
2019-03-26 21:58:20 -05:00
scnorton
2eba82b0fb
sub_8026634
2019-03-26 11:59:39 -04: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
a5ee2c14fd
Merge remote-tracking branch 'upstream/master' into use_pokeblock
...
# Conflicts:
# include/menu_specialized.h
2019-03-23 10:14:31 -05:00
Fontbane
e8add87bf3
Document Field Effects and some related text
...
Also VAR_TRICK_HOUSE_LEVEL
2019-03-23 09:57:37 -05:00
Fontbane
7d54c2b960
EventScript and Text Documentation
...
In event_script.s. Also renamed a couple events for consistency/detail.
2019-03-23 09:57:37 -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
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
7118462b9f
Decompile ereader.c up to faraway island code
2019-03-21 18:28:44 -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
Phlosioneer
092608aef6
Add a constant for "no music" on maps.
2019-03-16 12:31:29 -05:00
Phlosioneer
8cea949e6d
Move constant and EWRAM data into C.
2019-03-15 19:33:30 -04:00
Phlosioneer
8e1537fb57
Document map name popup flag
2019-03-10 09:23:58 -05:00
Phlosioneer
13c2f91b11
Moved last contest data into C
2019-03-09 23:51:39 -05:00
Phlosioneer
0c935a8bd5
Move the contest opponent filter to C
2019-03-09 22:54:17 -05:00
Phlosioneer
a32e8e7405
Move gContestOpponents into C
...
2,400 LOC by hand.
2019-03-09 20:56:36 -05:00
Phlosioneer
0e8f94a83e
Last bit of cleanup on contest_opponents
2019-03-09 02:49:57 -05:00
Phlosioneer
153499ed6f
Clean up contest_opponents.inc
2019-03-09 01:38:38 -05:00
Phlosioneer
5b4b0a245b
Move contest winner list to C
2019-03-09 00:01:49 -05:00
Phlosioneer
88c3781880
Move text pointer tables into C
2019-03-08 22:33:40 -05:00
Phlosioneer
b7cfa9d365
Move more contest constants into C
2019-03-08 21:39:51 -05:00
Phlosioneer
b93d923826
Merge branch 'master' into move-tutor
2019-03-08 02:27:20 -05:00
Phlosioneer
eac70acab6
Change filename to something more descriptive
2019-03-08 02:17:01 -05:00
Phlosioneer
aa7657a82a
Move constants into C
...
Also figured out what one of the graphics files is for.
2019-03-06 22:58:05 -05:00
Phlosioneer
0da83abad2
Several nonmatching functions
...
Huge and difficult.
2019-03-06 22:27:30 -05:00
Phlosioneer
4345ba8e6c
More decompiled and cleanup
2019-03-05 22:32:28 -05:00
DizzyEggg
b150091436
Rename an erroneously named battlescript
2019-03-05 17:06:29 +01:00
Phlosioneer
9bea9e1624
Start decompiling menu_unknown
2019-03-05 06:06:20 -05:00
Phlosioneer
0e3fc4956b
Rename asm file
2019-03-05 00:06:43 -05:00
Phlosioneer
907492fd6e
Split rom asm file in half
...
The first half is ui/menu stuff, while the second half is link-related
stuff.
2019-03-04 23:26:51 -05:00
Phlosioneer
cae63cf1c7
Rename move tutor to move relearner
2019-03-04 20:56:39 -05:00
Phlosioneer
4ea5e85bed
Fix typos
...
This is an updated version of #554 , since it hasn't been updated in two
weeks.
2019-03-03 09:31:47 -06:00
Phlosioneer
27aa27a2e9
Fix tabs
2019-03-03 02:58:50 -05:00
Phlosioneer
4907ce6f7f
Fully document move_tutor (formerly learn_move)
2019-03-03 02:50:40 -05: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
Phlosioneer
25050b9944
Fix tabs, do suggested rename
2019-03-02 04:13:27 -05: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
Phlosioneer
a7e5852f1d
More minor fixes
2019-03-01 01:49:11 -05:00
Phlosioneer
459fd93b59
Fix minor errors
2019-03-01 01:18:58 -05:00
hondew
9ed0f77528
fixed issues in data and include dirs
2019-02-28 21:21:56 -06:00
hondew
5c8cc5225f
document slot machine
2019-02-28 21:21:56 -06:00
Phlosioneer
373d73eb3b
Fix last special var
2019-02-28 00:06:27 -05:00
Phlosioneer
bf45b83c65
Finish documenting event vars
2019-02-27 23:54:51 -05:00
Phlosioneer
782979f1fc
Finish documenting trainer hill
...
Trainer hill isn't anywhere close to done, but I figured out enough
to name the VAR. That's all this PR should do.
2019-02-27 22:16:01 -05:00
Phlosioneer
66f0616a2d
I guess I'm documenting Trainer Hill now
2019-02-27 21:31:05 -05:00
Phlosioneer
e77e7844ea
Name several vars, document some related events
2019-02-27 20:25:09 -05:00
Phlosioneer
648fc3d4f3
Name more unknown vars
2019-02-27 15:18:56 -05:00
Phlosioneer
4137dd7b0b
Identify unused, never read, and never written vars
2019-02-27 14:42:32 -05:00
Marcus Huderle
4b9e93850c
Document easy chat screen types
2019-02-27 12:55:29 -06:00
Phlosioneer
c1348d22f3
Name most event scripts related to unusual weather
2019-02-27 04:27:54 -05:00
Phlosioneer
fe55580fe1
Reverse engineer unusual weather events
2019-02-27 03:42:04 -05:00
Phlosioneer
b8a60b055b
Fix previous merge
2019-02-26 22:11:43 -05:00
Phlosioneer
3a44b090d1
Merge branch 'master' into multiplayer-stuff
2019-02-26 22:07:29 -05:00
Phlosioneer
accea672f1
Incorporate feedback
2019-02-26 22:04:44 -05:00
Marcus Huderle
231355f84d
Decompile easy_chat data
2019-02-26 14:50:02 -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