DizzyEggg
|
a98c5ab78a
|
Merge branch 'master' into battle_engine_v2
|
2019-06-24 12:12:56 +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
|
9e175c9f1b
|
Merge branch 'master' into battle_engine_v2
|
2019-06-10 11:21:16 +02:00 |
|
Slawter666
|
5f292d621a
|
Use event object constants
|
2019-05-25 14:41:48 -05:00 |
|
DizzyEggg
|
09c0a195ac
|
Merge branch 'master' into battle_engine_v2
|
2019-05-20 09:05:12 +02:00 |
|
Flametix
|
dbdb827e54
|
Fix typos (#713)
* fix typos
|
2019-05-18 21:56:19 -05:00 |
|
DizzyEggg
|
f22f7866ac
|
Merge with master, fix conficts
|
2019-05-17 09:52:20 +02:00 |
|
garak
|
daecd5ec40
|
name some trainer card related functions
|
2019-05-16 17:10:13 -05:00 |
|
DizzyEggg
|
94045ace0b
|
Merge branch 'master' into battle_engine_v2
|
2019-05-15 13:31:53 +02:00 |
|
Fontbane
|
d9115ada86
|
Use species constants for VAR_TEMP_1 before givemon
|
2019-05-13 10:16:28 -05:00 |
|
DizzyEggg
|
bbe3a28b78
|
Merge with master
|
2019-05-01 11:10:41 +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
|
f8713f9c15
|
Merge with master
|
2019-04-06 20:43:13 +02: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 |
|
Marcus Huderle
|
033580da96
|
Document secret base
|
2019-04-05 16:24:57 -05:00 |
|
DizzyEggg
|
183b714ff1
|
Merge with master and fix web moves
|
2019-04-05 12:43:44 +02:00 |
|
Fontbane
|
9e74409bb2
|
Fix labels, label more scripts
|
2019-04-04 19:34:35 -05:00 |
|
Fontbane
|
90e32f4ec5
|
Document landmark setting and item balls
|
2019-04-04 19:34:35 -05:00 |
|
DizzyEggg
|
cd3de7821e
|
Merge branch 'master' into battle_engine_v2
|
2019-04-02 08:37:54 +02:00 |
|
DizzyEggg
|
88424b0ea3
|
Support for custom multi battle choose mons
|
2019-04-01 21:56:25 +02: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 |
|
DizzyEggg
|
17e74756cb
|
Merge with master, add defines to atk49 and statbuffchange commands
|
2019-03-31 15:19:25 +02:00 |
|
Marcus Huderle
|
cf917a8733
|
Decompile berry_powder.c
|
2019-03-24 14:50:16 -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 |
|
DizzyEggg
|
53c60ab292
|
Merge branch 'master' into battle_engine_v2
|
2019-03-23 15:54:08 +01:00 |
|
Marcus Huderle
|
f4f666f5af
|
Finish decompiling ereader.c
|
2019-03-22 13:36:06 -05:00 |
|
DizzyEggg
|
54ab6b43dc
|
Merge with master
|
2019-03-22 10:40:31 +01: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
|
8e1537fb57
|
Document map name popup flag
|
2019-03-10 09:23:58 -05:00 |
|
Phlosioneer
|
a32e8e7405
|
Move gContestOpponents into C
2,400 LOC by hand.
|
2019-03-09 20:56:36 -05:00 |
|
DizzyEggg
|
fddb5159b4
|
Merge with master
|
2019-03-05 21:46:45 +01:00 |
|
Phlosioneer
|
cae63cf1c7
|
Rename move tutor to move relearner
|
2019-03-04 20:56:39 -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 |
|
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 |
|
DizzyEggg
|
cebada80d0
|
Merge with master
|
2019-02-28 20:56:52 +01: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 |
|