diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:55:50 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:55:50 -0500 |
| commit | c28d691ff2821adcf43600a308d523fd609e12e2 (patch) | |
| tree | 5cfe618a442bb4a67b4aaef0c7f2c27d4bd3eedb /src/field/fldeff_flash.c | |
| parent | 19b0a0f3e05c73b84e5afaffb83080474774e918 (diff) | |
| parent | 6eaadfc62e89a25c2de674aebf69f077c491580f (diff) | |
Merge branch 'master' into fix_nonmatching
Diffstat (limited to 'src/field/fldeff_flash.c')
| -rw-r--r-- | src/field/fldeff_flash.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c index 22f170184..8c0f09bd9 100644 --- a/src/field/fldeff_flash.c +++ b/src/field/fldeff_flash.c @@ -71,6 +71,36 @@ static const u16 gUnknown_083F809C[] = INCBIN_U16("graphics/misc/83F809C.gbapal" static const u16 gCaveTransitionTilemap[] = INCBIN_U16("graphics/misc/cave_transition_map.bin.lz"); static const u8 gCaveTransitionTiles[] = INCBIN_U8("graphics/misc/cave_transition.4bpp.lz"); +#if DEBUG +__attribute__((naked)) +void debug_sub_8122080(void) +{ + asm("\ + push {lr}\n\ + ldr r0, ._4 @ gMapHeader\n\ + ldrb r0, [r0, #0x15]\n\ + cmp r0, #0x1\n\ + bne ._2 @cond_branch\n\ + ldr r0, ._4 + 4 @ 0x828\n\ + bl FlagGet\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._2 @cond_branch\n\ + bl sub_810CBFC\n\ + b ._3\n\ +._5:\n\ + .align 2, 0\n\ +._4:\n\ + .word gMapHeader\n\ + .word 0x828\n\ +._2:\n\ + bl ScriptContext2_Disable\n\ +._3:\n\ + pop {r0}\n\ + bx r0"); +} +#endif + bool8 SetUpFieldMove_Flash(void) { if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH)) |