diff options
95 files changed, 2437 insertions, 2381 deletions
@@ -84,9 +84,10 @@ tidy: include graphics_file_rules.mk %.s: ; -%.bin: ; %.png: ; %.pal: ; +%.aif: ; + %.1bpp: %.png ; $(GFX) $< $@ %.4bpp: %.png ; $(GFX) $< $@ %.8bpp: %.png ; $(GFX) $< $@ diff --git a/asm/birch_pc.s b/asm/birch_pc.s new file mode 100644 index 000000000..6665d9beb --- /dev/null +++ b/asm/birch_pc.s @@ -0,0 +1,234 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start ScriptGetPokedexInfo +ScriptGetPokedexInfo: @ 8137A4C + push {lr} + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + cmp r0, 0 + bne _08137A70 + movs r0, 0 + bl sub_80C0844 + ldr r1, =gSpecialVar_0x8005 + strh r0, [r1] + movs r0, 0x1 + bl sub_80C0844 + b _08137A80 + .pool +_08137A70: + movs r0, 0 + bl pokedex_count + ldr r1, =gSpecialVar_0x8005 + strh r0, [r1] + movs r0, 0x1 + bl pokedex_count +_08137A80: + ldr r1, =gSpecialVar_0x8006 + strh r0, [r1] + bl IsNationalPokedexEnabled + lsls r0, 16 + lsrs r0, 16 + pop {r1} + bx r1 + .pool + thumb_func_end ScriptGetPokedexInfo + + thumb_func_start GetPokedexRatingText +GetPokedexRatingText: @ 8137A98 + push {lr} + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x9 + bhi _08137AA4 + b _08137BFC +_08137AA4: + cmp r0, 0x13 + bhi _08137AB0 + ldr r0, =gUnknown_082A5DAB + b _08137C06 + .pool +_08137AB0: + cmp r0, 0x1D + bhi _08137ABC + ldr r0, =gUnknown_082A5DF1 + b _08137C06 + .pool +_08137ABC: + cmp r0, 0x27 + bhi _08137AC8 + ldr r0, =gUnknown_082A5E34 + b _08137C06 + .pool +_08137AC8: + cmp r0, 0x31 + bhi _08137AD4 + ldr r0, =gUnknown_082A5E83 + b _08137C06 + .pool +_08137AD4: + cmp r0, 0x3B + bhi _08137AE0 + ldr r0, =gUnknown_082A5EB9 + b _08137C06 + .pool +_08137AE0: + cmp r0, 0x45 + bhi _08137AEC + ldr r0, =gUnknown_082A5EF4 + b _08137C06 + .pool +_08137AEC: + cmp r0, 0x4F + bhi _08137AF8 + ldr r0, =gUnknown_082A5F39 + b _08137C06 + .pool +_08137AF8: + cmp r0, 0x59 + bhi _08137B04 + ldr r0, =gUnknown_082A5F82 + b _08137C06 + .pool +_08137B04: + cmp r0, 0x63 + bhi _08137B10 + ldr r0, =gUnknown_082A5FB9 + b _08137C06 + .pool +_08137B10: + cmp r0, 0x6D + bhi _08137B1C + ldr r0, =gUnknown_082A6018 + b _08137C06 + .pool +_08137B1C: + cmp r0, 0x77 + bhi _08137B28 + ldr r0, =gUnknown_082A6061 + b _08137C06 + .pool +_08137B28: + cmp r0, 0x81 + bhi _08137B34 + ldr r0, =gUnknown_082A609C + b _08137C06 + .pool +_08137B34: + cmp r0, 0x8B + bhi _08137B40 + ldr r0, =gUnknown_082A60D5 + b _08137C06 + .pool +_08137B40: + cmp r0, 0x95 + bhi _08137B4C + ldr r0, =gUnknown_082A6124 + b _08137C06 + .pool +_08137B4C: + cmp r0, 0x9F + bhi _08137B58 + ldr r0, =gUnknown_082A616F + b _08137C06 + .pool +_08137B58: + cmp r0, 0xA9 + bhi _08137B64 + ldr r0, =gUnknown_082A61D6 + b _08137C06 + .pool +_08137B64: + cmp r0, 0xB3 + bhi _08137B70 + ldr r0, =gUnknown_082A623A + b _08137C06 + .pool +_08137B70: + cmp r0, 0xBD + bhi _08137B7C + ldr r0, =gUnknown_082A6287 + b _08137C06 + .pool +_08137B7C: + cmp r0, 0xC7 + bls _08137BEA + cmp r0, 0xC8 + bne _08137BB8 + ldr r0, =0x00000199 + bl SpeciesToNationalPokedexNum + lsls r0, 16 + lsrs r0, 16 + movs r1, 0x1 + bl GetSetPokedexFlag + lsls r0, 24 + cmp r0, 0 + bne _08137BEA + movs r0, 0xCD + lsls r0, 1 + bl SpeciesToNationalPokedexNum + lsls r0, 16 + lsrs r0, 16 + movs r1, 0x1 + bl GetSetPokedexFlag + lsls r0, 24 + cmp r0, 0 + bne _08137BEA + b _08137C04 + .pool +_08137BB8: + cmp r0, 0xC9 + bne _08137BF8 + ldr r0, =0x00000199 + bl SpeciesToNationalPokedexNum + lsls r0, 16 + lsrs r0, 16 + movs r1, 0x1 + bl GetSetPokedexFlag + lsls r0, 24 + cmp r0, 0 + beq _08137C04 + movs r0, 0xCD + lsls r0, 1 + bl SpeciesToNationalPokedexNum + lsls r0, 16 + lsrs r0, 16 + movs r1, 0x1 + bl GetSetPokedexFlag + lsls r0, 24 + cmp r0, 0 + beq _08137C04 +_08137BEA: + ldr r0, =gUnknown_082A62C9 + b _08137C06 + .pool +_08137BF8: + cmp r0, 0xCA + beq _08137C04 +_08137BFC: + ldr r0, =gUnknown_082A5D6C + b _08137C06 + .pool +_08137C04: + ldr r0, =gUnknown_082A6312 +_08137C06: + pop {r1} + bx r1 + .pool + thumb_func_end GetPokedexRatingText + + thumb_func_start ShowPokedexRatingMessage +ShowPokedexRatingMessage: @ 8137C10 + push {lr} + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + bl GetPokedexRatingText + bl ShowFieldMessage + pop {r0} + bx r0 + .pool + thumb_func_end ShowPokedexRatingMessage diff --git a/asm/contest.s b/asm/contest.s index e3e4ccf86..5749350c7 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6657,7 +6657,7 @@ sub_80DB0C4: @ 80DB0C4 lsls r1, 1 movs r2, 0x20 bl LoadCompressedPalette - ldr r0, =gUnknown_08587BE8 + ldr r0, =gSpriteTemplate_8587BE8 movs r1, 0x70 movs r2, 0x24 movs r3, 0x1E @@ -6692,7 +6692,7 @@ sub_80DB120: @ 80DB120 bl LoadCompressedObjectPic ldr r0, =gUnknown_08587C10 bl LoadCompressedObjectPalette - ldr r0, =gUnknown_08587C18 + ldr r0, =gSpriteTemplate_8587C18 movs r1, 0x60 movs r2, 0xA movs r3, 0x1D @@ -8946,7 +8946,7 @@ _080DC2C8: ldrb r0, [r0] adds r0, r5 ldrb r2, [r0] - ldr r0, =gUnknown_08587AD0 + ldr r0, =gSpriteTemplate_8587AD0 movs r1, 0xB4 movs r3, 0x1 bl CreateSprite @@ -9240,7 +9240,7 @@ _080DC506: ldr r1, =gUnknown_08587AE8 adds r0, r1 bl LoadCompressedObjectPic - ldr r0, =gUnknown_08587B18 + ldr r0, =gSpriteTemplate_8587B18 adds r0, r6, r0 ldr r2, =gUnknown_08587A70 ldr r1, =gUnknown_02039F26 @@ -9264,7 +9264,7 @@ _080DC506: adds r0, r1 lsls r0, 2 add r0, r8 - ldr r1, =gUnknown_08587B80 + ldr r1, =gSubspriteTables_8587B80 bl SetSubspriteTables ldr r0, [r7] ldr r0, [r0, 0x14] @@ -9298,7 +9298,7 @@ sub_80DC594: @ 80DC594 bl LoadCompressedObjectPic ldr r0, =gUnknown_08587BB8 bl LoadSpritePalette - ldr r0, =gUnknown_08587BC8 + ldr r0, =gSpriteTemplate_8587BC8 movs r1, 0x1E movs r2, 0x2C movs r3, 0x1 @@ -9877,7 +9877,7 @@ sub_80DC9EC: @ 80DC9EC lsls r4, r2, 1 adds r4, r2 lsls r4, 3 - ldr r0, =gUnknown_0858998C + ldr r0, =gSpriteTemplate_858998C adds r4, r0 adds r0, r4, 0 movs r1, 0xB8 diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s index 7f32c880c..55503fde1 100644 --- a/asm/contest_link_80F57C4.s +++ b/asm/contest_link_80F57C4.s @@ -2151,7 +2151,7 @@ sub_80F6AE8: @ 80F6AE8 movs r2, 0x80 movs r3, 0x1 bl RequestDma3Fill - ldr r0, =gUnknown_0858D8C8 + ldr r0, =gSpriteTemplate_858D8C8 movs r1, 0x8 movs r2, 0x8 movs r3, 0 @@ -2454,7 +2454,7 @@ sub_80F6DC0: @ 80F6DC0 push {r4-r6,lr} sub sp, 0x20 mov r1, sp - ldr r0, =gUnknown_0858D7F8 + ldr r0, =gSpriteTemplate_858D7F8 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2-r4} @@ -3564,7 +3564,7 @@ sub_80F7670: @ 80F7670 ldrb r0, [r0, 0x7] cmp r0, 0x27 bhi _080F7732 - ldr r4, =gUnknown_0858D860 + ldr r4, =gSpriteTemplate_858D860 bl Random lsls r0, 16 lsrs r0, 16 diff --git a/asm/rom_81370FC.s b/asm/field_specials.s index d2d770472..608924603 100644 --- a/asm/rom_81370FC.s +++ b/asm/field_specials.s @@ -5,1388 +5,8 @@ .text - thumb_func_start sub_81370FC -sub_81370FC: @ 81370FC - push {r4,lr} - bl ShouldDoBrailleFlyEffect - lsls r0, 24 - cmp r0, 0 - beq _08137134 - ldr r4, =gSpecialVar_Result - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] - ldr r1, =gUnknown_03005DB0 - ldr r0, =hm_add_c3_launch_phase_2 - str r0, [r1] - ldr r1, =gUnknown_0203CEEC - ldr r0, =sub_8179918 - b _08137152 - .pool -_08137134: - ldr r0, =gMapHeader - ldrb r0, [r0, 0x15] - cmp r0, 0x1 - bne _08137170 - ldr r0, =0x00000888 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _08137170 - ldr r1, =gUnknown_03005DB0 - ldr r0, =hm_add_c3_launch_phase_2 - str r0, [r1] - ldr r1, =gUnknown_0203CEEC - ldr r0, =hm2_flash -_08137152: - str r0, [r1] - movs r0, 0x1 - b _08137172 - .pool -_08137170: - movs r0, 0 -_08137172: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81370FC - - thumb_func_start hm2_flash -hm2_flash: @ 8137178 - push {r4,lr} - bl oei_task_add - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl GetCursorSelectionMonId - ldr r1, =gFieldEffectArguments - lsls r0, 24 - lsrs r0, 24 - str r0, [r1] - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r2, =sub_81371B4 - lsrs r1, r2, 16 - strh r1, [r0, 0x18] - strh r2, [r0, 0x1A] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end hm2_flash - - thumb_func_start sub_81371B4 -sub_81371B4: @ 81371B4 - push {lr} - movs r0, 0xCF - bl PlaySE - ldr r0, =0x00000888 - bl FlagSet - ldr r0, =EventScript_2926F8 - bl ScriptContext1_SetupScript - pop {r0} - bx r0 - .pool - thumb_func_end sub_81371B4 - - thumb_func_start sub_81371D4 -sub_81371D4: @ 81371D4 - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_81371D4 - - thumb_func_start sub_81371EC -sub_81371EC: @ 81371EC - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end sub_81371EC - - thumb_func_start c2_change_map -c2_change_map: @ 8137200 - push {r4,lr} - sub sp, 0x8 - movs r0, 0 - bl SetVBlankCallback - movs r0, 0 - movs r1, 0 - bl SetGpuReg - movs r0, 0xC - movs r1, 0 - bl SetGpuReg - movs r0, 0xA - movs r1, 0 - bl SetGpuReg - movs r0, 0x8 - movs r1, 0 - bl SetGpuReg - movs r0, 0x18 - movs r1, 0 - bl SetGpuReg - movs r0, 0x1A - movs r1, 0 - bl SetGpuReg - movs r0, 0x14 - movs r1, 0 - bl SetGpuReg - movs r0, 0x16 - movs r1, 0 - bl SetGpuReg - movs r0, 0x10 - movs r1, 0 - bl SetGpuReg - movs r0, 0x12 - movs r1, 0 - bl SetGpuReg - mov r1, sp - movs r0, 0 - strh r0, [r1] - ldr r1, =0x040000d4 - mov r0, sp - str r0, [r1] - movs r0, 0xC0 - lsls r0, 19 - str r0, [r1, 0x4] - ldr r0, =0x8100c000 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r4, 0 - str r4, [sp, 0x4] - add r0, sp, 0x4 - str r0, [r1] - movs r0, 0xE0 - lsls r0, 19 - str r0, [r1, 0x4] - ldr r0, =0x85000100 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - mov r0, sp - strh r4, [r0] - str r0, [r1] - ldr r0, =0x05000002 - str r0, [r1, 0x4] - ldr r0, =0x810001ff - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - bl ResetPaletteFade - bl ResetTasks - bl ResetSpriteData - ldr r3, =0x04000208 - ldrh r2, [r3] - strh r4, [r3] - ldr r4, =0x04000200 - ldrh r0, [r4] - movs r1, 0x1 - orrs r0, r1 - strh r0, [r4] - strh r2, [r3] - ldr r0, =sub_81371EC - bl SetVBlankCallback - ldr r0, =sub_81371D4 - bl SetMainCallback2 - bl sub_8137304 - lsls r0, 24 - cmp r0, 0 - bne _081372D2 - ldr r0, =gMain - ldr r0, [r0, 0x8] - bl SetMainCallback2 -_081372D2: - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end c2_change_map - - thumb_func_start sub_8137304 -sub_8137304: @ 8137304 - push {r4-r7,lr} - bl get_map_light_from_warp0 - lsls r0, 24 - lsrs r6, r0, 24 - bl sav1_map_get_light_level - lsls r0, 24 - lsrs r5, r0, 24 - movs r3, 0 - ldr r4, =gUnknown_085B27C8 - ldrb r0, [r4] - cmp r0, 0 - beq _08137358 - adds r7, r4, 0 - adds r0, r4, 0x4 - mov r12, r0 -_08137326: - lsls r2, r3, 3 - adds r1, r2, r7 - ldrb r0, [r1] - cmp r0, r6 - bne _08137348 - ldrb r0, [r1, 0x1] - cmp r0, r5 - bne _08137348 - mov r1, r12 - adds r0, r2, r1 - ldr r0, [r0] - bl _call_via_r0 - movs r0, 0x1 - b _0813735A - .pool -_08137348: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - lsls r0, r3, 3 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0 - bne _08137326 -_08137358: - movs r0, 0 -_0813735A: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8137304 - - thumb_func_start sub_8137360 -sub_8137360: @ 8137360 - push {r4-r6,lr} - lsls r0, 24 - lsls r1, 24 - lsrs r5, r0, 24 - lsrs r4, r1, 24 - movs r3, 0 - ldr r1, =gUnknown_085B27C8 - ldrb r0, [r1] - cmp r0, 0 - beq _081373A0 - adds r6, r1, 0 -_08137376: - lsls r0, r3, 3 - adds r2, r0, r6 - ldrb r0, [r2] - cmp r0, r5 - bne _08137390 - ldrb r0, [r2, 0x1] - cmp r0, r4 - bne _08137390 - ldrb r0, [r2, 0x2] - b _081373A2 - .pool -_08137390: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - lsls r0, r3, 3 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _08137376 -_081373A0: - movs r0, 0 -_081373A2: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8137360 - - thumb_func_start fade_type_for_given_maplight_pair -fade_type_for_given_maplight_pair: @ 81373A8 - push {r4-r6,lr} - lsls r0, 24 - lsls r1, 24 - lsrs r5, r0, 24 - lsrs r4, r1, 24 - movs r3, 0 - ldr r1, =gUnknown_085B27C8 - ldrb r0, [r1] - cmp r0, 0 - beq _081373E8 - adds r6, r1, 0 -_081373BE: - lsls r0, r3, 3 - adds r2, r0, r6 - ldrb r0, [r2] - cmp r0, r5 - bne _081373D8 - ldrb r0, [r2, 0x1] - cmp r0, r4 - bne _081373D8 - ldrb r0, [r2, 0x3] - b _081373EA - .pool -_081373D8: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - lsls r0, r3, 3 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _081373BE -_081373E8: - movs r0, 0 -_081373EA: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end fade_type_for_given_maplight_pair - - thumb_func_start sub_81373F0 -sub_81373F0: @ 81373F0 - push {lr} - ldr r0, =sub_8137404 - movs r1, 0 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_81373F0 - - thumb_func_start sub_8137404 -sub_8137404: @ 8137404 - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r0, =sub_8137420 - str r0, [r1] - bx lr - .pool - thumb_func_end sub_8137404 - - thumb_func_start sub_8137420 -sub_8137420: @ 8137420 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0 - movs r1, 0 - bl SetGpuReg - ldr r0, =gUnknown_085B2A90 - ldr r1, =0x0600c000 - bl LZ77UnCompVram - ldr r0, =gUnknown_085B28B0 - ldr r1, =0x0600f800 - bl LZ77UnCompVram - ldr r0, =gUnknown_085B2850 - movs r1, 0xE0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_085B28A0 - movs r1, 0xE0 - movs r2, 0x10 - bl LoadPalette - ldr r1, =0x00003e41 - movs r0, 0x50 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - ldr r1, =0x00001f0c - movs r0, 0x8 - bl SetGpuReg - movs r1, 0x8A - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_81374C4 - str r1, [r0] - movs r2, 0 - movs r1, 0x10 - strh r1, [r0, 0x8] - strh r2, [r0, 0xA] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137420 - - thumb_func_start sub_81374C4 -sub_81374C4: @ 81374C4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r5, r1, r2 - ldrh r4, [r5, 0xA] - movs r0, 0x80 - lsls r0, 5 - adds r1, r4, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - cmp r4, 0x10 - bhi _081374F8 - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - b _08137500 - .pool -_081374F8: - movs r0, 0 - strh r0, [r5, 0xC] - ldr r0, =sub_813750C - str r0, [r5] -_08137500: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81374C4 - - thumb_func_start sub_813750C -sub_813750C: @ 813750C - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r1, =0x00001010 - movs r0, 0x52 - bl SetGpuReg - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r4, r0, r1 - ldrh r1, [r4, 0xC] - cmp r1, 0x7 - bhi _08137554 - adds r0, r1, 0x1 - strh r0, [r4, 0xC] - lsls r1, 1 - ldr r0, =gUnknown_085B28A0 - adds r0, r1, r0 - movs r2, 0x10 - subs r2, r1 - lsls r2, 16 - lsrs r2, 16 - movs r1, 0xE0 - bl LoadPalette - b _08137566 - .pool -_08137554: - ldr r0, =gUnknown_085B2850 - movs r1, 0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =sub_8137574 - str r0, [r4] - movs r0, 0x8 - strh r0, [r4, 0xC] -_08137566: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813750C - - thumb_func_start sub_8137574 -sub_8137574: @ 8137574 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldrh r2, [r1, 0xC] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _08137598 - subs r0, r2, 0x1 - strh r0, [r1, 0xC] - b _081375A0 - .pool -_08137598: - ldr r0, =gMain - ldr r0, [r0, 0x8] - bl SetMainCallback2 -_081375A0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137574 - - thumb_func_start sub_81375A8 -sub_81375A8: @ 81375A8 - push {lr} - ldr r0, =sub_81375BC - movs r1, 0 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_81375A8 - - thumb_func_start sub_81375BC -sub_81375BC: @ 81375BC - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r0, =sub_81375D8 - str r0, [r1] - bx lr - .pool - thumb_func_end sub_81375BC - - thumb_func_start sub_81375D8 -sub_81375D8: @ 81375D8 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0 - movs r1, 0 - bl SetGpuReg - ldr r0, =gUnknown_085B2A90 - ldr r1, =0x0600c000 - bl LZ77UnCompVram - ldr r0, =gUnknown_085B28B0 - ldr r1, =0x0600f800 - bl LZ77UnCompVram - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - ldr r1, =0x00001f0c - movs r0, 0x8 - bl SetGpuReg - movs r1, 0x8A - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - ldr r0, =gUnknown_085B2850 - movs r1, 0xE0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_085B2870 - movs r1, 0 - movs r2, 0x20 - bl LoadPalette - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_8137678 - str r1, [r0] - movs r2, 0 - movs r1, 0x10 - strh r1, [r0, 0x8] - strh r2, [r0, 0xA] - strh r2, [r0, 0xC] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81375D8 - - thumb_func_start sub_8137678 -sub_8137678: @ 8137678 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrh r1, [r4, 0xC] - cmp r1, 0xF - bhi _081376B4 - adds r2, r1, 0x1 - adds r0, r2, 0x1 - strh r0, [r4, 0xC] - movs r0, 0xF - subs r0, r1 - lsls r0, 1 - ldr r1, =gUnknown_085B2890 - adds r0, r1 - lsls r2, 17 - lsrs r2, 16 - movs r1, 0xE0 - bl LoadPalette - b _081376C8 - .pool -_081376B4: - ldr r1, =0x00001010 - movs r0, 0x52 - bl SetGpuReg - ldr r1, =0x00003e41 - movs r0, 0x50 - bl SetGpuReg - ldr r0, =sub_81376DC - str r0, [r4] -_081376C8: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137678 - - thumb_func_start sub_81376DC -sub_81376DC: @ 81376DC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r5, r1, r2 - ldrh r0, [r5, 0xA] - movs r1, 0x10 - subs r1, r0 - lsls r1, 16 - lsrs r4, r1, 16 - movs r0, 0x80 - lsls r0, 21 - adds r1, r0 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - cmp r4, 0 - beq _08137714 - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - b _08137726 - .pool -_08137714: - ldr r0, =gUnknown_085B2870 - movs r1, 0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gMain - ldr r0, [r0, 0x8] - bl SetMainCallback2 -_08137726: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81376DC - - thumb_func_start sub_8137734 -sub_8137734: @ 8137734 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x1C - bl HealPlayerParty - ldr r4, =0x00000864 - adds r0, r4, 0 - bl FlagGet - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x1 - bne _08137760 - ldr r0, =gHasHallOfFameRecords - strb r1, [r0] - b _0813776C - .pool -_08137760: - ldr r1, =gHasHallOfFameRecords - movs r0, 0 - strb r0, [r1] - adds r0, r4, 0 - bl FlagSet -_0813776C: - movs r0, 0x1 - bl GetGameStat - cmp r0, 0 - bne _0813778E - ldr r0, =gSaveBlock2Ptr - ldr r2, [r0] - ldrh r1, [r2, 0xE] - lsls r1, 16 - ldrb r0, [r2, 0x10] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x11] - orrs r1, r0 - movs r0, 0x1 - bl sav12_xor_set -_0813778E: - bl sub_8076D48 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - cmp r0, 0 - bne _081377AC - movs r0, 0x1 - bl sub_8084F6C - b _081377B2 - .pool -_081377AC: - movs r0, 0x2 - bl sub_8084F6C -_081377B2: - movs r7, 0 - movs r6, 0 - add r0, sp, 0x18 - mov r8, r0 - mov r5, sp -_081377BC: - movs r0, 0x64 - adds r1, r6, 0 - muls r1, r0 - ldr r0, =gPlayerParty - adds r4, r1, r0 - movs r0, 0 - strb r6, [r5] - strb r0, [r5, 0x1] - adds r0, r4, 0 - movs r1, 0x5 - bl GetMonData - cmp r0, 0 - beq _0813780A - adds r0, r4, 0 - movs r1, 0x6 - bl GetMonData - cmp r0, 0 - bne _0813780A - adds r0, r4, 0 - movs r1, 0x43 - bl GetMonData - cmp r0, 0 - bne _0813780A - movs r0, 0x1 - mov r1, r8 - strb r0, [r1] - adds r0, r4, 0 - movs r1, 0x43 - add r2, sp, 0x18 - bl SetMonData - adds r0, r4, 0 - bl GetRibbonCount - strb r0, [r5, 0x1] - movs r7, 0x1 -_0813780A: - adds r5, 0x4 - adds r6, 0x1 - cmp r6, 0x5 - ble _081377BC - cmp r7, 0x1 - bne _0813785A - movs r0, 0x2A - bl IncrementGameStat - ldr r0, =0x0000089b - bl FlagSet - mov r3, sp - add r2, sp, 0x4 - movs r6, 0x4 -_08137828: - ldrb r1, [r3, 0x1] - ldrb r0, [r2, 0x1] - cmp r0, r1 - bls _08137838 - ldr r1, [sp] - ldr r0, [r2] - str r0, [sp] - str r1, [r2] -_08137838: - adds r2, 0x4 - subs r6, 0x1 - cmp r6, 0 - bge _08137828 - mov r0, sp - ldrb r0, [r0, 0x1] - cmp r0, 0x4 - bls _0813785A - mov r0, sp - ldrb r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - movs r1, 0x43 - bl sub_80EE4DC -_0813785A: - ldr r0, =CB2_DoHallOfFameScreen - bl SetMainCallback2 - movs r0, 0 - add sp, 0x1C - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8137734 - - thumb_func_start sp0C8_whiteout_maybe -sp0C8_whiteout_maybe: @ 813787C - push {lr} - ldr r0, =CB2_WhiteOut - bl SetMainCallback2 - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sp0C8_whiteout_maybe - -@ time_events.o - - thumb_func_start sub_8137890 -sub_8137890: @ 8137890 - push {r4,lr} - ldr r0, =0x00004024 - bl VarGet - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, =0x00004025 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - lsls r4, 16 - orrs r4, r0 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8137890 - - thumb_func_start sub_81378BC -sub_81378BC: @ 81378BC - push {r4,lr} - adds r4, r0, 0 - ldr r0, =0x00004024 - lsrs r1, r4, 16 - bl VarSet - ldr r0, =0x00004025 - lsls r4, 16 - lsrs r4, 16 - adds r1, r4, 0 - bl VarSet - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81378BC - - thumb_func_start sub_81378E4 -sub_81378E4: @ 81378E4 - push {r4,lr} - bl Random - adds r4, r0, 0 - bl Random - lsls r4, 16 - lsls r0, 16 - lsrs r0, 16 - orrs r4, r0 - adds r0, r4, 0 - bl sub_81378BC - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81378E4 - - thumb_func_start UpdateMirageRnd -UpdateMirageRnd: @ 8137904 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - bl sub_8137890 - adds r1, r0, 0 - cmp r4, 0 - beq _08137928 - ldr r3, =0x41c64e6d - ldr r2, =0x00003039 -_08137918: - adds r0, r1, 0 - muls r0, r3 - adds r1, r0, r2 - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0 - bne _08137918 -_08137928: - adds r0, r1, 0 - bl sub_81378BC - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end UpdateMirageRnd - - thumb_func_start sub_813793C -sub_813793C: @ 813793C - push {r4-r6,lr} - bl sub_8137890 - lsrs r6, r0, 16 - movs r5, 0 -_08137946: - movs r0, 0x64 - adds r1, r5, 0 - muls r1, r0 - ldr r0, =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - cmp r0, 0 - beq _08137978 - adds r0, r4, 0 - movs r1, 0 - bl GetMonData - ldr r1, =0x0000ffff - ands r1, r0 - cmp r1, r6 - bne _08137978 - movs r0, 0x1 - b _08137980 - .pool -_08137978: - adds r5, 0x1 - cmp r5, 0x5 - ble _08137946 - movs r0, 0 -_08137980: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_813793C - - thumb_func_start sub_8137988 -sub_8137988: @ 8137988 - push {lr} - bl get_map_light_from_warp0 - lsls r0, 24 - lsrs r0, 24 - bl is_light_level_1_2_3_5_or_6 - lsls r0, 24 - cmp r0, 0 - beq _081379CE - bl RtcCalcLocalTime - ldr r1, =gUnknown_085B2B44 - ldr r0, =gLocalTime - ldrb r0, [r0, 0x2] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _081379C8 - ldr r0, =0x0000089a - bl FlagSet - b _081379CE - .pool -_081379C8: - ldr r0, =0x0000089a - bl FlagClear -_081379CE: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137988 - - thumb_func_start sub_81379D8 -sub_81379D8: @ 81379D8 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_80AC3BC - lsls r0, 24 - cmp r0, 0 - beq _081379F2 - bl EnableBothScriptContexts - adds r0, r4, 0 - bl DestroyTask -_081379F2: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81379D8 - - thumb_func_start sub_81379F8 -sub_81379F8: @ 81379F8 - push {lr} - ldr r0, =sub_81379D8 - movs r1, 0x50 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_81379F8 - - thumb_func_start sub_8137A0C -sub_8137A0C: @ 8137A0C - push {lr} - ldr r0, =0x00004049 - bl GetVarPointer - movs r1, 0 - strh r1, [r0] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137A0C - - thumb_func_start UpdateBirchState -UpdateBirchState: @ 8137A20 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, =0x00004049 - bl GetVarPointer - adds r5, r0, 0 - ldrh r0, [r5] - adds r4, r0 - strh r4, [r5] - ldrh r0, [r5] - movs r1, 0x7 - bl __umodsi3 - strh r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end UpdateBirchState - -@ birch_pc.o - - thumb_func_start sub_8137A4C -sub_8137A4C: @ 8137A4C - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _08137A70 - movs r0, 0 - bl sub_80C0844 - ldr r1, =gSpecialVar_0x8005 - strh r0, [r1] - movs r0, 0x1 - bl sub_80C0844 - b _08137A80 - .pool -_08137A70: - movs r0, 0 - bl pokedex_count - ldr r1, =gSpecialVar_0x8005 - strh r0, [r1] - movs r0, 0x1 - bl pokedex_count -_08137A80: - ldr r1, =gSpecialVar_0x8006 - strh r0, [r1] - bl IsNationalPokedexEnabled - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8137A4C - - thumb_func_start sub_8137A98 -sub_8137A98: @ 8137A98 - push {lr} - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x9 - bhi _08137AA4 - b _08137BFC -_08137AA4: - cmp r0, 0x13 - bhi _08137AB0 - ldr r0, =gUnknown_082A5DAB - b _08137C06 - .pool -_08137AB0: - cmp r0, 0x1D - bhi _08137ABC - ldr r0, =gUnknown_082A5DF1 - b _08137C06 - .pool -_08137ABC: - cmp r0, 0x27 - bhi _08137AC8 - ldr r0, =gUnknown_082A5E34 - b _08137C06 - .pool -_08137AC8: - cmp r0, 0x31 - bhi _08137AD4 - ldr r0, =gUnknown_082A5E83 - b _08137C06 - .pool -_08137AD4: - cmp r0, 0x3B - bhi _08137AE0 - ldr r0, =gUnknown_082A5EB9 - b _08137C06 - .pool -_08137AE0: - cmp r0, 0x45 - bhi _08137AEC - ldr r0, =gUnknown_082A5EF4 - b _08137C06 - .pool -_08137AEC: - cmp r0, 0x4F - bhi _08137AF8 - ldr r0, =gUnknown_082A5F39 - b _08137C06 - .pool -_08137AF8: - cmp r0, 0x59 - bhi _08137B04 - ldr r0, =gUnknown_082A5F82 - b _08137C06 - .pool -_08137B04: - cmp r0, 0x63 - bhi _08137B10 - ldr r0, =gUnknown_082A5FB9 - b _08137C06 - .pool -_08137B10: - cmp r0, 0x6D - bhi _08137B1C - ldr r0, =gUnknown_082A6018 - b _08137C06 - .pool -_08137B1C: - cmp r0, 0x77 - bhi _08137B28 - ldr r0, =gUnknown_082A6061 - b _08137C06 - .pool -_08137B28: - cmp r0, 0x81 - bhi _08137B34 - ldr r0, =gUnknown_082A609C - b _08137C06 - .pool -_08137B34: - cmp r0, 0x8B - bhi _08137B40 - ldr r0, =gUnknown_082A60D5 - b _08137C06 - .pool -_08137B40: - cmp r0, 0x95 - bhi _08137B4C - ldr r0, =gUnknown_082A6124 - b _08137C06 - .pool -_08137B4C: - cmp r0, 0x9F - bhi _08137B58 - ldr r0, =gUnknown_082A616F - b _08137C06 - .pool -_08137B58: - cmp r0, 0xA9 - bhi _08137B64 - ldr r0, =gUnknown_082A61D6 - b _08137C06 - .pool -_08137B64: - cmp r0, 0xB3 - bhi _08137B70 - ldr r0, =gUnknown_082A623A - b _08137C06 - .pool -_08137B70: - cmp r0, 0xBD - bhi _08137B7C - ldr r0, =gUnknown_082A6287 - b _08137C06 - .pool -_08137B7C: - cmp r0, 0xC7 - bls _08137BEA - cmp r0, 0xC8 - bne _08137BB8 - ldr r0, =0x00000199 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - bl GetSetPokedexFlag - lsls r0, 24 - cmp r0, 0 - bne _08137BEA - movs r0, 0xCD - lsls r0, 1 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - bl GetSetPokedexFlag - lsls r0, 24 - cmp r0, 0 - bne _08137BEA - b _08137C04 - .pool -_08137BB8: - cmp r0, 0xC9 - bne _08137BF8 - ldr r0, =0x00000199 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - bl GetSetPokedexFlag - lsls r0, 24 - cmp r0, 0 - beq _08137C04 - movs r0, 0xCD - lsls r0, 1 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - bl GetSetPokedexFlag - lsls r0, 24 - cmp r0, 0 - beq _08137C04 -_08137BEA: - ldr r0, =gUnknown_082A62C9 - b _08137C06 - .pool -_08137BF8: - cmp r0, 0xCA - beq _08137C04 -_08137BFC: - ldr r0, =gUnknown_082A5D6C - b _08137C06 - .pool -_08137C04: - ldr r0, =gUnknown_082A6312 -_08137C06: - pop {r1} - bx r1 - .pool - thumb_func_end sub_8137A98 - - thumb_func_start sub_8137C10 -sub_8137C10: @ 8137C10 - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - bl sub_8137A98 - bl ShowFieldMessage - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137C10 - - thumb_func_start sub_8137C28 -sub_8137C28: @ 8137C28 - push {lr} - ldr r0, =CB2_DoHallOfFamePC - bl SetMainCallback2 - bl ScriptContext2_Enable - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137C28 - - thumb_func_start sub_8137C3C -sub_8137C3C: @ 8137C3C - push {lr} - ldr r0, =c2_exit_to_overworld_2_switch - bl SetMainCallback2 - ldr r1, =gFieldCallback - ldr r0, =mapldr_080CA5C0 - str r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137C3C - - thumb_func_start mapldr_080CA5C0 -mapldr_080CA5C0: @ 8137C5C - push {lr} - sub sp, 0x4 - bl ScriptContext2_Enable - bl sub_8085784 - bl sp109_CreatePCMenu - bl sub_80E2514 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldr r0, =sub_8137C94 - movs r1, 0xA - bl CreateTask - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end mapldr_080CA5C0 - - thumb_func_start sub_8137C94 -sub_8137C94: @ 8137C94 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08137CAC - adds r0, r2, 0 - bl DestroyTask -_08137CAC: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137C94 - - thumb_func_start sub_8137CB4 -sub_8137CB4: @ 8137CB4 + thumb_func_start Special_ShowDiploma +Special_ShowDiploma: @ 8137CB4 push {lr} ldr r0, =CB2_ShowDiploma bl SetMainCallback2 @@ -1394,7 +14,7 @@ sub_8137CB4: @ 8137CB4 pop {r0} bx r0 .pool - thumb_func_end sub_8137CB4 + thumb_func_end Special_ShowDiploma thumb_func_start Special_ViewWallClock Special_ViewWallClock: @ 8137CC8 @@ -1410,8 +30,8 @@ Special_ViewWallClock: @ 8137CC8 .pool thumb_func_end Special_ViewWallClock - thumb_func_start wild_pokemon_reroll -wild_pokemon_reroll: @ 8137CEC + thumb_func_start ResetCyclingRoadChallengeData +ResetCyclingRoadChallengeData: @ 8137CEC ldr r0, =gUnknown_0203AB54 movs r1, 0 strb r1, [r0] @@ -1422,10 +42,10 @@ wild_pokemon_reroll: @ 8137CEC str r0, [r1] bx lr .pool - thumb_func_end wild_pokemon_reroll + thumb_func_end ResetCyclingRoadChallengeData - thumb_func_start sub_8137D0C -sub_8137D0C: @ 8137D0C + thumb_func_start Special_BeginCyclingRoadChallenge +Special_BeginCyclingRoadChallenge: @ 8137D0C ldr r1, =gUnknown_0203AB54 movs r0, 0x1 strb r0, [r1] @@ -1438,10 +58,10 @@ sub_8137D0C: @ 8137D0C str r0, [r1] bx lr .pool - thumb_func_end sub_8137D0C + thumb_func_end Special_BeginCyclingRoadChallenge - thumb_func_start sp0E3_walkrun_bitfield_interpretation -sp0E3_walkrun_bitfield_interpretation: @ 8137D34 + thumb_func_start GetPlayerAvatarBike +GetPlayerAvatarBike: @ 8137D34 push {lr} movs r0, 0x4 bl TestPlayerAvatarFlags @@ -1463,10 +83,10 @@ _08137D56: _08137D58: pop {r1} bx r1 - thumb_func_end sp0E3_walkrun_bitfield_interpretation + thumb_func_end GetPlayerAvatarBike - thumb_func_start sub_8137D5C -sub_8137D5C: @ 8137D5C + thumb_func_start DetermineCyclingRoadResults +DetermineCyclingRoadResults: @ 8137D5C push {r4-r7,lr} adds r7, r0, 0 lsls r1, 24 @@ -1588,10 +208,10 @@ _08137E5C: pop {r0} bx r0 .pool - thumb_func_end sub_8137D5C + thumb_func_end DetermineCyclingRoadResults - thumb_func_start sub_8137E6C -sub_8137E6C: @ 8137E6C + thumb_func_start FinishCyclingRoadChallenge +FinishCyclingRoadChallenge: @ 8137E6C push {r4,r5,lr} ldr r0, =gMain ldr r1, =gUnknown_0203AB58 @@ -1601,18 +221,18 @@ sub_8137E6C: @ 8137E6C ldr r5, =gUnknown_0203AB55 ldrb r1, [r5] adds r0, r4, 0 - bl sub_8137D5C + bl DetermineCyclingRoadResults ldrb r1, [r5] adds r0, r4, 0 - bl sub_8137E9C + bl RecordCyclingRoadResults pop {r4,r5} pop {r0} bx r0 .pool - thumb_func_end sub_8137E6C + thumb_func_end FinishCyclingRoadChallenge - thumb_func_start sub_8137E9C -sub_8137E9C: @ 8137E9C + thumb_func_start RecordCyclingRoadResults +RecordCyclingRoadResults: @ 8137E9C push {r4-r7,lr} mov r7, r8 push {r7} @@ -1653,10 +273,10 @@ _08137EE6: pop {r0} bx r0 .pool - thumb_func_end sub_8137E9C + thumb_func_end RecordCyclingRoadResults - thumb_func_start sub_8137EFC -sub_8137EFC: @ 8137EFC + thumb_func_start GetRecordedCyclingRoadResults +GetRecordedCyclingRoadResults: @ 8137EFC push {r4,lr} ldr r0, =0x00004028 bl VarGet @@ -1675,7 +295,7 @@ sub_8137EFC: @ 8137EFC lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl sub_8137D5C + bl DetermineCyclingRoadResults movs r0, 0x1 b _08137F3E .pool @@ -1685,10 +305,10 @@ _08137F3E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8137EFC + thumb_func_end GetRecordedCyclingRoadResults - thumb_func_start sub_8137F44 -sub_8137F44: @ 8137F44 + thumb_func_start UpdateCyclingRoadState +UpdateCyclingRoadState: @ 8137F44 push {r4,lr} ldr r0, =gUnknown_020322DC ldrh r1, [r0] @@ -1719,10 +339,10 @@ _08137F7C: pop {r0} bx r0 .pool - thumb_func_end sub_8137F44 + thumb_func_end UpdateCyclingRoadState - thumb_func_start sub_8137F90 -sub_8137F90: @ 8137F90 + thumb_func_start SetSSTidalFlag +SetSSTidalFlag: @ 8137F90 push {lr} ldr r0, =0x0000088d bl FlagSet @@ -1733,17 +353,17 @@ sub_8137F90: @ 8137F90 pop {r0} bx r0 .pool - thumb_func_end sub_8137F90 + thumb_func_end SetSSTidalFlag - thumb_func_start sub_8137FB0 -sub_8137FB0: @ 8137FB0 + thumb_func_start ResetSSTidalFlag +ResetSSTidalFlag: @ 8137FB0 push {lr} ldr r0, =0x0000088d bl FlagClear pop {r0} bx r0 .pool - thumb_func_end sub_8137FB0 + thumb_func_end ResetSSTidalFlag thumb_func_start CountSSTidalStep CountSSTidalStep: @ 8137FC0 @@ -2073,8 +693,8 @@ _0813823A: bx r1 thumb_func_end sub_81381F8 - thumb_func_start sub_8138240 -sub_8138240: @ 8138240 + thumb_func_start GetLinkPartnerNames +GetLinkPartnerNames: @ 8138240 push {r4-r7,lr} mov r7, r8 push {r7} @@ -2119,7 +739,7 @@ _0813828A: pop {r1} bx r1 .pool - thumb_func_end sub_8138240 + thumb_func_end GetLinkPartnerNames thumb_func_start SpawnLinkPartnerFieldObject SpawnLinkPartnerFieldObject: @ 81382A0 @@ -2419,8 +1039,8 @@ _081384E6: .pool thumb_func_end sub_813842C - thumb_func_start sub_81384F0 -sub_81384F0: @ 81384F0 + thumb_func_start MauvilleGymSpecial1 +MauvilleGymSpecial1: @ 81384F0 push {r4,r5,lr} movs r4, 0 ldr r5, =gUnknown_085B2B68 @@ -2454,10 +1074,10 @@ _0813852A: pop {r0} bx r0 .pool - thumb_func_end sub_81384F0 + thumb_func_end MauvilleGymSpecial1 - thumb_func_start sub_8138540 -sub_8138540: @ 8138540 + thumb_func_start MauvilleGymSpecial2 +MauvilleGymSpecial2: @ 8138540 push {r4-r6,lr} movs r5, 0xC _08138544: @@ -2668,10 +1288,10 @@ _08138744: pop {r0} bx r0 .pool - thumb_func_end sub_8138540 + thumb_func_end MauvilleGymSpecial2 - thumb_func_start sub_8138750 -sub_8138750: @ 8138750 + thumb_func_start MauvilleGymSpecial3 +MauvilleGymSpecial3: @ 8138750 push {r4-r6,lr} ldr r4, =gUnknown_085B2B68 movs r5, 0x3 @@ -2823,10 +1443,10 @@ _081388DA: pop {r0} bx r0 .pool - thumb_func_end sub_8138750 + thumb_func_end MauvilleGymSpecial3 - thumb_func_start sub_81388E4 -sub_81388E4: @ 81388E4 + thumb_func_start PetalburgGymSpecial1 +PetalburgGymSpecial1: @ 81388E4 push {lr} ldr r0, =gUnknown_0203AB5C movs r1, 0 @@ -2835,16 +1455,16 @@ sub_81388E4: @ 81388E4 strb r1, [r0] movs r0, 0x2C bl PlaySE - ldr r0, =sub_8138910 + ldr r0, =Task_PetalburgGym movs r1, 0x8 bl CreateTask pop {r0} bx r0 .pool - thumb_func_end sub_81388E4 + thumb_func_end PetalburgGymSpecial1 - thumb_func_start sub_8138910 -sub_8138910: @ 8138910 + thumb_func_start Task_PetalburgGym +Task_PetalburgGym: @ 8138910 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -2863,7 +1483,7 @@ sub_8138910: @ 8138910 lsls r1, 1 adds r1, r2 ldrh r1, [r1] - bl sub_8138978 + bl PetalburgGymFunc movs r0, 0 strb r0, [r4] ldrb r0, [r5] @@ -2885,10 +1505,10 @@ _08138970: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8138910 + thumb_func_end Task_PetalburgGym - thumb_func_start sub_8138978 -sub_8138978: @ 8138978 + thumb_func_start PetalburgGymFunc +PetalburgGymFunc: @ 8138978 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -3042,33 +1662,33 @@ _08138A92: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8138978 + thumb_func_end PetalburgGymFunc - thumb_func_start sub_8138AA4 -sub_8138AA4: @ 8138AA4 + thumb_func_start PetalburgGymSpecial2 +PetalburgGymSpecial2: @ 8138AA4 push {lr} ldr r0, =gSpecialVar_0x8004 ldrb r0, [r0] ldr r1, =gUnknown_085B2B7E ldrh r1, [r1, 0x8] - bl sub_8138978 + bl PetalburgGymFunc pop {r0} bx r0 .pool - thumb_func_end sub_8138AA4 + thumb_func_end PetalburgGymSpecial2 - thumb_func_start sub_8138AC0 -sub_8138AC0: @ 8138AC0 + thumb_func_start ShowFieldMessageStringVar4 +ShowFieldMessageStringVar4: @ 8138AC0 push {lr} ldr r0, =gStringVar4 bl ShowFieldMessage pop {r0} bx r0 .pool - thumb_func_end sub_8138AC0 + thumb_func_end ShowFieldMessageStringVar4 - thumb_func_start sub_8138AD0 -sub_8138AD0: @ 8138AD0 + thumb_func_start StorePlayerCoordsInVars +StorePlayerCoordsInVars: @ 8138AD0 ldr r1, =gSpecialVar_0x8004 ldr r0, =gSaveBlock1Ptr ldr r2, [r0] @@ -3079,10 +1699,10 @@ sub_8138AD0: @ 8138AD0 strh r0, [r1] bx lr .pool - thumb_func_end sub_8138AD0 + thumb_func_end StorePlayerCoordsInVars - thumb_func_start sub_8138AF0 -sub_8138AF0: @ 8138AF0 + thumb_func_start GetPlayerTrainerIdOnesDigit +GetPlayerTrainerIdOnesDigit: @ 8138AF0 push {lr} ldr r0, =gSaveBlock2Ptr ldr r0, [r0] @@ -3097,10 +1717,10 @@ sub_8138AF0: @ 8138AF0 pop {r1} bx r1 .pool - thumb_func_end sub_8138AF0 + thumb_func_end GetPlayerTrainerIdOnesDigit - thumb_func_start sub_8138B10 -sub_8138B10: @ 8138B10 + thumb_func_start GetPlayerBigGuyGirlString +GetPlayerBigGuyGirlString: @ 8138B10 push {lr} ldr r0, =gSaveBlock2Ptr ldr r0, [r0] @@ -3120,10 +1740,10 @@ _08138B3C: pop {r0} bx r0 .pool - thumb_func_end sub_8138B10 + thumb_func_end GetPlayerBigGuyGirlString - thumb_func_start sub_8138B48 -sub_8138B48: @ 8138B48 + thumb_func_start GetRivalSonDaughterString +GetRivalSonDaughterString: @ 8138B48 push {lr} ldr r0, =gSaveBlock2Ptr ldr r0, [r0] @@ -3143,7 +1763,7 @@ _08138B74: pop {r0} bx r0 .pool - thumb_func_end sub_8138B48 + thumb_func_end GetRivalSonDaughterString thumb_func_start sub_8138B80 sub_8138B80: @ 8138B80 @@ -3153,8 +1773,8 @@ sub_8138B80: @ 8138B80 .pool thumb_func_end sub_8138B80 - thumb_func_start sub_8138B8C -sub_8138B8C: @ 8138B8C + thumb_func_start CableCarWarp +CableCarWarp: @ 8138B8C push {lr} sub sp, 0x4 ldr r0, =gSpecialVar_0x8004 @@ -3184,10 +1804,10 @@ _08138BC2: add sp, 0x4 pop {r0} bx r0 - thumb_func_end sub_8138B8C + thumb_func_end CableCarWarp - thumb_func_start sub_8138BC8 -sub_8138BC8: @ 8138BC8 + thumb_func_start SetFlagInVar +SetFlagInVar: @ 8138BC8 push {lr} ldr r0, =gSpecialVar_0x8004 ldrh r0, [r0] @@ -3195,10 +1815,10 @@ sub_8138BC8: @ 8138BC8 pop {r0} bx r0 .pool - thumb_func_end sub_8138BC8 + thumb_func_end SetFlagInVar - thumb_func_start sub_8138BDC -sub_8138BDC: @ 8138BDC + thumb_func_start GetWeekCount +GetWeekCount: @ 8138BDC push {lr} ldr r0, =gLocalTime movs r1, 0 @@ -3215,10 +1835,10 @@ _08138BF6: pop {r1} bx r1 .pool - thumb_func_end sub_8138BDC + thumb_func_end GetWeekCount - thumb_func_start sub_8138C04 -sub_8138C04: @ 8138C04 + thumb_func_start GetLeadMonFriendshipScore +GetLeadMonFriendshipScore: @ 8138C04 push {r4,lr} bl GetLeadMonIndex lsls r0, 24 @@ -3281,32 +1901,32 @@ _08138C7E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8138C04 + thumb_func_end GetLeadMonFriendshipScore - thumb_func_start sub_8138C84 -sub_8138C84: @ 8138C84 + thumb_func_start CB2_FieldShowRegionMap +CB2_FieldShowRegionMap: @ 8138C84 push {lr} ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl sub_817018C pop {r0} bx r0 .pool - thumb_func_end sub_8138C84 + thumb_func_end CB2_FieldShowRegionMap - thumb_func_start sub_8138C94 -sub_8138C94: @ 8138C94 + thumb_func_start FieldShowRegionMap +FieldShowRegionMap: @ 8138C94 push {lr} - ldr r0, =sub_8138C84 + ldr r0, =CB2_FieldShowRegionMap bl SetMainCallback2 pop {r0} bx r0 .pool - thumb_func_end sub_8138C94 + thumb_func_end FieldShowRegionMap - thumb_func_start sp0D9_ComputerRelated -sp0D9_ComputerRelated: @ 8138CA4 + thumb_func_start DoPCTurnOnEffect +DoPCTurnOnEffect: @ 8138CA4 push {r4,lr} - ldr r4, =sub_8138CE8 + ldr r4, =Task_PCTurnOnEffect adds r0, r4, 0 bl FuncIsActiveTask lsls r0, 24 @@ -3334,10 +1954,10 @@ _08138CD8: pop {r0} bx r0 .pool - thumb_func_end sp0D9_ComputerRelated + thumb_func_end DoPCTurnOnEffect - thumb_func_start sub_8138CE8 -sub_8138CE8: @ 8138CE8 + thumb_func_start Task_PCTurnOnEffect +Task_PCTurnOnEffect: @ 8138CE8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -3351,15 +1971,15 @@ sub_8138CE8: @ 8138CE8 cmp r0, 0 bne _08138D06 adds r0, r1, 0 - bl sub_8138D10 + bl PCTurnOnEffect_0 _08138D06: pop {r0} bx r0 .pool - thumb_func_end sub_8138CE8 + thumb_func_end Task_PCTurnOnEffect - thumb_func_start sub_8138D10 -sub_8138D10: @ 8138D10 + thumb_func_start PCTurnOnEffect_0 +PCTurnOnEffect_0: @ 8138D10 push {r4-r6,lr} adds r4, r0, 0 movs r6, 0 @@ -3401,7 +2021,7 @@ _08138D4C: asrs r1, 24 lsls r2, r5, 24 asrs r2, 24 - bl sub_8138D88 + bl PCTurnOnEffect_1 bl DrawWholeMapView ldrh r0, [r4, 0x10] movs r1, 0x1 @@ -3423,10 +2043,10 @@ _08138D7C: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8138D10 + thumb_func_end PCTurnOnEffect_0 - thumb_func_start sub_8138D88 -sub_8138D88: @ 8138D88 + thumb_func_start PCTurnOnEffect_1 +PCTurnOnEffect_1: @ 8138D88 push {r4,r5,lr} lsls r1, 24 lsrs r1, 24 @@ -3498,18 +2118,18 @@ _08138DE6: pop {r0} bx r0 .pool - thumb_func_end sub_8138D88 + thumb_func_end PCTurnOnEffect_1 - thumb_func_start sub_8138E20 -sub_8138E20: @ 8138E20 + thumb_func_start DoPCTurnOffEffect +DoPCTurnOffEffect: @ 8138E20 push {lr} - bl sub_8138E2C + bl PCTurnOffEffect pop {r0} bx r0 - thumb_func_end sub_8138E20 + thumb_func_end DoPCTurnOffEffect - thumb_func_start sub_8138E2C -sub_8138E2C: @ 8138E2C + thumb_func_start PCTurnOffEffect +PCTurnOffEffect: @ 8138E2C push {r4-r6,lr} movs r6, 0 movs r5, 0 @@ -3583,12 +2203,12 @@ _08138E82: pop {r0} bx r0 .pool - thumb_func_end sub_8138E2C + thumb_func_end PCTurnOffEffect - thumb_func_start sub_8138EC0 -sub_8138EC0: @ 8138EC0 + thumb_func_start DoLotteryCornerComputerEffect +DoLotteryCornerComputerEffect: @ 8138EC0 push {r4,lr} - ldr r4, =sub_8138F04 + ldr r4, =Task_LotteryCornerComputerEffect adds r0, r4, 0 bl FuncIsActiveTask lsls r0, 24 @@ -3616,10 +2236,10 @@ _08138EF4: pop {r0} bx r0 .pool - thumb_func_end sub_8138EC0 + thumb_func_end DoLotteryCornerComputerEffect - thumb_func_start sub_8138F04 -sub_8138F04: @ 8138F04 + thumb_func_start Task_LotteryCornerComputerEffect +Task_LotteryCornerComputerEffect: @ 8138F04 push {lr} lsls r0, 24 lsrs r0, 24 @@ -3633,15 +2253,15 @@ sub_8138F04: @ 8138F04 cmp r0, 0 bne _08138F22 adds r0, r1, 0 - bl sub_8138F2C + bl LotteryCornerComputerEffect _08138F22: pop {r0} bx r0 .pool - thumb_func_end sub_8138F04 + thumb_func_end Task_LotteryCornerComputerEffect - thumb_func_start sub_8138F2C -sub_8138F2C: @ 8138F2C + thumb_func_start LotteryCornerComputerEffect +LotteryCornerComputerEffect: @ 8138F2C push {r4,lr} adds r4, r0, 0 movs r1, 0xE @@ -3697,10 +2317,10 @@ _08138F9A: pop {r0} bx r0 .pool - thumb_func_end sub_8138F2C + thumb_func_end LotteryCornerComputerEffect - thumb_func_start sub_8138FAC -sub_8138FAC: @ 8138FAC + thumb_func_start EndLotteryCornerComputerEffect +EndLotteryCornerComputerEffect: @ 8138FAC push {lr} ldr r2, =0x00000e9d movs r0, 0x12 @@ -3714,10 +2334,10 @@ sub_8138FAC: @ 8138FAC pop {r0} bx r0 .pool - thumb_func_end sub_8138FAC + thumb_func_end EndLotteryCornerComputerEffect - thumb_func_start sub_8138FD4 -sub_8138FD4: @ 8138FD4 + thumb_func_start SetTrickHouseEndRoomFlag +SetTrickHouseEndRoomFlag: @ 8138FD4 push {lr} ldr r1, =gSpecialVar_0x8004 ldr r0, =0x000001f5 @@ -3726,10 +2346,10 @@ sub_8138FD4: @ 8138FD4 pop {r0} bx r0 .pool - thumb_func_end sub_8138FD4 + thumb_func_end SetTrickHouseEndRoomFlag - thumb_func_start sub_8138FEC -sub_8138FEC: @ 8138FEC + thumb_func_start ResetTrickHouseEndRoomFlag +ResetTrickHouseEndRoomFlag: @ 8138FEC push {lr} ldr r1, =gSpecialVar_0x8004 ldr r0, =0x000001f5 @@ -3738,10 +2358,10 @@ sub_8138FEC: @ 8138FEC pop {r0} bx r0 .pool - thumb_func_end sub_8138FEC + thumb_func_end ResetTrickHouseEndRoomFlag - thumb_func_start sub_8139004 -sub_8139004: @ 8139004 + thumb_func_start CheckLeadMonCool +CheckLeadMonCool: @ 8139004 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3762,10 +2382,10 @@ _08139028: _0813902A: pop {r1} bx r1 - thumb_func_end sub_8139004 + thumb_func_end CheckLeadMonCool - thumb_func_start sub_8139030 -sub_8139030: @ 8139030 + thumb_func_start CheckLeadMonBeauty +CheckLeadMonBeauty: @ 8139030 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3786,10 +2406,10 @@ _08139054: _08139056: pop {r1} bx r1 - thumb_func_end sub_8139030 + thumb_func_end CheckLeadMonBeauty - thumb_func_start sub_813905C -sub_813905C: @ 813905C + thumb_func_start CheckLeadMonCute +CheckLeadMonCute: @ 813905C push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3810,10 +2430,10 @@ _08139080: _08139082: pop {r1} bx r1 - thumb_func_end sub_813905C + thumb_func_end CheckLeadMonCute - thumb_func_start sub_8139088 -sub_8139088: @ 8139088 + thumb_func_start CheckLeadMonSmart +CheckLeadMonSmart: @ 8139088 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3834,10 +2454,10 @@ _081390AC: _081390AE: pop {r1} bx r1 - thumb_func_end sub_8139088 + thumb_func_end CheckLeadMonSmart - thumb_func_start sub_81390B4 -sub_81390B4: @ 81390B4 + thumb_func_start CheckLeadMonTough +CheckLeadMonTough: @ 81390B4 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3858,10 +2478,10 @@ _081390D8: _081390DA: pop {r1} bx r1 - thumb_func_end sub_81390B4 + thumb_func_end CheckLeadMonTough - thumb_func_start sub_81390E0 -sub_81390E0: @ 81390E0 + thumb_func_start IsGrassTypeInParty +IsGrassTypeInParty: @ 81390E0 push {r4-r6,lr} movs r5, 0 ldr r6, =gBaseStats @@ -3915,7 +2535,7 @@ _0813914A: pop {r0} bx r0 .pool - thumb_func_end sub_81390E0 + thumb_func_end IsGrassTypeInParty thumb_func_start SpawnScriptFieldObject SpawnScriptFieldObject: @ 8139158 @@ -3975,8 +2595,8 @@ RemoveScriptFieldObject: @ 81391AC .pool thumb_func_end RemoveScriptFieldObject - thumb_func_start sub_81391D0 -sub_81391D0: @ 81391D0 + thumb_func_start GetPokeblockNameByMonNature +GetPokeblockNameByMonNature: @ 81391D0 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -3995,10 +2615,10 @@ sub_81391D0: @ 81391D0 pop {r1} bx r1 .pool - thumb_func_end sub_81391D0 + thumb_func_end GetPokeblockNameByMonNature - thumb_func_start sub_8139200 -sub_8139200: @ 8139200 + thumb_func_start GetSecretBaseNearbyMapName +GetSecretBaseNearbyMapName: @ 8139200 push {r4,lr} ldr r4, =gStringVar1 ldr r0, =0x00004026 @@ -4013,7 +2633,7 @@ sub_8139200: @ 8139200 pop {r0} bx r0 .pool - thumb_func_end sub_8139200 + thumb_func_end GetSecretBaseNearbyMapName thumb_func_start sub_8139228 sub_8139228: @ 8139228 @@ -4159,8 +2779,8 @@ _08139342: bx r1 thumb_func_end sub_8139320 - thumb_func_start sub_8139348 -sub_8139348: @ 8139348 + thumb_func_start LeadMonHasEffortRibbon +LeadMonHasEffortRibbon: @ 8139348 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -4177,10 +2797,10 @@ sub_8139348: @ 8139348 pop {r1} bx r1 .pool - thumb_func_end sub_8139348 + thumb_func_end LeadMonHasEffortRibbon - thumb_func_start sub_8139370 -sub_8139370: @ 8139370 + thumb_func_start GiveLeadMonEffortRibbon +GiveLeadMonEffortRibbon: @ 8139370 push {r4,lr} sub sp, 0x4 movs r0, 0x2A @@ -4216,10 +2836,10 @@ _081393B6: pop {r0} bx r0 .pool - thumb_func_end sub_8139370 + thumb_func_end GiveLeadMonEffortRibbon - thumb_func_start sub_81393C8 -sub_81393C8: @ 81393C8 + thumb_func_start Special_AreLeadMonEVsMaxedOut +Special_AreLeadMonEVsMaxedOut: @ 81393C8 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -4241,7 +2861,7 @@ _081393F4: _081393F6: pop {r1} bx r1 - thumb_func_end sub_81393C8 + thumb_func_end Special_AreLeadMonEVsMaxedOut thumb_func_start sub_81393FC sub_81393FC: @ 81393FC @@ -4298,8 +2918,8 @@ SetShoalItemFlag: @ 813945C .pool thumb_func_end SetShoalItemFlag - thumb_func_start sub_813946C -sub_813946C: @ 813946C + thumb_func_start PutZigzagoonInPlayerParty +PutZigzagoonInPlayerParty: @ 813946C push {r4,r5,lr} sub sp, 0x14 ldr r5, =gPlayerParty @@ -4347,10 +2967,10 @@ sub_813946C: @ 813946C pop {r0} bx r0 .pool - thumb_func_end sub_813946C + thumb_func_end PutZigzagoonInPlayerParty - thumb_func_start sub_81394D8 -sub_81394D8: @ 81394D8 + thumb_func_start IsStarterInParty +IsStarterInParty: @ 81394D8 push {r4-r6,lr} ldr r0, =0x00004023 bl VarGet @@ -4390,20 +3010,20 @@ _08139528: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_81394D8 + thumb_func_end IsStarterInParty - thumb_func_start sub_8139530 -sub_8139530: @ 8139530 + thumb_func_start ScriptCheckFreePokemonStorageSpace +ScriptCheckFreePokemonStorageSpace: @ 8139530 push {lr} - bl sub_80D2218 + bl CheckFreePokemonStorageSpace lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_8139530 + thumb_func_end ScriptCheckFreePokemonStorageSpace - thumb_func_start sub_8139540 -sub_8139540: @ 8139540 + thumb_func_start IsPokerusInParty +IsPokerusInParty: @ 8139540 push {lr} ldr r0, =gPlayerParty movs r1, 0x3F @@ -4419,7 +3039,7 @@ _08139558: _0813955A: pop {r1} bx r1 - thumb_func_end sub_8139540 + thumb_func_end IsPokerusInParty thumb_func_start sub_8139560 sub_8139560: @ 8139560 @@ -4529,8 +3149,8 @@ sub_8139634: @ 8139634 bx r1 thumb_func_end sub_8139634 - thumb_func_start sub_8139648 -sub_8139648: @ 8139648 + thumb_func_start SetRoute119Weather +SetRoute119Weather: @ 8139648 push {lr} bl get_map_light_from_warp0 lsls r0, 24 @@ -4545,10 +3165,10 @@ sub_8139648: @ 8139648 _08139664: pop {r0} bx r0 - thumb_func_end sub_8139648 + thumb_func_end SetRoute119Weather - thumb_func_start sub_8139668 -sub_8139668: @ 8139668 + thumb_func_start SetRoute123Weather +SetRoute123Weather: @ 8139668 push {lr} bl get_map_light_from_warp0 lsls r0, 24 @@ -4563,7 +3183,7 @@ sub_8139668: @ 8139668 _08139684: pop {r0} bx r0 - thumb_func_end sub_8139668 + thumb_func_end SetRoute123Weather thumb_func_start GetLeadMonIndex GetLeadMonIndex: @ 8139688 @@ -4611,8 +3231,8 @@ _081396D8: bx r1 thumb_func_end GetLeadMonIndex - thumb_func_start sub_81396E0 -sub_81396E0: @ 81396E0 + thumb_func_start ScriptGetPartyMonSpecies +ScriptGetPartyMonSpecies: @ 81396E0 push {lr} ldr r0, =gSpecialVar_0x8004 ldrh r1, [r0] @@ -4628,7 +3248,7 @@ sub_81396E0: @ 81396E0 pop {r1} bx r1 .pool - thumb_func_end sub_81396E0 + thumb_func_end ScriptGetPartyMonSpecies thumb_func_start nullsub_54 nullsub_54: @ 8139708 diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s new file mode 100644 index 000000000..9cc3a59a5 --- /dev/null +++ b/asm/fldeff_flash.s @@ -0,0 +1,709 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start SetUpFieldMove_Flash +SetUpFieldMove_Flash: @ 81370FC + push {r4,lr} + bl ShouldDoBrailleFlyEffect + lsls r0, 24 + cmp r0, 0 + beq _08137134 + ldr r4, =gSpecialVar_Result + bl GetCursorSelectionMonId + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4] + ldr r1, =gUnknown_03005DB0 + ldr r0, =hm_add_c3_launch_phase_2 + str r0, [r1] + ldr r1, =gUnknown_0203CEEC + ldr r0, =sub_8179918 + b _08137152 + .pool +_08137134: + ldr r0, =gMapHeader + ldrb r0, [r0, 0x15] + cmp r0, 0x1 + bne _08137170 + ldr r0, =0x00000888 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + bne _08137170 + ldr r1, =gUnknown_03005DB0 + ldr r0, =hm_add_c3_launch_phase_2 + str r0, [r1] + ldr r1, =gUnknown_0203CEEC + ldr r0, =hm2_flash +_08137152: + str r0, [r1] + movs r0, 0x1 + b _08137172 + .pool +_08137170: + movs r0, 0 +_08137172: + pop {r4} + pop {r1} + bx r1 + thumb_func_end SetUpFieldMove_Flash + + thumb_func_start hm2_flash +hm2_flash: @ 8137178 + push {r4,lr} + bl oei_task_add + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + bl GetCursorSelectionMonId + ldr r1, =gFieldEffectArguments + lsls r0, 24 + lsrs r0, 24 + str r0, [r1] + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r0, r1 + ldr r2, =sub_81371B4 + lsrs r1, r2, 16 + strh r1, [r0, 0x18] + strh r2, [r0, 0x1A] + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end hm2_flash + + thumb_func_start sub_81371B4 +sub_81371B4: @ 81371B4 + push {lr} + movs r0, 0xCF + bl PlaySE + ldr r0, =0x00000888 + bl FlagSet + ldr r0, =EventScript_2926F8 + bl ScriptContext1_SetupScript + pop {r0} + bx r0 + .pool + thumb_func_end sub_81371B4 + + thumb_func_start sub_81371D4 +sub_81371D4: @ 81371D4 + push {lr} + bl RunTasks + bl AnimateSprites + bl BuildOamBuffer + bl UpdatePaletteFade + pop {r0} + bx r0 + thumb_func_end sub_81371D4 + + thumb_func_start sub_81371EC +sub_81371EC: @ 81371EC + push {lr} + bl LoadOam + bl ProcessSpriteCopyRequests + bl TransferPlttBuffer + pop {r0} + bx r0 + thumb_func_end sub_81371EC + + thumb_func_start c2_change_map +c2_change_map: @ 8137200 + push {r4,lr} + sub sp, 0x8 + movs r0, 0 + bl SetVBlankCallback + movs r0, 0 + movs r1, 0 + bl SetGpuReg + movs r0, 0xC + movs r1, 0 + bl SetGpuReg + movs r0, 0xA + movs r1, 0 + bl SetGpuReg + movs r0, 0x8 + movs r1, 0 + bl SetGpuReg + movs r0, 0x18 + movs r1, 0 + bl SetGpuReg + movs r0, 0x1A + movs r1, 0 + bl SetGpuReg + movs r0, 0x14 + movs r1, 0 + bl SetGpuReg + movs r0, 0x16 + movs r1, 0 + bl SetGpuReg + movs r0, 0x10 + movs r1, 0 + bl SetGpuReg + movs r0, 0x12 + movs r1, 0 + bl SetGpuReg + mov r1, sp + movs r0, 0 + strh r0, [r1] + ldr r1, =0x040000d4 + mov r0, sp + str r0, [r1] + movs r0, 0xC0 + lsls r0, 19 + str r0, [r1, 0x4] + ldr r0, =0x8100c000 + str r0, [r1, 0x8] + ldr r0, [r1, 0x8] + movs r4, 0 + str r4, [sp, 0x4] + add r0, sp, 0x4 + str r0, [r1] + movs r0, 0xE0 + lsls r0, 19 + str r0, [r1, 0x4] + ldr r0, =0x85000100 + str r0, [r1, 0x8] + ldr r0, [r1, 0x8] + mov r0, sp + strh r4, [r0] + str r0, [r1] + ldr r0, =0x05000002 + str r0, [r1, 0x4] + ldr r0, =0x810001ff + str r0, [r1, 0x8] + ldr r0, [r1, 0x8] + bl ResetPaletteFade + bl ResetTasks + bl ResetSpriteData + ldr r3, =0x04000208 + ldrh r2, [r3] + strh r4, [r3] + ldr r4, =0x04000200 + ldrh r0, [r4] + movs r1, 0x1 + orrs r0, r1 + strh r0, [r4] + strh r2, [r3] + ldr r0, =sub_81371EC + bl SetVBlankCallback + ldr r0, =sub_81371D4 + bl SetMainCallback2 + bl sub_8137304 + lsls r0, 24 + cmp r0, 0 + bne _081372D2 + ldr r0, =gMain + ldr r0, [r0, 0x8] + bl SetMainCallback2 +_081372D2: + add sp, 0x8 + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end c2_change_map + + thumb_func_start sub_8137304 +sub_8137304: @ 8137304 + push {r4-r7,lr} + bl get_map_light_from_warp0 + lsls r0, 24 + lsrs r6, r0, 24 + bl sav1_map_get_light_level + lsls r0, 24 + lsrs r5, r0, 24 + movs r3, 0 + ldr r4, =gUnknown_085B27C8 + ldrb r0, [r4] + cmp r0, 0 + beq _08137358 + adds r7, r4, 0 + adds r0, r4, 0x4 + mov r12, r0 +_08137326: + lsls r2, r3, 3 + adds r1, r2, r7 + ldrb r0, [r1] + cmp r0, r6 + bne _08137348 + ldrb r0, [r1, 0x1] + cmp r0, r5 + bne _08137348 + mov r1, r12 + adds r0, r2, r1 + ldr r0, [r0] + bl _call_via_r0 + movs r0, 0x1 + b _0813735A + .pool +_08137348: + adds r0, r3, 0x1 + lsls r0, 24 + lsrs r3, r0, 24 + lsls r0, r3, 3 + adds r0, r4 + ldrb r0, [r0] + cmp r0, 0 + bne _08137326 +_08137358: + movs r0, 0 +_0813735A: + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_8137304 + + thumb_func_start sub_8137360 +sub_8137360: @ 8137360 + push {r4-r6,lr} + lsls r0, 24 + lsls r1, 24 + lsrs r5, r0, 24 + lsrs r4, r1, 24 + movs r3, 0 + ldr r1, =gUnknown_085B27C8 + ldrb r0, [r1] + cmp r0, 0 + beq _081373A0 + adds r6, r1, 0 +_08137376: + lsls r0, r3, 3 + adds r2, r0, r6 + ldrb r0, [r2] + cmp r0, r5 + bne _08137390 + ldrb r0, [r2, 0x1] + cmp r0, r4 + bne _08137390 + ldrb r0, [r2, 0x2] + b _081373A2 + .pool +_08137390: + adds r0, r3, 0x1 + lsls r0, 24 + lsrs r3, r0, 24 + lsls r0, r3, 3 + adds r0, r1 + ldrb r0, [r0] + cmp r0, 0 + bne _08137376 +_081373A0: + movs r0, 0 +_081373A2: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end sub_8137360 + + thumb_func_start fade_type_for_given_maplight_pair +fade_type_for_given_maplight_pair: @ 81373A8 + push {r4-r6,lr} + lsls r0, 24 + lsls r1, 24 + lsrs r5, r0, 24 + lsrs r4, r1, 24 + movs r3, 0 + ldr r1, =gUnknown_085B27C8 + ldrb r0, [r1] + cmp r0, 0 + beq _081373E8 + adds r6, r1, 0 +_081373BE: + lsls r0, r3, 3 + adds r2, r0, r6 + ldrb r0, [r2] + cmp r0, r5 + bne _081373D8 + ldrb r0, [r2, 0x1] + cmp r0, r4 + bne _081373D8 + ldrb r0, [r2, 0x3] + b _081373EA + .pool +_081373D8: + adds r0, r3, 0x1 + lsls r0, 24 + lsrs r3, r0, 24 + lsls r0, r3, 3 + adds r0, r1 + ldrb r0, [r0] + cmp r0, 0 + bne _081373BE +_081373E8: + movs r0, 0 +_081373EA: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end fade_type_for_given_maplight_pair + + thumb_func_start sub_81373F0 +sub_81373F0: @ 81373F0 + push {lr} + ldr r0, =sub_8137404 + movs r1, 0 + bl CreateTask + pop {r0} + bx r0 + .pool + thumb_func_end sub_81373F0 + + thumb_func_start sub_8137404 +sub_8137404: @ 8137404 + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + ldr r0, =sub_8137420 + str r0, [r1] + bx lr + .pool + thumb_func_end sub_8137404 + + thumb_func_start sub_8137420 +sub_8137420: @ 8137420 + push {r4,lr} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + movs r0, 0 + movs r1, 0 + bl SetGpuReg + ldr r0, =gCaveTransitionTiles + ldr r1, =0x0600c000 + bl LZ77UnCompVram + ldr r0, =gCaveTransitionTilemap + ldr r1, =0x0600f800 + bl LZ77UnCompVram + ldr r0, =gCaveTransitionPalette_White + movs r1, 0xE0 + movs r2, 0x20 + bl LoadPalette + ldr r0, =gUnknown_085B28A0 + movs r1, 0xE0 + movs r2, 0x10 + bl LoadPalette + ldr r1, =0x00003e41 + movs r0, 0x50 + bl SetGpuReg + movs r0, 0x52 + movs r1, 0 + bl SetGpuReg + movs r0, 0x54 + movs r1, 0 + bl SetGpuReg + ldr r1, =0x00001f0c + movs r0, 0x8 + bl SetGpuReg + movs r1, 0x8A + lsls r1, 5 + movs r0, 0 + bl SetGpuReg + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r0, r1 + ldr r1, =sub_81374C4 + str r1, [r0] + movs r2, 0 + movs r1, 0x10 + strh r1, [r0, 0x8] + strh r2, [r0, 0xA] + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137420 + + thumb_func_start sub_81374C4 +sub_81374C4: @ 81374C4 + push {r4,r5,lr} + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r5, r1, r2 + ldrh r4, [r5, 0xA] + movs r0, 0x80 + lsls r0, 5 + adds r1, r4, r0 + lsls r1, 16 + lsrs r1, 16 + movs r0, 0x52 + bl SetGpuReg + cmp r4, 0x10 + bhi _081374F8 + ldrh r0, [r5, 0xA] + adds r0, 0x1 + strh r0, [r5, 0xA] + b _08137500 + .pool +_081374F8: + movs r0, 0 + strh r0, [r5, 0xC] + ldr r0, =sub_813750C + str r0, [r5] +_08137500: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81374C4 + + thumb_func_start sub_813750C +sub_813750C: @ 813750C + push {r4,lr} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + ldr r1, =0x00001010 + movs r0, 0x52 + bl SetGpuReg + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r4, r0, r1 + ldrh r1, [r4, 0xC] + cmp r1, 0x7 + bhi _08137554 + adds r0, r1, 0x1 + strh r0, [r4, 0xC] + lsls r1, 1 + ldr r0, =gUnknown_085B28A0 + adds r0, r1, r0 + movs r2, 0x10 + subs r2, r1 + lsls r2, 16 + lsrs r2, 16 + movs r1, 0xE0 + bl LoadPalette + b _08137566 + .pool +_08137554: + ldr r0, =gCaveTransitionPalette_White + movs r1, 0 + movs r2, 0x20 + bl LoadPalette + ldr r0, =sub_8137574 + str r0, [r4] + movs r0, 0x8 + strh r0, [r4, 0xC] +_08137566: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813750C + + thumb_func_start sub_8137574 +sub_8137574: @ 8137574 + push {lr} + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + ldrh r2, [r1, 0xC] + movs r3, 0xC + ldrsh r0, [r1, r3] + cmp r0, 0 + beq _08137598 + subs r0, r2, 0x1 + strh r0, [r1, 0xC] + b _081375A0 + .pool +_08137598: + ldr r0, =gMain + ldr r0, [r0, 0x8] + bl SetMainCallback2 +_081375A0: + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137574 + + thumb_func_start sub_81375A8 +sub_81375A8: @ 81375A8 + push {lr} + ldr r0, =sub_81375BC + movs r1, 0 + bl CreateTask + pop {r0} + bx r0 + .pool + thumb_func_end sub_81375A8 + + thumb_func_start sub_81375BC +sub_81375BC: @ 81375BC + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + ldr r0, =sub_81375D8 + str r0, [r1] + bx lr + .pool + thumb_func_end sub_81375BC + + thumb_func_start sub_81375D8 +sub_81375D8: @ 81375D8 + push {r4,lr} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + movs r0, 0 + movs r1, 0 + bl SetGpuReg + ldr r0, =gCaveTransitionTiles + ldr r1, =0x0600c000 + bl LZ77UnCompVram + ldr r0, =gCaveTransitionTilemap + ldr r1, =0x0600f800 + bl LZ77UnCompVram + movs r0, 0x50 + movs r1, 0 + bl SetGpuReg + movs r0, 0x52 + movs r1, 0 + bl SetGpuReg + movs r0, 0x54 + movs r1, 0 + bl SetGpuReg + ldr r1, =0x00001f0c + movs r0, 0x8 + bl SetGpuReg + movs r1, 0x8A + lsls r1, 5 + movs r0, 0 + bl SetGpuReg + ldr r0, =gCaveTransitionPalette_White + movs r1, 0xE0 + movs r2, 0x20 + bl LoadPalette + ldr r0, =gCaveTransitionPalette_Black + movs r1, 0 + movs r2, 0x20 + bl LoadPalette + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r0, r1 + ldr r1, =sub_8137678 + str r1, [r0] + movs r2, 0 + movs r1, 0x10 + strh r1, [r0, 0x8] + strh r2, [r0, 0xA] + strh r2, [r0, 0xC] + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81375D8 + + thumb_func_start sub_8137678 +sub_8137678: @ 8137678 + push {r4,lr} + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r4, r1, r2 + ldrh r1, [r4, 0xC] + cmp r1, 0xF + bhi _081376B4 + adds r2, r1, 0x1 + adds r0, r2, 0x1 + strh r0, [r4, 0xC] + movs r0, 0xF + subs r0, r1 + lsls r0, 1 + ldr r1, =gUnknown_085B2890 + adds r0, r1 + lsls r2, 17 + lsrs r2, 16 + movs r1, 0xE0 + bl LoadPalette + b _081376C8 + .pool +_081376B4: + ldr r1, =0x00001010 + movs r0, 0x52 + bl SetGpuReg + ldr r1, =0x00003e41 + movs r0, 0x50 + bl SetGpuReg + ldr r0, =sub_81376DC + str r0, [r4] +_081376C8: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137678 + + thumb_func_start sub_81376DC +sub_81376DC: @ 81376DC + push {r4,r5,lr} + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r5, r1, r2 + ldrh r0, [r5, 0xA] + movs r1, 0x10 + subs r1, r0 + lsls r1, 16 + lsrs r4, r1, 16 + movs r0, 0x80 + lsls r0, 21 + adds r1, r0 + lsrs r1, 16 + movs r0, 0x52 + bl SetGpuReg + cmp r4, 0 + beq _08137714 + ldrh r0, [r5, 0xA] + adds r0, 0x1 + strh r0, [r5, 0xA] + b _08137726 + .pool +_08137714: + ldr r0, =gCaveTransitionPalette_Black + movs r1, 0 + movs r2, 0x20 + bl LoadPalette + ldr r0, =gMain + ldr r0, [r0, 0x8] + bl SetMainCallback2 +_08137726: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81376DC diff --git a/asm/hof_pc.s b/asm/hof_pc.s new file mode 100644 index 000000000..2456c18ba --- /dev/null +++ b/asm/hof_pc.s @@ -0,0 +1,73 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start AccessHallOfFamePC +AccessHallOfFamePC: @ 8137C28 + push {lr} + ldr r0, =CB2_DoHallOfFamePC + bl SetMainCallback2 + bl ScriptContext2_Enable + pop {r0} + bx r0 + .pool + thumb_func_end AccessHallOfFamePC + + thumb_func_start ReturnFromHallOfFamePC +ReturnFromHallOfFamePC: @ 8137C3C + push {lr} + ldr r0, =c2_exit_to_overworld_2_switch + bl SetMainCallback2 + ldr r1, =gFieldCallback + ldr r0, =ReshowPCMenuAfterHallOfFamePC + str r0, [r1] + pop {r0} + bx r0 + .pool + thumb_func_end ReturnFromHallOfFamePC + + thumb_func_start ReshowPCMenuAfterHallOfFamePC +ReshowPCMenuAfterHallOfFamePC: @ 8137C5C + push {lr} + sub sp, 0x4 + bl ScriptContext2_Enable + bl sub_8085784 + bl sp109_CreatePCMenu + bl sub_80E2514 + movs r0, 0x1 + negs r0, r0 + movs r1, 0 + str r1, [sp] + movs r2, 0x10 + movs r3, 0 + bl BeginNormalPaletteFade + ldr r0, =Task_WaitForPaletteFade + movs r1, 0xA + bl CreateTask + add sp, 0x4 + pop {r0} + bx r0 + .pool + thumb_func_end ReshowPCMenuAfterHallOfFamePC + + thumb_func_start Task_WaitForPaletteFade +Task_WaitForPaletteFade: @ 8137C94 + push {lr} + lsls r0, 24 + lsrs r2, r0, 24 + ldr r0, =gPaletteFade + ldrb r1, [r0, 0x7] + movs r0, 0x80 + ands r0, r1 + cmp r0, 0 + bne _08137CAC + adds r0, r2, 0 + bl DestroyTask +_08137CAC: + pop {r0} + bx r0 + .pool + thumb_func_end Task_WaitForPaletteFade diff --git a/asm/macros.inc b/asm/macros.inc index 0c6644002..ee58cc14e 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -65,7 +65,7 @@ .byte 3, 4, \slot, \slot, \slot .endm - .macro sprite_oam x, y, priority, tile_num_offset, size + .macro subsprite x, y, priority, tile_num_offset, size .byte \x .byte \y .2byte ((\priority) << 14) | ((\tile_num_offset) << 4) | SPRITE_SIZE_\size @@ -114,7 +114,8 @@ .4byte 0 @ padding .endm - .macro obj_rot_scal_anim_end + .macro obj_rot_scal_anim_end unknown=0 .2byte 0x7fff - .fill 6 @ padding + .2byte \unknown + .fill 4 @ padding .endm diff --git a/asm/overworld.s b/asm/overworld.s index f86097ce9..5f58e6d14 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -130,7 +130,7 @@ sub_8084788: @ 8084788 ldr r0, =0x0000088c bl FlagClear bl sub_8085B2C - bl wild_pokemon_reroll + bl ResetCyclingRoadChallengeData bl UpdateLocationHistoryForRoamer bl RoamerMoveToOtherLocationSet pop {r0} @@ -1377,7 +1377,7 @@ _080850C8: bl CopyFieldObjectTemplatesToSav1 bl TrySetMapSaveWarpStatus bl ClearTempFieldEventData - bl wild_pokemon_reroll + bl ResetCyclingRoadChallengeData bl prev_quest_postbuffer_cursor_backup_reset adds r0, r6, 0 adds r1, r5, 0 @@ -1465,7 +1465,7 @@ _080851A2: bl sub_80EB218 bl TrySetMapSaveWarpStatus bl ClearTempFieldEventData - bl wild_pokemon_reroll + bl ResetCyclingRoadChallengeData bl prev_quest_postbuffer_cursor_backup_reset ldr r0, =gSaveBlock1Ptr ldr r1, [r0] @@ -2668,7 +2668,7 @@ sub_8085B2C: @ 8085B2C lsls r0, 6 cmp r1, r0 bne _08085B5C - bl sub_813793C + bl IsMirageIslandPresent lsls r0, 24 cmp r0, 0 bne _08085B5C diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index 9bf70a379..a222c43f9 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -1831,7 +1831,7 @@ _0813D924: lsls r6, 16 adds r1, r6 asrs r1, 16 - ldr r0, =gUnknown_085B40FC + ldr r0, =gSpriteTemplate_85B40FC movs r2, 0x8C movs r3, 0 bl CreateSprite diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 1b93496a7..1ba3b773d 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -21048,8 +21048,8 @@ _080D220C: bx r1 thumb_func_end sub_80D214C - thumb_func_start sub_80D2218 -sub_80D2218: @ 80D2218 + thumb_func_start CheckFreePokemonStorageSpace +CheckFreePokemonStorageSpace: @ 80D2218 push {r4-r7,lr} mov r7, r8 push {r7} @@ -21095,7 +21095,7 @@ _080D2262: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80D2218 + thumb_func_end CheckFreePokemonStorageSpace thumb_func_start sub_80D2270 sub_80D2270: @ 80D2270 diff --git a/asm/post_battle_event_funcs.s b/asm/post_battle_event_funcs.s new file mode 100644 index 000000000..da84a6565 --- /dev/null +++ b/asm/post_battle_event_funcs.s @@ -0,0 +1,165 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start GameClear +GameClear: @ 8137734 + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x1C + bl HealPlayerParty + ldr r4, =0x00000864 + adds r0, r4, 0 + bl FlagGet + lsls r0, 24 + lsrs r1, r0, 24 + cmp r1, 0x1 + bne _08137760 + ldr r0, =gHasHallOfFameRecords + strb r1, [r0] + b _0813776C + .pool +_08137760: + ldr r1, =gHasHallOfFameRecords + movs r0, 0 + strb r0, [r1] + adds r0, r4, 0 + bl FlagSet +_0813776C: + movs r0, 0x1 + bl GetGameStat + cmp r0, 0 + bne _0813778E + ldr r0, =gSaveBlock2Ptr + ldr r2, [r0] + ldrh r1, [r2, 0xE] + lsls r1, 16 + ldrb r0, [r2, 0x10] + lsls r0, 8 + orrs r1, r0 + ldrb r0, [r2, 0x11] + orrs r1, r0 + movs r0, 0x1 + bl sav12_xor_set +_0813778E: + bl sub_8076D48 + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldrb r0, [r0, 0x8] + cmp r0, 0 + bne _081377AC + movs r0, 0x1 + bl sub_8084F6C + b _081377B2 + .pool +_081377AC: + movs r0, 0x2 + bl sub_8084F6C +_081377B2: + movs r7, 0 + movs r6, 0 + add r0, sp, 0x18 + mov r8, r0 + mov r5, sp +_081377BC: + movs r0, 0x64 + adds r1, r6, 0 + muls r1, r0 + ldr r0, =gPlayerParty + adds r4, r1, r0 + movs r0, 0 + strb r6, [r5] + strb r0, [r5, 0x1] + adds r0, r4, 0 + movs r1, 0x5 + bl GetMonData + cmp r0, 0 + beq _0813780A + adds r0, r4, 0 + movs r1, 0x6 + bl GetMonData + cmp r0, 0 + bne _0813780A + adds r0, r4, 0 + movs r1, 0x43 + bl GetMonData + cmp r0, 0 + bne _0813780A + movs r0, 0x1 + mov r1, r8 + strb r0, [r1] + adds r0, r4, 0 + movs r1, 0x43 + add r2, sp, 0x18 + bl SetMonData + adds r0, r4, 0 + bl GetRibbonCount + strb r0, [r5, 0x1] + movs r7, 0x1 +_0813780A: + adds r5, 0x4 + adds r6, 0x1 + cmp r6, 0x5 + ble _081377BC + cmp r7, 0x1 + bne _0813785A + movs r0, 0x2A + bl IncrementGameStat + ldr r0, =0x0000089b + bl FlagSet + mov r3, sp + add r2, sp, 0x4 + movs r6, 0x4 +_08137828: + ldrb r1, [r3, 0x1] + ldrb r0, [r2, 0x1] + cmp r0, r1 + bls _08137838 + ldr r1, [sp] + ldr r0, [r2] + str r0, [sp] + str r1, [r2] +_08137838: + adds r2, 0x4 + subs r6, 0x1 + cmp r6, 0 + bge _08137828 + mov r0, sp + ldrb r0, [r0, 0x1] + cmp r0, 0x4 + bls _0813785A + mov r0, sp + ldrb r1, [r0] + movs r0, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + movs r1, 0x43 + bl sub_80EE4DC +_0813785A: + ldr r0, =CB2_DoHallOfFameScreen + bl SetMainCallback2 + movs r0, 0 + add sp, 0x1C + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r1} + bx r1 + .pool + thumb_func_end GameClear + + thumb_func_start sp0C8_whiteout_maybe +sp0C8_whiteout_maybe: @ 813787C + push {lr} + ldr r0, =CB2_WhiteOut + bl SetMainCallback2 + movs r0, 0 + pop {r1} + bx r1 + .pool + thumb_func_end sp0C8_whiteout_maybe diff --git a/asm/time_events.s b/asm/time_events.s new file mode 100644 index 000000000..de2d2d165 --- /dev/null +++ b/asm/time_events.s @@ -0,0 +1,225 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start GetMirageRnd +GetMirageRnd: @ 8137890 + push {r4,lr} + ldr r0, =0x00004024 + bl VarGet + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r0, =0x00004025 + bl VarGet + lsls r0, 16 + lsrs r0, 16 + lsls r4, 16 + orrs r4, r0 + adds r0, r4, 0 + pop {r4} + pop {r1} + bx r1 + .pool + thumb_func_end GetMirageRnd + + thumb_func_start SetMirageRnd +SetMirageRnd: @ 81378BC + push {r4,lr} + adds r4, r0, 0 + ldr r0, =0x00004024 + lsrs r1, r4, 16 + bl VarSet + ldr r0, =0x00004025 + lsls r4, 16 + lsrs r4, 16 + adds r1, r4, 0 + bl VarSet + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end SetMirageRnd + + thumb_func_start InitMirageRnd +InitMirageRnd: @ 81378E4 + push {r4,lr} + bl Random + adds r4, r0, 0 + bl Random + lsls r4, 16 + lsls r0, 16 + lsrs r0, 16 + orrs r4, r0 + adds r0, r4, 0 + bl SetMirageRnd + pop {r4} + pop {r0} + bx r0 + thumb_func_end InitMirageRnd + + thumb_func_start UpdateMirageRnd +UpdateMirageRnd: @ 8137904 + push {r4,lr} + lsls r0, 16 + lsrs r4, r0, 16 + bl GetMirageRnd + adds r1, r0, 0 + cmp r4, 0 + beq _08137928 + ldr r3, =0x41c64e6d + ldr r2, =0x00003039 +_08137918: + adds r0, r1, 0 + muls r0, r3 + adds r1, r0, r2 + subs r0, r4, 0x1 + lsls r0, 16 + lsrs r4, r0, 16 + cmp r4, 0 + bne _08137918 +_08137928: + adds r0, r1, 0 + bl SetMirageRnd + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end UpdateMirageRnd + + thumb_func_start IsMirageIslandPresent +IsMirageIslandPresent: @ 813793C + push {r4-r6,lr} + bl GetMirageRnd + lsrs r6, r0, 16 + movs r5, 0 +_08137946: + movs r0, 0x64 + adds r1, r5, 0 + muls r1, r0 + ldr r0, =gPlayerParty + adds r4, r1, r0 + adds r0, r4, 0 + movs r1, 0xB + bl GetMonData + cmp r0, 0 + beq _08137978 + adds r0, r4, 0 + movs r1, 0 + bl GetMonData + ldr r1, =0x0000ffff + ands r1, r0 + cmp r1, r6 + bne _08137978 + movs r0, 0x1 + b _08137980 + .pool +_08137978: + adds r5, 0x1 + cmp r5, 0x5 + ble _08137946 + movs r0, 0 +_08137980: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end IsMirageIslandPresent + + thumb_func_start UpdateShoalTideFlag +UpdateShoalTideFlag: @ 8137988 + push {lr} + bl get_map_light_from_warp0 + lsls r0, 24 + lsrs r0, 24 + bl is_light_level_1_2_3_5_or_6 + lsls r0, 24 + cmp r0, 0 + beq _081379CE + bl RtcCalcLocalTime + ldr r1, =gUnknown_085B2B44 + ldr r0, =gLocalTime + ldrb r0, [r0, 0x2] + lsls r0, 24 + asrs r0, 24 + adds r0, r1 + ldrb r0, [r0] + cmp r0, 0 + beq _081379C8 + ldr r0, =0x0000089a + bl FlagSet + b _081379CE + .pool +_081379C8: + ldr r0, =0x0000089a + bl FlagClear +_081379CE: + pop {r0} + bx r0 + .pool + thumb_func_end UpdateShoalTideFlag + + thumb_func_start Task_WaitWeather +Task_WaitWeather: @ 81379D8 + push {r4,lr} + lsls r0, 24 + lsrs r4, r0, 24 + bl sub_80AC3BC + lsls r0, 24 + cmp r0, 0 + beq _081379F2 + bl EnableBothScriptContexts + adds r0, r4, 0 + bl DestroyTask +_081379F2: + pop {r4} + pop {r0} + bx r0 + thumb_func_end Task_WaitWeather + + thumb_func_start WaitWeather +WaitWeather: @ 81379F8 + push {lr} + ldr r0, =Task_WaitWeather + movs r1, 0x50 + bl CreateTask + pop {r0} + bx r0 + .pool + thumb_func_end WaitWeather + + thumb_func_start InitBirchState +InitBirchState: @ 8137A0C + push {lr} + ldr r0, =0x00004049 + bl GetVarPointer + movs r1, 0 + strh r1, [r0] + pop {r0} + bx r0 + .pool + thumb_func_end InitBirchState + + thumb_func_start UpdateBirchState +UpdateBirchState: @ 8137A20 + push {r4,r5,lr} + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r0, =0x00004049 + bl GetVarPointer + adds r5, r0, 0 + ldrh r0, [r5] + adds r4, r0 + strh r4, [r5] + ldrh r0, [r5] + movs r1, 0x7 + bl __umodsi3 + strh r0, [r5] + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end UpdateBirchState diff --git a/constants/species_constants.inc b/constants/species_constants.inc index 7ee94df61..64f1e19f7 100644 --- a/constants/species_constants.inc +++ b/constants/species_constants.inc @@ -384,3 +384,4 @@ .set SPECIES_JIRACHI, 0x199 .set SPECIES_DEOXYS, 0x19a .set SPECIES_CHIMECHO, 0x19b + .set SPECIES_EGG, 0x19c diff --git a/data/contest.s b/data/contest.s index cdd4de735..970a5d9b8 100644 --- a/data/contest.s +++ b/data/contest.s @@ -15,111 +15,127 @@ gUnknown_08587A74:: @ 8587A74 obj_tiles gUnknown_08C19450, 0x0020, 0x4e20 .align 2 -gUnknown_08587A7C:: @ 8587A7C - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +gOamData_8587A7C:: @ 8587A7C + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 .align 2 -gUnknown_08587A84:: @ 8587A84 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 +gSpriteAffineAnim_8587A84:: @ 8587A84 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_end .align 2 -gUnknown_08587A94:: @ 8587A94 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff6, 0xfff6, 0x14ec, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 +gSpriteAffineAnim_8587A94:: @ 8587A94 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, -20, 20 + obj_rot_scal_anim_end .align 2 -gUnknown_08587AAC:: @ 8587AAC - .2byte 0x0038, 0x0038, 0x0000, 0x0000, 0x000a, 0x000a, 0x1414, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 +gSpriteAffineAnim_8587AAC:: @ 8587AAC + obj_rot_scal_anim_frame 0x38, 0x38, 0, 0 + obj_rot_scal_anim_frame 0xA, 0xA, 20, 20 + obj_rot_scal_anim_end .align 2 -gUnknown_08587AC4:: @ 8587AC4 - .4byte gUnknown_08587A84 - .4byte gUnknown_08587A94 - .4byte gUnknown_08587AAC +gSpriteAffineAnimTable_8587AC4:: @ 8587AC4 + .4byte gSpriteAffineAnim_8587A84 + .4byte gSpriteAffineAnim_8587A94 + .4byte gSpriteAffineAnim_8587AAC .align 2 -gUnknown_08587AD0:: @ 8587AD0 - spr_template 0x4e20, 0xabe0, gUnknown_08587A7C, gDummySpriteAnimTable, NULL, gUnknown_08587AC4, SpriteCallbackDummy +gSpriteTemplate_8587AD0:: @ 8587AD0 + spr_template 0x4e20, 0xabe0, gOamData_8587A7C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8587AC4, SpriteCallbackDummy .align 2 gUnknown_08587AE8:: @ 8587AE8 - obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e22 - obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e23 - obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e24 - obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e25 + obj_tiles gContestNextTurnGfx, 0x0100, 0x4e22 + obj_tiles gContestNextTurnGfx, 0x0100, 0x4e23 + obj_tiles gContestNextTurnGfx, 0x0100, 0x4e24 + obj_tiles gContestNextTurnGfx, 0x0100, 0x4e25 .align 2 gUnknown_08587B08:: @ 8587B08 - obj_pal gUnknown_08D8ECA4, 0x4e22 + obj_pal gContestPal, 0x4e22 .align 2 -gUnknown_08587B10:: @ 8587B10 - .byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00 +gOamData_8587B10:: @ 8587B10 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0000 .align 2 -gUnknown_08587B18:: @ 8587B18 - spr_template 0x4e22, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 0x4e23, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 0x4e24, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 0x4e25, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +gSpriteTemplate_8587B18:: @ 8587B18 + spr_template 0x4e22, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0x4e23, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0x4e24, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0x4e25, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 -gUnknown_08587B78:: @ 8587B78 - .byte 0xe4, 0xfc, 0x05, 0x00, 0x04, 0xfc, 0x45, 0x00 +gSubspriteTable_8587B78:: @ 8587B78 + subsprite -28, -4, 0, 0, 32x8 + subsprite 4, -4, 0, 4, 32x8 .align 2 -gUnknown_08587B80:: @ 8587B80 - .4byte 0x00000002, gUnknown_08587B78 +gSubspriteTables_8587B80:: @ 8587B80 + .4byte 2, gSubspriteTable_8587B78 .align 2 gUnknown_08587B88:: @ 8587B88 obj_tiles gUnknown_08C19168, 0x0180, 0xabe1 .align 2 -gUnknown_08587B90:: @ 8587B90 - .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00 +gOamData_8587B90:: @ 8587B90 + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0000 .align 2 -gUnknown_08587B98:: @ 8587B98 - spr_template 0xabe1, 0xabe0, gUnknown_08587B90, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +gSpriteTemplate_8587B98:: @ 8587B98 + spr_template 0xabe1, 0xabe0, gOamData_8587B90, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 gUnknown_08587BB0:: @ 8587BB0 - obj_tiles gUnknown_08D8EAE4, 0x0400, 0xabe2 + obj_tiles gContestApplauseGfx, 0x0400, 0xabe2 .align 2 gUnknown_08587BB8:: @ 8587BB8 - obj_pal gUnknown_08D8ECA4, 0xabe2 + obj_pal gContestPal, 0xabe2 .align 2 -gUnknown_08587BC0:: @ 8587BC0 - .byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 +gOamData_8587BC0:: @ 8587BC0 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x0000 .align 2 -gUnknown_08587BC8:: @ 8587BC8 - spr_template 0xabe2, 0xabe2, gUnknown_08587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +gSpriteTemplate_8587BC8:: @ 8587BC8 + spr_template 0xabe2, 0xabe2, gOamData_8587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 -gUnknown_08587BE0:: @ 8587BE0 - .byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x2c, 0x00, 0x00 +gOamData_8587BE0:: @ 8587BE0 + .2byte 0x0000 + .2byte 0xC000 + .2byte 0x2C00 .align 2 -gUnknown_08587BE8:: @ 8587BE8 - spr_template 0x4e21, 0x4e21, gUnknown_08587BE0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +gSpriteTemplate_8587BE8:: @ 8587BE8 + spr_template 0x4e21, 0x4e21, gOamData_8587BE0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 gUnknown_08587C00:: @ 8587C00 - obj_tiles gUnknown_08C1C3E4, 0x0800, 0x4e21 + obj_tiles gContestJudgeGfx, 0x0800, 0x4e21 .align 2 gUnknown_08587C08:: @ 8587C08 - obj_tiles gUnknown_08C19284, 0x0380, 0xabe0 + obj_tiles gContestJudgeSymbolsGfx, 0x0380, 0xabe0 .align 2 gUnknown_08587C10:: @ 8587C10 - obj_pal gUnknown_08C19428, 0xabe0 + obj_pal gContest3Pal, 0xabe0 .align 2 -gUnknown_08587C18:: @ 8587C18 +gSpriteTemplate_8587C18:: @ 8587C18 spr_template 0xabe0, 0xabe0, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 @@ -300,10 +316,10 @@ gUnknown_085898A4:: @ 85898A4 .align 2 gUnknown_08589904:: @ 8589904 - obj_tiles gUnknown_08C0237C, 0x1000, 0x80e8 - obj_tiles gUnknown_08C0237C, 0x1000, 0x80e9 - obj_tiles gUnknown_08C0237C, 0x1000, 0x80ea - obj_tiles gUnknown_08C0237C, 0x1000, 0x80eb + obj_tiles gBlankGfxCompressed, 0x1000, 0x80e8 + obj_tiles gBlankGfxCompressed, 0x1000, 0x80e9 + obj_tiles gBlankGfxCompressed, 0x1000, 0x80ea + obj_tiles gBlankGfxCompressed, 0x1000, 0x80eb .align 2 gUnknown_08589924:: @ 8589924 Yup this is super dangerous but that's how it is here @@ -313,29 +329,35 @@ gUnknown_08589924:: @ 8589924 Yup this is super dangerous but that's how it is h obj_pal gHeap + 0x1A104, 0x80eb .align 2 -gUnknown_08589944:: @ 8589944 - .byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 +gOamData_8589944:: @ 8589944 + .2byte 0x0700 + .2byte 0xC000 + .2byte 0x0000 .align 2 -gUnknown_0858994C:: @ 858994C - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 +gSpriteAffineAnim_858994C:: @ 858994C + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_end .align 2 -gUnknown_0858995C:: @ 858995C - .2byte 0x0003, 0x0003, 0x0f00, 0x0000, 0xfffd, 0xfffd, 0x0f00, 0x0000, 0x0003, 0x0003, 0x0f00, 0x0000, 0xfffd, 0xfffd, 0x0f00, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 +gSpriteAffineAnim_858995C:: @ 858995C + obj_rot_scal_anim_frame 0x3, 0x3, 0, 15 + obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15 + obj_rot_scal_anim_frame 0x3, 0x3, 0, 15 + obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15 + obj_rot_scal_anim_end .align 2 -gUnknown_08589984:: @ 8589984 - .4byte gUnknown_0858994C - .4byte gUnknown_0858995C +gSpriteAffineAnimTable_8589984:: @ 8589984 + .4byte gSpriteAffineAnim_858994C + .4byte gSpriteAffineAnim_858995C .align 2 -gUnknown_0858998C:: @ 858998C - spr_template 0x80e8, 0x80e8, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy - spr_template 0x80e9, 0x80e9, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy - spr_template 0x80ea, 0x80ea, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy - spr_template 0x80eb, 0x80eb, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy +gSpriteTemplate_858998C:: @ 858998C + spr_template 0x80e8, 0x80e8, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy + spr_template 0x80e9, 0x80e9, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy + spr_template 0x80ea, 0x80ea, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy + spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy .align 2 gUnknown_085899EC:: @ 85899EC diff --git a/data/contest_link_80F57C4.s b/data/contest_link_80F57C4.s index 46c390df6..6bf51d174 100644 --- a/data/contest_link_80F57C4.s +++ b/data/contest_link_80F57C4.s @@ -1,30 +1,31 @@ -@ the third big chunk of data - .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata - .align 2 + + .align 2 gUnknown_0858D6B0:: @ 858D6B0 .incbin "graphics/unknown/unknown_58D6B0.gbapal" - .align 2 + .align 2 gUnknown_0858D6D0:: @ 858D6D0 .incbin "graphics/unknown/unknown_58D6D0.4bpp" - .align 2 -gUnknown_0858D7D0:: @ 858D7D0 + .align 2 +gMiscBlank_Pal:: @ 858D7D0 .incbin "graphics/interface/blank.gbapal" - .align 2 -gUnknown_0858D7F0:: @ 858D7F0 - .byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x2c, 0x00, 0x00 + .align 2 +gOamData_858D7F0:: @ 858D7F0 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x2C00 - .align 2 -gUnknown_0858D7F8:: @ 858D7F8 - spr_template 0x0bc1, 0x0bc1, gUnknown_0858D7F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 +gSpriteTemplate_858D7F8:: @ 858D7F8 + spr_template 0x0bc1, 0x0bc1, gOamData_858D7F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - .align 2 + .align 2 gUnknown_0858D810:: @ 858D810 obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc1 obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc2 @@ -35,31 +36,33 @@ gUnknown_0858D810:: @ 858D810 obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc7 obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc8 - .align 2 + .align 2 gUnknown_0858D850:: @ 858D850 - obj_pal gUnknown_0858D7D0, 0x0bc1 + obj_pal gMiscBlank_Pal, 0x0bc1 - .align 2 -gUnknown_0858D858:: @ 858D858 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .align 2 +gOamData_858D858:: @ 858D858 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 - .align 2 -gUnknown_0858D860:: @ 858D860 - spr_template 0x0bc9, 0x0bc9, gUnknown_0858D858, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F7768 + .align 2 +gSpriteTemplate_858D860:: @ 858D860 + spr_template 0x0bc9, 0x0bc9, gOamData_858D858, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F7768 - .align 2 + .align 2 gUnknown_0858D878:: @ 858D878 obj_tiles gContestConfetti_Gfx, 0x0220, 0x0bc9 - .align 2 + .align 2 gUnknown_0858D880:: @ 858D880 obj_pal gContestConfetti_Pal, 0x0bc9 - .align 2 + .align 2 gUnknown_0858D888:: @ 858D888 .4byte 0x000001e0, 0x00003181, 0x000031c2, 0x000031a3 - .align 2 + .align 2 gUnknown_0858D898:: @ 858D898 window_template 0x01, 0x07, 0x04, 0x0c, 0x02, 0x0f, 0x0302 window_template 0x01, 0x07, 0x07, 0x0c, 0x02, 0x0f, 0x031a @@ -67,19 +70,19 @@ gUnknown_0858D898:: @ 858D898 window_template 0x01, 0x07, 0x0d, 0x0c, 0x02, 0x0f, 0x034a window_template_terminator - .align 2 + .align 2 gUnknown_0858D8C0:: @ 858D8C0 .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00 - .align 2 -gUnknown_0858D8C8:: @ 858D8C8 + .align 2 +gSpriteTemplate_858D8C8:: @ 858D8C8 spr_template 0x56ce, 0x0000, gUnknown_0858D8C0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - .align 2 + .align 2 gUnknown_0858D8E0:: @ 858D8E0 obj_tiles gMiscBlank_Gfx, 0x0200, 0x56ce - .align 2 + .align 2 gUnknown_0858D8E8:: @ 858D8E8 .byte 0x01, 0x0f, 0x0e, 0x00 diff --git a/data/event_scripts.s b/data/event_scripts.s index f44538294..d0f286848 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1481,7 +1481,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 return OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43 - specialvar VAR_RESULT, sub_8139540 + specialvar VAR_RESULT, IsPokerusInParty compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A5F compare VAR_RESULT, 0 @@ -1724,7 +1724,7 @@ EventScript_271D2A:: @ 8271D2A copyvar VAR_0x8004, VAR_0x8008 msgbox gUnknown_08272A9A, 4 special sub_80EDCE8 - special sub_8138BC8 + special SetFlagInVar releaseall end @@ -1761,7 +1761,7 @@ EventScript_271D89:: @ 8271D89 EventScript_271D92:: @ 8271D92 lockall setvar VAR_0x8004, 0 - special sp0D9_ComputerRelated + special DoPCTurnOnEffect playse SE_PC_ON msgbox Text_27265A, 4 goto EventScript_271DAC @@ -1815,7 +1815,7 @@ EventScript_271E3E:: @ 8271E3E EventScript_271E47:: @ 8271E47 setvar VAR_0x8004, 0 playse SE_PC_OFF - special sub_8138E20 + special DoPCTurnOffEffect releaseall end @@ -1823,7 +1823,7 @@ EventScript_271E54:: @ 8271E54 checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_271E47 playse SE_PC_LOGIN - special sub_8137C28 + special AccessHallOfFamePC waitstate goto EventScript_271DBC end @@ -2202,7 +2202,7 @@ EventScript_27208F:: @ 827208F lockall msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, 4 fadescreen 1 - special sub_8138C94 + special FieldShowRegionMap waitstate releaseall end @@ -2292,7 +2292,7 @@ Route101_EventScript_27216F:: @ 827216F Route101_EventScript_272179:: @ 8272179 copyvar VAR_0x8004, VAR_0x8009 - special sub_8137C10 + special ShowPokedexRatingMessage waitmessage waitbuttonpress return @@ -2300,7 +2300,7 @@ Route101_EventScript_272179:: @ 8272179 EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184 Route101_EventScript_272184:: @ 8272184 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_8137A4C + specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x800A, VAR_RESULT @@ -2311,7 +2311,7 @@ Route101_EventScript_272184:: @ 8272184 compare VAR_0x800A, 0 goto_eq Route101_EventScript_27374E setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_8137A4C + specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 buffernumberstring 0, VAR_0x8008 @@ -4594,7 +4594,7 @@ EventScript_275BE8:: @ 8275BE8 setfieldeffectargument 0, VAR_RESULT setorcopyvar VAR_0x8004, VAR_RESULT lockall - special sub_8139200 + special GetSecretBaseNearbyMapName msgbox Text_276A3D, 5 compare VAR_RESULT, 0 goto_eq EventScript_275CDE diff --git a/data/rom_81370FC.s b/data/field_specials.s index 2cd824d44..8f9734a01 100644 --- a/data/rom_81370FC.s +++ b/data/field_specials.s @@ -1,75 +1,9 @@ -@ the fourth big chunk of data - .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata .align 2 -gUnknown_085B27C8:: @ 85B27C8 - .byte 0x01, 0x04, 0x01, 0x00 - .4byte sub_81375A8 - .byte 0x02, 0x04, 0x01, 0x00 - .4byte sub_81375A8 - .byte 0x03, 0x04, 0x01, 0x00 - .4byte sub_81375A8 - .byte 0x05, 0x04, 0x01, 0x00 - .4byte sub_81375A8 - .byte 0x06, 0x04, 0x01, 0x00 - .4byte sub_81375A8 - .byte 0x07, 0x04, 0x01, 0x00 - .4byte sub_81375A8 - .byte 0x08, 0x04, 0x01, 0x00 - .4byte sub_81375A8 - .byte 0x09, 0x04, 0x01, 0x00 - .4byte sub_81375A8 - .byte 0x04, 0x01, 0x00, 0x01 - .4byte sub_81373F0 - .byte 0x04, 0x02, 0x00, 0x01 - .4byte sub_81373F0 - .byte 0x04, 0x03, 0x00, 0x01 - .4byte sub_81373F0 - .byte 0x04, 0x05, 0x00, 0x01 - .4byte sub_81373F0 - .byte 0x04, 0x06, 0x00, 0x01 - .4byte sub_81373F0 - .byte 0x04, 0x07, 0x00, 0x01 - .4byte sub_81373F0 - .byte 0x04, 0x08, 0x00, 0x01 - .4byte sub_81373F0 - .byte 0x04, 0x09, 0x00, 0x01 - .4byte sub_81373F0 - .byte 0x00, 0x00, 0x00, 0x00 - .4byte NULL - - .align 2 -gUnknown_085B2850:: @ 85B2850 - .incbin "graphics/unknown/unknown_5B2850.gbapal" - - .align 2 -gUnknown_085B2870:: @ 85B2870 - .incbin "graphics/unknown/unknown_5B2870.gbapal" - - .align 2 -gUnknown_085B2890:: @ 85B2890 - .incbin "graphics/unknown/unknown_5B2890.gbapal" - - .align 2 -gUnknown_085B28A0:: @ 85B28A0 - .incbin "graphics/unknown/unknown_5B28A0.gbapal" - - .align 2 -gUnknown_085B28B0:: @ 85B28B0 - .incbin "graphics/unknown/unknown_5B28B0.bin.lz" - - .align 2 -gUnknown_085B2A90:: @ 85B2A90 - .incbin "graphics/unknown/unknown_5B2A90.4bpp.lz" - -gUnknown_085B2B44:: @ 85B2B44 - .byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01 - - .align 2 gUnknown_085B2B5C:: @ 85B2B5C .byte 0x07, 0x09, 0x08, 0x0a diff --git a/data/fldeff_flash.s b/data/fldeff_flash.s new file mode 100644 index 000000000..3c3071b37 --- /dev/null +++ b/data/fldeff_flash.s @@ -0,0 +1,81 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_085B27C8:: @ 85B27C8 + .byte 0x01, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + + .byte 0x02, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + + .byte 0x03, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + + .byte 0x05, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + + .byte 0x06, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + + .byte 0x07, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + + .byte 0x08, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + + .byte 0x09, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + + .byte 0x04, 0x01, 0x00, 0x01 + .4byte sub_81373F0 + + .byte 0x04, 0x02, 0x00, 0x01 + .4byte sub_81373F0 + + .byte 0x04, 0x03, 0x00, 0x01 + .4byte sub_81373F0 + + .byte 0x04, 0x05, 0x00, 0x01 + .4byte sub_81373F0 + + .byte 0x04, 0x06, 0x00, 0x01 + .4byte sub_81373F0 + + .byte 0x04, 0x07, 0x00, 0x01 + .4byte sub_81373F0 + + .byte 0x04, 0x08, 0x00, 0x01 + .4byte sub_81373F0 + + .byte 0x04, 0x09, 0x00, 0x01 + .4byte sub_81373F0 + + .byte 0x00, 0x00, 0x00, 0x00 + .4byte NULL + + .align 2 +gCaveTransitionPalette_White:: @ 85B2850 + .incbin "graphics/misc/cave_transition_white.gbapal" + + .align 2 +gCaveTransitionPalette_Black:: @ 85B2870 + .incbin "graphics/misc/cave_transition_black.gbapal" + + .align 2 +gUnknown_085B2890:: @ 85B2890 + .incbin "graphics/misc/85B2890.gbapal" + + .align 2 +gUnknown_085B28A0:: @ 85B28A0 + .incbin "graphics/misc/85B28A0.gbapal" + + .align 2 +gCaveTransitionTilemap:: @ 85B28B0 + .incbin "graphics/misc/cave_transition_map.bin.lz" + + .align 2 +gCaveTransitionTiles:: @ 85B2A90 + .incbin "graphics/misc/cave_transition.4bpp.lz" diff --git a/data/graphics.s b/data/graphics.s index 2f1a2c956..e135a63e3 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -120,7 +120,7 @@ gInterfacePal_PremierBall:: gOpenPokeballGfx:: @ 8C02300 .incbin "baserom.gba", 0xc02300, 0x7c -gUnknown_08C0237C:: @ 8C0237C +gBlankGfxCompressed:: @ 8C0237C .incbin "baserom.gba", 0xc0237c, 0x7074 gUnknown_08C093F0:: @ 8C093F0 @@ -167,10 +167,10 @@ gUnknown_08C1850C:: @ 8C1850C gUnknown_08C19168:: @ 8C19168 .incbin "baserom.gba", 0xc19168, 0x11c -gUnknown_08C19284:: @ 8C19284 +gContestJudgeSymbolsGfx:: @ 8C19284 .incbin "baserom.gba", 0xc19284, 0x1a4 -gUnknown_08C19428:: @ 8C19428 +gContest3Pal:: @ 8C19428 .incbin "baserom.gba", 0xc19428, 0x28 gUnknown_08C19450:: @ 8C19450 @@ -197,7 +197,7 @@ gUnknown_08C1A490:: @ 8C1A490 gUnknown_08C1A564:: @ 8C1A564 .incbin "baserom.gba", 0xc1a564, 0x1E80 -gUnknown_08C1C3E4:: @ 8C1C3E4 +gContestJudgeGfx:: @ 8C1C3E4 .incbin "baserom.gba", 0xc1c3e4, 0x2d4 gUnknown_08C1C6B8:: @ 8C1C6B8 @@ -774,7 +774,7 @@ gUnknown_08D8D58C:: @ 8D8D58C gUnknown_08D8DAB8:: @ 8D8DAB8 .incbin "baserom.gba", 0xd8dab8, 0xe84 -gUnknown_08D8E93C:: @ 8D8E93C +gContestNextTurnGfx:: @ 8D8E93C .incbin "baserom.gba", 0xd8e93c, 0x78 gUnknown_08D8E9B4:: @ 8D8E9B4 @@ -783,13 +783,13 @@ gUnknown_08D8E9B4:: @ 8D8E9B4 gUnknown_08D8EA34:: @ 8D8EA34 .incbin "baserom.gba", 0xd8ea34, 0xb0 -gUnknown_08D8EAE4:: @ 8D8EAE4 +gContestApplauseGfx:: @ 8D8EAE4 .incbin "baserom.gba", 0xd8eaE4, 0x140 gUnknown_08D8EC24:: @ 8D8EC24 .incbin "baserom.gba", 0xd8ec24, 0x80 -gUnknown_08D8ECA4:: @ 8D8ECA4 +gContestPal:: @ 8D8ECA4 .incbin "baserom.gba", 0xd8eca4, 0xef8 gUnknown_08D8FB9C:: @ 8D8FB9C diff --git a/data/graphics/field_objects/field_object_oam.inc b/data/graphics/field_objects/field_object_oam.inc index 0e02efa57..ea4da1c02 100644 --- a/data/graphics/field_objects/field_object_oam.inc +++ b/data/graphics/field_objects/field_object_oam.inc @@ -40,26 +40,26 @@ gFieldObjectBaseOam_64x64:: @ 8509524 .align 2 gFieldObjectSpriteOamTable_16x16_0:: @ 850952C - sprite_oam -8, -8, 2, 0, 16x16 + subsprite -8, -8, 2, 0, 16x16 .align 2 gFieldObjectSpriteOamTable_16x16_1:: @ 8509530 - sprite_oam -8, -8, 1, 0, 16x16 + subsprite -8, -8, 1, 0, 16x16 .align 2 gFieldObjectSpriteOamTable_16x16_2:: @ 8509534 - sprite_oam -8, -8, 2, 0, 16x8 - sprite_oam -8, 0, 3, 2, 16x8 + subsprite -8, -8, 2, 0, 16x8 + subsprite -8, 0, 3, 2, 16x8 .align 2 gFieldObjectSpriteOamTable_16x16_3:: @ 850953C - sprite_oam -8, -8, 2, 0, 16x16 - sprite_oam -8, -8, 3, 0, 16x16 + subsprite -8, -8, 2, 0, 16x16 + subsprite -8, -8, 3, 0, 16x16 .align 2 gFieldObjectSpriteOamTable_16x16_4:: @ 8509544 - sprite_oam -8, -8, 1, 0, 16x16 - sprite_oam -8, -8, 3, 0, 16x16 + subsprite -8, -8, 1, 0, 16x16 + subsprite -8, -8, 3, 0, 16x16 .align 2 gFieldObjectSpriteOamTables_16x16:: @ 850954C @@ -83,27 +83,27 @@ gFieldObjectSpriteOamTables_16x16:: @ 850954C .align 2 gFieldObjectSpriteOamTable_16x32_0:: @ 850957C - sprite_oam -8, -16, 2, 0, 16x32 + subsprite -8, -16, 2, 0, 16x32 .align 2 gFieldObjectSpriteOamTable_16x32_1:: @ 8509580 - sprite_oam -8, -16, 1, 0, 16x32 + subsprite -8, -16, 1, 0, 16x32 .align 2 gFieldObjectSpriteOamTable_16x32_2:: @ 8509584 - sprite_oam -8, -16, 2, 0, 16x16 - sprite_oam -8, 0, 2, 4, 16x8 - sprite_oam -8, 8, 3, 6, 16x8 + subsprite -8, -16, 2, 0, 16x16 + subsprite -8, 0, 2, 4, 16x8 + subsprite -8, 8, 3, 6, 16x8 .align 2 gFieldObjectSpriteOamTable_16x32_3:: @ 8509590 - sprite_oam -8, -16, 2, 0, 16x16 - sprite_oam -8, 0, 3, 4, 16x16 + subsprite -8, -16, 2, 0, 16x16 + subsprite -8, 0, 3, 4, 16x16 .align 2 gFieldObjectSpriteOamTable_16x32_4:: @ 8509598 - sprite_oam -8, -16, 1, 0, 16x16 - sprite_oam -8, 0, 3, 4, 16x16 + subsprite -8, -16, 1, 0, 16x16 + subsprite -8, 0, 3, 4, 16x16 .align 2 gFieldObjectSpriteOamTables_16x32:: @ 85095A0 @@ -127,27 +127,27 @@ gFieldObjectSpriteOamTables_16x32:: @ 85095A0 .align 2 gFieldObjectSpriteOamTable_32x32_0:: @ 85095D0 - sprite_oam -16, -16, 2, 0, 32x32 + subsprite -16, -16, 2, 0, 32x32 .align 2 gFieldObjectSpriteOamTable_32x32_1:: @ 85095D4 - sprite_oam -16, -16, 1, 0, 32x32 + subsprite -16, -16, 1, 0, 32x32 .align 2 gFieldObjectSpriteOamTable_32x32_2:: @ 85095D8 - sprite_oam -16, -16, 2, 0, 32x16 - sprite_oam -16, 0, 2, 8, 32x8 - sprite_oam -16, 8, 3, 12, 32x8 + subsprite -16, -16, 2, 0, 32x16 + subsprite -16, 0, 2, 8, 32x8 + subsprite -16, 8, 3, 12, 32x8 .align 2 gFieldObjectSpriteOamTable_32x32_3:: @ 85095E4 - sprite_oam -16, -16, 2, 0, 32x16 - sprite_oam -16, 0, 3, 8, 32x16 + subsprite -16, -16, 2, 0, 32x16 + subsprite -16, 0, 3, 8, 32x16 .align 2 gFieldObjectSpriteOamTable_32x32_4:: @ 85095EC - sprite_oam -16, -16, 1, 0, 32x16 - sprite_oam -16, 0, 3, 8, 32x16 + subsprite -16, -16, 1, 0, 32x16 + subsprite -16, 0, 3, 8, 32x16 .align 2 gFieldObjectSpriteOamTables_32x32:: @ 85095F4 @@ -171,18 +171,18 @@ gFieldObjectSpriteOamTables_32x32:: @ 85095F4 .align 2 gFieldObjectSpriteOamTable_Truck_0:: @ 8509624 - sprite_oam -24, -24, 2, 0, 32x8 - sprite_oam 8, -24, 2, 4, 16x8 - sprite_oam -24, -16, 2, 6, 32x8 - sprite_oam 8, -16, 2, 10, 16x8 - sprite_oam -24, -8, 2, 12, 32x8 - sprite_oam 8, -8, 2, 16, 16x8 - sprite_oam -24, 0, 2, 18, 32x8 - sprite_oam 8, 0, 2, 22, 16x8 - sprite_oam -24, 8, 2, 24, 32x8 - sprite_oam 8, 8, 2, 28, 16x8 - sprite_oam -24, 16, 2, 30, 32x8 - sprite_oam 8, 16, 2, 34, 16x8 + subsprite -24, -24, 2, 0, 32x8 + subsprite 8, -24, 2, 4, 16x8 + subsprite -24, -16, 2, 6, 32x8 + subsprite 8, -16, 2, 10, 16x8 + subsprite -24, -8, 2, 12, 32x8 + subsprite 8, -8, 2, 16, 16x8 + subsprite -24, 0, 2, 18, 32x8 + subsprite 8, 0, 2, 22, 16x8 + subsprite -24, 8, 2, 24, 32x8 + subsprite 8, 8, 2, 28, 16x8 + subsprite -24, 16, 2, 30, 32x8 + subsprite 8, 16, 2, 34, 16x8 .align 2 gFieldObjectSpriteOamTables_Truck:: @ 8509654 @@ -206,19 +206,19 @@ gFieldObjectSpriteOamTables_Truck:: @ 8509654 .align 2 gFieldObjectSpriteOamTable_Unused_0:: @ 8509684 - sprite_oam -32, -16, 2, 0, 64x32 + subsprite -32, -16, 2, 0, 64x32 .align 2 gFieldObjectSpriteOamTable_Unused_1:: @ 8509688 - sprite_oam -32, -16, 1, 0, 64x32 + subsprite -32, -16, 1, 0, 64x32 .align 2 gFieldObjectSpriteOamTable_Unused_2:: @ 850968C - sprite_oam -32, -16, 2, 0, 64x32 + subsprite -32, -16, 2, 0, 64x32 .align 2 gFieldObjectSpriteOamTable_Unused_3:: @ 8509690 - sprite_oam -32, -16, 2, 0, 64x32 + subsprite -32, -16, 2, 0, 64x32 .align 2 gFieldObjectSpriteOamTables_Unused:: @ 8509694 @@ -242,19 +242,19 @@ gFieldObjectSpriteOamTables_Unused:: @ 8509694 .align 2 gFieldObjectSpriteOamTable_64x64_0:: @ 85096C4 - sprite_oam -32, -32, 2, 0, 64x64 + subsprite -32, -32, 2, 0, 64x64 .align 2 gFieldObjectSpriteOamTable_64x64_1:: @ 85096C8 - sprite_oam -32, -32, 1, 0, 64x64 + subsprite -32, -32, 1, 0, 64x64 .align 2 gFieldObjectSpriteOamTable_64x64_2:: @ 85096CC - sprite_oam -32, -32, 2, 0, 64x64 + subsprite -32, -32, 2, 0, 64x64 .align 2 gFieldObjectSpriteOamTable_64x64_3:: @ 85096D0 - sprite_oam -32, -32, 2, 0, 64x64 + subsprite -32, -32, 2, 0, 64x64 .align 2 gFieldObjectSpriteOamTables_64x64:: @ 85096D4 @@ -278,75 +278,75 @@ gFieldObjectSpriteOamTables_64x64:: @ 85096D4 .align 2 gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704 - sprite_oam -48, -20, 2, 0, 32x8 - sprite_oam -16, -20, 2, 4, 32x8 - sprite_oam 16, -20, 2, 8, 32x8 - sprite_oam -48, -12, 2, 12, 32x8 - sprite_oam -16, -12, 2, 16, 32x8 - sprite_oam 16, -12, 2, 20, 32x8 - sprite_oam -48, -4, 2, 24, 32x8 - sprite_oam -16, -4, 2, 28, 32x8 - sprite_oam 16, -4, 2, 32, 32x8 - sprite_oam -48, 4, 2, 36, 32x8 - sprite_oam -16, 4, 2, 40, 32x8 - sprite_oam 16, 4, 2, 44, 32x8 - sprite_oam -48, 12, 2, 48, 32x8 - sprite_oam -16, 12, 2, 52, 32x8 - sprite_oam 16, 12, 2, 56, 32x8 + subsprite -48, -20, 2, 0, 32x8 + subsprite -16, -20, 2, 4, 32x8 + subsprite 16, -20, 2, 8, 32x8 + subsprite -48, -12, 2, 12, 32x8 + subsprite -16, -12, 2, 16, 32x8 + subsprite 16, -12, 2, 20, 32x8 + subsprite -48, -4, 2, 24, 32x8 + subsprite -16, -4, 2, 28, 32x8 + subsprite 16, -4, 2, 32, 32x8 + subsprite -48, 4, 2, 36, 32x8 + subsprite -16, 4, 2, 40, 32x8 + subsprite 16, 4, 2, 44, 32x8 + subsprite -48, 12, 2, 48, 32x8 + subsprite -16, 12, 2, 52, 32x8 + subsprite 16, 12, 2, 56, 32x8 .align 2 gFieldObjectSpriteOamTable_SSTidal_1:: @ 8509740 - sprite_oam -48, -20, 1, 0, 32x8 - sprite_oam -16, -20, 1, 4, 32x8 - sprite_oam 16, -20, 1, 8, 32x8 - sprite_oam -48, -12, 1, 12, 32x8 - sprite_oam -16, -12, 1, 16, 32x8 - sprite_oam 16, -12, 1, 20, 32x8 - sprite_oam -48, -4, 1, 24, 32x8 - sprite_oam -16, -4, 1, 28, 32x8 - sprite_oam 16, -4, 1, 32, 32x8 - sprite_oam -48, 4, 1, 36, 32x8 - sprite_oam -16, 4, 1, 40, 32x8 - sprite_oam 16, 4, 1, 44, 32x8 - sprite_oam -48, 12, 1, 48, 32x8 - sprite_oam -16, 12, 1, 52, 32x8 - sprite_oam 16, 12, 1, 56, 32x8 + subsprite -48, -20, 1, 0, 32x8 + subsprite -16, -20, 1, 4, 32x8 + subsprite 16, -20, 1, 8, 32x8 + subsprite -48, -12, 1, 12, 32x8 + subsprite -16, -12, 1, 16, 32x8 + subsprite 16, -12, 1, 20, 32x8 + subsprite -48, -4, 1, 24, 32x8 + subsprite -16, -4, 1, 28, 32x8 + subsprite 16, -4, 1, 32, 32x8 + subsprite -48, 4, 1, 36, 32x8 + subsprite -16, 4, 1, 40, 32x8 + subsprite 16, 4, 1, 44, 32x8 + subsprite -48, 12, 1, 48, 32x8 + subsprite -16, 12, 1, 52, 32x8 + subsprite 16, 12, 1, 56, 32x8 .align 2 gFieldObjectSpriteOamTable_SSTidal_2:: @ 850977C - sprite_oam -48, -20, 2, 0, 32x8 - sprite_oam -16, -20, 2, 4, 32x8 - sprite_oam 16, -20, 2, 8, 32x8 - sprite_oam -48, -12, 2, 12, 32x8 - sprite_oam -16, -12, 2, 16, 32x8 - sprite_oam 16, -12, 2, 20, 32x8 - sprite_oam -48, -4, 2, 24, 32x8 - sprite_oam -16, -4, 2, 28, 32x8 - sprite_oam 16, -4, 2, 32, 32x8 - sprite_oam -48, 4, 2, 36, 32x8 - sprite_oam -16, 4, 2, 40, 32x8 - sprite_oam 16, 4, 2, 44, 32x8 - sprite_oam -48, 12, 2, 48, 32x8 - sprite_oam -16, 12, 2, 52, 32x8 - sprite_oam 16, 12, 2, 56, 32x8 + subsprite -48, -20, 2, 0, 32x8 + subsprite -16, -20, 2, 4, 32x8 + subsprite 16, -20, 2, 8, 32x8 + subsprite -48, -12, 2, 12, 32x8 + subsprite -16, -12, 2, 16, 32x8 + subsprite 16, -12, 2, 20, 32x8 + subsprite -48, -4, 2, 24, 32x8 + subsprite -16, -4, 2, 28, 32x8 + subsprite 16, -4, 2, 32, 32x8 + subsprite -48, 4, 2, 36, 32x8 + subsprite -16, 4, 2, 40, 32x8 + subsprite 16, 4, 2, 44, 32x8 + subsprite -48, 12, 2, 48, 32x8 + subsprite -16, 12, 2, 52, 32x8 + subsprite 16, 12, 2, 56, 32x8 .align 2 gFieldObjectSpriteOamTable_SSTidal_3:: @ 85097B8 - sprite_oam -48, -20, 1, 0, 32x8 - sprite_oam -16, -20, 1, 4, 32x8 - sprite_oam 16, -20, 1, 8, 32x8 - sprite_oam -48, -12, 1, 12, 32x8 - sprite_oam -16, -12, 1, 16, 32x8 - sprite_oam 16, -12, 1, 20, 32x8 - sprite_oam -48, -4, 2, 24, 32x8 - sprite_oam -16, -4, 2, 28, 32x8 - sprite_oam 16, -4, 2, 32, 32x8 - sprite_oam -48, 4, 2, 36, 32x8 - sprite_oam -16, 4, 2, 40, 32x8 - sprite_oam 16, 4, 2, 44, 32x8 - sprite_oam -48, 12, 2, 48, 32x8 - sprite_oam -16, 12, 2, 52, 32x8 - sprite_oam 16, 12, 2, 56, 32x8 + subsprite -48, -20, 1, 0, 32x8 + subsprite -16, -20, 1, 4, 32x8 + subsprite 16, -20, 1, 8, 32x8 + subsprite -48, -12, 1, 12, 32x8 + subsprite -16, -12, 1, 16, 32x8 + subsprite 16, -12, 1, 20, 32x8 + subsprite -48, -4, 2, 24, 32x8 + subsprite -16, -4, 2, 28, 32x8 + subsprite 16, -4, 2, 32, 32x8 + subsprite -48, 4, 2, 36, 32x8 + subsprite -16, 4, 2, 40, 32x8 + subsprite 16, 4, 2, 44, 32x8 + subsprite -48, 12, 2, 48, 32x8 + subsprite -16, 12, 2, 52, 32x8 + subsprite 16, 12, 2, 56, 32x8 .align 2 gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4 @@ -370,79 +370,79 @@ gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4 .align 2 gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824 - sprite_oam -48, -20, 2, 0, 32x8 - sprite_oam -16, -20, 2, 4, 32x8 - sprite_oam 16, -20, 2, 8, 16x8 - sprite_oam 32, -20, 2, 10, 8x8 - sprite_oam -48, -12, 2, 11, 32x8 - sprite_oam -16, -12, 2, 15, 32x8 - sprite_oam 16, -12, 2, 19, 16x8 - sprite_oam 32, -12, 2, 21, 8x8 - sprite_oam -48, -4, 2, 22, 32x8 - sprite_oam -16, -4, 2, 26, 32x8 - sprite_oam 16, -4, 2, 30, 16x8 - sprite_oam 32, -4, 2, 32, 8x8 - sprite_oam -48, 4, 2, 33, 32x8 - sprite_oam -16, 4, 2, 37, 32x8 - sprite_oam 16, 4, 2, 41, 16x8 - sprite_oam 32, 4, 2, 43, 8x8 + subsprite -48, -20, 2, 0, 32x8 + subsprite -16, -20, 2, 4, 32x8 + subsprite 16, -20, 2, 8, 16x8 + subsprite 32, -20, 2, 10, 8x8 + subsprite -48, -12, 2, 11, 32x8 + subsprite -16, -12, 2, 15, 32x8 + subsprite 16, -12, 2, 19, 16x8 + subsprite 32, -12, 2, 21, 8x8 + subsprite -48, -4, 2, 22, 32x8 + subsprite -16, -4, 2, 26, 32x8 + subsprite 16, -4, 2, 30, 16x8 + subsprite 32, -4, 2, 32, 8x8 + subsprite -48, 4, 2, 33, 32x8 + subsprite -16, 4, 2, 37, 32x8 + subsprite 16, 4, 2, 41, 16x8 + subsprite 32, 4, 2, 43, 8x8 .align 2 gFieldObjectSpriteOamTable_SubmarineShadow_1:: @ 8509864 - sprite_oam -48, -20, 1, 0, 32x8 - sprite_oam -16, -20, 1, 4, 32x8 - sprite_oam 16, -20, 1, 8, 16x8 - sprite_oam 32, -20, 1, 10, 8x8 - sprite_oam -48, -12, 1, 11, 32x8 - sprite_oam -16, -12, 1, 15, 32x8 - sprite_oam 16, -12, 1, 19, 16x8 - sprite_oam 32, -12, 1, 21, 8x8 - sprite_oam -48, -4, 1, 22, 32x8 - sprite_oam -16, -4, 1, 26, 32x8 - sprite_oam 16, -4, 1, 30, 16x8 - sprite_oam 32, -4, 1, 32, 8x8 - sprite_oam -48, 4, 1, 33, 32x8 - sprite_oam -16, 4, 1, 37, 32x8 - sprite_oam 16, 4, 1, 41, 16x8 - sprite_oam 32, 4, 1, 43, 8x8 + subsprite -48, -20, 1, 0, 32x8 + subsprite -16, -20, 1, 4, 32x8 + subsprite 16, -20, 1, 8, 16x8 + subsprite 32, -20, 1, 10, 8x8 + subsprite -48, -12, 1, 11, 32x8 + subsprite -16, -12, 1, 15, 32x8 + subsprite 16, -12, 1, 19, 16x8 + subsprite 32, -12, 1, 21, 8x8 + subsprite -48, -4, 1, 22, 32x8 + subsprite -16, -4, 1, 26, 32x8 + subsprite 16, -4, 1, 30, 16x8 + subsprite 32, -4, 1, 32, 8x8 + subsprite -48, 4, 1, 33, 32x8 + subsprite -16, 4, 1, 37, 32x8 + subsprite 16, 4, 1, 41, 16x8 + subsprite 32, 4, 1, 43, 8x8 .align 2 gFieldObjectSpriteOamTable_SubmarineShadow_2:: @ 85098A4 - sprite_oam -48, -20, 2, 0, 32x8 - sprite_oam -16, -20, 2, 4, 32x8 - sprite_oam 16, -20, 2, 8, 16x8 - sprite_oam 32, -20, 2, 10, 8x8 - sprite_oam -48, -12, 2, 11, 32x8 - sprite_oam -16, -12, 2, 15, 32x8 - sprite_oam 16, -12, 2, 19, 16x8 - sprite_oam 32, -12, 2, 21, 8x8 - sprite_oam -48, -4, 2, 22, 32x8 - sprite_oam -16, -4, 2, 26, 32x8 - sprite_oam 16, -4, 2, 30, 16x8 - sprite_oam 32, -4, 2, 32, 8x8 - sprite_oam -48, 4, 2, 33, 32x8 - sprite_oam -16, 4, 2, 37, 32x8 - sprite_oam 16, 4, 2, 41, 16x8 - sprite_oam 32, 4, 2, 43, 8x8 + subsprite -48, -20, 2, 0, 32x8 + subsprite -16, -20, 2, 4, 32x8 + subsprite 16, -20, 2, 8, 16x8 + subsprite 32, -20, 2, 10, 8x8 + subsprite -48, -12, 2, 11, 32x8 + subsprite -16, -12, 2, 15, 32x8 + subsprite 16, -12, 2, 19, 16x8 + subsprite 32, -12, 2, 21, 8x8 + subsprite -48, -4, 2, 22, 32x8 + subsprite -16, -4, 2, 26, 32x8 + subsprite 16, -4, 2, 30, 16x8 + subsprite 32, -4, 2, 32, 8x8 + subsprite -48, 4, 2, 33, 32x8 + subsprite -16, 4, 2, 37, 32x8 + subsprite 16, 4, 2, 41, 16x8 + subsprite 32, 4, 2, 43, 8x8 .align 2 gFieldObjectSpriteOamTable_SubmarineShadow_3:: @ 85098E4 - sprite_oam -48, -20, 1, 0, 32x8 - sprite_oam -16, -20, 1, 4, 32x8 - sprite_oam 16, -20, 1, 8, 16x8 - sprite_oam 32, -20, 1, 10, 8x8 - sprite_oam -48, -12, 1, 11, 32x8 - sprite_oam -16, -12, 1, 15, 32x8 - sprite_oam 16, -12, 1, 19, 16x8 - sprite_oam 32, -12, 1, 21, 8x8 - sprite_oam -48, -4, 2, 22, 32x8 - sprite_oam -16, -4, 2, 26, 32x8 - sprite_oam 16, -4, 2, 30, 16x8 - sprite_oam 32, -4, 2, 32, 8x8 - sprite_oam -48, 4, 2, 33, 32x8 - sprite_oam -16, 4, 2, 37, 32x8 - sprite_oam 16, 4, 2, 41, 16x8 - sprite_oam 32, 4, 2, 43, 8x8 + subsprite -48, -20, 1, 0, 32x8 + subsprite -16, -20, 1, 4, 32x8 + subsprite 16, -20, 1, 8, 16x8 + subsprite 32, -20, 1, 10, 8x8 + subsprite -48, -12, 1, 11, 32x8 + subsprite -16, -12, 1, 15, 32x8 + subsprite 16, -12, 1, 19, 16x8 + subsprite 32, -12, 1, 21, 8x8 + subsprite -48, -4, 2, 22, 32x8 + subsprite -16, -4, 2, 26, 32x8 + subsprite 16, -4, 2, 30, 16x8 + subsprite 32, -4, 2, 32, 8x8 + subsprite -48, 4, 2, 33, 32x8 + subsprite -16, 4, 2, 37, 32x8 + subsprite 16, 4, 2, 41, 16x8 + subsprite 32, 4, 2, 43, 8x8 .align 2 gFieldObjectSpriteOamTables_SubmarineShadow:: @ 8509924 diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index 46d35924c..e55f03fab 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -1,4 +1,6 @@ - +#include "constants/flags.h" +#include "constants/region_map_sections.h" +#include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -6,11 +8,11 @@ .align 2 gUnknown_085B3D94:: @ 85B3D94 - .incbin "graphics/unknown/unknown_5B3D94.gbapal" + .incbin "graphics/pokedex/area_glow.gbapal" .align 2 gUnknown_085B3DB4:: @ 85B3DB4 - .incbin "graphics/unknown/unknown_5B3DB4.4bpp.lz" + .incbin "graphics/pokedex/area_glow.4bpp.lz" .align 1 gUnknown_085B3EE8:: @ 85B3EE8 @@ -18,15 +20,22 @@ gUnknown_085B3EE8:: @ 85B3EE8 .align 1 gUnknown_085B3EEA:: @ 85B3EEA - .2byte 0x00cb, 0x00cc, 0x00cd + .2byte MAPSEC_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE, MAPSEC_TERRA_CAVE .align 1 gUnknown_085B3EF0:: @ 85B3EF0 - .2byte 0x0148, 0x0000, 0x0022, 0x019c, 0x0000, 0x0000 + .2byte SPECIES_FEEBAS, 0x0000, 0x0022 + .2byte SPECIES_EGG, 0x0000, 0x0000 .align 1 gUnknown_085B3EFC:: @ 85B3EFC - .2byte 0x0055, 0x08be, 0x0044, 0x08a7, 0x00d2, 0x08dd, 0x00c7, 0x0078, 0x00d1, 0x08de, 0x00ca, 0x08df, 0x00d5, 0x0000 + .2byte MAPSEC_SKY_PILLAR, FLAG_LANDMARK_SKY_PILLAR + .2byte MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN + .2byte MAPSEC_ALTERING_CAVE_2, FLAG_LANDMARK_ALTERING_CAVE + .2byte MAPSEC_MIRAGE_TOWER, FLAG_LANDMARK_MIRAGE_TOWER + .2byte MAPSEC_DESERT_UNDERPASS, FLAG_LANDMARK_DESERT_UNDERPASS + .2byte MAPSEC_ARTISAN_CAVE, FLAG_0x8DF + .2byte MAPSEC_NONE, 0x0000 gUnknown_085B3F18:: @ 85B3F18 .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x11, 0x20, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f @@ -44,36 +53,40 @@ gUnknown_085B4018:: @ 85B4018 .align 2 gUnknown_085B401C:: @ 85B401C - obj_tiles gUnknown_085B406C, 0x0080, 0x0002 + obj_tiles AreaMarkerTiles, 0x0080, 0x0002 .align 2 gUnknown_085B4024:: @ 85B4024 - obj_pal gUnknown_085B404C, 0x0002 + obj_pal AreaMarkerPalette, 0x0002 .align 2 gUnknown_085B402C:: @ 85B402C - .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00 + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0400 .align 2 gUnknown_085B4034:: @ 85B4034 spr_template 0x0002, 0x0002, gUnknown_085B402C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 -gUnknown_085B404C:: @ 85B404C - .incbin "graphics/unknown/unknown_5B404C.gbapal" +AreaMarkerPalette:: @ 85B404C + .incbin "graphics/pokedex/area_marker.gbapal" .align 2 -gUnknown_085B406C:: @ 85B406C - .incbin "graphics/unknown/unknown_5B406C.4bpp" +AreaMarkerTiles:: @ 85B406C + .incbin "graphics/pokedex/area_marker.4bpp" .align 2 gUnknown_085B40EC:: @ 85B40EC obj_pal gUnknown_08DC4120, 0x0003 .align 2 -gUnknown_085B40F4:: @ 85B40F4 - .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x04, 0x00, 0x00 +gOamData_85B40F4:: @ 85B40F4 + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0400 .align 2 -gUnknown_085B40FC:: @ 85B40FC - spr_template 0x0003, 0x0003, gUnknown_085B40F4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +gSpriteTemplate_85B40FC:: @ 85B40FC + spr_template 0x0003, 0x0003, gOamData_85B40F4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index d20cfa799..07ed1b82d 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -67,7 +67,7 @@ Route117_EventScript_291CE8:: @ 8291CE8 special GetDaycareMonNicknames msgbox Route117_Text_292299, 4 special SetDaycareCompatibilityString - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress setvar VAR_0x8004, 0 diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/scripts/maps/BattleFrontier_Lounge1.inc index 5449fa8ee..ba8ca0cb6 100644 --- a/data/scripts/maps/BattleFrontier_Lounge1.inc +++ b/data/scripts/maps/BattleFrontier_Lounge1.inc @@ -30,7 +30,7 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 return BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF - specialvar VAR_RESULT, sub_81396E0 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 goto_eq BattleFrontier_Lounge1_EventScript_25E7FF special sub_8139D98 diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/scripts/maps/BattleFrontier_Lounge5.inc index a06927424..bb1feceec 100644 --- a/data/scripts/maps/BattleFrontier_Lounge5.inc +++ b/data/scripts/maps/BattleFrontier_Lounge5.inc @@ -13,7 +13,7 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 faceplayer compare VAR_0x8004, 255 goto_eq BattleFrontier_Lounge5_EventScript_26460D - specialvar VAR_RESULT, sub_81396E0 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 goto_eq BattleFrontier_Lounge5_EventScript_264603 special sub_813A7B8 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 20192a4e6..5cb4ee7fd 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -53,7 +53,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 setrespawn 1 fadescreenspeed 1, 24 - special sub_8137734 + special GameClear waitstate releaseall end @@ -61,7 +61,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 setrespawn 2 fadescreenspeed 1, 24 - special sub_8137734 + special GameClear waitstate releaseall end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index ed34cd953..90769b550 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F message LilycoveCity_CoveLilyMotel_2F_Text_21881C waitmessage call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E - special sub_8137CB4 + special Special_ShowDiploma waitstate release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 3eb61ed91..8de2d5d6f 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -26,10 +26,10 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 waitmovement 0 playse SE_PC_ON - special sub_8138EC0 + special DoLotteryCornerComputerEffect special PickLotteryCornerTicket delay 220 - special sub_8138FAC + special EndLotteryCornerComputerEffect delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E waitmovement 0 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index e60eccbaa..0fcdc46d5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034 end LittlerootTown_EventScript_1E805D:: @ 81E805D - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, 4 closemessage applymovement 1, LittlerootTown_Movement_2725A2 @@ -256,7 +256,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D end LittlerootTown_EventScript_1E807A:: @ 81E807A - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8CE3, 4 release end @@ -364,7 +364,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F waitmovement 0 applymovement 255, LittlerootTown_Movement_2725A4 waitmovement 0 - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, 4 closemessage applymovement 1, LittlerootTown_Movement_2725A2 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 112311462..0f3fa1a0e 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -98,7 +98,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 - special sub_8138B48 + special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4 setflag FLAG_0x057 setvar VAR_0x4082, 2 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index f1763753a..0e7ecbf22 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -256,7 +256,7 @@ gUnknown_081F860D:: @ 81F860D LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 setvar VAR_0x8004, 1 - special sp0D9_ComputerRelated + special DoPCTurnOnEffect playse SE_PC_ON msgbox gUnknown_08272D87, 4 special sub_816AE58 @@ -267,7 +267,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F setvar VAR_0x8004, 1 playse SE_PC_OFF - special sub_8138E20 + special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 2fdf79b03..e0229b9ea 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -98,7 +98,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8 applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 - special sub_8138B48 + special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4 setflag FLAG_0x057 setvar VAR_0x408C, 2 @@ -124,7 +124,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 compare VAR_0x408D, 3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F - special sub_8138B48 + special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4 release end @@ -148,7 +148,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D lock faceplayer - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4 release end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 3a983cdd4..327112d2f 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -317,7 +317,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 setvar VAR_0x8004, 2 - special sp0D9_ComputerRelated + special DoPCTurnOnEffect playse SE_PC_ON msgbox gUnknown_08272D87, 4 special sub_816AE58 @@ -328,7 +328,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F setvar VAR_0x8004, 2 playse SE_PC_OFF - special sub_8138E20 + special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 94da547d5..049833db0 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -49,30 +49,30 @@ MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4 MauvilleCity_Gym_EventScript_20DEAF:: @ 820DEAF setvar VAR_0x8004, 0 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DEBD:: @ 820DEBD setvar VAR_0x8004, 1 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DECB:: @ 820DECB setvar VAR_0x8004, 2 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DED9:: @ 820DED9 setvar VAR_0x8004, 3 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 - special sub_8138750 + special MauvilleGymSpecial3 end MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB @@ -102,7 +102,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B call_if 1, MauvilleCity_Gym_EventScript_271E84 setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_271F43 - special sub_8138750 + special MauvilleGymSpecial3 special DrawWholeMapView playse SE_KI_GASYAN call MauvilleCity_Gym_EventScript_20DFB1 @@ -189,8 +189,8 @@ MauvilleCity_Gym_EventScript_20E068:: @ 820E068 end MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D - special sub_8138540 - special sub_81384F0 + special MauvilleGymSpecial2 + special MauvilleGymSpecial1 special DrawWholeMapView playse SE_KI_GASYAN checkflag FLAG_0x063 diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index a06979ddf..b08d296c7 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -6,7 +6,7 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 faceplayer bufferleadmonspeciesname 0 msgbox MossdeepCity_House1_Text_22200F, 4 - specialvar VAR_RESULT, sub_81391D0 + specialvar VAR_RESULT, GetPokeblockNameByMonNature compare VAR_RESULT, 0 goto_eq MossdeepCity_House1_EventScript_221FFC msgbox MossdeepCity_House1_Text_22201D, 4 diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 0cd8ddf84..cb3cc0d16 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -21,7 +21,7 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 special sub_80E8BC8 compare VAR_RESULT, 0 goto_eq MossdeepCity_House4_EventScript_222E14 - special sub_8139200 + special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_222ECC, 4 release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 106dc5570..8fc55295f 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -53,7 +53,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 dodailyevents - specialvar VAR_RESULT, sub_8138BDC + specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012 @@ -75,7 +75,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 dodailyevents - specialvar VAR_RESULT, sub_8138BDC + specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 06621451e..1dd9c2725 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -47,7 +47,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C setvar VAR_0x8004, 1 setvar VAR_0x40A3, 2 incrementgamestat 48 - special sub_8138B8C + special CableCarWarp special sub_814FC9C waitstate release diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index bf671d01e..0e87677e6 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -13,10 +13,10 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 checkflag FLAG_0x12C call_if 0, PacifidlogTown_House2_EventScript_203801 setflag FLAG_0x12C - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_203816 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_203845 goto PacifidlogTown_House2_EventScript_20384F diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index aa02cc017..ec97a639e 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -4,7 +4,7 @@ PacifidlogTown_House5_MapScripts:: @ 8204110 PacifidlogTown_House5_EventScript_204111:: @ 8204111 lock faceplayer - specialvar VAR_RESULT, sub_813793C + specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq PacifidlogTown_House5_EventScript_20412D msgbox PacifidlogTown_House5_Text_204140, 4 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 1f6de9966..0da686052 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -31,7 +31,7 @@ PetalburgCity_MapScript2_1DC31C: @ 81DC31C PetalburgCity_EventScript_1DC32E:: @ 81DC32E lockall special copy_player_party_to_sav1 - special sub_813946C + special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_1DC451 applymovement 255, PetalburgCity_Movement_1DC430 waitmovement 0 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index c07b89eec..060531c97 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -222,7 +222,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC clearflag FLAG_0x2D6 clearflag FLAG_0x362 setflag FLAG_0x379 - special sub_8137A0C + special InitBirchState warp PETALBURG_CITY, 255, 15, 8 waitstate release @@ -1204,12 +1204,12 @@ PetalburgCity_Gym_EventScript_205733:: @ 8205733 return PetalburgCity_Gym_EventScript_205746:: @ 8205746 - special sub_81388E4 + special PetalburgGymSpecial1 waitstate return PetalburgCity_Gym_EventScript_20574B:: @ 820574B - special sub_8138AA4 + special PetalburgGymSpecial2 return PetalburgCity_Gym_EventScript_20574F:: @ 820574F diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 8d5d79d73..f4a31854e 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -28,7 +28,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C lock faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4 - specialvar VAR_RESULT, sub_81394D8 + specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 release diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 128888939..e672b7ad2 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -1035,14 +1035,14 @@ Route104_EventScript_1ED580:: @ 81ED580 Route104_EventScript_1ED597:: @ 81ED597 trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route104_Text_2952FE, 4 release end Route104_EventScript_1ED5B6:: @ 81ED5B6 trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route104_Text_29540D, 4 release end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index b8503593d..d708246de 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -328,7 +328,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E Route109_EventScript_1EE9B5:: @ 81EE9B5 lock faceplayer - special sub_8138B10 + special GetPlayerBigGuyGirlString checkflag FLAG_0x118 goto_eq Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, 4 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 210354444..3c743fb3c 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -5,7 +5,7 @@ Route110_MapScripts:: @ 81EF269 .byte 0 Route110_MapScript1_1EF279: @ 81EF279 - special sub_8137F44 + special UpdateCyclingRoadState end Route110_MapScript1_1EF27D: @ 81EF27D @@ -24,7 +24,7 @@ Route110_MapScript2_1EF297: @ 81EF297 .2byte 0 Route110_EventScript_1EF2A1:: @ 81EF2A1 - special sub_8137D0C + special Special_BeginCyclingRoadChallenge setvar VAR_0x40A9, 2 return @@ -130,7 +130,7 @@ Route110_EventScript_1EF389:: @ 81EF389 Route110_EventScript_1EF392:: @ 81EF392 lockall - specialvar VAR_RESULT, sub_8137EFC + specialvar VAR_RESULT, GetRecordedCyclingRoadResults compare VAR_RESULT, 0 goto_eq Route110_EventScript_1EF3AD msgbox Route110_Text_1F0A1E, 4 @@ -145,7 +145,7 @@ Route110_EventScript_1EF3AD:: @ 81EF3AD Route110_EventScript_1EF3B7:: @ 81EF3B7 lock faceplayer - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF3E8 compare VAR_0x40A9, 0 @@ -326,7 +326,7 @@ Route110_EventScript_1EF661:: @ 81EF661 end Route110_EventScript_1EF673:: @ 81EF673 - special sub_8137E6C + special FinishCyclingRoadChallenge msgbox Route110_Text_1F03FF, 4 switch VAR_RESULT case 10, Route110_EventScript_1EF6FD diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc index 8772f96b8..053183b28 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc @@ -10,7 +10,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78:: @ 826EA78 Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84 lockall - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 0 goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F setflag FLAG_SYS_CYCLING_ROAD diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc index ca7f558a8..602373825 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc @@ -22,7 +22,7 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4:: @ 826EBC4 Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0 lockall - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 2 call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6 compare VAR_RESULT, 0 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index cafa9c827..a0aa5856c 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -13,7 +13,7 @@ Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0 setvar VAR_0x4001, 0 setvar VAR_0x4002, 0 - special sub_8138FD4 + special SetTrickHouseEndRoomFlag end Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE @@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 call_if 1, Route110_TrickHouseEnd_EventScript_26B002 msgbox Route110_TrickHouseEnd_Text_26B69A, 4 call Route110_TrickHouseEnd_EventScript_26AFCF - special sub_8138FEC + special ResetTrickHouseEndRoomFlag release end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 5a20d6d76..8e1672dfe 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -170,7 +170,7 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 compare VAR_RESULT, 0 goto_eq Route111_EventScript_272054 setflag FLAG_0x92C - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route111_Text_2A6F3D, 4 release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 4835dffa6..72c003d99 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -48,7 +48,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 setvar VAR_0x8004, 0 setvar VAR_0x40A3, 1 incrementgamestat 48 - special sub_8138B8C + special CableCarWarp special sub_814FC9C waitstate release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 53c2c14ff..72707186b 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -20,7 +20,7 @@ Route119_MapScript1_1F444D: @ 81F444D call Route119_EventScript_271EFB compare VAR_0x40B3, 1 call_if 1, Route119_EventScript_1F4466 - special sub_8139648 + special SetRoute119Weather end Route119_EventScript_1F4466:: @ 81F4466 diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index eb7032672..399692db3 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -15,7 +15,7 @@ Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 lock faceplayer - special sub_8138B10 + special GetPlayerBigGuyGirlString compare VAR_0x40B3, 0 goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index c1cc0c230..f89ac7e86 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -110,7 +110,7 @@ Route120_EventScript_1F5527:: @ 81F5527 call_if 1, Route120_EventScript_1F562F compare VAR_RESULT, 0 call_if 1, Route120_EventScript_1F5638 - specialvar VAR_RESULT, sub_8138AF0 + specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit switch VAR_RESULT case 0, Route120_EventScript_1F55CA case 5, Route120_EventScript_1F55CA diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 4b60f1428..1369b5721 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -91,7 +91,7 @@ Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF getpartysize compare VAR_RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9 - specialvar VAR_RESULT, sub_8139530 + specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index feec8adeb..f6d535e38 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -3,7 +3,7 @@ Route123_MapScripts:: @ 81F6147 .byte 0 Route123_MapScript1_1F614D: @ 81F614D - special sub_8139668 + special SetRoute123Weather end Route123_EventScript_1F6151:: @ 81F6151 @@ -12,7 +12,7 @@ Route123_EventScript_1F6151:: @ 81F6151 checkflag FLAG_0x0E8 goto_eq Route123_EventScript_1F61A0 msgbox Route123_Text_1F641E, 4 - special sub_81390E0 + special IsGrassTypeInParty compare VAR_RESULT, 0 goto_eq Route123_EventScript_1F619E msgbox Route123_Text_1F645D, 4 diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 0b9d85e30..26278cf50 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -5,7 +5,7 @@ Route130_MapScripts:: @ 81F735F Route130_MapScript1_1F7365: @ 81F7365 compare VAR_0x405E, 4 call_if 4, Route130_EventScript_1F73B5 - specialvar VAR_RESULT, sub_813793C + specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq Route130_EventScript_1F73B1 setflag FLAG_0x011 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index a3bf1ac36..ad10e2669 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -11,7 +11,7 @@ SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 .2byte 0 SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF - special sub_8137F90 + special SetSSTidalFlag setvar VAR_PORTHOLE, 2 lockall playse SE_PINPON @@ -28,14 +28,14 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015 end SSTidalRooms_EventScript_23C028:: @ 823C028 - special sub_8137F90 + special SetSSTidalFlag setvar VAR_PORTHOLE, 7 playse SE_PINPON msgbox SSTidalRooms_Text_23C462, 4 return SSTidalRooms_EventScript_23C03C:: @ 823C03C - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 4 playse SE_PINPON msgbox SSTidalRooms_Text_23C553, 4 @@ -49,7 +49,7 @@ SSTidalCorridor_EventScript_23C050:: @ 823C050 end SSTidalCorridor_EventScript_23C067:: @ 823C067 - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 3 lockall playse SE_PINPON @@ -58,7 +58,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067 end SSTidalCorridor_EventScript_23C07D:: @ 823C07D - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 8 lockall playse SE_PINPON @@ -67,7 +67,7 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D end SSTidalRooms_EventScript_23C093:: @ 823C093 - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 8 playse SE_PINPON msgbox SSTidalRooms_Text_23C50F, 4 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 087459bbb..a2247286c 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -33,7 +33,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 special sub_80B05B4 waitstate msgbox SeafloorCavern_Room9_Text_235279, 4 - special sub_81379F8 + special WaitWeather waitstate setvar VAR_RESULT, 1 playse SE_W197 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index dcf29081a..f57a27c1d 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA .byte 0 ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 - special sub_8137988 + special UpdateShoalTideFlag checkflag FLAG_SYS_SHOAL_TIDE goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236DD1 goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc index aa0b51414..cced073aa 100644 --- a/data/scripts/maps/SkyPillar_Outside.inc +++ b/data/scripts/maps/SkyPillar_Outside.inc @@ -76,7 +76,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 setflag FLAG_SYS_WEATHER_CTRL setweather 15 doweather - special sub_81379F8 + special WaitWeather waitstate delay 30 msgbox SkyPillar_Outside_Text_23953A, 4 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 566c37a51..fe7cfc0fd 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -142,10 +142,10 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 faceplayer bufferleadmonspeciesname 0 msgbox SlateportCity_Text_1DD68A, 4 - specialvar VAR_RESULT, sub_8139348 + specialvar VAR_RESULT, LeadMonHasEffortRibbon compare VAR_RESULT, 1 call_if 1, SlateportCity_EventScript_1DCE38 - specialvar VAR_RESULT, sub_81393C8 + specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut compare VAR_RESULT, 0 call_if 1, SlateportCity_EventScript_1DCE2E msgbox SlateportCity_Text_1DD697, 4 @@ -153,7 +153,7 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 message SlateportCity_Text_1DD6E3 waitfanfare msgbox SlateportCity_Text_1DD702, 4 - special sub_8139370 + special GiveLeadMonEffortRibbon release end diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index f8ae54145..8ecc859f7 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -27,7 +27,7 @@ SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 end SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 - specialvar VAR_RESULT, sub_81396E0 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 goto_eq SlateportCity_House1_EventScript_209B46 special TV_CopyNicknameToStringVar1AndEnsureTerminated diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 19094db0d..192870003 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -144,7 +144,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 end SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF - specialvar VAR_RESULT, sub_8139004 + specialvar VAR_RESULT, CheckLeadMonCool compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0 return @@ -154,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 return SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 - specialvar VAR_RESULT, sub_8139030 + specialvar VAR_RESULT, CheckLeadMonBeauty compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107 return @@ -164,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 return SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D - specialvar VAR_RESULT, sub_813905C + specialvar VAR_RESULT, CheckLeadMonCute compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E return @@ -174,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E return SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 - specialvar VAR_RESULT, sub_8139088 + specialvar VAR_RESULT, CheckLeadMonSmart compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135 return @@ -184,7 +184,7 @@ SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 return SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B - specialvar VAR_RESULT, sub_81390B4 + specialvar VAR_RESULT, CheckLeadMonTough compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C return @@ -217,7 +217,7 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E checkflag FLAG_0x116 goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index a274d1f78..793b6f4fd 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -202,7 +202,7 @@ SootopolisCity_MapScript2_1E5914: @ 81E5914 SootopolisCity_EventScript_1E5926:: @ 81E5926 lockall - special sub_8138AD0 + special StorePlayerCoordsInVars compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5A82 compare VAR_0x8005, 32 @@ -492,7 +492,7 @@ SootopolisCity_Movement_1E5BF7: @ 81E5BF7 SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE lockall - special sub_8138AD0 + special StorePlayerCoordsInVars compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5CCE compare VAR_0x8005, 32 @@ -541,7 +541,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 removeobject 11 - special sub_81379F8 + special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 3 @@ -594,7 +594,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 removeobject 11 - special sub_81379F8 + special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 2 @@ -747,7 +747,7 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10 SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B dodailyevents - special sub_8138B10 + special GetPlayerBigGuyGirlString checkflag FLAG_0x932 goto_eq SootopolisCity_EventScript_1E5FBB msgbox SootopolisCity_Text_2A7BB0, 4 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index f5b867405..78c7303ae 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -46,14 +46,14 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD setvar VAR_0x40C0, 1 - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 setvar VAR_0x40C0, 2 - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index ee62be96e..28030d869 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 lock faceplayer msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, 4 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore switch VAR_RESULT case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094 case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_20309E diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 1597a66eb..327c0cbc6 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -816,7 +816,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 special sub_81203FC - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage yesnobox 20, 8 compare VAR_RESULT, 1 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 03ee0d510..0f705c841 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -680,7 +680,7 @@ LilycoveCity_ContestLobby_EventScript_29419D:: @ 829419D LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA fadescreen 1 - specialvar VAR_RESULT, sub_8138240 + specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 special SpawnLinkPartnerFieldObject diff --git a/data/specials.inc b/data/specials.inc index 93df6aa75..578668fce 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -45,7 +45,7 @@ gSpecials:: @ 81DBA64 def_special nullsub_37 def_special sub_80B3254 def_special sub_80B2FD8 - def_special sub_8138240 + def_special GetLinkPartnerNames def_special SpawnLinkPartnerFieldObject def_special copy_player_party_to_sav1 def_special copy_player_party_from_sav1 @@ -149,19 +149,19 @@ gSpecials:: @ 81DBA64 def_special sub_80F8864 def_special sub_80F8940 def_special ShowContestWinner - def_special sub_8138540 - def_special sub_81384F0 - def_special sub_8138AC0 + def_special MauvilleGymSpecial2 + def_special MauvilleGymSpecial1 + def_special ShowFieldMessageStringVar4 def_special DrawWholeMapView - def_special sub_8138AD0 - def_special sub_8138750 - def_special sub_81388E4 - def_special sub_8138AA4 - def_special sub_8138AF0 - def_special sub_8138B10 - def_special sub_8138B48 - def_special sub_8138BC8 - def_special sub_8138B8C + def_special StorePlayerCoordsInVars + def_special MauvilleGymSpecial3 + def_special PetalburgGymSpecial1 + def_special PetalburgGymSpecial2 + def_special GetPlayerTrainerIdOnesDigit + def_special GetPlayerBigGuyGirlString + def_special GetRivalSonDaughterString + def_special SetFlagInVar + def_special CableCarWarp def_special sub_814FC9C def_special sub_8085784 def_special StartWallClock @@ -213,34 +213,34 @@ gSpecials:: @ 81DBA64 def_special sp0C8_whiteout_maybe def_special sub_80FBE90 def_special sub_80FBED0 - def_special sub_8137F90 - def_special sub_8137FB0 + def_special SetSSTidalFlag + def_special ResetSSTidalFlag def_special EnterSafariMode def_special ExitSafariMode def_special GetPokeblockFeederInFront def_special OpenPokeblockCaseOnFeeder - def_special sub_813793C - def_special sub_8137988 - def_special sub_8137A0C - def_special sub_8137A4C - def_special sub_8137C10 - def_special sp0D9_ComputerRelated - def_special sub_8138E20 + def_special IsMirageIslandPresent + def_special UpdateShoalTideFlag + def_special InitBirchState + def_special ScriptGetPokedexInfo + def_special ShowPokedexRatingMessage + def_special DoPCTurnOnEffect + def_special DoPCTurnOffEffect def_special sub_8139994 - def_special sub_8138EC0 - def_special sub_8138FAC + def_special DoLotteryCornerComputerEffect + def_special EndLotteryCornerComputerEffect def_special sub_81B951C def_special sub_81B968C def_special sub_81B9770 def_special sub_81B9718 def_special sub_81B96D0 def_special sub_8160638 - def_special sub_8137EFC - def_special sub_8137D0C - def_special sp0E3_walkrun_bitfield_interpretation - def_special sub_8137E6C - def_special sub_8137F44 - def_special sub_8138C04 + def_special GetRecordedCyclingRoadResults + def_special Special_BeginCyclingRoadChallenge + def_special GetPlayerAvatarBike + def_special FinishCyclingRoadChallenge + def_special UpdateCyclingRoadState + def_special GetLeadMonFriendshipScore def_special sub_81A1780 def_special sub_8161F74 def_special sub_818E9AC @@ -261,39 +261,39 @@ gSpecials:: @ 81DBA64 def_special sub_80F94E8 def_special sub_816AE58 def_special sub_816AE98 - def_special sub_8138C94 + def_special FieldShowRegionMap def_special sub_807E73C def_special sub_807EA10 def_special sub_807F0E4 def_special sub_807E9D4 - def_special sub_8138BDC + def_special GetWeekCount def_special RetrieveLotteryNumber def_special PickLotteryCornerTicket def_special ShowBerryBlenderRecordWindow - def_special sub_8138FEC - def_special sub_8138FD4 + def_special ResetTrickHouseEndRoomFlag + def_special SetTrickHouseEndRoomFlag def_special sp109_CreatePCMenu - def_special sub_8137C28 - def_special sub_8137CB4 - def_special sub_8139004 - def_special sub_8139030 - def_special sub_813905C - def_special sub_8139088 - def_special sub_81390B4 + def_special AccessHallOfFamePC + def_special Special_ShowDiploma + def_special CheckLeadMonCool + def_special CheckLeadMonBeauty + def_special CheckLeadMonCute + def_special CheckLeadMonSmart + def_special CheckLeadMonTough def_special sub_80FB7A4 def_special DoSoftReset - def_special sub_8137734 + def_special GameClear def_special sub_8139A78 def_special nullsub_55 def_special SpawnScriptFieldObject def_special RemoveScriptFieldObject - def_special sub_81391D0 - def_special sub_8139200 + def_special GetPokeblockNameByMonNature + def_special GetSecretBaseNearbyMapName def_special CheckRelicanthWailord def_special ShouldDoBrailleStrengthEffectOld def_special sub_80B0534 def_special sub_80B058C - def_special sub_81379F8 + def_special WaitWeather def_special sub_8139238 def_special sub_8139248 def_special player_get_direction_lower_nybble @@ -301,23 +301,23 @@ gSpecials:: @ 81DBA64 def_special sub_81392D4 def_special sub_81392F8 def_special sub_8139320 - def_special sub_8139348 - def_special sub_8139370 - def_special sub_81393C8 + def_special LeadMonHasEffortRibbon + def_special GiveLeadMonEffortRibbon + def_special Special_AreLeadMonEVsMaxedOut def_special sub_8098574 def_special sub_809859C def_special InitRoamer def_special sub_81393FC - def_special sub_81390E0 + def_special IsGrassTypeInParty def_special sub_80AFC60 - def_special sub_813946C - def_special sub_81394D8 + def_special PutZigzagoonInPlayerParty + def_special IsStarterInParty def_special sub_80E980C - def_special sub_8139530 + def_special ScriptCheckFreePokemonStorageSpace def_special DoSealedChamberShakingEffect1 def_special sub_8139B60 def_special sub_80FAC78 - def_special sub_8139540 + def_special IsPokerusInParty def_special sub_809E1C8 def_special sub_8139560 def_special StartGroudonKyogreBattle @@ -333,10 +333,10 @@ gSpecials:: @ 81DBA64 def_special sub_80F8EB8 def_special sub_8162794 def_special BattleSetup_StartLatiBattle - def_special sub_8139648 - def_special sub_8139668 + def_special SetRoute119Weather + def_special SetRoute123Weather def_special sub_80F8FA0 - def_special sub_81396E0 + def_special ScriptGetPartyMonSpecies def_special sub_81B98DC def_special nullsub_54 def_special sub_80E9B70 diff --git a/data/time_events.s b/data/time_events.s new file mode 100644 index 000000000..7a543fff5 --- /dev/null +++ b/data/time_events.s @@ -0,0 +1,7 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_085B2B44:: @ 85B2B44 + .byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01 diff --git a/graphics/battle_transitions/vs.png b/graphics/battle_transitions/vs.png Binary files differdeleted file mode 100644 index a1badcb02..000000000 --- a/graphics/battle_transitions/vs.png +++ /dev/null diff --git a/graphics/battle_transitions/vs_frame.bin b/graphics/battle_transitions/vs_frame.bin Binary files differdeleted file mode 100644 index 2ad153964..000000000 --- a/graphics/battle_transitions/vs_frame.bin +++ /dev/null diff --git a/graphics/battle_transitions/vs_frame.png b/graphics/battle_transitions/vs_frame.png Binary files differdeleted file mode 100644 index 0b38c8960..000000000 --- a/graphics/battle_transitions/vs_frame.png +++ /dev/null diff --git a/graphics/unknown/unknown_5B2890.pal b/graphics/misc/85B2890.pal index fea15a176..fea15a176 100644 --- a/graphics/unknown/unknown_5B2890.pal +++ b/graphics/misc/85B2890.pal diff --git a/graphics/unknown/unknown_5B28A0.pal b/graphics/misc/85B28A0.pal index 09eb37624..09eb37624 100644 --- a/graphics/unknown/unknown_5B28A0.pal +++ b/graphics/misc/85B28A0.pal diff --git a/graphics/unknown/unknown_5B2A90.png b/graphics/misc/cave_transition.png Binary files differindex dd265149f..dd265149f 100644 --- a/graphics/unknown/unknown_5B2A90.png +++ b/graphics/misc/cave_transition.png diff --git a/graphics/unknown/unknown_5B2870.pal b/graphics/misc/cave_transition_black.pal index 4b0812f09..4b0812f09 100644 --- a/graphics/unknown/unknown_5B2870.pal +++ b/graphics/misc/cave_transition_black.pal diff --git a/graphics/unknown/unknown_5B28B0.bin b/graphics/misc/cave_transition_map.bin Binary files differindex 4293bfd1c..4293bfd1c 100644 --- a/graphics/unknown/unknown_5B28B0.bin +++ b/graphics/misc/cave_transition_map.bin diff --git a/graphics/unknown/unknown_5B2850.pal b/graphics/misc/cave_transition_white.pal index 98a1fb3c8..98a1fb3c8 100644 --- a/graphics/unknown/unknown_5B2850.pal +++ b/graphics/misc/cave_transition_white.pal diff --git a/graphics/pokedex/area_glow.png b/graphics/pokedex/area_glow.png Binary files differnew file mode 100644 index 000000000..3cf5387f3 --- /dev/null +++ b/graphics/pokedex/area_glow.png diff --git a/graphics/pokedex/area_marker.png b/graphics/pokedex/area_marker.png Binary files differnew file mode 100644 index 000000000..a0b828ea9 --- /dev/null +++ b/graphics/pokedex/area_marker.png diff --git a/graphics/unknown/unknown_5B3D94.pal b/graphics/unknown/unknown_5B3D94.pal deleted file mode 100644 index 905a16c23..000000000 --- a/graphics/unknown/unknown_5B3D94.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 139 139 -255 115 115 -255 213 213 -255 65 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/unknown/unknown_5B3DB4.png b/graphics/unknown/unknown_5B3DB4.png Binary files differdeleted file mode 100644 index a54dd61d5..000000000 --- a/graphics/unknown/unknown_5B3DB4.png +++ /dev/null diff --git a/graphics/unknown/unknown_5B404C.pal b/graphics/unknown/unknown_5B404C.pal deleted file mode 100644 index fabc36fad..000000000 --- a/graphics/unknown/unknown_5B404C.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 180 0 -0 0 0 -255 0 0 -255 49 49 -255 230 230 -255 156 156 -255 205 205 -255 255 255 -255 255 49 -106 255 255 -172 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/unknown/unknown_5B406C.png b/graphics/unknown/unknown_5B406C.png Binary files differdeleted file mode 100644 index 55c401eb9..000000000 --- a/graphics/unknown/unknown_5B406C.png +++ /dev/null diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h new file mode 100644 index 000000000..b9c518b1b --- /dev/null +++ b/include/constants/region_map_sections.h @@ -0,0 +1,219 @@ +#ifndef GUARD_REGIONMAPSEC_H +#define GUARD_REGIONMAPSEC_H + +#define MAPSEC_LITTLEROOT_TOWN 0x00 +#define MAPSEC_OLDALE_TOWN 0x01 +#define MAPSEC_DEWFORD_TOWN 0x02 +#define MAPSEC_LAVARIDGE_TOWN 0x03 +#define MAPSEC_FALLARBOR_TOWN 0x04 +#define MAPSEC_VERDANTURF_TOWN 0x05 +#define MAPSEC_PACIFIDLOG_TOWN 0x06 +#define MAPSEC_PETALBURG_CITY 0x07 +#define MAPSEC_SLATEPORT_CITY 0x08 +#define MAPSEC_MAUVILLE_CITY 0x09 +#define MAPSEC_RUSTBORO_CITY 0x0A +#define MAPSEC_FORTREE_CITY 0x0B +#define MAPSEC_LILYCOVE_CITY 0x0C +#define MAPSEC_MOSSDEEP_CITY 0x0D +#define MAPSEC_SOOTOPOLIS_CITY 0x0E +#define MAPSEC_EVER_GRANDE_CITY 0x0F +#define MAPSEC_ROUTE_101 0x10 +#define MAPSEC_ROUTE_102 0x11 +#define MAPSEC_ROUTE_103 0x12 +#define MAPSEC_ROUTE_104 0x13 +#define MAPSEC_ROUTE_105 0x14 +#define MAPSEC_ROUTE_106 0x15 +#define MAPSEC_ROUTE_107 0x16 +#define MAPSEC_ROUTE_108 0x17 +#define MAPSEC_ROUTE_109 0x18 +#define MAPSEC_ROUTE_110 0x19 +#define MAPSEC_ROUTE_111 0x1A +#define MAPSEC_ROUTE_112 0x1B +#define MAPSEC_ROUTE_113 0x1C +#define MAPSEC_ROUTE_114 0x1D +#define MAPSEC_ROUTE_115 0x1E +#define MAPSEC_ROUTE_116 0x1F +#define MAPSEC_ROUTE_117 0x20 +#define MAPSEC_ROUTE_118 0x21 +#define MAPSEC_ROUTE_119 0x22 +#define MAPSEC_ROUTE_120 0x23 +#define MAPSEC_ROUTE_121 0x24 +#define MAPSEC_ROUTE_122 0x25 +#define MAPSEC_ROUTE_123 0x26 +#define MAPSEC_ROUTE_124 0x27 +#define MAPSEC_ROUTE_125 0x28 +#define MAPSEC_ROUTE_126 0x29 +#define MAPSEC_ROUTE_127 0x2A +#define MAPSEC_ROUTE_128 0x2B +#define MAPSEC_ROUTE_129 0x2C +#define MAPSEC_ROUTE_130 0x2D +#define MAPSEC_ROUTE_131 0x2E +#define MAPSEC_ROUTE_132 0x2F +#define MAPSEC_ROUTE_133 0x30 +#define MAPSEC_ROUTE_134 0x31 +#define MAPSEC_UNDERWATER_124 0x32 +#define MAPSEC_UNDERWATER_125 0x33 +#define MAPSEC_UNDERWATER_126 0x34 +#define MAPSEC_UNDERWATER_127 0x35 +#define MAPSEC_UNDERWATER_SOOTOPOLIS 0x36 +#define MAPSEC_GRANITE_CAVE 0x37 +#define MAPSEC_MT_CHIMNEY 0x38 +#define MAPSEC_SAFARI_ZONE 0x39 +#define MAPSEC_BATTLE_FRONTIER 0x3A +#define MAPSEC_PETALBURG_WOODS 0x3B +#define MAPSEC_RUSTURF_TUNNEL 0x3C +#define MAPSEC_ABANDONED_SHIP 0x3D +#define MAPSEC_NEW_MAUVILLE 0x3E +#define MAPSEC_METEOR_FALLS 0x3F +#define MAPSEC_METEOR_FALLS2 0x40 +#define MAPSEC_MT_PYRE 0x41 +#define MAPSEC_AQUA_HIDEOUT_OLD 0x42 +#define MAPSEC_SHOAL_CAVE 0x43 +#define MAPSEC_SEAFLOOR_CAVERN 0x44 +#define MAPSEC_UNDERWATER_128 0x45 +#define MAPSEC_VICTORY_ROAD 0x46 +#define MAPSEC_MIRAGE_ISLAND 0x47 +#define MAPSEC_CAVE_OF_ORIGIN 0x48 +#define MAPSEC_SOUTHERN_ISLAND 0x49 +#define MAPSEC_FIERY_PATH 0x4A +#define MAPSEC_FIERY_PATH2 0x4B +#define MAPSEC_JAGGED_PASS 0x4C +#define MAPSEC_JAGGED_PASS2 0x4D +#define MAPSEC_SEALED_CHAMBER 0x4E +#define MAPSEC_UNDERWATER_SEALED_CHAMBER 0x4F +#define MAPSEC_SCORCHED_SLAB 0x50 +#define MAPSEC_ISLAND_CAVE 0x51 +#define MAPSEC_DESERT_RUINS 0x52 +#define MAPSEC_ANCIENT_TOMB 0x53 +#define MAPSEC_INSIDE_OF_TRUCK 0x54 +#define MAPSEC_SKY_PILLAR 0x55 +#define MAPSEC_SECRET_BASE 0x56 +#define MAPSEC_DYNAMIC 0x57 +#define MAPSEC_PALLET_TOWN 0x58 +#define MAPSEC_VIRIDIAN_CITY 0x59 +#define MAPSEC_PEWTER_CITY 0x5A +#define MAPSEC_CERULEAN_CITY 0x5B +#define MAPSEC_LAVENDER_TOWN 0x5C +#define MAPSEC_VERMILION_CITY 0x5D +#define MAPSEC_CELADON_CITY 0x5E +#define MAPSEC_FUCHSIA_CITY 0x5F +#define MAPSEC_CINNABAR_ISLAND 0x60 +#define MAPSEC_INDIGO_PLATEAU 0x61 +#define MAPSEC_SAFFRON_CITY 0x62 +#define MAPSEC_ROUTE_4_FLYDUP 0x63 +#define MAPSEC_ROUTE_10_FLYDUP 0x64 +#define MAPSEC_ROUTE_1 0x65 +#define MAPSEC_ROUTE_2 0x66 +#define MAPSEC_ROUTE_3 0x67 +#define MAPSEC_ROUTE_4 0x68 +#define MAPSEC_ROUTE_5 0x69 +#define MAPSEC_ROUTE_6 0x6A +#define MAPSEC_ROUTE_7 0x6B +#define MAPSEC_ROUTE_8 0x6C +#define MAPSEC_ROUTE_9 0x6D +#define MAPSEC_ROUTE_10 0x6E +#define MAPSEC_ROUTE_11 0x6F +#define MAPSEC_ROUTE_12 0x70 +#define MAPSEC_ROUTE_13 0x71 +#define MAPSEC_ROUTE_14 0x72 +#define MAPSEC_ROUTE_15 0x73 +#define MAPSEC_ROUTE_16 0x74 +#define MAPSEC_ROUTE_17 0x75 +#define MAPSEC_ROUTE_18 0x76 +#define MAPSEC_ROUTE_19 0x77 +#define MAPSEC_ROUTE_20 0x78 +#define MAPSEC_ROUTE_21 0x79 +#define MAPSEC_ROUTE_22 0x7A +#define MAPSEC_ROUTE_23 0x7B +#define MAPSEC_ROUTE_24 0x7C +#define MAPSEC_ROUTE_25 0x7D +#define MAPSEC_VIRIDIAN_FOREST 0x7E +#define MAPSEC_MT_MOON 0x7F +#define MAPSEC_S_S_ANNE 0x80 +#define MAPSEC_UNDERGROUND_PATH 0x81 +#define MAPSEC_UNDERGROUND_PATH_2 0x82 +#define MAPSEC_DIGLETTS_CAVE 0x83 +#define MAPSEC_KANTO_VICTORY_ROAD 0x84 +#define MAPSEC_ROCKET_HIDEOUT 0x85 +#define MAPSEC_SILPH_CO 0x86 +#define MAPSEC_POKEMON_MANSION 0x87 +#define MAPSEC_KANTO_SAFARI_ZONE 0x88 +#define MAPSEC_POKEMON_LEAGUE 0x89 +#define MAPSEC_ROCK_TUNNEL 0x8A +#define MAPSEC_SEAFOAM_ISLANDS 0x8B +#define MAPSEC_POKEMON_TOWER 0x8C +#define MAPSEC_CERULEAN_CAVE 0x8D +#define MAPSEC_POWER_PLANT 0x8E +#define MAPSEC_ONE_ISLAND 0x8F +#define MAPSEC_TWO_ISLAND 0x90 +#define MAPSEC_THREE_ISLAND 0x91 +#define MAPSEC_FOUR_ISLAND 0x92 +#define MAPSEC_FIVE_ISLAND 0x93 +#define MAPSEC_SEVEN_ISLAND 0x94 +#define MAPSEC_SIX_ISLAND 0x95 +#define MAPSEC_KINDLE_ROAD 0x96 +#define MAPSEC_TREASURE_BEACH 0x97 +#define MAPSEC_CAPE_BRINK 0x98 +#define MAPSEC_BOND_BRIDGE 0x99 +#define MAPSEC_THREE_ISLE_PORT 0x9A +#define MAPSEC_SEVII_ISLE_6 0x9B +#define MAPSEC_SEVII_ISLE_7 0x9C +#define MAPSEC_SEVII_ISLE_8 0x9D +#define MAPSEC_SEVII_ISLE_9 0x9E +#define MAPSEC_RESORT_GORGEOUS 0x9F +#define MAPSEC_WATER_LABYRINTH 0xA0 +#define MAPSEC_FIVE_ISLE_MEADOW 0xA1 +#define MAPSEC_MEMORIAL_PILLAR 0xA2 +#define MAPSEC_OUTCAST_ISLAND 0xA3 +#define MAPSEC_GREEN_PATH 0xA4 +#define MAPSEC_WATER_PATH 0xA5 +#define MAPSEC_RUIN_VALLEY 0xA6 +#define MAPSEC_TRAINER_TOWER 0xA7 +#define MAPSEC_CANYON_ENTRANCE 0xA8 +#define MAPSEC_SEVAULT_CANYON 0xA9 +#define MAPSEC_TANOBY_RUINS 0xAA +#define MAPSEC_SEVII_ISLE_22 0xAB +#define MAPSEC_SEVII_ISLE_23 0xAC +#define MAPSEC_SEVII_ISLE_24 0xAD +#define MAPSEC_NAVEL_ROCK 0xAE +#define MAPSEC_MT_EMBER 0xAF +#define MAPSEC_BERRY_FOREST 0xB0 +#define MAPSEC_ICEFALL_CAVE 0xB1 +#define MAPSEC_ROCKET_WAREHOUSE 0xB2 +#define MAPSEC_TRAINER_TOWER_2 0xB3 +#define MAPSEC_DOTTED_HOLE 0xB4 +#define MAPSEC_LOST_CAVE 0xB5 +#define MAPSEC_PATTERN_BUSH 0xB6 +#define MAPSEC_ALTERING_CAVE 0xB7 +#define MAPSEC_TANOBY_CHAMBERS 0xB8 +#define MAPSEC_THREE_ISLE_PATH 0xB9 +#define MAPSEC_TANOBY_KEY 0xBA +#define MAPSEC_BIRTH_ISLAND 0xBB +#define MAPSEC_MONEAN_CHAMBER 0xBC +#define MAPSEC_LIPTOO_CHAMBER 0xBD +#define MAPSEC_WEEPTH_CHAMBER 0xBE +#define MAPSEC_DILFORD_CHAMBER 0xBF +#define MAPSEC_SCUFIB_CHAMBER 0xC0 +#define MAPSEC_RIXY_CHAMBER 0xC1 +#define MAPSEC_VIAPOIS_CHAMBER 0xC2 +#define MAPSEC_EMBER_SPA 0xC3 +#define MAPSEC_SPECIAL_AREA 0xC4 +#define MAPSEC_AQUA_HIDEOUT 0xC5 +#define MAPSEC_MAGMA_HIDEOUT 0xC6 +#define MAPSEC_MIRAGE_TOWER 0xC7 +#define MAPSEC_BIRTH_ISLAND_2 0xC8 +#define MAPSEC_FARAWAY_ISLAND 0xC9 +#define MAPSEC_ARTISAN_CAVE 0xCA +#define MAPSEC_MARINE_CAVE 0xCB +#define MAPSEC_UNDERWATER_MARINE_CAVE 0xCC +#define MAPSEC_TERRA_CAVE 0xCD +#define MAPSEC_UNDERWATER_TERRA_CAVE 0xCE +#define MAPSEC_UNDERWATER_UNK1 0xCF +#define MAPSEC_UNDERWATER_129 0xD0 +#define MAPSEC_DESERT_UNDERPASS 0xD1 +#define MAPSEC_ALTERING_CAVE_2 0xD2 +#define MAPSEC_NAVEL_ROCK2 0xD3 +#define MAPSEC_TRAINER_HILL 0xD4 +#define MAPSEC_NONE 0xD5 + +#endif //GUARD_REGIONMAPSEC_H diff --git a/include/region_map_sections.h b/include/region_map_sections.h deleted file mode 100644 index f6f8bdb2c..000000000 --- a/include/region_map_sections.h +++ /dev/null @@ -1,221 +0,0 @@ -#ifndef GUARD_REGIONMAPSEC_H -#define GUARD_REGIONMAPSEC_H - -enum { - MAPSEC_LITTLEROOT_TOWN, - MAPSEC_OLDALE_TOWN, - MAPSEC_DEWFORD_TOWN, - MAPSEC_LAVARIDGE_TOWN, - MAPSEC_FALLARBOR_TOWN, - MAPSEC_VERDANTURF_TOWN, - MAPSEC_PACIFIDLOG_TOWN, - MAPSEC_PETALBURG_CITY, - MAPSEC_SLATEPORT_CITY, - MAPSEC_MAUVILLE_CITY, - MAPSEC_RUSTBORO_CITY, - MAPSEC_FORTREE_CITY, - MAPSEC_LILYCOVE_CITY, - MAPSEC_MOSSDEEP_CITY, - MAPSEC_SOOTOPOLIS_CITY, - MAPSEC_EVER_GRANDE_CITY, - MAPSEC_ROUTE_101, - MAPSEC_ROUTE_102, - MAPSEC_ROUTE_103, - MAPSEC_ROUTE_104, - MAPSEC_ROUTE_105, - MAPSEC_ROUTE_106, - MAPSEC_ROUTE_107, - MAPSEC_ROUTE_108, - MAPSEC_ROUTE_109, - MAPSEC_ROUTE_110, - MAPSEC_ROUTE_111, - MAPSEC_ROUTE_112, - MAPSEC_ROUTE_113, - MAPSEC_ROUTE_114, - MAPSEC_ROUTE_115, - MAPSEC_ROUTE_116, - MAPSEC_ROUTE_117, - MAPSEC_ROUTE_118, - MAPSEC_ROUTE_119, - MAPSEC_ROUTE_120, - MAPSEC_ROUTE_121, - MAPSEC_ROUTE_122, - MAPSEC_ROUTE_123, - MAPSEC_ROUTE_124, - MAPSEC_ROUTE_125, - MAPSEC_ROUTE_126, - MAPSEC_ROUTE_127, - MAPSEC_ROUTE_128, - MAPSEC_ROUTE_129, - MAPSEC_ROUTE_130, - MAPSEC_ROUTE_131, - MAPSEC_ROUTE_132, - MAPSEC_ROUTE_133, - MAPSEC_ROUTE_134, - MAPSEC_UNDERWATER_124, - MAPSEC_UNDERWATER_125, - MAPSEC_UNDERWATER_126, - MAPSEC_UNDERWATER_127, - MAPSEC_UNDERWATER_SOOTOPOLIS, - MAPSEC_GRANITE_CAVE, - MAPSEC_MT_CHIMNEY, - MAPSEC_SAFARI_ZONE, - MAPSEC_BATTLE_FRONTIER, - MAPSEC_PETALBURG_WOODS, - MAPSEC_RUSTURF_TUNNEL, - MAPSEC_ABANDONED_SHIP, - MAPSEC_NEW_MAUVILLE, - MAPSEC_METEOR_FALLS, - MAPSEC_METEOR_FALLS2, - MAPSEC_MT_PYRE, - MAPSEC_AQUA_HIDEOUT_OLD, - MAPSEC_SHOAL_CAVE, - MAPSEC_SEAFLOOR_CAVERN, - MAPSEC_UNDERWATER_128, - MAPSEC_VICTORY_ROAD, - MAPSEC_MIRAGE_ISLAND, - MAPSEC_CAVE_OF_ORIGIN, - MAPSEC_SOUTHERN_ISLAND, - MAPSEC_FIERY_PATH, - MAPSEC_FIERY_PATH2, - MAPSEC_JAGGED_PASS, - MAPSEC_JAGGED_PASS2, - MAPSEC_SEALED_CHAMBER, - MAPSEC_UNDERWATER_SEALED_CHAMBER, - MAPSEC_SCORCHED_SLAB, - MAPSEC_ISLAND_CAVE, - MAPSEC_DESERT_RUINS, - MAPSEC_ANCIENT_TOMB, - MAPSEC_INSIDE_OF_TRUCK, - MAPSEC_SKY_PILLAR, - MAPSEC_SECRET_BASE, - MAPSEC_DYNAMIC, - MAPSEC_PALLET_TOWN, - MAPSEC_VIRIDIAN_CITY, - MAPSEC_PEWTER_CITY, - MAPSEC_CERULEAN_CITY, - MAPSEC_LAVENDER_TOWN, - MAPSEC_VERMILION_CITY, - MAPSEC_CELADON_CITY, - MAPSEC_FUCHSIA_CITY, - MAPSEC_CINNABAR_ISLAND, - MAPSEC_INDIGO_PLATEAU, - MAPSEC_SAFFRON_CITY, - MAPSEC_ROUTE_4, - MAPSEC_ROUTE_10, - MAPSEC_ROUTE_1, - MAPSEC_ROUTE_2, - MAPSEC_ROUTE_3, - MAPSEC_ROUTE_4_2, - MAPSEC_ROUTE_5, - MAPSEC_ROUTE_6, - MAPSEC_ROUTE_7, - MAPSEC_ROUTE_8, - MAPSEC_ROUTE_9, - MAPSEC_ROUTE_10_2, - MAPSEC_ROUTE_11, - MAPSEC_ROUTE_12, - MAPSEC_ROUTE_13, - MAPSEC_ROUTE_14, - MAPSEC_ROUTE_15, - MAPSEC_ROUTE_16, - MAPSEC_ROUTE_17, - MAPSEC_ROUTE_18, - MAPSEC_ROUTE_19, - MAPSEC_ROUTE_20, - MAPSEC_ROUTE_21, - MAPSEC_ROUTE_22, - MAPSEC_ROUTE_23, - MAPSEC_ROUTE_24, - MAPSEC_ROUTE_25, - MAPSEC_VIRIDIAN_FOREST, - MAPSEC_MT_MOON, - MAPSEC_S_S_ANNE, - MAPSEC_UNDERGROUND_PATH, - MAPSEC_UNDERGROUND_PATH_2, - MAPSEC_DIGLETTS_CAVE, - MAPSEC_KANTO_VICTORY_ROAD, - MAPSEC_ROCKET_HIDEOUT, - MAPSEC_SILPH_CO, - MAPSEC_POKEMON_MANSION, - MAPSEC_KANTO_SAFARI_ZONE, - MAPSEC_POKEMON_LEAGUE, - MAPSEC_ROCK_TUNNEL, - MAPSEC_SEAFOAM_ISLANDS, - MAPSEC_POKEMON_TOWER, - MAPSEC_CERULEAN_CAVE, - MAPSEC_POWER_PLANT, - MAPSEC_ONE_ISLAND, - MAPSEC_TWO_ISLAND, - MAPSEC_THREE_ISLAND, - MAPSEC_FOUR_ISLAND, - MAPSEC_FIVE_ISLAND, - MAPSEC_SEVEN_ISLAND, - MAPSEC_SIX_ISLAND, - MAPSEC_KINDLE_ROAD, - MAPSEC_TREASURE_BEACH, - MAPSEC_CAPE_BRINK, - MAPSEC_BOND_BRIDGE, - MAPSEC_THREE_ISLE_PORT, - MAPSEC_SEVII_ISLE_6, - MAPSEC_SEVII_ISLE_7, - MAPSEC_SEVII_ISLE_8, - MAPSEC_SEVII_ISLE_9, - MAPSEC_RESORT_GORGEOUS, - MAPSEC_WATER_LABYRINTH, - MAPSEC_FIVE_ISLE_MEADOW, - MAPSEC_MEMORIAL_PILLAR, - MAPSEC_OUTCAST_ISLAND, - MAPSEC_GREEN_PATH, - MAPSEC_WATER_PATH, - MAPSEC_RUIN_VALLEY, - MAPSEC_TRAINER_TOWER, - MAPSEC_CANYON_ENTRANCE, - MAPSEC_SEVAULT_CANYON, - MAPSEC_TANOBY_RUINS, - MAPSEC_SEVII_ISLE_22, - MAPSEC_SEVII_ISLE_23, - MAPSEC_SEVII_ISLE_24, - MAPSEC_NAVEL_ROCK, - MAPSEC_MT_EMBER, - MAPSEC_BERRY_FOREST, - MAPSEC_ICEFALL_CAVE, - MAPSEC_ROCKET_WAREHOUSE, - MAPSEC_TRAINER_TOWER_2, - MAPSEC_DOTTED_HOLE, - MAPSEC_LOST_CAVE, - MAPSEC_PATTERN_BUSH, - MAPSEC_ALTERING_CAVE, - MAPSEC_TANOBY_CHAMBERS, - MAPSEC_THREE_ISLE_PATH, - MAPSEC_TANOBY_KEY, - MAPSEC_BIRTH_ISLAND, - MAPSEC_MONEAN_CHAMBER, - MAPSEC_LIPTOO_CHAMBER, - MAPSEC_WEEPTH_CHAMBER, - MAPSEC_DILFORD_CHAMBER, - MAPSEC_SCUFIB_CHAMBER, - MAPSEC_RIXY_CHAMBER, - MAPSEC_VIAPOIS_CHAMBER, - MAPSEC_EMBER_SPA, - MAPSEC_SPECIAL_AREA, - MAPSEC_AQUA_HIDEOUT, - MAPSEC_MAGMA_HIDEOUT, - MAPSEC_MIRAGE_TOWER, - MAPSEC_BIRTH_ISLAND_2, - MAPSEC_FARAWAY_ISLAND, - MAPSEC_ARTISAN_CAVE, - MAPSEC_MARINE_CAVE, - MAPSEC_UNDERWATER_MARINE_CAVE, - MAPSEC_TERRA_CAVE, - MAPSEC_UNDERWATER_TERRA_CAVE, - MAPSEC_UNDERWATER_UNK1, - MAPSEC_UNDERWATER_129, - MAPSEC_DESERT_UNDERPASS, - MAPSEC_ALTERING_CAVE_2, - MAPSEC_NAVEL_ROCK2, - MAPSEC_TRAINER_HILL, - MAPSEC_NONE -}; - -#endif //GUARD_REGIONMAPSEC_H diff --git a/ld_script.txt b/ld_script.txt index e6559dba8..abb7f64da 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -180,7 +180,12 @@ SECTIONS { src/wallclock.o(.text); asm/rom6.o(.text); src/pokeblock.o(.text); - asm/rom_81370FC.o(.text); + asm/fldeff_flash.o(.text); + asm/post_battle_event_funcs.o(.text); + asm/time_events.o(.text); + asm/birch_pc.o(.text); + asm/hof_pc.o(.text); + asm/field_specials.o(.text); asm/battle_records.o(.text); asm/pokedex_area_screen.o(.text); src/evolution_scene.o(.text); @@ -428,7 +433,9 @@ SECTIONS { data/starter_choose.o(.rodata); src/wallclock.o(.rodata); src/pokeblock.o(.rodata); - data/rom_81370FC.o(.rodata); + data/fldeff_flash.o(.rodata); + data/time_events.o(.rodata); + data/field_specials.o(.rodata); data/battle_records.o(.rodata); data/pokedex_area_screen.o(.rodata); src/evolution_scene.o(.rodata); diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 22be086f0..70b4d7d31 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -63,7 +63,7 @@ extern const u8 gUnknown_08C1F46C[]; extern const u8 gUnknown_08C1F5E8[]; extern const u8 gUnknown_08C1F76C[]; extern const u8 gUnknown_08C1F8E8[]; -extern const u8 gUnknown_08C0237C[]; +extern const u8 gBlankGfxCompressed[]; extern const u16 gBattleInterface_BallStatusBarPal[]; extern const u16 gBattleInterface_BallDisplayPal[]; @@ -110,10 +110,10 @@ static const struct CompressedSpriteSheet gUnknown_0832C100 = static const struct CompressedSpriteSheet gUnknown_0832C108[BATTLE_BANKS_COUNT] = { - {gUnknown_08C0237C, 0x0100, 0xd704}, - {gUnknown_08C0237C, 0x0120, 0xd705}, - {gUnknown_08C0237C, 0x0100, 0xd706}, - {gUnknown_08C0237C, 0x0120, 0xd707} + {gBlankGfxCompressed, 0x0100, 0xd704}, + {gBlankGfxCompressed, 0x0120, 0xd705}, + {gBlankGfxCompressed, 0x0100, 0xd706}, + {gBlankGfxCompressed, 0x0120, 0xd707} }; static const struct SpritePalette gUnknown_0832C128[2] = diff --git a/src/decoration.c b/src/decoration.c index 512252f7d..c539091c8 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -25,7 +25,7 @@ #include "sound.h" #include "event_scripts.h" #include "event_data.h" -#include "region_map_sections.h" +#include "constants/region_map_sections.h" #include "player_pc.h" #include "strings.h" #include "tv.h" diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 2496b9564..414959882 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -97,7 +97,7 @@ extern u16 sub_818D7D8(u16 species, u32 trainerId, u32 personality, u8 arg3, s16 extern void sub_8198204(u8 *dst, const u8 *src, u8, u8, u8); extern bool8 sub_80F9C30(void); extern void sub_8198314(void); -extern void sub_8137C3C(void); +extern void ReturnFromHallOfFamePC(void); extern void sub_8198180(const u8 *src, u8, u8); extern void sub_80F9BF4(u16, u16, u8); extern void sub_81980F0(u8, u8, u8, u8, u16); @@ -1108,7 +1108,7 @@ static void Task_HofPC_HandleExit(u8 taskId) if (sHofMonPtr != NULL) FREE_AND_SET_NULL(sHofMonPtr); - sub_8137C3C(); + ReturnFromHallOfFamePC(); } } diff --git a/src/landmark.c b/src/landmark.c index 3d4ed862b..4eade159a 100644 --- a/src/landmark.c +++ b/src/landmark.c @@ -1,6 +1,6 @@ #include "global.h" #include "event_data.h" -#include "region_map_sections.h" +#include "constants/region_map_sections.h" struct Landmark { diff --git a/src/region_map.c b/src/region_map.c index 261243792..086c0ba68 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -21,7 +21,7 @@ #include "m4a.h" #include "field_effect.h" #include "region_map.h" -#include "region_map_sections.h" +#include "constants/region_map_sections.h" #define MAP_WIDTH 28 #define MAP_HEIGHT 15 @@ -32,7 +32,7 @@ #include "naming_screen.h" #include "malloc.h" #include "region_map.h" -#include "region_map_sections.h" +#include "constants/region_map_sections.h" #include "decoration.h" #include "secret_base.h" #include "tv.h" |
