diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-09 19:43:30 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-09 20:30:56 -0600 |
commit | 09e431077af3c6fe672ad8a775b58d955596b81d (patch) | |
tree | 88d2eceb1071df85b4f73b1742885127755579c6 /asm/rom6.s | |
parent | 2d3044aaa645bbad85e8e60dfe23f7f0224383ca (diff) | |
parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) |
Merge remote-tracking branch 'pret/master' into dump_maps
Diffstat (limited to 'asm/rom6.s')
-rw-r--r-- | asm/rom6.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/rom6.s b/asm/rom6.s index 5b7202873..83fbece49 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -547,7 +547,7 @@ _081358D4: thumb_func_start sub_81358F4 sub_81358F4: @ 81358F4 push {lr} - ldr r1, =sub_8059D50 + ldr r1, =SetCB2ToReshowScreenAfterMenu2 movs r0, 0x1 bl sub_81357FC pop {r0} |