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
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
9fbcd552de
document remainder of secret_base scripts, delete unneeded scripts.incs
2019-09-06 02:12:00 -04: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
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
GriffinR
ecf2097abb
initial event_scripts documentation
2019-08-14 23:38:42 -04:00
GriffinR
0f5d96e5f5
name used and unnamed vars
2019-08-03 14:12:48 -04:00
garak
713f61de7c
continue labeling metatiles for scripts
2019-06-16 10:08:07 -05:00
DizzyEggg
39770f7fde
Use constants for new game berries setting script
2019-05-25 08:27:07 -05: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
Phlosioneer
50350cc2e1
Merge branch 'master' into contest-ai-cleanup
2019-04-07 20:20:22 -04:00
Marcus Huderle
033580da96
Document secret base
2019-04-05 16:24:57 -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
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
Phlosioneer
8e1537fb57
Document map name popup flag
2019-03-10 09:23:58 -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
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
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
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
Phlosioneer
8816aa527d
Update map script files
2019-02-25 08:01:22 -06:00
Phlosioneer
5f7a971313
Source file part of map script renaming
2019-02-25 08:01:22 -06:00
Phlosioneer
1cd5cb09cf
Merge branch 'master' into weather-15
2019-02-25 02:30:35 -05:00
Phlosioneer
4e5fae0086
Merge branch 'master' into event-vars
2019-02-25 02:24:20 -05:00
Phlosioneer
04db99bb0a
More misc event names
2019-02-24 10:10:18 -06:00
Phlosioneer
0de831fd29
Name some common single-entry movements
2019-02-24 10:10:18 -06:00
Phlosioneer
4582fd1545
Name a ton of commonly used event scripts
2019-02-24 10:10:18 -06:00
Phlosioneer
b2866fae21
Document the weather state functions
...
All weather types are now documented (including WEATHER_15)
2019-02-22 22:20:42 -05:00
Phlosioneer
cea5696f23
Finish moving pokeruby vars
2019-02-22 04:18:43 -05:00
Phlosioneer
e12a7790cf
Start porting pokeruby vars to pokeemerald
2019-02-22 04:01:38 -05:00
Phlosioneer
eca329f9c5
Merge branch 'master' into multiplayer-stuff
2019-02-21 21:22:10 -05:00
Phlosioneer
5695617d64
Merge branch 'master' into multiplayer-stuff
2019-02-18 01:12:47 -05:00
Phlosioneer
08579edbcd
Clean up mistakes and bad formatting
2019-02-18 01:03:44 -05:00
Phlosioneer
986d3d8b2f
Finish and polish new_game.c
...
Only one function is left undocumented. I tried to go into the assembly
to at least name it, but it clears fields in the save block that aren't
even documented yet.
2019-02-15 03:40:57 -05:00
Diegoisawesome
dfb896356c
Merge branch 'master' of github.com:pret/pokeemerald
2019-02-12 00:40:42 -06:00
Diegoisawesome
449fb25f23
Clear up misnamed time-based flags and functions
2019-02-12 00:40:34 -06:00
Phlosioneer
e75f45dbcf
Reverse engineered many of the multiplayer events
...
Some corrections to the way events are handled and identified.
2019-02-10 20:42:50 -05:00
Marcus Huderle
6f1d2b870c
Give proper names to dynamic map layouts
2019-02-09 09:57:30 -06:00
Marcus Huderle
6add3e1794
Document some battle dome stuff
2019-02-08 11:08:25 -06:00
Marcus Huderle
3a88ab831d
Document more battle pyramid
2019-02-07 11:51:03 -06:00
Marcus Huderle
29d6221935
Convert map data to JSON
2019-01-31 15:51:20 -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
36a1825bbe
Document trainer approach funcs, and use movement type constants in scripts
2019-01-29 14:36:02 -06:00
Diegoisawesome
6b2dda422b
Merge branch 'master' of github.com:pret/pokeemerald
2019-01-27 00:11:44 -06:00
Diegoisawesome
7a60f36954
Clean up variable numbers mistakenly written as decimal
2019-01-27 00:11:32 -06:00
DizzyEggg
4e396207d3
document more of trainer card
2019-01-20 18:24:35 +01:00
DizzyEggg
c0bc01d301
Move some vars to C
2019-01-13 13:15:23 +01:00
Tetrable
30e7ac0dca
Fix merge conflicts
2019-01-03 02:28:18 +00:00
Marcus Huderle
e1092028ec
Decompile match_call.c
2019-01-02 19:46:15 -06:00
Tetrable
a3ebca4d81
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Tetrable
1e3da62d24
Finish off labelling flags
2019-01-02 21:12:43 +00:00
Diegoisawesome
af1e44befe
Continue porting roulette
2018-12-31 18:07:29 -06:00
Marcus Huderle
6e7bdb3ca4
Document misc field_specials things
2018-12-29 11:36:54 -06:00
Melody
6d556f8cf7
improve checkplayergender calls
...
clean up constant definitions
make tweaks from review
2018-12-28 08:22:21 -06:00
Marcus Huderle
dcbc8db6a3
Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)
2018-12-25 11:46:35 -06:00
Melody
c7971ecb20
improve event script object calls
2018-12-25 11:20:33 -06:00
Melody
1e87810414
document setweather calls
2018-12-24 16:23:58 -05:00
Diegoisawesome
81b38c00e4
Merge pull request #466 from melthelesbian/compare_macros
...
improve compare macros
2018-12-23 11:17:30 -06:00
Melody
55005f1588
improve call_if macros
2018-12-21 21:32:45 -05:00
Melody
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -05:00
DizzyEggg
ecee02816d
Merge with master
2018-12-20 22:53:08 +01:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff
...
Decompile / port fldeff_80F9BCC
2018-12-19 22:16:59 -06:00
Melody
5e6ceeb631
update applymovement to remove magic numbers
2018-12-19 14:08:01 -05:00
garak
e292d0ca83
Merge branch 'master' into fldeff
2018-12-16 20:05:31 -05:00
Meowsy
d3e32ab287
Rename Mauville Man text.
2018-12-10 15:50:10 -05:00
DizzyEggg
c2d8876174
Document PSS functions
2018-12-10 21:36:52 +01:00
garak
e1e2132a37
sync fldeff function names with pokeruby
2018-12-09 22:24:54 -05:00
DizzyEggg
6068495619
Document trainer battle scripts ( #430 )
2018-12-07 16:50:56 -06:00
Melody
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -05:00
Melody
bad5323642
cleans up trainer battle scripts
...
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
2018-12-02 15:08:19 -05:00
Melody
c557ac61ae
adds constants, cleans up callstd and msgbox code
...
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
2018-12-02 03:37:46 -05:00
DizzyEggg
4e37723288
Document Battle Pyramid
2018-11-18 17:52:22 +01:00
Slawter666
6fcf878e2f
Tidy up header files
2018-11-13 22:28:46 +00:00
Slawter666
1d46507110
Move field effects enum to defines
2018-11-13 14:19:04 +00:00
DizzyEggg
b5ea69cf74
Fix conflicts
2018-11-12 19:22:23 +01:00
Slawter666
1b895ff52c
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
2018-11-12 14:14:50 +00:00
DizzyEggg
d5abd7b696
Document Battle Pie
2018-11-12 14:36:31 +01:00
Diegoisawesome
18839a4872
Merge remote-tracking branch 'pret/master' into script_menu
2018-11-06 20:20:56 -06:00
Diegoisawesome
7dd4ed7060
r5/r6 swap on sub_80E2578
2018-11-05 14:45:54 -06:00
DizzyEggg
0bb51037d7
Finish frontier util
2018-11-01 21:31:10 +01:00
DizzyEggg
0ab27e44b1
more tower, fail
2018-10-21 20:13:12 +02:00
Slawter666
3d8874d919
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
2018-10-21 00:20:09 +01:00
garak
113a8d1efd
clean flags and remove temp macro
2018-10-19 14:59:18 -04:00
garak
1441ee6bc3
finish event object flags
2018-10-19 13:04:47 -04:00
garak
cb5981cdf2
name more event flags
2018-10-18 21:32:21 -04:00
garak
c27043bd3c
more event flags
2018-10-18 15:28:59 -04:00
garak
d1b7f32b0a
begin event flag names, add temporary hidden item macro
2018-10-17 22:07:23 -04:00
garak
7d88b9647f
Merge branch 'master' into event-flags
2018-10-17 12:30:45 -04:00
garak
ff97873c30
label temp flags, test replace script
2018-10-17 12:25:12 -04:00
Diegoisawesome
e75f0b4f80
Port/decompile field_control_avatar
2018-10-16 21:47:08 -05:00
Slawter666
1435c96b41
Further synchronisation
2018-10-17 01:11:44 +01:00
DizzyEggg
b4a42a6832
Decompile apprentice
2018-10-14 11:37:44 +02:00
DizzyEggg
7dac22314e
Decompile a bit of pokemon storarage system
2018-08-12 16:40:31 +02:00
Diegoisawesome
18d5186630
Merge remote-tracking branch 'garakmon/heal-loc-2'
2018-08-11 16:57:46 -07:00
Diegoisawesome
cb9127ccaf
Revert "Rename some specials"
...
This reverts commit 658f9351fe
.
2018-08-11 15:16:41 -07:00
Diegoisawesome
658f9351fe
Rename some specials
2018-08-11 14:59:43 -07:00
Diegoisawesome
b54793be91
Finish decompiling field_specials
2018-08-11 14:51:54 -07:00
garak
c3512e3b39
port larger heal location changes from poke ruby pr
2018-08-10 10:45:15 -04:00
Diegoisawesome
90896e38c9
Begin porting/decompiling field_specials
2018-08-08 01:37:12 -07:00
Marcus Huderle
5e00c0bfcf
Fix map constants
2018-06-20 19:54:21 -05:00
Marcus Huderle
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
Marcus Huderle
acc1a5d446
Get all map constants from include/ rather than constants/
2018-06-15 07:49:21 -05:00
Marcus Huderle
e01dd90bb3
Update applymovement actions to reflect movement action names
2018-06-13 18:19:19 -05:00
DizzyEggg
d1798d0ed9
decompile field tasks
2018-05-19 18:02:43 +02:00
PikalaxALT
cae0fb8ec2
through sub_81203FC
2018-05-02 16:57:34 -04:00
KDSKardabox
936bb5925a
Decompile dewford trend
2018-04-16 16:22:13 +05:30
Marcus Huderle
a5cd6e8ef4
Merge pull request #231 from KDSKardabox/master
...
Player PC
2018-03-28 21:45:24 -07:00
Marcus Huderle
d4c6ef7ae6
Merge pull request #227 from PikalaxALT/pokenav_match_call
...
Pokenav match call
2018-03-28 21:33:50 -07:00
Anders Løvig
57775a946d
Rename start menu functions
2018-03-28 21:09:27 +02:00
KDSKardabox
e7cf8e5c17
Start decompile player_pc
2018-03-12 13:56:20 +05:30
PikalaxALT
df128cbfed
Merge branch 'master' into pokenav_match_call
2018-03-02 21:49:09 -05:00
PikalaxALT
89847427e4
match_call_t; through sub_81D17E4
2018-03-02 08:44:33 -05:00
PikalaxALT
1616f998fc
Rename some flags relevant to the conditions under which Wattson becomes available for rematch
2018-02-26 08:42:15 -05:00
DizzyEggg
94b47c0686
decompile overworld
2018-02-14 00:58:22 +01:00
DizzyEggg
382442c4c8
start decompiling overworld.s
2018-02-12 15:01:43 +01:00
DizzyEggg
ae8e89a10d
move some pokemon data to c
2018-02-05 17:39:26 +01:00
DizzyEggg
f59eedb672
decompile hof pc
2018-01-21 20:45:43 +01:00
golem galvanize
59e1aacd26
DIEGO SEND HELP
2018-01-20 17:26:30 -05:00
golem galvanize
5a5eb4ff59
dumped most of pokenav.s
2018-01-15 23:38:10 -05:00
Diegoisawesome
2d04eb22ab
Split rom_81370FC and port function names
2017-12-28 02:09:11 -06:00
Diegoisawesome
8bd6f9319f
Continue extraction from battle_frontier_2
2017-12-23 03:47:03 -06:00
sceptillion
3c286feec6
Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs
2017-12-22 00:17:34 -08:00
sceptillion
96511dc214
use internal song names
2017-12-22 00:10:20 -08:00
Diegoisawesome
0403f6eea9
Merge remote-tracking branch 'Egg/decompile_use_pokeblock'
2017-12-21 16:19:50 -06:00