GriffinR
4c12ad00d2
Merge branch 'master' into fix-eventobj
2020-01-19 21:57:29 -05:00
GriffinR
a40f054900
Move/rename gfx start/end vars
2020-01-18 08:49:34 -06:00
DizzyEggg
044f070020
Merge with master
2020-01-18 15:04:56 +01:00
jiangzhengwenjz
aa631825fc
resolve data sections
2020-01-16 08:14:27 -06:00
jiangzhengwenjz
46b00b11d4
match all the functions
2020-01-16 08:14:27 -06:00
jiangzhengwenjz
c2be2e8c69
sync documentation from firered
2020-01-16 08:14:27 -06:00
jiangzhengwenjz
8a5f292618
document symbols
2020-01-16 08:14:27 -06:00
GriffinR
ea8b1011d3
Merge master into fix-eventobj
2020-01-15 16:11:20 -05:00
Marcus Huderle
5a2d676e71
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
2020-01-13 20:26:20 -06:00
GriffinR
e92cc7752b
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05: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
GriffinR
c19289596d
Give/Take to Add/Remove for silent script macros
2020-01-12 23:24:52 -05:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05: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
GriffinR
e736c2d2fd
Document some easy chat specials
2020-01-12 19:39:30 -06:00
GriffinR
6a470ddfda
Some script clean up, document secret base secrets show
2020-01-12 19:39:30 -06:00
GriffinR
58e64b9524
Clean up some of save.c
2020-01-12 18:42:41 -06:00
GriffinR
635267ce32
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
GriffinR
ef67f2d33b
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
GriffinR
017fa294b5
Add battle tent mon/trainer constants
2020-01-08 01:07:53 -05:00
GriffinR
fb5bea98ce
More battle_dome.c doc
2020-01-07 22:30:37 -05:00
GriffinR
bb692a03eb
Add frontier mon constants
2020-01-03 23:20:11 -05: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
GriffinR
3efc8199d4
More battle_dome.c documentation
2019-12-25 22:27:33 -08:00
Fontbane
31b4656324
Labels better
2019-12-25 22:39:06 -05: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
DizzyEggg
9a2888fdbf
Merge into master
2019-12-23 16:46:03 +01:00
GriffinR
749965d56b
Document item_use.c
2019-12-21 21:39:30 -05:00
GriffinR
68cdd7b1cb
Merge master into ObjEvent rename
2019-12-21 05:19:27 -05:00
Diegoisawesome
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp
...
Document some warp/field screen effect
2019-12-20 23:44:56 -08:00
GriffinR
ff2d8a9c4e
Add frontier trainer constants
2019-12-20 21:14:05 -05:00
GriffinR
63c8cf97d1
Document Battle Dome scripts and some battle_dome.c
2019-12-20 16:53:33 -05:00
GriffinR
d137a1a0c1
Use constants in compare macro
2019-12-18 19:12:09 -05:00
GriffinR
949509aade
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
GriffinR
23f952b34e
Merge master into doc-tower
2019-12-17 21:17:46 -05:00
GriffinR
ddfa0c6298
Document Battle Tower scripts
2019-12-17 20:56:13 -05:00
huderlem
f8cef9a6a8
Merge pull request #932 from jiangzhengwenjz/berry_crush
...
berry crush
2019-12-17 19:35:00 -06:00
GriffinR
4879c1eab2
Merge branch 'master' into constants-fade
2019-12-17 19:11:51 -05:00
jiangzhengwenjz
5bec27aa34
nonmatch sub_8024604
2019-12-18 03:36:51 +08:00
GriffinR
d1cf9006fb
Document some warp/field screen effect
2019-12-17 05:23:07 -05:00
GriffinR
db8a5c6c2b
Merge branch 'master' into fix-eventobj
2019-12-15 11:47:27 -05:00
GriffinR
96ec5e1b84
Use fadescreen constants
2019-12-15 11:42:50 -05:00
huderlem
fee36224ed
Merge pull request #925 from GriffinRichards/doc-matchcall
...
Document some pokenav match call
2019-12-15 09:42:13 -06:00
GriffinR
a04347816f
Split PokenavMatchCallEntries from PokenavMonList
2019-12-15 10:25:47 -05:00
GriffinR
82f55f2381
Merge master into ObjEvent rename
2019-12-15 02:00:00 -05:00
GriffinR
75b0c9d7a9
Document Battle Pyramid scripts
2019-12-14 08:38:26 -06:00
GriffinR
ea9a2c848a
Define start and ends for temp vars and daily/temp/special flags
2019-12-14 08:27:49 -06:00
GriffinR
09840efc64
Name last event_data funcs
2019-12-14 08:27:49 -06:00
GriffinR
1a672dac8d
Use constant for daily flag offset
2019-12-14 08:27:49 -06:00
GriffinR
6556b556dd
Merge branch 'master' into fix-eventobj
2019-12-11 01:09:06 -05:00
GriffinR
47b0d8a597
Merge branch 'master' into doc-matchcall
2019-12-10 20:43:27 -05:00
GriffinR
49f1a90534
Document Battle Pike scripts
2019-12-10 19:31:27 -06:00
GriffinR
b7ab9cbf4c
Update JP translation and fix typo
2019-12-10 19:29:23 -06:00
GriffinR
ed1ff0ad77
Document misc strings and text colors
2019-12-10 19:29:23 -06:00
GriffinR
8da7a94423
Merge branch 'master' into fix-eventobj
2019-12-10 17:41:08 -05:00
Diegoisawesome
49b56d0136
Merge pull request #929 from jiangzhengwenjz/nonmatching
...
fake match InitEventObjectStateFromTemplate
2019-12-10 14:32:57 -08:00
jiangzhengwenjz
f34b8f564a
InitEventObjectStateFromTemplate
2019-12-11 05:35:40 +08:00
DizzyEggg
871e093b65
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2019-12-09 08:20:29 +01:00
GriffinR
51179df017
Clean up match call doc
2019-12-08 15:49:36 -05:00
GriffinR
0086cd1efa
More pokenav match call documentation
2019-12-08 15:25:21 -05:00
GriffinR
b93101bbeb
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
GriffinR
22fd579fd9
Add comment for ABNORMAL_WEATHER
2019-12-06 19:05:28 -06:00
GriffinR
7f22fc9879
Update old weather names in field_weather_effect
2019-12-06 19:05:28 -06:00
GriffinR
955bfe3f5c
Add comment for original weather name
2019-12-06 19:05:28 -06:00
GriffinR
efaea2a3ab
Revert WEATHER_CLOUDY to WEATHER_SHADE
2019-12-06 19:05:28 -06:00
GriffinR
a4191040c9
Sync weather names
2019-12-06 19:05:28 -06:00
GriffinR
1b30f0c973
Rename event_obj_lock to event_object_lock
2019-12-06 02:55:30 -05:00
GriffinR
cc9b923dc2
More pokenav match call documentation
2019-12-06 02:35:08 -05:00
GriffinR
c51e0f3bae
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
GriffinR
467a103bcc
Set up Battle Tent macros
2019-12-05 21:11:17 -06:00
GriffinR
fdae25eab2
Set up Battle Pyramid macros
2019-12-05 21:11:17 -06:00
GriffinR
9fcfbdbef5
Set up Battle Factory macros
2019-12-05 21:11:17 -06:00
GriffinR
41c1c9ca8a
Set up Battle Pike macros
2019-12-05 21:11:17 -06:00
GriffinR
9b3d1cfab6
Set up Battle Dome and Tower macros
2019-12-05 21:11:17 -06:00
GriffinR
be17c1602d
Set up remaining facility script doc, use Palace macros
2019-12-05 21:11:17 -06:00
GriffinR
548af3c0f1
Document a bit of Match Call
2019-12-05 15:33:36 -05:00
DizzyEggg
6e06b08c94
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2019-11-29 20:55:23 +01:00
GriffinR
cb90f22c5e
Merge master into ObjEvent rename
2019-11-27 12:51:10 -05:00
GriffinR
8d870d94c9
Document Battle Arena scripts
2019-11-26 18:47:48 -06:00
GriffinR
f559fa3fe2
Merge master into ObjEvent rename
2019-11-25 20:00:04 -05:00
GriffinR
0db46e84bc
Use macros for FRONTIER_DATA_6, fix offset comment
2019-11-25 18:37:48 -06:00
GriffinR
63ee15fc28
Document Frontier Util
2019-11-25 18:37:48 -06:00
GriffinR
08a8dc46e3
Use macros for Trainer Hill
2019-11-25 18:37:48 -06:00
GriffinR
4dfa959fa2
Begin documenting Battle Pike and Frontier Util
2019-11-25 18:37:48 -06:00
huderlem
9a81661075
Merge pull request #851 from Sewef/patch-3
...
battle_anim_effects_3
2019-11-24 12:02:54 -06:00
Sewef
07b79c3fc3
battle_anim_effects_3 (5)
2019-11-24 18:00:51 +01:00
huderlem
bef6150b59
Merge pull request #909 from GriffinRichards/doc-apprentice
...
Document Apprentice
2019-11-23 09:27:02 -06:00
Sewef
1dfe34dee3
TriForce → TriAttack
2019-11-23 15:51:08 +01:00
Sewef
4f590e8f61
battle_anim_effects_3 (4)
2019-11-23 11:57:39 +01:00
DizzyEggg
f3f9e47f96
Merge
2019-11-22 23:10:04 +01:00
GriffinR
4c52cf9ed1
Fix event constant file names
2019-11-21 14:03:35 -05:00
GriffinR
86c08330c4
Fix Event Object include guards
2019-11-21 14:03:11 -05:00
GriffinR
5822dfca8d
Rename FIELD_OBJ_EVENT to OBJECT_EVENT_MOVEMENT
2019-11-21 10:47:24 -05:00
GriffinR
7034f59c14
Rename EventObj to ObjEvent
2019-11-21 00:14:40 -05:00
GriffinR
82cb741d8b
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
GriffinR
ec3e86f1d2
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
GriffinR
b2eb49888d
Clean up Apprentice doc
2019-11-20 19:00:08 -05:00
GriffinR
a05006421b
Document Apprentice
2019-11-20 17:36:52 -05:00
GriffinR
215bb31d67
Clean up Trainer Fan Club doc
2019-11-20 09:08:24 -06:00
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
5393b42f7c
Remove SpriteCB_Null name
2019-11-17 08:16:28 -06:00
GriffinR
f6ab6934ae
Align battle tower func spacing
2019-11-17 08:16:28 -06: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
b96fad074b
Rename neverRead fields
2019-11-16 13:02:35 -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
248b85c3cb
Document Frontier Exchange Corner scripts
2019-11-16 12:00:35 -06:00
GriffinR
57a66bb22d
Document Battle Frontier lounges
2019-11-16 11:37:34 -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
ba65719090
Typo fix
2019-11-14 17:51:02 -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
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
DizzyEggg
e82fc06e08
Match ConvertImageProcessingToGBA
2019-11-12 17:25:02 +01: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
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
huderlem
ed76620d28
Merge pull request #880 from GriffinRichards/doc-trickhouse
...
Document Trick House scripts
2019-11-09 08:48:49 -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
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
GriffinR
de933000e3
Document Lavaridge scripts
2019-11-07 15:21:32 -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
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
fbc3eee1f2
Document Fossil Maniac and Berry Master route houses
2019-11-06 17:01:23 -06:00
GriffinR
6730df2321
Document Abandoned Ship scripts
2019-11-06 16:41:56 -06:00
GriffinR
58dcd6d99d
Clean up mystery event msg
2019-11-06 16:38:02 -06:00
GriffinR
d9da932dad
Document Rustboro scripts
2019-11-05 16:43:57 -06:00
GriffinR
5ef300c10b
Document dept store
2019-11-04 16:49:06 -06:00
GriffinR
f056328e37
Align trainer constant values
2019-11-04 16:45:00 -06:00
GriffinR
5c627518b3
Rename Grunts to use location-specific names
2019-11-04 16:45:00 -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
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
27169f634b
Review changes for party menu doc
2019-10-31 21:33:01 -04: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
aec7eb6089
Clean up party_menu doc
2019-10-31 14:11:55 -04:00
GriffinR
e01ec84837
Document party_menu second pass
2019-10-31 03:25:56 -04:00
GriffinR
93e2851fc1
Document players_house.inc and Littleroot house scripts
2019-10-30 17:51:35 -05:00
GriffinR
ff0109e0fd
Define unused hidden item flags
2019-10-27 11:01:40 -05:00
GriffinR
c31aafed57
Name unknown flag from R/S
2019-10-27 10:23:06 -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
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04: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
GriffinR
973e6f9667
Document mauville_man.inc
2019-10-21 17:21:53 -05:00
Sewef
e9675bdd24
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
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
GriffinR
b4a9298205
Merge branch 'master' into document-gyms2
2019-10-16 04:22:34 -04:00
GriffinR
0f15264595
Document rotating_tile_puzzle
2019-10-16 04:09:30 -04: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
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
garak
92d28c5daf
add MIN_LEVEL define to pokemon constants
2019-10-14 18:12:03 -05:00
Sewef
5a366e8d72
More battle_anim_effects_1 labels
2019-10-14 22:51:45 +02:00
Sewef
63b5be9259
Ended battle_anims_effects_1 SpriteTemplates
2019-10-14 21:05:40 +02:00
GriffinR
30ef494163
Merge branch 'master' into doc-inc2
2019-10-13 15:44:07 -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
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
1b7607bd91
Document cable_club.inc
2019-10-12 15:14:57 -05:00
GriffinR
3514f9dd6b
Clean up trade.c doc
2019-10-10 18:46:42 -04:00
GriffinR
07fa82c911
Last non-anim trade.c doc
2019-10-10 03:50:51 -04:00
GriffinR
32aa87c7e1
More trade doc, fix switch indentations
2019-10-09 14:21:29 -04:00
GriffinR
2c062dc764
More trade documentation
2019-10-09 05:56:44 -04:00
GriffinR
d1bcd60b58
Document more trade.c
2019-10-08 20:25:46 -04:00
GriffinR
d8f5e73bb7
Merge branch 'master' into doc-inc
2019-10-07 17:37:04 -04:00
GriffinR
0df304d629
Document roulette.inc
2019-10-07 02:00:16 -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
Marcus Huderle
4494b5d4cb
Document collision types
2019-10-06 15:48:26 -05:00
GriffinR
02070eaf73
Document kecleon
2019-10-06 16:06:34 -04:00
Marcus Huderle
799edaf3e6
Document hide/show reflection movement actions
2019-10-06 14:17:34 -05:00
GriffinR
748a1dbdd4
Document cave hole
2019-10-06 14:16:37 -04:00
DizzyEggg
cb6bafcb7f
Merge with master
2019-10-06 14:40:12 +02:00
GriffinR
66a68159b1
Continue trade doc
2019-10-05 10:41:37 -04:00
GriffinR
dadb1cb9f1
More trade/union room doc, incidental party_menu doc
2019-10-04 23:31:25 -04:00
GriffinR
6b556900f8
Move union room data, more trade doc
2019-10-04 17:24:03 -04:00
GriffinR
2b0c944286
Document more of trade
2019-10-04 07:42:45 -04:00
GriffinR
4a7f061885
Document some of trade
2019-10-03 19:39:37 -04:00
GriffinR
c3c8fb40cf
Move trade data, some trade.c clean up documentation
2019-10-03 01:16:22 -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
53bc1bd0d1
Document text input strings
2019-09-30 00:09:29 -04:00
GriffinR
73b96fe145
Rename CONTACT macros to ON_DAMAGE
2019-09-27 12:27:36 -04:00
PikalaxALT
301822603e
Merge pull request #802 from PikalaxALT/gflib
...
Gflib and libagbsyscall
2019-09-27 11:34:55 -04:00
PikalaxALT
7b8b5b5c8c
Merge branch 'master' into gflib
2019-09-27 09:11:22 -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
1ffa890d27
Consolidate remaining pokemon constants
2019-09-22 08:14:22 -05: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
340c4e1411
Clean up script_movement documentation
2019-09-16 19:30:36 -05:00
GriffinR
f9a8f44a29
Document script_movement
2019-09-16 19:30:36 -05:00
GriffinR
6c9997a906
Document decor icons
2019-09-16 19:23:21 -05:00
GriffinR
b46c4b6703
more constant usage
2019-09-16 19:21:23 -05:00
GriffinR
85d97542cd
Use MAX_MON_MOVES constants
2019-09-16 19:21:23 -05:00
GriffinR
bb236b490d
Update BS constants for Cmd rename
2019-09-15 17:58:12 -04:00
tustin2121
711e7d884c
Document cave transition code.
2019-09-10 13:43:33 -04:00
PikalaxALT
306ce048ad
Move gflib srcs and headers to gflib subdir
2019-09-08 21:07:54 -04:00
GriffinR
9fbcd552de
document remainder of secret_base scripts, delete unneeded scripts.incs
2019-09-06 02:12:00 -04:00
PikalaxALT
95b805a425
Nuke definition of struct TrHillTag_Half
2019-09-05 20:48:48 -05:00
PikalaxALT
e87f4f4cc7
Unify TrHillTag struct definitions (variable floors)
2019-09-05 20:48:48 -05:00
PikalaxALT
904bba9e16
NULL_BATTLE_TOWER_POKEMON define
2019-09-05 20:48:48 -05:00
PikalaxALT
f3bed6045e
Disassemble data/ereader_screen.s
2019-09-05 20:48:48 -05:00
PikalaxALT
a9918c3b89
Partial refactor of TryWriteTrainerHill_r
2019-09-05 20:48:48 -05:00
PikalaxALT
8d910465f8
Minor refactor of ereader_helpers.c
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
6b04ea0727
Merge branch 'master' into document-eventscripts
2019-09-03 22:22:14 -04:00
DizzyEggg
d0b9b31390
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2019-08-25 15:58:57 +02:00
ultima-soul
d3ea25ee7f
Synchronize with pokefirered pokedex.c.
2019-08-24 11:17:11 -07:00
GriffinR
869d0eebc0
Rename atk## constants and states
2019-08-23 08:46:21 -04:00
Diegoisawesome
8e7abad720
Merge pull request #786 from DizzyEggg/u8
...
GetAbilityBySpecies's arg from bool8 to u8
2019-08-22 17:45:56 -05:00
DizzyEggg
d09c290eba
bool8 to u8
2019-08-22 16:46:33 +02:00
GriffinR
4228750e38
more documentation in match_call_data
...
Documents everything related to UnkStruct_08625388, names HasCheckPage functions, fixes mislabeled Brendan/May headers, and adds header count to pokenav_unk_3
2019-08-21 17:18:38 -05:00
PikalaxALT
5b8d0f1c33
Remove MNUM from oam flip constant names
2019-08-21 17:15:23 -05:00
PikalaxALT
f7cf4fa154
Use HFLIP, VFLIP
2019-08-21 17:15:23 -05: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
771a7b25fa
move data, more contest 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
5d96a0cc97
minor fixes
2019-08-21 17:06:55 -05:00
GriffinR
fc467a9d52
standardize favour/favor
2019-08-21 17:06:55 -05:00
GriffinR
23979c4d7d
initial documentation commit
2019-08-21 17:06:55 -05: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
d12a8c10ee
Documenting credits a bit
2019-08-17 13:26:44 -04:00
DizzyEggg
51bfdffac3
Ability Capsule
2019-08-17 12:47:25 +02: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
5040a5f96b
Move pokenav syms around
2019-08-05 20:23:56 -04:00
PikalaxALT
195137b001
Merge pull request #768 from PikalaxALT/pokenav_unk_8
...
Finish pokenav_unk_8
2019-08-05 15:21:20 -04:00
PikalaxALT
a7eb4f9dd2
Make pokenav_unk_8 syms static, fix gcc-9 warnings
2019-08-05 14:00:38 -04:00
PikalaxALT
e2e667d4b5
Finish pokenav_unk_8
2019-08-05 13:47:04 -04: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
PikalaxALT
18f29c566a
through sub_81CF278
2019-08-05 10:54:56 -04:00
PikalaxALT
329670e16e
Minor fixes
2019-08-05 08:46:52 -04:00
PikalaxALT
51d5ee771d
Merge branch 'master' into pokenav_unk_2
2019-08-05 08:33:45 -04:00
PikalaxALT
1fc64b8582
Merge pull request #767 from DizzyEggg/pokenav_8
...
More pokenav
2019-08-05 08:21:36 -04:00
PikalaxALT
ff2166b8fe
pokenav_unk_2: unclutter global namespace
2019-08-04 21:10:08 -04:00
PikalaxALT
299c3cf1dc
Finish pokenav_unk_2
2019-08-04 20:39:36 -04:00
DizzyEggg
df1b804af8
Merge with master
2019-08-04 23:18:49 +02:00
PikalaxALT
cd876292d1
Merge branch 'master' into pokenav_unk_2
2019-08-04 15:35:35 -04:00
DizzyEggg
c8cc39cb57
More pokemav, massive clean-up, seriously who the left the file in this state???
2019-08-04 19:09:12 +02:00
PikalaxALT
fa5bfc1627
Merge pull request #766 from DizzyEggg/pokenav_10
...
Decompile pokenav 10
2019-08-04 11:07:10 -04:00
DizzyEggg
252df94bc1
Decompile pokenav 10
2019-08-04 13:53:00 +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
ce941e6f56
Merge pull request #762 from GriffinRichards/GriffinRichards-documentation
...
Documenting MAPSEC use in pokenav match call data
2019-08-03 11:10:42 -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
GriffinR
9c90ff65af
Update pokenav.h
2019-08-02 12:48:15 -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
PikalaxALT
a08cbaee0a
pokenav_unk_2 staging
2019-07-30 19:46:56 -04:00
DizzyEggg
ff2dcf5413
Two fakematches out
2019-07-29 21:09:05 +02:00
garak
5b57c001f5
Merge branch 'master' into navdata
2019-07-29 13:06:45 -04:00
DizzyEggg
a4a382a004
Match sub_81D2278 and poke jump clean
2019-07-29 16:22:50 +02:00
DizzyEggg
e634e722cc
Decompile pokemon jump
2019-07-29 12:35:57 +02:00
DizzyEggg
56b124fdec
Some more pokenav
2019-07-25 21:41:02 +02:00
DizzyEggg
fd07c608fc
Decompile pokemon unk 6
2019-07-25 18:56:08 +02:00
DizzyEggg
33c036e7ff
Decompile pokemonav 7
2019-07-24 17:02:52 +02:00
Sewef
23b3d4bd5e
Fix PREPARE_MOVE_BUFFER macro ( #749 )
2019-07-22 16:58:35 -04:00
garak
c39d25ff4d
Merge branch 'master' into navdata
2019-07-20 12:30:41 -04:00
PikalaxALT
8d0d5cfd55
Merge branch 'master' into modern_gcc
2019-07-20 11:51:22 -04:00
garak
690a0c4390
decompile pokenav_unk_4 rodata
2019-07-19 19:36:17 -04:00
garak
b68ab6106d
pokenav unk 2 data decomp
2019-07-19 17:23:52 -04:00
PikalaxALT
20863ac85b
Resolve compile warnings in modern
2019-07-18 20:46:00 -04:00
Gudf
75f165ed74
Use a constant instead of integer literals when checking for shinyness
2019-07-11 20:16:39 +02:00
DizzyEggg
11fb13d635
Some pokemon jump work
2019-07-09 16:39:29 -05:00
PikalaxALT
f300f9e699
Revert FLOAT_U* and DOUBLE_U* macros
2019-06-30 19:31:29 -04:00
PikalaxALT
e92e9a184c
Support for non-dkA toolchains
2019-06-28 22:26:11 -04:00
DizzyEggg
34aa9b9c56
Merge branch 'master' into item_expansion
2019-06-28 09:34:16 +02:00
PikalaxALT
b839c21307
Fix/suppress warnings when building with gcc-8
2019-06-26 16:42:57 -04:00
PikalaxALT
fb06e4a3c9
Modernize code
...
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
2019-06-26 12:12:10 -04:00
garak
2c22a82a25
clean metatile constants file
2019-06-16 10:08:07 -05: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
garak
fbbc2b1d8b
finish src metatile labels
2019-06-16 10:08:07 -05:00
garak
9f8a30e4e7
label metatiles in fldeff_cut.c
2019-06-16 10:08:07 -05:00
garak
8b26bd1e09
label metatiles for general, fallarbor, and sootopolis gym tilesets
2019-06-16 10:08:07 -05:00
garak
aad839995f
label metatiles for pacifidlog and fortree bridges
2019-06-16 10:08:07 -05:00
garak
724add638c
label regi cave metatiles
2019-06-16 10:08:07 -05:00
garak
7e35b8a710
label remaining metatiles in field_specials.c
2019-06-16 10:08:07 -05:00
garak
a9560d9c62
give metatile labels to petalburg gym and pcs
2019-06-16 10:08:07 -05:00