nepenutpriorityfix.asm

; Prevents Nep-Enut/Gargantua Blargg (sprite 0A5) from overwriting layer 1's priority

; Warning: with this patch, the eye sprites are displayed in front of layer 1
;  (visible in vanilla 2-3's Nep-Enut room)

.gba
.open "sma3.gba", "sma3-nepenutfix.gba", 0x08000000

; Nep-Enut code: replace hardcoded sublevel 03 check
.org 0x08057B62
.area @AreaEnd-org()
    ldr r2,=0x030069CE
    ldrh r0,[r2]        ; layer 3 control register
    mov r1,1            ;\
    bic r0,r1           ;| set layer 3 priority to 2
    mov r1,2            ;| (clear bit 0, set bit 1)
    orr r0,r1           ;/
    strh r0,[r2]
    b @Return
    .pool
.endarea

; overwrite remaining vanilla code
    .fill @AreaEnd-org()
.org 0x08057B94
@AreaEnd:

.org 0x08057BAC         ; area to clear includes last 5 .pool entries
    .fill @Return-org()
.org 0x08057BE8
@Return:

.close