aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm (follow)
Commit message (Expand)AuthorAgeFilesLines
* Cleaned hardcoded pointers related to pokecenter texts and OT names.Marcus Huderle2013-12-221-61/+61
* Cleaned map connections with macros.Marcus Huderle2013-12-201-717/+78
* Fishing Rod Graphics properties INCBIN.Marcus Huderle2013-12-191-3/+11
* Nidorino's intro fight animation INCBIN.Marcus Huderle2013-12-161-23/+71
* Stat modifier ratios INCBIN.Marcus Huderle2013-12-161-7/+20
* INCBIN for enemy mon's battle HUD tiles.Marcus Huderle2013-12-161-3/+6
* INCBIN for several tiles used in the player's battle HUD.Marcus Huderle2013-12-161-3/+6
* WildMonEncounterSlotChances INCBIN.Marcus Huderle2013-12-161-3/+16
* CutTreeBlockSwaps INCBIN.Marcus Huderle2013-12-161-3/+14
* CutTreeAnimationOffsets INCBIN.Marcus Huderle2013-12-161-9/+19
* Labeled GetMonFieldMoves function.Marcus Huderle2013-12-151-2/+2
* FieldMoveDisplayData INCBIN.Marcus Huderle2013-12-151-5/+21
* Merged and fixed incbin conflicts with Danny.Marcus Huderle2013-12-151-4776/+10319
|\
| * incbin killing part 2U-Fish-PC\Daniel2013-12-151-422/+1123
| * incbin killingU-Fish-PC\Daniel2013-12-141-328/+1272
| * Yet Another Map Script CommitU-Fish-PC\Daniel2013-12-121-23/+85
| * Move slot machine constantsU-Fish-PC\Daniel2013-12-111-0/+7
| * Disassemble Slot Machine and OthersU-Fish-PC\Daniel2013-12-111-79/+1242
| * Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel2013-12-101-1677/+1677
| |\
| | * finish off wram labels and fix up mistaken label overloadsyenatch2013-12-081-19/+19
| | * wram labels and clarify safari zone step counteryenatch2013-12-081-9/+9
| | * more wram labelsyenatch2013-12-081-104/+104
| | * Merge remote-tracking branch 'iimarckus/master' into crystal-makefileyenatch2013-12-071-2265/+4840
| | |\
| | * | INCLUDE .asm instead of .txyenatch2013-12-071-381/+381
| | * | split wram/hram out of constants.asm and start using wram sectionsyenatch2013-12-051-1137/+1137
| * | | Misc clean upU-Fish-PC\Daniel2013-12-091-126/+230
| | |/ | |/|
| * | IshiharaTeamU-Fish-PC\Daniel2013-11-261-6/+20
| * | FlyWarp dataU-Fish-PC\Daniel2013-11-261-43/+74
| * | Evem more map scriptsU-Fish-PC\Daniel2013-11-261-1612/+2933
| * | Complete Map ScriptsU-Fish-PC\Daniel2013-11-241-343/+1028
| * | Unincbin more map scriptsU-Fish-PC\Daniel2013-11-171-180/+501
| * | Add OAM dataU-Fish-PC\Daniel2013-11-161-12/+40
| * | Dissasemble and clean upU-Fish-PC\Daniel2013-11-151-30/+134
| * | Disassemble incbinned predef routinesU-Fish-PC\Daniel2013-11-151-17/+117
| * | Add labels to PredefPointers:U-Fish-PC\Daniel2013-11-121-86/+100
* | | Nicknaming screen loads the 'ED' symbol separately.Marcus Huderle2013-12-051-3/+4
* | | Cleaned up TitleScreenPokemonLogoYScrolls to use base-10 numbers.Marcus Huderle2013-12-051-8/+8
* | | FlyWarp data for maps in which you fall down holes.Marcus Huderle2013-12-051-6/+38
* | | Cable Club NPC Text labels.Marcus Huderle2013-12-051-31/+31
* | | Vending Machine routine and texts.Marcus Huderle2013-12-051-35/+36
* | | BattleCenter and TradeCenter warp data specs. Also renamed FirstMapSpec to Fi...Marcus Huderle2013-12-051-15/+39
* | | Title screen pokemon logo bouncing effect.Marcus Huderle2013-12-051-7/+17
|/ /
* / remove more redundant addressesU-Fish-PC\Daniel2013-11-091-72/+29
|/
* Merge branch 'master' of https://github.com/Sanky/pokeredIIMarckus2013-11-011-151/+169
|\
| * Merge remote-tracking branch 'kanzure/master' into mergetasticSanky2013-10-211-13259/+49071
| |\
| * | AskForMonNicknameSanky2013-07-041-4/+56
| * | FaintEnemyPokemonSanky2013-07-041-4/+114
| * | Disasm code which draws tiny party pokémon symbols in-battle.Sanky2013-07-031-1/+100
| * | Some Bill's PC stuffSanky2013-07-011-40/+200
* | | All INCBIN baserom.gbcs begin with \n and all INCBINs of gfx etc begin with \tU-Fish-PC\Daniel2013-11-011-34/+34