diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2016-11-01 22:03:16 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-11-01 20:03:16 -0700 |
| commit | 69c734c9a8b7fbc405d0d6e81bf7e2bcf783883d (patch) | |
| tree | 1d137feaea05c6fd80b245d5445e1542bb1e535e /asm/link.s | |
| parent | 2db94cf5eb0fa9b505f40fa4bff4d1fe876e61fb (diff) | |
Ported libmks4agb from pokeruby (#12)
* Port agb_flash from pokeruby
* use ramscrgen
* formatting
* delete ewram_syms.txt and iwram_syms.txt
* Finish port of agb_flash
* Ported libmks4agb from pokeruby
* Reordered declarations to match pokeruby
Diffstat (limited to 'asm/link.s')
| -rw-r--r-- | asm/link.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/link.s b/asm/link.s index ed6db63fd..5a6798e59 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3342,12 +3342,12 @@ c2_800ACD4: @ 800AF30 movs r0, 0 movs r1, 0 bl SetGpuReg - ldr r0, =gUnknown_030075F0 - bl MPlayStop_rev01 - ldr r0, =gUnknown_03007630 - bl MPlayStop_rev01 - ldr r0, =gUnknown_03007800 - bl MPlayStop_rev01 + ldr r0, =gMPlay_SE1 + bl m4aMPlayStop + ldr r0, =gMPlay_SE2 + bl m4aMPlayStop + ldr r0, =gMPlay_SE3 + bl m4aMPlayStop ldr r0, =0x02000000 movs r1, 0xE0 lsls r1, 9 @@ -32621,7 +32621,7 @@ sub_801A43C: @ 801A43C bl ResetAllObjectData bl ResetTasks bl remove_some_task - bl SoundVSyncOn_rev01 + bl m4aSoundVSyncOn ldr r0, =sub_801A418 bl SetVBlankCallback ldr r0, =sub_801A6C0 |