diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-02-18 19:20:50 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-18 19:20:50 -0600 |
| commit | 2e21a867487e2187a954a351f775bd3f3a9535b1 (patch) | |
| tree | e57f9f6851404a7591cffa7bb7842d2fc6b2d8da /src/field/fldeff_flash.c | |
| parent | adac76c8370b86176a52d8ecb2e349e2be13f8ba (diff) | |
| parent | b47dffc5df147adcd241df4bf11fa161d84af4f4 (diff) | |
Merge pull request #564 from camthesaxman/decompile_debug
decompile debug code
Diffstat (limited to 'src/field/fldeff_flash.c')
| -rw-r--r-- | src/field/fldeff_flash.c | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c index 8c0f09bd9..30ddd0f6c 100644 --- a/src/field/fldeff_flash.c +++ b/src/field/fldeff_flash.c @@ -72,33 +72,15 @@ static const u16 gCaveTransitionTilemap[] = INCBIN_U16("graphics/misc/cave_trans 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"); + if (gMapHeader.cave == 1 && !FlagGet(FLAG_SYS_USE_FLASH)) + sub_810CBFC(); + else + ScriptContext2_Disable(); } + #endif bool8 SetUpFieldMove_Flash(void) |