summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-07fixing merge conflictsgolem galvanize
2018-12-07Use normal apostrophes like adultsMelody
2018-12-07Tabs -> spaces & align in include/nullableVoidPtr
2018-12-07Realign comments, clean tables in pokemon_animation.c and use ↵nullableVoidPtr
SPECIES_OLD_UNOWN_ defines
2018-12-06pushing so I can mergegolem galvanize
2018-12-06Merge pull request #427 from Slawter666/pokedexDiegoisawesome
Document some more of pokedex.c
2018-12-06Merge pull request #428 from melthelesbian/pokedex_documentationDiegoisawesome
document pokédex options
2018-12-06Remove uses of INVALID_ defines, clean up some arrays with constants, and ↵nullableVoidPtr
spaces -> tabs
2018-12-06Fix sym_ indentationnullableVoidPtr
2018-12-06Fix alloc.c as per #386, define INVALID_ constants and rename malloc to ↵nullableVoidPtr
alloc as per #325 Some of the INVALID_ are likely erroneously placed, due to lack of documentation
2018-12-05Merge pull request #4 from DizzyEggg/help_garakgarak
Finish porting battle frontier data
2018-12-05Finish porting battle frontier dataDizzyEggg
2018-12-05Merge branch 'frontier_data_1' of https://github.com/garakmon/pokeemerald ↵DizzyEggg
into help_garak
2018-12-05document pokédex optionsMelody
2018-12-05Document some more of pokedex.cSlawter666
2018-12-04Merge pull request #426 from DizzyEggg/patch-1Diegoisawesome
Match and clean rotating_gate.c
2018-12-04extern gTower trainer datagarak
2018-12-04finish battle tower data except sRubyFacilityClassToEmeraldgarak
2018-12-03update frontier class namesgarak
2018-12-03fix merge conflictsgarak
2018-12-03remove frontier asm constants to fix buildgarak
2018-12-03Match and clean rotating_gate.cDizzyEggg
One more down, many more to go.
2018-12-03Merge pull request #425 from DizzyEggg/patch-1Diegoisawesome
Match battle_tower.c function
2018-12-03Match battle_tower.c functionDizzyEggg
For some reason, I gave the function of type void, type u16 instead, which messed up the registers, LMAO
2018-12-03Merge pull request #424 from DizzyEggg/labelsDiegoisawesome
Clean up src/data
2018-12-03tabsDizzyEggg
2018-12-03Fix merge conflictsDizzyEggg
2018-12-03Merge pull request #423 from Slawter666/pokedex-docDiegoisawesome
Document some of pokedex.c
2018-12-03Merge pull request #421 from melthelesbian/trainer_class_lookupsDiegoisawesome
clean up trainer class lookups
2018-12-03Clean up safari zoneDizzyEggg
2018-12-03Clean up roamerDizzyEggg
2018-12-03Add battle controllers var to src from sym_ewramDizzyEggg
2018-12-03Get rid of headers in src/dataDizzyEggg
2018-12-03Document some of pokedex.cSlawter666
2018-12-03Make data easier to editDizzyEggg
2018-12-03index trainer front anims ptr tableMelody
2018-12-03tweak alignmentMelody
2018-12-03fix brendan/may/wally consistency issuesMelody
2018-12-03Clean up items dataDizzyEggg
2018-12-03tweak alignmentMelody
2018-12-02begin batle tower datagarak
2018-12-02add more consistent namesMelody
2018-12-02index trainer class lookupsMelody
2018-12-02Merge pull request #419 from melthelesbian/trainerbattle_macro_cleanupDiegoisawesome
cleans up trainer battle scripts
2018-12-02adds req for macro argumentsMelody
2018-12-02trainerbattle_normal → trainerbattle_singleMelody
* trainerbattle_normal → trainerbattle_single * TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE * improves the macro documentation a little
2018-12-02cleans up trainer battle scriptsMelody
* adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro
2018-12-02Merge pull request #420 from DizzyEggg/boredDiegoisawesome
Get rid of static functions in includ and add req macro arguments
2018-12-02Merge with masterDizzyEggg
2018-12-02Merge pull request #417 from melthelesbian/msgbox_documentationDiegoisawesome
adds constants, cleans up callstd and msgbox code