diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | asm/lottery_corner.s | 389 | ||||
| -rw-r--r-- | asm/rom_813BA94.s | 380 | ||||
| -rw-r--r-- | ld_script.txt | 1 |
4 files changed, 391 insertions, 381 deletions
@@ -55,7 +55,7 @@ asm/party_menu.o asm/rom_806D7F8.o asm/wild_encounter.o asm/rom_80859BC.o \ asm/field_effect.o asm/title_screen.o asm/rom_807C828.o \ asm/rom_806936C.o asm/clear_save_data_menu.o asm/rom_8148B8C.o \ asm/mystery_event_menu.o asm/save_failed_screen.o asm/rom_81473B8.o \ -asm/diploma.o asm/berry_tag_screen.o +asm/diploma.o asm/berry_tag_screen.o asm/lottery_corner.o DATA_ASM_OBJS := data/data2.o data/graphics.o data/sound_data.o \ data/event_scripts.o data/battle_anim_scripts.o \ diff --git a/asm/lottery_corner.s b/asm/lottery_corner.s new file mode 100644 index 000000000..8e1b473a3 --- /dev/null +++ b/asm/lottery_corner.s @@ -0,0 +1,389 @@ + .include "constants/gba_constants.s" + .include "constants/species_constants.s" + .include "asm/macros.s" + + .syntax unified + + .text + + thumb_func_start sub_8145A78 +sub_8145A78: @ 8145A78 + push {r4,lr} + bl Random + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + bl Random + lsls r0, 16 + orrs r0, r4 + bl sub_8145D14 + ldr r0, _08145AA0 + movs r1, 0 + bl VarSet + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_08145AA0: .4byte 0x00004045 + thumb_func_end sub_8145A78 + + thumb_func_start sub_8145AA4 +sub_8145AA4: @ 8145AA4 + push {r4,r5,lr} + lsls r0, 16 + lsrs r4, r0, 16 + bl Random + lsls r0, 16 + lsrs r1, r0, 16 + subs r0, r4, 0x1 + lsls r0, 16 + lsrs r4, r0, 16 + ldr r0, _08145AE0 + cmp r4, r0 + beq _08145AD4 + ldr r5, _08145AE4 + ldr r3, _08145AE8 + adds r2, r0, 0 +_08145AC4: + adds r0, r1, 0 + muls r0, r5 + adds r1, r0, r3 + subs r0, r4, 0x1 + lsls r0, 16 + lsrs r4, r0, 16 + cmp r4, r2 + bne _08145AC4 +_08145AD4: + adds r0, r1, 0 + bl sub_8145D14 + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_08145AE0: .4byte 0x0000ffff +_08145AE4: .4byte 0x41c64e6d +_08145AE8: .4byte 0x00003039 + thumb_func_end sub_8145AA4 + + thumb_func_start sub_8145AEC +sub_8145AEC: @ 8145AEC + push {lr} + bl sub_8145D3C + ldr r1, _08145AFC + strh r0, [r1] + pop {r0} + bx r0 + .align 2, 0 +_08145AFC: .4byte gScriptResult + thumb_func_end sub_8145AEC + + thumb_func_start sub_8145B00 +sub_8145B00: @ 8145B00 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + ldr r1, _08145C24 + movs r0, 0 + strh r0, [r1] + movs r0, 0 + mov r10, r0 + mov r9, r0 + movs r6, 0 +_08145B18: + movs r0, 0x64 + adds r1, r6, 0 + muls r1, r0 + ldr r0, _08145C28 + adds r4, r1, r0 + adds r0, r4, 0 + movs r1, 0xB + bl GetMonData + cmp r0, 0 + beq _08145B74 + adds r0, r4, 0 + movs r1, 0x2D + bl GetMonData + cmp r0, 0 + bne _08145B6A + adds r0, r4, 0 + movs r1, 0x1 + bl GetMonData + adds r1, r0, 0 + ldr r0, _08145C2C + ldrh r0, [r0] + lsls r1, 16 + lsrs r1, 16 + bl sub_8145C8C + lsls r0, 24 + lsrs r0, 24 + ldr r1, _08145C24 + ldrh r2, [r1] + cmp r0, r2 + bls _08145B6A + cmp r0, 0x1 + bls _08145B6A + subs r0, 0x1 + strh r0, [r1] + movs r0, 0xE + mov r9, r0 + mov r10, r6 +_08145B6A: + adds r0, r6, 0x1 + lsls r0, 16 + lsrs r6, r0, 16 + cmp r6, 0x5 + bls _08145B18 +_08145B74: + movs r6, 0 +_08145B76: + movs r5, 0 + adds r1, r6, 0x1 + mov r8, r1 + lsls r0, r6, 2 + adds r7, r0, r6 +_08145B80: + lsls r2, r7, 4 + subs r2, r7 + lsls r2, 5 + lsls r0, r5, 2 + adds r0, r5 + lsls r0, 4 + ldr r1, _08145C30 + adds r0, r1 + adds r4, r2, r0 + adds r0, r4, 0 + movs r1, 0xB + bl GetBoxMonData + cmp r0, 0 + beq _08145BD8 + adds r0, r4, 0 + movs r1, 0x2D + bl GetBoxMonData + cmp r0, 0 + bne _08145BD8 + adds r0, r4, 0 + movs r1, 0x1 + bl GetBoxMonData + adds r1, r0, 0 + ldr r0, _08145C2C + ldrh r0, [r0] + lsls r1, 16 + lsrs r1, 16 + bl sub_8145C8C + lsls r0, 24 + lsrs r0, 24 + ldr r1, _08145C24 + ldrh r2, [r1] + cmp r0, r2 + bls _08145BD8 + cmp r0, 0x1 + bls _08145BD8 + subs r0, 0x1 + strh r0, [r1] + mov r9, r6 + mov r10, r5 +_08145BD8: + adds r0, r5, 0x1 + lsls r0, 16 + lsrs r5, r0, 16 + cmp r5, 0x1D + bls _08145B80 + mov r1, r8 + lsls r0, r1, 16 + lsrs r6, r0, 16 + cmp r6, 0xD + bls _08145B76 + ldr r3, _08145C24 + ldrh r0, [r3] + cmp r0, 0 + beq _08145C72 + ldr r2, _08145C34 + ldr r1, _08145C38 + subs r0, 0x1 + lsls r0, 1 + adds r0, r1 + ldrh r0, [r0] + strh r0, [r2] + mov r2, r9 + cmp r2, 0xE + bne _08145C44 + ldr r1, _08145C3C + movs r0, 0 + strh r0, [r1] + movs r0, 0x64 + mov r1, r10 + muls r1, r0 + adds r0, r1, 0 + ldr r1, _08145C28 + adds r0, r1 + ldr r2, _08145C40 + movs r1, 0x2 + bl GetMonData + b _08145C6C + .align 2, 0 +_08145C24: .4byte gUnknown_0202E8CC +_08145C28: .4byte gPlayerParty +_08145C2C: .4byte gScriptResult +_08145C30: .4byte gUnknown_020300A4 +_08145C34: .4byte gUnknown_0202E8CE +_08145C38: .4byte gUnknown_0840CB04 +_08145C3C: .4byte gUnknown_0202E8D0 +_08145C40: .4byte gStringVar1 +_08145C44: + ldr r1, _08145C80 + movs r0, 0x1 + strh r0, [r1] + mov r2, r9 + lsls r1, r2, 2 + add r1, r9 + lsls r0, r1, 4 + subs r0, r1 + lsls r0, 5 + mov r2, r10 + lsls r1, r2, 2 + add r1, r10 + lsls r1, 4 + ldr r2, _08145C84 + adds r1, r2 + adds r0, r1 + ldr r2, _08145C88 + movs r1, 0x2 + bl GetBoxMonData +_08145C6C: + ldr r0, _08145C88 + bl StringGetEnd10 +_08145C72: + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_08145C80: .4byte gUnknown_0202E8D0 +_08145C84: .4byte gUnknown_020300A4 +_08145C88: .4byte gStringVar1 + thumb_func_end sub_8145B00 + + thumb_func_start sub_8145C8C +sub_8145C8C: @ 8145C8C + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + lsls r0, 16 + lsrs r6, r0, 16 + lsls r1, 16 + lsrs r5, r1, 16 + movs r0, 0 + mov r8, r0 + movs r7, 0 + ldr r1, _08145D0C + mov r10, r1 + ldr r0, _08145D10 + mov r9, r0 +_08145CAC: + adds r0, r6, 0 + movs r1, 0xA + bl __umodsi3 + adds r4, r0, 0 + mov r1, r10 + strh r4, [r1] + adds r0, r5, 0 + movs r1, 0xA + bl __umodsi3 + mov r1, r9 + strh r0, [r1] + lsls r4, 16 + lsls r0, 16 + cmp r4, r0 + bne _08145CFA + adds r0, r6, 0 + movs r1, 0xA + bl __udivsi3 + lsls r0, 16 + lsrs r6, r0, 16 + adds r0, r5, 0 + movs r1, 0xA + bl __udivsi3 + lsls r0, 16 + lsrs r5, r0, 16 + mov r0, r8 + adds r0, 0x1 + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + adds r0, r7, 0x1 + lsls r0, 24 + lsrs r7, r0, 24 + cmp r7, 0x4 + bls _08145CAC +_08145CFA: + mov r0, r8 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r1} + bx r1 + .align 2, 0 +_08145D0C: .4byte gUnknown_02039328 +_08145D10: .4byte gUnknown_0203932A + thumb_func_end sub_8145C8C + + thumb_func_start sub_8145D14 +sub_8145D14: @ 8145D14 + push {r4,lr} + adds r1, r0, 0 + lsrs r4, r1, 16 + lsls r1, 16 + lsrs r1, 16 + ldr r0, _08145D34 + bl VarSet + ldr r0, _08145D38 + adds r1, r4, 0 + bl VarSet + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_08145D34: .4byte 0x0000404b +_08145D38: .4byte 0x0000404c + thumb_func_end sub_8145D14 + + thumb_func_start sub_8145D3C +sub_8145D3C: @ 8145D3C + push {r4,lr} + ldr r0, _08145D5C + bl VarGet + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r0, _08145D60 + bl VarGet + lsls r0, 16 + orrs r0, r4 + pop {r4} + pop {r1} + bx r1 + .align 2, 0 +_08145D5C: .4byte 0x0000404b +_08145D60: .4byte 0x0000404c + thumb_func_end sub_8145D3C + + thumb_func_start unref_sub_8145D64 +unref_sub_8145D64: @ 8145D64 + push {lr} + lsls r0, 16 + lsrs r0, 16 + bl sub_8145D14 + pop {r0} + bx r0 + thumb_func_end unref_sub_8145D64 + + .align 2, 0 @ Don't pad with nop. diff --git a/asm/rom_813BA94.s b/asm/rom_813BA94.s index 5872d8a75..ad114e87e 100644 --- a/asm/rom_813BA94.s +++ b/asm/rom_813BA94.s @@ -20256,384 +20256,4 @@ _08145A62: bx r0 thumb_func_end sub_81458DC - thumb_func_start sub_8145A78 -sub_8145A78: @ 8145A78 - push {r4,lr} - bl Random - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - bl Random - lsls r0, 16 - orrs r0, r4 - bl sub_8145D14 - ldr r0, _08145AA0 - movs r1, 0 - bl VarSet - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08145AA0: .4byte 0x00004045 - thumb_func_end sub_8145A78 - - thumb_func_start sub_8145AA4 -sub_8145AA4: @ 8145AA4 - push {r4,r5,lr} - lsls r0, 16 - lsrs r4, r0, 16 - bl Random - lsls r0, 16 - lsrs r1, r0, 16 - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, _08145AE0 - cmp r4, r0 - beq _08145AD4 - ldr r5, _08145AE4 - ldr r3, _08145AE8 - adds r2, r0, 0 -_08145AC4: - adds r0, r1, 0 - muls r0, r5 - adds r1, r0, r3 - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, r2 - bne _08145AC4 -_08145AD4: - adds r0, r1, 0 - bl sub_8145D14 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08145AE0: .4byte 0x0000ffff -_08145AE4: .4byte 0x41c64e6d -_08145AE8: .4byte 0x00003039 - thumb_func_end sub_8145AA4 - - thumb_func_start sub_8145AEC -sub_8145AEC: @ 8145AEC - push {lr} - bl sub_8145D3C - ldr r1, _08145AFC - strh r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08145AFC: .4byte gScriptResult - thumb_func_end sub_8145AEC - - thumb_func_start sub_8145B00 -sub_8145B00: @ 8145B00 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r1, _08145C24 - movs r0, 0 - strh r0, [r1] - movs r0, 0 - mov r10, r0 - mov r9, r0 - movs r6, 0 -_08145B18: - movs r0, 0x64 - adds r1, r6, 0 - muls r1, r0 - ldr r0, _08145C28 - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - cmp r0, 0 - beq _08145B74 - adds r0, r4, 0 - movs r1, 0x2D - bl GetMonData - cmp r0, 0 - bne _08145B6A - adds r0, r4, 0 - movs r1, 0x1 - bl GetMonData - adds r1, r0, 0 - ldr r0, _08145C2C - ldrh r0, [r0] - lsls r1, 16 - lsrs r1, 16 - bl sub_8145C8C - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08145C24 - ldrh r2, [r1] - cmp r0, r2 - bls _08145B6A - cmp r0, 0x1 - bls _08145B6A - subs r0, 0x1 - strh r0, [r1] - movs r0, 0xE - mov r9, r0 - mov r10, r6 -_08145B6A: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x5 - bls _08145B18 -_08145B74: - movs r6, 0 -_08145B76: - movs r5, 0 - adds r1, r6, 0x1 - mov r8, r1 - lsls r0, r6, 2 - adds r7, r0, r6 -_08145B80: - lsls r2, r7, 4 - subs r2, r7 - lsls r2, 5 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 4 - ldr r1, _08145C30 - adds r0, r1 - adds r4, r2, r0 - adds r0, r4, 0 - movs r1, 0xB - bl GetBoxMonData - cmp r0, 0 - beq _08145BD8 - adds r0, r4, 0 - movs r1, 0x2D - bl GetBoxMonData - cmp r0, 0 - bne _08145BD8 - adds r0, r4, 0 - movs r1, 0x1 - bl GetBoxMonData - adds r1, r0, 0 - ldr r0, _08145C2C - ldrh r0, [r0] - lsls r1, 16 - lsrs r1, 16 - bl sub_8145C8C - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08145C24 - ldrh r2, [r1] - cmp r0, r2 - bls _08145BD8 - cmp r0, 0x1 - bls _08145BD8 - subs r0, 0x1 - strh r0, [r1] - mov r9, r6 - mov r10, r5 -_08145BD8: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1D - bls _08145B80 - mov r1, r8 - lsls r0, r1, 16 - lsrs r6, r0, 16 - cmp r6, 0xD - bls _08145B76 - ldr r3, _08145C24 - ldrh r0, [r3] - cmp r0, 0 - beq _08145C72 - ldr r2, _08145C34 - ldr r1, _08145C38 - subs r0, 0x1 - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - mov r2, r9 - cmp r2, 0xE - bne _08145C44 - ldr r1, _08145C3C - movs r0, 0 - strh r0, [r1] - movs r0, 0x64 - mov r1, r10 - muls r1, r0 - adds r0, r1, 0 - ldr r1, _08145C28 - adds r0, r1 - ldr r2, _08145C40 - movs r1, 0x2 - bl GetMonData - b _08145C6C - .align 2, 0 -_08145C24: .4byte gUnknown_0202E8CC -_08145C28: .4byte gPlayerParty -_08145C2C: .4byte gScriptResult -_08145C30: .4byte gUnknown_020300A4 -_08145C34: .4byte gUnknown_0202E8CE -_08145C38: .4byte gUnknown_0840CB04 -_08145C3C: .4byte gUnknown_0202E8D0 -_08145C40: .4byte gStringVar1 -_08145C44: - ldr r1, _08145C80 - movs r0, 0x1 - strh r0, [r1] - mov r2, r9 - lsls r1, r2, 2 - add r1, r9 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - mov r2, r10 - lsls r1, r2, 2 - add r1, r10 - lsls r1, 4 - ldr r2, _08145C84 - adds r1, r2 - adds r0, r1 - ldr r2, _08145C88 - movs r1, 0x2 - bl GetBoxMonData -_08145C6C: - ldr r0, _08145C88 - bl StringGetEnd10 -_08145C72: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08145C80: .4byte gUnknown_0202E8D0 -_08145C84: .4byte gUnknown_020300A4 -_08145C88: .4byte gStringVar1 - thumb_func_end sub_8145B00 - - thumb_func_start sub_8145C8C -sub_8145C8C: @ 8145C8C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 16 - lsrs r6, r0, 16 - lsls r1, 16 - lsrs r5, r1, 16 - movs r0, 0 - mov r8, r0 - movs r7, 0 - ldr r1, _08145D0C - mov r10, r1 - ldr r0, _08145D10 - mov r9, r0 -_08145CAC: - adds r0, r6, 0 - movs r1, 0xA - bl __umodsi3 - adds r4, r0, 0 - mov r1, r10 - strh r4, [r1] - adds r0, r5, 0 - movs r1, 0xA - bl __umodsi3 - mov r1, r9 - strh r0, [r1] - lsls r4, 16 - lsls r0, 16 - cmp r4, r0 - bne _08145CFA - adds r0, r6, 0 - movs r1, 0xA - bl __udivsi3 - lsls r0, 16 - lsrs r6, r0, 16 - adds r0, r5, 0 - movs r1, 0xA - bl __udivsi3 - lsls r0, 16 - lsrs r5, r0, 16 - mov r0, r8 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x4 - bls _08145CAC -_08145CFA: - mov r0, r8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08145D0C: .4byte gUnknown_02039328 -_08145D10: .4byte gUnknown_0203932A - thumb_func_end sub_8145C8C - - thumb_func_start sub_8145D14 -sub_8145D14: @ 8145D14 - push {r4,lr} - adds r1, r0, 0 - lsrs r4, r1, 16 - lsls r1, 16 - lsrs r1, 16 - ldr r0, _08145D34 - bl VarSet - ldr r0, _08145D38 - adds r1, r4, 0 - bl VarSet - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08145D34: .4byte 0x0000404b -_08145D38: .4byte 0x0000404c - thumb_func_end sub_8145D14 - - thumb_func_start sub_8145D3C -sub_8145D3C: @ 8145D3C - push {r4,lr} - ldr r0, _08145D5C - bl VarGet - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, _08145D60 - bl VarGet - lsls r0, 16 - orrs r0, r4 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08145D5C: .4byte 0x0000404b -_08145D60: .4byte 0x0000404c - thumb_func_end sub_8145D3C - - thumb_func_start unref_sub_8145D64 -unref_sub_8145D64: @ 8145D64 - push {lr} - lsls r0, 16 - lsrs r0, 16 - bl sub_8145D14 - pop {r0} - bx r0 - thumb_func_end unref_sub_8145D64 - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index 174b476c4..ff60b837e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -98,6 +98,7 @@ SECTIONS { asm/rom_81258BC.o(.text); src/intro.o(.text); asm/rom_813BA94.o(.text); + asm/lottery_corner.o(.text); asm/diploma.o(.text); asm/berry_tag_screen.o(.text); asm/mystery_event_menu.o(.text); |