Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 15264d8
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Thu Apr 15 07:48:32 2021 +0900

    update document

commit 29d5520
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Thu Apr 15 03:06:25 2021 +0900

    fix

commit bcfb10a
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Thu Apr 15 03:05:07 2021 +0900

    fix

commit 6a4367c
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Thu Apr 15 03:01:39 2021 +0900

    fix

commit 14ab104
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Thu Apr 15 02:00:46 2021 +0900

    fifo

commit ac62239
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Thu Apr 15 01:48:10 2021 +0900

    fix

commit bf4922e
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Wed Apr 14 12:08:59 2021 +0900

    fix

commit e1e8f16
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Wed Apr 14 11:12:04 2021 +0900

    fix

commit 7c67c19
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Wed Apr 14 08:08:42 2021 +0900

    wip

commit f32b540
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Tue Apr 13 18:25:38 2021 +0900

    fix timer bug

commit 1931e69
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Tue Apr 13 15:16:07 2021 +0900

    wip

commit dd6e43e
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Tue Apr 13 14:54:59 2021 +0900

    wip

commit 608a9a6
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Tue Apr 13 13:57:57 2021 +0900

    fix

commit 0076783
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Tue Apr 13 11:06:21 2021 +0900

    wip

commit 58066c4
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Tue Apr 13 01:06:03 2021 +0900

    wip

commit d6fad49
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Mon Apr 12 20:44:50 2021 +0900

    fix

commit 56f9f88
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Mon Apr 12 20:23:32 2021 +0900

    wip

commit ed0f085
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Sat Apr 10 10:53:05 2021 +0900

    fix

commit 76a5e7a
Author: pokemium <bluejapan73+dev@gmail.com>
Date:   Sat Apr 10 10:07:36 2021 +0900

    fix
  • Loading branch information
akatsuki105 committed Apr 14, 2021
1 parent ba03c6c commit 1c2f382
Show file tree
Hide file tree
Showing 13 changed files with 887 additions and 145 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ $ ./build/darwin-amd64/mettaur XXXX.gba

## ToDo

- [ ] Sound
- [ ] Sound DMA
- [ ] Clear sound
- [ ] Window
- [ ] Mosaic
- [ ] Blend
Expand Down
8 changes: 1 addition & 7 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,7 @@ type Emulator struct {
}

func (e *Emulator) Update() error {
defer func() {
if err := recover(); err != nil {
fmt.Fprintf(os.Stderr, "crash in emulation: %s in 0x%08x\n", err, e.gba.PC())
e.gba.Exit("")
panic("")
}
}()
defer e.gba.PanicHandler(true)
e.gba.Update()
if e.gba.DoSav && e.gba.Frame%60 == 0 {
e.writeSav()
Expand Down
5 changes: 3 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module mettaur
go 1.16

require (
github.com/anthonynsimon/bild v0.13.0 // indirect
github.com/hajimehoshi/ebiten/v2 v2.0.6
github.com/anthonynsimon/bild v0.13.0
github.com/hajimehoshi/ebiten/v2 v2.0.8
github.com/hajimehoshi/oto v0.7.1
)
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200707082815-5321531c36a2/go.mod h1:tQ2
github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY=
github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
github.com/hajimehoshi/bitmapfont/v2 v2.1.0/go.mod h1:2BnYrkTQGThpr/CY6LorYtt/zEPNzvE/ND69CRTaHMs=
github.com/hajimehoshi/ebiten/v2 v2.0.6 h1:sHNymgI+q80xasP69oFyrpup6r2qCNsKxqwsGEh6PWE=
github.com/hajimehoshi/ebiten/v2 v2.0.6/go.mod h1:uS3OjMW3f2DRDMtWoIF7yMMmrMkv+fZ6pXcwR1pfA0Y=
github.com/hajimehoshi/ebiten/v2 v2.0.8 h1:+LPEcUhsLS3swxf2LtBb2V1TO72YoGPArWPqxzXEDYI=
github.com/hajimehoshi/ebiten/v2 v2.0.8/go.mod h1:uS3OjMW3f2DRDMtWoIF7yMMmrMkv+fZ6pXcwR1pfA0Y=
github.com/hajimehoshi/file2byteslice v0.0.0-20200812174855-0e5e8a80490e/go.mod h1:CqqAHp7Dk/AqQiwuhV1yT2334qbA/tFWQW0MD2dGqUE=
github.com/hajimehoshi/go-mp3 v0.3.1/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM=
github.com/hajimehoshi/oto v0.6.1/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
github.com/hajimehoshi/oto v0.6.8/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
github.com/hajimehoshi/oto v0.7.1 h1:I7maFPz5MBCwiutOrz++DLdbr4rTzBsbBuV2VpgU9kk=
github.com/hajimehoshi/oto v0.7.1/go.mod h1:wovJ8WWMfFKvP587mhHgot/MBr4DnNy9m6EepeVGnos=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/jakecoffman/cp v1.0.0/go.mod h1:JjY/Fp6d8E1CHnu74gWNnU0+b9VzEdUVPoJxg2PsTQg=
Expand Down
Loading

0 comments on commit 1c2f382

Please sign in to comment.