commit d2ff1d7aaa268496009796ffa4bdfabc93b2dea4
Merge: 0b36af8 9152664
Author: yenatch <yenatch@gmail.com>
Date:   Fri Aug 30 16:41:35 2013 -0400

    Merge remote-tracking branch 'kanzure/master'

commit 0b36af8da526ef1389d2c08bb61d6ea5fdb41f2e
Merge: b86d0da d2333a9
Author: yenatch <yenatch@gmail.com>
Date:   Fri Aug 30 13:33:09 2013 -0700

    Merge pull request #3 from kanzure/proposed-yenatch-master
    
    Proposed merge of kanzure/master into yenatch/master

commit 9152664ca51e2c870ed89ba3c81473847c1705db
Merge: 3e5b09b b86d0da
Author: Bryan Bishop <kanzure@gmail.com>
Date:   Fri Aug 30 13:06:57 2013 -0700

    Merge pull request #177 from yenatch/split-main
    
    split out a bunch of bank 0 from main.asm

commit d2333a90c9eed0be38d722bfcd0d8b5dee0e56a7
Merge: b86d0da 3e5b09b
Author: Bryan Bishop <kanzure@gmail.com>
Date:   Fri Aug 30 14:16:50 2013 -0500

    Merge branch 'kanzure/master' into yenatch/master

commit b86d0da040448f286aa65ff5b2bacb05fff200a8
Author: yenatch <yenatch@gmail.com>
Date:   Fri Aug 30 14:21:26 2013 -0400

    less arbitrary wram clearing in game init

commit 3aabca9baa859b3761235db8cb55b52837b5f5dc
Author: yenatch <yenatch@gmail.com>
Date:   Fri Aug 30 14:20:01 2013 -0400

    remove a section def in the middle of the player struct

commit 79bcda11ad25d7363a4fcfa1df71e5cdf4d1b2b0
Author: yenatch <yenatch@gmail.com>
Date:   Fri Aug 30 04:57:32 2013 -0400

    PCItems and game init formatting

commit 320142fdda96d153d0fbb4d6de68aecdd50609dc
Author: yenatch <yenatch@gmail.com>
Date:   Fri Aug 30 00:07:51 2013 -0400

    PCItems in wram

commit 2f169fd2f9859ec3bcaacc26dc132c9b29e561cd
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 23:27:57 2013 -0400

    clean up bank 7e includes

commit fd74b4d3791b71e80e95634a6da1580014a9a4ef
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 23:27:17 2013 -0400

    move battle tower mon handling asm into battle_tower.asm

commit 7201ea8f0ac0e3dd742fde251a351c4fdc8cc395
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 23:26:01 2013 -0400

    move GiveOddEgg into odd_eggs.asm

commit c4a764ce1073e5cfc3b2045282c83beda314ca91
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 23:20:09 2013 -0400

    use more bank 0 labels in engine/scripting.asm

commit 55cd8920263afd82500f6120ef2acea95bdcd2fe
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 23:19:21 2013 -0400

    fix/add some missing function labels in bank 0

commit fb28d24bd78c7a322c4bd3129b57808c8f7cbbad
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 21:42:28 2013 -0400

    condense repeated asm with rept macros

commit 579ab1350762a553d4f61e4c3534b52e857bc682
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 20:03:46 2013 -0400

    proper labeling of common function GetSpritePalette

commit 64a6af405240dcef1fdf4b4d321d9cc2093d2fd0
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 20:02:40 2013 -0400

    condense some repetitive asm with rept macros

commit cc98fab33ed222d89bba5fa3f96641ad3c8db6fb
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 19:40:33 2013 -0400

    move VBlank interrupt label from main.asm to engine/vblank.asm

commit 2c16bc7ab9df0b341406e108ac44c09cf403f9b4
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 19:39:21 2013 -0400

    move copy asm from main.asm to engine/copy.asm

commit 04da88a285b0d43192db4ecd5d49d86e5bfeaea3
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 19:37:35 2013 -0400

    move palette asm from main.asm to engine/palettes.asm

commit 6d29673a5fe731e4705f0f11e885d89b47eec927
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 19:32:03 2013 -0400

    move time-related asm from main.asm into engine/time.asm

commit 64677555685eeeaf6d3d6ae056d93bf2348a0993
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 19:11:39 2013 -0400

    move serial asm from main.asm into engine/serial.asm

commit 2341bb148ad651ca20e09ee6e48abd16c6aaee38
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 19:10:06 2013 -0400

    move more joypad code from main.asm into engine/joypad.asm

commit dd11c22b316681b0c6e5dac69d519439163efc53
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 19:08:25 2013 -0400

    more joypad function cleanup

commit 0a829301ae610f855c29e3288ac59dde8730fa20
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 18:58:38 2013 -0400

    reformat some joypad functions

commit 906496e10735bb7ad6b4b5de9802b3021aebaf28
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 18:52:16 2013 -0400

    split lcd functions out of main.asm

commit 2b5b6f3e3a1375066371beecb7e14ae9be1ae626
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 18:50:59 2013 -0400

    split fading functions out of main.asm

commit 37a841797e3f36c6a1155e4310d232057c192107
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 16:03:18 2013 -0400

    secret ruins of alph water stone room asm

commit ae1d50c0262ff63557929dea47d6c20c2651d1ba
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 15:24:37 2013 -0400

    warp sound effects in field moves

commit a167620109f5a71503e11fc43bbfef7686cf74b6
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 14:49:07 2013 -0400

    more field move scripts and some map header references

commit 1a5f9426c8fad04abad2ed2c39956f4dae4d7980
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 03:20:46 2013 -0400

    get rid of a trailing incbin at the end of bank 21

commit 99760c2cc99b6e235b490ec5a9b8599adce20bfa
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 03:04:23 2013 -0400

    more hlcoords in bank 1

commit 9d1a6fe5bbf342434037bbd28d6e9133aa9eb39d
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 02:53:04 2013 -0400

    more field move scripts

commit a4b69a123fcaa11128104ac6cb93a5ca08d22951
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 02:23:29 2013 -0400

    more text_jumps in known functions

commit eff81fb0807b55180c32e7529171404f1ff36408
Author: yenatch <yenatch@gmail.com>
Date:   Thu Aug 29 02:10:32 2013 -0400

    fix Stack's address ($c100 -> $c0ff)
    
    using negative ds