diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-04 22:22:52 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-04 22:22:52 -0500 |
| commit | 3ded09ef5dc1ab7af6d786cf34dd881ae8da3114 (patch) | |
| tree | bd95919752454c4e6941e555e8bc403c0d2e7445 /main.asm | |
| parent | 0fe8e003e4e0423a5eb016b093120429ce29ba51 (diff) | |
| parent | 32265fb71ba95632e06e403e2222c783378d1d9d (diff) | |
Merge branch 'use-pokemontools' into master
Conflicts:
extras
extras/analyze_incbins.py
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -106,7 +106,7 @@ SECTION "romheader",ROM0[$100] nop jp Start -Section "start",ROM0[$150] +SECTION "start",ROM0[$150] Start: ; 0150 (0:0150) cp $11 ; value that indicates Gameboy Color jr z,.gbcDetected |